YACL Config

2 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
index 6c648da9..97861e93 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
@@ -3,6 +3,8 @@ package me.xmrvizzy.skyblocker.skyblock.item;
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
+
+import dev.isxander.yacl3.config.ConfigEntry;
 import it.unimi.dsi.fastutil.Pair;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
@@ -138,7 +140,7 @@ public class CustomArmorTrims {
 		return Command.SINGLE_SUCCESS;
 	}
 
-	public record ArmorTrimId(Identifier material, Identifier pattern) implements Pair<Identifier, Identifier> {
+	public record ArmorTrimId(@ConfigEntry Identifier material, @ConfigEntry Identifier pattern) implements Pair<Identifier, Identifier> {
 		@Override
 		public Identifier left() {
 			return material();
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
index d20aa0e3..f04e7029 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -2,6 +2,8 @@ package me.xmrvizzy.skyblocker.skyblock.item;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+
+import me.xmrvizzy.skyblocker.config.ConfigModel;
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import me.xmrvizzy.skyblocker.utils.Http;
 import me.xmrvizzy.skyblocker.utils.Utils;
@@ -146,10 +148,10 @@ public class PriceInfoTooltip {
                 }
 
                 if (!neuName.isEmpty() && lbinExist) {
-                    SkyblockerConfig.Average type = SkyblockerConfig.get().general.itemTooltip.avg;
+                    ConfigModel.Average type = SkyblockerConfig.get().general.itemTooltip.avg;
 
                     // "No data" line because of API not keeping old data, it causes NullPointerException
-                    if (type == SkyblockerConfig.Average.ONE_DAY || type == SkyblockerConfig.Average.BOTH) {
+                    if (type == ConfigModel.Average.ONE_DAY || type == ConfigModel.Average.BOTH) {
                         lines.add(
                                 Text.literal(String.format("%-19s", "1 Day Avg. Price:"))
                                         .formatted(Formatting.GOLD)
@@ -159,7 +161,7 @@ public class PriceInfoTooltip {
                                         )
                         );
                     }
-                    if (type == SkyblockerConfig.Average.THREE_DAY || type == SkyblockerConfig.Average.BOTH) {
+                    if (type == ConfigModel.Average.THREE_DAY || type == ConfigModel.Average.BOTH) {
                         lines.add(
                                 Text.literal(String.format("%-19s", "3 Day Avg. Price:"))
                                         .formatted(Formatting.GOLD)
@@ -362,16 +364,16 @@ public class PriceInfoTooltip {
 
             List<CompletableFuture<Void>> futureList = new ArrayList<>();
             if (SkyblockerConfig.get().general.itemTooltip.enableAvgBIN) {
-                SkyblockerConfig.Average type = SkyblockerConfig.get().general.itemTooltip.avg;
+            	ConfigModel.Average type = SkyblockerConfig.get().general.itemTooltip.avg;
 
-                if (type == SkyblockerConfig.Average.BOTH || oneDayAvgPricesJson == null || threeDayAvgPricesJson == null || minute % 5 == 0) {
+                if (type == ConfigModel.Average.BOTH || oneDayAvgPricesJson == null || threeDayAvgPricesJson == null || minute % 5 == 0) {
                     futureList.add(CompletableFuture.runAsync(() -> {
                         oneDayAvgPricesJson = downloadPrices("1 day avg");
                         threeDayAvgPricesJson = downloadPrices("3 day avg");
                     }));
-                } else if (type == SkyblockerConfig.Average.ONE_DAY) {
+                } else if (type == ConfigModel.Average.ONE_DAY) {
                     futureList.add(CompletableFuture.runAsync(() -> oneDayAvgPricesJson = downloadPrices("1 day avg")));
-                } else if (type == SkyblockerConfig.Average.THREE_DAY) {
+                } else if (type == ConfigModel.Average.THREE_DAY) {
                     futureList.add(CompletableFuture.runAsync(() -> threeDayAvgPricesJson = downloadPrices("3 day avg")));
                 }
             }