Made lots of changes

1 files changed, 19 insertions, 12 deletions

diff --git a/java/darkknight/jewelrycraft/JewelrycraftMod.java b/java/darkknight/jewelrycraft/JewelrycraftMod.java
index cabc36f..a7c0746 100644
--- a/java/darkknight/jewelrycraft/JewelrycraftMod.java
+++ b/java/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -14,16 +14,13 @@ import java.util.logging.Logger;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
@@ -40,14 +37,21 @@ import cpw.mods.fml.common.registry.VillagerRegistry;
 import cpw.mods.fml.relauncher.Side;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.config.ConfigHandler;
+import darkknight.jewelrycraft.container.ContainerJewelryTab;
 import darkknight.jewelrycraft.container.GuiHandler;
+import darkknight.jewelrycraft.container.JewelryInventory;
 import darkknight.jewelrycraft.events.BucketHandler;
 import darkknight.jewelrycraft.events.EntityEventHandler;
+import darkknight.jewelrycraft.events.KeyBindings;
+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.PacketSendLiquidData;
+import darkknight.jewelrycraft.network.PacketSendPlayerInfo;
 import darkknight.jewelrycraft.recipes.CraftingRecipes;
 import darkknight.jewelrycraft.util.JewelrycraftUtil;
 import darkknight.jewelrycraft.worldGen.Generation;
@@ -69,8 +73,6 @@ public class JewelrycraftMod
     
     public static final Logger logger = Logger.getLogger("Jewelrycraft");
     public static File dir;
-    // TODO Look at how you did in ChowTime for files
-    
     public static CreativeTabs jewelrycraft = new CreativeTabs("JewelryCraft")
     {
         @Override
@@ -79,14 +81,14 @@ public class JewelrycraftMod
             return Item.getItemFromBlock(BlockList.jewelCraftingTable);
         }
     };
-    public static CreativeTabs rings = new CreativeTabRings("Rings");
-    public static CreativeTabs necklaces = new CreativeTabNecklaces("Necklaces");
     public static CreativeTabs liquids = new CreativeTabLiquids("Liquids");
     public static NBTTagCompound saveData = new NBTTagCompound();
     public static NBTTagCompound clientData = new NBTTagCompound();
     public static File liquidsConf;
     
     public static SimpleNetworkWrapper netWrapper;
+    public static boolean fancyRender;
+    public static JewelryInventory jewelry = new JewelryInventory();
     
     @EventHandler
     public void preInit(FMLPreInitializationEvent e) throws IOException
@@ -107,35 +109,40 @@ public class JewelrycraftMod
         }
         catch (Throwable e2)
         {
-            logger.severe("Error registering Jewelrycraft Structures with Vanilla Minecraft: this is expected in versions earlier than 1.7.2");
+            logger.severe("Error registering Jewelrycraft Structures with Vanilla Minecraft: this is expected in versions earlier than 1.7.10");
         }
         MinecraftForge.EVENT_BUS.register(new EntityEventHandler());
+        if (FMLCommonHandler.instance().getSide() == Side.CLIENT) MinecraftForge.EVENT_BUS.register(new ScreenHandler(Minecraft.getMinecraft()));
         MinecraftForge.EVENT_BUS.register(BucketHandler.INSTANCE);
         BucketHandler.INSTANCE.buckets.put(BlockList.moltenMetal, ItemList.bucket);
         
-        proxy.registerRenderers();
         ModMetadata metadata = e.getModMetadata();
         
         List<String> authorList = new ArrayList<String>();
         authorList.add("DarkKnight (or sor1n)");
         authorList.add("bspkrs");
+        authorList.add("domi1819");
         dir = e.getModConfigurationDirectory();
+        proxy.registerRenderers();
         
         netWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Reference.MODID);
-        
         netWrapper.registerMessage(PacketRequestLiquidData.class, PacketRequestLiquidData.class, 0, Side.SERVER);
         netWrapper.registerMessage(PacketSendLiquidData.class, PacketSendLiquidData.class, 1, Side.CLIENT);
         netWrapper.registerMessage(PacketClearColorCache.class, PacketClearColorCache.class, 2, Side.CLIENT);
+        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);
         
         metadata.autogenerated = false;
         metadata.authorList = authorList;
-        metadata.url = "https://github.com/sor1n/Modjam-Mod";
+        metadata.url = "https://github.com/sor1n/Jewelrycraft";
     }
     
     @EventHandler
     public void init(FMLInitializationEvent e)
     {
         GameRegistry.registerWorldGenerator(new Generation(), 0);
+        if (FMLCommonHandler.instance().getSide() == Side.CLIENT) FMLCommonHandler.instance().bus().register(new KeyBindings());
         new GuiHandler();
     }