Major changes. Thanks domi for helping me with the chest linking ring :)

1 files changed, 35 insertions, 32 deletions

diff --git a/common/darkknight/jewelrycraft/JewelrycraftMod.java b/common/darkknight/jewelrycraft/JewelrycraftMod.java
index b4c9c9d..68d26ec 100644
--- a/common/darkknight/jewelrycraft/JewelrycraftMod.java
+++ b/common/darkknight/jewelrycraft/JewelrycraftMod.java
@@ -22,41 +22,42 @@ import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkMod.SidedPacketHandler;
 import cpw.mods.fml.common.network.Player;
 import cpw.mods.fml.common.registry.GameRegistry;
-import darkknight.jewelrycraft.block.BlockJewelrsCraftingTable;
 import darkknight.jewelrycraft.block.BlockList;
 import darkknight.jewelrycraft.client.JewelryCraftClient;
 import darkknight.jewelrycraft.config.ConfigHandler;
+import darkknight.jewelrycraft.container.GuiHandler;
 import darkknight.jewelrycraft.item.ItemList;
 import darkknight.jewelrycraft.lib.Reference;
 import darkknight.jewelrycraft.recipes.CraftingRecipes;
 import darkknight.jewelrycraft.server.JewelryCraftServer;
+import darkknight.jewelrycraft.util.JewelrycraftUtil;
 import darkknight.jewelrycraft.worldGen.Generation;
 
 @Mod(modid = Reference.MODID, name = Reference.MODNAME, version = Reference.VERSION)
 @NetworkMod(clientSideRequired = false, serverSideRequired = false,
-        clientPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = JewelryCraftClient.class),
-        serverPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = JewelryCraftServer.class),
-        connectionHandler = JewelrycraftMod.class)
+clientPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = JewelryCraftClient.class),
+serverPacketHandlerSpec = @SidedPacketHandler(channels = { Reference.PACKET_CHANNEL }, packetHandler = JewelryCraftServer.class),
+connectionHandler = JewelrycraftMod.class)
 public class JewelrycraftMod implements IConnectionHandler
 {
     @Instance(Reference.MODID)
     public static JewelrycraftMod instance;
-    
+
     @Metadata(Reference.MODID)
-    public static ModMetadata     metadata;
-    
+    public static ModMetadata metadata;
+
     @SidedProxy(clientSide = "darkknight.jewelrycraft.client.ClientProxy", serverSide = "darkknight.jewelrycraft.CommonProxy")
-    public static CommonProxy     proxy;
-    
-    public static CreativeTabs    jewelrycraft = new CreativeTabs("JewelryCraft")
-                                               {
-                                                   @Override
-                                                   public ItemStack getIconItemStack()
-                                                   {
-                                                       return new ItemStack(ItemList.shadowIngot, 1, 0);
-                                                   }
-                                               };
-    
+    public static CommonProxy proxy;
+
+    public static CreativeTabs jewelrycraft = new CreativeTabs("JewelryCraft")
+    {
+        @Override
+        public ItemStack getIconItemStack()
+        {
+            return new ItemStack(ItemList.ring, 1, 0);
+        }
+    };
+
     @EventHandler
     public void preInit(FMLPreInitializationEvent e)
     {
@@ -66,60 +67,62 @@ public class JewelrycraftMod implements IConnectionHandler
         CraftingRecipes.preInit(e);
         proxy.registerRenderers();
     }
-    
+
     @EventHandler
     public void init(FMLInitializationEvent e)
     {
         OreDictionary.registerOre("ingotShadow", new ItemStack(ItemList.shadowIngot));
         OreDictionary.registerOre("oreShadow", new ItemStack(BlockList.shadowOre));
         GameRegistry.registerWorldGenerator(new Generation());
+        new GuiHandler();
     }
-    
+
     @EventHandler
     public void postInit(FMLPostInitializationEvent e)
     {   
-        BlockJewelrsCraftingTable.addStuff();
+        JewelrycraftUtil.addStuff();
+        JewelrycraftUtil.jamcrafters();
     }
-    
+
     @Override
     // 2) Called when a player logs into the server SERVER SIDE
     public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
     {   
-        
+
     }
-    
+
     @Override
     // If you don't want the connection to continue, return a non-empty string here SERVER SIDE
     public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
     {
         return null;
     }
-    
+
     @Override
     // 1) Fired when a remote connection is opened CLIENT SIDE
     public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager)
     {   
-        
+
     }
-    
+
     @Override
     // 1) Fired when a local connection is opened CLIENT SIDE
     public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager)
     {   
-        
+
     }
-    
+
     @Override
     // Fired when a connection closes ALL SIDES
     public void connectionClosed(INetworkManager manager)
     {   
-        
+
     }
-    
+
     @Override
     // 3) Fired when the client established the connection to the server CLIENT SIDE
     public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
     {   
-        
+
     }
 }