From 5b1e596cca48297da4395078dc9a170ec9a5122e Mon Sep 17 00:00:00 2001 From: FirstMegaGame4 <84094287+FirstMegaGame4@users.noreply.github.com> Date: Thu, 25 Apr 2024 23:52:58 +0200 Subject: [PATCH] Change InventoryModels --- .../library/client/render/model/InventoryModels.java | 2 +- .../mmodding_lib/mixin/injectors/client/ItemRendererMixin.java | 3 --- .../mmodding_lib/mixin/injectors/client/ModelLoaderMixin.java | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/mmodding/mmodding_lib/library/client/render/model/InventoryModels.java b/src/main/java/com/mmodding/mmodding_lib/library/client/render/model/InventoryModels.java index 19fedf9..46669b8 100644 --- a/src/main/java/com/mmodding/mmodding_lib/library/client/render/model/InventoryModels.java +++ b/src/main/java/com/mmodding/mmodding_lib/library/client/render/model/InventoryModels.java @@ -10,7 +10,7 @@ @FunctionalInterface public interface InventoryModels { - Set MODDED_HANDHELD_MODELS = new HashSet<>(); + Set REGISTRY = new HashSet<>(); Event EVENT = Event.create(InventoryModels.class, callbacks -> stack -> { for (InventoryModels callback : callbacks) { diff --git a/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/client/ItemRendererMixin.java b/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/client/ItemRendererMixin.java index 30c899f..23d74e1 100644 --- a/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/client/ItemRendererMixin.java +++ b/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/client/ItemRendererMixin.java @@ -14,11 +14,8 @@ import net.minecraft.client.render.item.ItemModels; import net.minecraft.client.render.item.ItemRenderer; import net.minecraft.client.render.model.BakedModel; -import net.minecraft.client.render.model.json.ModelOverrideList; import net.minecraft.client.render.model.json.ModelTransformation; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/client/ModelLoaderMixin.java b/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/client/ModelLoaderMixin.java index 5c9507d..2c27b91 100644 --- a/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/client/ModelLoaderMixin.java +++ b/src/main/java/com/mmodding/mmodding_lib/mixin/injectors/client/ModelLoaderMixin.java @@ -33,7 +33,7 @@ public abstract class ModelLoaderMixin { @Inject(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/model/ModelLoader;addModel(Lnet/minecraft/client/util/ModelIdentifier;)V", shift = At.Shift.AFTER, ordinal = 1)) private void appendModdedModels(ResourceManager resourceManager, BlockColors blockColors, Profiler profiler, int i, CallbackInfo ci) { - InventoryModels.MODDED_HANDHELD_MODELS.forEach(this::mmodding_lib$addModdedModel); + InventoryModels.REGISTRY.forEach(this::mmodding_lib$addModdedModel); } @Unique