Update dependencies and refactor config/settings usage

Oribuin · Oribuin · commit 6ce8f55e760e · 2025-07-01T22:37:19.000+01:00
Upgraded RoseGarden to 1.5.1 and Triumph-GUI to 3.1.11, and removed unused version properties from gradle.properties. Refactored configuration and settings code to use new RoseGarden SettingHolder and SettingSerializer APIs. Updated imports to use org.apache.commons.lang3.StringUtils. Adjusted item construction logic for compatibility with updated Paper API, and simplified ItemEnchantments creation.

Took 8 minutes
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,15 +34,17 @@ repositories {
 }
 
 dependencies {
-    api("dev.rosewood:rosegarden:1.4.7-SNAPSHOT")
-    api("dev.triumphteam:triumph-gui:3.1.10") {  // https://mf.mattstudios.me/triumph-gui/introduction
+    api("dev.rosewood:rosegarden:1.5.1")
+    api("dev.triumphteam:triumph-gui:3.1.11") {  // https://mf.mattstudios.me/triumph-gui/introduction
         exclude(group = "com.google.code.gson", module = "gson") // Remove GSON, Already included in spigot api
         exclude(group = "net.kyori", module = "*") // Remove kyori
     }
 
     compileOnly("io.papermc.paper:paper-api:1.21.5-R0.1-SNAPSHOT")
     compileOnly("com.mojang:authlib:1.5.21")
-    compileOnly("com.github.MilkBowl:VaultAPI:1.7")
+    compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
+        exclude(group = "org.bukkit", module = "*")
+    }
 
     implementation("net.objecthunter:exp4j:0.4.8")
     implementation("com.jeff-media:MorePersistentDataTypes:2.4.0")
diff --git a/gradle.properties b/gradle.properties
@@ -1,11 +1,2 @@
 # Gradle Settings
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-
-# API Versions
-spigotVersion=1.21.3
-gardenVersion=1.4.4
-vaultVersion=1.7
-authLibVersion=1.5.21
-triumphVersion=3.1.10
-persistentDataTypeVersion=2.4.0
-exp4jVersion=0.4.8
diff --git a/src/main/java/dev/oribuin/fishing/FishingPlugin.java b/src/main/java/dev/oribuin/fishing/FishingPlugin.java
@@ -17,9 +17,11 @@
 import dev.oribuin.fishing.model.totem.upgrade.UpgradeRegistry;
 import dev.rosewood.rosegarden.RosePlugin;
 import dev.rosewood.rosegarden.config.RoseSetting;
+import dev.rosewood.rosegarden.config.SettingHolder;
 import dev.rosewood.rosegarden.manager.Manager;
 import org.bukkit.plugin.PluginManager;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -74,9 +76,11 @@ public void disable() {
         );
     }
 
+    /**
+     * @return 
+     */
     @Override
-    protected @NotNull List<RoseSetting<?>> getRoseConfigSettings() {
-        return Setting.getKeys();
+    protected @Nullable SettingHolder getRoseConfigSettingHolder() {
+        return super.getRoseConfigSettingHolder();
     }
-
 }
diff --git a/src/main/java/dev/oribuin/fishing/config/Setting.java b/src/main/java/dev/oribuin/fishing/config/Setting.java
@@ -3,15 +3,18 @@
 import dev.oribuin.fishing.FishingPlugin;
 import dev.rosewood.rosegarden.config.CommentedConfigurationSection;
 import dev.rosewood.rosegarden.config.RoseSetting;
