From e0d71655cadccf0e8be6954e90282866e02a02d9 Mon Sep 17 00:00:00 2001 From: IronException Date: Fri, 25 Oct 2019 12:42:50 +0200 Subject: [PATCH 1/6] prepare for saving file --- .../kami/module/modules/render/ChunkFinder.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/ChunkFinder.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/ChunkFinder.java index 96f7211b..7e8c8629 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/ChunkFinder.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/ChunkFinder.java @@ -34,7 +34,8 @@ public class ChunkFinder extends Module { private Setting saveNewChunks = register(Settings.b("Save New Chunks", false)); private Setting saveOption = register(Settings.enumBuilder(SaveOption.class).withValue(SaveOption.extraFolder).withName("Save Option").withVisibility(aBoolean -> saveNewChunks.getValue()).build()); private Setting saveInRegionFolder = register(Settings.booleanBuilder("In Region").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()).build()); - private Setting alsoSaveNormalCoords = register(Settings.booleanBuilder("Save Normal Coords").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()).build()); + private Setting alsoSaveNormalCoords = register(Settings.booleanBuilder("Save Normal Coords").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()). private Setting alsoSaveNormalCoords = register(Settings.booleanBuilder("Save Normal Coords").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()).build()); + private Setting closeFile = register(Settings.booleanBuilder("Close File").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()).build()); private LastSetting lastSetting = new LastSetting(); private PrintWriter logWriter; @@ -92,6 +93,12 @@ public class ChunkFinder extends Module { GL11.glTranslated(x, -(y + yOffset.getValue()), z); } + @Override + protected void onUpdate() { + logWriterClose(); + // TODO test this... alos when onDisable is called + } + @Override protected void onDisable() { logWriterClose(); From 4bb68fec30b130a08dd4b2bc2238616f151cb5f9 Mon Sep 17 00:00:00 2001 From: IronException Date: Fri, 25 Oct 2019 18:02:26 +0200 Subject: [PATCH 2/6] should work now --- .../kami/module/modules/render/ChunkFinder.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/ChunkFinder.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/ChunkFinder.java index 7e8c8629..9aa7c06a 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/ChunkFinder.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/ChunkFinder.java @@ -34,7 +34,7 @@ public class ChunkFinder extends Module { private Setting saveNewChunks = register(Settings.b("Save New Chunks", false)); private Setting saveOption = register(Settings.enumBuilder(SaveOption.class).withValue(SaveOption.extraFolder).withName("Save Option").withVisibility(aBoolean -> saveNewChunks.getValue()).build()); private Setting saveInRegionFolder = register(Settings.booleanBuilder("In Region").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()).build()); - private Setting alsoSaveNormalCoords = register(Settings.booleanBuilder("Save Normal Coords").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()). private Setting alsoSaveNormalCoords = register(Settings.booleanBuilder("Save Normal Coords").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()).build()); + private Setting alsoSaveNormalCoords = register(Settings.booleanBuilder("Save Normal Coords").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()).build()); private Setting closeFile = register(Settings.booleanBuilder("Close File").withValue(false).withVisibility(aBoolean -> saveNewChunks.getValue()).build()); private LastSetting lastSetting = new LastSetting(); @@ -94,13 +94,17 @@ public class ChunkFinder extends Module { } @Override - protected void onUpdate() { + public void onUpdate() { + if (!closeFile.getValue()) + return; + closeFile.setValue(false); + Command.sendChatMessage("close file"); logWriterClose(); - // TODO test this... alos when onDisable is called } @Override protected void onDisable() { + Command.sendChatMessage("onDisable"); logWriterClose(); chunks.clear(); } From a1f6a4ab72bb2fcb1545aa0b4f3b309c5065ecf4 Mon Sep 17 00:00:00 2001 From: Bella Date: Tue, 17 Dec 2019 20:56:49 -0500 Subject: [PATCH 3/6] Revert "add format chat" This reverts commit b6621ec8429de851b5dac8c1b358589842c7498c. --- .../modules/bewwawho/misc/FormatChat.java | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/FormatChat.java 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(); - } - } - }); -} From c55b3b3da94319fb00b91282433f398c74feffb1 Mon Sep 17 00:00:00 2001 From: Bella Date: Tue, 17 Dec 2019 20:56:58 -0500 Subject: [PATCH 4/6] Revert "add console spam" This reverts commit 867a168bfb2c10ab9cb195485a6ba70bea4c3e40. --- .../modules/bewwawho/misc/ConsoleSpam.java | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/ConsoleSpam.java 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)); - } - }); -} From 5f6121eecfa2cc2a0b5f5b9d88235cf515c53bdc Mon Sep 17 00:00:00 2001 From: Bella Date: Tue, 17 Dec 2019 20:56:58 -0500 Subject: [PATCH 5/6] Revert "Revert "add console spam"" This reverts commit c55b3b3da94319fb00b91282433f398c74feffb1. --- .../modules/bewwawho/misc/ConsoleSpam.java | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/ConsoleSpam.java 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 new file mode 100644 index 00000000..32941327 --- /dev/null +++ b/src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/ConsoleSpam.java @@ -0,0 +1,39 @@ +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)); + } + }); +} From 7d45158a81cd3c04ac502f2594627acb1a0c14f8 Mon Sep 17 00:00:00 2001 From: Bella Date: Tue, 17 Dec 2019 20:56:49 -0500 Subject: [PATCH 6/6] Revert "Revert "add format chat"" This reverts commit a1f6a4ab72bb2fcb1545aa0b4f3b309c5065ecf4. --- .../modules/bewwawho/misc/FormatChat.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/FormatChat.java 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 new file mode 100644 index 00000000..9d4b21cf --- /dev/null +++ b/src/main/java/me/zeroeightsix/kami/module/modules/bewwawho/misc/FormatChat.java @@ -0,0 +1,47 @@ +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(); + } + } + }); +}