Add null safety checks at various places, bump Gradle (#63)

* Fixed NPE issues

* Added even more null safety

* Forgot to put -SNAPSHOT in version number lol

* Was able to revert .gitignore ( left testing batch files in there by accident ) and also to revert MapIconsTransformer.java

Author: mas6y6

build-logic/src/main/kotlin/pack.base-conventions.gradle.kts

@@ -1,3 +1,29 @@
+/*
+ * Copyright (c) 2026 GeyserMC. http://geysermc.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ *
+ *  @author GeyserMC
+ *  @link https://github.com/GeyserMC/PackConverter
+ *
+ */
+
 import org.gradle.kotlin.dsl.`java-library`
 
 plugins {

build-logic/src/main/kotlin/pack.publish-conventions.gradle.kts

@@ -1,3 +1,29 @@
+/*
+ * Copyright (c) 2026 GeyserMC. http://geysermc.org
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ *
+ *  @author GeyserMC
+ *  @link https://github.com/GeyserMC/PackConverter
+ *
+ */
+
 import java.net.URI
 
 plugins {

converter/src/main/java/org/geysermc/pack/converter/type/texture/TextureConverter.java

@@ -112,13 +112,15 @@ public Collection<Texture> extract(ResourcePack pack, ExtractionContext context)
         String input = texture.key().value();
         String relativePath = input.replaceAll("\\.png$", "");
 
-        String rootPath = relativePath.substring(0, relativePath.indexOf('/'));
+        int slashIndex = relativePath.indexOf('/');
+        String rootPath = slashIndex != -1 ? relativePath.substring(0, slashIndex) : "";
         String bedrockRoot = DIRECTORY_LOCATIONS.getOrDefault(rootPath, rootPath);
 
         List<String> mapping = mappings.map(relativePath);
         List<String> transformedOutputs = new ArrayList<>();
         for (String item : mapping) {
-            transformedOutputs.add(bedrockRoot + item.substring(item.indexOf('/')) + ".png");
+            int itemSlashIndex = item.indexOf('/');
+            transformedOutputs.add(bedrockRoot + (itemSlashIndex != -1 ? item.substring(itemSlashIndex) : "/" + item) + ".png");
         }
 
         transformed.output(transformedOutputs);
@@ -145,8 +147,9 @@ public void include(BedrockResourcePack pack, List<TransformedTexture> transform
                 }
                 exportedPaths.add(outputPath);
 
-                String root = outputPath.substring(0, outputPath.indexOf('/'));
-                String value = outputPath.substring(outputPath.indexOf('/') + 1);
+                int slashIndex = outputPath.indexOf('/');
+                String root = slashIndex != -1 ? outputPath.substring(0, slashIndex) : "";
+                String value = slashIndex != -1 ? outputPath.substring(slashIndex + 1) : outputPath;
 
                 outputs.add(texturePath.resolve((
                         bedrockDirectory.formatted(root, value)

converter/src/main/java/org/geysermc/pack/converter/type/texture/transformer/TextureTransformer.java

@@ -60,7 +60,15 @@ default int order() {
     }
 
     default void gridTransform(@NotNull TransformContext context, boolean poll, int rows, int columns, String bedrockOutput, String... javaInputs) throws IOException {
-        gridTransform(context, poll, rows, columns, KeyUtil.key(Key.MINECRAFT_NAMESPACE, bedrockOutput), Arrays.stream(javaInputs).map(str -> KeyUtil.key(Key.MINECRAFT_NAMESPACE, str)).toArray(Key[]::new));
+        gridTransform(
+                context,
+                poll,
+                rows,
+                columns,
+                KeyUtil.key(Key.MINECRAFT_NAMESPACE, bedrockOutput),
+                Arrays.stream(javaInputs).map(
+                        str ->
+                                str == null ? null : KeyUtil.key(Key.MINECRAFT_NAMESPACE, str)).toArray(Key[]::new));
     }
 
     // Adds images in rows and columns
@@ -85,7 +93,10 @@ default void gridTransform(@NotNull TransformContext context, boolean poll, int
         }
 
         List<Texture> textures = Arrays.stream(javaInputs)
-                .map(key -> poll ? context.pollOrPeekVanilla(key) : context.peekOrVanilla(key)).toList();
+                .map(key -> {
+                    if (key == null) return null;
+                    return poll ? context.pollOrPeekVanilla(key) : context.peekOrVanilla(key);
+                }).toList();
 
         List<BufferedImage> images = new ArrayList<>(textures.size());
 

converter/src/main/java/org/geysermc/pack/converter/type/texture/transformer/TransformContext.java

@@ -100,7 +100,10 @@ public Optional<ResourcePack> vanillaPack() {
      * @return the texture that was removed, or null if it didn't exist
      */
     @Nullable
-    public Texture poll(@NotNull Key key) {
+    public Texture poll(@Nullable Key key) {
+        if (key == null) {
+            return null;
+        }
         Texture remove = this.byKey.remove(key);
         if (remove == null) {
             return null;
@@ -117,7 +120,10 @@ public Texture poll(@NotNull Key key) {
      * @return the texture with the given key, or null if it doesn't exist
      */
     @Nullable
-    public Texture peek(@NotNull Key key) {
+    public Texture peek(@Nullable Key key) {
+        if (key == null) {
+            return null;
+        }
         return this.byKey.get(key);
     }
 
@@ -130,7 +136,10 @@ public Texture peek(@NotNull Key key) {
      * @return the texture that was removed, or the vanilla one if it didn't exist, or null
      */
     @Nullable
-    public Texture pollOrPeekVanilla(@NotNull Key key) {
+    public Texture pollOrPeekVanilla(@Nullable Key key) {
+        if (key == null) {
+            return null;
+        }
         Texture remove = this.byKey.remove(key);
         if (remove == null) {
             return vanillaPack.map(pack -> pack.texture(key)).orElse(null);
@@ -149,7 +158,10 @@ public Texture pollOrPeekVanilla(@NotNull Key key) {
      * @return the texture that was removed, or the vanilla one if it didn't exist, or null
      */
     @Nullable
-    public Texture peekOrVanilla(@NotNull Key key) {
+    public Texture peekOrVanilla(@Nullable Key key) {
+        if (key == null) {
+            return null;
+        }
         Texture texture = this.byKey.get(key);
         if (texture == null) {
             return vanillaPack.map(pack -> pack.texture(key)).orElse(null);
@@ -165,7 +177,10 @@ public Texture peekOrVanilla(@NotNull Key key) {
      * @return true if the texture is present, else false
      */
     @SuppressWarnings("BooleanMethodIsAlwaysInverted") // It just doesn't make sense.
-    public boolean isTexturePresent(@NotNull Key key) {
+    public boolean isTexturePresent(@Nullable Key key) {
+        if (key == null) {
+            return false;
+        }
         return this.byKey.containsKey(key);
     }
 

converter/src/main/java/org/geysermc/pack/converter/type/texture/transformer/type/particle/GridSpritesheetParticleTransformer.java

@@ -32,6 +32,7 @@
 import org.geysermc.pack.converter.util.KeyUtil;
 import org.geysermc.pack.converter.util.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import team.unnamed.creative.texture.Texture;
 
 import java.awt.*;
@@ -78,7 +79,8 @@ public void transform(@NotNull TransformContext context) throws IOException {
         int k = 0;
         for (int i = 0; i < rows; i++) {
             for (int j = 0; j < columns; j++) {
-                Key key = KeyUtil.key(Key.MINECRAFT_NAMESPACE, javaPaths[k++]);
+                String javaPath = javaPaths[k++];
+                Key key = javaPath == null ? null : KeyUtil.key(Key.MINECRAFT_NAMESPACE, javaPath);
                 Texture texture = context.pollOrPeekVanilla(key);
                 itemDatas.add(new ItemData(
                         key,
@@ -116,7 +118,7 @@ public BufferedImage preProcessImage(BufferedImage image) {
         return image;
     }
 
-    private record ItemData(Key key, Texture texture, int x, int y) {}
+    private record ItemData(@Nullable Key key, @Nullable Texture texture, int x, int y) {}
 
     public static abstract class Row extends GridSpritesheetParticleTransformer {
         public Row(String bedrockPath, int particleWidth, int particleHeight, String javaPath, int amount) {

converter/src/main/java/org/geysermc/pack/converter/type/texture/transformer/type/particle/SpritesheetParticleTransformer.java

@@ -60,6 +60,7 @@ public void transform(@NotNull TransformContext context) throws IOException {
         BitSet occupiedSectors = new BitSet(this.atlasCount);
         Spritesheet spritesheet = new Spritesheet();
         for (int i = 0; i < this.atlasCount; i++) {
+            if (javaPath == null) continue;
             Texture texture = context.poll(KeyUtil.key(Key.MINECRAFT_NAMESPACE, String.format(this.javaPath, i)));
             if (texture == null) {
                 continue;

gradle.properties

@@ -1,2 +1,2 @@
 group=org.geysermc.pack
-version=3.4.2-SNAPSHOT
+version=3.4.3-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sun May 17 16:47:50 CDT 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists