From b1f20104a64d565af747efefd6607752279e00fc Mon Sep 17 00:00:00 2001
From: Jakub <kuba.123123.6000@gmail.com>
Date: Thu, 17 Sep 2026 14:09:06 +0200
Subject: [PATCH] Publishing (#1039)

---
 dependencies.gradle                                 | 7 ++++++-
 gradle.properties                                   | 5 +++++
 gradle/wrapper/gradle-wrapper.properties            | 2 +-
 settings.gradle                                     | 2 +-
 src/main/java/codechicken/nei/CollapsibleItems.java | 9 +++++----
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 5c856240..3bc4a55c 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -27,9 +27,14 @@ dependencies {
     gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.48") { transitive = false }
 }
 
+def embedArchiveOperations = gtnhGradle.archiveOperations
+def gtnhlibEmbedContents = configurations.gtnhlibEmbed.elements.map { files ->
+    files.collect { embedArchiveOperations.zipTree(it.asFile) }
+}
+
 [tasks.jar, tasks.shadowJar].each {
     it.configure {
-        from({ project.configurations.getByName('gtnhlibEmbed').collect { zipTree(it) } }) {
+        from(gtnhlibEmbedContents) {
             include 'com/gtnewhorizon/gtnhlib/color/ColorResource.class'
             include 'com/gtnewhorizon/gtnhlib/color/ColorResource$*.class'
         }
diff --git a/gradle.properties b/gradle.properties
index 54705e59..ebd55615 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -186,6 +186,11 @@ modrinthRelations = required-project\:codechickencore-unofficial
 # Leave this empty if you don't want to publish on CurseForge.
 curseForgeProjectId = 358228
 
+# Comma-separated supported CurseForge environments: client, server (case-insensitive).
+# Use client or server for mods that only support one environment. Defaults to client,server.
+# These tags describe where the mod can run, not whether installation is required on both sides.
+curseForgeEnvironments = client,server
+
 # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
 # Syntax: type1:name1;type2:name2;...
 # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dbc3ce4a..c42672d9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index f1e3c23b..1abf1f08 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.29'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.30'
 }
 
 
diff --git a/src/main/java/codechicken/nei/CollapsibleItems.java b/src/main/java/codechicken/nei/CollapsibleItems.java
index 1126dcd4..2ce2b73f 100644
--- a/src/main/java/codechicken/nei/CollapsibleItems.java
+++ b/src/main/java/codechicken/nei/CollapsibleItems.java
@@ -10,6 +10,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTBase.NBTPrimitive;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
@@ -227,17 +228,17 @@ public class CollapsibleItems {
 
             if (NEIClientConfig.world.nbt.hasKey(STATE_KEY)) {
                 NBTTagCompound states = NEIClientConfig.world.nbt.getCompoundTag(STATE_KEY);
-                @SuppressWarnings("unchecked")
-                final Map<String, NBTPrimitive> list = (Map<String, NBTPrimitive>) states.tagMap;
+                final Map<String, NBTBase> list = states.tagMap;
                 final Map<String, GroupItem> mapping = new HashMap<>();
 
                 for (GroupItem group : CollapsibleItems.groups) {
                     mapping.put(group.guid, group);
                 }
 
-                for (Map.Entry<String, NBTPrimitive> nbtEntry : list.entrySet()) {
+                for (Map.Entry<String, NBTBase> nbtEntry : list.entrySet()) {
                     if (mapping.containsKey(nbtEntry.getKey())) {
-                        mapping.get(nbtEntry.getKey()).expanded = nbtEntry.getValue().func_150290_f() == 1;
+                        mapping.get(nbtEntry.getKey()).expanded = ((NBTPrimitive) nbtEntry.getValue()).func_150290_f()
+                                == 1;
                     }
                 }
             }