From 78109e2b7d3115f9aae47ecf4414108409e10d3a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 19 Jun 2014 14:05:29 -0400 Subject: [PATCH] Farm upgrades. Fix some power display bugs. Fix CME in Crafter. --- .../enderio/textures/gui/farmStation.png | Bin 3345 -> 66812 bytes .../machine/AbstractMachineEntity.java | 5 +- .../enderio/machine/SlotDefinition.java | 4 +- .../enderio/machine/crafter/TileCrafter.java | 15 +++--- .../enderio/machine/farm/GuiFarmStation.java | 6 --- .../enderio/machine/farm/TileFarmStation.java | 44 +++++++++++++----- 6 files changed, 44 insertions(+), 30 deletions(-) diff --git a/resources/assets/enderio/textures/gui/farmStation.png b/resources/assets/enderio/textures/gui/farmStation.png index b6047d5352eb13b07109edb43295d3ba3a6300cd..c40da4233e4d67520a9e2cab057da311176c5d3d 100644 GIT binary patch literal 66812 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 0 ? numInputs : -10; this.maxOutputSlot = minOutputSlot + (numOutputs - 1); - this.minUpgradeSlot = -1; - this.maxUpgradeSlot = -1; + this.minUpgradeSlot = numUpgradeSlots > 0 ? numInputs + numOutputs : -1; + this.maxUpgradeSlot = minUpgradeSlot + (numUpgradeSlots - 1); } public SlotDefinition(int numInputs, int numOutputs) { diff --git a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java index 150ab5b4..4c6c8529 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/TileCrafter.java @@ -1,9 +1,7 @@ package crazypants.enderio.machine.crafter; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -21,12 +19,12 @@ public class TileCrafter extends AbstractMachineEntity { DummyCraftingGrid craftingGrid = new DummyCraftingGrid(); - private Set containerItems; + private List containerItems; public TileCrafter() { super(new SlotDefinition(9, 1)); - containerItems = new HashSet(); + containerItems = new ArrayList(); } @Override @@ -67,12 +65,13 @@ public class TileCrafter extends AbstractMachineEntity { // process buffered container items if(!containerItems.isEmpty()) { - for(ItemStack i : containerItems) { + for(int i = 0; i < containerItems.size(); i++) { + ItemStack stack = containerItems.get(i); if(inventory[9] == null) { - inventory[9] = i; + inventory[9] = stack; containerItems.remove(i); - } else if(ItemStack.areItemStacksEqual(inventory[9], i) && inventory[9].stackSize + i.stackSize <= inventory[9].getMaxStackSize()) { - inventory[9].stackSize += i.stackSize; + } else if(ItemStack.areItemStacksEqual(inventory[9], stack) && inventory[9].stackSize + stack.stackSize <= inventory[9].getMaxStackSize()) { + inventory[9].stackSize += stack.stackSize; containerItems.remove(i); } } diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index 13f1fa30..7de43a57 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -29,10 +29,4 @@ public class GuiFarmStation extends GuiMachineBase { protected boolean showRecipeButton() { return false; } - @Override - protected int getPowerHeight() { - return 57; - } - - } diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index a787ad27..3d1da98f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -45,19 +45,21 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt private int minSupSlot = maxToolSlot + 1; private int maxSupSlot = minSupSlot + 4; + + private final int upgradeBonusSize = 2; private static final DummyTask TASK = new DummyTask(); private ICapacitor cap = new BasicCapacitor(200,25000); public TileFarmStation() { - super(new SlotDefinition(6, 4, 0)); + super(new SlotDefinition(6, 4, 1)); currentTask = TASK; powerHandler = PowerHandlerUtil.createHandler(cap, this, Type.MACHINE); } public int getFarmSize() { - return farmSize; + return farmSize + getUpgradeDist(); } public void setFarmSize(int farmSize) { @@ -65,7 +67,7 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt } public void actionPerformed() { - usePower(Config.farmActionEnergyUse); + usePower(Config.farmActionEnergyUse * (getUpgradeDist() * upgradeBonusSize)); } public int getMaxLootingValue() { @@ -80,6 +82,15 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt } return result; } + + private int getUpgradeDist() { + int upg = slotDefinition.getMaxUpgradeSlot(); + if (inventory[upg] == null) { + return 0; + } else { + return upgradeBonusSize * inventory[upg].getItemDamage(); + } + } public void damageMaxLootingItem(int damage, BlockCoord bc, Block block) { int maxLooting = -1; @@ -363,18 +374,20 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt private BlockCoord getNextCoord() { + int size = getFarmSize(); + BlockCoord loc = getLocation(); if(lastScanned == null) { - lastScanned = new BlockCoord(loc.x - farmSize, loc.y, loc.z - farmSize); + lastScanned = new BlockCoord(loc.x - size, loc.y, loc.z - size); return lastScanned; } int nextX = lastScanned.x + 1; int nextZ = lastScanned.z; - if(nextX > loc.x + farmSize) { - nextX = loc.x - farmSize; + if(nextX > loc.x + size) { + nextX = loc.x - size; nextZ += 1; - if(nextZ > loc.z + farmSize) { + if(nextZ > loc.z + size) { lastScanned = null; return getNextCoord(); } @@ -404,13 +417,20 @@ public class TileFarmStation extends AbstractPoweredTaskEntity /*implements IEnt @Override public void setCapacitor(Capacitors capacitorType) { - //no support for capacitor upgrades -// powerHandler = PowerHandlerUtil.createHandler(cap, this, Type.MACHINE); -// powerHandler.setEnergy(storedEnergy); + switch(capacitorType.ordinal()) { + case 1: + cap = new BasicCapacitor(400,50000); + break; + case 2: + cap = new BasicCapacitor(1000,250000,20); + break; + default: + cap = new BasicCapacitor(200,25000,50); + break; + } + powerHandler.configure(cap.getMinEnergyReceived(), cap.getMaxEnergyReceived(), cap.getMinActivationEnergy(), cap.getMaxEnergyStored()); } - - @Override public ICapacitor getCapacitor() { return cap;