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

Remove speed config option for solderer

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-01 21:54:33 +02:00
parent b9a704d781
commit 55e0dce84d
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/refinedstorage/RefinedStorage.java
View File

@@ -73,9 +73,7 @@ public final class RefinedStorage {
public int speedUpgradeRfUsage; public int speedUpgradeRfUsage;
public int craftingUpgradeRfUsage; public int craftingUpgradeRfUsage;
public int stackUpgradeRfUsage; public int stackUpgradeRfUsage;
public int wirelessTransmitterRangePerUpgrade; public int wirelessTransmitterRangePerUpgrade;
public int soldererSpeedIncreasePerUpgrade;
@EventHandler @EventHandler
public void preInit(FMLPreInitializationEvent e) { public void preInit(FMLPreInitializationEvent e) {
@@ -109,15 +107,13 @@ public final class RefinedStorage {
controllerUsesRf = config.getBoolean("controllerUsesRf", "energy", true, "Whether the controller uses RF"); controllerUsesRf = config.getBoolean("controllerUsesRf", "energy", true, "Whether the controller uses RF");
wirelessTransmitterBaseRange = config.getInt("range", "wirelessTransmitter", 16, 0, Integer.MAX_VALUE, "The base range of the Wireless Transmitter"); wirelessTransmitterBaseRange = config.getInt("range", "wirelessTransmitter", 16, 0, Integer.MAX_VALUE, "The base range of the Wireless Transmitter");
wirelessTransmitterRangePerUpgrade = config.getInt("rangePerUpgrade", "wirelessTransmitter", 8, 0, Integer.MAX_VALUE, "The additional range per Range Upgrade in the Wireless Transmitter");
rangeUpgradeRfUsage = config.getInt("range", "upgrades", 8, 0, Integer.MAX_VALUE, "The additional RF/t used per Range Upgrade"); rangeUpgradeRfUsage = config.getInt("range", "upgrades", 8, 0, Integer.MAX_VALUE, "The additional RF/t used per Range Upgrade");
speedUpgradeRfUsage = config.getInt("speed", "upgrades", 2, 0, Integer.MAX_VALUE, "The additional RF/t used per Speed Upgrade"); speedUpgradeRfUsage = config.getInt("speed", "upgrades", 2, 0, Integer.MAX_VALUE, "The additional RF/t used per Speed Upgrade");
craftingUpgradeRfUsage = config.getInt("crafting", "upgrades", 5, 0, Integer.MAX_VALUE, "The additional RF/t used per Crafting Upgrade"); craftingUpgradeRfUsage = config.getInt("crafting", "upgrades", 5, 0, Integer.MAX_VALUE, "The additional RF/t used per Crafting Upgrade");
stackUpgradeRfUsage = config.getInt("stack", "upgrades", 12, 0, Integer.MAX_VALUE, "The additional RF/t used per Stack Upgrade"); stackUpgradeRfUsage = config.getInt("stack", "upgrades", 12, 0, Integer.MAX_VALUE, "The additional RF/t used per Stack Upgrade");
wirelessTransmitterRangePerUpgrade = config.getInt("rangePerUpgrade", "upgrades", 8, 0, Integer.MAX_VALUE, "The additional range per Range Upgrade in the Wireless Transmitter");
soldererSpeedIncreasePerUpgrade = config.getInt("soldererSpeedIncrasePerUpgrade", "upgrades", 1, 0, Integer.MAX_VALUE, "The additional speed increase per Speed Upgrade in the Solderer");
config.save(); config.save();
} }

2
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -61,7 +61,7 @@ public class TileSolderer extends TileSlave {
markDirty(); markDirty();
} }
} else if (working) { } else if (working) {
progress += 1 + (RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_SPEED) * RefinedStorage.INSTANCE.soldererSpeedIncreasePerUpgrade); progress += 1 + RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_SPEED);
if (progress >= recipe.getDuration()) { if (progress >= recipe.getDuration()) {
if (items.getStackInSlot(3) != null) { if (items.getStackInSlot(3) != null) {