-import dev.rosewood.rosegarden.config.RoseSettingSerializer;
+import dev.rosewood.rosegarden.config.SettingHolder;
+import dev.rosewood.rosegarden.config.SettingSerializer;
+import org.bukkit.configuration.ConfigurationSection;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static dev.rosewood.rosegarden.config.RoseSettingSerializers.STRING;
+import static dev.rosewood.rosegarden.config.SettingSerializers.STRING;
 
 
-public class Setting {
+public class Setting implements SettingHolder {
+    public static final Setting INSTANCE = new Setting();
     private static final List<RoseSetting<?>> KEYS = new ArrayList<>();
 
     public static final RoseSetting<String> REQUIRED_XP_FORMULA = create(
@@ -22,19 +25,27 @@ public class Setting {
     );
 
 
-    private static <T> RoseSetting<T> create(String key, RoseSettingSerializer<T> serializer, T defaultValue, String... comments) {
-        RoseSetting<T> setting = RoseSetting.backed(FishingPlugin.get(), key, serializer, defaultValue, comments);
+    private static <T> RoseSetting<T> create(String key, SettingSerializer<T> serializer, T defaultValue, String... comments) {
+        RoseSetting<T> setting = RoseSetting.ofBackedValue(key, FishingPlugin.get(), serializer, defaultValue, comments);
         KEYS.add(setting);
         return setting;
     }
 
-    private static RoseSetting<CommentedConfigurationSection> create(String key, String... comments) {
-        RoseSetting<CommentedConfigurationSection> setting = RoseSetting.backedSection(FishingPlugin.get(), key, comments);
+    private static RoseSetting<ConfigurationSection> create(String key, String... comments) {
+        RoseSetting<ConfigurationSection> setting = RoseSetting.ofBackedSection(key, FishingPlugin.get(), comments);
         KEYS.add(setting);
         return setting;
     }
 
     public static List<RoseSetting<?>> getKeys() {
         return KEYS;
     }
+
+    /**
+     * @return 
+     */
+    @Override
+    public List<RoseSetting<?>> get() {
+        return List.of();
+    }
 }
diff --git a/src/main/java/dev/oribuin/fishing/model/condition/impl/TimeCondition.java b/src/main/java/dev/oribuin/fishing/model/condition/impl/TimeCondition.java
@@ -7,7 +7,7 @@
 import dev.oribuin.fishing.util.FishUtils;
 import dev.rosewood.rosegarden.config.CommentedConfigurationSection;
 import dev.rosewood.rosegarden.utils.StringPlaceholders;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.entity.FishHook;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
diff --git a/src/main/java/dev/oribuin/fishing/model/condition/impl/WeatherCondition.java b/src/main/java/dev/oribuin/fishing/model/condition/impl/WeatherCondition.java
@@ -1,17 +1,16 @@
 package dev.oribuin.fishing.model.condition.impl;
 
 import dev.oribuin.fishing.api.event.impl.ConditionCheckEvent;
-import dev.oribuin.fishing.model.fish.Fish;
 import dev.oribuin.fishing.model.condition.CatchCondition;
 import dev.oribuin.fishing.model.condition.Weather;
+import dev.oribuin.fishing.model.fish.Fish;
 import dev.oribuin.fishing.util.FishUtils;
 import dev.rosewood.rosegarden.config.CommentedConfigurationSection;
 import dev.rosewood.rosegarden.utils.StringPlaceholders;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.entity.FishHook;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/src/main/java/dev/oribuin/fishing/model/item/ItemConstruct.java b/src/main/java/dev/oribuin/fishing/model/item/ItemConstruct.java
@@ -11,7 +11,7 @@
 import dev.rosewood.rosegarden.utils.StringPlaceholders;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.datacomponent.item.ItemLore;
-import io.papermc.paper.datacomponent.item.Unbreakable;
+import io.papermc.paper.datacomponent.item.TooltipDisplay;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
@@ -117,10 +117,10 @@ public ItemStack build(StringPlaceholders placeholders) {
         }
 
         if (this.amount != null) stack.setAmount(this.amount);
-        if (this.unbreakable.value()) stack.setData(DataComponentTypes.UNBREAKABLE, Unbreakable.unbreakable(this.unbreakable.tooltip()));
+        if (this.unbreakable.value()) stack.setData(DataComponentTypes.UNBREAKABLE);
         if (this.glowing) stack.setData(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true);
-        if (!this.tooltip) stack.setData(DataComponentTypes.HIDE_TOOLTIP);
-        if (!this.additionalTooltip) stack.setData(DataComponentTypes.HIDE_ADDITIONAL_TOOLTIP);
+        if (!this.tooltip) stack.setData(DataComponentTypes.TOOLTIP_DISPLAY, TooltipDisplay.tooltipDisplay()
+                .hideTooltip(true));
         if (this.edible != null) stack.setData(DataComponentTypes.FOOD, this.edible.create());
         if (this.texture != null) stack.setData(DataComponentTypes.PROFILE, this.texture.create());
         if (this.enchantments != null) stack.setData(DataComponentTypes.ENCHANTMENTS, this.enchantments.create());
diff --git a/src/main/java/dev/oribuin/fishing/model/item/component/ItemEnchant.java b/src/main/java/dev/oribuin/fishing/model/item/component/ItemEnchant.java
@@ -43,7 +43,7 @@ public ItemEnchant() {
      * @return The potion effect
      */
     public ItemEnchantments create() {
-        return ItemEnchantments.itemEnchantments(this.enchantments, this.tooltip);
+        return ItemEnchantments.itemEnchantments(this.enchantments);
     }
 
     /**
diff --git a/src/main/java/dev/oribuin/fishing/model/totem/upgrade/TotemUpgrade.java b/src/main/java/dev/oribuin/fishing/model/totem/upgrade/TotemUpgrade.java
@@ -8,7 +8,7 @@
 import dev.oribuin.fishing.model.totem.Totem;
 import dev.rosewood.rosegarden.config.CommentedConfigurationSection;
 import dev.rosewood.rosegarden.utils.StringPlaceholders;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public ItemEnchant() {`
`43`	`43`	`* @return The potion effect`
`44`	`44`	`*/`
`45`	`45`	`public ItemEnchantments create() {`
`46`		`- return ItemEnchantments.itemEnchantments(this.enchantments, this.tooltip);`
	`46`	`+ return ItemEnchantments.itemEnchantments(this.enchantments);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`