From 5cfe09282fd1444c13d94a7b0fbc183d39883c43 Mon Sep 17 00:00:00 2001 From: way2muchnoise Date: Sun, 18 Sep 2016 22:27:12 +0200 Subject: [PATCH 1/2] add ingame config --- .../java/refinedstorage/RefinedStorage.java | 109 +---------- .../refinedstorage/RefinedStorageConfig.java | 185 ++++++++++++++++++ .../apiimpl/network/WirelessGridHandler.java | 6 +- .../apiimpl/network/grid/ItemGridHandler.java | 6 +- .../java/refinedstorage/block/BlockCable.java | 2 +- .../gui/config/ModGuiConfig.java | 17 ++ .../gui/config/ModGuiFactory.java | 29 +++ .../item/ItemBlockController.java | 4 +- .../java/refinedstorage/item/ItemUpgrade.java | 10 +- .../java/refinedstorage/tile/TileCable.java | 2 +- .../refinedstorage/tile/TileConstructor.java | 2 +- .../refinedstorage/tile/TileController.java | 6 +- .../java/refinedstorage/tile/TileCrafter.java | 4 +- .../tile/TileCraftingMonitor.java | 2 +- .../refinedstorage/tile/TileDestructor.java | 2 +- .../refinedstorage/tile/TileDetector.java | 2 +- .../refinedstorage/tile/TileDiskDrive.java | 4 +- .../tile/TileDiskManipulator.java | 2 +- .../refinedstorage/tile/TileExporter.java | 2 +- .../tile/TileFluidInterface.java | 2 +- .../refinedstorage/tile/TileFluidStorage.java | 2 +- .../refinedstorage/tile/TileImporter.java | 2 +- .../refinedstorage/tile/TileInterface.java | 2 +- .../tile/TileNetworkReceiver.java | 2 +- .../tile/TileNetworkTransmitter.java | 2 +- .../java/refinedstorage/tile/TileRelay.java | 2 +- .../refinedstorage/tile/TileSolderer.java | 2 +- .../java/refinedstorage/tile/TileStorage.java | 2 +- .../tile/TileWirelessTransmitter.java | 4 +- .../externalstorage/TileExternalStorage.java | 2 +- .../refinedstorage/tile/grid/TileGrid.java | 8 +- 31 files changed, 280 insertions(+), 148 deletions(-) create mode 100644 src/main/java/refinedstorage/RefinedStorageConfig.java create mode 100644 src/main/java/refinedstorage/gui/config/ModGuiConfig.java create mode 100644 src/main/java/refinedstorage/gui/config/ModGuiFactory.java diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index 0e7d61581..f8b7008db 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -3,7 +3,6 @@ package refinedstorage; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.config.Configuration; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -16,11 +15,12 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import refinedstorage.proxy.CommonProxy; -@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION, dependencies = RefinedStorage.DEPENDENCIES) +@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION, guiFactory = RefinedStorage.GUI_FACTORY, dependencies = RefinedStorage.DEPENDENCIES) public final class RefinedStorage { public static final String ID = "refinedstorage"; public static final String VERSION = "1.0.5"; public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2088,);required-after:mcmultipart@[1.2.1,);"; + public static final String GUI_FACTORY = "refinedstorage.gui.config.ModGuiFactory"; @SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy") public static CommonProxy PROXY; @@ -28,6 +28,8 @@ public final class RefinedStorage { @Instance public static RefinedStorage INSTANCE; + public static RefinedStorageConfig CONFIG; + public final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(ID); public final CreativeTabs tab = new CreativeTabs(ID) { @@ -46,111 +48,10 @@ public final class RefinedStorage { FluidRegistry.enableUniversalBucket(); } - public int controllerBaseUsage; - 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 fluidInterfaceUsage; - public int relayUsage; - public int soldererUsage; - public int storageUsage; - public int fluidStorageUsage; - public int wirelessTransmitterUsage; - public int gridUsage; - public int craftingGridUsage; - public int patternGridUsage; - public int fluidGridUsage; - public int networkTransmitterUsage; - public float networkTransmitterPerBlockUsage; - public int networkReceiverUsage; - public int diskManipulatorUsage; - - public int controllerCapacity; - public boolean controllerUsesEnergy; - - public int wirelessTransmitterBaseRange; - public int wirelessTransmitterRangePerUpgrade; - - public boolean wirelessGridUsesEnergy; - public int wirelessGridOpenUsage; - public int wirelessGridExtractUsage; - public int wirelessGridInsertUsage; - - public int rangeUpgradeUsage; - public int speedUpgradeUsage; - public int craftingUpgradeUsage; - public int stackUpgradeUsage; - public int interdimensionalUpgradeUsage; - - public boolean translucentCables; - @EventHandler public void preInit(FMLPreInitializationEvent e) { + CONFIG = new RefinedStorageConfig(e.getSuggestedConfigurationFile()); PROXY.preInit(e); - - Configuration config = new Configuration(e.getSuggestedConfigurationFile()); - - controllerBaseUsage = config.getInt("controllerBase", "energy", 0, 0, Integer.MAX_VALUE, "The base energy used by the Controller"); - 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"); - fluidInterfaceUsage = config.getInt("fluidInterface", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Fluid 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"); - fluidStorageUsage = config.getInt("fluidStorage", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Fluid 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"); - fluidGridUsage = config.getInt("fluidGrid", "energy", 2, 0, Integer.MAX_VALUE, "The energy used by Fluid Grids"); - networkTransmitterUsage = config.getInt("networkTransmitter", "energy", 50, 0, Integer.MAX_VALUE, "The base energy used by Network Transmitters"); - networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", "energy", 4, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up"); - networkReceiverUsage = config.getInt("networkReceiver", "energy", 15, 0, Integer.MAX_VALUE, "The energy used by Network Receivers"); - diskManipulatorUsage = config.getInt("diskManipulator", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Disk Manipulators"); - - controllerCapacity = config.getInt("capacity", "controller", 32000, 0, Integer.MAX_VALUE, "The energy capacity of the Controller"); - controllerUsesEnergy = config.getBoolean("usesEnergy", "controller", true, "Whether the Controller uses energy"); - - 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"); - - wirelessGridUsesEnergy = config.getBoolean("usesEnergy", "wirelessGrid", true, "Whether the Wireless Grid uses energy"); - wirelessGridOpenUsage = config.getInt("open", "wirelessGrid", 30, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to open"); - wirelessGridInsertUsage = config.getInt("insert", "wirelessGrid", 3, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to insert items"); - wirelessGridExtractUsage = config.getInt("extract", "wirelessGrid", 3, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to extract items"); - - 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"); - interdimensionalUpgradeUsage = config.getInt("interdimensional", "upgrades", 1000, 0, Integer.MAX_VALUE, "The additional energy used by the Interdimensional Upgrade"); - - translucentCables = config.getBoolean("translucentCables", "misc", false, "For resource pack makers that want a translucent cable"); - - config.save(); } @EventHandler diff --git a/src/main/java/refinedstorage/RefinedStorageConfig.java b/src/main/java/refinedstorage/RefinedStorageConfig.java new file mode 100644 index 000000000..d4ad6043a --- /dev/null +++ b/src/main/java/refinedstorage/RefinedStorageConfig.java @@ -0,0 +1,185 @@ +package refinedstorage; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.ConfigElement; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.fml.client.config.IConfigElement; +import net.minecraftforge.fml.client.event.ConfigChangedEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +public final class RefinedStorageConfig { + + private Configuration config; + + //region Energy + public int controllerBaseUsage; + 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 fluidInterfaceUsage; + public int relayUsage; + public int soldererUsage; + public int storageUsage; + public int fluidStorageUsage; + public int wirelessTransmitterUsage; + public int gridUsage; + public int craftingGridUsage; + public int patternGridUsage; + public int fluidGridUsage; + public int networkTransmitterUsage; + public float networkTransmitterPerBlockUsage; + public int networkReceiverUsage; + public int diskManipulatorUsage; + //endregion + + //region Controller + public int controllerCapacity; + public boolean controllerUsesEnergy; + //endregion + + //region Wireless Transmitter + public int wirelessTransmitterBaseRange; + public int wirelessTransmitterRangePerUpgrade; + //endregion + + //region Wireless Grid + public boolean wirelessGridUsesEnergy; + public int wirelessGridOpenUsage; + public int wirelessGridExtractUsage; + public int wirelessGridInsertUsage; + //endregion + + //region Upgrades + public int rangeUpgradeUsage; + public int speedUpgradeUsage; + public int craftingUpgradeUsage; + public int stackUpgradeUsage; + public int interdimensionalUpgradeUsage; + //endregion + + //region Misc + public boolean translucentCables; + //endregion + + //region Categories + private static final String ENERGY = "energy"; + private static final String CONTROLLER = "controller"; + private static final String WIRELESS_TRANSMITTER = "wirelessTransmitter"; + private static final String WIRELESS_GRID = "wirelessGrid"; + private static final String UPGRADES = "upgrades"; + private static final String MISC = "misc"; + //endregion + + public RefinedStorageConfig(File configFile) { + config = new Configuration(configFile); + MinecraftForge.EVENT_BUS.register(this); + loadConfig(); + } + + public Configuration getConfig() { + return config; + } + + @SubscribeEvent + public void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event) { + if (event.getModID().equalsIgnoreCase(RefinedStorage.ID)) { + loadConfig(); + } + } + + private void loadConfig() { + //region Energy + controllerBaseUsage = config.getInt("controllerBase", ENERGY, 0, 0, Integer.MAX_VALUE, "The base energy used by the Controller"); + 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"); + fluidInterfaceUsage = config.getInt("fluidInterface", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Fluid 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"); + fluidStorageUsage = config.getInt("fluidStorage", ENERGY, 1, 0, Integer.MAX_VALUE, "The energy used by Fluid 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"); + fluidGridUsage = config.getInt("fluidGrid", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Fluid Grids"); + networkTransmitterUsage = config.getInt("networkTransmitter", ENERGY, 50, 0, Integer.MAX_VALUE, "The base energy used by Network Transmitters"); + networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", ENERGY, 4, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up"); + networkReceiverUsage = config.getInt("networkReceiver", ENERGY, 15, 0, Integer.MAX_VALUE, "The energy used by Network Receivers"); + diskManipulatorUsage = config.getInt("diskManipulator", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Disk Manipulators"); + //endregion + + //region Controller + controllerCapacity = config.getInt("capacity", CONTROLLER, 32000, 0, Integer.MAX_VALUE, "The energy capacity of the Controller"); + controllerUsesEnergy = config.getBoolean("usesEnergy", CONTROLLER, true, "Whether the Controller uses energy"); + //endregion + + //region Wireless Transmitter + wirelessTransmitterBaseRange = config.getInt("range", WIRELESS_TRANSMITTER, 16, 0, Integer.MAX_VALUE, "The base range of the Wireless Transmitter"); + wirelessTransmitterRangePerUpgrade = config.getInt("rangePerUpgrade", WIRELESS_TRANSMITTER, 8, 0, Integer.MAX_VALUE, "The additional range per Range Upgrade in the Wireless Transmitter"); + //endregion + + //region Wireless Grid + wirelessGridUsesEnergy = config.getBoolean("usesEnergy", WIRELESS_GRID, true, "Whether the Wireless Grid uses energy"); + wirelessGridOpenUsage = config.getInt("open", WIRELESS_GRID, 30, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to open"); + wirelessGridInsertUsage = config.getInt("insert", WIRELESS_GRID, 3, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to insert items"); + wirelessGridExtractUsage = config.getInt("extract", WIRELESS_GRID, 3, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to extract items"); + //endregion + + //region Upgrades + 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"); + interdimensionalUpgradeUsage = config.getInt("interdimensional", UPGRADES, 1000, 0, Integer.MAX_VALUE, "The additional energy used by the Interdimensional Upgrade"); + //endregion + + //region Misc + translucentCables = config.getBoolean("translucentCables", MISC, false, "For resource pack makers that want a translucent cable"); + //endregion + + if (config.hasChanged()) { + config.save(); + } + } + + + @SuppressWarnings("unchecked") + public List getConfigElements() + { + List list = new ArrayList<>(); + list.addAll(new ConfigElement(config.getCategory(ENERGY)).getChildElements()); + list.addAll(new ConfigElement(config.getCategory(CONTROLLER)).getChildElements()); + list.addAll(new ConfigElement(config.getCategory(UPGRADES)).getChildElements()); + list.addAll(new ConfigElement(config.getCategory(WIRELESS_TRANSMITTER)).getChildElements()); + list.addAll(new ConfigElement(config.getCategory(WIRELESS_GRID)).getChildElements()); + list.addAll(new ConfigElement(config.getCategory(MISC)).getChildElements()); + return list; + } +} diff --git a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java index edd6a077e..1009cd4fc 100755 --- a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java @@ -55,7 +55,7 @@ public class WirelessGridHandler implements IWirelessGridHandler { ItemStack stack = player.getHeldItem(hand); - if (RefinedStorage.INSTANCE.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack) <= RefinedStorage.INSTANCE.wirelessGridOpenUsage) { + if (RefinedStorage.CONFIG.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack) <= RefinedStorage.CONFIG.wirelessGridOpenUsage) { return true; } @@ -65,7 +65,7 @@ public class WirelessGridHandler implements IWirelessGridHandler { network.sendItemStorageToClient((EntityPlayerMP) player); - drainEnergy(player, RefinedStorage.INSTANCE.wirelessGridOpenUsage); + drainEnergy(player, RefinedStorage.CONFIG.wirelessGridOpenUsage); return true; } @@ -83,7 +83,7 @@ public class WirelessGridHandler implements IWirelessGridHandler { public void drainEnergy(EntityPlayer player, int energy) { IWirelessGridConsumer consumer = getConsumer(player); - if (consumer != null && RefinedStorage.INSTANCE.wirelessGridUsesEnergy) { + if (consumer != null && RefinedStorage.CONFIG.wirelessGridUsesEnergy) { ItemWirelessGrid item = RefinedStorageItems.WIRELESS_GRID; if (consumer.getStack().getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE) { diff --git a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java index fa59c7f93..e0d3c6b3e 100755 --- a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java @@ -77,7 +77,7 @@ public class ItemGridHandler implements IItemGridHandler { player.updateHeldItem(); } - network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.wirelessGridExtractUsage); + network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.CONFIG.wirelessGridExtractUsage); } } @@ -85,7 +85,7 @@ public class ItemGridHandler implements IItemGridHandler { public ItemStack onInsert(EntityPlayerMP player, ItemStack stack) { ItemStack remainder = network.insertItem(stack, stack.stackSize, false); - network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.wirelessGridInsertUsage); + network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.CONFIG.wirelessGridInsertUsage); return remainder; } @@ -115,7 +115,7 @@ public class ItemGridHandler implements IItemGridHandler { player.updateHeldItem(); - network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.wirelessGridInsertUsage); + network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.CONFIG.wirelessGridInsertUsage); } @Override diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index 9fc84fd31..3b15fc665 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -341,6 +341,6 @@ public class BlockCable extends BlockCoverable { @Override public BlockRenderLayer getBlockLayer() { - return RefinedStorage.INSTANCE.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer(); + return RefinedStorage.CONFIG.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer(); } } diff --git a/src/main/java/refinedstorage/gui/config/ModGuiConfig.java b/src/main/java/refinedstorage/gui/config/ModGuiConfig.java new file mode 100644 index 000000000..74476d43d --- /dev/null +++ b/src/main/java/refinedstorage/gui/config/ModGuiConfig.java @@ -0,0 +1,17 @@ +package refinedstorage.gui.config; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.fml.client.config.GuiConfig; +import refinedstorage.RefinedStorage; + +public class ModGuiConfig extends GuiConfig { + + public ModGuiConfig(GuiScreen guiScreen) { + super(guiScreen, + RefinedStorage.CONFIG.getConfigElements(), + RefinedStorage.ID, + false, + false, + GuiConfig.getAbridgedConfigPath(RefinedStorage.CONFIG.getConfig().toString())); + } +} diff --git a/src/main/java/refinedstorage/gui/config/ModGuiFactory.java b/src/main/java/refinedstorage/gui/config/ModGuiFactory.java new file mode 100644 index 000000000..bf70e1207 --- /dev/null +++ b/src/main/java/refinedstorage/gui/config/ModGuiFactory.java @@ -0,0 +1,29 @@ +package refinedstorage.gui.config; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.fml.client.IModGuiFactory; + +import java.util.Set; + +public class ModGuiFactory implements IModGuiFactory { + @Override + public void initialize(Minecraft minecraftInstance) { + + } + + @Override + public Class mainConfigGuiClass() { + return ModGuiConfig.class; + } + + @Override + public Set runtimeGuiCategories() { + return null; + } + + @Override + public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { + return null; + } +} diff --git a/src/main/java/refinedstorage/item/ItemBlockController.java b/src/main/java/refinedstorage/item/ItemBlockController.java index be0806ff5..628f18691 100755 --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/refinedstorage/item/ItemBlockController.java @@ -29,7 +29,7 @@ public class ItemBlockController extends ItemBlockBase { } public static int getEnergyCapacity(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RefinedStorage.INSTANCE.controllerCapacity; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RefinedStorage.CONFIG.controllerCapacity; } @Override @@ -46,7 +46,7 @@ public class ItemBlockController extends ItemBlockBase { tag = new NBTTagCompound(); } - tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RefinedStorage.INSTANCE.controllerCapacity : 0); + tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RefinedStorage.CONFIG.controllerCapacity : 0); return stack; } diff --git a/src/main/java/refinedstorage/item/ItemUpgrade.java b/src/main/java/refinedstorage/item/ItemUpgrade.java index 7d12b0e5d..4dd5c817a 100755 --- a/src/main/java/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/refinedstorage/item/ItemUpgrade.java @@ -34,15 +34,15 @@ public class ItemUpgrade extends ItemBase { public static int getEnergyUsage(int type) { switch (type) { case TYPE_RANGE: - return RefinedStorage.INSTANCE.rangeUpgradeUsage; + return RefinedStorage.CONFIG.rangeUpgradeUsage; case TYPE_SPEED: - return RefinedStorage.INSTANCE.speedUpgradeUsage; + return RefinedStorage.CONFIG.speedUpgradeUsage; case TYPE_CRAFTING: - return RefinedStorage.INSTANCE.craftingUpgradeUsage; + return RefinedStorage.CONFIG.craftingUpgradeUsage; case TYPE_STACK: - return RefinedStorage.INSTANCE.stackUpgradeUsage; + return RefinedStorage.CONFIG.stackUpgradeUsage; case TYPE_INTERDIMENSIONAL: - return RefinedStorage.INSTANCE.interdimensionalUpgradeUsage; + return RefinedStorage.CONFIG.interdimensionalUpgradeUsage; default: return 0; } diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java index b76b70a05..1a38f3780 100755 --- a/src/main/java/refinedstorage/tile/TileCable.java +++ b/src/main/java/refinedstorage/tile/TileCable.java @@ -5,7 +5,7 @@ import refinedstorage.RefinedStorage; public class TileCable extends TileMultipartNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.cableUsage; + return RefinedStorage.CONFIG.cableUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index 7978179de..1f198e0c8 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -64,7 +64,7 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.constructorUsage + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.constructorUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index f7c82255c..623cd84c8 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -185,7 +185,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR private List craftingTasksToCancel = new ArrayList<>(); private List craftingTasksToRead = new ArrayList<>(); - private EnergyStorage energy = new EnergyStorage(RefinedStorage.INSTANCE.controllerCapacity); + private EnergyStorage energy = new EnergyStorage(RefinedStorage.CONFIG.controllerCapacity); private ControllerEnergyForge energyForge = new ControllerEnergyForge(this); private IControllerEnergyIC2 energyEU; private ControllerEnergyTesla energyTesla; @@ -299,7 +299,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR wirelessGridHandler.update(); if (getType() == EnumControllerType.NORMAL) { - if (!RefinedStorage.INSTANCE.controllerUsesEnergy) { + if (!RefinedStorage.CONFIG.controllerUsesEnergy) { energy.setEnergyStored(energy.getMaxEnergyStored()); } else if (energy.getEnergyStored() - getEnergyUsage() >= 0) { energy.extractEnergy(getEnergyUsage(), false); @@ -809,7 +809,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public int getEnergyUsage() { - int usage = RefinedStorage.INSTANCE.controllerBaseUsage; + int usage = RefinedStorage.CONFIG.controllerBaseUsage; for (INetworkNode node : nodeGraph.all()) { if (node.canUpdate()) { diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index e45c47d4d..6f2a4c83d 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -85,11 +85,11 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer { @Override public int getEnergyUsage() { - int usage = RefinedStorage.INSTANCE.crafterUsage + upgrades.getEnergyUsage(); + int usage = RefinedStorage.CONFIG.crafterUsage + upgrades.getEnergyUsage(); for (int i = 0; i < patterns.getSlots(); ++i) { if (patterns.getStackInSlot(i) != null) { - usage += RefinedStorage.INSTANCE.crafterPerPatternUsage; + usage += RefinedStorage.CONFIG.crafterPerPatternUsage; } } diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java index 24b232fd8..1a933626f 100755 --- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java +++ b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java @@ -33,7 +33,7 @@ public class TileCraftingMonitor extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.craftingMonitorUsage; + return RefinedStorage.CONFIG.craftingMonitorUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index f7e456626..95a56d4c7 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -63,7 +63,7 @@ public class TileDestructor extends TileMultipartNode implements IComparable, IF @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.destructorUsage + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.destructorUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index 67c41f14e..9bd3937f6 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -99,7 +99,7 @@ public class TileDetector extends TileNode implements IComparable, IType { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.detectorUsage; + return RefinedStorage.CONFIG.detectorUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 5d937478f..2173d3eeb 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -150,11 +150,11 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl @Override public int getEnergyUsage() { - int usage = RefinedStorage.INSTANCE.diskDriveUsage; + int usage = RefinedStorage.CONFIG.diskDriveUsage; for (int i = 0; i < disks.getSlots(); ++i) { if (disks.getStackInSlot(i) != null) { - usage += RefinedStorage.INSTANCE.diskDrivePerDiskUsage; + usage += RefinedStorage.CONFIG.diskDrivePerDiskUsage; } } diff --git a/src/main/java/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/refinedstorage/tile/TileDiskManipulator.java index dc74db230..a023daa17 100755 --- a/src/main/java/refinedstorage/tile/TileDiskManipulator.java +++ b/src/main/java/refinedstorage/tile/TileDiskManipulator.java @@ -163,7 +163,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.diskManipulatorUsage + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.diskManipulatorUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index 8432a56d5..f730519b6 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -48,7 +48,7 @@ public class TileExporter extends TileMultipartNode implements IComparable, ITyp @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.exporterUsage + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.exporterUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileFluidInterface.java b/src/main/java/refinedstorage/tile/TileFluidInterface.java index 02d3f3d34..c84f86c03 100755 --- a/src/main/java/refinedstorage/tile/TileFluidInterface.java +++ b/src/main/java/refinedstorage/tile/TileFluidInterface.java @@ -134,7 +134,7 @@ public class TileFluidInterface extends TileNode implements IComparable { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.fluidInterfaceUsage; + return RefinedStorage.CONFIG.fluidInterfaceUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileFluidStorage.java b/src/main/java/refinedstorage/tile/TileFluidStorage.java index cedf6479b..f78d1a27c 100755 --- a/src/main/java/refinedstorage/tile/TileFluidStorage.java +++ b/src/main/java/refinedstorage/tile/TileFluidStorage.java @@ -79,7 +79,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider, @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.fluidStorageUsage; + return RefinedStorage.CONFIG.fluidStorageUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index ccfb54f0d..f4d5b3fcd 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -53,7 +53,7 @@ public class TileImporter extends TileMultipartNode implements IComparable, IFil @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.importerUsage + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.importerUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index 41a282f02..9e60c212a 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -35,7 +35,7 @@ public class TileInterface extends TileNode implements IComparable { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.interfaceUsage + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.interfaceUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileNetworkReceiver.java b/src/main/java/refinedstorage/tile/TileNetworkReceiver.java index 6b35f1664..24e04cc90 100755 --- a/src/main/java/refinedstorage/tile/TileNetworkReceiver.java +++ b/src/main/java/refinedstorage/tile/TileNetworkReceiver.java @@ -10,7 +10,7 @@ public class TileNetworkReceiver extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.networkReceiverUsage; + return RefinedStorage.CONFIG.networkReceiverUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java index 607d45196..bc7aee4ce 100755 --- a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java @@ -109,7 +109,7 @@ public class TileNetworkTransmitter extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RefinedStorage.INSTANCE.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RefinedStorage.CONFIG.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage(); } public ItemHandlerBasic getNetworkCard() { diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/refinedstorage/tile/TileRelay.java index bda0388dc..7cae46bf8 100755 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -13,7 +13,7 @@ public class TileRelay extends TileNode { @Override public int getEnergyUsage() { - return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.INSTANCE.relayUsage; + return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.CONFIG.relayUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 3dfc89131..408d6cee4 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -76,7 +76,7 @@ public class TileSolderer extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.soldererUsage + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.soldererUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 5e07fa8bd..b35781154 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -79,7 +79,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.storageUsage; + return RefinedStorage.CONFIG.storageUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 06d07d9ae..77f012876 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -31,7 +31,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.wirelessTransmitterUsage + upgrades.getEnergyUsage(); + return RefinedStorage.CONFIG.wirelessTransmitterUsage + upgrades.getEnergyUsage(); } @Override @@ -56,7 +56,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm @Override public int getRange() { - return RefinedStorage.INSTANCE.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.TYPE_RANGE) * RefinedStorage.INSTANCE.wirelessTransmitterRangePerUpgrade); + return RefinedStorage.CONFIG.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.TYPE_RANGE) * RefinedStorage.CONFIG.wirelessTransmitterRangePerUpgrade); } @Override diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index 84a13a4bd..7bf9be481 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -104,7 +104,7 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora @Override public int getEnergyUsage() { - return RefinedStorage.INSTANCE.externalStorageUsage + ((itemStorages.size() + fluidStorages.size()) * RefinedStorage.INSTANCE.externalStoragePerStorageUsage); + return RefinedStorage.CONFIG.externalStorageUsage + ((itemStorages.size() + fluidStorages.size()) * RefinedStorage.CONFIG.externalStoragePerStorageUsage); } @Override diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index f12c8e81d..a14d34cbf 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -184,13 +184,13 @@ public class TileGrid extends TileNode implements IGrid { public int getEnergyUsage() { switch (getType()) { case NORMAL: - return RefinedStorage.INSTANCE.gridUsage; + return RefinedStorage.CONFIG.gridUsage; case CRAFTING: - return RefinedStorage.INSTANCE.craftingGridUsage; + return RefinedStorage.CONFIG.craftingGridUsage; case PATTERN: - return RefinedStorage.INSTANCE.patternGridUsage; + return RefinedStorage.CONFIG.patternGridUsage; case FLUID: - return RefinedStorage.INSTANCE.fluidGridUsage; + return RefinedStorage.CONFIG.fluidGridUsage; default: return 0; } From b594b52aa6a1f9945fb41d482c8195ee6790eb82 Mon Sep 17 00:00:00 2001 From: way2muchnoise Date: Sun, 18 Sep 2016 22:30:09 +0200 Subject: [PATCH 2/2] make config non-static --- src/main/java/refinedstorage/RefinedStorage.java | 4 ++-- .../apiimpl/network/WirelessGridHandler.java | 6 +++--- .../apiimpl/network/grid/ItemGridHandler.java | 6 +++--- src/main/java/refinedstorage/block/BlockCable.java | 2 +- .../java/refinedstorage/gui/config/ModGuiConfig.java | 4 ++-- .../java/refinedstorage/item/ItemBlockController.java | 4 ++-- src/main/java/refinedstorage/item/ItemUpgrade.java | 10 +++++----- src/main/java/refinedstorage/tile/TileCable.java | 2 +- src/main/java/refinedstorage/tile/TileConstructor.java | 2 +- src/main/java/refinedstorage/tile/TileController.java | 6 +++--- src/main/java/refinedstorage/tile/TileCrafter.java | 4 ++-- .../java/refinedstorage/tile/TileCraftingMonitor.java | 2 +- src/main/java/refinedstorage/tile/TileDestructor.java | 2 +- src/main/java/refinedstorage/tile/TileDetector.java | 2 +- src/main/java/refinedstorage/tile/TileDiskDrive.java | 4 ++-- .../java/refinedstorage/tile/TileDiskManipulator.java | 2 +- src/main/java/refinedstorage/tile/TileExporter.java | 2 +- .../java/refinedstorage/tile/TileFluidInterface.java | 2 +- .../java/refinedstorage/tile/TileFluidStorage.java | 2 +- src/main/java/refinedstorage/tile/TileImporter.java | 2 +- src/main/java/refinedstorage/tile/TileInterface.java | 2 +- .../java/refinedstorage/tile/TileNetworkReceiver.java | 2 +- .../refinedstorage/tile/TileNetworkTransmitter.java | 2 +- src/main/java/refinedstorage/tile/TileRelay.java | 2 +- src/main/java/refinedstorage/tile/TileSolderer.java | 2 +- src/main/java/refinedstorage/tile/TileStorage.java | 2 +- .../refinedstorage/tile/TileWirelessTransmitter.java | 4 ++-- .../tile/externalstorage/TileExternalStorage.java | 2 +- src/main/java/refinedstorage/tile/grid/TileGrid.java | 8 ++++---- 29 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index f8b7008db..72ae546fc 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -28,7 +28,7 @@ public final class RefinedStorage { @Instance public static RefinedStorage INSTANCE; - public static RefinedStorageConfig CONFIG; + public RefinedStorageConfig config; public final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(ID); @@ -50,7 +50,7 @@ public final class RefinedStorage { @EventHandler public void preInit(FMLPreInitializationEvent e) { - CONFIG = new RefinedStorageConfig(e.getSuggestedConfigurationFile()); + config = new RefinedStorageConfig(e.getSuggestedConfigurationFile()); PROXY.preInit(e); } diff --git a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java index 1009cd4fc..3cb6c3407 100755 --- a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java @@ -55,7 +55,7 @@ public class WirelessGridHandler implements IWirelessGridHandler { ItemStack stack = player.getHeldItem(hand); - if (RefinedStorage.CONFIG.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack) <= RefinedStorage.CONFIG.wirelessGridOpenUsage) { + if (RefinedStorage.INSTANCE.config.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack) <= RefinedStorage.INSTANCE.config.wirelessGridOpenUsage) { return true; } @@ -65,7 +65,7 @@ public class WirelessGridHandler implements IWirelessGridHandler { network.sendItemStorageToClient((EntityPlayerMP) player); - drainEnergy(player, RefinedStorage.CONFIG.wirelessGridOpenUsage); + drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridOpenUsage); return true; } @@ -83,7 +83,7 @@ public class WirelessGridHandler implements IWirelessGridHandler { public void drainEnergy(EntityPlayer player, int energy) { IWirelessGridConsumer consumer = getConsumer(player); - if (consumer != null && RefinedStorage.CONFIG.wirelessGridUsesEnergy) { + if (consumer != null && RefinedStorage.INSTANCE.config.wirelessGridUsesEnergy) { ItemWirelessGrid item = RefinedStorageItems.WIRELESS_GRID; if (consumer.getStack().getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE) { diff --git a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java index e0d3c6b3e..431b716de 100755 --- a/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java @@ -77,7 +77,7 @@ public class ItemGridHandler implements IItemGridHandler { player.updateHeldItem(); } - network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.CONFIG.wirelessGridExtractUsage); + network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridExtractUsage); } } @@ -85,7 +85,7 @@ public class ItemGridHandler implements IItemGridHandler { public ItemStack onInsert(EntityPlayerMP player, ItemStack stack) { ItemStack remainder = network.insertItem(stack, stack.stackSize, false); - network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.CONFIG.wirelessGridInsertUsage); + network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridInsertUsage); return remainder; } @@ -115,7 +115,7 @@ public class ItemGridHandler implements IItemGridHandler { player.updateHeldItem(); - network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.CONFIG.wirelessGridInsertUsage); + network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridInsertUsage); } @Override diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index 3b15fc665..01aa0e5d8 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -341,6 +341,6 @@ public class BlockCable extends BlockCoverable { @Override public BlockRenderLayer getBlockLayer() { - return RefinedStorage.CONFIG.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer(); + return RefinedStorage.INSTANCE.config.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer(); } } diff --git a/src/main/java/refinedstorage/gui/config/ModGuiConfig.java b/src/main/java/refinedstorage/gui/config/ModGuiConfig.java index 74476d43d..eb7a23296 100644 --- a/src/main/java/refinedstorage/gui/config/ModGuiConfig.java +++ b/src/main/java/refinedstorage/gui/config/ModGuiConfig.java @@ -8,10 +8,10 @@ public class ModGuiConfig extends GuiConfig { public ModGuiConfig(GuiScreen guiScreen) { super(guiScreen, - RefinedStorage.CONFIG.getConfigElements(), + RefinedStorage.INSTANCE.config.getConfigElements(), RefinedStorage.ID, false, false, - GuiConfig.getAbridgedConfigPath(RefinedStorage.CONFIG.getConfig().toString())); + GuiConfig.getAbridgedConfigPath(RefinedStorage.INSTANCE.config.getConfig().toString())); } } diff --git a/src/main/java/refinedstorage/item/ItemBlockController.java b/src/main/java/refinedstorage/item/ItemBlockController.java index 628f18691..83814a6ce 100755 --- a/src/main/java/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/refinedstorage/item/ItemBlockController.java @@ -29,7 +29,7 @@ public class ItemBlockController extends ItemBlockBase { } public static int getEnergyCapacity(ItemStack stack) { - return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RefinedStorage.CONFIG.controllerCapacity; + return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RefinedStorage.INSTANCE.config.controllerCapacity; } @Override @@ -46,7 +46,7 @@ public class ItemBlockController extends ItemBlockBase { tag = new NBTTagCompound(); } - tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RefinedStorage.CONFIG.controllerCapacity : 0); + tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RefinedStorage.INSTANCE.config.controllerCapacity : 0); return stack; } diff --git a/src/main/java/refinedstorage/item/ItemUpgrade.java b/src/main/java/refinedstorage/item/ItemUpgrade.java index 4dd5c817a..dc295a624 100755 --- a/src/main/java/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/refinedstorage/item/ItemUpgrade.java @@ -34,15 +34,15 @@ public class ItemUpgrade extends ItemBase { public static int getEnergyUsage(int type) { switch (type) { case TYPE_RANGE: - return RefinedStorage.CONFIG.rangeUpgradeUsage; + return RefinedStorage.INSTANCE.config.rangeUpgradeUsage; case TYPE_SPEED: - return RefinedStorage.CONFIG.speedUpgradeUsage; + return RefinedStorage.INSTANCE.config.speedUpgradeUsage; case TYPE_CRAFTING: - return RefinedStorage.CONFIG.craftingUpgradeUsage; + return RefinedStorage.INSTANCE.config.craftingUpgradeUsage; case TYPE_STACK: - return RefinedStorage.CONFIG.stackUpgradeUsage; + return RefinedStorage.INSTANCE.config.stackUpgradeUsage; case TYPE_INTERDIMENSIONAL: - return RefinedStorage.CONFIG.interdimensionalUpgradeUsage; + return RefinedStorage.INSTANCE.config.interdimensionalUpgradeUsage; default: return 0; } diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java index 1a38f3780..f511f60d2 100755 --- a/src/main/java/refinedstorage/tile/TileCable.java +++ b/src/main/java/refinedstorage/tile/TileCable.java @@ -5,7 +5,7 @@ import refinedstorage.RefinedStorage; public class TileCable extends TileMultipartNode { @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.cableUsage; + return RefinedStorage.INSTANCE.config.cableUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index 1f198e0c8..4fae351c9 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -64,7 +64,7 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.constructorUsage + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.constructorUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java index 623cd84c8..e339a389e 100755 --- a/src/main/java/refinedstorage/tile/TileController.java +++ b/src/main/java/refinedstorage/tile/TileController.java @@ -185,7 +185,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR private List craftingTasksToCancel = new ArrayList<>(); private List craftingTasksToRead = new ArrayList<>(); - private EnergyStorage energy = new EnergyStorage(RefinedStorage.CONFIG.controllerCapacity); + private EnergyStorage energy = new EnergyStorage(RefinedStorage.INSTANCE.config.controllerCapacity); private ControllerEnergyForge energyForge = new ControllerEnergyForge(this); private IControllerEnergyIC2 energyEU; private ControllerEnergyTesla energyTesla; @@ -299,7 +299,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR wirelessGridHandler.update(); if (getType() == EnumControllerType.NORMAL) { - if (!RefinedStorage.CONFIG.controllerUsesEnergy) { + if (!RefinedStorage.INSTANCE.config.controllerUsesEnergy) { energy.setEnergyStored(energy.getMaxEnergyStored()); } else if (energy.getEnergyStored() - getEnergyUsage() >= 0) { energy.extractEnergy(getEnergyUsage(), false); @@ -809,7 +809,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public int getEnergyUsage() { - int usage = RefinedStorage.CONFIG.controllerBaseUsage; + int usage = RefinedStorage.INSTANCE.config.controllerBaseUsage; for (INetworkNode node : nodeGraph.all()) { if (node.canUpdate()) { diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index 6f2a4c83d..8d97d130f 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -85,11 +85,11 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer { @Override public int getEnergyUsage() { - int usage = RefinedStorage.CONFIG.crafterUsage + upgrades.getEnergyUsage(); + int usage = RefinedStorage.INSTANCE.config.crafterUsage + upgrades.getEnergyUsage(); for (int i = 0; i < patterns.getSlots(); ++i) { if (patterns.getStackInSlot(i) != null) { - usage += RefinedStorage.CONFIG.crafterPerPatternUsage; + usage += RefinedStorage.INSTANCE.config.crafterPerPatternUsage; } } diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java index 1a933626f..3373f1d78 100755 --- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java +++ b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java @@ -33,7 +33,7 @@ public class TileCraftingMonitor extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.craftingMonitorUsage; + return RefinedStorage.INSTANCE.config.craftingMonitorUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index 95a56d4c7..cf0559288 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -63,7 +63,7 @@ public class TileDestructor extends TileMultipartNode implements IComparable, IF @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.destructorUsage + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.destructorUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index 9bd3937f6..ec4e129e2 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -99,7 +99,7 @@ public class TileDetector extends TileNode implements IComparable, IType { @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.detectorUsage; + return RefinedStorage.INSTANCE.config.detectorUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 2173d3eeb..1101fa3a3 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -150,11 +150,11 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl @Override public int getEnergyUsage() { - int usage = RefinedStorage.CONFIG.diskDriveUsage; + int usage = RefinedStorage.INSTANCE.config.diskDriveUsage; for (int i = 0; i < disks.getSlots(); ++i) { if (disks.getStackInSlot(i) != null) { - usage += RefinedStorage.CONFIG.diskDrivePerDiskUsage; + usage += RefinedStorage.INSTANCE.config.diskDrivePerDiskUsage; } } diff --git a/src/main/java/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/refinedstorage/tile/TileDiskManipulator.java index a023daa17..8bbbc0fa5 100755 --- a/src/main/java/refinedstorage/tile/TileDiskManipulator.java +++ b/src/main/java/refinedstorage/tile/TileDiskManipulator.java @@ -163,7 +163,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.diskManipulatorUsage + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.diskManipulatorUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index f730519b6..ae4a5bf37 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -48,7 +48,7 @@ public class TileExporter extends TileMultipartNode implements IComparable, ITyp @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.exporterUsage + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.exporterUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileFluidInterface.java b/src/main/java/refinedstorage/tile/TileFluidInterface.java index c84f86c03..40937004e 100755 --- a/src/main/java/refinedstorage/tile/TileFluidInterface.java +++ b/src/main/java/refinedstorage/tile/TileFluidInterface.java @@ -134,7 +134,7 @@ public class TileFluidInterface extends TileNode implements IComparable { @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.fluidInterfaceUsage; + return RefinedStorage.INSTANCE.config.fluidInterfaceUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileFluidStorage.java b/src/main/java/refinedstorage/tile/TileFluidStorage.java index f78d1a27c..f35b92896 100755 --- a/src/main/java/refinedstorage/tile/TileFluidStorage.java +++ b/src/main/java/refinedstorage/tile/TileFluidStorage.java @@ -79,7 +79,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider, @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.fluidStorageUsage; + return RefinedStorage.INSTANCE.config.fluidStorageUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index f4d5b3fcd..f6018e723 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -53,7 +53,7 @@ public class TileImporter extends TileMultipartNode implements IComparable, IFil @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.importerUsage + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.importerUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index 9e60c212a..98f2ec9aa 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -35,7 +35,7 @@ public class TileInterface extends TileNode implements IComparable { @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.interfaceUsage + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.interfaceUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileNetworkReceiver.java b/src/main/java/refinedstorage/tile/TileNetworkReceiver.java index 24e04cc90..d7cb54227 100755 --- a/src/main/java/refinedstorage/tile/TileNetworkReceiver.java +++ b/src/main/java/refinedstorage/tile/TileNetworkReceiver.java @@ -10,7 +10,7 @@ public class TileNetworkReceiver extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.networkReceiverUsage; + return RefinedStorage.INSTANCE.config.networkReceiverUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java index bc7aee4ce..0e171f5e5 100755 --- a/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileNetworkTransmitter.java @@ -109,7 +109,7 @@ public class TileNetworkTransmitter extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RefinedStorage.CONFIG.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RefinedStorage.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage(); } public ItemHandlerBasic getNetworkCard() { diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/refinedstorage/tile/TileRelay.java index 7cae46bf8..190d4cf51 100755 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -13,7 +13,7 @@ public class TileRelay extends TileNode { @Override public int getEnergyUsage() { - return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.CONFIG.relayUsage; + return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.INSTANCE.config.relayUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 408d6cee4..40b8119f2 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -76,7 +76,7 @@ public class TileSolderer extends TileNode { @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.soldererUsage + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.soldererUsage + upgrades.getEnergyUsage(); } @Override diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index b35781154..eb2577cd2 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -79,7 +79,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.storageUsage; + return RefinedStorage.INSTANCE.config.storageUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 77f012876..29374aa7d 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -31,7 +31,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.wirelessTransmitterUsage + upgrades.getEnergyUsage(); + return RefinedStorage.INSTANCE.config.wirelessTransmitterUsage + upgrades.getEnergyUsage(); } @Override @@ -56,7 +56,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm @Override public int getRange() { - return RefinedStorage.CONFIG.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.TYPE_RANGE) * RefinedStorage.CONFIG.wirelessTransmitterRangePerUpgrade); + return RefinedStorage.INSTANCE.config.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.TYPE_RANGE) * RefinedStorage.INSTANCE.config.wirelessTransmitterRangePerUpgrade); } @Override diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index 7bf9be481..6bb66394e 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -104,7 +104,7 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora @Override public int getEnergyUsage() { - return RefinedStorage.CONFIG.externalStorageUsage + ((itemStorages.size() + fluidStorages.size()) * RefinedStorage.CONFIG.externalStoragePerStorageUsage); + return RefinedStorage.INSTANCE.config.externalStorageUsage + ((itemStorages.size() + fluidStorages.size()) * RefinedStorage.INSTANCE.config.externalStoragePerStorageUsage); } @Override diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index a14d34cbf..6827a01f8 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -184,13 +184,13 @@ public class TileGrid extends TileNode implements IGrid { public int getEnergyUsage() { switch (getType()) { case NORMAL: - return RefinedStorage.CONFIG.gridUsage; + return RefinedStorage.INSTANCE.config.gridUsage; case CRAFTING: - return RefinedStorage.CONFIG.craftingGridUsage; + return RefinedStorage.INSTANCE.config.craftingGridUsage; case PATTERN: - return RefinedStorage.CONFIG.patternGridUsage; + return RefinedStorage.INSTANCE.config.patternGridUsage; case FLUID: - return RefinedStorage.CONFIG.fluidGridUsage; + return RefinedStorage.INSTANCE.config.fluidGridUsage; default: return 0; }