From cef4519f9d816d61d91337853f32fd35dce75fee Mon Sep 17 00:00:00 2001 From: WenXin2 Date: Sun, 29 Dec 2024 14:40:59 -0600 Subject: [PATCH] Fix geckolib mob scaling --- .../marioverse/mixin/GeoEntityRendererMixin.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/wenxin2/marioverse/mixin/GeoEntityRendererMixin.java b/src/main/java/com/wenxin2/marioverse/mixin/GeoEntityRendererMixin.java index 256e7bcd..4ccee81a 100644 --- a/src/main/java/com/wenxin2/marioverse/mixin/GeoEntityRendererMixin.java +++ b/src/main/java/com/wenxin2/marioverse/mixin/GeoEntityRendererMixin.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.wenxin2.marioverse.init.AttributesRegistry; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeMap; import org.jetbrains.annotations.Nullable; @@ -17,13 +17,9 @@ import software.bernie.geckolib.renderer.GeoEntityRenderer; @Mixin(GeoEntityRenderer.class) -public abstract class GeoEntityRendererMixin { - @Inject(method = "actuallyRender(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/entity/Entity;" + - "Lsoftware/bernie/geckolib/cache/object/BakedGeoModel;Lnet/minecraft/client/renderer/RenderType;" + - "Lnet/minecraft/client/renderer/MultiBufferSource;Lcom/mojang/blaze3d/vertex/VertexConsumer;ZFIII)V", at = @At(value = "HEAD")) - public void modifyScale(PoseStack poseStack, GeoAnimatable animatable, BakedGeoModel model, @Nullable RenderType renderType, - MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, boolean isReRender, - float partialTick, int packedLight, int packedOverlay, int colour, CallbackInfo ci) { +public abstract class GeoEntityRendererMixin { + @Inject(method = "preRender(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/world/entity/Entity;Lsoftware/bernie/geckolib/cache/object/BakedGeoModel;Lnet/minecraft/client/renderer/MultiBufferSource;Lcom/mojang/blaze3d/vertex/VertexConsumer;ZFIII)V", at = @At(value = "HEAD")) + public void modifyScale(PoseStack poseStack, T animatable, BakedGeoModel model, @Nullable MultiBufferSource bufferSource, @Nullable VertexConsumer buffer, boolean isReRender, float partialTick, int packedLight, int packedOverlay, int colour, CallbackInfo ci) { if (animatable instanceof LivingEntity livingEntity) { AttributeMap attributemap = livingEntity.getAttributes(); float heightScale = (float) attributemap.getValue(AttributesRegistry.HEIGHT_SCALE);