From 0aacb6b965852647fde85045882b6aa6cf58c287 Mon Sep 17 00:00:00 2001 From: nea Date: Tue, 25 Jul 2023 17:34:07 +0200 Subject: Add custom texture pack support --- .../moe/nea/firmament/mixins/MixinItemModels.java | 27 +++++++++++++ .../moe/nea/firmament/mixins/MixinModelLoader.java | 44 ++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 src/main/java/moe/nea/firmament/mixins/MixinItemModels.java create mode 100644 src/main/java/moe/nea/firmament/mixins/MixinModelLoader.java (limited to 'src/main/java/moe/nea/firmament') diff --git a/src/main/java/moe/nea/firmament/mixins/MixinItemModels.java b/src/main/java/moe/nea/firmament/mixins/MixinItemModels.java new file mode 100644 index 0000000..2c2cc31 --- /dev/null +++ b/src/main/java/moe/nea/firmament/mixins/MixinItemModels.java @@ -0,0 +1,27 @@ +package moe.nea.firmament.mixins; + +import moe.nea.firmament.events.CustomItemModelEvent; +import net.minecraft.client.render.item.ItemModels; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.BakedModelManager; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(ItemModels.class) +public class MixinItemModels { + @Shadow + @Final + private BakedModelManager modelManager; + + @Inject(method = "getModel(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/client/render/model/BakedModel;", at = @At("HEAD"), cancellable = true) + public void onGetModel(ItemStack stack, CallbackInfoReturnable cir) { + var model = CustomItemModelEvent.getModel(stack, modelManager); + if (model != null) + cir.setReturnValue(model); + } +} diff --git a/src/main/java/moe/nea/firmament/mixins/MixinModelLoader.java b/src/main/java/moe/nea/firmament/mixins/MixinModelLoader.java new file mode 100644 index 0000000..8d43083 --- /dev/null +++ b/src/main/java/moe/nea/firmament/mixins/MixinModelLoader.java @@ -0,0 +1,44 @@ +package moe.nea.firmament.mixins; + +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.model.ModelLoader; +import net.minecraft.client.render.model.UnbakedModel; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.util.ModelIdentifier; +import net.minecraft.client.util.SpriteIdentifier; +import net.minecraft.resource.Resource; +import net.minecraft.util.Identifier; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.Map; +import java.util.function.BiFunction; + +@Mixin(ModelLoader.class) +public abstract class MixinModelLoader { + + @Shadow + protected abstract void addModel(ModelIdentifier modelId); + + @Shadow + @Final + private Map modelsToBake; + + @Shadow + public abstract UnbakedModel getOrLoadModel(Identifier id); + + @Inject(method = "bake", at = @At("HEAD")) + public void onBake(BiFunction spriteLoader, CallbackInfo ci) { + Map resources = + MinecraftClient.getInstance().getResourceManager().findResources("models/item", it -> "firmskyblock".equals(it.getNamespace()) && it.getPath().endsWith(".json")); + for (Identifier identifier : resources.keySet()) { + ModelIdentifier modelId = new ModelIdentifier("firmskyblock", identifier.getPath().substring("models/item/".length(), identifier.getPath().length() - ".json".length()), "inventory"); + addModel(modelId); + } + modelsToBake.values().forEach(model -> model.setParents(this::getOrLoadModel)); + } +} -- cgit