From 1123d9db927aaee407de2c9adc420806226450cb Mon Sep 17 00:00:00 2001 From: Bella Who Date: Wed, 18 Dec 2019 09:05:57 -0500 Subject: [PATCH] Modmanager fix #296 (#298) * ModuleManager lookup fixes. * ModuleManager lookup fixes. * updateLookup() should store in lowercase * Revert "add format chat" This reverts commit b6621ec8429de851b5dac8c1b358589842c7498c. * Revert "add console spam" This reverts commit 867a168bfb2c10ab9cb195485a6ba70bea4c3e40. * ModuleManager safety * Module wasn't spelled correctly, causing NPE. --- .../kami/mixin/client/MixinC00Handshake.java | 2 +- .../me/zeroeightsix/kami/module/Module.java | 1 - .../modules/bewwawho/misc/ConsoleSpam.java | 39 --------------- .../modules/bewwawho/misc/FormatChat.java | 47 ------------------- 4 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/ConsoleSpam.java delete mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/FormatChat.java diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinC00Handshake.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinC00Handshake.java index 6d207533..04d46b82 100644 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinC00Handshake.java +++ b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinC00Handshake.java @@ -27,7 +27,7 @@ public class MixinC00Handshake { @Inject(method = "writePacketData", at = @At(value = "HEAD"), cancellable = true) public void writePacketData(PacketBuffer buf, CallbackInfo info) { - if (ModuleManager.isModuleEnabled("FakeVanilla")) { + if (ModuleManager.isModuleEnabled("FakeVanillaClient")) { info.cancel(); buf.writeVarInt(protocolVersion); buf.writeString(ip); diff --git a/src/main/java/me/zeroeightsix/kami/module/Module.java b/src/main/java/me/zeroeightsix/kami/module/Module.java index 69bc4573..f2419c1d 100644 --- a/src/main/java/me/zeroeightsix/kami/module/Module.java +++ b/src/main/java/me/zeroeightsix/kami/module/Module.java @@ -4,7 +4,6 @@ import com.google.common.base.Converter; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; import me.zeroeightsix.kami.KamiMod; -import me.zeroeightsix.kami.event.events.PacketEvent; import me.zeroeightsix.kami.event.events.RenderEvent; import me.zeroeightsix.kami.setting.Setting; import me.zeroeightsix.kami.setting.Settings; diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/ConsoleSpam.java b/src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/ConsoleSpam.java deleted file mode 100644 index 32941327..00000000 --- a/src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/ConsoleSpam.java +++ /dev/null @@ -1,39 +0,0 @@ -package me.zeroeightsix.kami.module.modules.bewwawho.misc; - -import me.zeroeightsix.kami.module.Module; -import me.zeroeightsix.kami.setting.Setting; -import me.zeroeightsix.kami.setting.Settings; -import me.zeroeightsix.kami.event.events.PacketEvent; -import me.zeroeightsix.kami.command.Command; -import me.zeroeightsix.kami.util.Wrapper; - -import me.zero.alpine.listener.EventHandler; -import me.zero.alpine.listener.Listener; - -import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock; -import net.minecraft.network.play.client.CPacketUpdateSign; -import net.minecraft.util.math.BlockPos; -import net.minecraft.tileentity.TileEntitySign; - -/** - * Created on 16 December by 0x2E | PretendingToCode - */ - -@Module.Info(name = "ConsoleSpam", description = "Spams Spigot consoles by sending invalid UpdateSign packets", category = Module.Category.MISC) -public class ConsoleSpam extends Module { - - @Override - public void onEnable() { - Command.sendChatMessage("[ConsoleSpam] Every time you right click a sign, a warning will appear in console."); - Command.sendChatMessage("[ConsoleSpam] Use an autoclicker to automate this process."); - } - - @EventHandler - public Listener sendListener = new Listener<>(event -> { - if (event.getPacket() instanceof CPacketPlayerTryUseItemOnBlock) { - BlockPos location = ((CPacketPlayerTryUseItemOnBlock) event.getPacket()).getPos(); - - Wrapper.getPlayer().connection.sendPacket(new CPacketUpdateSign(location, new TileEntitySign().signText)); - } - }); -} diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/FormatChat.java b/src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/FormatChat.java deleted file mode 100644 index 9d4b21cf..00000000 --- a/src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/FormatChat.java +++ /dev/null @@ -1,47 +0,0 @@ -package me.zeroeightsix.kami.module.modules.bewwawho.misc; - -import me.zeroeightsix.kami.module.Module; -import me.zeroeightsix.kami.setting.Setting; -import me.zeroeightsix.kami.setting.Settings; -import me.zeroeightsix.kami.event.events.PacketEvent; -import me.zeroeightsix.kami.command.Command; -import me.zeroeightsix.kami.util.Wrapper; - -import me.zero.alpine.listener.EventHandler; -import me.zero.alpine.listener.Listener; - -import net.minecraft.client.Minecraft; -import net.minecraft.network.play.client.CPacketChatMessage; - -/** - * Created on 16 December by 0x2E | PretendingToCode - */ - -@Module.Info(name = "FormatChat", description = "Add color and linebreak support to upstream chat packets", category = Module.Category.MISC) -public class FormatChat extends Module { - - @Override - public void onEnable() { - if (Minecraft.getMinecraft().getCurrentServerData() == null) { - Command.sendWarningMessage("[FormatChat] &6&lWarning: &r&6This does not work in singleplayer"); - this.disable(); - } - else { - Command.sendWarningMessage("[FormatChat] &6&lWarning: &r&6This will kick you on most servers!"); - } - } - - @EventHandler - public Listener sendListener = new Listener<>(event -> { - if (event.getPacket() instanceof CPacketChatMessage) { - String message = ((CPacketChatMessage) event.getPacket()).message; - if(message.contains("&") || message.contains("#n")){ - message = message.replaceAll("&", Command.SECTION_SIGN + ""); - message = message.replaceAll("#n", "\n"); - - Wrapper.getPlayer().connection.sendPacket(new CPacketChatMessage(message)); - event.cancel(); - } - } - }); -}