From 873e03a3c7bccfc79f46eaea7536fad20fff5ffb Mon Sep 17 00:00:00 2001 From: Lyft <127234178+Lyfts@users.noreply.github.com> Date: Sat, 6 Jun 2026 03:55:36 +0200 Subject: [PATCH 1/2] update bs+deps --- dependencies.gradle | 18 +++++++++--------- gradle.properties | 4 ++-- gradle/gradle-daemon-jvm.properties | 8 ++++---- settings.gradle | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7160fd9b..f03e89b0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,19 +2,19 @@ dependencies { - api("com.github.GTNewHorizons:GTNHLib:0.9.66:dev") - compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.98-GTNH:dev") {transitive = false} - compileOnly("com.github.GTNewHorizons:EnderIO:2.10.27:dev") {transitive = false} + api("com.github.GTNewHorizons:GTNHLib:0.11.4:dev") + compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.8.100-GTNH:dev") {transitive = false} + compileOnly("com.github.GTNewHorizons:EnderIO:2.10.29:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:Random-Things:2.7.7:dev") {transitive = false} compileOnly("com.github.GTNewHorizons:Navigator:1.1.3:dev") compileOnly('org.jetbrains:annotations:25.0.0') - compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.17-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.21-GTNH:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Battlegear2:1.4.3:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Galacticraft:3.4.28-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.14.70-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:AdventureBackpack2:1.4.19-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Minecraft-Backpack-Mod:2.6.12-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Galacticraft:3.4.29-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.14.87-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:AdventureBackpack2:1.4.21-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Minecraft-Backpack-Mod:2.6.13-GTNH:dev') {transitive = false} compileOnly(rfg.deobf("curse.maven:witchery-69673:2234410")) {transitive = false} - runtimeOnlyNonPublishable("com.github.GTNewHorizons:waila:1.19.28:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:waila:1.19.30:dev") } diff --git a/gradle.properties b/gradle.properties index e37629f5..d03f3568 100644 --- a/gradle.properties +++ b/gradle.properties @@ -169,7 +169,7 @@ modrinthProjectId = serverutilities-gtnh # and the name is the Modrinth project or version slug/id of the other mod. # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech # Note: UniMixins is automatically set as a required dependency if usesMixins = true. -modrinthRelations = required-project:gtnhlib;optional-project:navigator +modrinthRelations = required-project\:gtnhlib;optional-project\:navigator # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. # @@ -183,7 +183,7 @@ curseForgeProjectId = 1539566 # and the name is the CurseForge project slug of the other mod. # Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft # Note: UniMixins is automatically set as a required dependency if usesMixins = true. -curseForgeRelations = requiredDependency:gtnhlib;optionalDependency:navigator;incompatible:ftb-utilities-forge +curseForgeRelations = requiredDependency\:gtnhlib;optionalDependency\:navigator;incompatible\:ftb-utilities-forge # Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older # projects. New projects should not use this parameter. diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index 58206c6e..fa4ed510 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect toolchainVersion=25 diff --git a/settings.gradle b/settings.gradle index 407aea22..d33995eb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.25' } From d7d3c2dc7ff42bc03dc5c15f42a3d579a5ace564 Mon Sep 17 00:00:00 2001 From: Lyft <127234178+Lyfts@users.noreply.github.com> Date: Sat, 6 Jun 2026 03:55:43 +0200 Subject: [PATCH 2/2] remove brigadier transformer exception --- .../serverutils/core/ServerUtilitiesCore.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/serverutils/core/ServerUtilitiesCore.java b/src/main/java/serverutils/core/ServerUtilitiesCore.java index b22ee8d3..aca428f5 100644 --- a/src/main/java/serverutils/core/ServerUtilitiesCore.java +++ b/src/main/java/serverutils/core/ServerUtilitiesCore.java @@ -20,17 +20,7 @@ public class ServerUtilitiesCore implements IFMLLoadingPlugin, IEarlyMixinLoader { static { - try { - var cleF = LaunchClassLoader.class.getDeclaredField("classLoaderExceptions"); - cleF.setAccessible(true); - @SuppressWarnings("unchecked") - var cle = (Set) cleF.get(Launch.classLoader); - // for Brigadier - cle.remove("com.mojang."); - } catch (NoSuchFieldException | IllegalAccessException e) { - throw new RuntimeException(e); - } - + removeBrigadierExceptions(); ConfigurationManager.registerConfig(ServerUtilitiesConfig.class); ConfigurationManager.registerConfig(AuroraConfig.class); } @@ -67,4 +57,22 @@ public String getMixinConfig() { public List getMixins(Set loadedCoreMods) { return IMixins.getEarlyMixins(Mixins.class, loadedCoreMods); } + + @SuppressWarnings("unchecked") + private static void removeBrigadierExceptions() { + try { + var clef = LaunchClassLoader.class.getDeclaredField("classLoaderExceptions"); + clef.setAccessible(true); + var tef = LaunchClassLoader.class.getDeclaredField("transformerExceptions"); + tef.setAccessible(true); + Set loaderExceptions = (Set) clef.get(Launch.classLoader); + Set transformerExceptions = (Set) tef.get(Launch.classLoader); + // Remove classloader exception added by FML + loaderExceptions.remove("com.mojang."); + // Remove transformer exception added by GTNHExtLib + transformerExceptions.remove("com.mojang.brigadier"); + } catch (NoSuchFieldException | IllegalAccessException e) { + throw new RuntimeException(e); + } + } }