Merge pull request #249 from MrKinau/dev/1.21.2

1.21.2

Author: MrKinau

README.md

@@ -80,6 +80,9 @@ A list of all commands can be found in the wiki ([here](https://github.com/MrKin
 - 1.20.5
 - 1.20.6
 - 1.21
+- 1.21.1
+- 1.21.2
+- 1.21.3
 
 ## Discord
 To follow the project, get support or request features or bugs you can join my Discord: https://discord.gg/xHpCDYf

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>systems.kinau</groupId>
     <artifactId>FishingBot</artifactId>
-    <version>2.12.5</version>
+    <version>2.12.8</version>
     <name>FishingBot</name>
     <description>An AFK fishing bot for Minecraft</description>
 

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

@@ -44,4 +44,9 @@ public void read(ByteArrayDataInputWrapper in, int protocolId) {
         this.level = Packet.readVarInt(in);
         this.enchantmentType = Registries.ENCHANTMENT.getEnchantmentName(enchantmentId, protocolId);
     }
+
+    @Override
+    public String toString(int protocolId) {
+        return "{enchantment=" + getEnchantmentType() + ",level=" + level + "}";
+    }
 }

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

@@ -12,5 +12,6 @@ public class MovingObjectPositionBlock {
     private float dx;
     private float dy;
     private float dz;
-    private boolean flag;
+    private boolean inside;
+    private boolean worldBorderHit;
 }

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

@@ -85,6 +85,14 @@ public void onPosLookChange(PosLookChangeEvent event) {
             FishingBot.getInstance().getCurrentBot().getNet().sendPacket(new PacketOutTeleportConfirm(event.getTeleportId()));
     }
 
+    @EventHandler
+    public void onPosLookChange(LookChangeEvent event) {
+        this.yaw = event.getYaw();
+        this.pitch = event.getPitch();
+        this.originYaw = yaw;
+        this.originPitch = pitch;
+    }
+
     @EventHandler
     public void onUpdateXP(UpdateExperienceEvent event) {
         if (getLevels() >= 0 && getLevels() < event.getLevel()) {
@@ -320,7 +328,7 @@ public void shiftToInventory(int slotId, Inventory inventory) {
         FishingBot.getInstance().getCurrentBot().getNet().sendPacket(
                 new PacketOutClickWindow(
                         /* player inventory */ inventory.getWindowId(),
-                        /* the clicked slot */ (short) (slotId + (inventory.getContent().size() == 63 ? 18 : 45)),
+                        /* the clicked slot */ (short) (slotId + (inventory.getContent().size() - 45)),
                         /* use right click */ (byte) 0,
                         /* action count starting at 1 */ inventory.getActionCounter(),
                         /* shift click mode */ 1,
@@ -373,7 +381,7 @@ private void internalLook(float yaw, float pitch, int speed, Consumer<Boolean> o
                 setYaw(-180 + (getYaw() - 180));
             if (getYaw() < -180)
                 setYaw(180 + (getYaw() + 180));
-            FishingBot.getInstance().getCurrentBot().getNet().sendPacket(new PacketOutPosLook(getX(), getY(), getZ(), getYaw(), getPitch(), true));
+            FishingBot.getInstance().getCurrentBot().getNet().sendPacket(new PacketOutPosLook(getX(), getY(), getZ(), getYaw(), getPitch(), true, true));
             try {
                 Thread.sleep(50);
             } catch (InterruptedException ignore) { }
@@ -414,6 +422,7 @@ public void openAdjacentChest(LocationUtils.Direction direction) {
                     PacketOutBlockPlace.Hand.MAIN_HAND,
                     x, y, z, blockFace,
                     0.5F, 0.5F, 0.5F,
+                    false,
                     false
             ));
             if (autoSneak)
@@ -436,7 +445,7 @@ public void setHeldSlot(int heldSlot) {
     public void setHeldSlot(int heldSlot, boolean sendPacket) {
         if (sendPacket)
             FishingBot.getInstance().getCurrentBot().getNet().sendPacket(new PacketOutHeldItemChange(heldSlot));
-        this.heldSlot = heldSlot;
+        this.heldSlot = heldSlot + 36;
     }
 
     public void use() {

src/main/java/systems/kinau/fishingbot/bot/registry/Registries.java

@@ -20,6 +20,7 @@ public class Registries {
     public static EnchantmentRegistry ENCHANTMENT;
     public static DataComponentTypeRegistry DATA_COMPONENT_TYPE;
     public static ParticleTypeRegistry PARTICLE_TYPE;
+    public static ConsumeEffectTypeRegistry CONSUME_EFFECT_TYPE;
 
     public static final Set<Integer> BUNDLED_REGISTRY_IDS = new HashSet<>();
 
@@ -42,12 +43,14 @@ public class Registries {
         BUNDLED_REGISTRY_IDS.add(ProtocolConstants.MC_1_20_3);
         BUNDLED_REGISTRY_IDS.add(ProtocolConstants.MC_1_20_5);
         BUNDLED_REGISTRY_IDS.add(ProtocolConstants.MC_1_21);
+        BUNDLED_REGISTRY_IDS.add(ProtocolConstants.MC_1_21_2);
 
         ITEM = new ItemRegistry();
         ENTITY_TYPE = new EntityTypeRegistry();
         ENCHANTMENT = new EnchantmentRegistry();
         DATA_COMPONENT_TYPE = new DataComponentTypeRegistry();
         PARTICLE_TYPE = new ParticleTypeRegistry();
+        CONSUME_EFFECT_TYPE = new ConsumeEffectTypeRegistry();
     }
 
     public static Registries get() {
@@ -63,6 +66,7 @@ public static MetaRegistry<Integer, String> getByIdentifier(String identifier, i
             case "minecraft:enchantment": return ENCHANTMENT;
             case "minecraft:data_component_type": return DATA_COMPONENT_TYPE;
             case "minecraft:particle_type": return PARTICLE_TYPE;
+            case "minecraft:consume_effect_type": return CONSUME_EFFECT_TYPE;
         }
         return null;
     }
@@ -106,6 +110,7 @@ private String getRegistriesFileName(int protocolId) {
             case ProtocolConstants.MC_1_20_3: return "mc_data/1_20_3/registries.json";
             case ProtocolConstants.MC_1_20_5: return "mc_data/1_20_5/registries.json";
             case ProtocolConstants.MC_1_21: return "mc_data/1_21/registries.json";
+            case ProtocolConstants.MC_1_21_2: return "mc_data/1_21_2/registries.json";
             default: return null;
         }
     }

src/main/java/systems/kinau/fishingbot/bot/registry/Registry.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import systems.kinau.fishingbot.FishingBot;
 
 import java.util.*;
 import java.util.function.BiConsumer;
@@ -43,7 +44,10 @@ public boolean containsValue(V value) {
     }
 
     public K findKey(V value) {
-        return registry.inverse().get(value);
+        K key = registry.inverse().get(value);
+        if (key == null)
+            FishingBot.getLog().severe("Could not find key for value: " + value);
+        return key;
     }
 
     public void merge(Registry<Integer, String> other) {

src/main/java/systems/kinau/fishingbot/bot/registry/registries/ConsumeEffectTypeRegistry.java

@@ -0,0 +1,21 @@
+package systems.kinau.fishingbot.bot.registry.registries;
+
+import systems.kinau.fishingbot.bot.registry.MetaRegistry;
+import systems.kinau.fishingbot.bot.registry.RegistryLoader;
+
+import java.util.Optional;
+
+public class ConsumeEffectTypeRegistry extends MetaRegistry<Integer, String> {
+
+    public ConsumeEffectTypeRegistry() {
+        load(RegistryLoader.simple("minecraft:consume_effect_type"));
+    }
+
+    public int getConsumeEffectTypeId(String consumeEffectTypeName, int protocol) {
+        return Optional.ofNullable(findKey(consumeEffectTypeName, protocol)).orElse(0);
+    }
+
+    public String getConsumeEffectTypeName(int consumeEffectTypeId, int protocol) {
+        return getElement(consumeEffectTypeId, protocol);
+    }
+}

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

@@ -0,0 +1,11 @@
+package systems.kinau.fishingbot.event.play;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import systems.kinau.fishingbot.event.Event;
+
+@Getter
+@AllArgsConstructor
+public class ChunkBatchFinishedEvent extends Event {
+    private final int chunkCount;
+}

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

@@ -0,0 +1,12 @@
+package systems.kinau.fishingbot.event.play;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import systems.kinau.fishingbot.event.Event;
+
+@Getter
+@AllArgsConstructor
+public class LookChangeEvent extends Event {
+    private float yaw;
+    private float pitch;
+}