Improve NPE checks (#26)

.github/ISSUE_TEMPLATE/000-report-bug.yml

@@ -0,0 +1,62 @@
+name: Report Bug
+description: "Report a bug."
+body:
+  - type: markdown
+    attributes:
+      value: "A bug/crash report with sufficient information and logs to reproduce and track down."
+  - type: input
+    id: discord
+    attributes:
+      label: Your GTNH Discord Username
+      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
+      placeholder: "Example: Fake#1234"
+  - type: input
+    id: version
+    attributes:
+      label: Mod Version
+      description: "What version of the Mod are you using?"
+      placeholder: "Example: 1.0.0"
+    validations:
+      required: true
+  - type: textarea
+    id: report
+    attributes:
+      label: Bug Report
+      description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
+      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
+    validations:
+      required: true
+  - type: dropdown
+    id: java
+    attributes:
+      label: Java Version
+      description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
+      options:
+        - Java 8
+        - Java 9
+        - Java 11
+        - Java 17
+        - Java 19
+        - Java 20
+        - Java 21
+        - Other (Please Specify)
+    validations:
+      required: true
+  - type: textarea
+    id: modlist
+    attributes:
+      label: Mod List or GTNH Pack Version
+      description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log).  If using GTNH please indicate pack version and any changed mods, not the entire modlist."
+      placeholder: "List of mods or GTNH Pack version goes here"
+    validations:
+      required: true
+  - type: checkboxes
+    id: final
+    attributes:
+      label: Final Checklist
+      description: Certify that you read things
+      options:
+        - label: "I have searched the issues and haven't found a similar issue."
+          required: true
+
+

.github/ISSUE_TEMPLATE/001-request-feature.yml

@@ -0,0 +1,28 @@
+name: Feature Request
+description: "Request a feature."
+body:
+  - type: markdown
+    attributes:
+      value: "Please use this form to request features. We ask you check if it was already requested though"
+  - type: input
+    id: discord
+    attributes:
+      label: Your GTNH Discord Username
+      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
+      placeholder: "Example: Wumpus#1234"
+  - type: textarea
+    id: request
+    attributes:
+      label: Feature Request
+      description: "Relevant information, as well as relevant images"
+      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
+    validations:
+      required: true
+  - type: checkboxes
+    id: final
+    attributes:
+      label: Final Checklist
+      description: Certify that you read things
+      options:
+        - label: "I have searched the issues and haven't found a similar issue."
+          required: true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
 }
 
 

src/main/java/codechicken/core/ClassDiscoverer.java

@@ -1,13 +1,13 @@
 package codechicken.core;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
+import java.util.zip.ZipFile;
 
 import net.minecraft.launchwrapper.Launch;
 
