From fd6918167e859066ee0aed0060a9aca625f3bce6 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sat, 7 Aug 2021 03:49:40 +0200 Subject: [PATCH 1/8] My first working piece of code :,) --- .../meteorclient/mixin/CommandSuggestorMixin.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java index 3cc84da185..19de6a320b 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java @@ -11,6 +11,8 @@ import com.mojang.brigadier.suggestion.Suggestions; import meteordevelopment.meteorclient.systems.commands.Commands; import meteordevelopment.meteorclient.systems.config.Config; +import meteordevelopment.meteorclient.systems.modules.Modules; +import meteordevelopment.meteorclient.systems.modules.render.NoRender; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.CommandSuggestor; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -22,6 +24,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import net.minecraft.client.util.math.MatrixStack; import java.util.concurrent.CompletableFuture; @@ -71,4 +74,9 @@ public void onRefresh(CallbackInfo ci, String string, StringReader reader) { } } + @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true) + public void render(MatrixStack matrices, int mouseX, int mouseY, CallbackInfo info) { + if (Modules.get().get(NoRender.class).noSuggestion()) info.cancel(); + } + } From aaa0f8f27e1c6f8477ac2c924415d61a49aa8844 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sat, 7 Aug 2021 03:50:59 +0200 Subject: [PATCH 2/8] I feel so proud of myself right now :,) --- .../meteorclient/systems/modules/render/NoRender.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java index 6611e33427..d4146f99c1 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java @@ -113,6 +113,13 @@ public class NoRender extends Module { .build() ); + private final Setting noSuggestion = sgOverlay.add(new BoolSetting.Builder() + .name("chat-suggestion") + .description("Disables suggestions in chat.") + .defaultValue(false) + .build() + ); + // HUD private final Setting noBossBar = sgHUD.add(new BoolSetting.Builder() @@ -336,6 +343,10 @@ public boolean noEatParticles() { return isActive() && noEatParticles.get(); } + public boolean noSuggestion() { + return isActive() && noSuggestion.get(); + } + // HUD public boolean noBossBar() { From 11829555d3612630fce6215a2670b7ecf531f8d2 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sat, 7 Aug 2021 03:56:23 +0200 Subject: [PATCH 3/8] Renaming it to make more sense --- .../meteorclient/systems/modules/render/NoRender.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java index d4146f99c1..ccf68d22fd 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java @@ -114,8 +114,8 @@ public class NoRender extends Module { ); private final Setting noSuggestion = sgOverlay.add(new BoolSetting.Builder() - .name("chat-suggestion") - .description("Disables suggestions in chat.") + .name("command-suggestions") + .description("Disables command suggestions in chat.") .defaultValue(false) .build() ); From bd64bb8f882b699cb51fae44ed1c2f05fb167271 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sat, 7 Aug 2021 03:57:31 +0200 Subject: [PATCH 4/8] Renaming it to onRenderSuggestion --- .../meteorclient/systems/modules/render/NoRender.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java index ccf68d22fd..fc66a9a3a1 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java @@ -113,7 +113,7 @@ public class NoRender extends Module { .build() ); - private final Setting noSuggestion = sgOverlay.add(new BoolSetting.Builder() + private final Setting onRenderSuggestion = sgOverlay.add(new BoolSetting.Builder() .name("command-suggestions") .description("Disables command suggestions in chat.") .defaultValue(false) @@ -344,7 +344,7 @@ public boolean noEatParticles() { } public boolean noSuggestion() { - return isActive() && noSuggestion.get(); + return isActive() && onRenderSuggestion.get(); } // HUD From a5ca7b92ffdffac562eb1a50b64cf62fc7f6a477 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sat, 7 Aug 2021 03:58:34 +0200 Subject: [PATCH 5/8] Renaming it to onRenderSuggestion --- .../meteorclient/mixin/CommandSuggestorMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java index 19de6a320b..a1cc5f5d22 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java @@ -76,7 +76,7 @@ public void onRefresh(CallbackInfo ci, String string, StringReader reader) { @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true) public void render(MatrixStack matrices, int mouseX, int mouseY, CallbackInfo info) { - if (Modules.get().get(NoRender.class).noSuggestion()) info.cancel(); + if (Modules.get().get(NoRender.class).onRenderSuggestion()) info.cancel(); } } From f920ad99ec615be68c3210da2a5ab6205c288e07 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sat, 7 Aug 2021 03:59:47 +0200 Subject: [PATCH 6/8] Renaming it to onRenderSuggestion --- .../meteorclient/systems/modules/render/NoRender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java index fc66a9a3a1..4f1d77df25 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java @@ -343,7 +343,7 @@ public boolean noEatParticles() { return isActive() && noEatParticles.get(); } - public boolean noSuggestion() { + public boolean onRenderSuggestion() { return isActive() && onRenderSuggestion.get(); } From ddf189e1ff54f6d8c6f8a6eae6d3fc2ee99547cb Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sat, 7 Aug 2021 04:04:42 +0200 Subject: [PATCH 7/8] Renaming it to noCommandSuggestions pt. 1 --- .../meteorclient/mixin/CommandSuggestorMixin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java b/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java index a1cc5f5d22..68179fe2b7 100644 --- a/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java +++ b/src/main/java/meteordevelopment/meteorclient/mixin/CommandSuggestorMixin.java @@ -76,7 +76,7 @@ public void onRefresh(CallbackInfo ci, String string, StringReader reader) { @Inject(method = "render", at = @At(value = "HEAD"), cancellable = true) public void render(MatrixStack matrices, int mouseX, int mouseY, CallbackInfo info) { - if (Modules.get().get(NoRender.class).onRenderSuggestion()) info.cancel(); + if (Modules.get().get(NoRender.class).noCommandSuggestions()) info.cancel(); } } From 8b0c0ff777626e1b310de4a84a207aa90f2eda7c Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sat, 7 Aug 2021 04:05:30 +0200 Subject: [PATCH 8/8] Renaming it to noCommandSuggestions pt. 2 --- .../meteorclient/systems/modules/render/NoRender.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java index 4f1d77df25..f475799a3a 100644 --- a/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java +++ b/src/main/java/meteordevelopment/meteorclient/systems/modules/render/NoRender.java @@ -113,7 +113,7 @@ public class NoRender extends Module { .build() ); - private final Setting onRenderSuggestion = sgOverlay.add(new BoolSetting.Builder() + private final Setting noCommandSuggestions = sgOverlay.add(new BoolSetting.Builder() .name("command-suggestions") .description("Disables command suggestions in chat.") .defaultValue(false) @@ -343,8 +343,8 @@ public boolean noEatParticles() { return isActive() && noEatParticles.get(); } - public boolean onRenderSuggestion() { - return isActive() && onRenderSuggestion.get(); + public boolean noCommandSuggestions() { + return isActive() && noCommandSuggestions.get(); } // HUD