FancyMcPlugins · OliverSchlueter · Oct 31, 2024 · Oct 25, 2024 · Oct 31, 2024
diff --git a/api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java b/api/src/main/java/de/oliver/fancysitula/api/utils/ServerVersion.java
@@ -7,6 +7,7 @@
 
 public enum ServerVersion {
 
+    v1_21_3("1.21.3", 768),
     v1_21_1("1.21.1", 767),
     v1_21("1.21", 767),
     v1_20_6("1.20.6", 766),

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "de.oliver"
-    version = "0.0.10.1"
+    version = "0.0.10.2"
     description = "Simple, lightweight and fast library for minecraft internals"
 
     repositories {
@@ -23,6 +23,7 @@ dependencies {
 
     implementation(project(":api"))
     implementation(project(":factories"))
+    implementation(project(":implementations:1_21_3"))
     implementation(project(":implementations:1_20_6"))
     implementation("de.oliver.FancyAnalytics:logger:${findProperty("fancyLoggerVersion")}")
 }

diff --git a/factories/build.gradle.kts b/factories/build.gradle.kts
@@ -6,6 +6,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:${findProperty("minecraftVersion")}-R0.1-SNAPSHOT")
     compileOnly(project(":api"))
     compileOnly(project(":implementations:1_20_6"))
+    compileOnly(project(":implementations:1_21_3"))
 }
 
 tasks {

diff --git a/factories/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java b/factories/src/main/java/de/oliver/fancysitula/factories/PacketFactory.java
@@ -26,6 +26,9 @@ public FS_ClientboundPlayerInfoUpdatePacket createPlayerInfoUpdatePacket(
             ServerVersion serverVersion, EnumSet<FS_ClientboundPlayerInfoUpdatePacket.Action> actions,
             List<FS_ClientboundPlayerInfoUpdatePacket.Entry> entries) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundPlayerInfoUpdatePacketImpl(actions, entries);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundPlayerInfoUpdatePacketImpl(actions, entries);
             }
@@ -68,6 +71,9 @@ public FS_ClientboundAddEntityPacket createAddEntityPacket(
             int velocityZ,
             int data) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundAddEntityPacketImpl(entityId, entityUUID, entityType, x, y, z, yaw, pitch, headYaw, velocityX, velocityY, velocityZ, data);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundAddEntityPacketImpl(entityId, entityUUID, entityType, x, y, z, yaw, pitch, headYaw, velocityX, velocityY, velocityZ, data);
             }
@@ -106,6 +112,9 @@ public FS_ClientboundAddEntityPacket createAddEntityPacket(
      */
     public FS_ClientboundPlayerInfoRemovePacket createPlayerInfoRemovePacket(ServerVersion serverVersion, List<UUID> uuids) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundPlayerInfoRemovePacketImpl(uuids);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundPlayerInfoRemovePacketImpl(uuids);
             }
@@ -147,6 +156,9 @@ public FS_ClientboundPlayerInfoRemovePacket createPlayerInfoRemovePacket(UUID uu
      */
     public FS_ClientboundRemoveEntitiesPacket createRemoveEntitiesPacket(ServerVersion serverVersion, List<Integer> entityIds) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundRemoveEntitiesPacketImpl(entityIds);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundRemoveEntitiesPacketImpl(entityIds);
             }
@@ -185,6 +197,9 @@ public FS_ClientboundTeleportEntityPacket createTeleportEntityPacket(
             boolean onGround
     ) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundTeleportEntityPacketImpl(entityId, x, y, z, yaw, pitch, onGround);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundTeleportEntityPacketImpl(entityId, x, y, z, yaw, pitch, onGround);
             }
@@ -223,6 +238,9 @@ public FS_ClientboundTeleportEntityPacket createTeleportEntityPacket(
      */
     public FS_ClientboundRotateHeadPacket createRotateHeadPacket(ServerVersion serverVersion, int entityId, float headYaw) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundRotateHeadPacketImpl(entityId, headYaw);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundRotateHeadPacketImpl(entityId, headYaw);
             }
@@ -249,6 +267,9 @@ public FS_ClientboundRotateHeadPacket createRotateHeadPacket(int entityId, float
     public FS_ClientboundSetEntityDataPacket createSetEntityDataPacket(
             ServerVersion serverVersion, int entityId, List<FS_ClientboundSetEntityDataPacket.EntityData> entityData) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundSetEntityDataPacketImpl(entityId, entityData);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundSetEntityDataPacketImpl(entityId, entityData);
             }
@@ -274,6 +295,9 @@ public FS_ClientboundSetEntityDataPacket createSetEntityDataPacket(int entityId,
      */
     public FS_ClientboundSetEquipmentPacket createSetEquipmentPacket(ServerVersion serverVersion, int entityId, Map<FS_EquipmentSlot, ItemStack> equipment) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundSetEquipmentPacketImpl(entityId, equipment);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundSetEquipmentPacketImpl(entityId, equipment);
             }
@@ -300,6 +324,9 @@ public FS_ClientboundSetEquipmentPacket createSetEquipmentPacket(int entityId, M
     public FS_ClientboundSetPassengersPacket createSetPassengersPacket(
             ServerVersion serverVersion, int entityId, List<Integer> passengers) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundSetPassengersPacketImpl(entityId, passengers);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundSetPassengersPacketImpl(entityId, passengers);
             }
