Apply code review suggestions

2 files changed, 7 insertions, 10 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
index 277ca19c..65e1b138 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/CustomArmorTrims.java
@@ -5,8 +5,8 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.debug.Debug;
 import de.hysky.skyblocker.events.SkyblockEvents;
 import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.ItemUtils;
@@ -28,15 +28,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.trim.ArmorTrim;
 import net.minecraft.item.trim.ArmorTrimMaterial;
 import net.minecraft.item.trim.ArmorTrimPattern;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtOps;
 import net.minecraft.registry.*;
 import net.minecraft.registry.entry.RegistryEntry.Reference;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-
-import java.util.stream.Collectors;
-
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,7 +49,7 @@ public class CustomArmorTrims {
 	private static void initializeTrimCache() {
 		ClientPlayerEntity player = MinecraftClient.getInstance().player;
 		FabricLoader loader = FabricLoader.getInstance();
-		if (trimsInitialized || (player == null && !loader.isDevelopmentEnvironment())) {
+		if (trimsInitialized || (player == null && !Debug.debugEnabled())) {
 			return;
 		}
 		try {
@@ -76,7 +71,7 @@ public class CustomArmorTrims {
 	}
 
 	private static RegistryWrapper.WrapperLookup getWrapperLookup(FabricLoader loader, ClientPlayerEntity player) {
-		return !loader.isDevelopmentEnvironment() ? player.networkHandler.getRegistryManager() : BuiltinRegistries.createWrapperLookup();
+		return !Debug.debugEnabled() ? player.networkHandler.getRegistryManager() : BuiltinRegistries.createWrapperLookup();
 	}
 
 	private static void registerCommand(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
index 265d276a..0cffa05c 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/ItemTooltip.java
@@ -205,9 +205,11 @@ public class ItemTooltip {
             String uuid = ItemUtils.getItemUuid(stack);
             boolean hasCustomDye = SkyblockerConfigManager.get().general.customDyeColors.containsKey(uuid) || SkyblockerConfigManager.get().general.customAnimatedDyes.containsKey(uuid);
             //DyedColorComponent#getColor returns ARGB so we mask out the alpha bits
-            int dyeColor = DyedColorComponent.getColor(stack, -1) & 0x00FFFFFF; 
+            int dyeColor = DyedColorComponent.getColor(stack, 0);
 
-            if (!hasCustomDye && dyeColor != -1) {
+            // dyeColor will have alpha = 255 if it's dyed, and alpha = 0 if it's not dyed,
+            if (!hasCustomDye && dyeColor != 0) {
+                dyeColor = dyeColor & 0x00FFFFFF;
                 String colorHex = String.format("%06X", dyeColor);
                 String expectedHex = ExoticTooltip.getExpectedHex(internalID);