From ec0464670e646c510af0ffff8b1de0d70b9edd6b Mon Sep 17 00:00:00 2001 From: "thatonecoder (formerly Coccocoa's Helper)" <157546848+Coccocoahelper@users.noreply.github.com> Date: Thu, 13 Jun 2024 19:16:55 +0100 Subject: [PATCH] finally? --- .../client/command/CommandManager.java | 2 -- .../client/command/commands/Cname.java | 23 ---------------- .../client/command/commands/F3Name.java | 27 ------------------- .../client/module/ModuleManager.java | 1 - .../client/tweaker/ASMEventHandler.java | 8 +----- .../TransformerFMLCommonHandler.java | 5 ---- 6 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 src/main/java/keystrokesmod/client/command/commands/Cname.java delete mode 100644 src/main/java/keystrokesmod/client/command/commands/F3Name.java diff --git a/src/main/java/keystrokesmod/client/command/CommandManager.java b/src/main/java/keystrokesmod/client/command/CommandManager.java index ccdd4afc..c2f8ca92 100644 --- a/src/main/java/keystrokesmod/client/command/CommandManager.java +++ b/src/main/java/keystrokesmod/client/command/CommandManager.java @@ -23,7 +23,6 @@ public CommandManager() { this.addCommand(new Discord()); this.addCommand(new ConfigCommand()); this.addCommand(new Clear()); - this.addCommand(new Cname()); this.addCommand(new Debug()); this.addCommand(new Fakechat()); this.addCommand(new Nick()); @@ -31,7 +30,6 @@ public CommandManager() { this.addCommand(new Shoutout()); this.addCommand(new Friends()); this.addCommand(new VersionCommand()); - this.addCommand(new F3Name()); } diff --git a/src/main/java/keystrokesmod/client/command/commands/Cname.java b/src/main/java/keystrokesmod/client/command/commands/Cname.java deleted file mode 100644 index b8351643..00000000 --- a/src/main/java/keystrokesmod/client/command/commands/Cname.java +++ /dev/null @@ -1,23 +0,0 @@ -package keystrokesmod.client.command.commands; - -import keystrokesmod.client.clickgui.raven.Terminal; -import keystrokesmod.client.command.Command; -import keystrokesmod.client.module.modules.other.NameHider; -import keystrokesmod.client.utils.Utils; - -public class Cname extends Command { - public Cname() { - super("cname", "Hides your name client-side", 1, 1, new String[] {"New name"}, new String[] {"cn", "changename"}); - } - - @Override - public void onCall(String[] args) { - if (args.length == 0) { - this.incorrectArgs(); - return; - } - - NameHider.n = args[0]; - Terminal.print("Nick has been set to: " + NameHider.n); - } -} diff --git a/src/main/java/keystrokesmod/client/command/commands/F3Name.java b/src/main/java/keystrokesmod/client/command/commands/F3Name.java deleted file mode 100644 index 3af0dea6..00000000 --- a/src/main/java/keystrokesmod/client/command/commands/F3Name.java +++ /dev/null @@ -1,27 +0,0 @@ -package keystrokesmod.client.command.commands; - - -import keystrokesmod.client.clickgui.raven.Terminal; -import keystrokesmod.client.command.Command; -import keystrokesmod.client.module.modules.client.ClientNameSpoof; - -public class F3Name extends Command { - public F3Name() { - super("f3name", "Changes the client's name in f3", 1, 1, new String[] {"New client name"}, new String[] {"f3n"}); - } - - public void onCall(String[] args){ - if(args.length == 0){ - this.incorrectArgs(); - return; - } - StringBuilder wut = new StringBuilder(args[0]); - if(args.length > 1){ - for(int i = 2; i < args.length; i++){ - wut.append(" ").append(args[i]); - } - } - ClientNameSpoof.newName = wut.toString(); - Terminal.print("Set client name to " + wut); - } -} diff --git a/src/main/java/keystrokesmod/client/module/ModuleManager.java b/src/main/java/keystrokesmod/client/module/ModuleManager.java index e529ac00..bf847bde 100644 --- a/src/main/java/keystrokesmod/client/module/ModuleManager.java +++ b/src/main/java/keystrokesmod/client/module/ModuleManager.java @@ -55,7 +55,6 @@ public ModuleManager() { addModule(new Xray()); addModule(new MurderMystery()); addModule(new SumoFences()); - addModule(new ClientNameSpoof()); addModule(new FakeChat()); addModule(new StringEncrypt()); addModule(new WaterBucket()); diff --git a/src/main/java/keystrokesmod/client/tweaker/ASMEventHandler.java b/src/main/java/keystrokesmod/client/tweaker/ASMEventHandler.java index bc761ad4..8f750a37 100644 --- a/src/main/java/keystrokesmod/client/tweaker/ASMEventHandler.java +++ b/src/main/java/keystrokesmod/client/tweaker/ASMEventHandler.java @@ -6,7 +6,6 @@ import keystrokesmod.client.module.modules.combat.Reach; import keystrokesmod.client.module.modules.movement.KeepSprint; import keystrokesmod.client.module.modules.movement.NoSlow; -import keystrokesmod.client.module.modules.other.NameHider; import keystrokesmod.client.module.modules.other.StringEncrypt; import keystrokesmod.client.module.modules.player.SafeWalk; import keystrokesmod.client.module.modules.render.AntiShuffle; @@ -21,14 +20,9 @@ public class ASMEventHandler { /** * called when Minecraft format text - * ASM Modules : NameHider, AntiShuffle, StringEncrypt + * ASM Modules : AntiShuffle, StringEncrypt */ public static String getUnformattedTextForChat(String s) { - Module nameHider = Raven.moduleManager.getModuleByClazz(NameHider.class); - if (nameHider != null && nameHider.isEnabled()) { - s = NameHider.getUnformattedTextForChat(s); - } - Module antiShuffle = Raven.moduleManager.getModuleByClazz(StringEncrypt.class); if (antiShuffle != null && antiShuffle.isEnabled()) { s = AntiShuffle.getUnformattedTextForChat(s); diff --git a/src/main/java/keystrokesmod/client/tweaker/transformers/TransformerFMLCommonHandler.java b/src/main/java/keystrokesmod/client/tweaker/transformers/TransformerFMLCommonHandler.java index 6f115c31..50d80e20 100644 --- a/src/main/java/keystrokesmod/client/tweaker/transformers/TransformerFMLCommonHandler.java +++ b/src/main/java/keystrokesmod/client/tweaker/transformers/TransformerFMLCommonHandler.java @@ -5,7 +5,6 @@ import keystrokesmod.client.main.Raven; import keystrokesmod.client.module.Module; import keystrokesmod.client.module.ModuleManager; -import keystrokesmod.client.module.modules.client.ClientNameSpoof; import net.minecraftforge.fml.common.Loader; import org.objectweb.asm.tree.*; @@ -51,10 +50,6 @@ private InsnList getInsn() { } public static String getModName() { - Module cns = Raven.moduleManager.getModuleByClazz(ClientNameSpoof.class); - if (cns != null && cns.isEnabled()){ - return ClientNameSpoof.newName; - } List modNames = Lists.newArrayListWithExpectedSize(3); modNames.add("fml"); modNames.add("forge");