From b594b52aa6a1f9945fb41d482c8195ee6790eb82 Mon Sep 17 00:00:00 2001 From: way2muchnoise Date: Sun, 18 Sep 2016 22:30:09 +0200 Subject: [PATCH] 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; }