Epic Armor Customization GUI

src/main/java/de/hysky/skyblocker/config/SkyblockerConfigManager.java

@@ -30,7 +30,7 @@
 import org.apache.commons.lang3.function.Consumers;
 
 public class SkyblockerConfigManager {
-    public static final int CONFIG_VERSION = 3;
+    public static final int CONFIG_VERSION = 4;
     private static final Path CONFIG_FILE = FabricLoader.getInstance().getConfigDir().resolve("skyblocker.json");
     private static final ConfigClassHandler<SkyblockerConfig> HANDLER = ConfigClassHandler.createBuilder(SkyblockerConfig.class)
             .serializer(config -> GsonConfigSerializerBuilder.create(config)

src/main/java/de/hysky/skyblocker/config/configs/GeneralConfig.java

@@ -1,8 +1,8 @@
 package de.hysky.skyblocker.config.configs;
 
 import de.hysky.skyblocker.SkyblockerMod;
-import de.hysky.skyblocker.skyblock.item.CustomArmorAnimatedDyes;
-import de.hysky.skyblocker.skyblock.item.CustomArmorTrims;
+import de.hysky.skyblocker.skyblock.item.custom.CustomArmorAnimatedDyes;
+import de.hysky.skyblocker.skyblock.item.custom.CustomArmorTrims;
 import de.hysky.skyblocker.skyblock.item.slottext.SlotTextMode;
 import dev.isxander.yacl3.config.v2.api.SerialEntry;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;

src/main/java/de/hysky/skyblocker/config/datafixer/ConfigDataFixer.java

@@ -68,6 +68,8 @@ private static DataFixer build() {
 		builder.addFixer(new ConfigFix1(schema2, true));
 		Schema schema3 = builder.addSchema(3, Schema::new);
 		builder.addFixer(new ConfigFix2QuickNav(schema3, true));
+		Schema schema4 = builder.addSchema(4, Schema::new);
+		builder.addFixer(new ConfigFix3AnimatedDyeAndItemBackground(schema4, true));
 
 		return builder.build().fixer();
 	}

src/main/java/de/hysky/skyblocker/config/datafixer/ConfigFix3AnimatedDyeAndItemBackground.java

@@ -0,0 +1,54 @@
+package de.hysky.skyblocker.config.datafixer;
+
+import com.mojang.datafixers.DSL;
+import com.mojang.datafixers.TypeRewriteRule;
+import com.mojang.datafixers.schemas.Schema;
+import com.mojang.serialization.Dynamic;
+import net.minecraft.util.math.ColorHelper;
+
+import java.util.stream.Stream;
+
+public class ConfigFix3AnimatedDyeAndItemBackground extends ConfigDataFix {
+	public ConfigFix3AnimatedDyeAndItemBackground(Schema outputSchema, boolean changesType) {
+		super(outputSchema, changesType);
+	}
+
+	@Override
+	protected TypeRewriteRule makeRule() {
+		return fixTypeEverywhereTyped(
+				"ConfigFix3AnimatedDyeAndItemBackground",
+				getInputSchema().getType(ConfigDataFixer.CONFIG_TYPE),
+				typed -> typed.update(DSL.remainderFinder(), this::fix)
+		);
+	}
+
+	private <T> Dynamic<T> fix(Dynamic<T> dynamic) {
+		return fixVersion(dynamic).update("general", general -> general
+				.update("customAnimatedDyes", customAnimatedDyes -> customAnimatedDyes
+						.updateMapValues(customAnimatedDye -> customAnimatedDye.mapSecond(this::fixCustomAnimatedDye))
+				)
+				.update("itemInfoDisplay", itemInfoDisplay -> itemInfoDisplay
+						.renameField("itemRarityBackgroundStyle", "itemBackgroundStyle")
+						.renameField("itemRarityBackgroundsOpacity", "itemBackgroundOpacity")
+				)
+		);
+	}
+
+	private <T> Dynamic<T> fixCustomAnimatedDye(Dynamic<T> customAnimatedDye) {
+		return customAnimatedDye
+				.set("keyframes", customAnimatedDye.createList(Stream.of(
+						customAnimatedDye.emptyMap()
+								.set("color", customAnimatedDye.createInt(ColorHelper.fullAlpha(customAnimatedDye.get("color1").asInt(0))))
+								.set("time", customAnimatedDye.createFloat(0)),
+						customAnimatedDye.emptyMap()
+								.set("color", customAnimatedDye.createInt(ColorHelper.fullAlpha(customAnimatedDye.get("color2").asInt(0))))
+								.set("time", customAnimatedDye.createFloat(1))
+				)))
+				.remove("color1")
+				.remove("color2")
+				// Samples is how many steps the animation has, and tickDelay is how long each step takes in ticks.
+				.set("duration", customAnimatedDye.createFloat(customAnimatedDye.get("samples").asInt(20) * customAnimatedDye.get("tickDelay").asInt(1) / 20f))
+				.remove("samples")
+				.remove("tickDelay");
+	}
+}

src/main/java/de/hysky/skyblocker/debug/Debug.java

@@ -10,7 +10,7 @@
 import de.hysky.skyblocker.skyblock.events.EventNotifications;
 import de.hysky.skyblocker.utils.Constants;
 import de.hysky.skyblocker.utils.ItemUtils;
-import de.hysky.skyblocker.utils.datafixer.ItemStackComponentizationFixer;
+import de.hysky.skyblocker.utils.Utils;
 import de.hysky.skyblocker.utils.networth.NetworthCalculator;
 import net.azureaaron.networth.Calculation;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
@@ -150,7 +150,7 @@ public enum DumpFormat {
 		JSON {
 			@Override
 			public Text format(ItemStack stack) {
-				return Text.literal(SkyblockerMod.GSON_COMPACT.toJson(ItemUtils.EMPTY_ALLOWING_ITEMSTACK_CODEC.encodeStart(ItemStackComponentizationFixer.getRegistryLookup().getOps(JsonOps.INSTANCE), stack).getOrThrow()));
+				return Text.literal(SkyblockerMod.GSON_COMPACT.toJson(ItemUtils.EMPTY_ALLOWING_ITEMSTACK_CODEC.encodeStart(Utils.getRegistryWrapperLookup().getOps(JsonOps.INSTANCE), stack).getOrThrow()));
 			}
 		},
 		SNBT {

src/main/java/de/hysky/skyblocker/mixins/ComponentHolderMixin.java

@@ -6,7 +6,7 @@
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.skyblock.item.CustomArmorTrims;
+import de.hysky.skyblocker.skyblock.item.custom.CustomArmorTrims;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;

src/main/java/de/hysky/skyblocker/mixins/DyedColorComponentMixin.java

@@ -4,7 +4,7 @@
 import com.llamalad7.mixinextras.sugar.Local;
 
 import de.hysky.skyblocker.config.SkyblockerConfigManager;
-import de.hysky.skyblocker.skyblock.item.CustomArmorAnimatedDyes;
+import de.hysky.skyblocker.skyblock.item.custom.CustomArmorAnimatedDyes;
 import de.hysky.skyblocker.utils.ItemUtils;
 import de.hysky.skyblocker.utils.Utils;
 import net.minecraft.component.type.DyedColorComponent;

src/main/java/de/hysky/skyblocker/mixins/accessors/EntityRenderDispatcherAccessor.java

@@ -0,0 +1,12 @@
+package de.hysky.skyblocker.mixins.accessors;
+
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.equipment.EquipmentModelLoader;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(EntityRenderDispatcher.class)
+public interface EntityRenderDispatcherAccessor {
+	@Accessor
+	EquipmentModelLoader getEquipmentModelLoader();
+}

src/main/java/de/hysky/skyblocker/mixins/accessors/SpriteContentsAccessor.java

@@ -0,0 +1,12 @@
+package de.hysky.skyblocker.mixins.accessors;
+
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.SpriteContents;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(SpriteContents.class)
+public interface SpriteContentsAccessor {
+	@Accessor
+	NativeImage getImage();
+}