From 139544af3e39be0880d91099541b76e72dadb4d5 Mon Sep 17 00:00:00 2001 From: Henry Loenwind Date: Thu, 19 Mar 2015 14:34:56 +0100 Subject: [PATCH] Added bone meal support to farming station * 2 new slots for bone meal * Will try to use it on everything thats on the field and cannot be harvested * Different RF usage for successful and unsuccessfull tries * Fix: Output slots no longer accept seeds * Fix: "Only one tool per slot" policy works again --- .../enderio/textures/gui/farmStation.png | Bin 5431 -> 5771 bytes .../crazypants/enderio/config/Config.java | 7 + .../machine/farm/FarmStationContainer.java | 6 +- .../machine/farm/PacketFarmAction.java | 5 + .../enderio/machine/farm/TileFarmStation.java | 129 ++++++++++++------ .../enderio/tool/ArrayMappingTool.java | 38 ++++++ 6 files changed, 140 insertions(+), 45 deletions(-) create mode 100644 src/main/java/crazypants/enderio/tool/ArrayMappingTool.java diff --git a/resources/assets/enderio/textures/gui/farmStation.png b/resources/assets/enderio/textures/gui/farmStation.png index e978b6069a8d8e38cf2ab3b9b0f4070b8f1b8ade..a356c16880d6f45016de0d9f9344e969b153446d 100644 GIT binary patch literal 5771 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 + this.coords.add(bc); + } + @Override public void toBytes(ByteBuf buffer) { int size = coords.size(); diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 51b4d352..3ea6ca81 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -9,6 +9,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -31,11 +32,14 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.tool.ArrayMappingTool; import crazypants.util.BlockCoord; import crazypants.util.Lang; public class TileFarmStation extends AbstractPoweredTaskEntity { + private static final int TICKS_PER_WORK = 20; + public enum ToolType { HOE { @Override @@ -66,6 +70,12 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { boolean match(ItemStack item) { return item.getItem() instanceof ItemShears; } + }, + NONE { + @Override + boolean match(ItemStack item) { + return false; + } }; public final boolean itemMatches(ItemStack item) { @@ -90,6 +100,15 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } return false; } + + public static ToolType getToolType(ItemStack stack) { + for (ToolType type : values()) { + if (type.itemMatches(stack)) { + return type; + } + } + return NONE; + } } public static final String NOTIFICATION_NO_HOE = "noHoe"; @@ -99,13 +118,20 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { private BlockCoord lastScanned; private EntityPlayerMP farmerJoe; + public static final int NUM_TOOL_SLOTS = 3; + private static final int minToolSlot = 0; - private static final int maxToolSlot = 2; + private static final int maxToolSlot = -1 + NUM_TOOL_SLOTS; + + public static final int NUM_FERTILIZER_SLOTS = 2; + + public static final int minFirtSlot = maxToolSlot + 1; + public static final int maxFirtSlot = maxToolSlot + NUM_FERTILIZER_SLOTS; public static final int NUM_SUPPLY_SLOTS = 4; - public static final int minSupSlot = maxToolSlot + 1; - public static final int maxSupSlot = maxToolSlot + NUM_SUPPLY_SLOTS; + public static final int minSupSlot = maxFirtSlot + 1; + public static final int maxSupSlot = maxFirtSlot + NUM_SUPPLY_SLOTS; private final BitSet lockedSlots = new BitSet(); @@ -117,7 +143,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { private boolean wasActive; public TileFarmStation() { - super(new SlotDefinition(7, 6, 1)); + super(new SlotDefinition(9, 6, 1)); } public int getFarmSize() { @@ -321,21 +347,21 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } if(i <= maxToolSlot) { if (ToolType.isTool(stack)) { - int otherSlot = i == minToolSlot ? maxToolSlot : minToolSlot; - if (inventory[otherSlot] == null) { - return true; - } else { // let's make sure there's not one of this type in here already - for (ToolType type : ToolType.values()) { - if (type.itemMatches(inventory[otherSlot]) && type.itemMatches(stack)) { - return false; - } + for (int j = minToolSlot; j <= maxToolSlot; j++) { + if (ToolType.getToolType(stack).itemMatches(inventory[j])) { + return false; } - return true; } + return true; } return false; + } else if (i <= maxFirtSlot) { + return stack.getItem() == Items.dye && stack.getItemDamage() == 15; + } else if (i <= maxSupSlot) { + return (inventory[i] != null || !isSlotLocked(i)) && FarmersCommune.instance.canPlant(stack); + } else { + return false; } - return (inventory[i] != null || !isSlotLocked(i)) && FarmersCommune.instance.canPlant(stack); } @Override @@ -376,7 +402,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { protected void doTick() { - if (sendNotification && shouldDoWorkThisTick(20)) { + if (sendNotification && shouldDoWorkThisTick(TICKS_PER_WORK)) { sendNotification = false; sendNotification(); } @@ -424,23 +450,50 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { if(!isOpen(bc)) { IHarvestResult harvest = FarmersCommune.instance.harvestBlock(this, bc, block, meta); - if(harvest != null) { - if(harvest.getDrops() != null) { - PacketFarmAction pkt = new PacketFarmAction(harvest.getHarvestedBlocks()); - PacketHandler.INSTANCE.sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); - for (EntityItem ei : harvest.getDrops()) { - if(ei != null) { - insertHarvestDrop(ei, bc); - if(!ei.isDead) { - worldObj.spawnEntityInWorld(ei); - } + if(harvest != null && harvest.getDrops() != null) { + PacketFarmAction pkt = new PacketFarmAction(harvest.getHarvestedBlocks()); + PacketHandler.INSTANCE.sendToAllAround(pkt, new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); + for (EntityItem ei : harvest.getDrops()) { + if(ei != null) { + insertHarvestDrop(ei, bc); + if(!ei.isDead) { + worldObj.spawnEntityInWorld(ei); } } } + } else if (!isOpen(bc) && hasBonemeal() && bonemealCooldown-- <= 0) { + // there's a block and it did not produce harvest. Try bonemealing it + if (inventory[minFirtSlot].getItem().onItemUse(inventory[minFirtSlot], farmerJoe, worldObj, bc.x, bc.y, bc.z, 1, 0.5f, 0.5f, 0.5f)) { + worldObj.playAuxSFX(2005, bc.x, bc.y, bc.z, 0); + PacketHandler.INSTANCE.sendToAllAround(new PacketFarmAction(bc), new TargetPoint(worldObj.provider.dimensionId, bc.x, bc.y, bc.z, 64)); + if (inventory[minFirtSlot].stackSize == 0) { + inventory[minFirtSlot] = null; + } + bonemealCooldown = 5; + usePower(Config.farmBonemealActionEnergyUseRF); + } else { + usePower(Config.farmBonemealTryEnergyUseRF); + } } } } + private int bonemealCooldown = 5; // no need to persist this + + private boolean hasBonemeal() { + if (inventory[minFirtSlot] != null) { + return true; + } + for (int i = minFirtSlot + 1; i <= maxFirtSlot; i++) { + if (inventory[i] != null) { + inventory[minFirtSlot] = inventory[i]; + inventory[i] = null; + return true; + } + } + return false; + } + private boolean isOutputFull() { for (int i = slotDefinition.minOutputSlot; i <= slotDefinition.maxOutputSlot; i++) { ItemStack curStack = inventory[i]; @@ -673,24 +726,12 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { lockedSlots.set(i); } int slotLayoutVersion = nbtRoot.getInteger("slotLayoutVersion"); - if (slotLayoutVersion < 1) { - // update from v0 (2+4+4+1) to v1 (3+4+4+1) by moving in+out+cap one back - for (int i = (3+4+4+1) - 2; i >= 2; i--) { - if (inventory[i+1] == null) { - // Should always be true, but better safe than deleting items - inventory[i+1] = inventory[i]; - inventory[i] = null; - } - } - slotLayoutVersion = 1; - } - if (slotLayoutVersion < 2) { - // update from v1 (3+4+4+1) to v2 (3+4+6+1) by moving cap to new position - if (inventory[(3+4+6+1)-1] == null) { - inventory[(3+4+6+1)-1] = inventory[(3+4+4+1)-1]; - inventory[(3+4+4+1)-3] = null; - } - slotLayoutVersion = 2; + if (slotLayoutVersion == 0) { + inventory = (new ArrayMappingTool("TTSSSSOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); + } else if (slotLayoutVersion == 1) { + inventory = (new ArrayMappingTool("TTTSSSSOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); + } else if (slotLayoutVersion == 2) { + inventory = (new ArrayMappingTool("TTTSSSSOOOOOOC", "TTTBBSSSSOOOOOOC")).map(inventory); } } @@ -714,7 +755,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } nbtRoot.setIntArray("lockedSlots", locked); } - nbtRoot.setInteger("slotLayoutVersion", 2); + nbtRoot.setInteger("slotLayoutVersion", 3); } } diff --git a/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java b/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java new file mode 100644 index 00000000..6233cc8c --- /dev/null +++ b/src/main/java/crazypants/enderio/tool/ArrayMappingTool.java @@ -0,0 +1,38 @@ +package crazypants.enderio.tool; + +import java.lang.reflect.Array; +import java.util.Arrays; + +import crazypants.enderio.machine.AbstractMachineEntity; + +public class ArrayMappingTool { + + private final byte[] from_mapping; + private final byte[] to_mapping; + + public ArrayMappingTool(String from_mapping, String to_mapping) { + this.from_mapping = from_mapping.getBytes(); + this.to_mapping = to_mapping.getBytes(); + } + + private T getNextT(T[] in, byte what) { + for (int i = 0; i < from_mapping.length; i++) { + if (from_mapping[i] == what && in[i] != null) { + T result = in[i]; + in[i] = null; + return result; + } + } + return null; + } + + public T[] map(T[] in) { + T[] in_tmp = in.clone(); + T[] out = (T[]) Array.newInstance(in.getClass().getComponentType(), to_mapping.length); + for (int i = 0; i < to_mapping.length; i++) { + out[i] = getNextT(in_tmp, to_mapping[i]); + } + return out; + } + +}