fix 1.21 support

andrei1058 · Aug 31, 2024 · 8ac4ae8 · 8ac4ae8
1 parent 1fdc3f4
commit 8ac4ae8
Show file tree

Hide file tree

Showing 22 changed files with 60 additions and 35 deletions.
diff --git a/bedwars-api/pom.xml b/bedwars-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bedwars-api</artifactId>

diff --git a/bedwars-api/src/main/java/com/andrei1058/bedwars/api/server/VersionSupport.java b/bedwars-api/src/main/java/com/andrei1058/bedwars/api/server/VersionSupport.java
@@ -46,8 +46,8 @@
 public abstract class VersionSupport {
 
     private static String name2;
-    public static String PLUGIN_TAG_GENERIC_KEY = "BedWars1058";
-    public static String PLUGIN_TAG_TIER_KEY = "tierIdentifier";
+    public static String PLUGIN_TAG_GENERIC_KEY = "bed_wars_1058";
+    public static String PLUGIN_TAG_TIER_KEY = "tier_identifier";
 
     private Effect eggBridge;
 

diff --git a/bedwars-plugin/pom.xml b/bedwars-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bedwars-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.andrei1058.bedwars</groupId>
     <artifactId>BedWars1058</artifactId>
     <packaging>pom</packaging>
-    <version>23.12.1-SNAPSHOT</version>
+    <version>24.8-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/resetadapter_aswm/pom.xml b/resetadapter_aswm/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>resetadapter-aswm</artifactId>

diff --git a/resetadapter_slime/pom.xml b/resetadapter_slime/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>resetadapter-slime</artifactId>

diff --git a/resetadapter_slimepaper/pom.xml b/resetadapter_slimepaper/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>resetadapter-slimepaper</artifactId>

diff --git a/versionsupport_1_12_R1/pom.xml b/versionsupport_1_12_R1/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/versionsupport_1_8_R3/pom.xml b/versionsupport_1_8_R3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_1_8_R3</artifactId>

diff --git a/versionsupport_common/pom.xml b/versionsupport_common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/versionsupport_nms_cmn1/pom.xml b/versionsupport_nms_cmn1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.andrei1058.bedwars</groupId>
         <artifactId>BedWars1058</artifactId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_nms_cmn1</artifactId>

diff --git a/versionsupport_nms_cmn1/src/main/java/dev/andrei1058/mc/bedwars/AbstractVerImplCmn1.java b/versionsupport_nms_cmn1/src/main/java/dev/andrei1058/mc/bedwars/AbstractVerImplCmn1.java
@@ -334,11 +334,20 @@ public org.bukkit.inventory.ItemStack addCustomData(org.bukkit.inventory.ItemSta
         if (null == tag) {
             return i;
         }
-        tag.set(
-                Objects.requireNonNull(NamespacedKey.fromString(key, getPlugin())),
-                PersistentDataType.STRING,
-                data
-        );
+        try {
+            tag.set(
+                    Objects.requireNonNull(NamespacedKey.fromString(key.toLowerCase(), getPlugin())),
+                    PersistentDataType.STRING,
+                    data
+            );
+        } catch (IllegalArgumentException e) {
+            if (!e.getMessage().contains("Invalid Key. Must be")) {
+                getPlugin().getLogger().severe("Cannot append item custom tag with key -> " + key);
+                getPlugin().getLogger().severe("Reason:" + e.getMessage());
+            }
+            e.printStackTrace();
+
+        }
         return i;
     }
 
@@ -348,12 +357,20 @@ public org.bukkit.inventory.ItemStack setTag(org.bukkit.inventory.ItemStack item
         if (null == tag) {
             return itemStack;
         }
-        key = key.replaceFirst("minecraft:", "");
-        tag.set(
-                Objects.requireNonNull(NamespacedKey.minecraft(key)),
-                PersistentDataType.STRING,
-                value
-        );
+        try {
+            key = key.replaceFirst("minecraft:", "");
+            tag.set(
+                    Objects.requireNonNull(NamespacedKey.minecraft(key.toLowerCase())),
+                    PersistentDataType.STRING,
+                    value
+            );
+        } catch (IllegalArgumentException e) {
+            if (e.getMessage().contains("Invalid Key. Must be")) {
+                getPlugin().getLogger().severe("Cannot append item custom tag with key -> " + key);
+                getPlugin().getLogger().severe("Reason:" + e.getMessage());
+            }
+            e.printStackTrace();
+        }
         return itemStack;
     }
 
@@ -480,7 +497,8 @@ public org.bukkit.Material woolMaterial() {
     }
 
 
-    @Override @Nullable
+    @Override
+    @Nullable
     public String getShopUpgradeIdentifier(org.bukkit.inventory.ItemStack itemStack) {
         return getTag(itemStack, VersionSupport.PLUGIN_TAG_TIER_KEY);
     }

diff --git a/versionsupport_v1_16_R3/pom.xml b/versionsupport_v1_16_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/versionsupport_v1_17_R1/pom.xml b/versionsupport_v1_17_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/versionsupport_v1_18_R2/pom.xml b/versionsupport_v1_18_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BedWars1058</artifactId>
         <groupId>com.andrei1058.bedwars</groupId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/versionsupport_v1_19_R2/pom.xml b/versionsupport_v1_19_R2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.andrei1058.bedwars</groupId>
         <artifactId>BedWars1058</artifactId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_v1_19_R2</artifactId>

diff --git a/versionsupport_v1_19_R3/pom.xml b/versionsupport_v1_19_R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.andrei1058.bedwars</groupId>
         <artifactId>BedWars1058</artifactId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_v1_19_R3</artifactId>

diff --git a/versionsupport_v1_20_R1/pom.xml b/versionsupport_v1_20_R1/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.andrei1058.bedwars</groupId>
         <artifactId>BedWars1058</artifactId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_v1_20_R1</artifactId>

diff --git a/versionsupport_v1_20_R2/pom.xml b/versionsupport_v1_20_R2/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.andrei1058.bedwars</groupId>
         <artifactId>BedWars1058</artifactId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_v1_20_R2</artifactId>

diff --git a/versionsupport_v1_20_R3/pom.xml b/versionsupport_v1_20_R3/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.andrei1058.bedwars</groupId>
         <artifactId>BedWars1058</artifactId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_v1_20_R3</artifactId>

diff --git a/versionsupport_v1_20_R4/pom.xml b/versionsupport_v1_20_R4/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.andrei1058.bedwars</groupId>
         <artifactId>BedWars1058</artifactId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_v1_20_R4</artifactId>

diff --git a/versionsupport_v1_21_R1/pom.xml b/versionsupport_v1_21_R1/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.andrei1058.bedwars</groupId>
         <artifactId>BedWars1058</artifactId>
-        <version>23.12.1-SNAPSHOT</version>
+        <version>24.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>versionsupport_v1_21_R1</artifactId>
@@ -15,6 +15,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>andrei1058-repo</id>
+            <url>https://repo.andrei1058.dev/releases</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>com.andrei1058.bedwars</groupId>
@@ -52,7 +59,7 @@
         <dependency>
             <groupId>com.andrei1058.spigot.sidebar</groupId>
             <artifactId>sidebar-v1_21_R1</artifactId>
-            <version>24.8-SNAPSHOT</version>
+            <version>24.8</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>