diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index 89a4ae084..37e18d9e4 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -47,37 +47,37 @@ public final class RefinedStorage { public List items = new ArrayList(); - public int cableRfUsage; - public int constructorRfUsage; - public int crafterRfUsage; - public int crafterPerPatternRfUsage; - public int craftingMonitorRfUsage; - public int destructorRfUsage; - public int detectorRfUsage; - public int diskDriveRfUsage; - public int diskDrivePerDiskRfUsage; - public int externalStorageRfUsage; - public int externalStoragePerStorageRfUsage; - public int exporterRfUsage; - public int importerRfUsage; - public int interfaceRfUsage; - public int relayRfUsage; - public int soldererRfUsage; - public int storageRfUsage; - public int wirelessTransmitterRfUsage; - public int gridRfUsage; - public int craftingGridRfUsage; - public int patternGridRfUsage; + public int cableUsage; + public int constructorUsage; + public int crafterUsage; + public int crafterPerPatternUsage; + public int craftingMonitorUsage; + public int destructorUsage; + public int detectorUsage; + public int diskDriveUsage; + public int diskDrivePerDiskUsage; + public int externalStorageUsage; + public int externalStoragePerStorageUsage; + public int exporterUsage; + public int importerUsage; + public int interfaceUsage; + public int relayUsage; + public int soldererUsage; + public int storageUsage; + public int wirelessTransmitterUsage; + public int gridUsage; + public int craftingGridUsage; + public int patternGridUsage; public int controller; - public boolean controllerUsesRf; + public boolean controllerUsesEnergy; public int wirelessTransmitterBaseRange; - public int rangeUpgradeRfUsage; - public int speedUpgradeRfUsage; - public int craftingUpgradeRfUsage; - public int stackUpgradeRfUsage; + public int rangeUpgradeUsage; + public int speedUpgradeUsage; + public int craftingUpgradeUsage; + public int stackUpgradeUsage; public int wirelessTransmitterRangePerUpgrade; @EventHandler @@ -86,38 +86,38 @@ public final class RefinedStorage { Configuration config = new Configuration(e.getSuggestedConfigurationFile()); - cableRfUsage = config.getInt("cable", "energy", 0, 0, Integer.MAX_VALUE, "The RF/t used by cables"); - constructorRfUsage = config.getInt("constructor", "energy", 1, 0, Integer.MAX_VALUE, "The RF/t used by Constructors"); - crafterRfUsage = config.getInt("crafter", "energy", 2, 0, Integer.MAX_VALUE, "The base RF/t used by Crafters"); - crafterPerPatternRfUsage = config.getInt("crafterPerPattern", "energy", 1, 0, Integer.MAX_VALUE, "The additional RF/t used per Pattern in a Crafter"); - craftingMonitorRfUsage = config.getInt("craftingMonitor", "energy", 2, 0, Integer.MAX_VALUE, "The RF/t used by Crafting Monitors"); - destructorRfUsage = config.getInt("destructor", "energy", 1, 0, Integer.MAX_VALUE, "The RF/t used by Destructors"); - detectorRfUsage = config.getInt("detector", "energy", 2, 0, Integer.MAX_VALUE, "The RF/t used by Detectors"); - diskDriveRfUsage = config.getInt("diskDrive", "energy", 0, 0, Integer.MAX_VALUE, "The base RF/t used by Disk Drives"); - diskDrivePerDiskRfUsage = config.getInt("diskDrivePerDisk", "energy", 1, 0, Integer.MAX_VALUE, "The additional RF/t used by Storage Disks in Disk Drives"); - externalStorageRfUsage = config.getInt("externalStorage", "energy", 0, 0, Integer.MAX_VALUE, "The base RF/t used by External Storages"); - externalStoragePerStorageRfUsage = config.getInt("externalStoragePerStorage", "energy", 1, 0, Integer.MAX_VALUE, "The additional RF/t used per connected storage to an External Storage"); - exporterRfUsage = config.getInt("exporter", "energy", 1, 0, Integer.MAX_VALUE, "The RF/t used by Exporters"); - importerRfUsage = config.getInt("importer", "energy", 1, 0, Integer.MAX_VALUE, "The RF/t used by Importers"); - interfaceRfUsage = config.getInt("interface", "energy", 3, 0, Integer.MAX_VALUE, "The RF/t used by Interfaces"); - relayRfUsage = config.getInt("relay", "energy", 1, 0, Integer.MAX_VALUE, "The RF/t used by Relays"); - soldererRfUsage = config.getInt("solderer", "energy", 3, 0, Integer.MAX_VALUE, "The RF/t used by Solderers"); - storageRfUsage = config.getInt("storage", "energy", 1, 0, Integer.MAX_VALUE, "The RF/t used by Storage Blocks"); - wirelessTransmitterRfUsage = config.getInt("wirelessTransmitter", "energy", 8, 0, Integer.MAX_VALUE, "The RF/t used by Wireless Transmitters"); - gridRfUsage = config.getInt("grid", "energy", 2, 0, Integer.MAX_VALUE, "The RF/t used by Grids"); - craftingGridRfUsage = config.getInt("craftingGrid", "energy", 4, 0, Integer.MAX_VALUE, "The RF/t used by Crafting Grids"); - patternGridRfUsage = config.getInt("patternGrid", "energy", 3, 0, Integer.MAX_VALUE, "The RF/t used by Pattern Grids"); + cableUsage = config.getInt("cable", "energy", 0, 0, Integer.MAX_VALUE, "The energy used by Cables"); + constructorUsage = config.getInt("constructor", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Constructors"); + crafterUsage = config.getInt("crafter", "energy", 2, 0, Integer.MAX_VALUE, "The base energy used by Crafters"); + crafterPerPatternUsage = config.getInt("crafterPerPattern", "energy", 1, 0, Integer.MAX_VALUE, "The additional energy used per Pattern in a Crafter"); + craftingMonitorUsage = config.getInt("craftingMonitor", "energy", 2, 0, Integer.MAX_VALUE, "The energy used by Crafting Monitors"); + destructorUsage = config.getInt("destructor", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Destructors"); + detectorUsage = config.getInt("detector", "energy", 2, 0, Integer.MAX_VALUE, "The energy used by Detectors"); + diskDriveUsage = config.getInt("diskDrive", "energy", 0, 0, Integer.MAX_VALUE, "The base energy used by Disk Drives"); + diskDrivePerDiskUsage = config.getInt("diskDrivePerDisk", "energy", 1, 0, Integer.MAX_VALUE, "The additional energy used by Storage Disks in Disk Drives"); + externalStorageUsage = config.getInt("externalStorage", "energy", 0, 0, Integer.MAX_VALUE, "The base energy used by External Storages"); + externalStoragePerStorageUsage = config.getInt("externalStoragePerStorage", "energy", 1, 0, Integer.MAX_VALUE, "The additional energy used per connected storage to an External Storage"); + exporterUsage = config.getInt("exporter", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Exporters"); + importerUsage = config.getInt("importer", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Importers"); + interfaceUsage = config.getInt("interface", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Interfaces"); + relayUsage = config.getInt("relay", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Relays"); + soldererUsage = config.getInt("solderer", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Solderers"); + storageUsage = config.getInt("storage", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Storage Blocks"); + wirelessTransmitterUsage = config.getInt("wirelessTransmitter", "energy", 8, 0, Integer.MAX_VALUE, "The energy used by Wireless Transmitters"); + gridUsage = config.getInt("grid", "energy", 2, 0, Integer.MAX_VALUE, "The energy used by Grids"); + craftingGridUsage = config.getInt("craftingGrid", "energy", 4, 0, Integer.MAX_VALUE, "The energy used by Crafting Grids"); + patternGridUsage = config.getInt("patternGrid", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Pattern Grids"); controller = config.getInt("controller", "energy", 32000, 0, Integer.MAX_VALUE, "The energy capacity of the controller"); - controllerUsesRf = config.getBoolean("controllerUsesRf", "energy", true, "Whether the controller uses RF"); + controllerUsesEnergy = config.getBoolean("controllerUsesEnergy", "energy", true, "Whether the controller uses RF"); 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"); - 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"); - stackUpgradeRfUsage = config.getInt("stack", "upgrades", 12, 0, Integer.MAX_VALUE, "The additional RF/t used per Stack Upgrade"); + rangeUpgradeUsage = config.getInt("range", "upgrades", 8, 0, Integer.MAX_VALUE, "The additional energy used per Range Upgrade"); + speedUpgradeUsage = config.getInt("speed", "upgrades", 2, 0, Integer.MAX_VALUE, "The additional energy used per Speed Upgrade"); + craftingUpgradeUsage = config.getInt("crafting", "upgrades", 5, 0, Integer.MAX_VALUE, "The additional energy used per Crafting Upgrade"); + stackUpgradeUsage = config.getInt("stack", "upgrades", 12, 0, Integer.MAX_VALUE, "The additional energy used per Stack Upgrade"); config.save(); } diff --git a/src/main/java/refinedstorage/item/ItemUpgrade.java b/src/main/java/refinedstorage/item/ItemUpgrade.java index a80cf1055..921cc7887 100755 --- a/src/main/java/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/refinedstorage/item/ItemUpgrade.java @@ -31,13 +31,13 @@ public class ItemUpgrade extends ItemBase { public static int getEnergyUsage(int type) { switch (type) { case TYPE_RANGE: - return RefinedStorage.INSTANCE.rangeUpgradeRfUsage; + return RefinedStorage.INSTANCE.rangeUpgradeUsage; case TYPE_SPEED: - return RefinedStorage.INSTANCE.speedUpgradeRfUsage; + return RefinedStorage.INSTANCE.speedUpgradeUsage; case TYPE_CRAFTING: - return RefinedStorage.INSTANCE.craftingUpgradeRfUsage; + return RefinedStorage.INSTANCE.craftingUpgradeUsage; case TYPE_STACK: - return RefinedStorage.INSTANCE.stackUpgradeRfUsage; + return RefinedStorage.INSTANCE.stackUpgradeUsage; default: return 0; } diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java index ac9a33d99..1e3305df1 100755 --- a/src/main/java/refinedstorage/tile/TileCable.java +++ b/src/main/java/refinedstorage/tile/TileCable.java @@ -6,7 +6,7 @@ import refinedstorage.RefinedStorage; public class TileCable extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.cableRfUsage; + return RefinedStorage.INSTANCE.cableUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index 9d2bd1ed3..692268651 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -50,7 +50,7 @@ public class TileConstructor extends TileNode implements ICompareConfig { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.constructorRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.constructorUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index b98b8afd3..bdebf3134 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -43,11 +43,11 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer, @Override public int getEnergyUsage() { - int usage = RefinedStorage.INSTANCE.crafterRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + int usage = RefinedStorage.INSTANCE.crafterUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); for (int i = 0; i < patterns.getSlots(); ++i) { if (patterns.getStackInSlot(i) != null) { - usage += RefinedStorage.INSTANCE.crafterPerPatternRfUsage; + usage += RefinedStorage.INSTANCE.crafterPerPatternUsage; } } diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java index 74ec74107..4357bd91a 100755 --- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java +++ b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java @@ -17,7 +17,7 @@ public class TileCraftingMonitor extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.craftingMonitorRfUsage; + return RefinedStorage.INSTANCE.craftingMonitorUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index 97833c49c..59ff51fdd 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -44,7 +44,7 @@ public class TileDestructor extends TileNode implements ICompareConfig, IModeCon @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.destructorRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.destructorUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index 99736ea21..22826eb5a 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -43,7 +43,7 @@ public class TileDetector extends TileNode implements ICompareConfig { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.detectorRfUsage; + return RefinedStorage.INSTANCE.detectorUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 62efe7a45..0a93d3172 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -88,11 +88,11 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag @Override public int getEnergyUsage() { - int usage = RefinedStorage.INSTANCE.diskDriveRfUsage; + int usage = RefinedStorage.INSTANCE.diskDriveUsage; for (int i = 0; i < disks.getSlots(); ++i) { if (disks.getStackInSlot(i) != null) { - usage += RefinedStorage.INSTANCE.diskDrivePerDiskRfUsage; + usage += RefinedStorage.INSTANCE.diskDrivePerDiskUsage; } } diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index 336091b3f..d3693e9c4 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -37,7 +37,7 @@ public class TileExporter extends TileNode implements ICompareConfig { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.exporterRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.exporterUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 663ef8038..dafab8a2f 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -39,7 +39,7 @@ public class TileImporter extends TileNode implements ICompareConfig, IModeConfi @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.importerRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.importerUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index 55ab5f9ae..05fd82d64 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -37,7 +37,7 @@ public class TileInterface extends TileNode implements ICompareConfig { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.interfaceRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.interfaceUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/refinedstorage/tile/TileRelay.java index 02bcec2dd..61c01910a 100755 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -15,7 +15,7 @@ public class TileRelay extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.relayRfUsage; + return RefinedStorage.INSTANCE.relayUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 483baa956..c1851c464 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -36,7 +36,7 @@ public class TileSolderer extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.soldererRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.soldererUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 81c3eee10..f08ce5fda 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -65,7 +65,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.storageRfUsage; + return RefinedStorage.INSTANCE.storageUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index d58fe4701..645d06a16 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -19,7 +19,7 @@ public class TileWirelessTransmitter extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.wirelessTransmitterRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.wirelessTransmitterUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index 520934bbf..35fa53e40 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -184,7 +184,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR wirelessGridHandler.update(); if (getType() == EnumControllerType.NORMAL) { - if (!RefinedStorage.INSTANCE.controllerUsesRf) { + if (!RefinedStorage.INSTANCE.controllerUsesEnergy) { energy.setEnergyStored(energy.getMaxEnergyStored()); } else if (energy.getEnergyStored() - getEnergyUsage() >= 0) { energy.extractEnergy(getEnergyUsage(), false); diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index cd05e7147..57b2b29dc 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -46,7 +46,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.externalStorageRfUsage + (storages.size() * RefinedStorage.INSTANCE.externalStoragePerStorageRfUsage); + return RefinedStorage.INSTANCE.externalStorageUsage + (storages.size() * RefinedStorage.INSTANCE.externalStoragePerStorageUsage); } @Override diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index e0101b0b3..8335446c1 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -70,11 +70,11 @@ public class TileGrid extends TileNode implements IGrid { public int getEnergyUsage() { switch (getType()) { case NORMAL: - return RefinedStorage.INSTANCE.gridRfUsage; + return RefinedStorage.INSTANCE.gridUsage; case CRAFTING: - return RefinedStorage.INSTANCE.craftingGridRfUsage; + return RefinedStorage.INSTANCE.craftingGridUsage; case PATTERN: - return RefinedStorage.INSTANCE.patternGridRfUsage; + return RefinedStorage.INSTANCE.patternGridUsage; default: return 0; } diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang index 8abc95d90..b1b09103f 100755 --- a/src/main/resources/assets/refinedstorage/lang/en_US.lang +++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang @@ -31,9 +31,9 @@ gui.refinedstorage:crafter.processing=Processing gui.refinedstorage:processing_pattern_encoder=Processing Pattern Encoder gui.refinedstorage:processing_pattern_encoder.pattern_create=Create Pattern -misc.refinedstorage:energy_stored=%d / %d RF -misc.refinedstorage:energy_usage=Usage: %d RF/t -misc.refinedstorage:energy_usage_minimal=%d RF/t +misc.refinedstorage:energy_stored=%d / %d RS +misc.refinedstorage:energy_usage=Usage: %d RS/t +misc.refinedstorage:energy_usage_minimal=%d RS/t misc.refinedstorage:storage.stored=Stored: %d misc.refinedstorage:storage.stored_capacity=Stored: %d / %d