From 14f29432a5777b36e18c248e9760cdf4b7ea2a23 Mon Sep 17 00:00:00 2001 From: Erdragh Date: Fri, 30 Aug 2024 19:53:56 +0200 Subject: [PATCH 1/2] Fix build error on forge --- forge/src/main/kotlin/dev/erdragh/astralbot/forge/BotMod.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge/src/main/kotlin/dev/erdragh/astralbot/forge/BotMod.kt b/forge/src/main/kotlin/dev/erdragh/astralbot/forge/BotMod.kt index 6e58d74..6b7189a 100644 --- a/forge/src/main/kotlin/dev/erdragh/astralbot/forge/BotMod.kt +++ b/forge/src/main/kotlin/dev/erdragh/astralbot/forge/BotMod.kt @@ -26,8 +26,8 @@ import net.minecraftforge.fml.event.config.ModConfigEvent @Mod("astralbot") object BotMod { init { - ModLoadingContext.get().activeContainer.registerConfig(ModConfig.Type.SERVER, AstralBotConfig.SPEC) - ModLoadingContext.get().activeContainer.registerConfig(ModConfig.Type.SERVER, AstralBotTextConfig.SPEC, "astralbot-text.toml") + ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, AstralBotConfig.SPEC) + ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, AstralBotTextConfig.SPEC, "astralbot-text.toml") MOD_BUS.addListener(::onConfigReloaded) FORGE_BUS.addListener(::onServerStart) From 4da67cddc141f619395f2c583909e690e1376f50 Mon Sep 17 00:00:00 2001 From: Erdragh Date: Fri, 30 Aug 2024 19:58:11 +0200 Subject: [PATCH 2/2] Relocate newly added dependencies with shadow --- build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 7679417..1c0952e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -259,6 +259,10 @@ subprojects { relocate("org.json", "dev.erdragh.shadowed.org.json") relocate("net.bytebuddy", "dev.erdragh.shadowed.net.bytebuddy") + relocate("com.google", "dev.erdragh.shadowed.com.google") + relocate("google", "dev.erdragh.shadowed.google") + relocate("javax", "dev.erdragh.shadowed.javax") + exclude("**/org/slf4j/**") exclude("**/org/jetbrains/annotations/*")