diff --git a/src/main/java/forestry/api/circuits/ICircuit.java b/src/main/java/forestry/api/circuits/ICircuit.java index bdc71d430..900ab84ef 100644 --- a/src/main/java/forestry/api/circuits/ICircuit.java +++ b/src/main/java/forestry/api/circuits/ICircuit.java @@ -10,10 +10,6 @@ import java.util.List; public interface ICircuit { String getUID(); - boolean requiresDiscovery(); - - int getLimit(); - String getUnlocalizedName(); boolean isCircuitable(Object tile); diff --git a/src/main/java/forestry/core/circuits/Circuit.java b/src/main/java/forestry/core/circuits/Circuit.java index d0a3061b4..bdb8c7566 100755 --- a/src/main/java/forestry/core/circuits/Circuit.java +++ b/src/main/java/forestry/core/circuits/Circuit.java @@ -19,35 +19,18 @@ import forestry.core.utils.Translator; public abstract class Circuit implements ICircuit { private final String uid; - private final boolean requiresDiscovery; - private int limit = 1; - protected Circuit(String uid, boolean requiresDiscovery) { + protected Circuit(String uid) { this.uid = uid; - this.requiresDiscovery = requiresDiscovery; ChipsetManager.circuitRegistry.registerCircuit(this); } - protected void setLimit(int limit) { - this.limit = limit; - } - @Override public String getUID() { return "forestry." + this.uid; } - @Override - public int getLimit() { - return this.limit; - } - - @Override - public boolean requiresDiscovery() { - return this.requiresDiscovery; - } - @Override public String getUnlocalizedName() { return "for.circuit." + this.uid; diff --git a/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java index 9fc24e09c..a236666be 100755 --- a/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java +++ b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java @@ -11,20 +11,22 @@ package forestry.core.circuits; public enum EnumCircuitBoardType { - BASIC((short) 1, 0x191919, 0x6dcff6), ENHANCED((short) 2, 0x191919, 0xcb7c32), REFINED((short) 3, 0x191919, 0xc9c9c9), INTRICATE((short) 4, 0x191919, - 0xe2cb6b); + BASIC(1, 0x191919, 0x6dcff6), + ENHANCED(2, 0x191919, 0xcb7c32), + REFINED(3, 0x191919, 0xc9c9c9), + INTRICATE(4, 0x191919, 0xe2cb6b); - private final short sockets; + private final int sockets; private final int primaryColor; private final int secondaryColor; - EnumCircuitBoardType(short sockets, int primaryColor, int secondaryColor) { + EnumCircuitBoardType(int sockets, int primaryColor, int secondaryColor) { this.sockets = sockets; this.primaryColor = primaryColor; this.secondaryColor = secondaryColor; } - public short getSockets() { + public int getSockets() { return sockets; } diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index 0a3713a73..d8856afb9 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -50,7 +50,7 @@ public class GuiSolderingIron extends GuiForestry layouts = new RevolvingList<>(ChipsetManager.circuitRegistry.getRegisteredLayouts().values()); - private static final short blankSlot = 0; - private static final short finishedSlot = 1; + private static final short inputCircuitBoardSlot = 0; + private static final short finishedCircuitBoardSlot = 1; private static final short ingredientSlot1 = 2; private static final short ingredientSlotCount = 4; @@ -84,11 +84,6 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS continue; } - // / Make sure we don't exceed this circuits limit per chipset - if (getCount(recipe.getCircuit(), circuits) >= recipe.getCircuit().getLimit()) { - continue; - } - if (doConsume) { decrStackSize(ingredientSlot1 + i, recipe.getResource().stackSize); } @@ -104,39 +99,36 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS return; } - ItemStack blank = getStackInSlot(blankSlot); - // Requires blank slot - if (blank == null) { + ItemStack inputCircuitBoard = getStackInSlot(inputCircuitBoardSlot); + + if (inputCircuitBoard == null || inputCircuitBoard.stackSize > 1) { return; } - if (blank.stackSize > 1) { - return; - } - if (getStackInSlot(finishedSlot) != null) { + if (getStackInSlot(finishedCircuitBoardSlot) != null) { return; } // Need a chipset item - if (!ChipsetManager.circuitRegistry.isChipset(blank)) { + if (!ChipsetManager.circuitRegistry.isChipset(inputCircuitBoard)) { return; } // Illegal type - if (blank.getItemDamage() < 0 || blank.getItemDamage() >= EnumCircuitBoardType.values().length) { + if (inputCircuitBoard.getItemDamage() < 0 || inputCircuitBoard.getItemDamage() >= EnumCircuitBoardType.values().length) { return; } - EnumCircuitBoardType type = EnumCircuitBoardType.values()[blank.getItemDamage()]; + EnumCircuitBoardType type = EnumCircuitBoardType.values()[inputCircuitBoard.getItemDamage()]; if (getCircuitCount() != type.getSockets()) { return; } ICircuit[] circuits = getCircuits(true); - ItemStack circuitBoard = ItemCircuitBoard.createCircuitboard(type, layouts.getCurrent(), circuits); + ItemStack outputCircuitBoard = ItemCircuitBoard.createCircuitboard(type, layouts.getCurrent(), circuits); - setInventorySlotContents(finishedSlot, circuitBoard); - setInventorySlotContents(blankSlot, null); + setInventorySlotContents(finishedCircuitBoardSlot, outputCircuitBoard); + setInventorySlotContents(inputCircuitBoardSlot, null); } private int getCircuitCount() { @@ -150,16 +142,6 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS return count; } - public static int getCount(ICircuit circuit, ICircuit[] circuits) { - int count = 0; - for (ICircuit other : circuits) { - if (other != null && other.getUID().equals(circuit.getUID())) { - count++; - } - } - return count; - } - @Override public ImmutableSet getErrorStates() { ImmutableSet.Builder errorStates = ImmutableSet.builder(); @@ -168,7 +150,7 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS errorStates.add(EnumErrorCode.NO_CIRCUIT_LAYOUT); } - ItemStack blankCircuitBoard = getStackInSlot(blankSlot); + ItemStack blankCircuitBoard = getStackInSlot(inputCircuitBoardSlot); if (blankCircuitBoard == null) { errorStates.add(EnumErrorCode.NO_CIRCUIT_BOARD); @@ -202,7 +184,7 @@ public class ItemInventorySolderingIron extends ItemInventory implements IErrorS } Item item = itemStack.getItem(); - if (slotIndex == blankSlot) { + if (slotIndex == inputCircuitBoardSlot) { return item instanceof ItemCircuitBoard; } else if (slotIndex >= ingredientSlot1 && slotIndex < ingredientSlot1 + ingredientSlotCount) { CircuitRecipe recipe = SolderManager.getMatchingRecipe(layouts.getCurrent(), itemStack); diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java b/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java index 5cca5bf28..1126108a5 100644 --- a/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricBoost.java @@ -12,9 +12,8 @@ package forestry.energy.circuits; public class CircuitElectricBoost extends CircuitElectricChange { - public CircuitElectricBoost(String uid, int limit, int eu, int rf) { - super(uid, false); - this.setLimit(limit); + public CircuitElectricBoost(String uid, int eu, int rf) { + super(uid); this.configureChange(eu, rf); } diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java index cecb6f416..182701cb7 100755 --- a/src/main/java/forestry/energy/circuits/CircuitElectricChange.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricChange.java @@ -18,8 +18,8 @@ public abstract class CircuitElectricChange extends Circuit { private int euChange = 7; private int rfChange = 20; - protected CircuitElectricChange(String uid, boolean requiresDiscovery) { - super(uid, requiresDiscovery); + protected CircuitElectricChange(String uid) { + super(uid); } protected void configureChange(int euChange, int rfChange) { diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java b/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java index 859aae6bc..eecd6b982 100644 --- a/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricChoke.java @@ -13,8 +13,7 @@ package forestry.energy.circuits; public class CircuitElectricChoke extends CircuitElectricChange { public CircuitElectricChoke(String uid) { - super(uid, false); + super(uid); this.configureChange(-2, -10); - this.setLimit(1); } } diff --git a/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java b/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java index d44ebd816..e1a2fd827 100644 --- a/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java +++ b/src/main/java/forestry/energy/circuits/CircuitElectricEfficiency.java @@ -13,8 +13,7 @@ package forestry.energy.circuits; public class CircuitElectricEfficiency extends CircuitElectricChange { public CircuitElectricEfficiency(String uid) { - super(uid, false); - this.setLimit(1); + super(uid); this.configureChange(-1, 0); } diff --git a/src/main/java/forestry/factory/PluginFactory.java b/src/main/java/forestry/factory/PluginFactory.java index 8f99d3660..10d058109 100644 --- a/src/main/java/forestry/factory/PluginFactory.java +++ b/src/main/java/forestry/factory/PluginFactory.java @@ -203,9 +203,9 @@ public class PluginFactory extends BlankForestryPlugin { blocks.raintank.init(); blocks.worktable.init(); - Circuit.machineSpeedUpgrade1 = new CircuitSpeedUpgrade("machine.speed.boost.1", 0.125f, 0.05f, 4); - Circuit.machineSpeedUpgrade2 = new CircuitSpeedUpgrade("machine.speed.boost.2", 0.250f, 0.10f, 4); - Circuit.machineEfficiencyUpgrade1 = new CircuitSpeedUpgrade("machine.efficiency.1", 0, -0.10f, 2); + Circuit.machineSpeedUpgrade1 = new CircuitSpeedUpgrade("machine.speed.boost.1", 0.125f, 0.05f); + Circuit.machineSpeedUpgrade2 = new CircuitSpeedUpgrade("machine.speed.boost.2", 0.250f, 0.10f); + Circuit.machineEfficiencyUpgrade1 = new CircuitSpeedUpgrade("machine.efficiency.1", 0, -0.10f); } @Override diff --git a/src/main/java/forestry/factory/circuits/CircuitSpeedUpgrade.java b/src/main/java/forestry/factory/circuits/CircuitSpeedUpgrade.java index f142632f4..c05c52719 100644 --- a/src/main/java/forestry/factory/circuits/CircuitSpeedUpgrade.java +++ b/src/main/java/forestry/factory/circuits/CircuitSpeedUpgrade.java @@ -18,9 +18,8 @@ public class CircuitSpeedUpgrade extends Circuit { private final double speedBoost; private final float powerDraw; - public CircuitSpeedUpgrade(String uid, double speedBoost, float powerDraw, int limit) { - super(uid, false); - this.setLimit(limit); + public CircuitSpeedUpgrade(String uid, double speedBoost, float powerDraw) { + super(uid); this.speedBoost = speedBoost; this.powerDraw = powerDraw; } diff --git a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java index 17ae69f21..5bab2ae76 100755 --- a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java +++ b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java @@ -21,9 +21,8 @@ public class CircuitFarmLogic extends Circuit { private boolean isManual = false; public CircuitFarmLogic(String uid, IFarmLogic logic) { - super(uid, false); + super(uid); this.logic = logic; - setLimit(4); } public CircuitFarmLogic setManual() { diff --git a/src/main/java/forestry/plugins/compat/PluginIC2.java b/src/main/java/forestry/plugins/compat/PluginIC2.java index 0f2d20608..47f2320e4 100644 --- a/src/main/java/forestry/plugins/compat/PluginIC2.java +++ b/src/main/java/forestry/plugins/compat/PluginIC2.java @@ -138,8 +138,8 @@ public class PluginIC2 extends BlankForestryPlugin { Circuit.energyElectricChoke1 = new CircuitElectricChoke("electric.choke.1"); Circuit.energyElectricEfficiency1 = new CircuitElectricEfficiency("electric.efficiency.1"); - Circuit.energyElectricBoost1 = new CircuitElectricBoost("electric.boost.1", 2, 7, 20); - Circuit.energyElectricBoost2 = new CircuitElectricBoost("electric.boost.2", 2, 15, 40); + Circuit.energyElectricBoost1 = new CircuitElectricBoost("electric.boost.1", 7, 20); + Circuit.energyElectricBoost2 = new CircuitElectricBoost("electric.boost.2", 15, 40); blocks.electricalEngine.init(); blocks.generator.init();