From 13b09e3be36ab38b92e14c7d808fb04ecdc65b82 Mon Sep 17 00:00:00 2001
From: Fix3d <serhanduzce@gmail.com>
Date: Wed, 22 Mar 2023 12:01:14 +0300
Subject: a cleaner PriceInfoTooltip

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 97284bc1..4d3ce5e9 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -6,7 +6,6 @@ import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
 import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
-import net.minecraft.item.ItemStack;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -219,8 +218,8 @@ public class SkyblockerConfig implements ConfigData {
 
         public String toString() {
             return switch (this) {
-                case ONE_DAY -> "1 day price";
-                case THREE_DAY -> "3 day price";
+                case ONE_DAY -> "1 day avg";
+                case THREE_DAY -> "3 day avg";
                 case BOTH -> "Both";
             };
         }
-- 
cgit 


From 16e61da08b98ecaaff5ce71458958178732f6d29 Mon Sep 17 00:00:00 2001
From: Fix3d <serhanduzce@gmail.com>
Date: Wed, 29 Mar 2023 17:17:51 +0300
Subject: conflicts resolved

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 4d3ce5e9..e711e681 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -66,7 +66,7 @@ public class SkyblockerConfig implements ConfigData {
 
         @ConfigEntry.Category("button8")
         @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
-        public QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"), "none", "/warp dungeon");
+        public QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"), "none", "/warp dungeon_hub");
 
         @ConfigEntry.Category("button9")
         @ConfigEntry.Gui.CollapsibleObject(startExpanded = false)
@@ -174,6 +174,7 @@ public class SkyblockerConfig implements ConfigData {
         RIGHT,
         NONE;
 
+        @Override
         public String toString() {
             return switch (this) {
                 case LAYER1 -> "Layer 1";
@@ -216,6 +217,7 @@ public class SkyblockerConfig implements ConfigData {
         THREE_DAY,
         BOTH;
 
+        @Override
         public String toString() {
             return switch (this) {
                 case ONE_DAY -> "1 day avg";
-- 
cgit 


From 9cbce39d68c1c766e20819101fbb803ad05e8fdc Mon Sep 17 00:00:00 2001
From: msg-programs <msgdoesstuff@gmail.com>
Date: Sun, 2 Apr 2023 14:58:42 +0200
Subject: Merging SkyHyTab into Skyblocker: Initial commit

Needs cleanup
---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 21322c81..41ac7f2d 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -125,6 +125,8 @@ public class SkyblockerConfig implements ConfigData {
         public final boolean enableUpdateNotification = true;
         public final boolean backpackPreviewWithoutShift = false;
 
+        public boolean tabHudEnabled = true;
+
         @ConfigEntry.Gui.Excluded
         public String apiKey;
 
-- 
cgit 


From 0249b4c809ef017949b280fcf5deaf973bb1eb87 Mon Sep 17 00:00:00 2001
From: msg-programs <msgdoesstuff@gmail.com>
Date: Sat, 15 Apr 2023 16:39:28 +0200
Subject: Add new "tab-menu-like" style options to dwarven mines HUD.

---
 .../xmrvizzy/skyblocker/config/SkyblockerConfig.java   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index ae96a8f7..089f67c8 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -277,11 +277,29 @@ public class SkyblockerConfig implements ConfigData {
 
     public static class DwarvenHud {
         public boolean enabled = true;
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
+        @ConfigEntry.Gui.Tooltip(count = 3)
+        public Style style = Style.SIMPLE;
         public boolean enableBackground = true;
         public int x = 10;
         public int y = 10;
     }
 
+    public enum Style {
+        SIMPLE,
+        FANCY,
+        CLASSIC;
+
+        @Override
+		public String toString() {
+            return switch (this) {
+                case SIMPLE -> "Simple";
+                case FANCY -> "Fancy";
+                case CLASSIC -> "Classic";
+            };
+        }
+    }
+
     public static class Messages {
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         public ChatFilterResult hideAbility = ChatFilterResult.PASS;
-- 
cgit 


From 4825f2044b4cc674f4147a73ebdae08874cf8563 Mon Sep 17 00:00:00 2001
From: msg-programs <msgdoesstuff@gmail.com>
Date: Sat, 6 May 2023 13:15:15 +0200
Subject: Add option to scale HUD relatively to the vanilla GUI scale

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 6d43eff8..f612ae08 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -128,6 +128,9 @@ public class SkyblockerConfig implements ConfigData {
         public boolean hideEmptyTooltips = true;
 
         public boolean tabHudEnabled = true;
+        @ConfigEntry.BoundedDiscrete(min=10, max=200)
+        @ConfigEntry.Gui.Tooltip()
+        public int tabHudScale = 100;
 
         @ConfigEntry.Gui.Excluded
         public String apiKey;
-- 
cgit 


From 8716da49090362275e94d159b0dc7be4781f6451 Mon Sep 17 00:00:00 2001
From: msg-programs <msgdoesstuff@gmail.com>
Date: Sun, 7 May 2023 11:32:45 +0200
Subject: Put fancy tab HUD config into its own section

---
 .../me/xmrvizzy/skyblocker/config/SkyblockerConfig.java   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index f612ae08..e89c32bd 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -127,10 +127,9 @@ public class SkyblockerConfig implements ConfigData {
         public boolean backpackPreviewWithoutShift = false;
         public boolean hideEmptyTooltips = true;
 
-        public boolean tabHudEnabled = true;
-        @ConfigEntry.BoundedDiscrete(min=10, max=200)
-        @ConfigEntry.Gui.Tooltip()
-        public int tabHudScale = 100;
+        @ConfigEntry.Category("tabHud")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public TabHudConf tabHud = new TabHudConf();
 
         @ConfigEntry.Gui.Excluded
         public String apiKey;
@@ -155,6 +154,14 @@ public class SkyblockerConfig implements ConfigData {
         public List<Integer> lockedSlots = new ArrayList<>();
     }
 
+    public static class TabHudConf {
+        public boolean tabHudEnabled = true;
+
+        @ConfigEntry.BoundedDiscrete(min=10, max=200)
+        @ConfigEntry.Gui.Tooltip()
+        public int tabHudScale = 100;
+    }
+
     public static class Bars {
         public boolean enableBars = true;
 
-- 
cgit 


From 2093b1fc1c2a75009b367bcd7b378bcf6e1d16b8 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Tue, 16 May 2023 19:40:01 -0400
Subject: Added config screen command

---
 .../skyblocker/config/SkyblockerConfig.java        | 38 +++++++++++++++++++---
 1 file changed, 34 insertions(+), 4 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 48eb31c7..e2e7b4ca 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -1,16 +1,24 @@
 package me.xmrvizzy.skyblocker.config;
 
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
 import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
+import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.resource.language.I18n;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
+
 @Config(name = "skyblocker")
 public class SkyblockerConfig implements ConfigData {
 
@@ -59,7 +67,7 @@ public class SkyblockerConfig implements ConfigData {
 
         @ConfigEntry.Category("button6")
         @ConfigEntry.Gui.CollapsibleObject()
-        public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"),  "Storage", "/storage");
+        public QuickNavItem button6 = new QuickNavItem(true, new ItemData("ender_chest"), "Storage", "/storage");
 
         @ConfigEntry.Category("button7")
         @ConfigEntry.Gui.CollapsibleObject()
@@ -133,7 +141,7 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Category("bars")
         @ConfigEntry.Gui.CollapsibleObject()
         public Bars bars = new Bars();
-      
+
         @ConfigEntry.Category("itemList")
         @ConfigEntry.Gui.CollapsibleObject()
         public ItemList itemList = new ItemList();
@@ -177,7 +185,7 @@ public class SkyblockerConfig implements ConfigData {
         NONE;
 
         @Override
-		public String toString() {
+        public String toString() {
             return I18n.translate("text.autoconfig.skyblocker.option.general.bars.barpositions." + name());
         }
 
@@ -215,7 +223,7 @@ public class SkyblockerConfig implements ConfigData {
         BOTH;
 
         @Override
-		public String toString() {
+        public String toString() {
             return I18n.translate("text.autoconfig.skyblocker.option.general.itemTooltip.avg." + name());
         }
     }
@@ -310,14 +318,36 @@ public class SkyblockerConfig implements ConfigData {
         PURSE,
         BITS,
         LOCATION;
+
         @Override
         public String toString() {
             return I18n.translate("text.autoconfig.skyblocker.option.richPresence.info." + name());
         }
     }
 
+    /**
+     * Registers the config to AutoConfig and register commands to open the config screen.
+     */
     public static void init() {
         AutoConfig.register(SkyblockerConfig.class, GsonConfigSerializer::new);
+        ClientCommandRegistrationCallback.EVENT.register(((dispatcher, registryAccess) -> dispatcher.register(literal("skyblocker").then(optionsLiteral("config")).then(optionsLiteral("options")))));
+    }
+
+    /**
+     * Registers an options command with the given name. Used for registering both options and config as valid commands.
+     *
+     * @param name the name of the command node
+     * @return the command builder
+     */
+    private static LiteralArgumentBuilder<FabricClientCommandSource> optionsLiteral(String name) {
+        return literal(name).executes(context -> {
+            // Don't immediately open the next screen as it will be closed by ChatScreen right after this command is executed
+            SkyblockerMod.getInstance().scheduler.schedule(() -> {
+                Screen a = AutoConfig.getConfigScreen(SkyblockerConfig.class, null).get();
+                MinecraftClient.getInstance().setScreen(a);
+            }, 0);
+            return 1;
+        });
     }
 
     public static SkyblockerConfig get() {
-- 
cgit 


From 18e0b1c1b18a6a0795894b71565f1950b513f666 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Sat, 20 May 2023 14:10:46 -0400
Subject: Add Fishing Helper

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index e2e7b4ca..13f70137 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -142,6 +142,10 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Gui.CollapsibleObject()
         public Bars bars = new Bars();
 
+        @ConfigEntry.Category("fishing")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public Fishing fishing = new Fishing();
+
         @ConfigEntry.Category("itemList")
         @ConfigEntry.Gui.CollapsibleObject()
         public ItemList itemList = new ItemList();
@@ -199,6 +203,10 @@ public class SkyblockerConfig implements ConfigData {
         }
     }
 
+    public static class Fishing {
+        public boolean enableFishingHelper = true;
+    }
+
     public static class Hitbox {
         public boolean oldFarmlandHitbox = true;
         public boolean oldLeverHitbox = false;
-- 
cgit 


From 049f988c904e7bee85e4d0a03e2dbbcf0047d27e Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Mon, 22 May 2023 20:30:12 -0400
Subject: Add Livid Color

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 13f70137..65e5c392 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -269,6 +269,8 @@ public class SkyblockerConfig implements ConfigData {
         public boolean solveThreeWeirdos = true;
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
+        public boolean lividColor = true;
+        public String lividColorText = "[color]";
         @ConfigEntry.Gui.CollapsibleObject()
         public Terminals terminals = new Terminals();
     }
-- 
cgit 


From 98e875d281b99de6df4e150656e501a3121d2d81 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Sun, 28 May 2023 19:38:12 -0400
Subject: Fix Reparty commands and update config

---
 .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 65e5c392..c87f0ad9 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -269,12 +269,19 @@ public class SkyblockerConfig implements ConfigData {
         public boolean solveThreeWeirdos = true;
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
-        public boolean lividColor = true;
-        public String lividColorText = "[color]";
+        @ConfigEntry.Gui.CollapsibleObject
+        public LividColor lividColor = new LividColor();
         @ConfigEntry.Gui.CollapsibleObject()
         public Terminals terminals = new Terminals();
     }
 
+    public static class LividColor {
+        @ConfigEntry.Gui.Tooltip()
+        public boolean enableLividColor = true;
+        @ConfigEntry.Gui.Tooltip()
+        public String lividColorText = "The livid color is [color]";
+    }
+
     public static class Terminals {
         public boolean solveColor = true;
         public boolean solveOrder = true;
-- 
cgit 


From 97384423da03f5d85ed5ec62a16f80d40f109b74 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Mon, 5 Jun 2023 01:13:54 -0400
Subject: Add Dungeon Map Placement Screen!

You can now move the dungeon map to wherever you want on your screen! No
longer is it locked to the top left.
---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 7fdd7254..b1bc2001 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -278,6 +278,8 @@ public class SkyblockerConfig implements ConfigData {
         public boolean croesusHelper = true;
         public boolean enableMap = true;
         public float mapScaling = 1f;
+        public int mapX = 2;
+        public int mapY = 2;
         public boolean solveThreeWeirdos = true;
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
-- 
cgit 


From dc3b373391db5e2fd43752430b13d59956d5be4e Mon Sep 17 00:00:00 2001
From: Jakub Kolodziej <jakvb.kolodziej@gmail.com>
Date: Sat, 10 Jun 2023 14:23:35 +0200
Subject: Add Auto Rejoin Reparty

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index b1bc2001..3acbbdec 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -281,6 +281,7 @@ public class SkyblockerConfig implements ConfigData {
         public int mapX = 2;
         public int mapY = 2;
         public boolean solveThreeWeirdos = true;
+        public boolean repartyRejoin = true;
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
         @ConfigEntry.Gui.CollapsibleObject
-- 
cgit 


From 24136a4e82c18e17d2cf88e389c665dffab3588d Mon Sep 17 00:00:00 2001
From: Jakub Kolodziej <jakvb.kolodziej@gmail.com>
Date: Sun, 11 Jun 2023 22:44:46 +0200
Subject: Change acceptReparty option placement

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 3acbbdec..ccf86eb2 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -132,6 +132,7 @@ public class SkyblockerConfig implements ConfigData {
 
     public static class General {
         public boolean enableUpdateNotification = true;
+        public boolean acceptReparty = true;
         public boolean backpackPreviewWithoutShift = false;
         public boolean hideEmptyTooltips = true;
 
@@ -281,7 +282,6 @@ public class SkyblockerConfig implements ConfigData {
         public int mapX = 2;
         public int mapY = 2;
         public boolean solveThreeWeirdos = true;
-        public boolean repartyRejoin = true;
         public boolean blazesolver = true;
         public boolean solveTrivia = true;
         @ConfigEntry.Gui.CollapsibleObject
-- 
cgit 


From 027426aacac048b85cd310e9e3d4101e0156a917 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Mon, 22 May 2023 20:30:12 -0400
Subject: Add Fairy Souls Helper

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index b1bc2001..f296e487 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -150,6 +150,10 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Gui.CollapsibleObject()
         public Fishing fishing = new Fishing();
 
+        @ConfigEntry.Category("fairySouls")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public FairySouls fairySouls = new FairySouls();
+
         @ConfigEntry.Category("itemList")
         @ConfigEntry.Gui.CollapsibleObject()
         public ItemList itemList = new ItemList();
@@ -219,6 +223,10 @@ public class SkyblockerConfig implements ConfigData {
         public boolean enableFishingHelper = true;
     }
 
+    public static class FairySouls {
+        public boolean enableFairySouls = true;
+    }
+
     public static class Hitbox {
         public boolean oldFarmlandHitbox = true;
         public boolean oldLeverHitbox = false;
-- 
cgit 


From d1bdb78708bfd7f289b59e17dd0b225c1aedd9a2 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Thu, 25 May 2023 20:13:03 -0400
Subject: Fix fairy souls option name

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index f296e487..31887a90 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -224,7 +224,7 @@ public class SkyblockerConfig implements ConfigData {
     }
 
     public static class FairySouls {
-        public boolean enableFairySouls = true;
+        public boolean enableFairySoulsHelper = false;
     }
 
     public static class Hitbox {
-- 
cgit 


From 4a1075ce0e7c7bb53179820c44f639ce79fe7404 Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Fri, 16 Jun 2023 16:34:16 +0800
Subject: Add Chronomatron Solver

---
 .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 31887a90..5621a258 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -146,6 +146,10 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Gui.CollapsibleObject()
         public Bars bars = new Bars();
 
+        @ConfigEntry.Category("experiments")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public Experiments experiments = new Experiments();
+
         @ConfigEntry.Category("fishing")
         @ConfigEntry.Gui.CollapsibleObject()
         public Fishing fishing = new Fishing();
@@ -219,6 +223,12 @@ public class SkyblockerConfig implements ConfigData {
         }
     }
 
+    public static class Experiments {
+        public boolean enableChronomatronSolver = true;
+        public boolean enableSuperpairsSolver = true;
+        public boolean enableUltrasequencerSolver = true;
+    }
+
     public static class Fishing {
         public boolean enableFishingHelper = true;
     }
-- 
cgit 


From 384f75a5aec98713d719f01662fc95464bed84f3 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Mon, 26 Jun 2023 02:24:56 -0400
Subject: Add Mirrorverse Waypoints + Rift Fixes

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 5621a258..988f5f77 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -289,6 +289,10 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Category("dwarvenmines")
         @ConfigEntry.Gui.CollapsibleObject()
         public DwarvenMines dwarvenMines = new DwarvenMines();
+        
+        @ConfigEntry.Category("rift")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public Rift rift = new Rift();
     }
 
     public static class Dungeons {
@@ -357,6 +361,10 @@ public class SkyblockerConfig implements ConfigData {
         public boolean solveHungryHiker = true;
         public boolean solveTreasureHunter = true;
     }
+    
+    public static class Rift {
+    	public boolean mirrorverseWaypoints = true;
+    }
 
     public static class Messages {
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-- 
cgit 


From c3dd9419010ba36647ee330ffb4e6873359d494a Mon Sep 17 00:00:00 2001
From: Futuremappermydud <54294576+Futuremappermydud@users.noreply.github.com>
Date: Thu, 29 Jun 2023 06:18:23 -0400
Subject: Implement Vampire Slayer Features (#191)

Implement Vampire Slayer Features

Co-authored-by: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
---
 .../skyblocker/config/SkyblockerConfig.java        | 39 +++++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 988f5f77..4b1398e0 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -30,6 +30,10 @@ public class SkyblockerConfig implements ConfigData {
     @ConfigEntry.Gui.TransitiveObject
     public Locations locations = new Locations();
 
+    @ConfigEntry.Category("slayer")
+    @ConfigEntry.Gui.TransitiveObject
+    public Slayer slayer = new Slayer();
+
     @ConfigEntry.Category("quickNav")
     @ConfigEntry.Gui.TransitiveObject
     public QuickNav quickNav = new QuickNav();
@@ -177,7 +181,7 @@ public class SkyblockerConfig implements ConfigData {
     public static class TabHudConf {
         public boolean tabHudEnabled = true;
 
-        @ConfigEntry.BoundedDiscrete(min=10, max=200)
+        @ConfigEntry.BoundedDiscrete(min = 10, max = 200)
         @ConfigEntry.Gui.Tooltip()
         public int tabHudScale = 100;
     }
@@ -289,7 +293,7 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Category("dwarvenmines")
         @ConfigEntry.Gui.CollapsibleObject()
         public DwarvenMines dwarvenMines = new DwarvenMines();
-        
+
         @ConfigEntry.Category("rift")
         @ConfigEntry.Gui.CollapsibleObject()
         public Rift rift = new Rift();
@@ -348,7 +352,7 @@ public class SkyblockerConfig implements ConfigData {
         CLASSIC;
 
         @Override
-		public String toString() {
+        public String toString() {
             return switch (this) {
                 case SIMPLE -> "Simple";
                 case FANCY -> "Fancy";
@@ -361,9 +365,34 @@ public class SkyblockerConfig implements ConfigData {
         public boolean solveHungryHiker = true;
         public boolean solveTreasureHunter = true;
     }
-    
+
     public static class Rift {
-    	public boolean mirrorverseWaypoints = true;
+        public boolean mirrorverseWaypoints = true;
+    }
+
+    public static class Slayer {
+        @ConfigEntry.Category("vampire")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public VampireSlayer vampireSlayer = new VampireSlayer();
+    }
+
+    public static class VampireSlayer {
+        public boolean enableEffigyWaypoints = true;
+        public boolean compactEffigyWaypoints;
+        @ConfigEntry.BoundedDiscrete(min = 1, max = 10)
+        @ConfigEntry.Gui.Tooltip()
+        public int effigyUpdateFrequency = 5;
+        public boolean enableHolyIceIndicator = true;
+        public int holyIceIndicatorTickDelay = 10;
+        @ConfigEntry.BoundedDiscrete(min = 1, max = 10)
+        @ConfigEntry.Gui.Tooltip()
+        public int holyIceUpdateFrequency = 5;
+        public boolean enableHealingMelonIndicator = true;
+        public float healingMelonHealthThreshold = 4F;
+        public boolean enableSteakStakeIndicator = true;
+        @ConfigEntry.BoundedDiscrete(min = 1, max = 10)
+        @ConfigEntry.Gui.Tooltip()
+        public int steakStakeUpdateFrequency = 5;
     }
 
     public static class Messages {
-- 
cgit 


From f81e276c6fd27eac93fea03ecc6258d8d16d1cbd Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Sat, 1 Jul 2023 14:38:38 -0400
Subject: Add Motes Price Tooltip

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 3a8a4a1f..108eab47 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -273,6 +273,8 @@ public class SkyblockerConfig implements ConfigData {
 
     public static class ItemTooltip {
         public boolean enableNPCPrice = true;
+        @ConfigEntry.Gui.Tooltip
+        public boolean enableMotesPrice = true;
         public boolean enableAvgBIN = true;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
         @ConfigEntry.Gui.Tooltip()
-- 
cgit 


From e700b19b7a39cb749290f0051d72ec8bd51653e2 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Sat, 1 Jul 2023 15:55:16 -0400
Subject: McGrubber Burgers

---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 108eab47..26e59b40 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -371,6 +371,9 @@ public class SkyblockerConfig implements ConfigData {
 
     public static class Rift {
         public boolean mirrorverseWaypoints = true;
+        @ConfigEntry.BoundedDiscrete(min = 0, max = 5)
+        @ConfigEntry.Gui.Tooltip
+        public int mcGrubberStacks = 0;
     }
 
     public static class Slayer {
-- 
cgit 


From 64e1de1f4f857d4c126b7610b008120a61f118d2 Mon Sep 17 00:00:00 2001
From: Futuremappermydud <54294576+Futuremappermydud@users.noreply.github.com>
Date: Tue, 4 Jul 2023 20:19:40 -0400
Subject: New Slayer Stuff

Implement TitleContainer for stacking titles.
Implement Mania Indicator to show the player when they are standing on green terracotta during mania.
---
 src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 26e59b40..ab4149fc 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -399,6 +399,10 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.BoundedDiscrete(min = 1, max = 10)
         @ConfigEntry.Gui.Tooltip()
         public int steakStakeUpdateFrequency = 5;
+        public boolean enableManiaIndicator = true;
+        @ConfigEntry.BoundedDiscrete(min = 1, max = 10)
+        @ConfigEntry.Gui.Tooltip()
+        public int maniaUpdateFrequency = 5;
     }
 
     public static class Messages {
-- 
cgit 


From e393d6f9fa44b0314734ce54927ebf3bf0551d47 Mon Sep 17 00:00:00 2001
From: Futuremappermydud <54294576+Futuremappermydud@users.noreply.github.com>
Date: Wed, 5 Jul 2023 17:07:44 -0400
Subject: Make Changes + Add scaling

---
 .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index ab4149fc..d461dbfe 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -175,6 +175,11 @@ public class SkyblockerConfig implements ConfigData {
         @ConfigEntry.Gui.CollapsibleObject()
         public Hitbox hitbox = new Hitbox();
 
+        @ConfigEntry.Gui.Tooltip()
+        @ConfigEntry.Category("titleContainer")
+        @ConfigEntry.Gui.CollapsibleObject()
+        public TitleContainer titleContainer = new TitleContainer();
+
         @ConfigEntry.Gui.Excluded
         public List<Integer> lockedSlots = new ArrayList<>();
     }
@@ -247,6 +252,11 @@ public class SkyblockerConfig implements ConfigData {
         public boolean oldLeverHitbox = false;
     }
 
+    public static class TitleContainer {
+        @ConfigEntry.BoundedDiscrete(min = 30, max = 140)
+        public float titleContainerScale = 100;
+    }
+
     public static class RichPresence {
         public boolean enableRichPresence = false;
         @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-- 
cgit 


From a4917d92ab77bc980b68017721adac2091a51f3e Mon Sep 17 00:00:00 2001
From: Futuremappermydud <54294576+Futuremappermydud@users.noreply.github.com>
Date: Fri, 7 Jul 2023 18:00:58 -0400
Subject: WIP Title Container movement + Duration methods

Added a WIP configuration screen under /Skyblocker hud titleContainer that allows you to move, change alignment, and reorient the titles inside.
Added methods(TitleContainer.addTitleWithDismiss, and RenderHelper.displayInTitleContainerWDismissAndPlaySound) that will display the given title and after a set amount of ticks will disable that title.
---
 .../skyblocker/config/SkyblockerConfig.java        | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index d461dbfe..1aeee35e 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -255,6 +255,40 @@ public class SkyblockerConfig implements ConfigData {
     public static class TitleContainer {
         @ConfigEntry.BoundedDiscrete(min = 30, max = 140)
         public float titleContainerScale = 100;
+        public int x = 540;
+        public int y = 10;
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
+        public Direction direction = Direction.HORIZONTAL;
+        @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.DROPDOWN)
+        public Alignment alignment = Alignment.MIDDLE;
+    }
+
+    public enum Direction {
+        HORIZONTAL,
+        VERTICAL;
+
+        @Override
+        public String toString() {
+            return switch (this) {
+                case HORIZONTAL -> "Horizontal";
+                case VERTICAL -> "Vertical";
+            };
+        }
+    }
+
+    public enum Alignment {
+        LEFT,
+        RIGHT,
+        MIDDLE;
+
+        @Override
+        public String toString() {
+            return switch (this) {
+                case LEFT -> "Left";
+                case RIGHT -> "Right";
+                case MIDDLE -> "Middle";
+            };
+        }
     }
 
     public static class RichPresence {
-- 
cgit 


From 796177d64aac6c64949973a5604aedc0d1f2651f Mon Sep 17 00:00:00 2001
From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>
Date: Sat, 8 Jul 2023 17:20:55 +0800
Subject: Refactor Title Container

---
 .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/main/java/me/xmrvizzy/skyblocker/config')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
index 1aeee35e..7da9979a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java
@@ -1,5 +1,6 @@
 package me.xmrvizzy.skyblocker.config;
 
+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.ConfigData;
@@ -10,8 +11,6 @@ import me.xmrvizzy.skyblocker.SkyblockerMod;
 import me.xmrvizzy.skyblocker.chat.ChatFilterResult;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.resource.language.I18n;
 
 import java.util.ArrayList;
@@ -500,11 +499,8 @@ public class SkyblockerConfig implements ConfigData {
     private static LiteralArgumentBuilder<FabricClientCommandSource> optionsLiteral(String name) {
         return literal(name).executes(context -> {
             // Don't immediately open the next screen as it will be closed by ChatScreen right after this command is executed
-            SkyblockerMod.getInstance().scheduler.schedule(() -> {
-                Screen a = AutoConfig.getConfigScreen(SkyblockerConfig.class, null).get();
-                MinecraftClient.getInstance().setScreen(a);
-            }, 0);
-            return 1;
+            SkyblockerMod.getInstance().scheduler.queueOpenScreen(AutoConfig.getConfigScreen(SkyblockerConfig.class, null));
+            return Command.SINGLE_SUCCESS;
         });
     }
 
-- 
cgit