@@ -114,21 +114,18 @@ public class ClassDiscoverer {
     }
 
     private void readFromZipFile(File file) throws IOException {
-        FileInputStream fileinputstream = new FileInputStream(file);
-        ZipInputStream zipinputstream = new ZipInputStream(fileinputstream);
-        do {
-            ZipEntry zipentry = zipinputstream.getNextEntry();
-            if (zipentry == null) {
-                break;
+        try (ZipFile zipFile = new ZipFile(file)) {
+            Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
+            while (zipEntries.hasMoreElements()) {
+                ZipEntry zipentry = zipEntries.nextElement();
+                String fullname = zipentry.getName().replace('\\', '/');
+                int pos = fullname.lastIndexOf('/');
+                String name = pos == -1 ? fullname : fullname.substring(pos + 1);
+                if (!zipentry.isDirectory() && matcher.matches(name)) {
+                    checkAddClass(fullname);
+                }
             }
-            String fullname = zipentry.getName().replace('\\', '/');
-            int pos = fullname.lastIndexOf('/');
-            String name = pos == -1 ? fullname : fullname.substring(pos + 1);
-            if (!zipentry.isDirectory() && matcher.matches(name)) {
-                checkAddClass(fullname);
-            }
-        } while (true);
-        fileinputstream.close();
+        }
     }
 
     private void readFromDirectory(File directory, File basedirectory) {

src/main/java/codechicken/lib/gui/GuiDraw.java

@@ -162,6 +162,11 @@ public class GuiDraw {
     }
 
     public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list) {
+        drawMultilineTip(font, x, y, list, 0xf0100010, 0xf0100010, 0x505000ff, 0x5028007F);
+    }
+
+    public static void drawMultilineTip(FontRenderer font, int x, int y, List<String> list, int bgStart, int bgEnd,
+            int borderStart, int borderEnd) {
         if (list.isEmpty()) return;
 
         GL11.glDisable(GL12.GL_RESCALE_NORMAL);
@@ -189,7 +194,7 @@ public class GuiDraw {
         y = (int) MathHelper.clip(y, 8, displaySize().height - 8 - h);
 
         gui.incZLevel(300);
-        drawTooltipBox(x - 4, y - 4, w + 7, h + 7);
+        drawTooltipBox(x - 4, y - 4, w + 7, h + 7, bgStart, bgEnd, borderStart, borderEnd);
         for (String s : list) {
             ITooltipLineHandler line = getTipLine(s);
             if (line != null) {
@@ -210,18 +215,23 @@ public class GuiDraw {
     }
 
     public static void drawTooltipBox(int x, int y, int w, int h) {
-        int bg = 0xf0100010;
-        drawGradientRect(x + 1, y, w - 1, 1, bg, bg);
-        drawGradientRect(x + 1, y + h, w - 1, 1, bg, bg);
-        drawGradientRect(x + 1, y + 1, w - 1, h - 1, bg, bg); // center
-        drawGradientRect(x, y + 1, 1, h - 1, bg, bg);
-        drawGradientRect(x + w, y + 1, 1, h - 1, bg, bg);
-        int grad1 = 0x505000ff;
-        int grad2 = 0x5028007F;
-        drawGradientRect(x + 1, y + 2, 1, h - 3, grad1, grad2);
-        drawGradientRect(x + w - 1, y + 2, 1, h - 3, grad1, grad2);
+        drawTooltipBox(x, y, w, h, 0xf0100010, 0xf0100010, 0x505000ff, 0x5028007F);
+    }
 
-        drawGradientRect(x + 1, y + 1, w - 1, 1, grad1, grad1);
-        drawGradientRect(x + 1, y + h - 1, w - 1, 1, grad2, grad2);
+    public static void drawTooltipBox(int x, int y, int w, int h, int bgStart, int bgEnd, int borderStart,
+            int borderEnd) {
+        // spotless:off
+        // draw background
+        drawGradientRect(x + 1, y,     w - 1, 1,     bgStart, bgStart); // top
+        drawGradientRect(x + 1, y + h, w - 1, 1,     bgEnd,   bgEnd); // bottom
+        drawGradientRect(x + 1, y + 1, w - 1, h - 1, bgStart, bgEnd); // center
+        drawGradientRect(x,     y + 1, 1,     h - 1, bgStart, bgEnd); // left
+        drawGradientRect(x + w, y + 1, 1,     h - 1, bgStart, bgEnd); // right
+        // draw inner border
+        drawGradientRect(x + 1,     y + 2, 1,  h - 3,    borderStart, borderEnd); // left
+        drawGradientRect(x + w - 1, y + 2, 1,  h - 3,    borderStart, borderEnd); // right
+        drawGradientRect(x + 1,     y + 1,     w - 1, 1, borderStart, borderStart); // top
+        drawGradientRect(x + 1,     y + h - 1, w - 1, 1, borderEnd,   borderEnd); // bottom
+        // spotless:on
     }
 }

src/main/java/codechicken/lib/world/WorldExtensionManager.java

@@ -79,17 +79,25 @@ public class WorldExtensionManager {
 
         @SubscribeEvent
         public void onChunkWatch(Watch event) {
-            Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
-            for (WorldExtension extension : worldMap.get(event.player.worldObj))
-                extension.watchChunk(chunk, event.player);
+            WorldExtension[] extensions = worldMap.get(event.player.worldObj);
+
+            if (extensions != null) {
+                Chunk chunk = event.player.worldObj
+                        .getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
+                for (WorldExtension extension : extensions) extension.watchChunk(chunk, event.player);
+            }
         }
 
         @SubscribeEvent
         @SideOnly(Side.CLIENT)
         public void onChunkUnWatch(UnWatch event) {
-            Chunk chunk = event.player.worldObj.getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
-            for (WorldExtension extension : worldMap.get(event.player.worldObj))
-                extension.unwatchChunk(chunk, event.player);
+            WorldExtension[] extensions = worldMap.get(event.player.worldObj);
+
+            if (extensions != null) {
+                Chunk chunk = event.player.worldObj
+                        .getChunkFromChunkCoords(event.chunk.chunkXPos, event.chunk.chunkZPos);
+                for (WorldExtension extension : extensions) extension.unwatchChunk(chunk, event.player);
+            }
         }
 
         @SubscribeEvent
@@ -110,7 +118,7 @@ public class WorldExtensionManager {
     }
 
     private static boolean initialised;
-    private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<WorldExtensionInstantiator>();
+    private static ArrayList<WorldExtensionInstantiator> extensionIntialisers = new ArrayList<>();
 
     public static void registerWorldExtension(WorldExtensionInstantiator init) {
         if (!initialised) init();
@@ -125,7 +133,7 @@ public class WorldExtensionManager {
         FMLCommonHandler.instance().bus().register(new WorldExtensionEventHandler());
     }
 
-    private static HashMap<World, WorldExtension[]> worldMap = new HashMap<World, WorldExtension[]>();
+    private static HashMap<World, WorldExtension[]> worldMap = new HashMap<>();
 
     private static void onWorldLoad(World world) {
         WorldExtension[] extensions = new WorldExtension[extensionIntialisers.size()];