feat(game.widget): widgets for removing some debug information

auioc · Oct 11, 2022 · a9a66b2 · a9a66b2
1 parent fcd8f6b
commit a9a66b2
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 28 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mod/client/config/AHClientConfig.java b/src/main/java/org/auioc/mcmod/arnicalib/mod/client/config/AHClientConfig.java
@@ -16,7 +16,7 @@ public class AHClientConfig {
         final ForgeConfigSpec.Builder b = new ForgeConfigSpec.Builder();
 
         ConfigUtils.push(b, "advanced_item_tooltip", AdvancedItemTooltip.Config::build);
-        ConfigUtils.push(b, "additional_debug_information", DebugScreenInformation.Config::build);
+        ConfigUtils.push(b, "debug_information", DebugScreenInformation.Config::build);
 
         CONFIG = b.build();
     }

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/mod/client/widget/DebugScreenInformation.java b/src/main/java/org/auioc/mcmod/arnicalib/mod/client/widget/DebugScreenInformation.java
@@ -13,53 +13,89 @@ public class DebugScreenInformation {
     private static final Minecraft MC = Minecraft.getInstance();
 
     public static void handle(ArrayList<String> gameInfo, ArrayList<String> systemInfo) {
-        if (Config.enabled.get()) {
-            if (!MC.options.reducedDebugInfo) handleGameInformation(gameInfo);
-            handleSystemInformation(systemInfo);
-        }
+        if (!MC.options.reducedDebugInfo) handleGameInformation(gameInfo);
+        handleSystemInformation(systemInfo);
     }
 
     private static void handleGameInformation(ArrayList<String> info) {
-        if (Config.speedmeterEnabled.get()) {
-            var unit = Config.speedmeterUnit.get();
-            var symbol = Config.speedmeterShowUnitSymbol.get() ? String.format(" (%s)", unit.getSymbol()) : "";
-
-            var entity = MC.cameraEntity;
-            double vX = unit.convertFrom(entity.getX() - entity.xOld);
-            double vY = unit.convertFrom(entity.getY() - entity.yOld);
-            double vZ = unit.convertFrom(entity.getZ() - entity.zOld);
-            double vA = Math.sqrt(vX * vX + vY * vY + vZ * vZ);
-
-            var velocity = String.format("Velocity: %.3f / %.3f / %.3f%s", vX, vY, vZ, symbol);
-            var speed = String.format("Speed: %.3f%s", vA, symbol);
-
-            int at = ListUtils.indexOf(info, (l) -> l.startsWith("XYZ")) + 1;
-            ListUtils.add(info, at, speed);
-            ListUtils.add(info, at, velocity);
+        if (Config.enabledTweaks.get()) {
+            if (Config.hideLeftSide.get() && _clear(info)) return;
+        }
+        if (Config.enabledAddons.get()) {
+            if (Config.speedmeterEnabled.get()) _addSpeedmeter(info);
         }
     }
 
     private static void handleSystemInformation(ArrayList<String> info) {
+        if (Config.enabledTweaks.get()) {
+            if (Config.hideRightSide.get() && _clear(info)) return;
+            if (Config.hideSystemInformation.get()) _removeSystemInfo(info);
+        }
+    }
+
 
+    private static boolean _clear(ArrayList<String> info) {
+        info.clear();
+        return true;
     }
 
+    private static void _addSpeedmeter(ArrayList<String> info) {
+        var unit = Config.speedmeterUnit.get();
+        var symbol = Config.speedmeterShowUnitSymbol.get() ? String.format(" (%s)", unit.getSymbol()) : "";
 
-    public static class Config {
+        var entity = MC.cameraEntity;
+        double vX = unit.convertFrom(entity.getX() - entity.xOld);
+        double vY = unit.convertFrom(entity.getY() - entity.yOld);
+        double vZ = unit.convertFrom(entity.getZ() - entity.zOld);
+        double vA = Math.sqrt(vX * vX + vY * vY + vZ * vZ);
+
+        var velocity = String.format("Velocity: %.3f / %.3f / %.3f%s", vX, vY, vZ, symbol);
+        var speed = String.format("Speed: %.3f%s", vA, symbol);
 
-        public static BooleanValue enabled;
+        int at = ListUtils.indexOf(info, (l) -> l.startsWith("XYZ")) + 1;
+        ListUtils.add(info, at, speed);
+        ListUtils.add(info, at, velocity);
+    }
 
+    private static void _removeSystemInfo(ArrayList<String> info) {
+        int targetedIndex = ListUtils.indexOf(info, (l) -> l.startsWith("§nTargeted"));
+        int toIndex = targetedIndex != -1 ? targetedIndex : info.size();
+        info.subList(0, toIndex).clear();
+    }
+
+
+    public static class Config {
+
+        public static BooleanValue enabledAddons;
         public static BooleanValue speedmeterEnabled;
         public static EnumValue<SpeedUnit> speedmeterUnit;
         public static BooleanValue speedmeterShowUnitSymbol;
 
+        public static BooleanValue enabledTweaks;
+        public static BooleanValue hideLeftSide;
+        public static BooleanValue hideRightSide;
+        public static BooleanValue hideSystemInformation;
+
         public static void build(final ForgeConfigSpec.Builder b) {
-            enabled = b.define("enabled", true);
+            {
+                b.push("addons");
+                enabledAddons = b.define("enabled", true);
+                {
+                    b.push("speedmeter");
+                    speedmeterEnabled = b.define("enabled", true);
+                    speedmeterUnit = b.defineEnum("unit", SpeedUnit.METRES_PER_SECOND);
+                    speedmeterShowUnitSymbol = b.define("show_unit_symbol", true);
+                    b.pop();
+                }
+                b.pop();
+            }
 
             {
-                b.push("speedmeter");
-                speedmeterEnabled = b.define("enabled", true);
-                speedmeterUnit = b.defineEnum("unit", SpeedUnit.METRES_PER_SECOND);
-                speedmeterShowUnitSymbol = b.define("show_unit_symbol", true);
+                b.push("tweaks");
+                enabledTweaks = b.define("enabled", false);
+                hideLeftSide = b.define("hide_left_side", false);
+                hideRightSide = b.define("hide_right_side", false);
+                hideSystemInformation = b.define("hide_system_information", false);
                 b.pop();
             }
         }