new pr because fixing merge conflict would take too long

1 files changed, 0 insertions, 27 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/DyeableItemMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/DyeableItemMixin.java
deleted file mode 100644
index bbe31472..00000000
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/DyeableItemMixin.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package me.xmrvizzy.skyblocker.mixin;
-
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfigManager;
-import me.xmrvizzy.skyblocker.utils.Utils;
-import net.minecraft.item.DyeableItem;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
-@Mixin(DyeableItem.class)
-public interface DyeableItemMixin {
-	@ModifyReturnValue(method = "getColor", at = @At("RETURN"))
-	private int skyblocker$customDyeColor(int originalColor, ItemStack stack) {
-		NbtCompound nbt = stack.getNbt();
-
-		if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes")) {
-			NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes");
-			String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
-
-			return SkyblockerConfigManager.get().general.customDyeColors.getOrDefault(itemUuid, originalColor);
-		}
-
-		return originalColor;
-	}
-}