Add support for Paper 1.21

Rapha149 · Jun 20, 2024 · 826835f · 826835f
1 parent a9c7b10
commit 826835f
Show file tree

Hide file tree

Showing 31 changed files with 123 additions and 43 deletions.
diff --git a/1_10_R1/pom.xml b/1_10_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_11_R1/pom.xml b/1_11_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_12_R1/pom.xml b/1_12_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_13_R1/pom.xml b/1_13_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_13_R2/pom.xml b/1_13_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_14_R1/pom.xml b/1_14_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_15_R1/pom.xml b/1_15_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_16_R1/pom.xml b/1_16_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_16_R2/pom.xml b/1_16_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_16_R3/pom.xml b/1_16_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_17_R1/pom.xml b/1_17_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_18_R1/pom.xml b/1_18_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_18_R2/pom.xml b/1_18_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_19_R1/pom.xml b/1_19_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_19_R2/pom.xml b/1_19_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_19_R3/pom.xml b/1_19_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_20_R1/pom.xml b/1_20_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_20_R2/pom.xml b/1_20_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_20_R3/pom.xml b/1_20_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_20_R4/pom.xml b/1_20_R4/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_21_R1/pom.xml b/1_21_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_8_R1/pom.xml b/1_8_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_8_R2/pom.xml b/1_8_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_8_R3/pom.xml b/1_8_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_9_R1/pom.xml b/1_9_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_9_R2/pom.xml b/1_9_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/README.md b/README.md
@@ -9,10 +9,40 @@ Maven dependency:
 <dependency>
     <groupId>de.rapha149.signgui</groupId>
     <artifactId>signgui</artifactId>
-    <version>2.3.4</version>
+    <version>2.3.5</version>
 </dependency>
 ```
 
+In order to avoid conflicts with other plugins that also use this api, relocate the package in your maven shade plugin:
+```xml
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <version>SHADE_VERSION</version> <!-- The version must be at least 3.5.0 -->
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>shade</goal>
+                    </goals>
+                    <configuration>
+                        <relocations>
+                            <relocation>
+                                <pattern>de.rapha149.signgui</pattern>
+                                <!-- Replace [YOUR_PLUGIN_PACKAGE] with your namespace -->
+                                <shadedPattern>[YOUR_PLUGIN_PACKAGE].signgui</shadedPattern>
+                            </relocation>
+                        </relocations>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
+```
+
 ## Usage
 To open a sign editor gui for a player, do the following:
 ```java

diff --git a/api/pom.xml b/api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>signgui-parent</artifactId>
         <groupId>de.rapha149.signgui</groupId>
-        <version>2.3.4</version>
+        <version>2.3.5</version>
     </parent>
 
     <artifactId>signgui</artifactId>
@@ -39,6 +39,11 @@
     </scm>
 
     <dependencies>
+        <!--<dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20240303</version>
+        </dependency>-->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
@@ -214,13 +219,21 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.5.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <!--<configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.json</pattern>
+                                    <shadedPattern>de.rapha149.signgui.json</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>-->
                     </execution>
                 </executions>
             </plugin>
@@ -376,6 +389,14 @@
                     <tokenEnabled>true</tokenEnabled>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>