From ace34fc0e860f70e823d3614e949cfa45337fa73 Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@laposte.net>
Date: Mon, 13 Jan 2025 23:57:48 +0100
Subject: [PATCH] MC 1.21.4 + small fixes

---
 .../lib/paper/json/ConfigurationSerializableAdapter.java      | 2 +-
 .../paper/reflect/wrapper/minecraft/commands/Coordinates.java | 2 +-
 .../reflect/wrapper/paper/commands/BukkitCommandNode.java     | 1 -
 .../reflect/wrapper/paper/commands/PluginCommandNode.java     | 2 +-
 pom.xml                                                       | 4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/json/ConfigurationSerializableAdapter.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/json/ConfigurationSerializableAdapter.java
index 2577b55..87b19ce 100644
--- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/json/ConfigurationSerializableAdapter.java
+++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/json/ConfigurationSerializableAdapter.java
@@ -23,7 +23,7 @@ import java.util.Map;
 /**
  * Gson adapter for ConfigurationSerializable, an interface implemented by several classes in the Bukkit API to ease
  * serialization to YAML.
- *
+ * <p>
  * To not reinvent the wheel, this class uses the Bukkit’s Yaml API to convert the objects from/to json.
  */
 /* package */ class ConfigurationSerializableAdapter implements JsonSerializer<ConfigurationSerializable>, JsonDeserializer<ConfigurationSerializable> {
diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java
index dcae2ad..0dc923c 100644
--- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java
+++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java
@@ -14,7 +14,7 @@ import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
 
 @ConcreteWrapper(Coordinates.__concrete.class)
 public interface Coordinates extends ReflectWrapperI {
-    public static final ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.commands.arguments.coordinates.Coordinates"));
+    ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("net.minecraft.commands.arguments.coordinates.Coordinates"));
     ReflectMethod<?> getPosition = wrapEx(() -> REFLECT.method("getPosition", CommandSourceStack.REFLECT.get()));
 
     default Vec3 getPosition(io.papermc.paper.command.brigadier.CommandSourceStack source) {
diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/commands/BukkitCommandNode.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/commands/BukkitCommandNode.java
index 9ca918e..9a40b16 100644
--- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/commands/BukkitCommandNode.java
+++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/commands/BukkitCommandNode.java
@@ -7,7 +7,6 @@ import fr.pandacube.lib.reflect.ReflectMethod;
 import fr.pandacube.lib.reflect.wrapper.ReflectWrapperTyped;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import org.bukkit.command.Command;
-import org.bukkit.plugin.Plugin;
 
 import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
 import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx;
diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/commands/PluginCommandNode.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/commands/PluginCommandNode.java
index 0e89244..46db7f4 100644
--- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/commands/PluginCommandNode.java
+++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/commands/PluginCommandNode.java
@@ -19,7 +19,7 @@ public class PluginCommandNode extends ReflectWrapperTyped<LiteralCommandNode<Co
     public static final ReflectClass<?> REFLECT = wrapEx(() -> Reflect.ofClass("io.papermc.paper.command.brigadier.PluginCommandNode"));
     private static final ReflectMethod<?> getPlugin = wrapEx(() -> REFLECT.method("getPlugin"));
     private static final ReflectMethod<?> getDescription = wrapEx(() -> REFLECT.method("getDescription"));
-    private static final ReflectConstructor CONSTRUCTOR = wrapEx(() -> REFLECT.constructor(String.class, PluginMeta.class, LiteralCommandNode.class, String.class));
+    private static final ReflectConstructor<?> CONSTRUCTOR = wrapEx(() -> REFLECT.constructor(String.class, PluginMeta.class, LiteralCommandNode.class, String.class));
 
 
     public PluginCommandNode(@NotNull String literal, @NotNull PluginMeta plugin, @NotNull LiteralCommandNode<CommandSourceStack> rootLiteral, @Nullable String description) {
diff --git a/pom.xml b/pom.xml
index 59b3aa8..6d889a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
         <bungeecord.version>1.21-R0.1-SNAPSHOT</bungeecord.version>
-        <paper.version>1.21.3-R0.1</paper.version>
-        <mc.version>1.21.3</mc.version>
+        <paper.version>1.21.4-R0.1</paper.version>
+        <mc.version>1.21.4</mc.version>
 
         <guava.version>32.1.2-jre</guava.version> <!-- Match the version imported by Paper API/BungeeCord API if possible -->
     </properties>