bug: Fixed modified contraption registry not registering defaults on …

…Fabric server (issue Cannoneers-of-Create#718)
rbasamoyai · Dec 31, 2024 · cf43de8 · cf43de8
1 parent 746c0d1
commit cf43de8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/fabric/src/main/java/rbasamoyai/createbigcannons/fabric/CBCClientFabric.java b/fabric/src/main/java/rbasamoyai/createbigcannons/fabric/CBCClientFabric.java
@@ -44,7 +44,6 @@
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import rbasamoyai.createbigcannons.CBCClientCommon;
-import rbasamoyai.createbigcannons.CreateBigCannons;
 import rbasamoyai.createbigcannons.compat.trinkets.CBCTrinketsClient;
 import rbasamoyai.createbigcannons.fabric.mixin.client.KeyMappingAccessor;
 import rbasamoyai.createbigcannons.fabric.network.CBCNetworkFabric;
@@ -85,7 +84,6 @@ private static void wrapOverlay(String id, CBCClientCommon.CBCGuiOverlay overlay
 	}
 
 	public static void onModsLoaded(EnvType envType) {
-		CreateBigCannons.onCommonSetup();
 		if (envType != EnvType.CLIENT)
 			return;
 		CBCModsFabric.TRINKETS.executeIfInstalled(() -> () -> CBCTrinketsClient.initClient());

diff --git a/fabric/src/main/java/rbasamoyai/createbigcannons/fabric/CBCCommonFabricEvents.java b/fabric/src/main/java/rbasamoyai/createbigcannons/fabric/CBCCommonFabricEvents.java
@@ -38,6 +38,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import rbasamoyai.createbigcannons.CBCCommonEvents;
+import rbasamoyai.createbigcannons.CreateBigCannons;
 import rbasamoyai.createbigcannons.block_armor_properties.BlockArmorInspectionToolItem;
 import rbasamoyai.createbigcannons.cannon_control.config.DefaultCannonMountPropertiesSerializers;
 import rbasamoyai.createbigcannons.compat.copycats.CopycatsCompat;
@@ -72,6 +73,7 @@ public static void onModsLoaded(EnvType type) {
 		GasMaskItem.registerDefaultHandlers();
 		DefaultCreateCompat.init();
 		DefaultCannonMountPropertiesSerializers.init();
+		CreateBigCannons.onCommonSetup();
 		CBCModsFabric.COPYCATS.executeIfInstalled(() -> () -> CopycatsCompat.init(CBCModsFabric.COPYCATS::getBlock));
 		CBCModsFabric.TRINKETS.executeIfInstalled(() -> () -> CBCTrinketsIntegration.init());
 	}