From abf33d80f724ef0d54985b0ffff531ac27354cb6 Mon Sep 17 00:00:00 2001 From: Eivind Norling Date: Sat, 25 May 2024 14:59:53 +0200 Subject: [PATCH] fix: crash on servers --- common/build.gradle | 3 --- .../java/com/ewyboy/worldstripper/WorldStripper.java | 5 ++++- fabric/build.gradle | 3 --- .../fabric/WorldStripperClientFabric.java | 12 ++++++++++++ forge/build.gradle | 4 ---- .../worldstripper/forge/WorldStripperForge.java | 8 +++++++- gradle.properties | 5 ++--- neoforge/build.gradle | 4 ---- .../neoforge/WorldStripperNeoForge.java | 5 +++++ 9 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 fabric/src/main/java/com/ewyboy/worldstripper/fabric/WorldStripperClientFabric.java diff --git a/common/build.gradle b/common/build.gradle index c0b1784..1769f44 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -12,9 +12,6 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury:${rootProject.architectury_version}" - - implementation "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" - shadowCommon "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" } publishing { diff --git a/common/src/main/java/com/ewyboy/worldstripper/WorldStripper.java b/common/src/main/java/com/ewyboy/worldstripper/WorldStripper.java index c8f9c33..5b8e62e 100644 --- a/common/src/main/java/com/ewyboy/worldstripper/WorldStripper.java +++ b/common/src/main/java/com/ewyboy/worldstripper/WorldStripper.java @@ -15,9 +15,12 @@ public static void init() { WSCommands.init(); StrippablesHandler.init(); WSConfigLoader.init(); - Keymappings.init(); NetworkHandler.init(); WorldWorker.init(); } + public static void initClient() { + Keymappings.init(); + } + } diff --git a/fabric/build.gradle b/fabric/build.gradle index 95eeb69..925b274 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -23,9 +23,6 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } - - implementation "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" - shadowCommon "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" } processResources { diff --git a/fabric/src/main/java/com/ewyboy/worldstripper/fabric/WorldStripperClientFabric.java b/fabric/src/main/java/com/ewyboy/worldstripper/fabric/WorldStripperClientFabric.java new file mode 100644 index 0000000..ea2c314 --- /dev/null +++ b/fabric/src/main/java/com/ewyboy/worldstripper/fabric/WorldStripperClientFabric.java @@ -0,0 +1,12 @@ +package com.ewyboy.worldstripper.fabric; + +import com.ewyboy.worldstripper.WorldStripper; +import net.fabricmc.api.ClientModInitializer; + +public class WorldStripperClientFabric implements ClientModInitializer { + + @Override + public void onInitializeClient() { + WorldStripper.initClient(); + } +} \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle index ea3dca3..c58f759 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -27,10 +27,6 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } - - implementation "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" - forgeRuntimeLibrary "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" - shadowCommon "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" } processResources { diff --git a/forge/src/main/java/com/ewyboy/worldstripper/forge/WorldStripperForge.java b/forge/src/main/java/com/ewyboy/worldstripper/forge/WorldStripperForge.java index bcd86be..89c1b10 100644 --- a/forge/src/main/java/com/ewyboy/worldstripper/forge/WorldStripperForge.java +++ b/forge/src/main/java/com/ewyboy/worldstripper/forge/WorldStripperForge.java @@ -3,13 +3,19 @@ import dev.architectury.platform.forge.EventBuses; import com.ewyboy.worldstripper.WorldStripper; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @Mod(WorldStripper.MOD_ID) public class WorldStripperForge { + public WorldStripperForge() { - // Submit our event bus to let architectury register our content on the right time EventBuses.registerModEventBus(WorldStripper.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); WorldStripper.init(); } + + public void onClient(FMLClientSetupEvent event) { + WorldStripper.initClient(); + } + } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 2899362..b4c2fe6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,14 @@ minecraft_version=1.20.4 enabled_platforms=fabric,forge,neoforge archives_base_name=WorldStripper -mod_version=1.20.4-4.0.0 +mod_version=1.20.4-4.0.1 maven_group=com.ewyboy -snakeyaml_version=2.2 - architectury_version=11.1.13 fabric_loader_version=0.15.7 fabric_api_version=0.96.4+1.20.4 forge_version=1.20.4-49.0.31 + neoforge_version=20.4.183 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 8b4e529..5185948 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -26,10 +26,6 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive false } - - implementation "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" - forgeRuntimeLibrary "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" - shadowCommon "org.yaml:snakeyaml:${rootProject.snakeyaml_version}" } processResources { diff --git a/neoforge/src/main/java/com/ewyboy/worldstripper/neoforge/WorldStripperNeoForge.java b/neoforge/src/main/java/com/ewyboy/worldstripper/neoforge/WorldStripperNeoForge.java index c1c39b0..bb2b3f0 100644 --- a/neoforge/src/main/java/com/ewyboy/worldstripper/neoforge/WorldStripperNeoForge.java +++ b/neoforge/src/main/java/com/ewyboy/worldstripper/neoforge/WorldStripperNeoForge.java @@ -2,6 +2,7 @@ import com.ewyboy.worldstripper.WorldStripper; import net.neoforged.fml.common.Mod; +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; @Mod(WorldStripper.MOD_ID) public final class WorldStripperNeoForge { @@ -10,4 +11,8 @@ public WorldStripperNeoForge() { WorldStripper.init(); } + public void onClient(FMLClientSetupEvent event) { + WorldStripper.initClient(); + } + } \ No newline at end of file