From 26756e8c86e38f3e18db8df935e0c095202c2488 Mon Sep 17 00:00:00 2001 From: kawaiizenbo <48113593+kawaiizenbo@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:43:53 -0700 Subject: [PATCH] fix non devenv crash + remove broken colour thing --- .../moonlight/module/modules/HUDModule.java | 12 ++++++------ src/main/java/me/kawaiizenbo/moonlight/ui/HUD.java | 4 ++-- src/main/resources/moonlight.mixins.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/me/kawaiizenbo/moonlight/module/modules/HUDModule.java b/src/main/java/me/kawaiizenbo/moonlight/module/modules/HUDModule.java index 04b19eb..25b76ae 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/module/modules/HUDModule.java +++ b/src/main/java/me/kawaiizenbo/moonlight/module/modules/HUDModule.java @@ -8,17 +8,17 @@ import me.kawaiizenbo.moonlight.util.ReflectionUtils; public class HUDModule extends Module_ { - public DoubleSetting r = new DoubleSetting("Red", 0x55, 0, 255, 0, ReflectionUtils.tryGetMethod("updateHUD()V", getClass())); - public DoubleSetting g = new DoubleSetting("Green", 255, 0, 255, 0, ReflectionUtils.tryGetMethod("updateHUD()V", getClass())); - public DoubleSetting b = new DoubleSetting("Blue", 255, 0, 255, 0, ReflectionUtils.tryGetMethod("updateHUD()V", getClass())); + //public DoubleSetting r = new DoubleSetting("Red", 0x55, 0, 255, 0, ReflectionUtils.tryGetMethod("updateHUD()V", getClass())); + //public DoubleSetting g = new DoubleSetting("Green", 255, 0, 255, 0, ReflectionUtils.tryGetMethod("updateHUD()V", getClass())); + //public DoubleSetting b = new DoubleSetting("Blue", 255, 0, 255, 0, ReflectionUtils.tryGetMethod("updateHUD()V", getClass())); //public ColorSetting color = new ColorSetting("Color", 0x55FFFF, ReflectionUtils.tryGetMethod("updateHUD", getClass())); public HUDModule() { super("HUD", "Enables or disables the Moonlight HUD.", Category.RENDER); this.enabled = true; - settings.add(r); - settings.add(g); - settings.add(b); + //settings.add(r); + //settings.add(g); + //settings.add(b); //settings.add(color); } diff --git a/src/main/java/me/kawaiizenbo/moonlight/ui/HUD.java b/src/main/java/me/kawaiizenbo/moonlight/ui/HUD.java index 108e722..bfc57f8 100644 --- a/src/main/java/me/kawaiizenbo/moonlight/ui/HUD.java +++ b/src/main/java/me/kawaiizenbo/moonlight/ui/HUD.java @@ -16,11 +16,11 @@ public class HUD public static HUD INSTANCE = new HUD(); private MinecraftClient mc = MinecraftClient.getInstance(); TextRenderer textRenderer = mc.textRenderer; - public int hudColor = ColorUtils.rgbaToInt( + public int hudColor = 0xFF00FFFF; /*ColorUtils.rgbaToInt( (int)((HUDModule)ModuleManager.INSTANCE.getModuleByName("HUD")).r.value, (int)((HUDModule)ModuleManager.INSTANCE.getModuleByName("HUD")).g.value, (int)((HUDModule)ModuleManager.INSTANCE.getModuleByName("HUD")).b.value, - 255 ); + 255 );*/ public void renderHUD(DrawContext drawContext, int scaledWidth, int scaledHeight) { diff --git a/src/main/resources/moonlight.mixins.json b/src/main/resources/moonlight.mixins.json index bcdd68e..6e85a7a 100644 --- a/src/main/resources/moonlight.mixins.json +++ b/src/main/resources/moonlight.mixins.json @@ -8,7 +8,7 @@ "client": [ "TitleScreenMixin", "MultiplayerScreenMixin", - "InGameHUDMixin", + "InGameHudMixin", "ChatInputSuggestorMixin", "ClientConnectionMixin", "LivingEntityMixin",