feat: 1.21.4 support

cerus · cerus · commit aadf72163bc2 · 2024-12-15T06:09:54.000+01:00
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ See [FAQ](#FAQ)
     <dependency>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>common</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
         <scope>provided</scope> <!-- "provided" if the maps plugin is on the server, "compile" if not -->
     </dependency>
 
@@ -59,7 +59,7 @@ See [FAQ](#FAQ)
     <dependency>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
         <scope>provided</scope>
     </dependency>
 </dependencies>
diff --git a/bukkit-16_R3/pom.xml b/bukkit-16_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bukkit-17_R1/pom.xml b/bukkit-17_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bukkit-18_R1/pom.xml b/bukkit-18_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bukkit-18_R2/pom.xml b/bukkit-18_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bukkit-19_R1/pom.xml b/bukkit-19_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bukkit-19_R2/pom.xml b/bukkit-19_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>dev.cerus.maps</groupId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/bukkit-19_R3/pom.xml b/bukkit-19_R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
 
     <artifactId>bukkit-19_R3</artifactId>
diff --git a/bukkit-20_R1/pom.xml b/bukkit-20_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
 
     <artifactId>bukkit-20_R1</artifactId>
diff --git a/bukkit-20_R2/pom.xml b/bukkit-20_R2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
 
     <artifactId>bukkit-20_R2</artifactId>
diff --git a/bukkit-20_R3/pom.xml b/bukkit-20_R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
 
     <artifactId>bukkit-20_R3</artifactId>
diff --git a/bukkit-20_R4/pom.xml b/bukkit-20_R4/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
 
     <artifactId>bukkit-20_R4</artifactId>
diff --git a/bukkit-21_R1/pom.xml b/bukkit-21_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
 
     <artifactId>bukkit-21_R1</artifactId>
diff --git a/bukkit-21_R2/pom.xml b/bukkit-21_R2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>dev.cerus.maps</groupId>
         <artifactId>parent</artifactId>
-        <version>3.8.8</version>
+        <version>3.8.9</version>
     </parent>
 
     <artifactId>bukkit-21_R2</artifactId>
diff --git a/bukkit-21_R3/pom.xml b/bukkit-21_R3/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dev.cerus.maps</groupId>
+        <artifactId>parent</artifactId>
+        <version>3.8.9</version>
+    </parent>
+
+    <artifactId>bukkit-21_R3</artifactId>
+
+    <properties>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>dev.cerus.maps</groupId>
+            <artifactId>common</artifactId>
+            <version>${parent.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.21.4-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/bukkit-21_R3/src/main/java/dev/cerus/maps/version/PacketHandler21R3.java b/bukkit-21_R3/src/main/java/dev/cerus/maps/version/PacketHandler21R3.java
@@ -0,0 +1,110 @@
+package dev.cerus.maps.version;
+
+import dev.cerus.maps.api.version.PacketListener;
+import io.netty.channel.ChannelDuplexHandler;
+import io.netty.channel.ChannelHandlerContext;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import net.minecraft.network.protocol.game.ClientboundBlockChangedAckPacket;
+import net.minecraft.network.protocol.game.PacketPlayInBlockDig;
+import net.minecraft.network.protocol.game.PacketPlayInBlockPlace;
+import net.minecraft.network.protocol.game.PacketPlayInUseEntity;
+import net.minecraft.network.protocol.game.PacketPlayInUseItem;
+import net.minecraft.world.EnumHand;
+import net.minecraft.world.phys.MovingObjectPositionBlock;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_21_R3.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class PacketHandler21R3 extends ChannelDuplexHandler {
+
+    private static final Field actionField;
+    private static final Object attackAction;
+
+    static {
+        try {
+            actionField = PacketPlayInUseEntity.class.getDeclaredField("c");
+            actionField.setAccessible(true);
+            final Field attackActionField = PacketPlayInUseEntity.class.getDeclaredField("e");
+            attackActionField.setAccessible(true);
+            attackAction = attackActionField.get(null);
+        } catch (final NoSuchFieldException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private final Player player;
+    private final PacketListener listener;
+    private final JavaPlugin plugin;
+
+    public PacketHandler21R3(final Player player, final PacketListener listener, final JavaPlugin plugin) {
+        this.player = player;
+        this.listener = listener;
+        this.plugin = plugin;
+    }
+
+    private static Object getAction(final PacketPlayInUseEntity packet) {
+        try {
+            return actionField.get(packet);
+        } catch (final IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static EnumHand getHand(final PacketPlayInUseEntity packet) {
+        try {
+            final Object action = getAction(packet);
+            final Field handField = Arrays.stream(action.getClass().getDeclaredFields())
+                    .filter(field -> field.getType() == EnumHand.class)
+                    .findAny().orElse(null);
+            if (handField == null) {
+                return null;
+            }
+            handField.setAccessible(true);
+            return (EnumHand) handField.get(action);
+        } catch (final IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void channelRead(final ChannelHandlerContext ctx, final Object msg) throws Exception {
+        if ((((msg instanceof final PacketPlayInUseItem useItem && useItem.b() != EnumHand.b) || msg instanceof PacketPlayInBlockPlace) && this.listener.handlePlayerRightClick(this.player))
+            || (msg instanceof final PacketPlayInUseEntity useEntity && getHand(useEntity) != EnumHand.b && (getAction(useEntity) == attackAction ? this.listener.handlePlayerLeftClick(this.player) : this.listener.handlePlayerRightClick(this.player)))
+            || (msg instanceof PacketPlayInBlockDig && this.listener.handlePlayerLeftClick(this.player))) {
+            if (msg instanceof final PacketPlayInBlockDig dig) {
+                // To prevent de-syncs we need to tell the client that the block has not changed
+                final Location location = new Location(
+                        this.player.getWorld(),
+                        dig.b().u(),
+                        dig.b().v(),
+                        dig.b().w()
+                );
+                // If we don't acknowledge the client's block change it won't accept further block change packets
+                ((CraftPlayer) this.player).getHandle().f.a(new ClientboundBlockChangedAckPacket(dig.g()));
+                Bukkit.getScheduler().runTask(this.plugin, () -> this.player.sendBlockChange(location, location.getBlock().getBlockData()));
+            }
+            if (msg instanceof final PacketPlayInUseItem useItem) {
+                // To prevent de-syncs we need to tell the client that the block has not changed
+                final MovingObjectPositionBlock pos = useItem.e();
+                if (pos != null && pos.a() != null) {
+                    final Location location = new Location(
+                            this.player.getWorld(),
+                            pos.b().u(),
+                            pos.b().v(),
+                            pos.b().w()
+                    ).getBlock().getRelative(CraftBlock.notchToBlockFace(pos.c())).getLocation();
+                    // If we don't acknowledge the client's block change it won't accept further block change packets
+                    ((CraftPlayer) this.player).getHandle().f.a(new ClientboundBlockChangedAckPacket(useItem.f()));
+                    Bukkit.getScheduler().runTask(this.plugin, () -> this.player.sendBlockChange(location, location.getBlock().getBlockData()));
+                }
+            }
+            return;
+        }
+        super.channelRead(ctx, msg);
+    }
+
+}
diff --git a/bukkit-21_R3/src/main/java/dev/cerus/maps/version/VersionAdapter21R3.java b/bukkit-21_R3/src/main/java/dev/cerus/maps/version/VersionAdapter21R3.java
diff --git a/common/pom.xml b/common/pom.xml
diff --git a/plugin/pom.xml b/plugin/pom.xml
diff --git a/plugin/src/main/java/dev/cerus/maps/version/VersionAdapterFactory.java b/plugin/src/main/java/dev/cerus/maps/version/VersionAdapterFactory.java
diff --git a/pom.xml b/pom.xml
