From 3082c198c466c60a3fef4b067fb6346b6f1b52bc Mon Sep 17 00:00:00 2001 From: immibis Date: Sat, 17 Jan 2015 19:30:51 +1300 Subject: [PATCH] Added hidePowerNumbers and hideFluidNumbers options. --- common/buildcraft/BuildCraftCore.java | 10 ++++++++++ common/buildcraft/energy/gui/GuiEngine.java | 3 ++- .../buildcraft/silicon/gui/GuiAssemblyTable.java | 3 ++- common/buildcraft/silicon/gui/GuiLaserTable.java | 3 ++- .../buildcraft/transport/PipeToolTipManager.java | 16 ++++++++++------ 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java index ecbf1345..312d6d41 100644 --- a/common/buildcraft/BuildCraftCore.java +++ b/common/buildcraft/BuildCraftCore.java @@ -141,6 +141,8 @@ public class BuildCraftCore extends BuildCraftMod { public static boolean modifyWorld = false; public static boolean colorBlindMode = false; public static boolean dropBrokenBlocks = true; // Set to false to prevent the filler from dropping broken blocks. + public static boolean hidePowerNumbers = false; + public static boolean hideFluidNumbers = false; public static int itemLifespan = 1200; public static int updateFactor = 10; public static long longUpdateFactor = 40; @@ -259,6 +261,14 @@ public class BuildCraftCore extends BuildCraftMod { Property dropBlock = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "dropBrokenBlocks", true); dropBlock.comment = "set to false to prevent fillers from dropping blocks."; dropBrokenBlocks = dropBlock.getBoolean(true); + + Property hideRFNumbers = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "hidePowerNumbers", false); + hideRFNumbers.comment = "set to true to not display any RF or RF/t numbers."; + hidePowerNumbers = hideRFNumbers.getBoolean(false); + + Property hideMBNumbers = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "hideFluidNumbers", false); + hideMBNumbers.comment = "set to true to not display any mB or mB/t numbers."; + hideFluidNumbers = hideMBNumbers.getBoolean(false); Property lifespan = BuildCraftCore.mainConfiguration.get(Configuration.CATEGORY_GENERAL, "itemLifespan", itemLifespan); lifespan.comment = "the lifespan in ticks of items dropped on the ground by pipes and machines, vanilla = 6000, default = 1200"; diff --git a/common/buildcraft/energy/gui/GuiEngine.java b/common/buildcraft/energy/gui/GuiEngine.java index 59aa0016..4ba8e562 100644 --- a/common/buildcraft/energy/gui/GuiEngine.java +++ b/common/buildcraft/energy/gui/GuiEngine.java @@ -76,6 +76,7 @@ public abstract class GuiEngine extends GuiBuildCraft { @Override protected void initLedgers(IInventory inventory) { super.initLedgers(inventory); - ledgerManager.add(new EngineLedger((TileEngine) tile)); + if(!BuildCraftCore.hidePowerNumbers) + ledgerManager.add(new EngineLedger((TileEngine) tile)); } } diff --git a/common/buildcraft/silicon/gui/GuiAssemblyTable.java b/common/buildcraft/silicon/gui/GuiAssemblyTable.java index 288c28c3..5a1e360e 100644 --- a/common/buildcraft/silicon/gui/GuiAssemblyTable.java +++ b/common/buildcraft/silicon/gui/GuiAssemblyTable.java @@ -184,6 +184,7 @@ public class GuiAssemblyTable extends GuiAdvancedInterface { @Override protected void initLedgers(IInventory inventory) { super.initLedgers(inventory); - ledgerManager.add(new LaserTableLedger()); + if(!BuildCraftCore.hidePowerNumbers) + ledgerManager.add(new LaserTableLedger()); } } diff --git a/common/buildcraft/silicon/gui/GuiLaserTable.java b/common/buildcraft/silicon/gui/GuiLaserTable.java index 0c6c8321..7005878c 100644 --- a/common/buildcraft/silicon/gui/GuiLaserTable.java +++ b/common/buildcraft/silicon/gui/GuiLaserTable.java @@ -81,6 +81,7 @@ public abstract class GuiLaserTable extends GuiBuildCraft { @Override protected void initLedgers(IInventory inventory) { super.initLedgers(inventory); - ledgerManager.add(new LaserTableLedger()); + if(!BuildCraftCore.hidePowerNumbers) + ledgerManager.add(new LaserTableLedger()); } } diff --git a/common/buildcraft/transport/PipeToolTipManager.java b/common/buildcraft/transport/PipeToolTipManager.java index a32f9495..8c288e55 100644 --- a/common/buildcraft/transport/PipeToolTipManager.java +++ b/common/buildcraft/transport/PipeToolTipManager.java @@ -17,7 +17,7 @@ import net.minecraft.client.gui.GuiScreen; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - +import buildcraft.BuildCraftCore; import buildcraft.core.utils.StringUtils; @SideOnly(Side.CLIENT) @@ -26,13 +26,17 @@ public final class PipeToolTipManager { private static final Map>, String> toolTips = new HashMap>, String>(); static { - for (Map.Entry>, Integer> pipe : PipeTransportPower.powerCapacities.entrySet()) { - PipeToolTipManager.addToolTip(pipe.getKey(), String.format("%d RF/t", pipe.getValue())); + if(!BuildCraftCore.hidePowerNumbers) { + for (Map.Entry>, Integer> pipe : PipeTransportPower.powerCapacities.entrySet()) { + PipeToolTipManager.addToolTip(pipe.getKey(), String.format("%d RF/t", pipe.getValue())); + } } - for (Map.Entry>, Integer> pipe : PipeTransportFluids.fluidCapacities.entrySet()) { - PipeToolTipManager.addToolTip(pipe.getKey(), String.format("%d mB/t", pipe.getValue())); - } + if(!BuildCraftCore.hideFluidNumbers) { + for (Map.Entry>, Integer> pipe : PipeTransportFluids.fluidCapacities.entrySet()) { + PipeToolTipManager.addToolTip(pipe.getKey(), String.format("%d mB/t", pipe.getValue())); + } + } } /**