Refactor CustomArmorDyeColors and CustomItemNames

2 files changed, 12 insertions, 16 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/DyeableItemMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/DyeableItemMixin.java
index 4d0b6bae..f04c4cdd 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/DyeableItemMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/DyeableItemMixin.java
@@ -1,31 +1,27 @@
 package me.xmrvizzy.skyblocker.mixin;
 
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
-import com.llamalad7.mixinextras.sugar.Local;
-
 import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 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"))
-	default public int skyblocker$customDyeColor(int originalColor, @Local ItemStack stack) {
+	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;
-			
+			String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
+
 			return SkyblockerConfig.get().general.customDyeColors.getOrDefault(itemUuid, originalColor);
 		}
-		
+
 		return originalColor;
 	}
 }
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemStackMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemStackMixin.java
index 640bce9b..63dc6624 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemStackMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ItemStackMixin.java
@@ -14,20 +14,20 @@ import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.Text;
 
 @Mixin(ItemStack.class)
-public class ItemStackMixin {
+public abstract class ItemStackMixin {
 	@Shadow
 	@Nullable
 	private NbtCompound nbt;
 
 	@ModifyReturnValue(method = "getName", at = @At("RETURN"))
-	public Text skyblocker$customItemNames(Text original) {
+	private Text skyblocker$customItemNames(Text original) {
 		if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes"))  {
 			NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes");
-			String itemUuid =  extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
-			
+			String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null;
+
 			return SkyblockerConfig.get().general.customItemNames.getOrDefault(itemUuid, original);
 		}
-		
+
 		return original;
 	}
 }