From a79ae8b0d3075a32ba53795cccb30ec1f82ccb6b Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Tue, 10 Feb 2015 17:10:11 +0100 Subject: [PATCH] Farming station can utilize shears * Farming stations will use shears if available and there are enough sapling in store * Otherwise they will break the leaves with the axe * Third tool slot was added for the shears * Old inventories will be adapted automagically * GUI texture is still missing Added GUI texture * GUI texture with third slot for shears * Fixed slot positioning Fixed transparency --- .../enderio/textures/gui/farmStation.png | Bin 66812 -> 4397 bytes .../machine/farm/FarmStationContainer.java | 8 +- .../enderio/machine/farm/TileFarmStation.java | 93 +++++++++++------- .../machine/farm/farmers/TreeFarmer.java | 38 +++++-- 4 files changed, 94 insertions(+), 45 deletions(-) diff --git a/resources/assets/enderio/textures/gui/farmStation.png b/resources/assets/enderio/textures/gui/farmStation.png index 125e2aead93de32cd4f76d482ee8fa65d595e1d4..84a0c754886f545cc711351aa10b19e996e13811 100644 GIT binary patch literal 4397 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 Kn}6@T82>*`KVgRe diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java index 62cca78d..890be780 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmStationContainer.java @@ -17,8 +17,10 @@ public class FarmStationContainer extends AbstractMachineContainer { protected void addMachineSlots(InventoryPlayer playerInv) { Point[] points = new Point[] { - new Point(53, 12), - new Point(71, 12), + new Point(44, 12), + new Point(62, 12), + new Point(80, 12), + new Point(53, 37), new Point(71, 37), new Point(53, 55), @@ -42,7 +44,7 @@ public class FarmStationContainer extends AbstractMachineContainer { @Override public int getSlotStackLimit() { - if(slot > 1 && slot < 6) { + if(slot > 2 && slot < 7) { int tier = ((TileFarmStation)tileEntity).tier; return (int) (16 * Math.pow(2, tier)); } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 76474002..0ed271c1 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.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; @@ -35,7 +36,7 @@ import crazypants.util.Lang; public class TileFarmStation extends AbstractPoweredTaskEntity { public enum ToolType { - HOE { + HOE { @Override boolean match(ItemStack item) { for (ItemStack stack : Config.farmHoes) { @@ -46,10 +47,14 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return false; } }, - - AXE { boolean match(ItemStack item) { return item.getItem().getHarvestLevel(item, "axe") >= 0; }}, - TREETAP { boolean match(ItemStack item) { return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap;}}; - + + AXE { @Override + boolean match(ItemStack item) { return item.getItem().getHarvestLevel(item, "axe") >= 0; }}, + TREETAP { @Override + boolean match(ItemStack item) { return item.getItem().getClass() == RubberTreeFarmerIC2.treeTap; }}, + SHEARS { @Override + boolean match(ItemStack item) { return item.getItem() instanceof ItemShears; }}; + public final boolean itemMatches(ItemStack item) { if (item == null) { return false; @@ -73,20 +78,20 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return false; } } - + public static final String NOTIFICATION_NO_HOE = "noHoe"; public static final String NOTIFICATION_NO_AXE = "noAxe"; public static final String NOTIFICATION_NO_SEEDS = "noSeeds"; - + private BlockCoord lastScanned; private EntityPlayerMP farmerJoe; private static final int minToolSlot = 0; - private static final int maxToolSlot = 1; + private static final int maxToolSlot = 2; public static final int minSupSlot = maxToolSlot + 1; public static final int maxSupSlot = minSupSlot + 4; - + private final BitSet lockedSlots = new BitSet(); private final int upgradeBonusSize = 2; @@ -99,8 +104,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { public boolean sendNotification = false; public TileFarmStation() { - super(new SlotDefinition(6, 4, 1)); - setCapacitor(Capacitors.BASIC_CAPACITOR); + super(new SlotDefinition(7, 4, 1)); + setCapacitor(Capacitors.BASIC_CAPACITOR); } public int getFarmSize() { @@ -166,6 +171,10 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return hasTool(ToolType.AXE); } + public boolean hasShears() { + return hasTool(ToolType.SHEARS); + } + public int getAxeLootingValue() { ItemStack tool = getTool(ToolType.AXE); if(tool == null) { @@ -182,6 +191,10 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { damageTool(ToolType.HOE, null, bc, i); } + public void damageShears(Block blk, BlockCoord bc) { + damageTool(ToolType.SHEARS, blk, bc, 1); + } + public boolean hasTool(ToolType type){ return getTool(type) != null; } @@ -207,14 +220,14 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return; } boolean canDamage = canDamage(tool); - if(type == ToolType.AXE) { - tool.getItem().onBlockDestroyed(tool, worldObj, blk, bc.x, bc.y, bc.z, farmerJoe); + if(type == ToolType.AXE) { + tool.getItem().onBlockDestroyed(tool, worldObj, blk, bc.x, bc.y, bc.z, farmerJoe); } else if(type == ToolType.HOE) { int origDamage = tool.getItemDamage(); tool.getItem().onItemUse(tool, farmerJoe, worldObj, bc.x, bc.y, bc.z, 1, 0.5f, 0.5f, 0.5f); if(origDamage == tool.getItemDamage() && canDamage) { tool.damageItem(1, farmerJoe); - } + } } else if(canDamage) { tool.damageItem(1, farmerJoe); } @@ -223,9 +236,9 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { destroyTool(type); } } - + private boolean canDamage(ItemStack stack) { - return stack != null && stack.isItemStackDamageable() && stack.getItem().isDamageable(); + return stack != null && stack.isItemStackDamageable() && stack.getItem().isDamageable(); } private void destroyTool(ToolType type) { @@ -265,7 +278,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return block.isAir(worldObj, bc.x, bc.y, bc.z) || block.isReplaceable(worldObj, bc.x, bc.y, bc.z); } - public void setNotification(String unloc) { + public void setNotification(String unloc) { String newNote = Lang.localize("farm.note." + unloc); if(!newNote.equals(notification)) { notification = newNote; @@ -283,7 +296,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { public boolean hasNotification() { return !"".equals(notification); } - + private void sendNotification() { PacketHandler.INSTANCE.sendToAll(new PacketUpdateNotification(this, notification)); } @@ -294,7 +307,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return false; } if(i <= maxToolSlot) { - if (ToolType.isTool(stack)) { + if (ToolType.isTool(stack)) { int otherSlot = i == minToolSlot ? maxToolSlot : minToolSlot; if (inventory[otherSlot] == null) { return true; @@ -319,23 +332,23 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } return false; } - + protected boolean canTick(boolean redstoneChecksPassed) { if(worldObj.getTotalWorldTime() % 2 != 0) { return false; - } + } if(getEnergyStored() < getPowerUsePerTick()) { setNotification("noPower"); return false; - } + } if(redstoneChecksPassed) { usePower(); - } + } int curScaled = getProgressScaled(16); if(curScaled != lastProgressScaled) { sendTaskProgressPacket(); lastProgressScaled = curScaled; - } + } return true; } @@ -344,8 +357,8 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { if (sendNotification && worldObj.getTotalWorldTime() % 20 == 0) { sendNotification = false; sendNotification(); - } - + } + if(!hasPower() && Config.farmActionEnergyUseRF > 0 && Config.farmAxeActionEnergyUseRF > 0) { setNotification("noPower"); return; @@ -371,7 +384,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { if(farmerJoe == null) { farmerJoe = new FakeFarmPlayer(MinecraftServer.getServer().worldServerForDimension(worldObj.provider.dimensionId)); } - + if(isOpen(bc)) { FarmersCommune.instance.prepareBlock(this, bc, block, meta); block = worldObj.getBlock(bc.x, bc.y, bc.z); @@ -381,7 +394,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { setNotification("outputFull"); return; } - + if(!hasPower() && Config.farmActionEnergyUseRF > 0 && Config.farmAxeActionEnergyUseRF > 0) { setNotification("noPower"); return; @@ -422,6 +435,12 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { return inv != null && (inv.stackSize > 1 || !isSlotLocked(slot)) && inv.isItemEqual(seeds); } + public boolean needSeeds(BlockCoord bc) { + int slot = getSupplySlotForCoord(bc); + ItemStack inv = inventory[slot]; + return (inv == null || (inv.stackSize < 8)); + } + public ItemStack takeSeedFromSupplies(ItemStack stack, BlockCoord forBlock) { return takeSeedFromSupplies(stack, forBlock, true); } @@ -437,10 +456,10 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { if (inv.stackSize <= 1 && isSlotLocked(slot)) { return null; } - + ItemStack result = inv.copy(); result.stackSize = 1; - + inv = inv.copy(); inv.stackSize--; if(inv.stackSize == 0) { @@ -546,7 +565,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } return new BlockCoord(nextX, lastScanned.y, nextZ); } - + public void toggleLockedState(int slot) { if (worldObj.isRemote) { PacketHandler.INSTANCE.sendToServer(new PacketFarmLockedSlot(this, slot)); @@ -583,7 +602,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { super.setCapacitor(capacitorType); tier = capacitorType.ordinal(); currentTask = createTask(); - + int ppt = getPowerUsePerTick(); switch (capacitorType.ordinal()) { case 1: @@ -598,7 +617,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } if(getEnergyStored() > getMaxEnergyStored()) { setEnergyStored(getMaxEnergyStored()); - } + } } @Override @@ -624,6 +643,13 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { for (int i : nbtRoot.getIntArray("lockedSlots")) { lockedSlots.set(i); } + int slotLayoutVersion = nbtRoot.getInteger("slotLayoutVersion"); + if (slotLayoutVersion < 1) { + for (int i = 9; i >= 2; i--) { + inventory[i+1] = inventory[i]; + } + inventory[2] = null; + } } IPoweredTask createTask() { @@ -646,6 +672,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { } nbtRoot.setIntArray("lockedSlots", locked); } + nbtRoot.setInteger("slotLayoutVersion", 1); } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java index 2949d2fe..f1c8d848 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeFarmer.java @@ -12,6 +12,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.IShearable; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.config.Config; import crazypants.enderio.machine.farm.TileFarmStation; @@ -111,31 +112,50 @@ public class TreeFarmer implements IFarmerJoe { Collections.sort(res.harvestedBlocks, comp); List actualHarvests = new ArrayList(); + + boolean needSeeds = farm.needSeeds(bc); // avoid calling these in a loop + boolean hasSheards = farm.hasShears(); for (int i = 0; i < res.harvestedBlocks.size() && farm.hasAxe(); i++) { BlockCoord coord = res.harvestedBlocks.get(i); Block blk = farm.getBlock(coord); - ArrayList drops = blk.getDrops(farm.getWorldObj(), bc.x, bc.y, bc.z, farm.getBlockMeta(coord), farm.getAxeLootingValue()); + ArrayList drops; + boolean wasSheared = false; + boolean wasAxed = false; + boolean wasWood = isWood(blk); + + if (blk instanceof IShearable && hasSheards && !needSeeds) { + drops = ((IShearable)blk).onSheared(null, farm.getWorldObj(), bc.x, bc.y, bc.z, 0); + wasSheared = true; + } else { + drops = blk.getDrops(farm.getWorldObj(), bc.x, bc.y, bc.z, farm.getBlockMeta(coord), farm.getAxeLootingValue()); + wasAxed = true; + } + if(drops != null) { for (ItemStack drop : drops) { res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, drop.copy())); } } - boolean isWood = true; - if(!isWood(blk)) { //leaves - isWood = Config.farmAxeDamageOnLeafBreak; + + if (wasAxed && !wasWood) { + wasAxed = Config.farmAxeDamageOnLeafBreak; int leaveMeta = farm.getBlockMeta(coord); if(TreeHarvestUtil.canDropApples(blk, leaveMeta)) { if(farm.getWorldObj().rand.nextInt(200) == 0) { res.drops.add(new EntityItem(farm.getWorldObj(), bc.x + 0.5, bc.y + 0.5, bc.z + 0.5, new ItemStack(Items.apple))); } - } - } - farm.actionPerformed(isWood); - if(isWood) { - farm.damageAxe(blk, coord); + } } + + farm.actionPerformed(wasWood || wasSheared); + if(wasAxed) { + farm.damageAxe(blk, coord); + } else if (wasSheared) { + farm.damageShears(blk, coord); + } + farm.getWorldObj().setBlockToAir(coord.x, coord.y, coord.z); actualHarvests.add(coord); }