More stuff. I don't even know by this point....

1 files changed, 5 insertions, 17 deletions

diff --git a/java/darkknight/jewelrycraft/JewelrycraftMod.java b/java/darkknight/jewelrycraft/JewelrycraftMod.java
index d984685..fd7058f 100644
--- a/java/darkknight/jewelrycraft/JewelrycraftMod.java
+++ b/java/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -10,13 +10,11 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Logger;
-import net.minecraft.client.Minecraft;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.OreDictionary;
@@ -37,9 +35,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 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.commands.JewelrycraftCommands;
 import darkknight.jewelrycraft.config.ConfigHandler;
 import darkknight.jewelrycraft.container.GuiHandler;
@@ -51,14 +46,13 @@ import darkknight.jewelrycraft.entities.EntityHeart;
 import darkknight.jewelrycraft.events.BucketHandler;
 import darkknight.jewelrycraft.events.EntityEventHandler;
 import darkknight.jewelrycraft.events.KeyBindings;
-import darkknight.jewelrycraft.events.PlayerRenderHandler;
-import darkknight.jewelrycraft.events.ScreenHandler;
 import darkknight.jewelrycraft.item.ItemList;
 import darkknight.jewelrycraft.lib.Reference;
 import darkknight.jewelrycraft.network.PacketClearColorCache;
 import darkknight.jewelrycraft.network.PacketKeyPressEvent;
 import darkknight.jewelrycraft.network.PacketRequestLiquidData;
 import darkknight.jewelrycraft.network.PacketRequestPlayerInfo;
+import darkknight.jewelrycraft.network.PacketSendCurseStats;
 import darkknight.jewelrycraft.network.PacketSendLiquidData;
 import darkknight.jewelrycraft.network.PacketSendPlayerInfo;
 import darkknight.jewelrycraft.recipes.CraftingRecipes;
@@ -90,6 +84,7 @@ public class JewelrycraftMod
     public static File liquidsConf;
     public static SimpleNetworkWrapper netWrapper;
     public static boolean fancyRender;
+    public static final int MAX_CURSES = 10;
     
     /**
      * Pre initialization of mod stuff.
@@ -116,15 +111,7 @@ public class JewelrycraftMod
         catch(Throwable e2){
             logger.severe("Error registering Jewelrycraft Structures with Vanilla Minecraft: this is expected in versions earlier than 1.7.10");
         }
-        TabRegistry.registerTab(new InventoryTabVanilla());
-        TabRegistry.registerTab(new TabJewelry());
         MinecraftForge.EVENT_BUS.register(new EntityEventHandler());
-        if (FMLCommonHandler.instance().getSide() == Side.CLIENT){
-            MinecraftForge.EVENT_BUS.register(new PlayerRenderHandler());
-            ResourceLocation jeweleryTexture = new ResourceLocation("jewelrycraft", "textures/gui/curses.png");
-            MinecraftForge.EVENT_BUS.register(new ScreenHandler(Minecraft.getMinecraft(), jeweleryTexture));
-            MinecraftForge.EVENT_BUS.register(new TabRegistry());
-        }
         MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
         BucketHandler.INSTANCE.buckets.put(BlockList.moltenMetal, ItemList.bucket);
         
@@ -136,7 +123,7 @@ public class JewelrycraftMod
         authorList.add("domi1819");
         
         dir = e.getModConfigurationDirectory();
-        proxy.registerRenderers();
+        proxy.preInit();
         netWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Reference.MODID);
         netWrapper.registerMessage(PacketRequestLiquidData.class, PacketRequestLiquidData.class, 0, Side.SERVER);
         netWrapper.registerMessage(PacketSendLiquidData.class, PacketSendLiquidData.class, 1, Side.CLIENT);
@@ -144,6 +131,7 @@ public class JewelrycraftMod
         netWrapper.registerMessage(PacketKeyPressEvent.class, PacketKeyPressEvent.class, 3, Side.SERVER);
         netWrapper.registerMessage(PacketRequestPlayerInfo.class, PacketRequestPlayerInfo.class, 4, Side.SERVER);
         netWrapper.registerMessage(PacketSendPlayerInfo.class, PacketSendPlayerInfo.class, 5, Side.CLIENT);
+        netWrapper.registerMessage(PacketSendCurseStats.class, PacketSendCurseStats.class, 6, Side.CLIENT);
         metadata.autogenerated = false;
         metadata.authorList = authorList;
         metadata.url = "https://github.com/sor1n/Jewelrycraft";
@@ -184,10 +172,10 @@ public class JewelrycraftMod
     public void postInit(FMLPostInitializationEvent e)
     {
         JewelrycraftUtil.addMetals();
-        JewelrycraftUtil.addStuff();
         JewelrycraftUtil.jamcrafters();
         EffectsList.postInit(e);
         DamageSourceList.postInit(e);
+        proxy.postInit();
     }
 
     @Mod.EventHandler