From 3edf03abd7c876b8f0ee25da766e02aaecc403a6 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Sun, 8 Sep 2013 05:16:41 -0400 Subject: [PATCH] cleanup && Packet handler work --- src/dark/api/farm/ICropHandler.java | 5 ++--- src/dark/farmtech/FarmTech.java | 10 +++------- src/dark/farmtech/blocks/BlockFarmSoil.java | 5 ++--- src/dark/farmtech/machines/BlockFT.java | 1 - .../farmtech/machines/TileEntityCompBox.java | 11 ++++++----- src/dark/farmtech/machines/TileEntityFT.java | 17 ----------------- .../machines/farmer/CropHandlerCactus.java | 2 +- .../farmtech/machines/farmer/DroneTask.java | 3 --- .../machines/farmer/EntityFarmDrone.java | 2 +- .../machines/farmer/TileEntityFarmBox.java | 4 ++-- 10 files changed, 17 insertions(+), 43 deletions(-) delete mode 100644 src/dark/farmtech/machines/TileEntityFT.java diff --git a/src/dark/api/farm/ICropHandler.java b/src/dark/api/farm/ICropHandler.java index 9c39a439..1b183a19 100644 --- a/src/dark/api/farm/ICropHandler.java +++ b/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 diff --git a/src/dark/farmtech/FarmTech.java b/src/dark/farmtech/FarmTech.java index 55b5cc42..5af22b6c 100644 --- a/src/dark/farmtech/FarmTech.java +++ b/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; diff --git a/src/dark/farmtech/blocks/BlockFarmSoil.java b/src/dark/farmtech/blocks/BlockFarmSoil.java index 19896cf7..2239573e 100644 --- a/src/dark/farmtech/blocks/BlockFarmSoil.java +++ b/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 diff --git a/src/dark/farmtech/machines/BlockFT.java b/src/dark/farmtech/machines/BlockFT.java index 50892446..a068cc77 100644 --- a/src/dark/farmtech/machines/BlockFT.java +++ b/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; diff --git a/src/dark/farmtech/machines/TileEntityCompBox.java b/src/dark/farmtech/machines/TileEntityCompBox.java index 3848450d..4a0109f0 100644 --- a/src/dark/farmtech/machines/TileEntityCompBox.java +++ b/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) { diff --git a/src/dark/farmtech/machines/TileEntityFT.java b/src/dark/farmtech/machines/TileEntityFT.java deleted file mode 100644 index 4bcfaa65..00000000 --- a/src/dark/farmtech/machines/TileEntityFT.java +++ /dev/null @@ -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; - } - -} diff --git a/src/dark/farmtech/machines/farmer/CropHandlerCactus.java b/src/dark/farmtech/machines/farmer/CropHandlerCactus.java index 1c23cc9c..1b18881f 100644 --- a/src/dark/farmtech/machines/farmer/CropHandlerCactus.java +++ b/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 { diff --git a/src/dark/farmtech/machines/farmer/DroneTask.java b/src/dark/farmtech/machines/farmer/DroneTask.java index 039799e8..432c9283 100644 --- a/src/dark/farmtech/machines/farmer/DroneTask.java +++ b/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 diff --git a/src/dark/farmtech/machines/farmer/EntityFarmDrone.java b/src/dark/farmtech/machines/farmer/EntityFarmDrone.java index ee0f8172..4da3fbd6 100644 --- a/src/dark/farmtech/machines/farmer/EntityFarmDrone.java +++ b/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 { diff --git a/src/dark/farmtech/machines/farmer/TileEntityFarmBox.java b/src/dark/farmtech/machines/farmer/TileEntityFarmBox.java index 3112551d..ac26c4e0 100644 --- a/src/dark/farmtech/machines/farmer/TileEntityFarmBox.java +++ b/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;