From b427d8a92a7e18995b06708d2779bb5197a25528 Mon Sep 17 00:00:00 2001 From: TheCricket Date: Sun, 2 Nov 2014 16:53:36 -0500 Subject: [PATCH] Fixes #6 --- .../java/info/jbcs/minecraft/chisel/Chisel.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index adff348c..3a3b233e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -1,5 +1,7 @@ package info.jbcs.minecraft.chisel; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.block.BlockCarvable; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel; @@ -51,7 +53,7 @@ import cpw.mods.fml.common.registry.GameRegistry.Type; public class Chisel { public static final String MOD_ID = "chisel"; - public static final String MOD_NAME = "Chisel"; + public static final String MOD_NAME = "Chisel 2"; public static boolean multipartLoaded = false; @@ -169,9 +171,9 @@ public class Chisel GameRegistry.registerWorldGenerator(new GeneratorMarble(ModBlocks.marble, 32, Configurations.marbleAmount), 1000); GameRegistry.registerWorldGenerator(new GeneratorLimestone(ModBlocks.limestone, 32, Configurations.limestoneAmount), 1000); - ModIntegration.addMod(FMPIntegration.class); - - ModIntegration.init(); + if(event.getSide() == Side.CLIENT){ + initModIntegration(); + } proxy.init(); MinecraftForge.EVENT_BUS.register(this); @@ -198,4 +200,11 @@ public class Chisel } } + @SideOnly(Side.CLIENT) + private static void initModIntegration(){ + ModIntegration.addMod(FMPIntegration.class); + + ModIntegration.init(); + } + }