cleanup && Packet handler work

src/dark/api/farm/ICropHandler.java

@@ -1,9 +1,8 @@
 package dark.api.farm;
 
-import dark.farmtech.machines.farmer.EntityFarmDrone;
-import universalelectricity.core.vector.Vector3;
-import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import universalelectricity.core.vector.Vector3;
+import dark.farmtech.machines.farmer.EntityFarmDrone;
 
 /** Special case handling for crops so the farm automatons know to do a few extra steps to care for
  * and harvest a crop block

src/dark/farmtech/FarmTech.java

@@ -11,7 +11,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.Configuration;
 import universalelectricity.prefab.TranslationHelper;
-import universalelectricity.prefab.network.PacketManager;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -24,26 +23,23 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
-import dark.api.farm.DecayMatterList;
 import dark.api.farm.CropAutomationHandler;
+import dark.api.farm.DecayMatterList;
 import dark.core.common.BlockRegistry;
-import dark.core.common.DarkMain;
 import dark.core.common.BlockRegistry.BlockData;
+import dark.core.common.DarkMain;
 import dark.core.prefab.ModPrefab;
 import dark.core.prefab.items.ItemBlockHolder;
 import dark.farmtech.blocks.BlockFarmSoil;
 
 @Mod(modid = FarmTech.MOD_ID, name = FarmTech.MOD_NAME, version = DarkMain.VERSION, dependencies = "after:DarkCore", useMetadata = true)
-@NetworkMod(channels = { FarmTech.CHANNEL }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
+@NetworkMod(clientSideRequired = true, serverSideRequired = false)
 public class FarmTech extends ModPrefab
 {
 
     public static final String MOD_ID = "FarmTech";
     public static final String MOD_NAME = "Farm Tech";
 
-    // @NetworkMod
-    public static final String CHANNEL = MOD_ID;
-
     @Metadata(FarmTech.MOD_ID)
     public static ModMetadata meta;
 

src/dark/farmtech/blocks/BlockFarmSoil.java

@@ -2,15 +2,14 @@ package dark.farmtech.blocks;
 
 import java.util.List;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Icon;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import dark.farmtech.FarmTech;
 
 /** Generic block set containing farm blocks: mulch, fertilizer, fertile dirt, mud

src/dark/farmtech/machines/BlockFT.java

@@ -4,7 +4,6 @@ import java.util.Set;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import net.minecraftforge.common.Configuration;
 import dark.core.prefab.BlockMachine;
 import dark.core.prefab.IExtraObjectInfo;

src/dark/farmtech/machines/TileEntityCompBox.java

@@ -4,14 +4,15 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeDirection;
 import dark.api.farm.DecayMatterList;
 import dark.core.interfaces.IInvBox;
+import dark.core.prefab.TileEntityMachine;
 import dark.core.prefab.invgui.InvChest;
 
 /** Simple box that turns matter into compost to grow plants with
- * 
+ *
  * 6 slot input stores output as an float that then need to be converted to a bucket of compost
- * 
+ *
  * @author DarkGuardsman */
-public class TileEntityCompBox extends TileEntityFT
+public class TileEntityCompBox extends TileEntityMachine
 {
     /** Allow undead parts to be compost */
     public static final boolean undeadCompost = false;
@@ -32,7 +33,7 @@ public class TileEntityCompBox extends TileEntityFT
     }
 
     /** Converts one item in the slot into compost
-     * 
+     *
      * @param slot 0-5 */
     public void process(int slot)
     {
@@ -48,7 +49,7 @@ public class TileEntityCompBox extends TileEntityFT
     }
 
     /** Tests if the item in the slot is read to be processed
-     * 
+     *
      * @param slot 0-5 */
     public boolean canProcess(int slot)
     {

src/dark/farmtech/machines/TileEntityFT.java

@@ -1,17 +0,0 @@
-package dark.farmtech.machines;
-
-import dark.core.prefab.TileEntityMachine;
-import dark.farmtech.FarmTech;
-
-/** Prefab class for all farm blocks to remove the need for some configuration of the super class
- * 
- * @author Darkguardsman */
-public abstract class TileEntityFT extends TileEntityMachine
-{
-    @Override
-    public String getChannel()
-    {
-        return FarmTech.CHANNEL;
-    }
-
-}

src/dark/farmtech/machines/farmer/CropHandlerCactus.java

@@ -1,8 +1,8 @@
 package dark.farmtech.machines.farmer;
 
-import universalelectricity.core.vector.Vector3;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import universalelectricity.core.vector.Vector3;
 
 public class CropHandlerCactus extends CropHandler
 {

src/dark/farmtech/machines/farmer/DroneTask.java

@@ -1,8 +1,5 @@
 package dark.farmtech.machines.farmer;
 
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
 import universalelectricity.core.vector.Vector3;
 
 public class DroneTask

src/dark/farmtech/machines/farmer/EntityFarmDrone.java

@@ -1,12 +1,12 @@
 package dark.farmtech.machines.farmer;
 
-import dark.core.prefab.helpers.ItemWorldHelper;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 import universalelectricity.core.block.IElectricalStorage;
 import universalelectricity.core.vector.Vector3;
+import dark.core.prefab.helpers.ItemWorldHelper;
 
 public class EntityFarmDrone extends EntityLiving implements IElectricalStorage
 {

src/dark/farmtech/machines/farmer/TileEntityFarmBox.java

@@ -1,10 +1,10 @@
 package dark.farmtech.machines.farmer;
 
 import universalelectricity.core.vector.Vector3;
-import dark.farmtech.machines.TileEntityFT;
+import dark.core.prefab.TileEntityMachine;
 import dark.farmtech.machines.farmer.EntityFarmDrone.DroneData;
 
-public class TileEntityFarmBox extends TileEntityFT
+public class TileEntityFarmBox extends TileEntityMachine
 {
     /** Current amount of drone slots this box has */
     private int droneSlots = 1;