Merge branch 'feat/1.21.2-update' into testing/fabric-1-21-2

api/src/main/java/com/github/retrooper/packetevents/protocol/entity/EntityPositionData.java

@@ -0,0 +1,109 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2024 retrooper and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.github.retrooper.packetevents.protocol.entity;
+// Created by booky10 in packetevents (02:12 21.10.2024)
+
+import com.github.retrooper.packetevents.util.Vector3d;
+import com.github.retrooper.packetevents.wrapper.PacketWrapper;
+import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerEntityPositionSync;
+
+import java.util.Objects;
+
+public final class EntityPositionData {
+
+    private Vector3d position;
+    private Vector3d deltaMovement;
+    private float yaw;
+    private float pitch;
+
+    public EntityPositionData(Vector3d position, Vector3d deltaMovement, float yaw, float pitch) {
+        this.position = position;
+        this.deltaMovement = deltaMovement;
+        this.yaw = yaw;
+        this.pitch = pitch;
+    }
+
+    public static EntityPositionData read(PacketWrapper<?> wrapper) {
+        Vector3d position = Vector3d.read(wrapper);
+        Vector3d deltaMovement = Vector3d.read(wrapper);
+        float yaw = wrapper.readFloat();
+        float pitch = wrapper.readFloat();
+        return new EntityPositionData(position, deltaMovement, yaw, pitch);
+    }
+
+    public static void write(PacketWrapper<?> wrapper, EntityPositionData positionData) {
+        Vector3d.write(wrapper, positionData.position);
+        Vector3d.write(wrapper, positionData.deltaMovement);
+        wrapper.writeFloat(positionData.yaw);
+        wrapper.writeFloat(positionData.pitch);
+    }
+
+    public Vector3d getPosition() {
+        return this.position;
+    }
+
+    public void setPosition(Vector3d position) {
+        this.position = position;
+    }
+
+    public Vector3d getDeltaMovement() {
+        return this.deltaMovement;
+    }
+
+    public void setDeltaMovement(Vector3d deltaMovement) {
+        this.deltaMovement = deltaMovement;
+    }
+
+    public float getYaw() {
+        return this.yaw;
+    }
+
+    public void setYaw(float yaw) {
+        this.yaw = yaw;
+    }
+
+    public float getPitch() {
+        return this.pitch;
+    }
+
+    public void setPitch(float pitch) {
+        this.pitch = pitch;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (!(obj instanceof EntityPositionData)) return false;
+        EntityPositionData that = (EntityPositionData) obj;
+        if (Float.compare(that.yaw, this.yaw) != 0) return false;
+        if (Float.compare(that.pitch, this.pitch) != 0) return false;
+        if (!this.position.equals(that.position)) return false;
+        return this.deltaMovement.equals(that.deltaMovement);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.position, this.deltaMovement, this.yaw, this.pitch);
+    }
+
+    @Override
+    public String toString() {
+        return "EntityPositionData{position=" + this.position + ", deltaMovement=" + this.deltaMovement + ", yaw=" + this.yaw + ", pitch=" + this.pitch + '}';
+    }
+}

api/src/main/java/com/github/retrooper/packetevents/protocol/packettype/clientbound/ClientboundPacketType_1_21_2.java

@@ -51,8 +51,8 @@ public enum ClientboundPacketType_1_21_2 {
     DELETE_CHAT,
     DISCONNECT,
     DISGUISED_CHAT,
-    ENTITY_POSITION_SYNC, // new packet
     ENTITY_STATUS,
+    ENTITY_POSITION_SYNC, // new packet
     EXPLOSION,
     UNLOAD_CHUNK,
     CHANGE_GAME_STATE,

api/src/main/java/com/github/retrooper/packetevents/protocol/recipe/SingleInputOptionDisplay.java

@@ -18,6 +18,9 @@
 
 package com.github.retrooper.packetevents.protocol.recipe;
 
+import com.github.retrooper.packetevents.protocol.item.type.ItemType;
+import com.github.retrooper.packetevents.protocol.item.type.ItemTypes;
+import com.github.retrooper.packetevents.protocol.mapper.MappedEntitySet;
 import com.github.retrooper.packetevents.protocol.recipe.display.slot.SlotDisplay;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 
@@ -31,30 +34,30 @@
  */
 public class SingleInputOptionDisplay {
 
-    private Ingredient input;
+    private MappedEntitySet<ItemType> input;
     private SlotDisplay<?> optionDisplay;
 
-    public SingleInputOptionDisplay(Ingredient input, SlotDisplay<?> optionDisplay) {
+    public SingleInputOptionDisplay(MappedEntitySet<ItemType> input, SlotDisplay<?> optionDisplay) {
         this.input = input;
         this.optionDisplay = optionDisplay;
     }
 
     public static SingleInputOptionDisplay read(PacketWrapper<?> wrapper) {
-        Ingredient ingredient = Ingredient.read(wrapper);
+        MappedEntitySet<ItemType> ingredient = MappedEntitySet.read(wrapper, ItemTypes.getRegistry());
         SlotDisplay<?> optionDisplay = SlotDisplay.read(wrapper);
         return new SingleInputOptionDisplay(ingredient, optionDisplay);
     }
 
     public static void write(PacketWrapper<?> wrapper, SingleInputOptionDisplay recipe) {
-        Ingredient.write(wrapper, recipe.input);
+        MappedEntitySet.write(wrapper, recipe.input);
         SlotDisplay.write(wrapper, recipe.optionDisplay);
     }
 
-    public Ingredient getInput() {
+    public MappedEntitySet<ItemType> getInput() {
         return this.input;
     }
 
-    public void setInput(Ingredient input) {
+    public void setInput(MappedEntitySet<ItemType> input) {
         this.input = input;
     }