From 1df8a8ea02a75dfbcf663028a7ed2a78bfe3a760 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 1 Jul 2016 20:17:02 +0200 Subject: [PATCH] Apply all configs --- src/main/java/refinedstorage/item/ItemUpgrade.java | 9 +++++---- src/main/java/refinedstorage/tile/TileCable.java | 3 ++- src/main/java/refinedstorage/tile/TileConstructor.java | 3 ++- src/main/java/refinedstorage/tile/TileCrafter.java | 5 +++-- .../java/refinedstorage/tile/TileCraftingMonitor.java | 3 ++- src/main/java/refinedstorage/tile/TileDestructor.java | 3 ++- src/main/java/refinedstorage/tile/TileDetector.java | 3 ++- src/main/java/refinedstorage/tile/TileDiskDrive.java | 4 ++-- src/main/java/refinedstorage/tile/TileExporter.java | 3 ++- src/main/java/refinedstorage/tile/TileImporter.java | 3 ++- src/main/java/refinedstorage/tile/TileInterface.java | 3 ++- src/main/java/refinedstorage/tile/TileRelay.java | 3 ++- src/main/java/refinedstorage/tile/TileSolderer.java | 5 +++-- src/main/java/refinedstorage/tile/TileStorage.java | 2 +- .../refinedstorage/tile/TileWirelessTransmitter.java | 7 +++---- .../refinedstorage/tile/controller/TileController.java | 4 +++- .../tile/externalstorage/TileExternalStorage.java | 2 +- 17 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/main/java/refinedstorage/item/ItemUpgrade.java b/src/main/java/refinedstorage/item/ItemUpgrade.java index db148129b..a80cf1055 100755 --- a/src/main/java/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/refinedstorage/item/ItemUpgrade.java @@ -3,6 +3,7 @@ package refinedstorage.item; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorage; import java.util.List; @@ -30,13 +31,13 @@ public class ItemUpgrade extends ItemBase { public static int getEnergyUsage(int type) { switch (type) { case TYPE_RANGE: - return 8; + return RefinedStorage.INSTANCE.rangeUpgradeRfUsage; case TYPE_SPEED: - return 2; + return RefinedStorage.INSTANCE.speedUpgradeRfUsage; case TYPE_CRAFTING: - return 5; + return RefinedStorage.INSTANCE.craftingUpgradeRfUsage; case TYPE_STACK: - return 12; + return RefinedStorage.INSTANCE.stackUpgradeRfUsage; default: return 0; } diff --git a/src/main/java/refinedstorage/tile/TileCable.java b/src/main/java/refinedstorage/tile/TileCable.java index e1824d435..17b46026c 100755 --- a/src/main/java/refinedstorage/tile/TileCable.java +++ b/src/main/java/refinedstorage/tile/TileCable.java @@ -1,11 +1,12 @@ package refinedstorage.tile; import net.minecraft.inventory.Container; +import refinedstorage.RefinedStorage; public class TileCable extends TileSlave { @Override public int getEnergyUsage() { - return 0; + return RefinedStorage.INSTANCE.cableRfUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index 2a768bb3e..320fb8f17 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -12,6 +12,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.apiimpl.autocrafting.CraftingTaskScheduler; @@ -49,7 +50,7 @@ public class TileConstructor extends TileSlave implements ICompareConfig { @Override public int getEnergyUsage() { - return 1 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.constructorRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index 6358ba166..3a3a4c99c 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -9,6 +9,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.api.autocrafting.ICraftingPatternContainer; @@ -32,11 +33,11 @@ public class TileCrafter extends TileSlave implements ICraftingPatternContainer @Override public int getEnergyUsage() { - int usage = 2 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + int usage = RefinedStorage.INSTANCE.crafterRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); for (int i = 0; i < patterns.getSlots(); ++i) { if (patterns.getStackInSlot(i) != null) { - usage++; + usage += RefinedStorage.INSTANCE.crafterPerPatternRfUsage; } } diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java index e9b0fb1c3..eb5de6c58 100755 --- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java +++ b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.network.ByteBufUtils; +import refinedstorage.RefinedStorage; import refinedstorage.api.autocrafting.ICraftingTask; import refinedstorage.container.ContainerCraftingMonitor; @@ -16,7 +17,7 @@ public class TileCraftingMonitor extends TileSlave { @Override public int getEnergyUsage() { - return 2; + return RefinedStorage.INSTANCE.craftingMonitorRfUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java index f6c5ac3e5..3b65128d3 100755 --- a/src/main/java/refinedstorage/tile/TileDestructor.java +++ b/src/main/java/refinedstorage/tile/TileDestructor.java @@ -12,6 +12,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerDestructor; @@ -43,7 +44,7 @@ public class TileDestructor extends TileSlave implements ICompareConfig, IModeCo @Override public int getEnergyUsage() { - return 1 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.destructorRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java index e74bc18b5..fd1621066 100755 --- a/src/main/java/refinedstorage/tile/TileDetector.java +++ b/src/main/java/refinedstorage/tile/TileDetector.java @@ -6,6 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerDetector; @@ -42,7 +43,7 @@ public class TileDetector extends TileSlave implements ICompareConfig { @Override public int getEnergyUsage() { - return 2; + return RefinedStorage.INSTANCE.detectorRfUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 6d042e304..35aabeb4f 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -83,11 +83,11 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora @Override public int getEnergyUsage() { - int usage = 0; + int usage = RefinedStorage.INSTANCE.diskDriveRfUsage; for (int i = 0; i < disks.getSlots(); ++i) { if (disks.getStackInSlot(i) != null) { - usage += 1; + usage += RefinedStorage.INSTANCE.diskDrivePerDiskRfUsage; } } diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java index e77ef5f70..e6ba7bf9b 100755 --- a/src/main/java/refinedstorage/tile/TileExporter.java +++ b/src/main/java/refinedstorage/tile/TileExporter.java @@ -9,6 +9,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.apiimpl.autocrafting.CraftingTaskScheduler; @@ -36,7 +37,7 @@ public class TileExporter extends TileSlave implements ICompareConfig { @Override public int getEnergyUsage() { - return 2 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.exporterRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java index 9fac415e4..08a3e534d 100755 --- a/src/main/java/refinedstorage/tile/TileImporter.java +++ b/src/main/java/refinedstorage/tile/TileImporter.java @@ -8,6 +8,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerImporter; @@ -38,7 +39,7 @@ public class TileImporter extends TileSlave implements ICompareConfig, IModeConf @Override public int getEnergyUsage() { - return 2 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.importerRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java index cda500f30..6f39552a5 100755 --- a/src/main/java/refinedstorage/tile/TileInterface.java +++ b/src/main/java/refinedstorage/tile/TileInterface.java @@ -9,6 +9,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerInterface; @@ -36,7 +37,7 @@ public class TileInterface extends TileSlave implements ICompareConfig { @Override public int getEnergyUsage() { - return 4 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.interfaceRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override diff --git a/src/main/java/refinedstorage/tile/TileRelay.java b/src/main/java/refinedstorage/tile/TileRelay.java index 9345b0c1e..554bb8b8d 100755 --- a/src/main/java/refinedstorage/tile/TileRelay.java +++ b/src/main/java/refinedstorage/tile/TileRelay.java @@ -1,6 +1,7 @@ package refinedstorage.tile; import net.minecraft.inventory.Container; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.container.ContainerRelay; import refinedstorage.tile.config.RedstoneMode; @@ -14,7 +15,7 @@ public class TileRelay extends TileSlave { @Override public int getEnergyUsage() { - return 1; + return RefinedStorage.INSTANCE.relayRfUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index cff555750..4dc826a2d 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -9,6 +9,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.wrapper.CombinedInvWrapper; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.api.RefinedStorageAPI; @@ -35,7 +36,7 @@ public class TileSolderer extends TileSlave { @Override public int getEnergyUsage() { - return 3 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.soldererRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override @@ -60,7 +61,7 @@ public class TileSolderer extends TileSlave { markDirty(); } } else if (working) { - progress += 1 + RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_SPEED); + progress += 1 + (RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_SPEED) * RefinedStorage.INSTANCE.soldererSpeedIncreasePerUpgrade); if (progress >= recipe.getDuration()) { if (items.getStackInSlot(3) != null) { diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 40fcfe06f..3925676b6 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -63,7 +63,7 @@ public class TileStorage extends TileSlave implements IStorageProvider, IStorage @Override public int getEnergyUsage() { - return 1; + return RefinedStorage.INSTANCE.storageRfUsage; } @Override diff --git a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java index 58dba1d3c..436a09002 100755 --- a/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java +++ b/src/main/java/refinedstorage/tile/TileWirelessTransmitter.java @@ -6,6 +6,7 @@ import net.minecraft.util.EnumFacing; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerWirelessTransmitter; @@ -14,13 +15,11 @@ import refinedstorage.inventory.BasicItemValidator; import refinedstorage.item.ItemUpgrade; public class TileWirelessTransmitter extends TileSlave { - public static final int RANGE_PER_UPGRADE = 8; - private BasicItemHandler upgrades = new BasicItemHandler(4, this, new BasicItemValidator(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE)); @Override public int getEnergyUsage() { - return 8 + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); + return RefinedStorage.INSTANCE.wirelessTransmitterRfUsage + RefinedStorageUtils.getUpgradeEnergyUsage(upgrades); } @Override @@ -44,7 +43,7 @@ public class TileWirelessTransmitter extends TileSlave { } public int getRange() { - return 16 + (RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_RANGE) * RANGE_PER_UPGRADE); + return RefinedStorage.INSTANCE.wirelessTransmitterBaseRange + (RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_RANGE) * RefinedStorage.INSTANCE.wirelessTransmitterRangePerUpgrade); } public BasicItemHandler getUpgrades() { diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index 9cfc1c5d4..d81749825 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -169,7 +169,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR wirelessGridHandler.update(); if (getType() == EnumControllerType.NORMAL) { - if (energy.getEnergyStored() - energyUsage >= 0) { + if (!RefinedStorage.INSTANCE.controllerUsesRf) { + energy.setEnergyStored(energy.getMaxEnergyStored()); + } else if (energy.getEnergyStored() - energyUsage >= 0) { energy.extractEnergy(energyUsage, false); } else { energy.setEnergyStored(0); diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index 179588241..481aaef53 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -43,7 +43,7 @@ public class TileExternalStorage extends TileSlave implements IStorageProvider, @Override public int getEnergyUsage() { - return storages.size(); + return RefinedStorage.INSTANCE.externalStorageRfUsage + (storages.size() * RefinedStorage.INSTANCE.externalStoragePerStorageRfUsage); } @Override