From ffcdb31adb391622cb1e8a6c04d0252b7a7c574f Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 23 May 2016 18:23:35 +0200 Subject: [PATCH] Hotfix for 0.6.11: removed useless methods --- .../refinedstorage/RefinedStorageUtils.java | 20 ++++--------------- .../tile/autocrafting/TileCrafter.java | 2 +- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/main/java/refinedstorage/RefinedStorageUtils.java b/src/main/java/refinedstorage/RefinedStorageUtils.java index 7fbdd1673..99ef10d0c 100755 --- a/src/main/java/refinedstorage/RefinedStorageUtils.java +++ b/src/main/java/refinedstorage/RefinedStorageUtils.java @@ -133,15 +133,11 @@ public class RefinedStorageUtils { } public static int getSpeed(IItemHandler handler) { - return getSpeed(handler, 9, 2, 0); + return getSpeed(handler, 9, 2); } public static int getSpeed(IItemHandler handler, int speed, int speedIncrease) { - return getSpeed(handler, speed, speedIncrease, 0); - } - - public static int getSpeed(IItemHandler handler, int speed, int speedIncrease, int start) { - for (int i = start; i < handler.getSlots(); ++i) { + for (int i = 0; i < handler.getSlots(); ++i) { if (handler.getStackInSlot(i) != null && handler.getStackInSlot(i).getMetadata() == ItemUpgrade.TYPE_SPEED) { speed -= speedIncrease; } @@ -155,13 +151,9 @@ public class RefinedStorageUtils { } public static int getUpgradeCount(IItemHandler handler, int type) { - return getUpgradeCount(handler, type, 0); - } - - public static int getUpgradeCount(IItemHandler handler, int type, int start) { int upgrades = 0; - for (int i = start; i < handler.getSlots(); ++i) { + for (int i = 0; i < handler.getSlots(); ++i) { if (handler.getStackInSlot(i) != null && handler.getStackInSlot(i).getMetadata() == type) { upgrades++; } @@ -171,13 +163,9 @@ public class RefinedStorageUtils { } public static int getUpgradeEnergyUsage(IItemHandler handler) { - return getUpgradeEnergyUsage(handler, 0); - } - - public static int getUpgradeEnergyUsage(IItemHandler handler, int start) { int usage = 0; - for (int i = start; i < handler.getSlots(); ++i) { + for (int i = 0; i < handler.getSlots(); ++i) { if (handler.getStackInSlot(i) != null) { usage += ItemUpgrade.getEnergyUsage(handler.getStackInSlot(i).getMetadata()); } diff --git a/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java b/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java index dab9e41ca..85cc31768 100755 --- a/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java @@ -71,7 +71,7 @@ public class TileCrafter extends TileMachine { } public int getSpeed() { - return 20 - (RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_SPEED, PATTERN_SLOTS) * 4); + return 20 - (RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_SPEED) * 4); } public IItemHandler getPatterns() {