From 776dadb050b4e7d76de9fa16161d2cda4dd66e5b Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:36:08 -0400 Subject: YACL Config --- .../me/xmrvizzy/skyblocker/skyblock/FairySouls.java | 3 ++- .../me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java | 2 +- .../skyblocker/skyblock/dungeon/DungeonChestProfit.java | 3 ++- .../skyblock/dungeon/DungeonMapConfigScreen.java | 17 +++++++++++++++-- .../skyblock/dungeon/secrets/SecretWaypoint.java | 6 ++++-- .../skyblock/dwarven/DwarvenHudConfigScreen.java | 17 +++++++++++++++-- .../skyblock/experiment/ChronomatronSolver.java | 4 +++- .../skyblock/experiment/ExperimentSolver.java | 3 ++- .../skyblock/experiment/SuperpairsSolver.java | 3 ++- .../skyblock/experiment/UltrasequencerSolver.java | 3 ++- .../skyblocker/skyblock/item/CustomArmorTrims.java | 4 +++- .../skyblocker/skyblock/item/PriceInfoTooltip.java | 16 +++++++++------- .../xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java | 8 +++++--- .../skyblock/shortcut/ShortcutsConfigScreen.java | 16 ++++++++++++---- .../xmrvizzy/skyblocker/skyblock/spidersden/Relics.java | 3 ++- .../skyblock/tabhud/widget/PlayerListWidget.java | 3 ++- 16 files changed, 81 insertions(+), 30 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java index fcd6be7a..1933184a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java @@ -7,6 +7,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.mojang.brigadier.CommandDispatcher; import me.xmrvizzy.skyblocker.SkyblockerMod; +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.NEURepo; import me.xmrvizzy.skyblocker.utils.PosUtils; @@ -141,7 +142,7 @@ public class FairySouls { } private static void render(WorldRenderContext context) { - SkyblockerConfig.FairySouls fairySoulsConfig = SkyblockerConfig.get().general.fairySouls; + ConfigModel.FairySouls fairySoulsConfig = SkyblockerConfig.get().general.fairySouls; if (fairySoulsConfig.enableFairySoulsHelper && fairySoulsLoaded.isDone() && fairySouls.containsKey(Utils.getLocationRaw())) { for (BlockPos fairySoulPos : fairySouls.get(Utils.getLocationRaw())) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java index e9b2bfa3..9f38fe35 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java @@ -35,7 +35,7 @@ public class HotbarSlotLock { int selected = player.getInventory().selectedSlot; if (!isLocked(player.getInventory().selectedSlot)) lockedSlots.add(selected); else lockedSlots.remove(Integer.valueOf(selected)); - AutoConfig.getConfigHolder(SkyblockerConfig.class).save(); + SkyblockerConfig.save(); } } } \ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java index b223e1a2..f6fd5909 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java @@ -2,6 +2,7 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; import com.google.gson.JsonObject; import it.unimi.dsi.fastutil.ints.IntBooleanPair; +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.mixin.accessor.ScreenAccessor; import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip; @@ -158,7 +159,7 @@ public class DungeonChestProfit { } private static Text getProfitText(int profit, boolean hasIncompleteData) { - SkyblockerConfig.DungeonChestProfit config = SkyblockerConfig.get().locations.dungeons.dungeonChestProfit; + ConfigModel.DungeonChestProfit config = SkyblockerConfig.get().locations.dungeons.dungeonChestProfit; return getProfitText(profit, hasIncompleteData, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java index d4fe812b..9f4cc6b7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java @@ -13,9 +13,15 @@ public class DungeonMapConfigScreen extends Screen { private int hudX = SkyblockerConfig.get().locations.dungeons.mapX; private int hudY = SkyblockerConfig.get().locations.dungeons.mapY; - + private final Screen parent; + protected DungeonMapConfigScreen() { + this(null); + } + + public DungeonMapConfigScreen(Screen parent) { super(Text.literal("Dungeon Map Config")); + this.parent = parent; } @Override @@ -51,7 +57,14 @@ public class DungeonMapConfigScreen extends Screen { public void close() { SkyblockerConfig.get().locations.dungeons.mapX = hudX; SkyblockerConfig.get().locations.dungeons.mapY = hudY; - AutoConfig.getConfigHolder(SkyblockerConfig.class).save(); + SkyblockerConfig.save(); + + if (parent != null) { + this.client.setScreen(parent); + + return; + } + super.close(); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java index 3fdd683c..13ea400a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/secrets/SecretWaypoint.java @@ -1,6 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon.secrets; import com.google.gson.JsonObject; + +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.render.RenderHelper; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; @@ -91,10 +93,10 @@ public class SecretWaypoint { FAIRYSOUL(secretWaypoints -> secretWaypoints.enableFairySoulWaypoints, 255, 85, 255), STONK(secretWaypoints -> secretWaypoints.enableStonkWaypoints, 146, 52, 235), DEFAULT(secretWaypoints -> secretWaypoints.enableDefaultWaypoints, 190, 255, 252); - private final Predicate enabledPredicate; + private final Predicate enabledPredicate; private final float[] colorComponents; - Category(Predicate enabledPredicate, int... intColorComponents) { + Category(Predicate enabledPredicate, int... intColorComponents) { this.enabledPredicate = enabledPredicate; colorComponents = new float[intColorComponents.length]; for (int i = 0; i < intColorComponents.length; i++) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java index cde1b236..e8684540 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java @@ -19,9 +19,15 @@ public class DwarvenHudConfigScreen extends Screen { private int hudX = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x; private int hudY = SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y; + private final Screen parent; protected DwarvenHudConfigScreen() { - super(Text.of("Dwarven HUD Config")); + this(null); + } + + public DwarvenHudConfigScreen(Screen parent) { + super(Text.of("Dwarven HUD Config")); + this.parent = parent; } @Override @@ -56,7 +62,14 @@ public class DwarvenHudConfigScreen extends Screen { public void close() { SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x = hudX; SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y = hudY; - AutoConfig.getConfigHolder(SkyblockerConfig.class).save(); + SkyblockerConfig.save(); + + if (parent != null) { + this.client.setScreen(parent); + + return; + } + super.close(); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java index d62383be..84ef5698 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ChronomatronSolver.java @@ -1,6 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.experiment; import com.google.common.collect.ImmutableMap; + +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.render.gui.ColorHighlight; import net.minecraft.client.gui.screen.Screen; @@ -51,7 +53,7 @@ public class ChronomatronSolver extends ExperimentSolver { } @Override - protected boolean isEnabled(SkyblockerConfig.Experiments experimentsConfig) { + protected boolean isEnabled(ConfigModel.Experiments experimentsConfig) { return experimentsConfig.enableChronomatronSolver; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ExperimentSolver.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ExperimentSolver.java index d0e5522d..aaf25577 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ExperimentSolver.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/ExperimentSolver.java @@ -1,5 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.experiment; +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.render.gui.ContainerSolver; import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; @@ -39,7 +40,7 @@ public abstract class ExperimentSolver extends ContainerSolver { return isEnabled(SkyblockerConfig.get().general.experiments); } - protected abstract boolean isEnabled(SkyblockerConfig.Experiments experimentsConfig); + protected abstract boolean isEnabled(ConfigModel.Experiments experimentsConfig); @Override protected void start(GenericContainerScreen screen) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java index f329a395..0ac15dfc 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/SuperpairsSolver.java @@ -1,5 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.experiment; +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.render.gui.ColorHighlight; import net.minecraft.client.gui.screen.Screen; @@ -27,7 +28,7 @@ public class SuperpairsSolver extends ExperimentSolver { } @Override - protected boolean isEnabled(SkyblockerConfig.Experiments experimentsConfig) { + protected boolean isEnabled(ConfigModel.Experiments experimentsConfig) { return experimentsConfig.enableSuperpairsSolver; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java index d4d80ee6..6527231f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/experiment/UltrasequencerSolver.java @@ -1,5 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.experiment; +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.render.gui.ColorHighlight; import net.minecraft.client.gui.screen.Screen; @@ -27,7 +28,7 @@ public class UltrasequencerSolver extends ExperimentSolver { } @Override - protected boolean isEnabled(SkyblockerConfig.Experiments experimentsConfig) { + protected boolean isEnabled(ConfigModel.Experiments experimentsConfig) { return experimentsConfig.enableUltrasequencerSolver; } 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 { + public record ArmorTrimId(@ConfigEntry Identifier material, @ConfigEntry Identifier pattern) implements Pair { @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> 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"))); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java index fb8f438b..833a6917 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNav.java @@ -1,6 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.quicknav; import com.mojang.brigadier.exceptions.CommandSyntaxException; + +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.Utils; import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; @@ -34,7 +36,7 @@ public class QuickNav { public static List init(String screenTitle) { List buttons = new ArrayList<>(); - SkyblockerConfig.QuickNav data = SkyblockerConfig.get().quickNav; + ConfigModel.QuickNav data = SkyblockerConfig.get().quickNav; try { if (data.button1.render) buttons.add(parseButton(data.button1, screenTitle, 0)); if (data.button2.render) buttons.add(parseButton(data.button2, screenTitle, 1)); @@ -54,8 +56,8 @@ public class QuickNav { return buttons; } - private static QuickNavButton parseButton(SkyblockerConfig.QuickNavItem buttonInfo, String screenTitle, int id) throws CommandSyntaxException { - SkyblockerConfig.ItemData itemData = buttonInfo.item; + private static QuickNavButton parseButton(ConfigModel.QuickNavItem buttonInfo, String screenTitle, int id) throws CommandSyntaxException { + ConfigModel.ItemData itemData = buttonInfo.item; String nbtString = "{id:\"minecraft:" + itemData.itemName.toLowerCase(Locale.ROOT) + "\",Count:1"; if (itemData.nbt.length() > 2) nbtString += "," + itemData.nbt; nbtString += "}"; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java index dec23d36..043582c4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java @@ -18,9 +18,15 @@ public class ShortcutsConfigScreen extends Screen { private ButtonWidget buttonDone; private boolean initialized; private double scrollAmount; - + private final Screen parent; + public ShortcutsConfigScreen() { + this(null); + } + + public ShortcutsConfigScreen(Screen parent) { super(Text.translatable("skyblocker.shortcuts.config")); + this.parent = parent; } @Override @@ -89,13 +95,15 @@ public class ShortcutsConfigScreen extends Screen { if (client != null && shortcutsConfigListWidget.hasChanges()) { client.setScreen(new ConfirmScreen(confirmedAction -> { if (confirmedAction) { - super.close(); + this.client.setScreen(parent); + if (parent == null) super.close(); } else { client.setScreen(this); } - }, Text.translatable("text.cloth-config.quit_config"), Text.translatable("text.cloth-config.quit_config_sure"), Text.translatable("text.cloth-config.quit_discard"), ScreenTexts.CANCEL)); + }, Text.translatable("text.skyblocker.quit_config"), Text.translatable("text.skyblocker.quit_config_sure"), Text.translatable("text.skyblocker.quit_discard"), ScreenTexts.CANCEL)); } else { - super.close(); + this.client.setScreen(parent); + if (parent == null) super.close(); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/spidersden/Relics.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/spidersden/Relics.java index 12ce0715..dd420fcf 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/spidersden/Relics.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/spidersden/Relics.java @@ -6,6 +6,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.mojang.brigadier.CommandDispatcher; import me.xmrvizzy.skyblocker.SkyblockerMod; +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.PosUtils; import me.xmrvizzy.skyblocker.utils.Utils; @@ -115,7 +116,7 @@ public class Relics { } private static void render(WorldRenderContext context) { - SkyblockerConfig.Relics config = SkyblockerConfig.get().locations.spidersDen.relics; + ConfigModel.Relics config = SkyblockerConfig.get().locations.spidersDen.relics; if (config.enableRelicsHelper && relicsLoaded.isDone() && Utils.getLocationRaw().equals("combat_1")) { for (BlockPos fairySoulPos : relics) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java index 31370dc6..068c9c5e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/PlayerListWidget.java @@ -1,5 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.tabhud.widget; +import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.skyblock.tabhud.util.PlayerListMgr; import me.xmrvizzy.skyblocker.skyblock.tabhud.widget.component.PlainTextComponent; @@ -50,7 +51,7 @@ public class PlayerListWidget extends Widget { list.add(PlayerListMgr.getRaw(i)); } - if (SkyblockerConfig.get().general.tabHud.nameSorting == SkyblockerConfig.NameSorting.ALPHABETICAL) { + if (SkyblockerConfig.get().general.tabHud.nameSorting == ConfigModel.NameSorting.ALPHABETICAL) { list.sort(Comparator.comparing(o -> o.getProfile().getName().toLowerCase())); } -- cgit From 7ff019278797431a9b9731834463497f1a33d5b6 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 24 Sep 2023 14:12:29 -0400 Subject: YACL 3.2.0 (+1.20.2 Support) --- src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock') 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 97861e93..443ad509 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java @@ -140,6 +140,7 @@ public class CustomArmorTrims { return Command.SINGLE_SUCCESS; } + @SuppressWarnings("deprecation") public record ArmorTrimId(@ConfigEntry Identifier material, @ConfigEntry Identifier pattern) implements Pair { @Override public Identifier left() { -- cgit From 04f97400a0216d7fdd1154b8c8fa64ac65df63cb Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Tue, 26 Sep 2023 12:49:48 -0400 Subject: Functionality Tweaks --- .../skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java | 10 +--------- .../skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java | 9 +-------- .../skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java | 4 +--- 3 files changed, 3 insertions(+), 20 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java index 9f4cc6b7..88a9070e 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java @@ -1,6 +1,5 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.shedaniel.autoconfig.AutoConfig; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.utils.render.RenderHelper; import net.minecraft.client.gui.DrawContext; @@ -58,13 +57,6 @@ public class DungeonMapConfigScreen extends Screen { SkyblockerConfig.get().locations.dungeons.mapX = hudX; SkyblockerConfig.get().locations.dungeons.mapY = hudY; SkyblockerConfig.save(); - - if (parent != null) { - this.client.setScreen(parent); - - return; - } - - super.close(); + this.client.setScreen(parent); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java index e8684540..ee7c71a2 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java @@ -63,13 +63,6 @@ public class DwarvenHudConfigScreen extends Screen { SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.x = hudX; SkyblockerConfig.get().locations.dwarvenMines.dwarvenHud.y = hudY; SkyblockerConfig.save(); - - if (parent != null) { - this.client.setScreen(parent); - - return; - } - - super.close(); + client.setScreen(parent); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java index 043582c4..d9fe850b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/shortcut/ShortcutsConfigScreen.java @@ -95,15 +95,13 @@ public class ShortcutsConfigScreen extends Screen { if (client != null && shortcutsConfigListWidget.hasChanges()) { client.setScreen(new ConfirmScreen(confirmedAction -> { if (confirmedAction) { - this.client.setScreen(parent); - if (parent == null) super.close(); + this.client.setScreen(parent); } else { client.setScreen(this); } }, Text.translatable("text.skyblocker.quit_config"), Text.translatable("text.skyblocker.quit_config_sure"), Text.translatable("text.skyblocker.quit_discard"), ScreenTexts.CANCEL)); } else { this.client.setScreen(parent); - if (parent == null) super.close(); } } -- cgit From 84aedfe464bc648cbb18b4f2a7eaeb695091b2b5 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Tue, 26 Sep 2023 12:58:40 -0400 Subject: Rename Config Files --- .../xmrvizzy/skyblocker/skyblock/FairySouls.java | 4 +-- .../skyblocker/skyblock/FancyStatusBars.java | 12 +++---- .../skyblocker/skyblock/FishingHelper.java | 4 +-- .../skyblocker/skyblock/HotbarSlotLock.java | 8 ++--- .../skyblocker/skyblock/QuiverWarning.java | 8 ++--- .../skyblocker/skyblock/StatusBarTracker.java | 6 ++-- .../skyblocker/skyblock/TeleportOverlay.java | 18 +++++----- .../skyblocker/skyblock/barn/HungryHiker.java | 4 +-- .../skyblocker/skyblock/barn/TreasureHunter.java | 4 +-- .../skyblocker/skyblock/dungeon/CroesusHelper.java | 4 +-- .../skyblocker/skyblock/dungeon/DungeonBlaze.java | 4 +-- .../skyblock/dungeon/DungeonChestProfit.java | 10 +++--- .../skyblocker/skyblock/dungeon/DungeonMap.java | 10 +++--- .../skyblock/dungeon/DungeonMapConfigScreen.java | 14 ++++---- .../skyblocker/skyblock/dungeon/LividColor.java | 10 +++--- .../skyblocker/skyblock/dungeon/OldLever.java | 4 +-- .../skyblocker/skyblock/dungeon/Reparty.java | 4 +-- .../skyblocker/skyblock/dungeon/ThreeWeirdos.java | 4 +-- .../skyblocker/skyblock/dungeon/TicTacToe.java | 4 +-- .../skyblocker/skyblock/dungeon/Trivia.java | 4 +-- .../skyblock/dungeon/secrets/DungeonSecrets.java | 10 +++--- .../skyblock/dungeon/secrets/SecretWaypoint.java | 8 ++--- .../skyblock/dungeon/terminal/ColorTerminal.java | 4 +-- .../skyblock/dungeon/terminal/OrderTerminal.java | 4 +-- .../dungeon/terminal/StartsWithTerminal.java | 4 +-- .../skyblocker/skyblock/dwarven/DwarvenHud.java | 20 +++++------ .../skyblock/dwarven/DwarvenHudConfigScreen.java | 12 +++---- .../skyblocker/skyblock/dwarven/Fetchur.java | 4 +-- .../skyblocker/skyblock/dwarven/Puzzler.java | 4 +-- .../skyblock/experiment/ChronomatronSolver.java | 4 +-- .../skyblock/experiment/ExperimentSolver.java | 6 ++-- .../skyblock/experiment/SuperpairsSolver.java | 4 +-- .../skyblock/experiment/UltrasequencerSolver.java | 4 +-- .../skyblocker/skyblock/filters/AbilityFilter.java | 4 +-- .../skyblocker/skyblock/filters/AdFilter.java | 4 +-- .../skyblocker/skyblock/filters/AoteFilter.java | 4 +-- .../skyblocker/skyblock/filters/AutopetFilter.java | 8 ++--- .../skyblocker/skyblock/filters/ComboFilter.java | 4 +-- .../skyblocker/skyblock/filters/HealFilter.java | 4 +-- .../skyblock/filters/ImplosionFilter.java | 4 +-- .../skyblock/filters/MoltenWaveFilter.java | 4 +-- .../skyblocker/skyblock/filters/ShowOffFilter.java | 4 +-- .../skyblock/filters/TeleportPadFilter.java | 4 +-- .../skyblock/item/CustomArmorDyeColors.java | 8 ++--- .../skyblocker/skyblock/item/CustomArmorTrims.java | 8 ++--- .../skyblocker/skyblock/item/CustomItemNames.java | 8 ++--- .../skyblocker/skyblock/item/PriceInfoTooltip.java | 42 +++++++++++----------- .../skyblocker/skyblock/quicknav/QuickNav.java | 10 +++--- .../skyblocker/skyblock/rift/EffigyWaypoints.java | 8 ++--- .../skyblock/rift/HealingMelonIndicator.java | 6 ++-- .../skyblocker/skyblock/rift/ManiaIndicator.java | 4 +-- .../skyblock/rift/MirrorverseWaypoints.java | 4 +-- .../skyblocker/skyblock/rift/StakeIndicator.java | 4 +-- .../xmrvizzy/skyblocker/skyblock/rift/TheRift.java | 10 +++--- .../skyblock/rift/TwinClawsIndicator.java | 6 ++-- .../skyblocker/skyblock/shortcut/Shortcuts.java | 12 +++---- .../skyblock/special/SpecialEffects.java | 4 +-- .../skyblocker/skyblock/spidersden/Relics.java | 4 +-- .../skyblock/tabhud/util/ScreenConst.java | 4 +-- .../skyblock/tabhud/widget/PlayerListWidget.java | 4 +-- .../skyblocker/skyblock/tabhud/widget/Widget.java | 4 +-- .../tabhud/widget/component/PlayerComponent.java | 4 +-- 62 files changed, 213 insertions(+), 213 deletions(-) (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java index 1933184a..46454fb3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java @@ -7,8 +7,8 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.mojang.brigadier.CommandDispatcher; import me.xmrvizzy.skyblocker.SkyblockerMod; -import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.NEURepo; import me.xmrvizzy.skyblocker.utils.PosUtils; import me.xmrvizzy.skyblocker.utils.Utils; @@ -142,7 +142,7 @@ public class FairySouls { } private static void render(WorldRenderContext context) { - ConfigModel.FairySouls fairySoulsConfig = SkyblockerConfig.get().general.fairySouls; + SkyblockerConfig.FairySouls fairySoulsConfig = SkyblockerConfigManager.get().general.fairySouls; if (fairySoulsConfig.enableFairySoulsHelper && fairySoulsLoaded.isDone() && fairySouls.containsKey(Utils.getLocationRaw())) { for (BlockPos fairySoulPos : fairySouls.get(Utils.getLocationRaw())) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java index 1a460f5b..56b6c7fe 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FancyStatusBars.java @@ -1,7 +1,7 @@ package me.xmrvizzy.skyblocker.skyblock; import me.xmrvizzy.skyblocker.SkyblockerMod; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.Utils; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; @@ -40,7 +40,7 @@ public class FancyStatusBars { public boolean render(DrawContext context, int scaledWidth, int scaledHeight) { var player = client.player; - if (!SkyblockerConfig.get().general.bars.enableBars || player == null || Utils.isInTheRift()) + if (!SkyblockerConfigManager.get().general.bars.enableBars || player == null || Utils.isInTheRift()) return false; anchorsX[0] = scaledWidth / 2 - 91; anchorsY[0] = scaledHeight - 33; @@ -60,10 +60,10 @@ public class FancyStatusBars { // Update positions of bars from config for (int i = 0; i < 4; i++) { int configAnchorNum = switch (i) { - case 0 -> SkyblockerConfig.get().general.bars.barpositions.healthBarPosition.toInt(); - case 1 -> SkyblockerConfig.get().general.bars.barpositions.manaBarPosition.toInt(); - case 2 -> SkyblockerConfig.get().general.bars.barpositions.defenceBarPosition.toInt(); - case 3 -> SkyblockerConfig.get().general.bars.barpositions.experienceBarPosition.toInt(); + case 0 -> SkyblockerConfigManager.get().general.bars.barpositions.healthBarPosition.toInt(); + case 1 -> SkyblockerConfigManager.get().general.bars.barpositions.manaBarPosition.toInt(); + case 2 -> SkyblockerConfigManager.get().general.bars.barpositions.defenceBarPosition.toInt(); + case 3 -> SkyblockerConfigManager.get().general.bars.barpositions.experienceBarPosition.toInt(); default -> 0; }; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java index f039a79d..dca3f30b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FishingHelper.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.render.RenderHelper; import me.xmrvizzy.skyblocker.utils.render.title.Title; import net.fabricmc.fabric.api.event.player.UseItemCallback; @@ -46,7 +46,7 @@ public class FishingHelper { public static void onSound(PlaySoundS2CPacket packet) { String path = packet.getSound().value().getId().getPath(); - if (SkyblockerConfig.get().general.fishing.enableFishingHelper && startTime != 0 && System.currentTimeMillis() >= startTime + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) { + if (SkyblockerConfigManager.get().general.fishing.enableFishingHelper && startTime != 0 && System.currentTimeMillis() >= startTime + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) { ClientPlayerEntity player = MinecraftClient.getInstance().player; if (player != null && player.fishHook != null) { Vec3d soundToFishHook = player.fishHook.getPos().subtract(packet.getX(), 0, packet.getZ()); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java index 9f38fe35..ab8ea882 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/HotbarSlotLock.java @@ -1,7 +1,7 @@ package me.xmrvizzy.skyblocker.skyblock; import me.shedaniel.autoconfig.AutoConfig; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.option.KeyBinding; @@ -22,7 +22,7 @@ public class HotbarSlotLock { } public static boolean isLocked(int slot) { - return SkyblockerConfig.get().general.lockedSlots.contains(slot); + return SkyblockerConfigManager.get().general.lockedSlots.contains(slot); } public static void handleDropSelectedItem(int slot, CallbackInfoReturnable cir) { @@ -31,11 +31,11 @@ public class HotbarSlotLock { public static void handleInputEvents(ClientPlayerEntity player) { while (hotbarSlotLock.wasPressed()) { - List lockedSlots = SkyblockerConfig.get().general.lockedSlots; + List lockedSlots = SkyblockerConfigManager.get().general.lockedSlots; int selected = player.getInventory().selectedSlot; if (!isLocked(player.getInventory().selectedSlot)) lockedSlots.add(selected); else lockedSlots.remove(Integer.valueOf(selected)); - SkyblockerConfig.save(); + SkyblockerConfigManager.save(); } } } \ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java index 381bf94c..2d0715e4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.Utils; import me.xmrvizzy.skyblocker.utils.scheduler.Scheduler; import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; @@ -21,7 +21,7 @@ public class QuiverWarning { public static boolean onChatMessage(Text text, boolean overlay) { String message = text.getString(); - if (SkyblockerConfig.get().general.quiverWarning.enableQuiverWarning && message.endsWith("left in your Quiver!")) { + if (SkyblockerConfigManager.get().general.quiverWarning.enableQuiverWarning && message.endsWith("left in your Quiver!")) { MinecraftClient.getInstance().inGameHud.setDefaultTitleFade(); if (message.startsWith("You only have 50")) { onChatMessage(Type.FIFTY_LEFT); @@ -37,14 +37,14 @@ public class QuiverWarning { private static void onChatMessage(Type warning) { if (!Utils.isInDungeons()) { MinecraftClient.getInstance().inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED)); - } else if (SkyblockerConfig.get().general.quiverWarning.enableQuiverWarningInDungeons) { + } else if (SkyblockerConfigManager.get().general.quiverWarning.enableQuiverWarningInDungeons) { MinecraftClient.getInstance().inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED)); QuiverWarning.warning = warning; } } public static void update() { - if (warning != null && SkyblockerConfig.get().general.quiverWarning.enableQuiverWarning && SkyblockerConfig.get().general.quiverWarning.enableQuiverWarningAfterDungeon && !Utils.isInDungeons()) { + if (warning != null && SkyblockerConfigManager.get().general.quiverWarning.enableQuiverWarning && SkyblockerConfigManager.get().general.quiverWarning.enableQuiverWarningAfterDungeon && !Utils.isInDungeons()) { InGameHud inGameHud = MinecraftClient.getInstance().inGameHud; inGameHud.setDefaultTitleFade(); inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED)); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/StatusBarTracker.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/StatusBarTracker.java index aeee9978..ae5aff0b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/StatusBarTracker.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/StatusBarTracker.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.Utils; import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; import net.minecraft.client.MinecraftClient; @@ -66,10 +66,10 @@ public class StatusBarTracker { } private Text onOverlayMessage(Text text, boolean overlay) { - if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfig.get().general.bars.enableBars || Utils.isInTheRift()) { + if (!overlay || !Utils.isOnSkyblock() || !SkyblockerConfigManager.get().general.bars.enableBars || Utils.isInTheRift()) { return text; } - return Text.of(update(text.getString(), SkyblockerConfig.get().messages.hideMana)); + return Text.of(update(text.getString(), SkyblockerConfigManager.get().messages.hideMana)); } public String update(String actionBar, boolean filterManaUse) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/TeleportOverlay.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/TeleportOverlay.java index c7ab926e..1aeeb6d3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/TeleportOverlay.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/TeleportOverlay.java @@ -1,7 +1,7 @@ package me.xmrvizzy.skyblocker.skyblock; import com.mojang.blaze3d.systems.RenderSystem; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip; import me.xmrvizzy.skyblocker.utils.Utils; import me.xmrvizzy.skyblocker.utils.render.RenderHelper; @@ -24,7 +24,7 @@ public class TeleportOverlay { } private static void render(WorldRenderContext wrc) { - if (Utils.isOnSkyblock() && SkyblockerConfig.get().general.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) { + if (Utils.isOnSkyblock() && SkyblockerConfigManager.get().general.teleportOverlay.enableTeleportOverlays && client.player != null && client.world != null) { ItemStack heldItem = client.player.getMainHandStack(); String itemId = PriceInfoTooltip.getInternalNameFromNBT(heldItem, true); NbtCompound nbt = heldItem.getNbt(); @@ -32,34 +32,34 @@ public class TeleportOverlay { if (itemId != null) { switch (itemId) { case "ASPECT_OF_THE_LEECH_1" -> { - if (SkyblockerConfig.get().general.teleportOverlay.enableWeirdTransmission) { + if (SkyblockerConfigManager.get().general.teleportOverlay.enableWeirdTransmission) { render(wrc, 3); } } case "ASPECT_OF_THE_LEECH_2" -> { - if (SkyblockerConfig.get().general.teleportOverlay.enableWeirdTransmission) { + if (SkyblockerConfigManager.get().general.teleportOverlay.enableWeirdTransmission) { render(wrc, 4); } } case "ASPECT_OF_THE_END", "ASPECT_OF_THE_VOID" -> { - if (SkyblockerConfig.get().general.teleportOverlay.enableEtherTransmission && client.options.sneakKey.isPressed() && nbt != null && nbt.getCompound("ExtraAttributes").getInt("ethermerge") == 1) { + if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission && client.options.sneakKey.isPressed() && nbt != null && nbt.getCompound("ExtraAttributes").getInt("ethermerge") == 1) { render(wrc, nbt, 57); - } else if (SkyblockerConfig.get().general.teleportOverlay.enableInstantTransmission) { + } else if (SkyblockerConfigManager.get().general.teleportOverlay.enableInstantTransmission) { render(wrc, nbt, 8); } } case "ETHERWARP_CONDUIT" -> { - if (SkyblockerConfig.get().general.teleportOverlay.enableEtherTransmission) { + if (SkyblockerConfigManager.get().general.teleportOverlay.enableEtherTransmission) { render(wrc, nbt, 57); } } case "SINSEEKER_SCYTHE" -> { - if (SkyblockerConfig.get().general.teleportOverlay.enableSinrecallTransmission) { + if (SkyblockerConfigManager.get().general.teleportOverlay.enableSinrecallTransmission) { render(wrc, nbt, 4); } } case "NECRON_BLADE", "ASTRAEA", "HYPERION", "SCYLLA", "VALKYRIE" -> { - if (SkyblockerConfig.get().general.teleportOverlay.enableWitherImpact) { + if (SkyblockerConfigManager.get().general.teleportOverlay.enableWitherImpact) { render(wrc, 10); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java index a5d02d93..91862622 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.barn; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.chat.ChatFilterResult; import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListener; import net.minecraft.client.MinecraftClient; @@ -18,7 +18,7 @@ public class HungryHiker extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfig.get().locations.barn.solveHungryHiker ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().locations.barn.solveHungryHiker ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java index ba42d2ba..385dc20b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.barn; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.chat.ChatFilterResult; import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListener; import net.minecraft.client.MinecraftClient; @@ -18,7 +18,7 @@ public class TreasureHunter extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfig.get().locations.barn.solveTreasureHunter ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().locations.barn.solveTreasureHunter ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java index bf3cc36d..67e6d7f4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.render.gui.ColorHighlight; import me.xmrvizzy.skyblocker.utils.render.gui.ContainerSolver; import net.minecraft.item.ItemStack; @@ -17,7 +17,7 @@ public class CroesusHelper extends ContainerSolver { @Override protected boolean isEnabled() { - return SkyblockerConfig.get().locations.dungeons.croesusHelper; + return SkyblockerConfigManager.get().locations.dungeons.croesusHelper; } @Override diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java index 8d676d0b..f39684eb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonBlaze.java @@ -1,7 +1,7 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; import it.unimi.dsi.fastutil.objects.ObjectIntPair; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.Utils; import me.xmrvizzy.skyblocker.utils.render.RenderHelper; import me.xmrvizzy.skyblocker.utils.scheduler.Scheduler; @@ -106,7 +106,7 @@ public class DungeonBlaze { */ public static void blazeRenderer(WorldRenderContext wrc) { try { - if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfig.get().locations.dungeons.blazesolver) { + if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().locations.dungeons.blazesolver) { if (highestBlaze.getY() < 69) { renderBlazeOutline(highestBlaze, nextHighestBlaze, wrc); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java index f6fd5909..91be5248 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonChestProfit.java @@ -2,8 +2,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; import com.google.gson.JsonObject; import it.unimi.dsi.fastutil.ints.IntBooleanPair; -import me.xmrvizzy.skyblocker.config.ConfigModel; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.mixin.accessor.ScreenAccessor; import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip; import me.xmrvizzy.skyblocker.utils.Utils; @@ -41,7 +41,7 @@ public class DungeonChestProfit { public static Text getChestProfit(GenericContainerScreenHandler handler, Text title, MinecraftClient client) { try { - if (SkyblockerConfig.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator && isDungeonChest(title.getString())) { + if (SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.enableProfitCalculator && isDungeonChest(title.getString())) { int profit = 0; boolean hasIncompleteData = false, usedKismet = false; List slots = handler.slots.subList(0, handler.getRows() * 9); @@ -69,7 +69,7 @@ public class DungeonChestProfit { } //Essence price - if (name.contains("Essence") && SkyblockerConfig.get().locations.dungeons.dungeonChestProfit.includeEssence) { + if (name.contains("Essence") && SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.includeEssence) { Matcher matcher = ESSENCE_PATTERN.matcher(name); if (matcher.matches()) { @@ -106,7 +106,7 @@ public class DungeonChestProfit { } } - if (SkyblockerConfig.get().locations.dungeons.dungeonChestProfit.includeKismet && usedKismet) { + if (SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit.includeKismet && usedKismet) { IntBooleanPair kismetPriceData = getItemPrice("KISMET_FEATHER"); if (!kismetPriceData.rightBoolean()) hasIncompleteData = true; @@ -159,7 +159,7 @@ public class DungeonChestProfit { } private static Text getProfitText(int profit, boolean hasIncompleteData) { - ConfigModel.DungeonChestProfit config = SkyblockerConfig.get().locations.dungeons.dungeonChestProfit; + SkyblockerConfig.DungeonChestProfit config = SkyblockerConfigManager.get().locations.dungeons.dungeonChestProfit; return getProfitText(profit, hasIncompleteData, config.neutralThreshold, config.neutralColor.formatting, config.profitColor.formatting, config.lossColor.formatting, config.incompleteColor.formatting); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java index a70dd501..53cc4fac 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.scheduler.Scheduler; import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; @@ -32,9 +32,9 @@ public class DungeonMap { VertexConsumerProvider.Immediate vertices = client.getBufferBuilders().getEffectVertexConsumers(); MapRenderer map = client.gameRenderer.getMapRenderer(); MapState state = FilledMapItem.getMapState(mapid, client.world); - float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling; - int x = SkyblockerConfig.get().locations.dungeons.mapX; - int y = SkyblockerConfig.get().locations.dungeons.mapY; + float scaling = SkyblockerConfigManager.get().locations.dungeons.mapScaling; + int x = SkyblockerConfigManager.get().locations.dungeons.mapX; + int y = SkyblockerConfigManager.get().locations.dungeons.mapY; if (state == null) return; matrices.push(); @@ -47,7 +47,7 @@ public class DungeonMap { } public static void renderHUDMap(DrawContext context, int x, int y) { - float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling; + float scaling = SkyblockerConfigManager.get().locations.dungeons.mapScaling; int size = (int) (128 * scaling); context.drawTexture(MAP_BACKGROUND, x, y, 0, 0, size, size, size, size); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java index 88a9070e..94b05e86 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.render.RenderHelper; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; @@ -10,8 +10,8 @@ import java.awt.*; public class DungeonMapConfigScreen extends Screen { - private int hudX = SkyblockerConfig.get().locations.dungeons.mapX; - private int hudY = SkyblockerConfig.get().locations.dungeons.mapY; + private int hudX = SkyblockerConfigManager.get().locations.dungeons.mapX; + private int hudY = SkyblockerConfigManager.get().locations.dungeons.mapY; private final Screen parent; protected DungeonMapConfigScreen() { @@ -33,7 +33,7 @@ public class DungeonMapConfigScreen extends Screen { @Override public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { - float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling; + float scaling = SkyblockerConfigManager.get().locations.dungeons.mapScaling; int size = (int) (128 * scaling); if (RenderHelper.pointIsInArea(mouseX, mouseY, hudX, hudY, hudX + size, hudY + size) && button == 0) { hudX = (int) Math.max(Math.min(mouseX - (size >> 1), this.width - size), 0); @@ -54,9 +54,9 @@ public class DungeonMapConfigScreen extends Screen { @Override public void close() { - SkyblockerConfig.get().locations.dungeons.mapX = hudX; - SkyblockerConfig.get().locations.dungeons.mapY = hudY; - SkyblockerConfig.save(); + SkyblockerConfigManager.get().locations.dungeons.mapX = hudX; + SkyblockerConfigManager.get().locations.dungeons.mapY = hudY; + SkyblockerConfigManager.save(); this.client.setScreen(parent); } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java index e5d8a720..2df8192d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/LividColor.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.Utils; import me.xmrvizzy.skyblocker.utils.scheduler.MessageScheduler; import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; @@ -12,7 +12,7 @@ public class LividColor { public static void init() { ClientReceiveMessageEvents.GAME.register((message, overlay) -> { - if (SkyblockerConfig.get().locations.dungeons.lividColor.enableLividColor && message.getString().equals("[BOSS] Livid: I respect you for making it to here, but I'll be your undoing.")) { + if (SkyblockerConfigManager.get().locations.dungeons.lividColor.enableLividColor && message.getString().equals("[BOSS] Livid: I respect you for making it to here, but I'll be your undoing.")) { tenTicks = 8; } }); @@ -21,15 +21,15 @@ public class LividColor { public static void update() { MinecraftClient client = MinecraftClient.getInstance(); if (tenTicks != 0) { - if (SkyblockerConfig.get().locations.dungeons.lividColor.enableLividColor && Utils.isInDungeons() && client.world != null) { + if (SkyblockerConfigManager.get().locations.dungeons.lividColor.enableLividColor && Utils.isInDungeons() && client.world != null) { if (tenTicks == 1) { - MessageScheduler.INSTANCE.sendMessageAfterCooldown(SkyblockerConfig.get().locations.dungeons.lividColor.lividColorText.replace("[color]", "red")); + MessageScheduler.INSTANCE.sendMessageAfterCooldown(SkyblockerConfigManager.get().locations.dungeons.lividColor.lividColorText.replace("[color]", "red")); tenTicks = 0; return; } String key = client.world.getBlockState(new BlockPos(5, 110, 42)).getBlock().getTranslationKey(); if (key.startsWith("block.minecraft.") && key.endsWith("wool") && !key.endsWith("red_wool")) { - MessageScheduler.INSTANCE.sendMessageAfterCooldown(SkyblockerConfig.get().locations.dungeons.lividColor.lividColorText.replace("[color]", key.substring(16, key.length() - 5))); + MessageScheduler.INSTANCE.sendMessageAfterCooldown(SkyblockerConfigManager.get().locations.dungeons.lividColor.lividColorText.replace("[color]", key.substring(16, key.length() - 5))); tenTicks = 0; return; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java index 91de7a1d..b9fba7be 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/OldLever.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import net.minecraft.block.Block; import net.minecraft.block.enums.BlockFace; import net.minecraft.util.math.Direction; @@ -14,7 +14,7 @@ public class OldLever { protected static final VoxelShape WEST_SHAPE = Block.createCuboidShape(10.0D, 3.0D, 5.0D, 16.0D, 13.0D, 11.0D); public static VoxelShape getShape(BlockFace face, Direction direction) { - if (!SkyblockerConfig.get().general.hitbox.oldLeverHitbox) + if (!SkyblockerConfigManager.get().general.hitbox.oldLeverHitbox) return null; if (face == BlockFace.FLOOR) { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java index 8d8a840a..288a8b5a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Reparty.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; -import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager; import me.xmrvizzy.skyblocker.utils.Utils; import me.xmrvizzy.skyblocker.utils.chat.ChatFilterResult; import me.xmrvizzy.skyblocker.utils.chat.ChatPatternListener; @@ -43,7 +43,7 @@ public class Reparty extends ChatPatternListener { @Override public ChatFilterResult state() { - return (SkyblockerConfig.get().general.acceptReparty || this.repartying) ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return (SkyblockerConfigManager.get().general.acceptReparty || this.repartying) ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/ThreeWeirdos.java b/src/main/java/me/xmrvizzy/skyblocker