Skip to content

Commit

Permalink
fix: crash on servers
Browse files Browse the repository at this point in the history
  • Loading branch information
eivindnorling committed May 25, 2024
1 parent 993ec37 commit abf33d8
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 19 deletions.
3 changes: 0 additions & 3 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

}
3 changes: 0 additions & 3 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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();
}
}
4 changes: 0 additions & 4 deletions forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

}
5 changes: 2 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -10,4 +11,8 @@ public WorldStripperNeoForge() {
WorldStripper.init();
}

public void onClient(FMLClientSetupEvent event) {
WorldStripper.initClient();
}

}

0 comments on commit abf33d8

Please sign in to comment.