Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-09-03 03:09:05 -04:00
parent dea9cad1ef
commit 66f7354652
9 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dark/api/farm/CropAutomationHandler.java
View file

@ -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

2
src/dark/api/farm/DecayMatterList.java
View file

@ -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
{

10
src/dark/farmtech/FarmTech.java
View file

@ -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)

7
src/dark/farmtech/item/ItemBucketCompost.java → src/dark/farmtech/item/ItemFarmBucket.java
View file

@ -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);

6
src/dark/farmtech/machines/BlockFT.java
View file

@ -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
*

4
src/dark/farmtech/machines/TileEntityCompBox.java
View file

@ -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
*

2
src/dark/farmtech/machines/TileEntityFT.java
View file

@ -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
*

6
src/dark/farmtech/machines/TileEntityMechCompBox.java
View file

@ -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

2
src/dark/farmtech/machines/farmer/EntityFarmDrone.java
View file

@ -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;