Optimize code, replace 'var' with the actual variable type and improv…

…e Javadoc.
Rapha149 · Aug 9, 2024 · f4f563e · f4f563e
1 parent f9f0f47
commit f4f563e
Show file tree

Hide file tree

Showing 41 changed files with 99 additions and 150,633 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ test/
 dependency-reduced-pom.xml
 .mvn/
 .flattened-pom.xml
+.paper-nms/
diff --git a/.paper-nms/mappings_1.20.6.tiny b/.paper-nms/mappings_1.20.6.tiny
diff --git a/.paper-nms/mappings_1.21.tiny b/.paper-nms/mappings_1.21.tiny
diff --git a/1_10_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_10_R1.java b/1_10_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_10_R1.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_11_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_11_R1.java b/1_11_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_11_R1.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_12_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_12_R1.java b/1_12_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_12_R1.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_13_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_13_R1.java b/1_13_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_13_R1.java
@@ -30,7 +30,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_13_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_13_R2.java b/1_13_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_13_R2.java
@@ -30,7 +30,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_14_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_14_R1.java b/1_14_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_14_R1.java
@@ -36,7 +36,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws NoSuchFieldException, IllegalAccessException {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws NoSuchFieldException, IllegalAccessException {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_15_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_15_R1.java b/1_15_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_15_R1.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_16_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_16_R1.java b/1_16_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_16_R1.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_16_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_16_R2.java b/1_16_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_16_R2.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_16_R3/src/main/java/de/rapha149/signgui/version/Wrapper1_16_R3.java b/1_16_R3/src/main/java/de/rapha149/signgui/version/Wrapper1_16_R3.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_17_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_17_R1.java b/1_17_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_17_R1.java
@@ -39,7 +39,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.b;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_18_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_18_R1.java b/1_18_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_18_R1.java
@@ -39,7 +39,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.b;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_18_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_18_R2.java b/1_18_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_18_R2.java
@@ -39,7 +39,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.b;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_19_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_19_R1.java b/1_19_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_19_R1.java
@@ -39,7 +39,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.b;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_19_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_19_R2.java b/1_19_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_19_R2.java
@@ -39,7 +39,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.b;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_19_R3/pom.xml b/1_19_R3/pom.xml
@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>signgui-parent</artifactId>
-        <version>2.4.0</version>
         <groupId>de.rapha149.signgui</groupId>
+        <version>2.4.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/1_19_R3/src/main/java/de/rapha149/signgui/version/Wrapper1_19_R3.java b/1_19_R3/src/main/java/de/rapha149/signgui/version/Wrapper1_19_R3.java
@@ -56,7 +56,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.b;
 

diff --git a/1_20_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_20_R1.java b/1_20_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_20_R1.java
@@ -59,7 +59,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.c;
 

diff --git a/1_20_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_20_R2.java b/1_20_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_20_R2.java
@@ -60,7 +60,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.c;
 

diff --git a/1_20_R3/src/main/java/de/rapha149/signgui/version/Wrapper1_20_R3.java b/1_20_R3/src/main/java/de/rapha149/signgui/version/Wrapper1_20_R3.java
@@ -15,7 +15,6 @@
 import net.minecraft.server.network.PlayerConnection;
 import net.minecraft.server.network.ServerCommonPacketListenerImpl;
 import net.minecraft.world.item.EnumColor;
-import net.minecraft.world.level.block.entity.CrafterBlockEntity;
 import net.minecraft.world.level.block.entity.SignText;
 import net.minecraft.world.level.block.entity.TileEntitySign;
 import org.bukkit.DyeColor;
@@ -61,7 +60,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.c;
 

diff --git a/1_20_R4/src/main/java/de/rapha149/signgui/version/Wrapper1_20_R4.java b/1_20_R4/src/main/java/de/rapha149/signgui/version/Wrapper1_20_R4.java
@@ -61,7 +61,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.c;
 

diff --git a/1_21_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_21_R1.java b/1_21_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_21_R1.java
@@ -61,7 +61,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws IllegalAccessException {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.c;
 

diff --git a/1_8_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_8_R1.java b/1_8_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_8_R1.java
@@ -33,7 +33,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws NoSuchFieldException, IllegalAccessException {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) throws NoSuchFieldException, IllegalAccessException {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_8_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_8_R2.java b/1_8_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_8_R2.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_8_R3/src/main/java/de/rapha149/signgui/version/Wrapper1_8_R3.java b/1_8_R3/src/main/java/de/rapha149/signgui/version/Wrapper1_8_R3.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_9_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_9_R1.java b/1_9_R1/src/main/java/de/rapha149/signgui/version/Wrapper1_9_R1.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/1_9_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_9_R2.java b/1_9_R2/src/main/java/de/rapha149/signgui/version/Wrapper1_9_R2.java
@@ -31,7 +31,7 @@ public List<Material> getSignTypes() {
     }
 
     @Override
-    public void openSignEditor(Player player, String[] lines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
+    public void openSignEditor(Player player, String[] lines, Object[] adventureLines, Material type, DyeColor color, Location signLoc, BiConsumer<SignEditor, String[]> onFinish) {
         EntityPlayer p = ((CraftPlayer) player).getHandle();
         PlayerConnection conn = p.playerConnection;
         Location loc = signLoc != null ? signLoc : getDefaultLocation(player);

diff --git a/Mojang1_20_R4/pom.xml b/Mojang1_20_R4/pom.xml
@@ -16,6 +16,7 @@
     </properties>
 
     <dependencies>
+        <!-- plugins -> paper-nms -> init (https://github.com/Alvinn8/paper-nms-maven-plugin) -->
         <dependency>
             <groupId>ca.bkaw</groupId>
             <artifactId>paper-nms</artifactId>