1 files changed, 12 insertions, 31 deletions

diff --git a/src/Java/binnie/core/BinnieCore.java b/src/Java/binnie/core/BinnieCore.java
index 6f1ce219ef..e2dbc502e3 100644
--- a/src/Java/binnie/core/BinnieCore.java
+++ b/src/Java/binnie/core/BinnieCore.java
@@ -1,5 +1,12 @@
 package binnie.core;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraftforge.client.event.TextureStitchEvent;
 import binnie.Binnie;
 import binnie.core.block.MultipassBlockRenderer;
 import binnie.core.block.TileEntityMetadata;
@@ -8,15 +15,10 @@ import binnie.core.gui.BinnieGUIHandler;
 import binnie.core.gui.IBinnieGUID;
 import binnie.core.item.ItemFieldKit;
 import binnie.core.item.ItemGenesis;
-import binnie.core.item.ModuleItems;
-import binnie.core.liquid.FluidContainer;
-import binnie.core.liquid.ItemFluidContainer;
-import binnie.core.liquid.ManagerLiquid;
 import binnie.core.machines.MachineGroup;
 import binnie.core.machines.storage.ModuleStorage;
 import binnie.core.mod.config.ConfigurationMain;
 import binnie.core.mod.config.ConfigurationMods;
-import binnie.core.mod.config.ManagerConfig;
 import binnie.core.mod.parser.FieldParser;
 import binnie.core.mod.parser.ItemParser;
 import binnie.core.network.BinnieCorePacketID;
@@ -24,15 +26,11 @@ import binnie.core.network.BinniePacketHandler;
 import binnie.core.network.IPacketID;
 import binnie.core.proxy.BinnieProxy;
 import binnie.core.proxy.IBinnieProxy;
-import binnie.core.resource.ManagerResource;
 import binnie.core.triggers.ModuleTrigger;
 import binnie.craftgui.minecraft.ModuleCraftGUI;
-import com.mojang.authlib.GameProfile;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -42,20 +40,8 @@ import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import forestry.api.core.ForestryEvent.SpeciesDiscovered;
-import forestry.api.genetics.IAlleleSpecies;
-import forestry.api.genetics.IBreedingTracker;
-import forestry.plugins.PluginManager.Module;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.Item;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.management.ServerConfigurationManager;
-import net.minecraftforge.client.event.TextureStitchEvent.Pre;
+import forestry.api.core.ForestryEvent;
+import forestry.plugins.PluginManager;
 
 @Mod(modid="BinnieCore", name="Binnie Core", useMetadata=true)
 public final class BinnieCore
@@ -76,7 +62,7 @@ public final class BinnieCore
     }
     addModule(new ModuleCraftGUI());
     addModule(new ModuleStorage());
-    addModule(new ModuleItems());
+    //addModule(new ModuleItems());
     if (Loader.isModLoaded("BuildCraft|Silicon")) {
       addModule(new ModuleTrigger());
     }
@@ -103,11 +89,6 @@ public final class BinnieCore
   public void preInit()
   {
     instance = this;
-    for (FluidContainer container : FluidContainer.values())
-    {
-      Item item = new ItemFluidContainer(container);
-      GameRegistry.registerItem(item, item.getUnlocalizedName().substring(5));
-    }
     FieldParser.parsers.add(new ItemParser());
     
     super.preInit();
@@ -228,7 +209,7 @@ public final class BinnieCore
   public void handleTextureRemap(TextureStitchEvent.Pre event)
   {
     if (event.map.getTextureType() == 0) {
-      Binnie.Liquid.reloadIcons(event.map);
+      //Binnie.Liquid.reloadIcons(event.map);
     }
     Binnie.Resource.registerIcons(event.map, event.map.getTextureType());
   }
@@ -248,7 +229,7 @@ public final class BinnieCore
   {
     public PacketHandler()
     {
-      super();
+      super(instance);
     }
   }