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, 19 insertions, 10 deletions

diff --git a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
index bd1cd5bd..b398e9b6 100644
--- a/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
+++ b/src/main/java/de/hysky/skyblocker/SkyblockerMod.java
@@ -2,22 +2,27 @@ package de.hysky.skyblocker;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.skyblock.*;
+import de.hysky.skyblocker.skyblock.diana.MythologicalRitual;
 import de.hysky.skyblocker.skyblock.dungeon.*;
 import de.hysky.skyblocker.skyblock.dungeon.secrets.DungeonSecrets;
-import de.hysky.skyblocker.skyblock.item.*;
-import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.ScreenMaster;
-import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.dungeon.secrets.SecretsTracker;
 import de.hysky.skyblocker.skyblock.dwarven.DwarvenHud;
-import de.hysky.skyblocker.skyblock.itemlist.ItemRegistry;
+import de.hysky.skyblocker.skyblock.item.*;
+import de.hysky.skyblocker.skyblock.item.tooltip.BackpackPreview;
+import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
+import de.hysky.skyblocker.skyblock.itemlist.ItemRepository;
 import de.hysky.skyblocker.skyblock.quicknav.QuickNav;
 import de.hysky.skyblocker.skyblock.rift.TheRift;
 import de.hysky.skyblocker.skyblock.shortcut.Shortcuts;
 import de.hysky.skyblocker.skyblock.special.SpecialEffects;
 import de.hysky.skyblocker.skyblock.spidersden.Relics;
 import de.hysky.skyblocker.skyblock.tabhud.TabHud;
+import de.hysky.skyblocker.skyblock.tabhud.screenbuilder.ScreenMaster;
 import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr;
-import de.hysky.skyblocker.utils.NEURepo;
+import de.hysky.skyblocker.utils.ApiUtils;
+import de.hysky.skyblocker.utils.NEURepoManager;
 import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.chat.ChatMessageListener;
 import de.hysky.skyblocker.utils.discord.DiscordRPCManager;
@@ -39,7 +44,7 @@ import java.nio.file.Path;
  * this class.
  */
 public class SkyblockerMod implements ClientModInitializer {
-    public static final String VERSION = FabricLoader.getInstance().getModContainer("skyblocker").get().getMetadata().getVersion().getFriendlyString();
+    public static final String VERSION = FabricLoader.getInstance().getModContainer("skyblocker").orElseThrow().getMetadata().getVersion().getFriendlyString();
     public static final String NAMESPACE = "skyblocker";
     public static final Path CONFIG_DIR = FabricLoader.getInstance().getConfigDir().resolve(NAMESPACE);
     public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
@@ -68,14 +73,15 @@ public class SkyblockerMod implements ClientModInitializer {
     public void onInitializeClient() {
         ClientTickEvents.END_CLIENT_TICK.register(this::tick);
         Utils.init();
-        HotbarSlotLock.init();
         SkyblockerConfigManager.init();
-        PriceInfoTooltip.init();
+        NEURepoManager.init();
+        ItemRepository.init();
+        HotbarSlotLock.init();
+        ItemTooltip.init();
         WikiLookup.init();
-        ItemRegistry.init();
-        NEURepo.init();
         FairySouls.init();
         Relics.init();
+        MythologicalRitual.init();
         BackpackPreview.init();
         QuickNav.init();
         ItemCooldowns.init();
@@ -104,6 +110,9 @@ public class SkyblockerMod implements ClientModInitializer {
         ItemProtection.init();
         CreeperBeams.init();
         ItemRarityBackgrounds.init();
+        MuseumItemCache.init();
+        SecretsTracker.init();
+        ApiUtils.init();
         containerSolverManager.init();
         statusBarTracker.init();
         Scheduler.INSTANCE.scheduleCyclic(Utils::update, 20);