hopeful fix on advanced enchantments else someone smokes pot and is f…

…ucking stupid as fuck bro
H7KZ · Feb 10, 2025 · 68bd5de · 68bd5de
1 parent 8f5dbd7
commit 68bd5de
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/core/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Disenchantment
-version: 6.1.2
+version: 6.1.3
 main: com.jankominek.disenchantment.Disenchantment
 api-version: 1.18
 

diff --git a/pom.xml b/pom.xml
@@ -36,7 +36,7 @@
     </build>
 
     <properties>
-        <revision>6.1.2</revision>
+        <revision>6.1.3</revision>
 
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>

diff --git a/v1_18_R1/src/main/java/plugins/AdvancedEnchantments_v1_18_R1.java b/v1_18_R1/src/main/java/plugins/AdvancedEnchantments_v1_18_R1.java
@@ -7,20 +7,20 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class AdvancedEnchantments_v1_18_R1 implements ISupportedPlugin {
     public String getName() {
         return "AdvancedEnchantments";
     }
 
     public ItemStack createEnchantedBook(Map<Enchantment, Integer> enchantments) {
-        ItemStack book = new ItemStack(Material.ENCHANTED_BOOK);
+        AtomicReference<ItemStack> book = new AtomicReference<>(new ItemStack(Material.ENCHANTED_BOOK));
 
         enchantments.forEach((en, l) -> {
-            // Deprecated?! TODO: replace deprecated method
-            AEAPI.applyEnchant(en.getKey().getKey(), l, book, true);
+            book.set(AEAPI.applyEnchant(en.getKey().getKey(), l, book.get()));
         });
-        return book;
+        return book.get();
     }
 
     public ItemStack removeEnchantmentsFromItem(ItemStack firstItem, Map<Enchantment, Integer> enchantments) {

diff --git a/v1_20_R4/src/main/java/plugins/AdvancedEnchantments_v1_20_R4.java b/v1_20_R4/src/main/java/plugins/AdvancedEnchantments_v1_20_R4.java
@@ -7,19 +7,20 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class AdvancedEnchantments_v1_20_R4 implements ISupportedPlugin {
     public String getName() {
         return "AdvancedEnchantments";
     }
 
     public ItemStack createEnchantedBook(Map<Enchantment, Integer> enchantments) {
-        ItemStack book = new ItemStack(Material.ENCHANTED_BOOK);
+        AtomicReference<ItemStack> book = new AtomicReference<>(new ItemStack(Material.ENCHANTED_BOOK));
 
         enchantments.forEach((en, l) -> {
-            AEAPI.applyEnchant(en.getKey().getKey(), l, book, true);
+            book.set(AEAPI.applyEnchant(en.getKey().getKey(), l, book.get()));
         });
-        return book;
+        return book.get();
     }
 
     public ItemStack removeEnchantmentsFromItem(ItemStack firstItem, Map<Enchantment, Integer> enchantments) {

diff --git a/v1_21_R1/src/main/java/plugins/AdvancedEnchantments_v1_21_R1.java b/v1_21_R1/src/main/java/plugins/AdvancedEnchantments_v1_21_R1.java
@@ -7,20 +7,20 @@
 import org.bukkit.inventory.ItemStack;
 
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class AdvancedEnchantments_v1_21_R1 implements ISupportedPlugin {
     public String getName() {
         return "AdvancedEnchantments";
     }
 
     public ItemStack createEnchantedBook(Map<Enchantment, Integer> enchantments) {
-        ItemStack book = new ItemStack(Material.ENCHANTED_BOOK);
+        AtomicReference<ItemStack> book = new AtomicReference<>(new ItemStack(Material.ENCHANTED_BOOK));
 
         enchantments.forEach((en, l) -> {
-            // Deprecated?! TODO: replace deprecated method
-            AEAPI.applyEnchant(en.getKey().getKey(), l, book, true);
+            book.set(AEAPI.applyEnchant(en.getKey().getKey(), l, book.get()));
         });
-        return book;
+        return book.get();
     }
 
     public ItemStack removeEnchantmentsFromItem(ItemStack firstItem, Map<Enchantment, Integer> enchantments) {