Adjust mixin for 1.18

This commit is contained in:
embeddedt 2023-04-29 11:36:59 -04:00
parent 50f0723fb8
commit 4006551afe
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -15,15 +15,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ClientSetup.class) @Mixin(ClientSetup.class)
public class ClientSetupMixin { public class ClientSetupMixin {
@Shadow @Final private BakedModelOverrideRegistry bakedModelOverrideRegistry; @Shadow @Final private static BakedModelOverrideRegistry BAKED_MODEL_OVERRIDE_REGISTRY;
@Inject(method = "<init>", at = @At("RETURN")) @Inject(method = "onClientSetup", at = @At("RETURN"), remap = false)
private void addDynamicListener(CallbackInfo ci) { private static void addDynamicListener(CallbackInfo ci) {
MinecraftForge.EVENT_BUS.addListener(this::onDynamicModelBake); MinecraftForge.EVENT_BUS.addListener(ClientSetupMixin::onDynamicModelBake);
} }
private void onDynamicModelBake(DynamicModelBakeEvent event) { private static void onDynamicModelBake(DynamicModelBakeEvent event) {
BakedModelOverrideRegistry.BakedModelOverrideFactory factory = bakedModelOverrideRegistry.get(event.getLocation() instanceof ModelResourceLocation ? new ResourceLocation(event.getLocation().getNamespace(), event.getLocation().getPath()) : event.getLocation()); BakedModelOverrideRegistry.BakedModelOverrideFactory factory = BAKED_MODEL_OVERRIDE_REGISTRY.get(event.getLocation() instanceof ModelResourceLocation ? new ResourceLocation(event.getLocation().getNamespace(), event.getLocation().getPath()) : event.getLocation());
if(factory != null) if(factory != null)
event.setModel(factory.create(event.getModel(), event.getModelLoader().getBakedTopLevelModels())); event.setModel(factory.create(event.getModel(), event.getModelLoader().getBakedTopLevelModels()));
} }