From 293b3aee371531d206d336dcbcaa4e27e5230d70 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Fri, 20 Sep 2024 23:15:47 +0200
Subject: [PATCH] fix merge conflict

---
 .../event/hoppity/HoppityCollectionStats.kt   | 26 -------------------
 1 file changed, 26 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
index 229146498079..8ccb76ea04b2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityCollectionStats.kt
@@ -33,7 +33,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.firstMatcher
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
-import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getMinecraftId
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
@@ -201,31 +200,6 @@ object HoppityCollectionStats {
         replacementCache[event.originalItem.displayName]?.let { event.replace(it) }
     }
 
-    @SubscribeEvent
-    fun replaceItem(event: ReplaceItemEvent) {
-        if (!config.rarityDyeRecolor || !pagePattern.matches(event.inventory.name)) return
-        val item = event.originalItem
-        // The "base" missing rabbits are Gray Dye (minecraft:dye with metadata 8)
-        if (item.getMinecraftId().toString() != "minecraft:dye" || item.metadata != 8) return
-
-        val rarity = HoppityAPI.rarityByRabbit(item.displayName)
-        // Add NBT for the dye color itself
-        val newItemStack = ItemStack(Items.dye, 1, when (rarity) {
-            LorenzRarity.COMMON -> 7  // Light gray dye
-            LorenzRarity.UNCOMMON -> 10 // Lime dye
-            LorenzRarity.RARE -> 4 // Lapis lazuli
-            LorenzRarity.EPIC -> 5 // Purple dye
-            LorenzRarity.LEGENDARY -> 14 // Orange dye
-            LorenzRarity.MYTHIC -> 13 // Magenta dye
-            LorenzRarity.DIVINE -> 12 // Light blue dye
-            LorenzRarity.SPECIAL -> 1 // Rose Red - Covering bases for future (?)
-            else -> return
-        })
-        newItemStack.setLore(item.getLore())
-        newItemStack.setStackDisplayName(item.displayName)
-        event.replace(newItemStack)
-    }
-
     @SubscribeEvent
     fun onInventoryOpen(event: InventoryFullyOpenedEvent) {
         if (!(LorenzUtils.inSkyBlock)) return