-
-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #238 from AzureAaron/armour-trims
Custom Armour Trims
- Loading branch information
Showing
9 changed files
with
259 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
src/main/java/me/xmrvizzy/skyblocker/mixin/ArmorTrimMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package me.xmrvizzy.skyblocker.mixin; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.ModifyReturnValue; | ||
| import com.llamalad7.mixinextras.sugar.Local; | ||
| import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; | ||
| import me.xmrvizzy.skyblocker.config.SkyblockerConfig; | ||
| import me.xmrvizzy.skyblocker.skyblock.item.CustomArmorTrims; | ||
| import me.xmrvizzy.skyblocker.utils.Utils; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.trim.ArmorTrim; | ||
| import net.minecraft.nbt.NbtCompound; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| @Mixin(ArmorTrim.class) | ||
| public class ArmorTrimMixin { | ||
|
|
||
| @ModifyReturnValue(method = "getTrim", at = @At("RETURN")) | ||
| private static Optional<ArmorTrim> skyblocker$customArmorTrims(@SuppressWarnings("OptionalUsedAsFieldOrParameterType") Optional<ArmorTrim> original, @Local ItemStack stack) { | ||
| NbtCompound nbt = stack.getNbt(); | ||
|
|
||
| if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes")) { | ||
| Object2ObjectOpenHashMap<String, CustomArmorTrims.ArmorTrimId> customTrims = SkyblockerConfig.get().general.customArmorTrims; | ||
| NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes"); | ||
| String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null; | ||
|
|
||
| if (customTrims.containsKey(itemUuid)) { | ||
| CustomArmorTrims.ArmorTrimId trimKey = customTrims.get(itemUuid); | ||
| return CustomArmorTrims.TRIMS_CACHE.getOrDefault(trimKey, original); | ||
| } | ||
| } | ||
|
|
||
| return original; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
147 changes: 147 additions & 0 deletions
147
src/main/java/me/xmrvizzy/skyblocker/skyblock/item/CustomArmorTrims.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| package me.xmrvizzy.skyblocker.skyblock.item; | ||
|
|
||
| import com.mojang.brigadier.Command; | ||
| import com.mojang.brigadier.CommandDispatcher; | ||
| import com.mojang.brigadier.suggestion.SuggestionProvider; | ||
| import it.unimi.dsi.fastutil.Pair; | ||
| import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; | ||
| import me.xmrvizzy.skyblocker.config.SkyblockerConfig; | ||
| import me.xmrvizzy.skyblocker.utils.SkyblockEvents; | ||
| import me.xmrvizzy.skyblocker.utils.Utils; | ||
| import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; | ||
| import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; | ||
| import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; | ||
| import net.minecraft.client.MinecraftClient; | ||
| import net.minecraft.client.network.ClientPlayerEntity; | ||
| import net.minecraft.command.CommandRegistryAccess; | ||
| import net.minecraft.command.CommandSource; | ||
| import net.minecraft.command.argument.IdentifierArgumentType; | ||
| import net.minecraft.item.ArmorItem; | ||
| import net.minecraft.item.ItemStack; | ||
| import net.minecraft.item.trim.ArmorTrim; | ||
| import net.minecraft.nbt.NbtCompound; | ||
| import net.minecraft.nbt.NbtOps; | ||
| import net.minecraft.registry.*; | ||
| import net.minecraft.text.Text; | ||
| import net.minecraft.util.Identifier; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| public class CustomArmorTrims { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(CustomArmorTrims.class); | ||
| public static final Object2ObjectOpenHashMap<ArmorTrimId, Optional<ArmorTrim>> TRIMS_CACHE = new Object2ObjectOpenHashMap<>(); | ||
| private static boolean trimsInitialized = false; | ||
|
|
||
| public static void init() { | ||
| SkyblockEvents.JOIN.register(CustomArmorTrims::initializeTrimCache); | ||
| ClientCommandRegistrationCallback.EVENT.register(CustomArmorTrims::registerCommand); | ||
| } | ||
|
|
||
| private static void initializeTrimCache() { | ||
| ClientPlayerEntity player = MinecraftClient.getInstance().player; | ||
| if (!trimsInitialized && player != null) { | ||
| TRIMS_CACHE.clear(); | ||
| DynamicRegistryManager registryManager = player.networkHandler.getRegistryManager(); | ||
| for (Identifier material : registryManager.get(RegistryKeys.TRIM_MATERIAL).getIds()) { | ||
| for (Identifier pattern : registryManager.get(RegistryKeys.TRIM_PATTERN).getIds()) { | ||
| NbtCompound compound = new NbtCompound(); | ||
| compound.putString("material", material.toString()); | ||
| compound.putString("pattern", pattern.toString()); | ||
|
|
||
| ArmorTrim trim = ArmorTrim.CODEC.parse(RegistryOps.of(NbtOps.INSTANCE, registryManager), compound).resultOrPartial(LOGGER::error).orElse(null); | ||
|
|
||
| // Something went terribly wrong | ||
| if (trim == null) throw new IllegalStateException("Trim shouldn't be null! [" + "\"" + material + "\",\"" + pattern + "\"]"); | ||
|
|
||
| TRIMS_CACHE.put(new ArmorTrimId(material, pattern), Optional.of(trim)); | ||
| } | ||
| } | ||
|
|
||
| LOGGER.info("[Skyblocker] Successfully cached all armor trims!"); | ||
| trimsInitialized = true; | ||
| } | ||
| } | ||
|
|
||
| private static void registerCommand(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) { | ||
| dispatcher.register(ClientCommandManager.literal("skyblocker") | ||
| .then(ClientCommandManager.literal("custom") | ||
| .then(ClientCommandManager.literal("armorTrim") | ||
| .executes(context -> customizeTrim(context.getSource(), null, null)) | ||
| .then(ClientCommandManager.argument("material", IdentifierArgumentType.identifier()) | ||
| .suggests(getIdSuggestionProvider(RegistryKeys.TRIM_MATERIAL)) | ||
| .executes(context -> customizeTrim(context.getSource(), context.getArgument("material", Identifier.class), null)) | ||
| .then(ClientCommandManager.argument("pattern", IdentifierArgumentType.identifier()) | ||
| .suggests(getIdSuggestionProvider(RegistryKeys.TRIM_PATTERN)) | ||
| .executes(context -> customizeTrim(context.getSource(), context.getArgument("material", Identifier.class), context.getArgument("pattern", Identifier.class)))))))); | ||
| } | ||
|
|
||
| @NotNull | ||
| private static SuggestionProvider<FabricClientCommandSource> getIdSuggestionProvider(RegistryKey<? extends Registry<?>> registryKey) { | ||
| return (context, builder) -> context.getSource().listIdSuggestions(registryKey, CommandSource.SuggestedIdType.ELEMENTS, builder, context); | ||
| } | ||
|
|
||
| @SuppressWarnings("SameReturnValue") | ||
| private static int customizeTrim(FabricClientCommandSource source, Identifier material, Identifier pattern) { | ||
| ItemStack heldItem = source.getPlayer().getMainHandStack(); | ||
| NbtCompound nbt = (heldItem != null) ? heldItem.getNbt() : null; | ||
|
|
||
| if (Utils.isOnSkyblock() && heldItem != null) { | ||
| if (heldItem.getItem() instanceof ArmorItem) { | ||
| if (nbt != null && nbt.contains("ExtraAttributes")) { | ||
| NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes"); | ||
| String itemUuid = extraAttributes.contains("uuid") ? extraAttributes.getString("uuid") : null; | ||
|
|
||
| if (itemUuid != null) { | ||
| Object2ObjectOpenHashMap<String, ArmorTrimId> customArmorTrims = SkyblockerConfig.get().general.customArmorTrims; | ||
|
|
||
| if (material == null && pattern == null) { | ||
| if (customArmorTrims.containsKey(itemUuid)) { | ||
| customArmorTrims.remove(itemUuid); | ||
| SkyblockerConfig.save(); | ||
| source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.removed")); | ||
| } else { | ||
| source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.neverHad")); | ||
| } | ||
| } else { | ||
| // Ensure that the material & trim are valid | ||
| ArmorTrimId trimId = new ArmorTrimId(material, pattern); | ||
| if (TRIMS_CACHE.get(trimId) == null) { | ||
| source.sendError(Text.translatable("skyblocker.customArmorTrims.invalidMaterialOrPattern")); | ||
|
|
||
| return Command.SINGLE_SUCCESS; | ||
| } | ||
|
|
||
| customArmorTrims.put(itemUuid, trimId); | ||
| SkyblockerConfig.save(); | ||
| source.sendFeedback(Text.translatable("skyblocker.customArmorTrims.added")); | ||
| } | ||
| } else { | ||
| source.sendError(Text.translatable("skyblocker.customArmorTrims.noItemUuid")); | ||
| } | ||
| } | ||
| } else { | ||
| source.sendError(Text.translatable("skyblocker.customArmorTrims.notAnArmorPiece")); | ||
| return Command.SINGLE_SUCCESS; | ||
| } | ||
| } else { | ||
| source.sendError(Text.translatable("skyblocker.customArmorTrims.unableToSetTrim")); | ||
| } | ||
|
|
||
| return Command.SINGLE_SUCCESS; | ||
| } | ||
|
|
||
| public record ArmorTrimId(Identifier material, Identifier pattern) implements Pair<Identifier, Identifier> { | ||
| @Override | ||
| public Identifier left() { | ||
| return material(); | ||
| } | ||
|
|
||
| @Override | ||
| public Identifier right() { | ||
| return pattern(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.