Fixed issue with destroy/success dust not working

Author: ryderbelserion

changelog.md

@@ -1,4 +1,2 @@
 ## Fixes
-- Fixed an issue on startup where config#getString("Player") was null
-  - getStringList() returns an empty list, but getString() throws an NPE, rather than an empty String.
-  - The solution was `config#getString("Player", "")` which is so very amusing.
+- Fixed an issue where Success/Destroy dust was not working.

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-crazyenchantments = "2.6.1"
+crazyenchantments = "2.6.2"
 
 # Minecraft
-minecraft = "1.21.7"
+minecraft = "1.21.10"
 
 ## JetBrains
 annotations = "24.1.0" # https://github.com/JetBrains/java-annotations
@@ -23,16 +23,16 @@ kingdoms = "1.16.20.5"           # https://www.spigotmc.org/resources/kingdomsx.
 bStats = "3.1.0" # https://github.com/Bastian/bStats
 
 ## Paper
-paperweight = "2.0.0-beta.17" # https://github.com/PaperMC/paperweight
-paper = "1.21.7-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
+paperweight = "2.0.0-beta.19" # https://github.com/PaperMC/paperweight
+paper = "1.21.10-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
 
 ## Gradle Plugins
 fix-javadoc = "1.19" # https://github.com/mfnalex/gradle-fix-javadoc-plugin
 run-paper = "2.3.1" # https://github.com/jpenilla/run-task
 minotaur = "2.8.7" # https://github.com/modrinth/minotaur
 feather = "0.4.0" # https://github.com/ryderbelserion/Feather
 hangar = "0.1.3" # https://github.com/HangarMC/hangar-publish-plugin
-shadow = "9.0.0-beta17" # https://github.com/GradleUp/shadow
+shadow = "9.2.2" # https://github.com/GradleUp/shadow
 
 fusion = "2.4.3" # https://github.com/ryderbelserion/Fusion
 

paper/src/main/java/com/badbones69/crazyenchantments/paper/listeners/DustControlListener.java

@@ -12,11 +12,13 @@
 import com.badbones69.crazyenchantments.paper.api.enums.pdc.EnchantedBook;
 import com.badbones69.crazyenchantments.paper.api.objects.CEnchantment;
 import com.badbones69.crazyenchantments.paper.api.utils.ColorUtils;
+import com.google.gson.Gson;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.datacomponent.item.ItemLore;
 import io.papermc.paper.persistence.PersistentDataContainerView;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.bukkit.Color;
 import org.bukkit.GameMode;
 import org.bukkit.Sound;
@@ -41,6 +43,8 @@ public class DustControlListener implements Listener {
     @NotNull
     private final CrazyEnchantments plugin = JavaPlugin.getPlugin(CrazyEnchantments.class);
 
+    private final ComponentLogger logger = this.plugin.getComponentLogger();
+
     @NotNull
     private final Starter starter = this.plugin.getStarter();
 
@@ -90,9 +94,12 @@ public void onInventoryClick(InventoryClickEvent event) { // dust use
         if (book.getAmount() > 1) return;
 
         final PersistentDataContainerView container = dust.getPersistentDataContainer();
+        final PersistentDataContainerView bookContainer = book.getPersistentDataContainer();
+
+        final Gson gson = Methods.getGson();
 
-        final DustData dustData = Methods.getGson().fromJson(container.get(DataKeys.dust.getNamespacedKey(), PersistentDataType.STRING), DustData.class);
-        final EnchantedBook bookData = Methods.getGson().fromJson(container.get(DataKeys.stored_enchantments.getNamespacedKey(), PersistentDataType.STRING), EnchantedBook.class); //Once Books have PDC
+        final DustData dustData = gson.fromJson(container.get(DataKeys.dust.getNamespacedKey(), PersistentDataType.STRING), DustData.class);
+        final EnchantedBook bookData = gson.fromJson(bookContainer.get(DataKeys.stored_enchantments.getNamespacedKey(), PersistentDataType.STRING), EnchantedBook.class); //Once Books have PDC
 
         if (bookData == null || dustData == null) return;
 
@@ -110,7 +117,9 @@ public void onInventoryClick(InventoryClickEvent event) { // dust use
 
         if (!toggle) return;
 
-        if (dustData.getConfigName().equalsIgnoreCase(Dust.SUCCESS_DUST.getConfigName())) {
+        final String configName = dustData.getConfigName();
+
+        if (configName.equalsIgnoreCase(Dust.SUCCESS_DUST.getConfigName())) {
             int per = dustData.getChance();
 
             if (this.methods.hasArgument("%success_rate%", config.getStringList("Settings.EnchantmentBookLore"))) {
@@ -138,7 +147,7 @@ public void onInventoryClick(InventoryClickEvent event) { // dust use
             return;
         }
 
-        if (dustData.getConfigName().equalsIgnoreCase(Dust.DESTROY_DUST.getConfigName())) {
+        if (configName.equalsIgnoreCase(Dust.DESTROY_DUST.getConfigName())) {
             int per = dustData.getChance();
 
             if (this.methods.hasArgument("%destroy_rate%", config.getStringList("Settings.EnchantmentBookLore"))) {