From 66f735465233b075ff1154529ae655e8431f79fd Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Tue, 3 Sep 2013 03:09:05 -0400 Subject: [PATCH] Import changes --- src/dark/api/farm/CropAutomationHandler.java | 2 +- src/dark/api/farm/DecayMatterList.java | 2 +- src/dark/farmtech/FarmTech.java | 10 +++++----- .../{ItemBucketCompost.java => ItemFarmBucket.java} | 7 ++++--- src/dark/farmtech/machines/BlockFT.java | 6 +++--- src/dark/farmtech/machines/TileEntityCompBox.java | 4 ++-- src/dark/farmtech/machines/TileEntityFT.java | 2 +- src/dark/farmtech/machines/TileEntityMechCompBox.java | 6 +++--- src/dark/farmtech/machines/farmer/EntityFarmDrone.java | 2 +- 9 files changed, 21 insertions(+), 20 deletions(-) rename src/dark/farmtech/item/{ItemBucketCompost.java => ItemFarmBucket.java} (89%) diff --git a/src/dark/api/farm/CropAutomationHandler.java b/src/dark/api/farm/CropAutomationHandler.java index 00c84134..105c776a 100644 --- a/src/dark/api/farm/CropAutomationHandler.java +++ b/src/dark/api/farm/CropAutomationHandler.java @@ -3,7 +3,7 @@ package dark.api.farm; import java.util.HashMap; import net.minecraft.item.ItemStack; -import dark.prefab.helpers.Pair; +import dark.core.prefab.helpers.Pair; /** Tracks a list of all crops that can be auto farmed. Does some guessing on block to avoid having * each mod register all its crops diff --git a/src/dark/api/farm/DecayMatterList.java b/src/dark/api/farm/DecayMatterList.java index 62b461b0..287f88d5 100644 --- a/src/dark/api/farm/DecayMatterList.java +++ b/src/dark/api/farm/DecayMatterList.java @@ -3,7 +3,7 @@ package dark.api.farm; import java.util.HashMap; import net.minecraft.item.ItemStack; -import dark.prefab.helpers.Pair; +import dark.core.prefab.helpers.Pair; public class DecayMatterList { diff --git a/src/dark/farmtech/FarmTech.java b/src/dark/farmtech/FarmTech.java index 593acea2..c1ee33ee 100644 --- a/src/dark/farmtech/FarmTech.java +++ b/src/dark/farmtech/FarmTech.java @@ -26,12 +26,12 @@ 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.common.BlockRegistry; -import dark.common.DarkMain; -import dark.common.BlockRegistry.BlockData; +import dark.core.common.BlockRegistry; +import dark.core.common.DarkMain; +import dark.core.common.BlockRegistry.BlockData; +import dark.core.prefab.ModPrefab; +import dark.core.prefab.items.ItemBlockHolder; import dark.farmtech.blocks.BlockFarmSoil; -import dark.prefab.ModPrefab; -import dark.prefab.items.ItemBlockHolder; @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) diff --git a/src/dark/farmtech/item/ItemBucketCompost.java b/src/dark/farmtech/item/ItemFarmBucket.java similarity index 89% rename from src/dark/farmtech/item/ItemBucketCompost.java rename to src/dark/farmtech/item/ItemFarmBucket.java index 2e662d8a..e94a837a 100644 --- a/src/dark/farmtech/item/ItemBucketCompost.java +++ b/src/dark/farmtech/item/ItemFarmBucket.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; import cpw.mods.fml.relauncher.Side; @@ -14,11 +15,11 @@ import dark.farmtech.FarmTech; /** Bucket containing compost for farming * * @author DarkGuardsman */ -public class ItemBucketCompost extends Item +public class ItemFarmBucket extends ItemBucket { - public ItemBucketCompost(int itemID) + public ItemFarmBucket(int itemID, int blockID) { - super(FarmTech.CONFIGURATION.getItem("Bucket", itemID).getInt()); + super(FarmTech.CONFIGURATION.getItem("Bucket", itemID).getInt(), blockID); this.setCreativeTab(FarmTech.TabFarmTech); this.setHasSubtypes(true); this.setContainerItem(Item.bucketEmpty); diff --git a/src/dark/farmtech/machines/BlockFT.java b/src/dark/farmtech/machines/BlockFT.java index 9e0bf51e..dc54dbfc 100644 --- a/src/dark/farmtech/machines/BlockFT.java +++ b/src/dark/farmtech/machines/BlockFT.java @@ -6,10 +6,10 @@ 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; +import dark.core.prefab.helpers.Pair; import dark.farmtech.FarmTech; -import dark.prefab.BlockMachine; -import dark.prefab.IExtraObjectInfo; -import dark.prefab.helpers.Pair; /** Prefab class for all farm blocks to remove the need for some configuration of the super class * diff --git a/src/dark/farmtech/machines/TileEntityCompBox.java b/src/dark/farmtech/machines/TileEntityCompBox.java index 35d5f4aa..bb16b3e8 100644 --- a/src/dark/farmtech/machines/TileEntityCompBox.java +++ b/src/dark/farmtech/machines/TileEntityCompBox.java @@ -3,8 +3,8 @@ package dark.farmtech.machines; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeDirection; import dark.api.farm.DecayMatterList; -import dark.interfaces.IInvBox; -import dark.prefab.invgui.InvChest; +import dark.core.interfaces.IInvBox; +import dark.core.prefab.invgui.InvChest; /** Simple box that turns matter into compost to grow plants with * diff --git a/src/dark/farmtech/machines/TileEntityFT.java b/src/dark/farmtech/machines/TileEntityFT.java index 353175d0..ff5749ec 100644 --- a/src/dark/farmtech/machines/TileEntityFT.java +++ b/src/dark/farmtech/machines/TileEntityFT.java @@ -1,7 +1,7 @@ package dark.farmtech.machines; +import dark.core.prefab.TileEntityMachine; import dark.farmtech.FarmTech; -import dark.prefab.TileEntityMachine; /** Prefab class for all farm blocks to remove the need for some configuration of the super class * diff --git a/src/dark/farmtech/machines/TileEntityMechCompBox.java b/src/dark/farmtech/machines/TileEntityMechCompBox.java index d5ba5f2f..43dbe7ad 100644 --- a/src/dark/farmtech/machines/TileEntityMechCompBox.java +++ b/src/dark/farmtech/machines/TileEntityMechCompBox.java @@ -5,9 +5,9 @@ import java.util.List; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import dark.interfaces.INetworkEnergyPart; -import dark.prefab.tilenetwork.NetworkSharedPower; -import dark.prefab.tilenetwork.NetworkTileEntities; +import dark.core.interfaces.INetworkEnergyPart; +import dark.core.prefab.tilenetwork.NetworkSharedPower; +import dark.core.prefab.tilenetwork.NetworkTileEntities; /** Advanced version of the compBox that can link to other boxes and process matter at a higher rate. * Cost some minor power and will have some mechanical animation of flipping dirt & items diff --git a/src/dark/farmtech/machines/farmer/EntityFarmDrone.java b/src/dark/farmtech/machines/farmer/EntityFarmDrone.java index b70d798c..927674d8 100644 --- a/src/dark/farmtech/machines/farmer/EntityFarmDrone.java +++ b/src/dark/farmtech/machines/farmer/EntityFarmDrone.java @@ -1,6 +1,6 @@ package dark.farmtech.machines.farmer; -import dark.prefab.helpers.ItemWorldHelper; +import dark.core.prefab.helpers.ItemWorldHelper; import net.minecraft.entity.EntityLiving; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound;