- Fixed the mod from crashing on a server

9 files changed, 34 insertions, 10 deletions

diff --git a/Changelog.txt b/Changelog.txt
index dd51542..be4ff76 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,6 @@
+Version 1.0.6
+- Fixed the mod from crashing on a server
+
 Version 1.0.5
 - Made the ritual even better
 - Fixed a type where the "Thieving Gloves" were named "Thiefing Gloves"
diff --git a/src/main/java/darkknight/jewelrycraft/api/Curse.java b/src/main/java/darkknight/jewelrycraft/api/Curse.java
index bba11e3..8a471f0 100644
--- a/src/main/java/darkknight/jewelrycraft/api/Curse.java
+++ b/src/main/java/darkknight/jewelrycraft/api/Curse.java
@@ -10,6 +10,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import net.minecraftforge.event.world.BlockEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class Curse
 {
@@ -111,10 +113,12 @@ public class Curse
     
     public void entityDropItems(EntityPlayer player, Entity target, ArrayList<EntityItem> drops)
     {}
-    
+
+    @SideOnly(Side.CLIENT)
     public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event)
     {}
-    
+
+    @SideOnly(Side.CLIENT)
     public void playerHandRender(EntityPlayer player, RenderHandEvent event)
     {}
     
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
index 4716ff2..fbc3a88 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
@@ -1,6 +1,9 @@
 package darkknight.jewelrycraft.curses;
 
 import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.EntityLivingBase;
@@ -22,7 +25,6 @@ import darkknight.jewelrycraft.util.Variables;
 
 public class CurseInfamy extends Curse
 {
-    MaskRender mask = new MaskRender();
     public CurseInfamy(String name, int txtID, String pack)
     {
         super(name, txtID, pack);
@@ -45,6 +47,7 @@ public class CurseInfamy extends Curse
     @Override
     public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event)
     {
+        MaskRender mask = new MaskRender();
         float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * event.partialRenderTick;
         float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * event.partialRenderTick;
         float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * event.partialRenderTick;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
index 219c161..8597c6b 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
@@ -9,6 +9,9 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import darkknight.jewelrycraft.api.Curse;
 import darkknight.jewelrycraft.util.Variables;
 
@@ -23,9 +26,7 @@ public class CursePentagram extends Curse
     
     @Override
     public void attackedByPlayerAction(World world, EntityPlayer player, Entity target)
-    {
-        
-    }
+    {}
     
     @Override
     public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event)
diff --git a/src/main/java/darkknight/jewelrycraft/events/EventList.java b/src/main/java/darkknight/jewelrycraft/events/EventList.java
index 4b3fff4..4515ee1 100644
--- a/src/main/java/darkknight/jewelrycraft/events/EventList.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EventList.java
@@ -35,8 +35,8 @@ public class EventList
     public static void init(FMLInitializationEvent e)
     {
         GameRegistry.registerWorldGenerator(new Generation(), 0);
-        if (FMLCommonHandler.instance().getSide() == Side.CLIENT) FMLCommonHandler.instance().bus().register(new KeyBindings());
-        new GuiHandler();
+        JewelrycraftMod.proxy.init();
+        new GuiHandler(); 
         FMLCommonHandler.instance().bus().register(ConfigHandler.INSTANCE);
     }
     
diff --git a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
index 091b88b..d0b2661 100644
--- a/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
+++ b/src/main/java/darkknight/jewelrycraft/proxy/ClientProxy.java
@@ -6,14 +6,18 @@ import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.registry.VillagerRegistry;
+import cpw.mods.fml.relauncher.Side;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.client.InventoryTabVanilla;
 import darkknight.jewelrycraft.client.TabJewelry;
 import darkknight.jewelrycraft.client.TabRegistry;
+import darkknight.jewelrycraft.client.gui.GuiHandler;
 import darkknight.jewelrycraft.entities.EntityHalfHeart;
 import darkknight.jewelrycraft.entities.EntityHeart;
 import darkknight.jewelrycraft.entities.renders.HeartRender;
+import darkknight.jewelrycraft.events.KeyBindings;
 import darkknight.jewelrycraft.events.PlayerRenderHandler;
 import darkknight.jewelrycraft.events.ScreenHandler;
 import darkknight.jewelrycraft.item.ItemList;
@@ -85,6 +89,12 @@ public class ClientProxy extends CommonProxy
     }
     
     @Override
+    public void init()
+    {
+        FMLCommonHandler.instance().bus().register(new KeyBindings());
+    }
+    
+    @Override
     public void postInit()
     {
         JewelrycraftUtil.addStuff();        
diff --git a/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java b/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java
index 03ffdf6..358858d 100644
--- a/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java
+++ b/src/main/java/darkknight/jewelrycraft/proxy/CommonProxy.java
@@ -8,6 +8,9 @@ public class CommonProxy
     public void preInit()
     {}
     
+    public void init()
+    {}
+    
     public void postInit()
     {}
 }
\ No newline at end of file
diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java
index 71f5ab8..a019409 100644
--- a/src/main/java/darkknight/jewelrycraft/util/Variables.java
+++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java
@@ -6,7 +6,7 @@ public class Variables
 {
     public static final String MODID = "jewelrycraft2";
     public static final String MODNAME = "Jewelrycraft 2";
-    public static final String VERSION = "1.0.5";
+    public static final String VERSION = "1.0.6";
     public static final String PACKET_CHANNEL = "jewelrycraft2";
     
     public static final String CONFIG_GUI = "darkknight.jewelrycraft.config.ConfigGuiFactory";
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 8067b6f..7e7596f 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -4,7 +4,7 @@
     "modid": "jewelrycraft2",
     "name": "Jewelrycraft 2",
     "description": "Jewelrycraft 2 is a mod about creating jewellery and imbuing them with mystical powers. However, they have both positives and negatives. There are also curses, some good, some bad. Maybe acquiring some wouldn't be that bad.",
-    "version": "1.0.5",
+    "version": "1.0.6",
     "mcversion": "1.7.10",
     "url": "http://www.minecraftforum.net/forums/topic/2414865",
     "updateUrl": "",