Merge branch 'master' of https://github.com/SkyblockerMod/Skyblocker into cleanup-2

# Conflicts:
#	src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
#	src/main/java/de/hysky/skyblocker/utils/Http.java
#	src/main/java/de/hysky/skyblocker/utils/render/title/TitleContainerConfigScreen.java

Pull changes from upstream master

1 files changed, 57 insertions, 3 deletions

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index de53ca0a..8119fcab 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -1,11 +1,12 @@
 package de.hysky.skyblocker.config;
 
+import de.hysky.skyblocker.skyblock.item.CustomArmorTrims;
+import de.hysky.skyblocker.utils.chat.ChatFilterResult;
+import de.hysky.skyblocker.utils.waypoint.Waypoint;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
-import de.hysky.skyblocker.skyblock.item.CustomArmorTrims;
-import de.hysky.skyblocker.utils.chat.ChatFilterResult;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -177,6 +178,9 @@ public class SkyblockerConfig {
 		public FairySouls fairySouls = new FairySouls();
 
 		@SerialEntry
+		public MythologicalRitual mythologicalRitual = new MythologicalRitual();
+
+		@SerialEntry
 		public ItemCooldown itemCooldown = new ItemCooldown();
 
 		@SerialEntry
@@ -195,6 +199,9 @@ public class SkyblockerConfig {
 		public ItemInfoDisplay itemInfoDisplay = new ItemInfoDisplay();
 
 		@SerialEntry
+		public WikiLookup wikiLookup = new WikiLookup();
+
+		@SerialEntry
 		public SpecialEffects specialEffects = new SpecialEffects();
 
 		@SerialEntry
@@ -207,6 +214,9 @@ public class SkyblockerConfig {
 		public TeleportOverlay teleportOverlay = new TeleportOverlay();
 
 		@SerialEntry
+		public FlameOverlay flameOverlay = new FlameOverlay();
+
+		@SerialEntry
 		public List<Integer> lockedSlots = new ArrayList<>();
 
 		@SerialEntry
@@ -316,6 +326,11 @@ public class SkyblockerConfig {
 		public boolean highlightOnlyNearbySouls = false;
 	}
 
+	public static class MythologicalRitual {
+		@SerialEntry
+		public boolean enableMythologicalRitualHelper = true;
+	}
+
 	public static class ItemCooldown {
 		@SerialEntry
 		public boolean enableItemCooldowns = true;
@@ -388,6 +403,14 @@ public class SkyblockerConfig {
 		public boolean enableWitherImpact = true;
 	}
 
+	public static class FlameOverlay {
+		@SerialEntry
+		public float flameHeight = 0f;
+
+		@SerialEntry
+		public float flameOpacity = 0f;
+	}
+
 	public enum Direction {
 		HORIZONTAL, VERTICAL;
 
@@ -462,6 +485,9 @@ public class SkyblockerConfig {
 
 		@SerialEntry
 		public boolean enableMuseumDate = true;
+
+		@SerialEntry
+		public boolean enableExoticTooltip = true;
 	}
 
 	public static class ItemInfoDisplay {
@@ -475,6 +501,14 @@ public class SkyblockerConfig {
 		public float itemRarityBackgroundsOpacity = 1f;
 	}
 
+	public static class WikiLookup {
+		@SerialEntry
+		public boolean enableWikiLookup = true;
+
+		@SerialEntry
+		public boolean officialWiki = false;
+	}
+
 	public static class SpecialEffects {
 		@SerialEntry
 		public boolean rareDungeonDropEffects = true;
@@ -520,6 +554,9 @@ public class SkyblockerConfig {
 		public int mapY = 2;
 
 		@SerialEntry
+		public boolean playerSecretsTracker = false;
+
+		@SerialEntry
 		public boolean starredMobGlow = true;
 
 		@SerialEntry
@@ -552,6 +589,12 @@ public class SkyblockerConfig {
 		public boolean noInitSecretWaypoints = false;
 
 		@SerialEntry
+		public Waypoint.Type waypointType = Waypoint.Type.WAYPOINT;
+
+		@SerialEntry
+		public boolean showSecretText = true;
+
+		@SerialEntry
 		public boolean enableEntranceWaypoints = true;
 
 		@SerialEntry
@@ -579,6 +622,12 @@ public class SkyblockerConfig {
 		public boolean enableStonkWaypoints = true;
 
 		@SerialEntry
+		public boolean enableAotvWaypoints = true;
+		
+		@SerialEntry
+		public boolean enablePearlWaypoints = true;
+
+		@SerialEntry
 		public boolean enableDefaultWaypoints = true;
 	}
 
@@ -606,7 +655,6 @@ public class SkyblockerConfig {
 
 		@SerialEntry
 		public Formatting incompleteColor = Formatting.BLUE;
-
 	}
 
 	public static class LividColor {
@@ -685,6 +733,12 @@ public class SkyblockerConfig {
 		public boolean mirrorverseWaypoints = true;
 
 		@SerialEntry
+		public boolean enigmaSoulWaypoints = false;
+		
+		@SerialEntry
+		public boolean highlightFoundEnigmaSouls = true;
+
+		@SerialEntry
 		public int mcGrubberStacks = 0;
 	}