dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hotfix for 0.6.11: removed useless methods

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-23 18:23:35 +02:00
parent e0f13bc886
commit ffcdb31adb
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -133,15 +133,11 @@ public class RefinedStorageUtils {
} }
public static int getSpeed(IItemHandler handler) { 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) { public static int getSpeed(IItemHandler handler, int speed, int speedIncrease) {
return getSpeed(handler, speed, speedIncrease, 0); for (int i = 0; i < handler.getSlots(); ++i) {
}
public static int getSpeed(IItemHandler handler, int speed, int speedIncrease, int start) {
for (int i = start; i < handler.getSlots(); ++i) {
if (handler.getStackInSlot(i) != null && handler.getStackInSlot(i).getMetadata() == ItemUpgrade.TYPE_SPEED) { if (handler.getStackInSlot(i) != null && handler.getStackInSlot(i).getMetadata() == ItemUpgrade.TYPE_SPEED) {
speed -= speedIncrease; speed -= speedIncrease;
} }
@@ -155,13 +151,9 @@ public class RefinedStorageUtils {
} }
public static int getUpgradeCount(IItemHandler handler, int type) { 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; 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) { if (handler.getStackInSlot(i) != null && handler.getStackInSlot(i).getMetadata() == type) {
upgrades++; upgrades++;
} }
@@ -171,13 +163,9 @@ public class RefinedStorageUtils {
} }
public static int getUpgradeEnergyUsage(IItemHandler handler) { public static int getUpgradeEnergyUsage(IItemHandler handler) {
return getUpgradeEnergyUsage(handler, 0);
}
public static int getUpgradeEnergyUsage(IItemHandler handler, int start) {
int usage = 0; int usage = 0;
for (int i = start; i < handler.getSlots(); ++i) { for (int i = 0; i < handler.getSlots(); ++i) {
if (handler.getStackInSlot(i) != null) { if (handler.getStackInSlot(i) != null) {
usage += ItemUpgrade.getEnergyUsage(handler.getStackInSlot(i).getMetadata()); usage += ItemUpgrade.getEnergyUsage(handler.getStackInSlot(i).getMetadata());
} }

2
src/main/java/refinedstorage/tile/autocrafting/TileCrafter.java
View File

@@ -71,7 +71,7 @@ public class TileCrafter extends TileMachine {
} }
public int getSpeed() { 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() { public IItemHandler getPatterns() {