Move AccessoryTooltip and MuseumTooltip

4 files changed, 9 insertions, 8 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
index 8798a139..992206ad 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
@@ -108,7 +108,7 @@ public class AccessoriesHelper {
 				.put(page, new ObjectOpenHashSet<>(accessoryIds));
 	}
 
-	static Pair<AccessoryReport, String> calculateReport4Accessory(String accessoryId) {
+	public static Pair<AccessoryReport, String> calculateReport4Accessory(String accessoryId) {
 		if (!ACCESSORY_DATA.containsKey(accessoryId) || Utils.getProfileId().isEmpty()) return Pair.of(AccessoryReport.INELIGIBLE, null);
 
 		Accessory accessory = ACCESSORY_DATA.get(accessoryId);
@@ -208,7 +208,7 @@ public class AccessoriesHelper {
 		}
 	}
 
-	enum AccessoryReport {
+	public enum AccessoryReport {
 		HAS_HIGHEST_TIER, //You've collected the highest tier - Collected
 		IS_GREATER_TIER, //This accessory is an upgrade from the one in the same family that you already have - Upgrade -- Shows you what tier this accessory is in its family
 		HAS_GREATER_TIER, //This accessory has a higher tier upgrade - Upgradable -- Shows you the highest tier accessory you've collected in that family
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoryTooltip.java b/src/main/java/de/hysky/skyblocker/utils/tooltip/AccessoryTooltip.java
index a0a0559b..6650adee 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoryTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/utils/tooltip/AccessoryTooltip.java
@@ -1,6 +1,8 @@
-package de.hysky.skyblocker.skyblock.item.tooltip;
+package de.hysky.skyblocker.utils.tooltip;
 
-import de.hysky.skyblocker.utils.tooltip.TooltipAdder;
+import de.hysky.skyblocker.skyblock.item.tooltip.AccessoriesHelper;
+import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
+import de.hysky.skyblocker.skyblock.item.tooltip.TooltipInfoType;
 import it.unimi.dsi.fastutil.Pair;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.MutableText;
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/MuseumTooltip.java b/src/main/java/de/hysky/skyblocker/utils/tooltip/MuseumTooltip.java
index 727c83db..038cbbe8 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/MuseumTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/utils/tooltip/MuseumTooltip.java
@@ -1,8 +1,9 @@
-package de.hysky.skyblocker.skyblock.item.tooltip;
+package de.hysky.skyblocker.utils.tooltip;
 
 import de.hysky.skyblocker.skyblock.item.MuseumItemCache;
+import de.hysky.skyblocker.skyblock.item.tooltip.ItemTooltip;
+import de.hysky.skyblocker.skyblock.item.tooltip.TooltipInfoType;
 import de.hysky.skyblocker.utils.ItemUtils;
-import de.hysky.skyblocker.utils.tooltip.TooltipAdder;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.screen.slot.Slot;
diff --git a/src/main/java/de/hysky/skyblocker/utils/tooltip/TooltipManager.java b/src/main/java/de/hysky/skyblocker/utils/tooltip/TooltipManager.java
index 8b9898a2..dca81389 100644
--- a/src/main/java/de/hysky/skyblocker/utils/tooltip/TooltipManager.java
+++ b/src/main/java/de/hysky/skyblocker/utils/tooltip/TooltipManager.java
@@ -1,7 +1,5 @@
 package de.hysky.skyblocker.utils.tooltip;
 
-import de.hysky.skyblocker.skyblock.item.tooltip.AccessoryTooltip;
-import de.hysky.skyblocker.skyblock.item.tooltip.MuseumTooltip;
 import de.hysky.skyblocker.utils.Utils;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.minecraft.client.gui.screen.Screen;