implemented 1.16-pre5 support (nothing changed, lol)

implemented auto-respawn (only tested in 1.16) #27 #35
first attempts of forge handshake #38

Author: MrKinau

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>systems.kinau</groupId>
     <artifactId>FishingBot</artifactId>
-    <version>2.7</version>
+    <version>2.7.1</version>
     <name>FishingBot</name>
     <description>An AFK fishing bot for minecraft</description>
 
@@ -36,6 +36,7 @@
             <scope>provided</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
+        <!-- TODO: Replace with json-simple -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -51,7 +52,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.10</version>
+            <version>4.5.12</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -61,7 +62,7 @@
         <dependency>
             <groupId>com.flowpowered</groupId>
             <artifactId>flow-nbt</artifactId>
-            <version>LATEST</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.MrPowerGamerBR</groupId>

src/main/java/systems/kinau/fishingbot/bot/Player.java

@@ -15,6 +15,7 @@
 import systems.kinau.fishingbot.fishing.AnnounceType;
 import systems.kinau.fishingbot.network.protocol.ProtocolConstants;
 import systems.kinau.fishingbot.network.protocol.play.PacketOutChat;
+import systems.kinau.fishingbot.network.protocol.play.PacketOutClientStatus;
 import systems.kinau.fishingbot.network.protocol.play.PacketOutTeleportConfirm;
 
 public class Player implements Listener {
@@ -79,5 +80,16 @@ public void onUpdateSlot(UpdateSlotEvent event) {
     @EventHandler
     public void onJoinGame(JoinGameEvent event) {
         setEntityID(event.getEid());
+        respawn();
+    }
+
+    @EventHandler
+    public void onUpdateHealth(UpdateHealthEvent event) {
+        if (event.getHealth() <= 0)
+            respawn();
+    }
+
+    public void respawn() {
+        FishingBot.getInstance().getNet().sendPacket(new PacketOutClientStatus(PacketOutClientStatus.Action.PERFORM_RESPAWN));
     }
 }

src/main/java/systems/kinau/fishingbot/event/play/UpdateHealthEvent.java

@@ -0,0 +1,14 @@
+package systems.kinau.fishingbot.event.play;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import systems.kinau.fishingbot.event.Event;
+
+@AllArgsConstructor
+public class UpdateHealthEvent extends Event {
+
+    @Getter private float health;
+    @Getter private int food;
+    @Getter private float saturation;
+
+}

src/main/java/systems/kinau/fishingbot/fishing/ItemHandler.java

@@ -64,6 +64,7 @@ public ItemHandler(int protocolId) {
                 break;
             }
             case ProtocolConstants.MINECRAFT_1_16_PRE_2:
+            case ProtocolConstants.MINECRAFT_1_16_PRE_5:
             default: {
                 root = new JsonParser().parse(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("registries_1_16.json")));
                 root = root.getAsJsonObject().get("minecraft:item").getAsJsonObject().get("entries").getAsJsonObject();

src/main/java/systems/kinau/fishingbot/modules/ClientDefaultsModule.java

@@ -22,6 +22,7 @@
 public class ClientDefaultsModule extends Module implements Listener {
 
     @Getter private Thread positionThread;
+    @Getter private boolean joined;
 
     @Override
     public void onEnable() {
@@ -37,6 +38,9 @@ public void onDisable() {
 
     @EventHandler
     public void onSetDifficulty(DifficultySetEvent event) {
+        if (isJoined())
+            return;
+        this.joined = true;
         new Thread(() -> {
             try {
                 Thread.sleep(1500);

src/main/java/systems/kinau/fishingbot/modules/FishingModule.java

@@ -352,6 +352,7 @@ public void onSpawnObject(SpawnObjectEvent event) {
                 break;
             }
             case ProtocolConstants.MINECRAFT_1_16_PRE_2:
+            case ProtocolConstants.MINECRAFT_1_16_PRE_5:
             default: {
                 if(event.getType() == 106) {   //106 = bobber
                     if(FishingBot.getInstance().getPlayer().getEntityID() == -1 || event.getObjectData() == FishingBot.getInstance().getPlayer().getEntityID())

src/main/java/systems/kinau/fishingbot/modules/LoginModule.java

@@ -84,6 +84,7 @@ public void onSetCompression(SetCompressionEvent event) {
 
     @EventHandler
     public void onLoginPluginRequest(LoginPluginRequestEvent event) {
+        System.out.println(event.getMsgId() + " >> " + event.getChannel());
         FishingBot.getInstance().getNet().sendPacket(new PacketOutLoginPluginResponse(event.getMsgId(), false, null));
     }
 

src/main/java/systems/kinau/fishingbot/network/protocol/NetworkHandler.java

@@ -6,6 +6,7 @@
 package systems.kinau.fishingbot.network.protocol;
 
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 
 public class ProtocolConstants {
@@ -33,6 +34,7 @@ public class ProtocolConstants {
     public static final int MINECRAFT_1_15_1 = 575;
     public static final int MINECRAFT_1_15_2 = 578;
     public static final int MINECRAFT_1_16_PRE_2 = 722;
+    public static final int MINECRAFT_1_16_PRE_5 = 729;
 
     public static final List<String> SUPPORTED_VERSIONS = Arrays.asList(
             "1.8.x",
@@ -69,7 +71,8 @@ public class ProtocolConstants {
             ProtocolConstants.MINECRAFT_1_15,
             ProtocolConstants.MINECRAFT_1_15_1,
             ProtocolConstants.MINECRAFT_1_15_2,
-            ProtocolConstants.MINECRAFT_1_16_PRE_2
+            ProtocolConstants.MINECRAFT_1_16_PRE_2,
+            ProtocolConstants.MINECRAFT_1_16_PRE_5
     );
 
     public static String getVersionString(int protocolId) {
@@ -97,6 +100,7 @@ public static String getVersionString(int protocolId) {
             case MINECRAFT_1_15_1: return "1.15.1";
             case MINECRAFT_1_15_2: return "1.15.2";
             case MINECRAFT_1_16_PRE_2: return "1.16-pre2";
+            case MINECRAFT_1_16_PRE_5: return "1.16-pre5";
             default: return "Unknown version";
         }
     }
@@ -125,7 +129,12 @@ public static int getProtocolId(String versionString) {
             case "1.15.1": return MINECRAFT_1_15_1;
             case "1.15.2": return MINECRAFT_1_15_2;
             case "1.16-pre2": return MINECRAFT_1_16_PRE_2;
+            case "1.16-pre5": return MINECRAFT_1_16_PRE_5;
             default: return MINECRAFT_1_8;
         }
     }
+
+    public static int getLatest() {
+        return SUPPORTED_VERSION_IDS.stream().max(Comparator.naturalOrder()).orElse(0);
+    }
 }

src/main/java/systems/kinau/fishingbot/network/protocol/ProtocolConstants.java

@@ -21,7 +21,7 @@ public class PacketOutHandshake extends Packet {
     @Override
     public void write(ByteArrayDataOutput out, int protocolId) {
         writeVarInt(FishingBot.getInstance().getServerProtocol(), out);
-        writeString(serverName, out);
+        writeString(serverName + "\0FML\0", out);
         out.writeShort(serverPort);
         writeVarInt(2, out); //next State = 2 -> LOGIN
     }