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

Get rid of RF term in code

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-03 16:02:21 +02:00
parent bb53005c77
commit 593cdfb816
20 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,37 +47,37 @@ public final class RefinedStorage {
public List<ItemStack> items = new ArrayList<ItemStack>();
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();
}

8
src/main/java/refinedstorage/item/ItemUpgrade.java
View File

@@ -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;
}

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

@@ -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

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

@@ -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

4
src/main/java/refinedstorage/tile/TileCrafter.java
View File

@@ -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;
}
}

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

@@ -17,7 +17,7 @@ public class TileCraftingMonitor extends TileNode {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.craftingMonitorRfUsage;
return RefinedStorage.INSTANCE.craftingMonitorUsage;
}
@Override

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

@@ -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

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

@@ -43,7 +43,7 @@ public class TileDetector extends TileNode implements ICompareConfig {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.detectorRfUsage;
return RefinedStorage.INSTANCE.detectorUsage;
}
@Override

4
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -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;
}
}

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

@@ -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

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

@@ -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

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

@@ -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

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

@@ -15,7 +15,7 @@ public class TileRelay extends TileNode {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.relayRfUsage;
return RefinedStorage.INSTANCE.relayUsage;
}
@Override

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

@@ -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

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

@@ -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

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

@@ -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

2
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -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);

2
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -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

6
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -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;
}

6
src/main/resources/assets/refinedstorage/lang/en_US.lang
View File

@@ -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