From 07b1724e24bb460a7ccc7a2592536767ad9bbd13 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 1 Sep 2017 16:19:59 +0300 Subject: [PATCH] Updated max energy storage for several tools. Closes #1219 --- .../java/techreborn/config/ConfigTechReborn.java | 16 +++++++++------- .../items/battery/ItemLapotronCrystal.java | 2 +- .../items/tools/ItemElectricTreetap.java | 2 +- .../techreborn/items/tools/ItemNanosaber.java | 2 +- .../tiles/storage/TileHighVoltageSU.java | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 0c002837a..a7151fbcd 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -42,20 +42,22 @@ public class ConfigTechReborn { public static boolean enableGemArmorAndTools = true; //TODO give an annotation + //Tools public static int IronDrillCharge = 10000; public static int DiamondDrillCharge = 100000; public static int AdvancedDrillCharge = 1000000; public static int IronChainsawCharge = 10000; - public static int DiamondChainsawCharge = 10000; + public static int DiamondChainsawCharge = 100000; public static int AdvancedChainsawCharge = 1000000; - public static int SteelJackhammerCharge = 1000000; - public static int DiamondJackhammerCharge = 20000; - public static int AdvancedJackhammerCharge = 100000; - public static int LapotronPackCharge = 100000000; - public static int LithiumBatpackCharge = 4000000; - public static int LapotronicOrbMaxCharge = 20000; + public static int SteelJackhammerCharge = 10000; + public static int DiamondJackhammerCharge = 100000; + public static int AdvancedJackhammerCharge = 1000000; public static int OmniToolCharge = 20000; public static int RockCutterCharge = 10000; + + public static int LapotronPackCharge = 100000000; + public static int LithiumBatpackCharge = 4000000; + public static int LapotronicOrbMaxCharge = 100000000; public static int CloakingDeviceCharge = 10000000; public static int CentrifugeCharge = 1000000; public static int ThermalGeneratorCharge = 1000000; diff --git a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java index a2aa78973..23de21db6 100644 --- a/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java +++ b/src/main/java/techreborn/items/battery/ItemLapotronCrystal.java @@ -35,7 +35,7 @@ import techreborn.init.ModItems; public class ItemLapotronCrystal extends ItemBattery { public ItemLapotronCrystal() { - super("lapotronCrystal", 1000000, 512); + super("lapotronCrystal", 10000000, 2048); } @SuppressWarnings({ "rawtypes", "unchecked" }) diff --git a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java index e2eef7a4c..7d88ff789 100644 --- a/src/main/java/techreborn/items/tools/ItemElectricTreetap.java +++ b/src/main/java/techreborn/items/tools/ItemElectricTreetap.java @@ -57,7 +57,7 @@ import javax.annotation.Nullable; */ public class ItemElectricTreetap extends ItemTR implements IEnergyItemInfo, IEnergyInterfaceItem { - public static final int maxCharge = 5120; + public static final int maxCharge = 10000; public static final int tier = 1; public int cost = 20; diff --git a/src/main/java/techreborn/items/tools/ItemNanosaber.java b/src/main/java/techreborn/items/tools/ItemNanosaber.java index 458d06528..2b8e4880c 100644 --- a/src/main/java/techreborn/items/tools/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tools/ItemNanosaber.java @@ -202,7 +202,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, IEnergy @Override public double getMaxPower(ItemStack stack) { - return 100000; + return 40000; } @Override diff --git a/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java b/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java index a2c6fc5d6..c0b561cc9 100644 --- a/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java +++ b/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java @@ -38,10 +38,10 @@ import techreborn.init.ModBlocks; public class TileHighVoltageSU extends TileEnergyStorage implements IContainerProvider { /** - * MFSU should store 16M FE with 2048 FE/t I/O + * MFSU should store 40M FE with 2048 FE/t I/O */ public TileHighVoltageSU() { - super("HIGH_VOLTAGE_SU", 2, ModBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 4000000); + super("HIGH_VOLTAGE_SU", 2, ModBlocks.HIGH_VOLTAGE_SU, EnumPowerTier.HIGH, 512, 512, 10000000); } @Override