From f96e55737f3393a9fc94e52f4503a5045092be66 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Tue, 21 Jul 2015 14:49:05 +0100 Subject: [PATCH 1/3] fixed charge hud showing when disabled closes #84 --- src/main/java/techreborn/client/hud/ChargeHud.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index 375b55785..b9cbfcf66 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -40,7 +40,10 @@ public class ChargeHud return; if (mc.inGameHasFocus || (mc.currentScreen != null && mc.gameSettings.showDebugInfo)) - drawChargeHud(event.resolution); + { + if (ConfigTechReborn.ShowChargeHud) + drawChargeHud(event.resolution); + } } public void drawChargeHud(ScaledResolution res) From 0880ffac72147065beb0cabdc119a98ee9ec1762 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Tue, 21 Jul 2015 17:53:20 +0100 Subject: [PATCH 2/3] Added configs to Aesu --- .../java/techreborn/client/hud/ChargeHud.java | 2 +- .../techreborn/config/ConfigTechReborn.java | 1521 ++++++----------- src/main/java/techreborn/tiles/TileAesu.java | 4 +- 3 files changed, 537 insertions(+), 990 deletions(-) diff --git a/src/main/java/techreborn/client/hud/ChargeHud.java b/src/main/java/techreborn/client/hud/ChargeHud.java index b9cbfcf66..d331737f5 100644 --- a/src/main/java/techreborn/client/hud/ChargeHud.java +++ b/src/main/java/techreborn/client/hud/ChargeHud.java @@ -42,7 +42,7 @@ public class ChargeHud if (mc.inGameHasFocus || (mc.currentScreen != null && mc.gameSettings.showDebugInfo)) { if (ConfigTechReborn.ShowChargeHud) - drawChargeHud(event.resolution); + drawChargeHud(event.resolution); } } diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index c067c4890..7d2ba61e6 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -6,1086 +6,633 @@ import net.minecraftforge.common.config.Configuration; import java.io.File; public class ConfigTechReborn { - private static ConfigTechReborn instance = null; - public static String CATEGORY_WORLD = "world"; - public static String CATEGORY_POWER = "power"; - public static String CATEGORY_CRAFTING = "crafting"; - public static String CATEGORY_UU = "uu"; - public static String CATEGORY_EMC = "emc"; + private static ConfigTechReborn instance = null; + public static String CATEGORY_WORLD = "world"; + public static String CATEGORY_POWER = "power"; + public static String CATEGORY_CRAFTING = "crafting"; + public static String CATEGORY_UU = "uu"; + public static String CATEGORY_EMC = "emc"; - // WORLDGEN - public static boolean GalenaOreTrue; - public static int GalenaOreRare; + // WORLDGEN + public static boolean GalenaOreTrue; + public static int GalenaOreRare; - public static boolean IridiumOreTrue; - public static int IridiumOreRare; + public static boolean IridiumOreTrue; + public static int IridiumOreRare; - public static boolean RubyOreTrue; - public static int RubyOreRare; + public static boolean RubyOreTrue; + public static int RubyOreRare; - public static boolean SapphireOreTrue; - public static int SapphireOreRare; + public static boolean SapphireOreTrue; + public static int SapphireOreRare; - public static boolean BauxiteOreTrue; - public static int BauxiteOreRare; + public static boolean BauxiteOreTrue; + public static int BauxiteOreRare; - public static boolean TetrahedriteOreTrue; - public static int TetrahedriteOreRare; + public static boolean TetrahedriteOreTrue; + public static int TetrahedriteOreRare; - public static boolean CassiteriteOreTrue; - public static int CassiteriteOreRare; + public static boolean CassiteriteOreTrue; + public static int CassiteriteOreRare; - public static boolean LeadOreTrue; - public static int LeadOreRare; + public static boolean LeadOreTrue; + public static int LeadOreRare; - public static boolean SilverOreTrue; - public static int SilverOreRare; + public static boolean SilverOreTrue; + public static int SilverOreRare; - public static boolean PyriteOreTrue; - public static int PyriteOreRare; + public static boolean PyriteOreTrue; + public static int PyriteOreRare; - public static boolean CinnabarOreTrue; - public static int CinnabarOreRare; + public static boolean CinnabarOreTrue; + public static int CinnabarOreRare; - public static boolean SphaleriteOreTrue; - public static int SphaleriteOreRare; + public static boolean SphaleriteOreTrue; + public static int SphaleriteOreRare; - public static boolean TungstenOreTrue; - public static int TungstenOreRare; + public static boolean TungstenOreTrue; + public static int TungstenOreRare; - public static boolean SheldoniteOreTrue; - public static int SheldoniteOreRare; + public static boolean SheldoniteOreTrue; + public static int SheldoniteOreRare; - public static boolean PeridotOreTrue; - public static int PeridotOreRare; + public static boolean PeridotOreTrue; + public static int PeridotOreRare; - public static boolean SodaliteOreTrue; - public static int SodaliteOreRare; + public static boolean SodaliteOreTrue; + public static int SodaliteOreRare; - public static double FortuneSecondaryOreMultiplierPerLevel; + public static double FortuneSecondaryOreMultiplierPerLevel; - // Power - public static int ThermalGenertaorOutput; - public static int CentrifugeInputTick; - public static int DragoneggsiphonerOutput; - public static int heatGeneratorOutput; - public static int aveargeEuOutTickTime; + // Power + public static int ThermalGenertaorOutput; + public static int CentrifugeInputTick; + public static int DragoneggsiphonerOutput; + public static int heatGeneratorOutput; + public static int aveargeEuOutTickTime; public static int extraOutputPerLesuBlock; public static int baseLesuOutput; public static int lesuStoragePerBlock; public static int euPerRF; - public static int farmEu; - // Charge - public static int AdvancedDrillCharge; - public static int LapotronPackCharge; - public static int LithiumBatpackCharge; + public static int farmEu; + public static int aesuMaxOutput; + public static int aesuMaxStorage; + // Charge + public static int AdvancedDrillCharge; + public static int LapotronPackCharge; + public static int LithiumBatpackCharge; public static int LapotronicOrbMaxCharge; - public static int OmniToolCharge; - public static int RockCutterCharge; - public static int GravityCharge; - public static int CentrifugeCharge; - public static int ThermalGeneratorCharge; - // Tier - public static int AdvancedDrillTier; - public static int LapotronPackTier; + public static int OmniToolCharge; + public static int RockCutterCharge; + public static int GravityCharge; + public static int CentrifugeCharge; + public static int ThermalGeneratorCharge; + // Tier + public static int AdvancedDrillTier; + public static int LapotronPackTier; public static int LapotronicOrbTier; - public static int LithiumBatpackTier; - public static int OmniToolTier; - public static int RockCutterTier; - public static int GravityTier; - public static int CentrifugeTier; - public static int ThermalGeneratorTier; - // Crafting - public static boolean ExpensiveMacerator; - public static boolean ExpensiveDrill; - public static boolean ExpensiveDiamondDrill; - public static boolean ExpensiveSolar; + public static int LithiumBatpackTier; + public static int OmniToolTier; + public static int RockCutterTier; + public static int GravityTier; + public static int CentrifugeTier; + public static int ThermalGeneratorTier; + // Crafting + public static boolean ExpensiveMacerator; + public static boolean ExpensiveDrill; + public static boolean ExpensiveDiamondDrill; + public static boolean ExpensiveSolar; - // UU - public static boolean HideUuRecipes; - public static boolean UUrecipesIridiamOre; - public static boolean UUrecipesWood; - public static boolean UUrecipesStone; - public static boolean UUrecipesSnowBlock; - public static boolean UUrecipesGrass; - public static boolean UUrecipesObsidian; - public static boolean UUrecipesGlass; - public static boolean UUrecipesWater; - public static boolean UUrecipesLava; - public static boolean UUrecipesCocoa; - public static boolean UUrecipesGunpowder; - public static boolean UUrecipesGlowstoneBlock; - public static boolean UUrecipesCactus; - public static boolean UUrecipesSugarCane; - public static boolean UUrecipesVine; - public static boolean UUrecipesSnowBall; - public static boolean UUrecipeslilypad; - public static boolean UUrecipesBone; - public static boolean UUrecipesFeather; - public static boolean UUrecipesInk; - public static boolean UUrecipesEnderPearl; - public static boolean UUrecipesCoal; - public static boolean UUrecipesIronOre; - public static boolean UUrecipesIronDust; - public static boolean UUrecipesGoldOre; - public static boolean UUrecipesGoldDust; - public static boolean UUrecipesRedStone; - public static boolean UUrecipesLapis; - public static boolean UUrecipesEmeraldOre; - public static boolean UUrecipesEmerald; - public static boolean UUrecipesDiamond; - public static boolean UUrecipesResin; - public static boolean UUrecipesTinDust; - public static boolean UUrecipesCopperDust; - public static boolean UUrecipesLeadDust; - public static boolean UUrecipesPlatinumDust; - public static boolean UUrecipesTungstenDust; - public static boolean UUrecipesTitaniumDust; - public static boolean UUrecipesAluminumDust; - - //EMC - - // Client - public static boolean ShowChargeHud; + // UU + public static boolean HideUuRecipes; + public static boolean UUrecipesIridiamOre; + public static boolean UUrecipesWood; + public static boolean UUrecipesStone; + public static boolean UUrecipesSnowBlock; + public static boolean UUrecipesGrass; + public static boolean UUrecipesObsidian; + public static boolean UUrecipesGlass; + public static boolean UUrecipesWater; + public static boolean UUrecipesLava; + public static boolean UUrecipesCocoa; + public static boolean UUrecipesGunpowder; + public static boolean UUrecipesGlowstoneBlock; + public static boolean UUrecipesCactus; + public static boolean UUrecipesSugarCane; + public static boolean UUrecipesVine; + public static boolean UUrecipesSnowBall; + public static boolean UUrecipeslilypad; + public static boolean UUrecipesBone; + public static boolean UUrecipesFeather; + public static boolean UUrecipesInk; + public static boolean UUrecipesEnderPearl; + public static boolean UUrecipesCoal; + public static boolean UUrecipesIronOre; + public static boolean UUrecipesIronDust; + public static boolean UUrecipesGoldOre; + public static boolean UUrecipesGoldDust; + public static boolean UUrecipesRedStone; + public static boolean UUrecipesLapis; + public static boolean UUrecipesEmeraldOre; + public static boolean UUrecipesEmerald; + public static boolean UUrecipesDiamond; + public static boolean UUrecipesResin; + public static boolean UUrecipesTinDust; + public static boolean UUrecipesCopperDust; + public static boolean UUrecipesLeadDust; + public static boolean UUrecipesPlatinumDust; + public static boolean UUrecipesTungstenDust; + public static boolean UUrecipesTitaniumDust; + public static boolean UUrecipesAluminumDust; - public static Configuration config; + // EMC - private ConfigTechReborn(File configFile) { - config = new Configuration(configFile); - config.load(); + // Client + public static boolean ShowChargeHud; - ConfigTechReborn.Configs(); + public static Configuration config; - config.save(); + private ConfigTechReborn(File configFile) { + config = new Configuration(configFile); + config.load(); - } + ConfigTechReborn.Configs(); - public static ConfigTechReborn initialize(File configFile) { + config.save(); - if (instance == null) - instance = new ConfigTechReborn(configFile); - else - throw new IllegalStateException( - "Cannot initialize TechReborn Config twice"); + } - return instance; - } + public static ConfigTechReborn initialize(File configFile) { - public static ConfigTechReborn instance() { - if (instance == null) { + if (instance == null) + instance = new ConfigTechReborn(configFile); + else + throw new IllegalStateException("Cannot initialize TechReborn Config twice"); - throw new IllegalStateException( - "Instance of TechReborn Config requested before initialization"); - } - return instance; - } + return instance; + } - public static void Configs() { - GalenaOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.galenaOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.galenaOre.tooltip")) - .getBoolean(true); - IridiumOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.iridiumOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.iridiumOre.tooltip")) - .getBoolean(true); - RubyOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.rubyOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.rubyOre.tooltip")) - .getBoolean(true); - SapphireOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.sapphireOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.sapphireOre.tooltip")) - .getBoolean(true); - BauxiteOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.bauxiteOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.bauxiteOre.tooltip")) - .getBoolean(true); - TetrahedriteOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.copperOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.copperOre.tooltip")) - .getBoolean(true); - CassiteriteOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.tinOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.tinOre.tooltip")) - .getBoolean(true); - LeadOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.leadOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.leadOre.tooltip")) - .getBoolean(true); - SilverOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.silverOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.silverOre.tooltip")) - .getBoolean(true); - PyriteOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.pyriteOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.pyriteOre.tooltip")) - .getBoolean(true); - CinnabarOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.cinnabarOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.cinnabarOre.tooltip")) - .getBoolean(true); - SphaleriteOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.sphaleriteOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.sphaleriteOre.tooltip")) - .getBoolean(true); - TungstenOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.tungstonOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.tungstonOre.tooltip")) - .getBoolean(true); - SheldoniteOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.sheldoniteOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.sheldoniteOre.tooltip")) - .getBoolean(true); - PeridotOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.olivineOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.olivineOre.tooltip")) - .getBoolean(true); - SodaliteOreTrue = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.allow.sodaliteOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.sodaliteOre.tooltip")) - .getBoolean(true); - GalenaOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.galenaOre.rare"), - 8, - StatCollector - .translateToLocal("config.techreborn.galenaOre.rare.tooltip")) - .getInt(); - IridiumOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.iridiumOre.rare"), - 1, - StatCollector - .translateToLocal("config.techreborn.iridiumOre.rare.tooltip")) - .getInt(); + public static ConfigTechReborn instance() { + if (instance == null) { - RubyOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.rubyOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.rubyOre.rare.tooltip")) - .getInt(); + throw new IllegalStateException("Instance of TechReborn Config requested before initialization"); + } + return instance; + } - SapphireOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.sapphireOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.sapphireOre.rare.tooltip")) - .getInt(); + public static void Configs() { + GalenaOreTrue = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.galenaOre"), + true, StatCollector.translateToLocal("config.techreborn.allow.galenaOre.tooltip")).getBoolean(true); + IridiumOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.iridiumOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.iridiumOre.tooltip")) + .getBoolean(true); + RubyOreTrue = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.rubyOre"), + true, StatCollector.translateToLocal("config.techreborn.allow.rubyOre.tooltip")).getBoolean(true); + SapphireOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.sapphireOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.sapphireOre.tooltip")) + .getBoolean(true); + BauxiteOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.bauxiteOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.bauxiteOre.tooltip")) + .getBoolean(true); + TetrahedriteOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.copperOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.copperOre.tooltip")) + .getBoolean(true); + CassiteriteOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.tinOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.tinOre.tooltip")) + .getBoolean(true); + LeadOreTrue = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.leadOre"), + true, StatCollector.translateToLocal("config.techreborn.allow.leadOre.tooltip")).getBoolean(true); + SilverOreTrue = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.silverOre"), + true, StatCollector.translateToLocal("config.techreborn.allow.silverOre.tooltip")).getBoolean(true); + PyriteOreTrue = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.pyriteOre"), + true, StatCollector.translateToLocal("config.techreborn.allow.pyriteOre.tooltip")).getBoolean(true); + CinnabarOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.cinnabarOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.cinnabarOre.tooltip")) + .getBoolean(true); + SphaleriteOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.sphaleriteOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.sphaleriteOre.tooltip")) + .getBoolean(true); + TungstenOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.tungstonOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.tungstonOre.tooltip")) + .getBoolean(true); + SheldoniteOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.sheldoniteOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.sheldoniteOre.tooltip")) + .getBoolean(true); + PeridotOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.olivineOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.olivineOre.tooltip")) + .getBoolean(true); + SodaliteOreTrue = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.allow.sodaliteOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.sodaliteOre.tooltip")) + .getBoolean(true); + GalenaOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.galenaOre.rare"), + 8, StatCollector.translateToLocal("config.techreborn.galenaOre.rare.tooltip")).getInt(); + IridiumOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.iridiumOre.rare"), + 1, StatCollector.translateToLocal("config.techreborn.iridiumOre.rare.tooltip")).getInt(); - BauxiteOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.bauxiteOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.bauxiteOre.rare.tooltip")) - .getInt(); + RubyOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.rubyOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.rubyOre.rare.tooltip")).getInt(); - PyriteOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.pyriteOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.pyriteOre.rare.tooltip")) - .getInt(); + SapphireOreRare = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.sapphireOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.sapphireOre.rare.tooltip")) + .getInt(); - CinnabarOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.cinnabarOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.cinnabarOre.rare.tooltip")) - .getInt(); + BauxiteOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.bauxiteOre.rare"), + 6, StatCollector.translateToLocal("config.techreborn.bauxiteOre.rare.tooltip")).getInt(); - SphaleriteOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.sphaleriteOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.sphaleriteOre.rare.tooltip")) - .getInt(); + PyriteOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.pyriteOre.rare"), + 6, StatCollector.translateToLocal("config.techreborn.pyriteOre.rare.tooltip")).getInt(); - TungstenOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.tungstenOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.tungstenOre.rare.tooltip")) - .getInt(); + CinnabarOreRare = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.cinnabarOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.cinnabarOre.rare.tooltip")) + .getInt(); - SheldoniteOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.sheldoniteOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.sheldoniteOre.rare.tooltip")) - .getInt(); + SphaleriteOreRare = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.sphaleriteOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.sphaleriteOre.rare.tooltip")) + .getInt(); - PeridotOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.olivineOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.olivineOre.rare.tooltip")) - .getInt(); + TungstenOreRare = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.tungstenOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.tungstenOre.rare.tooltip")) + .getInt(); - SodaliteOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.sodaliteOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.sodaliteOre.rare.tooltip")) - .getInt(); + SheldoniteOreRare = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.sheldoniteOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.sheldoniteOre.rare.tooltip")) + .getInt(); - TetrahedriteOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.copperOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.copperOre.rare.tooltip")) - .getInt(); + PeridotOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.olivineOre.rare"), + 6, StatCollector.translateToLocal("config.techreborn.olivineOre.rare.tooltip")).getInt(); - CassiteriteOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.tinOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.tinOre.rare.tooltip")) - .getInt(); + SodaliteOreRare = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.sodaliteOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.sodaliteOre.rare.tooltip")) + .getInt(); - LeadOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.leadOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.leadOre.rare.tooltip")) - .getInt(); + TetrahedriteOreRare = config + .get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.copperOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.copperOre.rare.tooltip")) + .getInt(); - SilverOreRare = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.silverOre.rare"), - 6, - StatCollector - .translateToLocal("config.techreborn.silverOre.rare.tooltip")) - .getInt(); + CassiteriteOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.tinOre.rare"), + 6, StatCollector.translateToLocal("config.techreborn.tinOre.rare.tooltip")).getInt(); - FortuneSecondaryOreMultiplierPerLevel = config - .get(CATEGORY_WORLD, - StatCollector - .translateToLocal("config.techreborn.fortuneSecondaryOreMultiplierPerLevel"), - 0.5, - StatCollector - .translateToLocal("config.techreborn.fortuneSecondaryOreMultiplierPerLevel.tooltip")) - .getDouble(); - - // Power - ThermalGenertaorOutput = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.thermalGeneratorPower"), - 30, - StatCollector - .translateToLocal("config.techreborn.thermalGeneratorPower.tooltip")) + LeadOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.leadOre.rare"), 6, + StatCollector.translateToLocal("config.techreborn.leadOre.rare.tooltip")).getInt(); - .getInt(); - DragoneggsiphonerOutput = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.dragoneggsiphonerPower"), - 30, - StatCollector - .translateToLocal("config.techreborn.dragoneggsiphonerPower.tooltip")) + SilverOreRare = config.get(CATEGORY_WORLD, StatCollector.translateToLocal("config.techreborn.silverOre.rare"), + 6, StatCollector.translateToLocal("config.techreborn.silverOre.rare.tooltip")).getInt(); - .getInt(); - CentrifugeInputTick = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.centrifugePowerUsage"), - 5, - StatCollector - .translateToLocal("config.techreborn.centrifugePowerUsage.tooltip")) - .getInt(); - heatGeneratorOutput = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.heatGeneratorOutput"), - 1, - StatCollector - .translateToLocal("config.techreborn.heatGeneratorOutput.tooltip")) + FortuneSecondaryOreMultiplierPerLevel = config + .get(CATEGORY_WORLD, + StatCollector.translateToLocal("config.techreborn.fortuneSecondaryOreMultiplierPerLevel"), 0.5, + StatCollector + .translateToLocal("config.techreborn.fortuneSecondaryOreMultiplierPerLevel.tooltip")) + .getDouble(); - .getInt(); + // Power + ThermalGenertaorOutput = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.thermalGeneratorPower"), 30, + StatCollector.translateToLocal("config.techreborn.thermalGeneratorPower.tooltip")) - // Charge - AdvancedDrillCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.advancedDrillMaxCharge"), - 60000, - StatCollector - .translateToLocal("config.techreborn.advancedDrillMaxCharge.tooltip")) - .getInt(); - LapotronPackCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.lapotronPackMaxCharge"), - 100000000, - StatCollector - .translateToLocal("config.techreborn.lapotronPackMaxCharge.tooltop")) - .getInt(); + .getInt(); + DragoneggsiphonerOutput = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.dragoneggsiphonerPower"), 30, + StatCollector.translateToLocal("config.techreborn.dragoneggsiphonerPower.tooltip")) + + .getInt(); + CentrifugeInputTick = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.centrifugePowerUsage"), 5, + StatCollector.translateToLocal("config.techreborn.centrifugePowerUsage.tooltip")) + .getInt(); + heatGeneratorOutput = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.heatGeneratorOutput"), 1, + StatCollector.translateToLocal("config.techreborn.heatGeneratorOutput.tooltip")) + .getInt(); + + aesuMaxOutput = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.aesuMaxOutput"), 8192, + StatCollector.translateToLocal("config.techreborn.aesuMaxOutput.tooltip")) + .getInt(); + aesuMaxStorage = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.aesuMaxStorage"), 1000000000, + StatCollector.translateToLocal("config.techreborn.aesuMaxStorage.tooltip")) + .getInt(); + + // Charge + AdvancedDrillCharge = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.advancedDrillMaxCharge"), 60000, + StatCollector.translateToLocal("config.techreborn.advancedDrillMaxCharge.tooltip")) + .getInt(); + LapotronPackCharge = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.lapotronPackMaxCharge"), + 100000000, StatCollector.translateToLocal("config.techreborn.lapotronPackMaxCharge.tooltop")) + .getInt(); LapotronicOrbMaxCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.lapotronicOrbMaxCharge"), - 10000000, - StatCollector - .translateToLocal("config.techreborn.lapotronicOrbMaxCharge")) - .getInt(); - LithiumBatpackCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.lithiumBatpackMaxCharge"), - 4000000, - StatCollector - .translateToLocal("config.techreborn.lithiumBatpackMaxCharge.tooltip")) - .getInt(); - OmniToolCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.omniToolMaxCharge"), - 20000, - StatCollector - .translateToLocal("config.techreborn.omniToolMaxCharge.tooltip")) - .getInt(); - RockCutterCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.rockCutterMaxCharge"), - 10000, - StatCollector - .translateToLocal("config.techreborn.rockCutterMaxCharge.tooltip")) - .getInt(); - GravityCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.gravityChestplateMaxCharge"), - 100000, - StatCollector - .translateToLocal("config.techreborn.gravityChestplateMaxCharge.tooltip")) - .getInt(); - CentrifugeCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.centrifugeMaxCharge"), - 1000000, - StatCollector - .translateToLocal("config.techreborn.centrifugeMaxCharge.tooltip")) - .getInt(); - ThermalGeneratorCharge = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.thermalGeneratorMaxCharge"), - 1000000, - StatCollector - .translateToLocal("config.techreborn.thermalGeneratorMaxCharge.tooltip")) - .getInt(); - aveargeEuOutTickTime = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.aveargeEuOutTickTime"), - 100, - StatCollector - .translateToLocal("config.techreborn.aveargeEuOutTickTime.tooltip")) - .getInt(); - lesuStoragePerBlock = config.get(CATEGORY_POWER, - StatCollector.translateToLocal("config.techreborn.lesuStoragePerBlock"), - 1000000, - StatCollector.translateToLocal("config.techreborn.lesuStoragePerBlock.tooltip")) + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.lapotronicOrbMaxCharge"), + 10000000, StatCollector.translateToLocal("config.techreborn.lapotronicOrbMaxCharge")) .getInt(); - baseLesuOutput = config.get(CATEGORY_POWER, - StatCollector.translateToLocal("config.techreborn.baseLesuOutput"), - 16, - StatCollector.translateToLocal("config.techreborn.baseLesuOutput.tooltip")) + LithiumBatpackCharge = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.lithiumBatpackMaxCharge"), + 4000000, StatCollector.translateToLocal("config.techreborn.lithiumBatpackMaxCharge.tooltip")) .getInt(); - extraOutputPerLesuBlock = config.get(CATEGORY_POWER, - StatCollector.translateToLocal("config.techreborn.extraOutputPerLesuBlock"), - 8, - StatCollector.translateToLocal("config.techreborn.extraOutputPerLesuBlock.tooltip")) + OmniToolCharge = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.omniToolMaxCharge"), 20000, + StatCollector.translateToLocal("config.techreborn.omniToolMaxCharge.tooltip")) .getInt(); - euPerRF = config.get(CATEGORY_POWER, - StatCollector.translateToLocal("config.techreborn.euPerRF"), - 4, - StatCollector.translateToLocal("config.techreborn.euPerRF.tooltip")) + RockCutterCharge = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.rockCutterMaxCharge"), 10000, + StatCollector.translateToLocal("config.techreborn.rockCutterMaxCharge.tooltip")) .getInt(); - farmEu = config.get(CATEGORY_POWER, - StatCollector.translateToLocal("config.techreborn.farmeu"), - 32, - StatCollector.translateToLocal("config.techreborn.farmeu.tooltip")) - .getInt(); + GravityCharge = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.gravityChestplateMaxCharge"), + 100000, StatCollector.translateToLocal("config.techreborn.gravityChestplateMaxCharge.tooltip")) + .getInt(); + CentrifugeCharge = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.centrifugeMaxCharge"), 1000000, + StatCollector.translateToLocal("config.techreborn.centrifugeMaxCharge.tooltip")) + .getInt(); + ThermalGeneratorCharge = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.thermalGeneratorMaxCharge"), + 1000000, StatCollector.translateToLocal("config.techreborn.thermalGeneratorMaxCharge.tooltip")) + .getInt(); + aveargeEuOutTickTime = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.aveargeEuOutTickTime"), 100, + StatCollector.translateToLocal("config.techreborn.aveargeEuOutTickTime.tooltip")) + .getInt(); + lesuStoragePerBlock = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.lesuStoragePerBlock"), 1000000, + StatCollector.translateToLocal("config.techreborn.lesuStoragePerBlock.tooltip")) + .getInt(); + baseLesuOutput = config.get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.baseLesuOutput"), + 16, StatCollector.translateToLocal("config.techreborn.baseLesuOutput.tooltip")).getInt(); + extraOutputPerLesuBlock = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.extraOutputPerLesuBlock"), 8, + StatCollector.translateToLocal("config.techreborn.extraOutputPerLesuBlock.tooltip")) + .getInt(); + euPerRF = config.get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.euPerRF"), 4, + StatCollector.translateToLocal("config.techreborn.euPerRF.tooltip")).getInt(); + farmEu = config.get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.farmeu"), 32, + StatCollector.translateToLocal("config.techreborn.farmeu.tooltip")).getInt(); - - - // Teir - AdvancedDrillTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.advancedDrillTier"), - 2, - StatCollector - .translateToLocal("config.techreborn.advancedDrillTier.tooltip")) - .getInt(); - LapotronPackTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.lapotronPackTier"), - 2, - StatCollector - .translateToLocal("config.techreborn.lapotronPackTier.tooltip")) - .getInt(); + // Teir + AdvancedDrillTier = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.advancedDrillTier"), 2, + StatCollector.translateToLocal("config.techreborn.advancedDrillTier.tooltip")) + .getInt(); + LapotronPackTier = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.lapotronPackTier"), 2, + StatCollector.translateToLocal("config.techreborn.lapotronPackTier.tooltip")) + .getInt(); LapotronicOrbTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.lapotronicOrbTier"), - 2, - StatCollector - .translateToLocal("config.techreborn.lapotronicOrbTier.tooltip")) - .getInt(); - LithiumBatpackTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.lithiumBatpackTier"), - 3, - StatCollector - .translateToLocal("config.techreborn.lithiumBatpackTier.tooltip")) - .getInt(); - OmniToolTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.omniToolTier"), - 3, - StatCollector - .translateToLocal("config.techreborn.omniToolTier.tooltip")) - .getInt(); - RockCutterTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.rockCutterTier"), - 3, - StatCollector - .translateToLocal("config.techreborn.rockCutterTier.tooltip")) - .getInt(); - GravityTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.gravityChestplateTier"), - 3, - StatCollector - .translateToLocal("config.techreborn.gravityChestplateTier.tooltip")) - .getInt(); - CentrifugeTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.centrifugeTier"), - 1, - StatCollector - .translateToLocal("config.techreborn.centrifugeTier.tooltip")) - .getInt(); - ThermalGeneratorTier = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.thermalGeneratorTier"), - 1, - StatCollector - .translateToLocal("config.techreborn.thermalGeneratorTier.tooltip")) - .getInt(); + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.lapotronicOrbTier"), 2, + StatCollector.translateToLocal("config.techreborn.lapotronicOrbTier.tooltip")) + .getInt(); + LithiumBatpackTier = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.lithiumBatpackTier"), 3, + StatCollector.translateToLocal("config.techreborn.lithiumBatpackTier.tooltip")) + .getInt(); + OmniToolTier = config.get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.omniToolTier"), 3, + StatCollector.translateToLocal("config.techreborn.omniToolTier.tooltip")).getInt(); + RockCutterTier = config.get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.rockCutterTier"), + 3, StatCollector.translateToLocal("config.techreborn.rockCutterTier.tooltip")).getInt(); + GravityTier = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.gravityChestplateTier"), 3, + StatCollector.translateToLocal("config.techreborn.gravityChestplateTier.tooltip")) + .getInt(); + CentrifugeTier = config.get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.centrifugeTier"), + 1, StatCollector.translateToLocal("config.techreborn.centrifugeTier.tooltip")).getInt(); + ThermalGeneratorTier = config + .get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.thermalGeneratorTier"), 1, + StatCollector.translateToLocal("config.techreborn.thermalGeneratorTier.tooltip")) + .getInt(); - // Crafting - ExpensiveMacerator = config - .get(CATEGORY_CRAFTING, - StatCollector - .translateToLocal("config.techreborn.allowExpensiveMacerator"), - true, - StatCollector - .translateToLocal("config.techreborn.allowExpensiveMacerator.tooltip")) - .getBoolean(true); - ExpensiveDrill = config - .get(CATEGORY_CRAFTING, - StatCollector - .translateToLocal("config.techreborn.allowExpensiveDrill"), - true, - StatCollector - .translateToLocal("config.techreborn.allowExpensiveDrill.tooltip")) - .getBoolean(true); - ExpensiveDiamondDrill = config - .get(CATEGORY_CRAFTING, - StatCollector - .translateToLocal("config.techreborn.allowExpensiveDiamondDrill"), - true, - StatCollector - .translateToLocal("config.techreborn.allowExpensiveDiamondDrill.tooltip")) - .getBoolean(true); - ExpensiveSolar = config - .get(CATEGORY_CRAFTING, - StatCollector - .translateToLocal("config.techreborn.allowExpensiveSolarPanels"), - true, - StatCollector - .translateToLocal("config.techreborn.allowExpensiveSolarPanels.tooltip")) - .getBoolean(true); - // Uu - HideUuRecipes = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.hiderecipes"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.hiderecipes.tooltip")) - .getBoolean(true); - UUrecipesIridiamOre = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesIridiamOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesIridiamOre.tooltip")) - .getBoolean(true); - UUrecipesWood = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesWood"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesWood.tooltip")) - .getBoolean(true); + // Crafting + ExpensiveMacerator = config + .get(CATEGORY_CRAFTING, StatCollector.translateToLocal("config.techreborn.allowExpensiveMacerator"), + true, StatCollector.translateToLocal("config.techreborn.allowExpensiveMacerator.tooltip")) + .getBoolean(true); + ExpensiveDrill = config + .get(CATEGORY_CRAFTING, StatCollector.translateToLocal("config.techreborn.allowExpensiveDrill"), true, + StatCollector.translateToLocal("config.techreborn.allowExpensiveDrill.tooltip")) + .getBoolean(true); + ExpensiveDiamondDrill = config + .get(CATEGORY_CRAFTING, StatCollector.translateToLocal("config.techreborn.allowExpensiveDiamondDrill"), + true, StatCollector.translateToLocal("config.techreborn.allowExpensiveDiamondDrill.tooltip")) + .getBoolean(true); + ExpensiveSolar = config + .get(CATEGORY_CRAFTING, StatCollector.translateToLocal("config.techreborn.allowExpensiveSolarPanels"), + true, StatCollector.translateToLocal("config.techreborn.allowExpensiveSolarPanels.tooltip")) + .getBoolean(true); + // Uu + HideUuRecipes = config.get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.hiderecipes"), + true, StatCollector.translateToLocal("config.techreborn.allow.hiderecipes.tooltip")).getBoolean(true); + UUrecipesIridiamOre = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesIridiamOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesIridiamOre.tooltip")) + .getBoolean(true); + UUrecipesWood = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesWood"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesWood.tooltip")) + .getBoolean(true); - UUrecipesStone = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesStone"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesStone.tooltip")) - .getBoolean(true); + UUrecipesStone = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesStone"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesStone.tooltip")) + .getBoolean(true); - UUrecipesSnowBlock = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesSnowBlock"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesSnowBlock.tooltip")) - .getBoolean(true); + UUrecipesSnowBlock = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesSnowBlock"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesSnowBlock.tooltip")) + .getBoolean(true); - UUrecipesGrass = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesGrass"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesGrass.tooltip")) - .getBoolean(true); + UUrecipesGrass = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesGrass"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesGrass.tooltip")) + .getBoolean(true); - UUrecipesObsidian = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesObsidian"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesObsidian.tooltip")) - .getBoolean(true); + UUrecipesObsidian = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesObsidian"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesObsidian.tooltip")) + .getBoolean(true); - UUrecipesGlass = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesGlass"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesGlass.tooltip")) - .getBoolean(true); + UUrecipesGlass = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesGlass"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesGlass.tooltip")) + .getBoolean(true); - UUrecipesWater = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesWater"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesWater.tooltip")) - .getBoolean(true); + UUrecipesWater = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesWater"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesWater.tooltip")) + .getBoolean(true); - UUrecipesLava = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesLava"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesLava.tooltip")) - .getBoolean(true); + UUrecipesLava = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesLava"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesLava.tooltip")) + .getBoolean(true); - UUrecipesCocoa = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesCocoa"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesCocoa.tooltip")) - .getBoolean(true); + UUrecipesCocoa = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesCocoa"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesCocoa.tooltip")) + .getBoolean(true); - UUrecipesGlowstoneBlock = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesGlowstoneBlock"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesGlowstoneBlock.tooltip")) - .getBoolean(true); + UUrecipesGlowstoneBlock = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesGlowstoneBlock"), + true, StatCollector.translateToLocal("config.techreborn.allow.uurecipesGlowstoneBlock.tooltip")) + .getBoolean(true); - UUrecipesCactus = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesCactus"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesCactus.tooltip")) - .getBoolean(true); - UUrecipesSugarCane = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesSugarCane"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesSugarCane.tooltip")) - .getBoolean(true); + UUrecipesCactus = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesCactus"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesCactus.tooltip")) + .getBoolean(true); + UUrecipesSugarCane = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesSugarCane"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesSugarCane.tooltip")) + .getBoolean(true); - UUrecipesVine = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesVine"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesVine.tooltip")) - .getBoolean(true); + UUrecipesVine = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesVine"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesVine.tooltip")) + .getBoolean(true); - UUrecipesSnowBall = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesSnowBall"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesSnowBall.tooltip")) - .getBoolean(true); + UUrecipesSnowBall = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesSnowBall"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesSnowBall.tooltip")) + .getBoolean(true); - UUrecipeslilypad = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesLilypad"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesLilypad.tooltip")) - .getBoolean(true); + UUrecipeslilypad = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesLilypad"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesLilypad.tooltip")) + .getBoolean(true); - UUrecipesBone = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesBone"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesBone.tooltip")) - .getBoolean(true); + UUrecipesBone = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesBone"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesBone.tooltip")) + .getBoolean(true); - UUrecipesFeather = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesFeather"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesFeather.tooltip")) - .getBoolean(true); + UUrecipesFeather = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesFeather"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesFeather.tooltip")) + .getBoolean(true); - UUrecipesInk = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesInk"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesInk.tooltip")) - .getBoolean(true); + UUrecipesInk = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesInk"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesInk.tooltip")) + .getBoolean(true); - UUrecipesEnderPearl = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesEnderPearl"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.uurecipesEnderPearl.tooltip")) - .getBoolean(true); + UUrecipesEnderPearl = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.uurecipesEnderPearl"), true, + StatCollector.translateToLocal("config.techreborn.allow.uurecipesEnderPearl.tooltip")) + .getBoolean(true); - UUrecipesCoal = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesCoal"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesCoal.tooltip")) - .getBoolean(true); - - UUrecipesIronOre = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesIronOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesIronOre.tooltip")) - .getBoolean(true); - - UUrecipesIronDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesIronDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesIronDust.tooltip")) - .getBoolean(true); - - UUrecipesGoldOre = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesGoldOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesGoldOre.tooltip")) - .getBoolean(true); - - UUrecipesGoldDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesGoldDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesGoldDust.tooltip")) - .getBoolean(true); - - UUrecipesRedStone = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesRedStone"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesRedStone.tooltip")) - .getBoolean(true); - - UUrecipesLapis = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesLapis"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesLapis.tooltip")) - .getBoolean(true); + UUrecipesCoal = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesCoal"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesCoal.tooltip")) + .getBoolean(true); - - UUrecipesEmeraldOre = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesEmeraldOre"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesEmeraldOre.tooltip")) - .getBoolean(true); + UUrecipesIronOre = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesIronOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesIronOre.tooltip")) + .getBoolean(true); - - UUrecipesEmerald = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesEmerald"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesEmerald.tooltip")) - .getBoolean(true); + UUrecipesIronDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesIronDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesIronDust.tooltip")) + .getBoolean(true); - - UUrecipesDiamond = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesDiamond"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesDiamond.tooltip")) - .getBoolean(true); + UUrecipesGoldOre = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesGoldOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesGoldOre.tooltip")) + .getBoolean(true); - - UUrecipesResin = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesResin"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesResin.tooltip")) - .getBoolean(true); + UUrecipesGoldDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesGoldDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesGoldDust.tooltip")) + .getBoolean(true); - - UUrecipesTinDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesTinDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesTinDust.tooltip")) - .getBoolean(true); + UUrecipesRedStone = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesRedStone"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesRedStone.tooltip")) + .getBoolean(true); - - UUrecipesCopperDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesCopperDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesCopperDust.tooltip")) - .getBoolean(true); + UUrecipesLapis = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesLapis"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesLapis.tooltip")) + .getBoolean(true); - - UUrecipesLeadDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesLeadDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesLeadDust.tooltip")) - .getBoolean(true); + UUrecipesEmeraldOre = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesEmeraldOre"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesEmeraldOre.tooltip")) + .getBoolean(true); - - UUrecipesPlatinumDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesPlatinumDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesPlatinumDust.tooltip")) - .getBoolean(true); + UUrecipesEmerald = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesEmerald"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesEmerald.tooltip")) + .getBoolean(true); - - UUrecipesTungstenDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesTungstenDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesTungstenDust.tooltip")) - .getBoolean(true); + UUrecipesDiamond = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesDiamond"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesDiamond.tooltip")) + .getBoolean(true); - - UUrecipesTitaniumDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesTitaniumDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesTitaniumDust.tooltip")) - .getBoolean(true); + UUrecipesResin = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesResin"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesResin.tooltip")) + .getBoolean(true); - - UUrecipesAluminumDust = config - .get(CATEGORY_UU, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesAluminumDust"), - true, - StatCollector - .translateToLocal("config.techreborn.allow.UUrecipesAluminumDust.tooltip")) - .getBoolean(true); - - ShowChargeHud = config - .get(CATEGORY_POWER, - StatCollector - .translateToLocal("config.techreborn.showChargehud"), - true, - StatCollector - .translateToLocal("config.techreborn.showChargehud.tooltip")) - .getBoolean(true); + UUrecipesTinDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesTinDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesTinDust.tooltip")) + .getBoolean(true); + UUrecipesCopperDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesCopperDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesCopperDust.tooltip")) + .getBoolean(true); - if (config.hasChanged()) - config.save(); - } + UUrecipesLeadDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesLeadDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesLeadDust.tooltip")) + .getBoolean(true); + + UUrecipesPlatinumDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesPlatinumDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesPlatinumDust.tooltip")) + .getBoolean(true); + + UUrecipesTungstenDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesTungstenDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesTungstenDust.tooltip")) + .getBoolean(true); + + UUrecipesTitaniumDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesTitaniumDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesTitaniumDust.tooltip")) + .getBoolean(true); + + UUrecipesAluminumDust = config + .get(CATEGORY_UU, StatCollector.translateToLocal("config.techreborn.allow.UUrecipesAluminumDust"), true, + StatCollector.translateToLocal("config.techreborn.allow.UUrecipesAluminumDust.tooltip")) + .getBoolean(true); + + ShowChargeHud = config.get(CATEGORY_POWER, StatCollector.translateToLocal("config.techreborn.showChargehud"), + true, StatCollector.translateToLocal("config.techreborn.showChargehud.tooltip")).getBoolean(true); + + if (config.hasChanged()) + config.save(); + } } diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index 3551b42a8..5038490c0 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -14,8 +14,8 @@ import techreborn.util.LogHelper; public class TileAesu extends EUStorageTile implements IWrenchable { - public static final int MAX_OUTPUT = 8192; - public static final int MAX_STORAGE = 1000000000; //One billion! + public static final int MAX_OUTPUT = ConfigTechReborn.aesuMaxOutput; + public static final int MAX_STORAGE = ConfigTechReborn.aesuMaxStorage; public Inventory inventory = new Inventory(2, "TileAesu", 64); private int OUTPUT = 64; //The current output private double euLastTick = 0; From ab72f7dced75f3185164ca3e5ffa511e07653eae Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Tue, 21 Jul 2015 17:53:43 +0100 Subject: [PATCH 3/3] Started adding progress bars to other machines --- .../blocks/machine/BlockAlloySmelter.java | 2 -- .../client/gui/GuiIndustrialElectrolyzer.java | 23 +++++++++++++------ .../tiles/TileIndustrialElectrolyzer.java | 10 ++++++++ 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java index 511dac699..4d794598e 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java @@ -72,12 +72,10 @@ public class BlockAlloySmelter extends BlockMachineBase { if(side == metadata && tileAlloySmelter.crafter.isActive()){ return this.iconFrontOn; } - return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); - } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java index 80c21acd1..35d611307 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialElectrolyzer.java @@ -17,8 +17,7 @@ public class GuiIndustrialElectrolyzer extends GuiContainer { TileIndustrialElectrolyzer eletrolyzer; - public GuiIndustrialElectrolyzer(EntityPlayer player, - TileIndustrialElectrolyzer tileeletrolyzer) + public GuiIndustrialElectrolyzer(EntityPlayer player, TileIndustrialElectrolyzer tileeletrolyzer) { super(new ContainerIndustrialElectrolyzer(tileeletrolyzer, player)); this.xSize = 176; @@ -40,15 +39,25 @@ public class GuiIndustrialElectrolyzer extends GuiContainer { int k = (this.width - this.xSize) / 2; int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + + int j = 0; + + j = eletrolyzer.getProgressScaled(24); + if(j > 0) { + this.drawTexturedModalRect(k + 72, l + 38, 176, 14, j + 1, 16); + } + + j = eletrolyzer.getEnergyScaled(12); + if(j > 0) { + this.drawTexturedModalRect(k + 134, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); + } } - protected void drawGuiContainerForegroundLayer(int p_146979_1_, - int p_146979_2_) + protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { String name = StatCollector.translateToLocal("tile.techreborn.industrialelectrolyzer.name"); this.fontRendererObj.drawString(name, (this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2), 6, 4210752); - this.fontRendererObj.drawString( - I18n.format("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, + this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index c5d3aaa25..b3bde81d5 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -216,5 +216,15 @@ public class TileIndustrialElectrolyzer extends TileMachineBase implements IWren { return slotIndex == 2 || slotIndex == 3 || slotIndex == 4 || slotIndex == 5; } + + public int getProgressScaled(int scale) { + if(crafter.currentTickTime != 0) { + return crafter.currentTickTime * scale / crafter.currentNeededTicks; + } + return 0; + } + public int getEnergyScaled(int scale) { + return (int)energy.getEnergyStored() * scale / energy.getCapacity(); + } }