Skip to content

Commit 2f5e1c3

Browse files
committed
Move gamerule registration to CommonSetup, closes #605
1 parent dbebc89 commit 2f5e1c3

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import net.neoforged.fml.ModContainer;
2020
import net.neoforged.fml.common.Mod;
2121
import net.neoforged.fml.config.ModConfig;
22+
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
2223
import net.neoforged.neoforge.common.NeoForge;
2324

2425
@Mod(CompactMachines.MOD_ID)
@@ -33,7 +34,6 @@ public CompactMachinesCommon(IEventBus modBus, ModContainer modContainer) {
3334
registerEvents(modBus);
3435

3536
CMRegistries.setup(modBus);
36-
CMGameRules.register();
3737
}
3838

3939
private static void initConfigs(ModContainer modContainer) {
@@ -55,11 +55,16 @@ private static void registerEvents(IEventBus modBus) {
5555
RoomUpgrades.registerEvents(modBus);
5656
WorldBorderFixer.registerEvents();
5757

58+
modBus.addListener(CompactMachinesCommon::commonSetup);
5859
modBus.addListener(CMFeaturePacks::addFeaturePacks);
5960
modBus.addListener(CMNetworks::onPacketRegistration);
6061
modBus.addListener(InterModCompat::enqueueCompatMessages);
6162

6263
NeoForge.EVENT_BUS.addListener(Commands::onCommandsRegister);
6364
NeoForge.EVENT_BUS.addListener(ProtectedBlockEventHandler::leftClickBlock);
6465
}
66+
67+
private static void commonSetup(FMLCommonSetupEvent evt) {
68+
CMGameRules.register();
69+
}
6570
}

0 commit comments

Comments
 (0)