tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

UpdatedToNewForgeVersion

Browse source
This commit is contained in:
DarkGuardsman 2013-09-23 12:10:11 -04:00
parent c0b488795e
commit 0f760d5ea1
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,9 @@ package dark.api.farm;
import java.util.HashMap;
import com.builtbroken.common.Pair;
import net.minecraft.item.ItemStack;
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

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

@ -2,8 +2,9 @@ package dark.api.farm;
import java.util.HashMap;
import com.builtbroken.common.Pair;
import net.minecraft.item.ItemStack;
import dark.core.prefab.helpers.Pair;
public class DecayMatterList
{

4
src/dark/farmtech/item/ItemFarmBucket.java
View file

@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import dark.farmtech.FarmTech;
/** Bucket containing compost for farming
*
*
* @author DarkGuardsman */
public class ItemFarmBucket extends ItemBucket
{
@ -24,7 +24,7 @@ public class ItemFarmBucket extends ItemBucket
this.setHasSubtypes(true);
this.setContainerItem(Item.bucketEmpty);
this.setUnlocalizedName("farmBucket");
this.func_111206_d(FarmTech.instance.PREFIX + "farmBucket");
this.setTextureName(FarmTech.instance.PREFIX + "farmBucket");
}
@Override

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

@ -85,11 +85,11 @@ public class EntityFarmDrone extends EntityLiving implements IElectricalStorage
}
/** Adds an item to the drones inventory or drops it on the ground if the drone is full
*
*
* @param location - location were the item was so to drop it there if the drone can't pick it
* up
* @param stack - stack to store or drop
*
*
* @return the itemstack if any of it is left */
public ItemStack pickUpItem(Vector3 location, ItemStack stack, boolean drop)
{
@ -167,7 +167,7 @@ public class EntityFarmDrone extends EntityLiving implements IElectricalStorage
}
/** Used to store data on a drone. Mainly for saving the drone when stored in a tileEntity
*
*
* @author DarkGuardsman */
public static class DroneData
{
@ -185,7 +185,7 @@ public class EntityFarmDrone extends EntityLiving implements IElectricalStorage
public DroneData getDroneData(EntityFarmDrone drone)
{
this.health = drone.func_110143_aJ();
this.health = drone.getHealth();
this.energy = drone.energy;
this.inv = drone.inv;
return this;