Merge pull request #105 from patheloper/trunk

[3.2.1] Supporting Spigot 1.21.2 and fix backwards compatibility for 1.18-1.20.6
Metaphoriker · Oct 23, 2024 · d5fedb1 · d5fedb1
2 parents 52e113b + 2813a45
commit d5fedb1
Show file tree

Hide file tree

Showing 34 changed files with 1,022 additions and 57 deletions.
diff --git a/README.md b/README.md
@@ -183,3 +183,8 @@ For help and support, join our community on
 the [SpigotMC forum thread](https://www.spigotmc.org/threads/how-pathetic.578998/)
 or [Discord Server](https://discord.gg/HMqCbdQjX9).
 
+### Sponsored By:
+
+<img src="https://github.com/user-attachments/assets/262672b9-a673-4732-8392-5771e7aadfd0" alt="JetBrains_beam_logo" width="400"/>
+
+We'd like to thank JetBrains for sponsoring the development of this project with an amazing toolset!
diff --git a/pathetic-api/pom.xml b/pathetic-api/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>pathetic-api</artifactId>
-    <version>3.2</version>
+    <version>3.2.1</version>
 
     <dependencies>
         <dependency>

diff --git a/pathetic-example/pom.xml b/pathetic-example/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>pathetic-example</artifactId>
-    <version>3.2</version>
+    <version>3.2.1</version>
     <packaging>jar</packaging>
 
     <name>PatheticTest</name>
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>pathetic-mapping</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/pathetic-mapping/pom.xml b/pathetic-mapping/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>pathetic-mapping</artifactId>
-    <version>3.2</version>
+    <version>3.2.1</version>
 
     <build>
         <plugins>
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>pathetic-model</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/pathetic-model/pom.xml b/pathetic-model/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
     </parent>
 
     <artifactId>pathetic-model</artifactId>
-    <version>3.2</version>
+    <version>3.2.1</version>
 
     <build>
         <resources>
@@ -100,13 +100,13 @@
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>pathetic-api</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>pathetic-nms</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/pathetic-nms/paper/pom.xml b/pathetic-nms/paper/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.patheloper</groupId>
         <artifactId>pathetic-main</artifactId>
-        <version>3.2</version>
+        <version>3.2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>pathetic-api</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/pathetic-nms/pom.xml b/pathetic-nms/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>pathetic-nms</artifactId>
-    <version>3.2</version>
+    <version>3.2.1</version>
 
     <dependencies>
         <dependency>
@@ -33,49 +33,112 @@
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>paper</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.patheloper</groupId>
-            <artifactId>v1_18Up</artifactId>
-            <version>3.2</version>
+            <artifactId>v1_21_R2</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_21_R1</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_20_R4</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_20_R3</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_20_R2</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_20_R1</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_19_R3</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_19_R2</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_18_R2</artifactId>
+            <version>3.2.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>v1_18</artifactId>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>v1_17</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>v1_16</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>v1_15</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>v1_12</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.patheloper</groupId>
             <artifactId>v1_8</artifactId>
-            <version>3.2</version>
+            <version>3.2.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/pathetic-nms/src/main/java/org/patheloper/provider/ChunkDataProviderResolver.java b/pathetic-nms/src/main/java/org/patheloper/provider/ChunkDataProviderResolver.java
@@ -7,6 +7,16 @@
 import org.patheloper.provider.v1_12.v1_12ChunkDataProviderImpl;
 import org.patheloper.provider.v1_15.v1_15ChunkDataProviderImpl;
 import org.patheloper.provider.v1_17.v1_17ChunkDataProviderImpl;
+import org.patheloper.provider.v1_18.v1_18ChunkDataProviderImpl;
+import org.patheloper.provider.v1_18_R2.v1_18_R2ChunkDataProviderImpl;
+import org.patheloper.provider.v1_19_R2.v1_19_R2ChunkDataProviderImpl;
+import org.patheloper.provider.v1_19_R3.v1_19_R3ChunkDataProviderImpl;
+import org.patheloper.provider.v1_20_R1.v1_20_R1ChunkDataProviderImpl;
+import org.patheloper.provider.v1_20_R2.v1_20_R2ChunkDataProviderImpl;
+import org.patheloper.provider.v1_20_R3.v1_20_R3ChunkDataProviderImpl;
+import org.patheloper.provider.v1_20_R4.v1_20_R4ChunkDataProviderImpl;
+import org.patheloper.provider.v1_21_R1.v1_21_R1ChunkDataProviderImpl;
+import org.patheloper.provider.v1_21_R2.v1_21_R2ChunkDataProviderImpl;
 import org.patheloper.provider.v1_8.v1_8ChunkDataProviderImpl;
 import org.patheloper.provider.paper.PaperChunkDataProvider;
 
@@ -33,10 +43,41 @@ private ChunkDataProvider determineChunkDataProvider(int major, int minor) {
     final ChunkDataProvider chunkDataProvider;
     switch (major) {
       case 21:
+        if(minor == 2) {
+          chunkDataProvider = new v1_21_R2ChunkDataProviderImpl();
+          break;
+        }
+        chunkDataProvider = new v1_21_R1ChunkDataProviderImpl();
+        break;
       case 20:
+        if (minor == 5 || minor == 6) {
+          chunkDataProvider = new v1_20_R4ChunkDataProviderImpl();
+          break;
+        } else if (minor == 3 || minor == 4) {
+          chunkDataProvider = new v1_20_R3ChunkDataProviderImpl();
+          break;
+        } else if (minor == 2) {
+          chunkDataProvider = new v1_20_R2ChunkDataProviderImpl();
+          break;
+        } else if (minor == 1) {
+          chunkDataProvider = new v1_20_R1ChunkDataProviderImpl();
+          break;
+        }
       case 19:
+        if (minor == 2 || minor == 3) {
+          chunkDataProvider = new v1_19_R2ChunkDataProviderImpl();
+          break;
+        }
+        if (minor == 4) {
+          chunkDataProvider = new v1_19_R3ChunkDataProviderImpl();
+          break;
+        }
       case 18:
-        chunkDataProvider = new v1_18UpChunkDataProviderImpl();
+        if (minor == 2) {
+          chunkDataProvider = new v1_18_R2ChunkDataProviderImpl();
+          break;
+        }
+        chunkDataProvider = new v1_18ChunkDataProviderImpl();
         break;
       case 17:
         chunkDataProvider = new v1_17ChunkDataProviderImpl();

diff --git a/pathetic-nms/v1_12/pom.xml b/pathetic-nms/v1_12/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pathetic-nms/v1_15/pom.xml b/pathetic-nms/v1_15/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pathetic-nms/v1_16/pom.xml b/pathetic-nms/v1_16/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pathetic-nms/v1_17/pom.xml b/pathetic-nms/v1_17/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>pathetic-main</artifactId>
         <groupId>org.patheloper</groupId>
-        <version>3.2</version>
+        <version>3.2.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pathetic-nms/v1_18/pom.xml b/pathetic-nms/v1_18/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         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>org.patheloper</groupId>
+        <artifactId>pathetic-main</artifactId>
+        <version>3.2.1</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>v1_18</artifactId>
+
+    <repositories>
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.org/repository/nms/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.18.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.patheloper</groupId>
+            <artifactId>pathetic-api</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>