Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand All @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.25'
}


30 changes: 19 additions & 11 deletions src/main/java/serverutils/core/ServerUtilitiesCore.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>) 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);
}
Expand Down Expand Up @@ -67,4 +57,22 @@ public String getMixinConfig() {
public List<String> getMixins(Set<String> 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<String> loaderExceptions = (Set<String>) clef.get(Launch.classLoader);
Set<String> transformerExceptions = (Set<String>) 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);
}
}
}