From 99df4cbbe2d8e189b0ed94352c61f4078287f49e Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 29 Apr 2023 11:26:01 -0400 Subject: [PATCH] Add dynamic model support to Refined Storage --- .../rs/ClientSetupMixin.java | 30 +++++++++++++++++++ src/main/resources/modernfix.mixins.json | 1 + 2 files changed, 31 insertions(+) create mode 100644 src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java new file mode 100644 index 00000000..8facb447 --- /dev/null +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java @@ -0,0 +1,30 @@ +package org.embeddedt.modernfix.mixin.perf.dynamic_resources.rs; + +import com.refinedmods.refinedstorage.render.BakedModelOverrideRegistry; +import com.refinedmods.refinedstorage.setup.ClientSetup; +import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.common.MinecraftForge; +import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +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; + +@Mixin(ClientSetup.class) +public class ClientSetupMixin { + @Shadow @Final private BakedModelOverrideRegistry bakedModelOverrideRegistry; + + @Inject(method = "", at = @At("RETURN")) + private void addDynamicListener(CallbackInfo ci) { + MinecraftForge.EVENT_BUS.addListener(this::onDynamicModelBake); + } + + private void onDynamicModelBake(DynamicModelBakeEvent event) { + BakedModelOverrideRegistry.BakedModelOverrideFactory factory = bakedModelOverrideRegistry.get(event.getLocation() instanceof ModelResourceLocation ? new ResourceLocation(event.getLocation().getNamespace(), event.getLocation().getPath()) : event.getLocation()); + if(factory != null) + event.setModel(factory.create(event.getModel(), event.getModelLoader().getBakedTopLevelModels())); + } +} diff --git a/src/main/resources/modernfix.mixins.json b/src/main/resources/modernfix.mixins.json index 71141447..99ce333d 100644 --- a/src/main/resources/modernfix.mixins.json +++ b/src/main/resources/modernfix.mixins.json @@ -95,6 +95,7 @@ "perf.dynamic_resources.ItemRendererMixin", "perf.dynamic_resources.ModelBakeryMixin", "perf.dynamic_resources.ae2.RegistrationMixin", + "perf.dynamic_resources.rs.ClientSetupMixin", "perf.dynamic_resources.ctm.TextureMetadataHandlerMixin", "perf.dynamic_resources.ctm.CTMPackReloadListenerMixin", "perf.dynamic_resources.supermartijncore.ClientRegistrationHandlerMixin",