From 92a9afa22c05d17951b51d7d83e5a772b4bbfa84 Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@laposte.net>
Date: Sun, 18 Feb 2024 13:49:30 +0100
Subject: [PATCH] Prepare 1.20.2 full support

- Update some POM files
- OBC reflection should not try to parse relocation package version
- NMS reflection dependency update
---
 pandalib-chat/pom.xml                          |  2 +-
 pandalib-paper/pom.xml                         |  2 +-
 .../lib/paper/reflect/NMSReflect.java          |  2 +-
 .../lib/paper/reflect/OBCReflect.java          | 18 ++----------------
 pandalib-reflect/pom.xml                       |  2 +-
 pom.xml                                        |  4 ++--
 6 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/pandalib-chat/pom.xml b/pandalib-chat/pom.xml
index c63cae5..4eedead 100644
--- a/pandalib-chat/pom.xml
+++ b/pandalib-chat/pom.xml
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.10</version>
+            <version>2.10.1</version>
         </dependency>
     </dependencies>
 
diff --git a/pandalib-paper/pom.xml b/pandalib-paper/pom.xml
index 75c754b..d166f49 100644
--- a/pandalib-paper/pom.xml
+++ b/pandalib-paper/pom.xml
@@ -94,7 +94,7 @@
         <dependency>
             <groupId>net.fabricmc</groupId>
             <artifactId>mapping-io</artifactId>
-            <version>0.3.0</version>
+            <version>0.5.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java
index 92c7bb9..7bae2df 100644
--- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java
+++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java
@@ -169,7 +169,7 @@ public class NMSReflect {
             }
             
             MemoryMappingTree tree = new MemoryMappingTree();
-            MappingReader.read(new InputStreamReader(mappingsInputStream, StandardCharsets.UTF_8), MappingFormat.TINY_2, tree);
+            MappingReader.read(new InputStreamReader(mappingsInputStream, StandardCharsets.UTF_8), MappingFormat.TINY_2_FILE, tree);
             
             List<ClassMapping> classes = new ArrayList<>();
             for (MappingTree.ClassMapping cls : tree.getClasses()) {
diff --git a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java
index 67ee72b..3afa13f 100644
--- a/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java
+++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java
@@ -10,18 +10,7 @@ import fr.pandacube.lib.reflect.ReflectClass;
  */
 public class OBCReflect {
 	
-	private static final String OBC_PACKAGE_PREFIX = "org.bukkit.craftbukkit.";
-	
-	private static final String OBC_PACKAGE_VERSION;
-
-	static {
-		String name = Bukkit.getServer().getClass().getName()
-				.substring(OBC_PACKAGE_PREFIX.length());
-		name = name.substring(0, name.indexOf("."));
-
-		OBC_PACKAGE_VERSION = name;
-	}
-
+	private static final String CRAFTBUKKIT_PACKAGE = Bukkit.getServer().getClass().getPackage().getName();
 
 	/**
 	 * Returns the OBC class that has the provided name, wrapped into a {@link ReflectClass}.
@@ -31,10 +20,7 @@ public class OBCReflect {
 	 * @throws ClassNotFoundException if the provided class was not found in {@code OBC} package.
 	 */
 	public static ReflectClass<?> ofClass(String obcClass) throws ClassNotFoundException {
-		return Reflect.ofClass(OBC_PACKAGE_PREFIX + OBC_PACKAGE_VERSION + "." + obcClass);
+		return Reflect.ofClass(CRAFTBUKKIT_PACKAGE + "." + obcClass);
 	}
-	
-	
-	
 
 }
diff --git a/pandalib-reflect/pom.xml b/pandalib-reflect/pom.xml
index 5a4e7e1..8aafbc9 100644
--- a/pandalib-reflect/pom.xml
+++ b/pandalib-reflect/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version> <!-- Match the version imported by Paper API/BungeeCord API if possible -->
+            <version>32.1.2-jre</version> <!-- Match the version imported by Paper API/BungeeCord API if possible -->
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index c2bca38..f3c365d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,8 +56,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
         <bungeecord.version>1.20-R0.3-SNAPSHOT</bungeecord.version>
-        <paper.version>1.20.1-R0.1</paper.version>
-        <mc.version>1.20.1</mc.version>
+        <paper.version>1.20.2-R0.1</paper.version>
+        <mc.version>1.20.2</mc.version>
     </properties>
 	
     <modules>