From 49f5073309993ad607958c210c58657ad0678ecc Mon Sep 17 00:00:00 2001 From: games647 Date: Fri, 15 Dec 2017 16:00:15 +0100 Subject: [PATCH] Fix auto register --- .../games647/lambdaattack/LambdaAttack.java | 3 +-- .../games647/lambdaattack/UniversalFactory.java | 7 +++---- .../bot/listener/SessionListener.java | 3 +-- .../bot/listener/SessionListener111.java | 16 ++++++++-------- .../bot/listener/SessionListener112.java | 17 +++++++++-------- .../games647/lambdaattack/gui/MainGui.java | 9 ++++++++- .../games647/lambdaattack/GameVersion.java | 14 ++++++++++++-- version_1_11/pom.xml | 2 +- version_1_12/pom.xml | 2 +- .../version/v1_12/ProtocolWrapper.java | 2 +- 10 files changed, 45 insertions(+), 30 deletions(-) diff --git a/core/src/main/java/com/github/games647/lambdaattack/LambdaAttack.java b/core/src/main/java/com/github/games647/lambdaattack/LambdaAttack.java index 0cc523c..fa1e71e 100644 --- a/core/src/main/java/com/github/games647/lambdaattack/LambdaAttack.java +++ b/core/src/main/java/com/github/games647/lambdaattack/LambdaAttack.java @@ -34,10 +34,9 @@ public static void main(String[] args) { }); instance = new LambdaAttack(); + new MainGui(instance); } - private final MainGui mainGui = new MainGui(this); - private boolean running = false; private GameVersion gameVersion = GameVersion.VERSION_1_12; diff --git a/core/src/main/java/com/github/games647/lambdaattack/UniversalFactory.java b/core/src/main/java/com/github/games647/lambdaattack/UniversalFactory.java index fc62598..2cb6d01 100644 --- a/core/src/main/java/com/github/games647/lambdaattack/UniversalFactory.java +++ b/core/src/main/java/com/github/games647/lambdaattack/UniversalFactory.java @@ -1,6 +1,5 @@ package com.github.games647.lambdaattack; -import com.github.games647.lambdaattack.version.v1_12.ProtocolWrapper; import com.github.steveice10.packetlib.Session; public class UniversalFactory { @@ -8,7 +7,7 @@ public class UniversalFactory { public static UniversalProtocol authenticate(GameVersion gameVersion, String username) { switch (gameVersion) { case VERSION_1_11: - return new ProtocolWrapper(username); + return new com.github.games647.lambdaattack.version.v1_11.ProtocolWrapper(username); case VERSION_1_12: return new com.github.games647.lambdaattack.version.v1_12.ProtocolWrapper(username); default: @@ -19,10 +18,10 @@ public static UniversalProtocol authenticate(GameVersion gameVersion, String use public static void sendChatMessage(GameVersion gameVersion, String message, Session session) { switch (gameVersion) { case VERSION_1_11: - session.send(new com.github.steveice10.mc.protocol.v1_11.packet.ingame.client.ClientChatPacket(message)); + session.send(new com.github.steveice10.protocol.v1_11.packet.ingame.client.ClientChatPacket(message)); break; case VERSION_1_12: - session.send(new com.github.steveice10.mc.protocol.v1_12.packet.ingame.client.ClientChatPacket(message)); + session.send(new com.github.steveice10.protocol.v1_12.packet.ingame.client.ClientChatPacket(message)); break; default: throw new IllegalArgumentException("Invalid game version"); diff --git a/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener.java b/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener.java index f0d7259..ef6b3b6 100644 --- a/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener.java +++ b/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener.java @@ -2,7 +2,6 @@ import com.github.games647.lambdaattack.LambdaAttack; import com.github.games647.lambdaattack.bot.Bot; -import com.github.steveice10.mc.auth.data.GameProfile; import com.github.steveice10.packetlib.event.session.DisconnectedEvent; import com.github.steveice10.packetlib.event.session.SessionAdapter; @@ -22,7 +21,7 @@ public void disconnected(DisconnectedEvent disconnectedEvent) { owner.getLogger().log(Level.INFO, "Disconnected: {0}", reason); } - public void onJoin(GameProfile profile) { + public void onJoin() { if (LambdaAttack.getInstance().isAutoRegister()) { String password = LambdaAttack.PROJECT_NAME; owner.sendMessage(Bot.COMMAND_IDENTIFIER + "register " + password + password); diff --git a/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener111.java b/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener111.java index c1b1cec..3c1fb5f 100644 --- a/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener111.java +++ b/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener111.java @@ -3,11 +3,11 @@ import com.github.games647.lambdaattack.bot.Bot; import com.github.games647.lambdaattack.bot.EntitiyLocation; import com.github.steveice10.packetlib.event.session.PacketReceivedEvent; -import com.github.steveice10.mc.protocol.v1_11.packet.login.server.LoginSuccessPacket; -import com.github.steveice10.mc.protocol.v1_11.data.message.Message; -import com.github.steveice10.mc.protocol.v1_11.packet.ingame.server.ServerChatPacket; -import com.github.steveice10.mc.protocol.v1_11.packet.ingame.server.entity.player.ServerPlayerHealthPacket; -import com.github.steveice10.mc.protocol.v1_11.packet.ingame.server.entity.player.ServerPlayerPositionRotationPacket; +import com.github.steveice10.protocol.v1_11.packet.ingame.server.ServerJoinGamePacket; +import com.github.steveice10.protocol.v1_11.data.message.Message; +import com.github.steveice10.protocol.v1_11.packet.ingame.server.ServerChatPacket; +import com.github.steveice10.protocol.v1_11.packet.ingame.server.entity.player.ServerPlayerHealthPacket; +import com.github.steveice10.protocol.v1_11.packet.ingame.server.entity.player.ServerPlayerPositionRotationPacket; import java.util.logging.Level; @@ -36,9 +36,9 @@ public void packetReceived(PacketReceivedEvent receiveEvent) { ServerPlayerHealthPacket healthPacket = receiveEvent.getPacket(); owner.setHealth(healthPacket.getHealth()); owner.setFood(healthPacket.getFood()); - } else if (receiveEvent.getPacket() instanceof LoginSuccessPacket) { - LoginSuccessPacket loginSuccessPacket = receiveEvent.getPacket(); - super.onJoin(loginSuccessPacket.getProfile()); + } else if (receiveEvent.getPacket() instanceof ServerJoinGamePacket) { + ServerJoinGamePacket loginSuccessPacket = receiveEvent.getPacket(); + super.onJoin(); } } } diff --git a/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener112.java b/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener112.java index eafdc14..761075c 100644 --- a/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener112.java +++ b/core/src/main/java/com/github/games647/lambdaattack/bot/listener/SessionListener112.java @@ -1,13 +1,14 @@ package com.github.games647.lambdaattack.bot.listener; +import com.github.games647.lambdaattack.LambdaAttack; import com.github.games647.lambdaattack.bot.Bot; import com.github.games647.lambdaattack.bot.EntitiyLocation; import com.github.steveice10.packetlib.event.session.PacketReceivedEvent; -import com.github.steveice10.mc.protocol.v1_12.packet.login.server.LoginSuccessPacket; -import com.github.steveice10.mc.protocol.v1_12.data.message.Message; -import com.github.steveice10.mc.protocol.v1_12.packet.ingame.server.ServerChatPacket; -import com.github.steveice10.mc.protocol.v1_12.packet.ingame.server.entity.player.ServerPlayerHealthPacket; -import com.github.steveice10.mc.protocol.v1_12.packet.ingame.server.entity.player.ServerPlayerPositionRotationPacket; +import com.github.steveice10.protocol.v1_12.packet.ingame.server.ServerJoinGamePacket; +import com.github.steveice10.protocol.v1_12.data.message.Message; +import com.github.steveice10.protocol.v1_12.packet.ingame.server.ServerChatPacket; +import com.github.steveice10.protocol.v1_12.packet.ingame.server.entity.player.ServerPlayerHealthPacket; +import com.github.steveice10.protocol.v1_12.packet.ingame.server.entity.player.ServerPlayerPositionRotationPacket; import java.util.logging.Level; @@ -36,9 +37,9 @@ public void packetReceived(PacketReceivedEvent receiveEvent) { ServerPlayerHealthPacket healthPacket = receiveEvent.getPacket(); owner.setHealth(healthPacket.getHealth()); owner.setFood(healthPacket.getFood()); - } else if (receiveEvent.getPacket() instanceof LoginSuccessPacket) { - LoginSuccessPacket loginSuccessPacket = receiveEvent.getPacket(); - super.onJoin(loginSuccessPacket.getProfile()); + } else if (receiveEvent.getPacket() instanceof ServerJoinGamePacket) { + ServerJoinGamePacket loginSuccessPacket = receiveEvent.getPacket(); + super.onJoin(); } } } diff --git a/core/src/main/java/com/github/games647/lambdaattack/gui/MainGui.java b/core/src/main/java/com/github/games647/lambdaattack/gui/MainGui.java index 767d4a8..8a95ba2 100644 --- a/core/src/main/java/com/github/games647/lambdaattack/gui/MainGui.java +++ b/core/src/main/java/com/github/games647/lambdaattack/gui/MainGui.java @@ -6,6 +6,8 @@ import java.awt.BorderLayout; import java.awt.event.ItemEvent; +import java.util.Arrays; +import java.util.Comparator; import java.util.logging.Level; import javax.swing.JButton; @@ -66,6 +68,7 @@ private JPanel setTopPane() { topPanel.add(new JLabel("Auto Register: ")); JCheckBox autoRegister = new JCheckBox(); + autoRegister.addActionListener(e -> botManager.setAutoRegister(!botManager.isAutoRegister())); topPanel.add(autoRegister); topPanel.add(new JLabel("Amount: ")); @@ -77,7 +80,11 @@ private JPanel setTopPane() { JTextField nameFormat = new JTextField("Bot-%d"); topPanel.add(nameFormat); - JComboBox versionBox = new JComboBox<>(new String[]{"1.11", "1.10", "1.9", "1.8", "1.7"}); + JComboBox versionBox = new JComboBox<>(); + Arrays.stream(GameVersion.values()) + .sorted(Comparator.reverseOrder()) + .map(GameVersion::getVersion) + .forEach(versionBox::addItem); versionBox.addItemListener(itemEvent -> { if (itemEvent.getStateChange() == ItemEvent.SELECTED) { botManager.setGameVersion(GameVersion.findByName((String) itemEvent.getItem())); diff --git a/version/src/main/java/com/github/games647/lambdaattack/GameVersion.java b/version/src/main/java/com/github/games647/lambdaattack/GameVersion.java index 4bc57c5..dba1413 100644 --- a/version/src/main/java/com/github/games647/lambdaattack/GameVersion.java +++ b/version/src/main/java/com/github/games647/lambdaattack/GameVersion.java @@ -2,9 +2,9 @@ public enum GameVersion { - VERSION_1_11, + VERSION_1_11("1.11"), - VERSION_1_12; + VERSION_1_12("1.12.2"); public static GameVersion findByName(String name) { switch (name) { @@ -16,4 +16,14 @@ public static GameVersion findByName(String name) { return null; } + + private final String version; + + GameVersion(String version) { + this.version = version; + } + + public String getVersion() { + return version; + } } diff --git a/version_1_11/pom.xml b/version_1_11/pom.xml index 2959f18..d08c84b 100644 --- a/version_1_11/pom.xml +++ b/version_1_11/pom.xml @@ -23,7 +23,7 @@ com.github.steveice10.mc.protocol - com.github.steveice10.mc.protocol.v1_11 + com.github.steveice10.protocol.v1_11 diff --git a/version_1_12/pom.xml b/version_1_12/pom.xml index 54d69a3..1f6f345 100644 --- a/version_1_12/pom.xml +++ b/version_1_12/pom.xml @@ -23,7 +23,7 @@ com.github.steveice10.mc.protocol - com.github.steveice10.mc.protocol.v1_12 + com.github.steveice10.protocol.v1_12 diff --git a/version_1_12/src/main/java/com/github/games647/lambdaattack/version/v1_12/ProtocolWrapper.java b/version_1_12/src/main/java/com/github/games647/lambdaattack/version/v1_12/ProtocolWrapper.java index 6a8cf03..e58c3d8 100644 --- a/version_1_12/src/main/java/com/github/games647/lambdaattack/version/v1_12/ProtocolWrapper.java +++ b/version_1_12/src/main/java/com/github/games647/lambdaattack/version/v1_12/ProtocolWrapper.java @@ -38,6 +38,6 @@ public PacketProtocol getProtocol() { @Override public GameVersion getGameVersion() { - return GameVersion.VERSION_1_11; + return GameVersion.VERSION_1_12; } }