diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 6de361d99..a47a02fe7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -37,8 +37,10 @@ public enum Mixins implements IMixins { , "angelica.MixinMinecraft_FrameHook" , "angelica.MixinMinecraftServer" , "angelica.bugfixes.MixinItemRenderer_EdgeDepth" + , "angelica.bugfixes.MixinModelWither_ArmorCentering" , "angelica.bugfixes.MixinRenderBlocks_CrossedSquaresNormal" , "angelica.bugfixes.MixinRenderGlobal_DestroyBlock" + , "angelica.bugfixes.MixinRenderWither_ArmorCentering" , "angelica.bugfixes.MixinRendererLivingEntity_EyeDepth" , "angelica.debug.MixinMinecraft_FPSCap" , "angelica.ffp.MixinTessellator_CoreProfile" diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/WitherArmorState.java b/src/main/java/com/gtnewhorizons/angelica/rendering/WitherArmorState.java new file mode 100644 index 000000000..0caed378b --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/WitherArmorState.java @@ -0,0 +1,5 @@ +package com.gtnewhorizons.angelica.rendering; + +public class WitherArmorState { + public static boolean pendingInflate = false; +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinModelWither_ArmorCentering.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinModelWither_ArmorCentering.java new file mode 100644 index 000000000..6cb35c3b3 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinModelWither_ArmorCentering.java @@ -0,0 +1,71 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica.bugfixes; + +import com.gtnewhorizons.angelica.rendering.WitherArmorState; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.model.ModelWither; +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; + +/** + * Creates a centered armor model for the Wither. + * + * Vanilla 1.7.10 uses glScalef(1.1) on the base model for the armor overlay, which + * shifts off-center and rotating parts away from their correct positions. Modern Minecraft + * (1.21+) replaced this with a separate model using CubeDeformation(0.5). + * This mixin backports that approach. + */ +@Mixin(ModelWither.class) +public class MixinModelWither_ArmorCentering { + + // Contains body segments: [0] shoulder, [1] upper body + ribs, [2] tail + @Shadow private ModelRenderer[] field_82905_a; + + // Heads: [0] center, [1] left, [2] right + @Shadow private ModelRenderer[] field_82904_b; + + private static final float ARMOR_INFLATE = 0.5F; + + // If the armor inflate flag is set, rebuild all boxes with uniform inflate. + @Inject(method = "", at = @At("TAIL")) + private void angelica$applyInflate(CallbackInfo ci) { + if (!WitherArmorState.pendingInflate) return; + WitherArmorState.pendingInflate = false; + + ModelWither self = (ModelWither) (Object) this; + + // [0] Shoulder + field_82905_a[0] = new ModelRenderer(self, 0, 16); + field_82905_a[0].addBox(-10.0F, 3.9F, -0.5F, 20, 3, 3, ARMOR_INFLATE); + + // [1] Upper body (spine + ribs things) + field_82905_a[1] = (new ModelRenderer(self)).setTextureSize(self.textureWidth, self.textureHeight); + field_82905_a[1].setRotationPoint(-2.0F, 6.9F, -0.5F); + field_82905_a[1].setTextureOffset(0, 22).addBox(0.0F, 0.0F, 0.0F, 3, 10, 3, ARMOR_INFLATE); + field_82905_a[1].setTextureOffset(24, 22).addBox(-4.0F, 1.5F, 0.5F, 11, 2, 2, ARMOR_INFLATE); + field_82905_a[1].setTextureOffset(24, 22).addBox(-4.0F, 4.0F, 0.5F, 11, 2, 2, ARMOR_INFLATE); + field_82905_a[1].setTextureOffset(24, 22).addBox(-4.0F, 6.5F, 0.5F, 11, 2, 2, ARMOR_INFLATE); + + // [2] Tail + field_82905_a[2] = new ModelRenderer(self, 12, 22); + field_82905_a[2].addBox(0.0F, 0.0F, 0.0F, 3, 6, 3, ARMOR_INFLATE); + + // [0] Center head + field_82904_b[0] = new ModelRenderer(self, 0, 0); + field_82904_b[0].addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, ARMOR_INFLATE); + + // [1] Left head + field_82904_b[1] = new ModelRenderer(self, 32, 0); + field_82904_b[1].addBox(-4.0F, -4.0F, -4.0F, 6, 6, 6, ARMOR_INFLATE); + field_82904_b[1].rotationPointX = -8.0F; + field_82904_b[1].rotationPointY = 4.0F; + + // [2] Right head + field_82904_b[2] = new ModelRenderer(self, 32, 0); + field_82904_b[2].addBox(-4.0F, -4.0F, -4.0F, 6, 6, 6, ARMOR_INFLATE); + field_82904_b[2].rotationPointX = 10.0F; + field_82904_b[2].rotationPointY = 4.0F; + } +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderWither_ArmorCentering.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderWither_ArmorCentering.java new file mode 100644 index 000000000..7d56e13ab --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/bugfixes/MixinRenderWither_ArmorCentering.java @@ -0,0 +1,58 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica.bugfixes; + +import com.gtnewhorizons.angelica.rendering.WitherArmorState; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelWither; +import net.minecraft.client.renderer.entity.RenderWither; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Redirect; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * Replaces the Wither's glScalef(1.1) armor approach with a per-box inflated model. + * This fixes the armor being visually off-center on off-center and rotating parts. + * Not exactly mod friendly but we can figure that out later. + */ +@Mixin(RenderWither.class) +public class MixinRenderWither_ArmorCentering { + + @Unique + private ModelWither angelica$armorModel; + + @Inject(method = "", at = @At("TAIL")) + private void angelica$createArmorModel(CallbackInfo ci) { + WitherArmorState.pendingInflate = true; + angelica$armorModel = new ModelWither(); + } + + // Use the inflated armor model instead of mainModel. + @Redirect( + method = "shouldRenderPass(Lnet/minecraft/entity/boss/EntityWither;IF)I", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/client/renderer/entity/RenderWither;setRenderPassModel(Lnet/minecraft/client/model/ModelBase;)V") + ) + private void angelica$useInflatedModel(RenderWither instance, ModelBase model) { + ((RenderWither) (Object) this).setRenderPassModel(angelica$armorModel); + } + + // No-op glTranslatef + @Redirect( + method = "shouldRenderPass(Lnet/minecraft/entity/boss/EntityWither;IF)I", + at = @At(value = "INVOKE", + target = "Lorg/lwjgl/opengl/GL11;glTranslatef(FFF)V", ordinal = 1, remap = false) + ) + private void angelica$skipTranslate(float x, float y, float z) { + } + + // No-op glScalef + @Redirect( + method = "shouldRenderPass(Lnet/minecraft/entity/boss/EntityWither;IF)I", + at = @At(value = "INVOKE", + target = "Lorg/lwjgl/opengl/GL11;glScalef(FFF)V", remap = false) + ) + private void angelica$skipScale(float x, float y, float z) { + } +}