From 53a5559d77a031c9221e45354f0b76aaef8bfa03 Mon Sep 17 00:00:00 2001 From: Bella Date: Wed, 4 Dec 2019 11:55:48 -0500 Subject: [PATCH] close #231 --- .../zeroeightsix/kami/gui/kami/KamiGUI.java | 14 +++++++++++--- .../me/zeroeightsix/kami/module/Module.java | 1 + .../modules/sdashb/gui/InfoOverlay.java | 19 +++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/sdashb/gui/InfoOverlay.java diff --git a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java index 1a165625..9f67d3c5 100644 --- a/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java +++ b/src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java @@ -20,6 +20,7 @@ import me.zeroeightsix.kami.gui.rgui.util.ContainerHelper; import me.zeroeightsix.kami.gui.rgui.util.Docking; import me.zeroeightsix.kami.module.Module; import me.zeroeightsix.kami.module.ModuleManager; +import me.zeroeightsix.kami.module.modules.sdashb.gui.InfoOverlay; import me.zeroeightsix.kami.util.ColourHolder; import me.zeroeightsix.kami.util.LagCompensator; import me.zeroeightsix.kami.util.Pair; @@ -211,10 +212,17 @@ public class KamiGUI extends GUI { information.addTickListener(() -> { information.setText(""); information.addLine("\u00A7b" + KamiMod.KAMI_KANJI + "\u00A73 " + KamiMod.MODVER); - information.addLine("\u00A7b" + Math.round(LagCompensator.INSTANCE.getTickRate()) + Command.SECTIONSIGN() + "3 tps"); - information.addLine("\u00A7b" + Wrapper.getMinecraft().debugFPS + Command.SECTIONSIGN() + "3 fps"); + if (((InfoOverlay)ModuleManager.getModuleByName("Info")).globalInfoTps.getValue()) { + information.addLine("\u00A7b" + Math.round(LagCompensator.INSTANCE.getTickRate()) + Command.SECTIONSIGN() + "3 tps"); + } + if (((InfoOverlay)ModuleManager.getModuleByName("Info")).globalInfoFps.getValue()) { + information.addLine("\u00A7b" + Wrapper.getMinecraft().debugFPS + Command.SECTIONSIGN() + "3 fps"); + } + if (((InfoOverlay)ModuleManager.getModuleByName("Info")).globalInfoMem.getValue()) { + information.addLine("\u00A7b" + (Runtime.getRuntime().freeMemory() / 1000000) + Command.SECTIONSIGN() + "3mB free"); + } + //information.addLine("\u00A7b" + Runtime.getRuntime().availableProcessors() + Command.SECTIONSIGN() + "3 cores"); - information.addLine("\u00A7b" + (Runtime.getRuntime().freeMemory() / 1000000) + Command.SECTIONSIGN() + "3mB free"); //information.addLine("\u00A7b" + Wrapper.getPlayer().getDistance() + Command.SECTIONSIGN() + "3 fps"); //OperatingSystemMXBean.getSystemLoadAverage() / OperatingSystemMXBean.getAvailableProcessors() diff --git a/src/main/java/me/zeroeightsix/kami/module/Module.java b/src/main/java/me/zeroeightsix/kami/module/Module.java index c35ac6e3..942e3aee 100644 --- a/src/main/java/me/zeroeightsix/kami/module/Module.java +++ b/src/main/java/me/zeroeightsix/kami/module/Module.java @@ -78,6 +78,7 @@ public class Module { PLAYER("Player", false), MOVEMENT("Movement", false), EXPERIMENTAL("Experimental", false), + GUI("GUI", false), HIDDEN("Hidden", true); boolean hidden; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/sdashb/gui/InfoOverlay.java b/src/main/java/me/zeroeightsix/kami/module/modules/sdashb/gui/InfoOverlay.java new file mode 100644 index 00000000..c8df248a --- /dev/null +++ b/src/main/java/me/zeroeightsix/kami/module/modules/sdashb/gui/InfoOverlay.java @@ -0,0 +1,19 @@ +package me.zeroeightsix.kami.module.modules.sdashb.gui; + +import me.zeroeightsix.kami.module.Module; +import me.zeroeightsix.kami.setting.Setting; +import me.zeroeightsix.kami.setting.Settings; + +/** + * @author S-B99 + * Updated by S-B99 on 30/10/19 + */ + +@Module.Info(name = "Info", category = Module.Category.GUI, description = "Configures game information overlay") +public class InfoOverlay extends Module { + public Setting globalInfoTps = register(Settings.b("TPS", true)); + public Setting globalInfoFps = register(Settings.b("FPS", true)); + public Setting globalInfoMem = register(Settings.b("Memory", true)); +// private Setting debug = register(Settings.b("Debug", true)); + +}