@@ -329,6 +356,9 @@ public FS_ClientboundSetPassengersPacket createSetPassengersPacket(int entityId,
      */
     public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.CreateTeam createTeam) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, createTeam);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, createTeam);
             }
@@ -358,6 +388,9 @@ public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(Str
      */
     public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.RemoveTeam removeTeam) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeTeam);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeTeam);
             }
@@ -387,6 +420,9 @@ public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(Str
      */
     public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.UpdateTeam updateTeam) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, updateTeam);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, updateTeam);
             }
@@ -416,6 +452,9 @@ public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(Str
      */
     public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.AddEntity addEntity) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, addEntity);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, addEntity);
             }
@@ -445,6 +484,9 @@ public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(Str
      */
     public FS_ClientboundCreateOrUpdateTeamPacket createCreateOrUpdateTeamPacket(ServerVersion serverVersion, String teamName, FS_ClientboundCreateOrUpdateTeamPacket.RemoveEntity removeEntity) {
         switch (serverVersion) {
+            case v1_21_3 -> {
+                return new de.oliver.fancysitula.versions.v1_21_3.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeEntity);
+            }
             case v1_20_5, v1_20_6, v1_21, v1_21_1 -> {
                 return new de.oliver.fancysitula.versions.v1_20_6.packets.ClientboundCreateOrUpdateTeamPacketImpl(teamName, removeEntity);
             }

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-minecraftVersion=1.21
+minecraftVersion=1.21.3
 fancyLoggerVersion=0.0.4
diff --git a/implementations/1_20_6/build.gradle.kts b/implementations/1_20_6/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java-library")
-    id("io.papermc.paperweight.userdev") version "1.7.1"
+    id("io.papermc.paperweight.userdev") version "1.7.3"
 }
 
 val minecraftVersion = "1.20.6"

diff --git a/implementations/1_21/build.gradle.kts b/implementations/1_21/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java-library")
-    id("io.papermc.paperweight.userdev") version "1.7.1"
+    id("io.papermc.paperweight.userdev") version "1.7.3"
 }
 
 val minecraftVersion = "1.21"

diff --git a/implementations/1_21_1/build.gradle.kts b/implementations/1_21_1/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java-library")
-    id("io.papermc.paperweight.userdev") version "1.7.1"
+    id("io.papermc.paperweight.userdev") version "1.7.3"
 }
 
 val minecraftVersion = "1.21.1"

diff --git a/implementations/1_21_3/build.gradle.kts b/implementations/1_21_3/build.gradle.kts
@@ -0,0 +1,23 @@
+plugins {
+    id("java-library")
+    id("io.papermc.paperweight.userdev") version "1.7.3"
+}
+
+val minecraftVersion = "1.21.3"
+
+paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
+
+dependencies {
+    paperweight.paperDevBundle("$minecraftVersion-R0.1-SNAPSHOT")
+    compileOnly(project(":api"))
+
+    testImplementation(project(":api"))
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
+}
+
+tasks {
+    test {
+        useJUnitPlatform()
+    }
+}
diff --git a/...n/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundAddEntityPacketImpl.java b/...n/java/de/oliver/fancysitula/versions/v1_21_3/packets/ClientboundAddEntityPacketImpl.java
@@ -0,0 +1,48 @@
+package de.oliver.fancysitula.versions.v1_21_3.packets;
+
+import de.oliver.fancysitula.api.entities.FS_RealPlayer;
+import de.oliver.fancysitula.api.packets.FS_ClientboundAddEntityPacket;
+import de.oliver.fancysitula.api.utils.AngelConverter;
+import de.oliver.fancysitula.versions.v1_21_3.utils.VanillaPlayerAdapter;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.phys.Vec3;
+import org.bukkit.craftbukkit.util.CraftNamespacedKey;
+import org.bukkit.entity.EntityType;
+
+import java.util.UUID;
+
+public class ClientboundAddEntityPacketImpl extends FS_ClientboundAddEntityPacket {
+
+    public ClientboundAddEntityPacketImpl(int entityId, UUID entityUUID, EntityType entityType, double x, double y, double z, float yaw, float pitch, float headYaw, int velocityX, int velocityY, int velocityZ, int data) {
+        super(entityId, entityUUID, entityType, x, y, z, yaw, pitch, headYaw, velocityX, velocityY, velocityZ, data);
+    }
+
+    @Override
+    public Object createPacket() {
+        net.minecraft.world.entity.EntityType<?> vanillaType = BuiltInRegistries.ENTITY_TYPE.getValue(CraftNamespacedKey.toMinecraft(entityType.getKey()));
+
+        return new ClientboundAddEntityPacket(
+                entityId,
+                entityUUID,
+                x,
+                y,
+                z,
+                AngelConverter.degreesToVanillaByte(pitch),
+                AngelConverter.degreesToVanillaByte(yaw),
+                vanillaType,
+                data,
+                new Vec3(velocityX, velocityY, velocityZ),
+                AngelConverter.degreesToVanillaByte(headYaw)
+        );
+    }
+
+    @Override
+    public void sendPacketTo(FS_RealPlayer player) {
+        ClientboundAddEntityPacket packet = (ClientboundAddEntityPacket) createPacket();
+
+        ServerPlayer vanillaPlayer = VanillaPlayerAdapter.asVanilla(player.getBukkitPlayer());
+        vanillaPlayer.connection.send(packet);
+    }
+}