Fix ConfigVec3iList and ConfigVec3iTupleList causing NPE if empty (#189)

Signed-off-by: Hendrix-Shen <[email protected]>

Author: Hendrix-Shen

magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/widget/WidgetVec3iListEditEntry.java

@@ -201,18 +201,22 @@ public void render(
                 // CHECKSTYLE.ON: SeparatorWrap
                 // CHECKSTYLE.ON: NoWhitespaceBefore
         );
-        this.vec3iEntry.render(
-                // CHECKSTYLE.OFF: NoWhitespaceBefore
-                // CHECKSTYLE.OFF: SeparatorWrap
-                mouseX,
-                mouseY,
-                selected
-                //#if MC > 11502
-                , poseStackOrGuiGraphics
-                //#endif
-                // CHECKSTYLE.ON: SeparatorWrap
-                // CHECKSTYLE.ON: NoWhitespaceBefore
-        );
+
+        if (this.vec3iEntry != null) {
+            this.vec3iEntry.render(
+                    // CHECKSTYLE.OFF: NoWhitespaceBefore
+                    // CHECKSTYLE.OFF: SeparatorWrap
+                    mouseX,
+                    mouseY,
+                    selected
+                    //#if MC > 11502
+                    , poseStackOrGuiGraphics
+                    //#endif
+                    // CHECKSTYLE.ON: SeparatorWrap
+                    // CHECKSTYLE.ON: NoWhitespaceBefore
+            );
+        }
+
         super.render(
                 // CHECKSTYLE.OFF: NoWhitespaceBefore
                 // CHECKSTYLE.OFF: SeparatorWrap
@@ -242,6 +246,10 @@ protected boolean onMouseClickedImpl(int mouseX, int mouseY, int mouseButton) {
 
     @Override
     public boolean onKeyTypedImpl(int keyCode, int scanCode, int modifiers) {
+        if (this.vec3iEntry == null) {
+            return false;
+        }
+
         return this.vec3iEntry.onKeyTypedImpl(keyCode, scanCode, modifiers);
     }
 

magiclib-malilib-extra/src/main/java/top/hendrixshen/magiclib/impl/malilib/config/gui/widget/WidgetVec3iTupleListEditEntry.java

@@ -211,30 +211,34 @@ public void render(
                 // CHECKSTYLE.ON: SeparatorWrap
                 // CHECKSTYLE.ON: NoWhitespaceBefore
         );
-        this.firstVec3iEntry.render(
-                // CHECKSTYLE.OFF: NoWhitespaceBefore
-                // CHECKSTYLE.OFF: SeparatorWrap
-                mouseX,
-                mouseY,
-                selected
-                //#if MC > 11502
-                , poseStackOrGuiGraphics
-                //#endif
-                // CHECKSTYLE.ON: SeparatorWrap
-                // CHECKSTYLE.ON: NoWhitespaceBefore
-        );
-        this.secondVec3iEntry.render(
-                // CHECKSTYLE.OFF: NoWhitespaceBefore
-                // CHECKSTYLE.OFF: SeparatorWrap
-                mouseX,
-                mouseY,
-                selected
-                //#if MC > 11502
-                , poseStackOrGuiGraphics
-                //#endif
-                // CHECKSTYLE.ON: SeparatorWrap
-                // CHECKSTYLE.ON: NoWhitespaceBefore
-        );
+
+        if (this.firstVec3iEntry != null && this.secondVec3iEntry != null) {
+            this.firstVec3iEntry.render(
+                    // CHECKSTYLE.OFF: NoWhitespaceBefore
+                    // CHECKSTYLE.OFF: SeparatorWrap
+                    mouseX,
+                    mouseY,
+                    selected
+                    //#if MC > 11502
+                    , poseStackOrGuiGraphics
+                    //#endif
+                    // CHECKSTYLE.ON: SeparatorWrap
+                    // CHECKSTYLE.ON: NoWhitespaceBefore
+            );
+            this.secondVec3iEntry.render(
+                    // CHECKSTYLE.OFF: NoWhitespaceBefore
+                    // CHECKSTYLE.OFF: SeparatorWrap
+                    mouseX,
+                    mouseY,
+                    selected
+                    //#if MC > 11502
+                    , poseStackOrGuiGraphics
+                    //#endif
+                    // CHECKSTYLE.ON: SeparatorWrap
+                    // CHECKSTYLE.ON: NoWhitespaceBefore
+            );
+        }
+
         super.render(
                 // CHECKSTYLE.OFF: NoWhitespaceBefore
                 // CHECKSTYLE.OFF: SeparatorWrap
@@ -265,6 +269,10 @@ protected boolean onMouseClickedImpl(int mouseX, int mouseY, int mouseButton) {
 
     @Override
     public boolean onKeyTypedImpl(int keyCode, int scanCode, int modifiers) {
+        if (this.firstVec3iEntry == null || this.secondVec3iEntry == null) {
+            return false;
+        }
+
         return this.firstVec3iEntry.onKeyTypedImpl(keyCode, scanCode, modifiers)
                 || this.secondVec3iEntry.onKeyTypedImpl(keyCode, scanCode, modifiers);
     }