From c9b9abff282b4ba3d23aff58af913d75eaac83a4 Mon Sep 17 00:00:00 2001 From: RickyTheRacc Date: Wed, 21 Aug 2024 20:36:33 -0500 Subject: [PATCH 1/8] Refactor icon.png Should be located in the base assets folder, unless we wanted a smaller res version to specifically go in a chat folder --- src/main/java/me/redcarlos/higtools/HIGTools.java | 2 +- .../resources/assets/higtools/{chat => }/icon.png | Bin src/main/resources/fabric.mod.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename src/main/resources/assets/higtools/{chat => }/icon.png (100%) diff --git a/src/main/java/me/redcarlos/higtools/HIGTools.java b/src/main/java/me/redcarlos/higtools/HIGTools.java index 340b73c..d547319 100644 --- a/src/main/java/me/redcarlos/higtools/HIGTools.java +++ b/src/main/java/me/redcarlos/higtools/HIGTools.java @@ -43,7 +43,7 @@ public class HIGTools extends MeteorAddon { public void onInitialize() { LogUtils.getLogger().info("Initializing HIGTools {}", HIGTools.VERSION); - BetterChat.registerCustomHead("[HIGTools]", identifier("chat/icon.png")); + BetterChat.registerCustomHead("[HIG Tools]", identifier("icon.png")); Tabs.add(new HIGTab()); // Commands diff --git a/src/main/resources/assets/higtools/chat/icon.png b/src/main/resources/assets/higtools/icon.png similarity index 100% rename from src/main/resources/assets/higtools/chat/icon.png rename to src/main/resources/assets/higtools/icon.png diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9406450..616314f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -15,7 +15,7 @@ "discord": "https://discord.gg/a4jkKGJNdJ" }, "license": "GPL-3.0", - "icon": "assets/higtools/chat/icon.png", + "icon": "icon.png", "environment": "client", "entrypoints": { "meteor": [ From 8953136fbcf040fac835f4e8fe01f0d065d12448 Mon Sep 17 00:00:00 2001 From: RickyTheRacc Date: Wed, 21 Aug 2024 20:37:15 -0500 Subject: [PATCH 2/8] Cleanup text presets Player coords and opposite coords are both implemented in Meteor now, also can inline some of the values in addPreset --- .../me/redcarlos/higtools/modules/hud/TextPresets.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java b/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java index 964ca22..2347f0a 100644 --- a/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java +++ b/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java @@ -12,15 +12,13 @@ private static TextHud create() { } static { - addPreset("Player-Coords", "XYZ: #1{roundToString(player.pos.x, 1)}, {floor(player.pos.y)}, {roundToString(player.pos.z, 1)}", 0); - addPreset("Opposite-Coords", "{player.opposite_dimension != \"End\" ? player.opposite_dimension + \":\" : \"\"} #1{player.opposite_dimension != \"End\" ? \"\" + floor(player.opposite_dim_pos.x) + \", \" + floor(player.opposite_dim_pos.z) : \"\"}", 0); - addPreset("KM/H-Speed", "Speed: #1{roundToString(player.speed*3.6, 1)} km/h", 0); + addPreset("KM/H Speed", "Speed: #1{roundToString(player.speed*3.6, 1)} km/h"); } - private static HudElementInfo.Preset addPreset(String title, String text, int updateDelay) { - return INFO.addPreset(title, textHud -> { + private static void addPreset(String title, String text) { + INFO.addPreset(title, textHud -> { if (text != null) textHud.text.set(text); - if (updateDelay != -1) textHud.updateDelay.set(updateDelay); + textHud.updateDelay.set(0); }); } } From 74b92d1258df81a095b160ac389192b1865d9cd0 Mon Sep 17 00:00:00 2001 From: RickyTheRacc Date: Wed, 21 Aug 2024 20:46:45 -0500 Subject: [PATCH 3/8] Make Welcome Hud a preset --- .../java/me/redcarlos/higtools/HIGTools.java | 2 - .../higtools/modules/hud/TextPresets.java | 4 +- .../higtools/modules/hud/WelcomeHudHig.java | 48 ------------------- 3 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 src/main/java/me/redcarlos/higtools/modules/hud/WelcomeHudHig.java diff --git a/src/main/java/me/redcarlos/higtools/HIGTools.java b/src/main/java/me/redcarlos/higtools/HIGTools.java index d547319..f801706 100644 --- a/src/main/java/me/redcarlos/higtools/HIGTools.java +++ b/src/main/java/me/redcarlos/higtools/HIGTools.java @@ -5,7 +5,6 @@ import me.redcarlos.higtools.commands.Coordinates; import me.redcarlos.higtools.modules.highwayborers.*; import me.redcarlos.higtools.modules.hud.TextPresets; -import me.redcarlos.higtools.modules.hud.WelcomeHudHig; import me.redcarlos.higtools.modules.main.*; import me.redcarlos.higtools.system.HIGTab; import meteordevelopment.meteorclient.addons.MeteorAddon; @@ -53,7 +52,6 @@ public void onInitialize() { // Hud Hud hud = Systems.get(Hud.class); hud.register(TextPresets.INFO); - hud.register(WelcomeHudHig.INFO); // Modules Modules modules = Modules.get(); diff --git a/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java b/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java index 2347f0a..8d09906 100644 --- a/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java +++ b/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java @@ -12,7 +12,9 @@ private static TextHud create() { } static { - addPreset("KM/H Speed", "Speed: #1{roundToString(player.speed*3.6, 1)} km/h"); + + addPreset("Welcome Hud", "Welcome to HIG Tools, #1{meteor.is_module_active(\"name-protect\") ? meteor.get_module_setting(\"name-protect\", \"name\") : player._toString}"); + addPreset("KM/H Speed", "Speed: #1{roundToString(player.speed * 3.6, 1)} km/h"); } private static void addPreset(String title, String text) { diff --git a/src/main/java/me/redcarlos/higtools/modules/hud/WelcomeHudHig.java b/src/main/java/me/redcarlos/higtools/modules/hud/WelcomeHudHig.java deleted file mode 100644 index dc43d17..0000000 --- a/src/main/java/me/redcarlos/higtools/modules/hud/WelcomeHudHig.java +++ /dev/null @@ -1,48 +0,0 @@ -package me.redcarlos.higtools.modules.hud; - -import me.redcarlos.higtools.HIGTools; -import meteordevelopment.meteorclient.systems.hud.HudElement; -import meteordevelopment.meteorclient.systems.hud.HudElementInfo; -import meteordevelopment.meteorclient.systems.hud.HudRenderer; -import meteordevelopment.meteorclient.systems.hud.elements.TextHud; -import meteordevelopment.meteorclient.systems.modules.Modules; -import meteordevelopment.meteorclient.systems.modules.misc.NameProtect; - -import static meteordevelopment.meteorclient.MeteorClient.mc; - -public class WelcomeHudHig extends HudElement { - public static final HudElementInfo INFO = new HudElementInfo<>(HIGTools.HUD, "HIG-welcome", "Displays a welcome message.", WelcomeHudHig::new); - - private String leftText; - private String rightText; - private double leftWidth; - - public WelcomeHudHig() { - super(INFO); - } - - @Override - public void tick(HudRenderer renderer) { - leftText = "Welcome to HIG Tools, "; - rightText = Modules.get().get(NameProtect.class).getName(mc.getSession().getUsername()); - - leftWidth = renderer.textWidth(leftText); - double rightWidth = renderer.textWidth(rightText); - - box.setSize((leftWidth + rightWidth), renderer.textHeight()); - } - - @Override - public void render(HudRenderer renderer) { - double x = this.x; - double y = this.y; - - if (isInEditor()) { - renderer.text("Welcome Hud", x, y, TextHud.getSectionColor(0), true); - return; - } - - renderer.text(leftText, x, y, TextHud.getSectionColor(0), true); - renderer.text(rightText, x + leftWidth, y, TextHud.getSectionColor(1), true); - } -} From 16a443a900f99185c0d8a3bc5fa57ebb048dc9c4 Mon Sep 17 00:00:00 2001 From: RickyTheRacc Date: Wed, 21 Aug 2024 20:48:14 -0500 Subject: [PATCH 4/8] Systems comment Cuz everything else is so ig this should be as well --- src/main/java/me/redcarlos/higtools/HIGTools.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/me/redcarlos/higtools/HIGTools.java b/src/main/java/me/redcarlos/higtools/HIGTools.java index f801706..46238b4 100644 --- a/src/main/java/me/redcarlos/higtools/HIGTools.java +++ b/src/main/java/me/redcarlos/higtools/HIGTools.java @@ -42,6 +42,7 @@ public class HIGTools extends MeteorAddon { public void onInitialize() { LogUtils.getLogger().info("Initializing HIGTools {}", HIGTools.VERSION); + // Systems BetterChat.registerCustomHead("[HIG Tools]", identifier("icon.png")); Tabs.add(new HIGTab()); From 35a50dd24e68cf51dbe38449bfbf4e0e5da2d57a Mon Sep 17 00:00:00 2001 From: RickyTheRacc Date: Wed, 21 Aug 2024 20:52:03 -0500 Subject: [PATCH 5/8] Use MOD_ID when retrieving metadata Makes it easier if anyone tries to skid this addon ig :D --- src/main/java/me/redcarlos/higtools/HIGTools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/redcarlos/higtools/HIGTools.java b/src/main/java/me/redcarlos/higtools/HIGTools.java index 46238b4..def5081 100644 --- a/src/main/java/me/redcarlos/higtools/HIGTools.java +++ b/src/main/java/me/redcarlos/higtools/HIGTools.java @@ -30,7 +30,7 @@ public class HIGTools extends MeteorAddon { public static final HudGroup HUD; static { - METADATA = FabricLoader.getInstance().getModContainer("higtools").orElseThrow().getMetadata(); + METADATA = FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow().getMetadata(); VERSION = METADATA.getVersion().getFriendlyString(); MAIN = new Category("HIG Tools", Items.NETHERITE_PICKAXE.getDefaultStack()); From 23878b78511bc4742cf75e6cd2cc9efc6de914cb Mon Sep 17 00:00:00 2001 From: RickyTheRacc Date: Wed, 21 Aug 2024 21:02:33 -0500 Subject: [PATCH 6/8] fabric.mod.json updates Fix icon path that got scuffed in last update, remove duplicate links --- src/main/resources/fabric.mod.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 616314f..710dd54 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,13 +9,12 @@ "Ethius" ], "contact": { - "homepage": "https://discord.gg/a4jkKGJNdJ", "issues": "https://github.com/RedCarlos26/HIGTools/issues", "sources": "https://github.com/RedCarlos26/HIGTools", "discord": "https://discord.gg/a4jkKGJNdJ" }, "license": "GPL-3.0", - "icon": "icon.png", + "icon": "assets/higtools/icon.png", "environment": "client", "entrypoints": { "meteor": [ From 31e739e2c3bd78405d0c54768ed5562dec0584c7 Mon Sep 17 00:00:00 2001 From: RickyTheRacc Date: Thu, 22 Aug 2024 08:58:49 -0500 Subject: [PATCH 7/8] Readd position presets And make note of the differences from Meteor so they aren't removed in the future --- .../java/me/redcarlos/higtools/modules/hud/TextPresets.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java b/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java index 8d09906..efadeb8 100644 --- a/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java +++ b/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java @@ -12,6 +12,9 @@ private static TextHud create() { } static { + // These use a different and more accurate rounding method than Meteor's, do not remove + addPreset("Player Coords", "XYZ: #1{roundToString(player.pos.x, 1)}, {floor(player.pos.y)}, {roundToString(player.pos.z, 1)}"); + addPreset("Opposite-Coords", "{player.opposite_dimension != \"End\" ? player.opposite_dimension + \":\" : \"\"} #1{player.opposite_dimension != \"End\" ? \"\" + floor(player.opposite_dim_pos.x) + \", \" + floor(player.opposite_dim_pos.z) : \"\"}"); addPreset("Welcome Hud", "Welcome to HIG Tools, #1{meteor.is_module_active(\"name-protect\") ? meteor.get_module_setting(\"name-protect\", \"name\") : player._toString}"); addPreset("KM/H Speed", "Speed: #1{roundToString(player.speed * 3.6, 1)} km/h"); From 0f3313523cf3b80e850399ded10b97310beee5b5 Mon Sep 17 00:00:00 2001 From: RickyTheRacc Date: Thu, 22 Aug 2024 08:59:45 -0500 Subject: [PATCH 8/8] Typo --- .../java/me/redcarlos/higtools/modules/hud/TextPresets.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java b/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java index efadeb8..cf1c3a1 100644 --- a/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java +++ b/src/main/java/me/redcarlos/higtools/modules/hud/TextPresets.java @@ -14,7 +14,7 @@ private static TextHud create() { static { // These use a different and more accurate rounding method than Meteor's, do not remove addPreset("Player Coords", "XYZ: #1{roundToString(player.pos.x, 1)}, {floor(player.pos.y)}, {roundToString(player.pos.z, 1)}"); - addPreset("Opposite-Coords", "{player.opposite_dimension != \"End\" ? player.opposite_dimension + \":\" : \"\"} #1{player.opposite_dimension != \"End\" ? \"\" + floor(player.opposite_dim_pos.x) + \", \" + floor(player.opposite_dim_pos.z) : \"\"}"); + addPreset("Opposite Coords", "{player.opposite_dimension != \"End\" ? player.opposite_dimension + \":\" : \"\"} #1{player.opposite_dimension != \"End\" ? \"\" + floor(player.opposite_dim_pos.x) + \", \" + floor(player.opposite_dim_pos.z) : \"\"}"); addPreset("Welcome Hud", "Welcome to HIG Tools, #1{meteor.is_module_active(\"name-protect\") ? meteor.get_module_setting(\"name-protect\", \"name\") : player._toString}"); addPreset("KM/H Speed", "Speed: #1{roundToString(player.speed * 3.6, 1)} km/h");