make config non-static

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

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) {

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

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();
     }
 }

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()));
     }
 }

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

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

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

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

src/main/java/refinedstorage/tile/TileController.java

@@ -185,7 +185,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
     private List<ICraftingTask> craftingTasksToCancel = new ArrayList<>();
     private List<NBTTagCompound> 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()) {

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

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

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

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

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

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

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

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

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

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

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

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

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() {

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

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

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

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

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

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