aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy/skyblocker/skyblock/item
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/item')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorDyeColors.java8
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java8
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java8
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java42
4 files changed, 33 insertions, 33 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorDyeColors.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorDyeColors.java
index 7c4ed423..88df1b40 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorDyeColors.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorDyeColors.java
@@ -4,7 +4,7 @@ import com.mojang.brigadier.Command;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.utils.Utils;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
@@ -46,19 +46,19 @@ public class CustomArmorDyeColors {
String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
if (itemUuid != null) {
- Object2IntOpenHashMap<String> customDyeColors = SkyblockerConfig.get().general.customDyeColors;
+ Object2IntOpenHashMap<String> customDyeColors = SkyblockerConfigManager.get().general.customDyeColors;
if (hex == null) {
if (customDyeColors.containsKey(itemUuid)) {
customDyeColors.removeInt(itemUuid);
- SkyblockerConfig.save();
+ SkyblockerConfigManager.save();
source.sendFeedback(Text.translatable("skyblocker.customDyeColors.removed"));
} else {
source.sendFeedback(Text.translatable("skyblocker.customDyeColors.neverHad"));
}
} else {
customDyeColors.put(itemUuid, Integer.decode("0x" + hex.replace("#", "")).intValue());
- SkyblockerConfig.save();
+ SkyblockerConfigManager.save();
source.sendFeedback(Text.translatable("skyblocker.customDyeColors.added"));
}
} else {
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 443ad509..c7de9320 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
@@ -7,7 +7,7 @@ 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;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.utils.SkyblockEvents;
import me.xmrvizzy.skyblocker.utils.Utils;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
@@ -102,12 +102,12 @@ public class CustomArmorTrims {
String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
if (itemUuid != null) {
- Object2ObjectOpenHashMap<String, ArmorTrimId> customArmorTrims = SkyblockerConfig.get().general.customArmorTrims;
+ Object2ObjectOpenHashMap<String, ArmorTrimId> customArmorTrims = SkyblockerConfigManager.get().general.customArmorTrims;
if (material == null && pattern == null) {
if (customArmorTrims.containsKey(itemUuid)) {
customArmorTrims.remove(itemUuid);
- SkyblockerConfig.save();
+ SkyblockerConfigManager.save();
source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.removed"));
} else {
source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.neverHad"));
@@ -122,7 +122,7 @@ public class CustomArmorTrims {
}
customArmorTrims.put(itemUuid, trimId);
- SkyblockerConfig.save();
+ SkyblockerConfigManager.save();
source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.added"));
}
} else {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
index 8c160456..76312461 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomItemNames.java
@@ -3,7 +3,7 @@ package me.xmrvizzy.skyblocker.skyblock.item;
import com.mojang.brigadier.Command;
import com.mojang.brigadier.CommandDispatcher;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
+import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.utils.Utils;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
@@ -40,13 +40,13 @@ public class CustomItemNames {
String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
if (itemUuid != null) {
- Object2ObjectOpenHashMap<String, Text> customItemNames = SkyblockerConfig.get().general.customItemNames;
+ Object2ObjectOpenHashMap<String, Text> customItemNames = SkyblockerConfigManager.get().general.customItemNames;
if (text == null) {
if (customItemNames.containsKey(itemUuid)) {
//Remove custom item name when the text argument isn't passed
customItemNames.remove(itemUuid);
- SkyblockerConfig.save();
+ SkyblockerConfigManager.save();
source.sendFeedback(Text.translatable("skyblocker.customItemNames.removed"));
} else {
source.sendFeedback(Text.translatable("skyblocker.customItemNames.neverHad"));
@@ -59,7 +59,7 @@ public class CustomItemNames {
((MutableText) text).setStyle(currentStyle.withItalic((currentStyle.isItalic() ? true : false)));
customItemNames.put(itemUuid, text);
- SkyblockerConfig.save();
+ SkyblockerConfigManager.save();
source.sendFeedback(Text.translatable("skyblocker.customItemNames.added"));
}
} else {
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 f04e7029..16a4c596 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java
@@ -3,8 +3,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.config.SkyblockerConfigManager;
import me.xmrvizzy.skyblocker.utils.Http;
import me.xmrvizzy.skyblocker.utils.Utils;
import me.xmrvizzy.skyblocker.utils.scheduler.Scheduler;
@@ -63,7 +63,7 @@ public class PriceInfoTooltip {
int count = stack.getCount();
boolean bazaarOpened = lines.stream().anyMatch(each -> each.getString().contains("Buy price:") || each.getString().contains("Sell price:"));
- if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice) {
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableNPCPrice) {
if (npcPricesJson == null) {
nullWarning();
} else if (npcPricesJson.has(internalID)) {
@@ -73,7 +73,7 @@ public class PriceInfoTooltip {
}
}
- if (SkyblockerConfig.get().general.itemTooltip.enableMotesPrice && Utils.isInTheRift()) {
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableMotesPrice && Utils.isInTheRift()) {
if (motesPricesJson == null) {
nullWarning();
} else if (motesPricesJson.has(internalID)) {
@@ -85,7 +85,7 @@ public class PriceInfoTooltip {
boolean bazaarExist = false;
- if (SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice && !bazaarOpened) {
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableBazaarPrice && !bazaarOpened) {
if (bazaarPricesJson == null) {
nullWarning();
} else if (bazaarPricesJson.has(name)) {
@@ -106,7 +106,7 @@ public class PriceInfoTooltip {
// bazaarOpened & bazaarExist check for lbin, because Skytils keeps some bazaar item data in lbin api
boolean lbinExist = false;
- if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN && !bazaarOpened && !bazaarExist) {
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableLowestBIN && !bazaarOpened && !bazaarExist) {
if (lowestPricesJson == null) {
nullWarning();
} else if (lowestPricesJson.has(name)) {
@@ -117,7 +117,7 @@ public class PriceInfoTooltip {
}
}
- if (SkyblockerConfig.get().general.itemTooltip.enableAvgBIN) {
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableAvgBIN) {
if (threeDayAvgPricesJson == null || oneDayAvgPricesJson == null) {
nullWarning();
} else {
@@ -148,10 +148,10 @@ public class PriceInfoTooltip {
}
if (!neuName.isEmpty() && lbinExist) {
- ConfigModel.Average type = SkyblockerConfig.get().general.itemTooltip.avg;
+ SkyblockerConfig.Average type = SkyblockerConfigManager.get().general.itemTooltip.avg;
// "No data" line because of API not keeping old data, it causes NullPointerException
- if (type == ConfigModel.Average.ONE_DAY || type == ConfigModel.Average.BOTH) {
+ if (type == SkyblockerConfig.Average.ONE_DAY || type == SkyblockerConfig.Average.BOTH) {
lines.add(
Text.literal(String.format("%-19s", "1 Day Avg. Price:"))
.formatted(Formatting.GOLD)
@@ -161,7 +161,7 @@ public class PriceInfoTooltip {
)
);
}
- if (type == ConfigModel.Average.THREE_DAY || type == ConfigModel.Average.BOTH) {
+ if (type == SkyblockerConfig.Average.THREE_DAY || type == SkyblockerConfig.Average.BOTH) {
lines.add(
Text.literal(String.format("%-19s", "3 Day Avg. Price:"))
.formatted(Formatting.GOLD)
@@ -175,7 +175,7 @@ public class PriceInfoTooltip {
}
}
- if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate && !bazaarOpened) {
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableMuseumDate && !bazaarOpened) {
if (isMuseumJson == null) {
nullWarning();
} else {
@@ -332,7 +332,7 @@ public class PriceInfoTooltip {
}
private static Text getMotesMessage(int price, int count) {
- float motesMultiplier = SkyblockerConfig.get().locations.rift.mcGrubberStacks * 0.05f + 1;
+ float motesMultiplier = SkyblockerConfigManager.get().locations.rift.mcGrubberStacks * 0.05f + 1;
// Calculate the total price
int totalPrice = price * count;
@@ -363,33 +363,33 @@ public class PriceInfoTooltip {
}
List<CompletableFuture<Void>> futureList = new ArrayList<>();
- if (SkyblockerConfig.get().general.itemTooltip.enableAvgBIN) {
- ConfigModel.Average type = SkyblockerConfig.get().general.itemTooltip.avg;
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableAvgBIN) {
+ SkyblockerConfig.Average type = SkyblockerConfigManager.get().general.itemTooltip.avg;
- if (type == ConfigModel.Average.BOTH || oneDayAvgPricesJson == null || threeDayAvgPricesJson == null || minute % 5 == 0) {
+ if (type == SkyblockerConfig.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 == ConfigModel.Average.ONE_DAY) {
+ } else if (type == SkyblockerConfig.Average.ONE_DAY) {
futureList.add(CompletableFuture.runAsync(() -> oneDayAvgPricesJson = downloadPrices("1 day avg")));
- } else if (type == ConfigModel.Average.THREE_DAY) {
+ } else if (type == SkyblockerConfig.Average.THREE_DAY) {
futureList.add(CompletableFuture.runAsync(() -> threeDayAvgPricesJson = downloadPrices("3 day avg")));
}
}
- if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN || SkyblockerConfig.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator)
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableLowestBIN || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator)
futureList.add(CompletableFuture.runAsync(() -> lowestPricesJson = downloadPrices("lowest bins")));
- if (SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice || SkyblockerConfig.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator)
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableBazaarPrice || SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator)
futureList.add(CompletableFuture.runAsync(() -> bazaarPricesJson = downloadPrices("bazaar")));
- if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice && npcPricesJson == null)
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableNPCPrice && npcPricesJson == null)
futureList.add(CompletableFuture.runAsync(() -> npcPricesJson = downloadPrices("npc")));
- if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate && isMuseumJson == null)
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableMuseumDate && isMuseumJson == null)
futureList.add(CompletableFuture.runAsync(() -> isMuseumJson = downloadPrices("museum")));
- if (SkyblockerConfig.get().general.itemTooltip.enableMotesPrice && motesPricesJson == null)
+ if (SkyblockerConfigManager.get().general.itemTooltip.enableMotesPrice && motesPricesJson == null)
futureList.add(CompletableFuture.runAsync(() -> motesPricesJson = downloadPrices("motes")));
minute++;
generated by cgit (git 2.46.0) at 2025-02-06 18:17:05 +0000