diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java index 3faf1990..a37af40b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java @@ -46,6 +46,13 @@ public class BalanceConfigHandler public static int draconiumBlockChargingSpeed = 10000000; public static int energyInfuserStorage = 10000000; public static int energyInfuserMaxTransfer = 10000000; + public static long energyStorageTier1Storage = 45500000L; + public static long energyStorageTier2Storage = 273000000L; + public static long energyStorageTier3Storage = 1640000000L; + public static long energyStorageTier4Storage = 9880000000L; + public static long energyStorageTier5Storage = 59300000000L; + public static long energyStorageTier6Storage = 356000000000L; + public static long energyStorageTier7Storage = 2140000000000L; public static int grinderInternalEnergyBufferSize = 20000; public static int grinderExternalEnergyBufferSize = 100000; public static int grinderMaxReceive = 32000; @@ -165,6 +172,27 @@ public class BalanceConfigHandler getInteger("energy.machines", "Energy Infuser: Energy buffer size (RF)", energyInfuserStorage); energyInfuserMaxTransfer = getInteger("energy.machines", "Energy Infuser: Maximum energy transfer rate (RF/t)", energyInfuserMaxTransfer); + energyStorageTier1Storage = + getLong("energy.machines", "Multiblock Energy Storage Tier 1: Energy buffer size (RF)", + energyStorageTier1Storage); + energyStorageTier2Storage = + getLong("energy.machines", "Multiblock Energy Storage Tier 2: Energy buffer size (RF)", + energyStorageTier2Storage); + energyStorageTier3Storage = + getLong("energy.machines", "Multiblock Energy Storage Tier 3: Energy buffer size (RF)", + energyStorageTier3Storage); + energyStorageTier4Storage = + getLong("energy.machines", "Multiblock Energy Storage Tier 4: Energy buffer size (RF)", + energyStorageTier4Storage); + energyStorageTier5Storage = + getLong("energy.machines", "Multiblock Energy Storage Tier 5: Energy buffer size (RF)", + energyStorageTier5Storage); + energyStorageTier6Storage = + getLong("energy.machines", "Multiblock Energy Storage Tier 6: Energy buffer size (RF)", + energyStorageTier6Storage); + energyStorageTier7Storage = + getLong("energy.machines", "Multiblock Energy Storage Tier 7: Energy buffer size (RF)", + energyStorageTier7Storage); grinderInternalEnergyBufferSize = getInteger("energy.machines", "Mob Grinder: Internal energy buffer size (RF)", grinderInternalEnergyBufferSize); grinderExternalEnergyBufferSize = @@ -189,4 +217,9 @@ public class BalanceConfigHandler { return config.get(categoty, propertyName, defaultValue).getInt(defaultValue); } + private static long getLong(String category, String propertyName, long defaultValue) + { + return (long) config.get(category, propertyName, (double) defaultValue, "", 0D, (double) Long.MAX_VALUE) + .getDouble((long) defaultValue); + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java index b23e01ff..d660ea7f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java @@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles; import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.multiblock.MultiblockHelper.TileLocation; +import com.brandon3055.draconicevolution.common.handler.BalanceConfigHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileObjectSync; import com.brandon3055.draconicevolution.common.tileentities.TileParticleGenerator; @@ -606,28 +607,33 @@ public class TileEnergyStorageCore extends TileObjectSync { tile.setMaster(new TileLocation(xCoord, yCoord, zCoord)); worldObj.setBlockMetadataWithNotify(stabilizers[i].getXCoord(), stabilizers[i].getYCoord(), stabilizers[i].getZCoord(), 1, 2); } + initializeCapacity(); + } + + private void initializeCapacity() + { long capacity = 0; switch (tier){ case 0: - capacity = 45500000L; + capacity = BalanceConfigHandler.energyStorageTier1Storage; break; case 1: - capacity = 273000000L; + capacity = BalanceConfigHandler.energyStorageTier2Storage; break; case 2: - capacity = 1640000000L; + capacity = BalanceConfigHandler.energyStorageTier3Storage; break; case 3: - capacity = 9880000000L; + capacity = BalanceConfigHandler.energyStorageTier4Storage; break; case 4: - capacity = 59300000000L; + capacity = BalanceConfigHandler.energyStorageTier5Storage; break; case 5: - capacity = 356000000000L; + capacity = BalanceConfigHandler.energyStorageTier6Storage; break; case 6: - capacity = 2140000000000L; + capacity = BalanceConfigHandler.energyStorageTier7Storage; break; } this.capacity = capacity; @@ -710,32 +716,7 @@ public class TileEnergyStorageCore extends TileObjectSync { if (stabilizers[i] != null) stabilizers[i].readFromNBT(compound, String.valueOf(i)); } - long capacity = 0; - switch (tier){ - case 0: - capacity = 45500000L;//000 - break; - case 1: - capacity = 273000000L;//000 - break; - case 2: - capacity = 1640000000L;//000 - break; - case 3: - capacity = 9880000000L;//000 - break; - case 4: - capacity = 59300000000L;//000 - break; - case 5: - capacity = 356000000000L;//000 - break; - case 6: - capacity = 2140000000000L;//000 - break; - } - this.capacity = capacity; - if (energy > capacity) energy = capacity; + initializeCapacity(); super.readFromNBT(compound); }