From 388929cc0ce2df4279d2ed61bc92f2f169840802 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 27 Jan 2024 16:17:06 -0800 Subject: [PATCH] Fewer Allocations (#243) --- .../gtnewhorizons/angelica/mixins/Mixins.java | 1 + .../MixinRendererLivingEntity.java | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/optimizations/MixinRendererLivingEntity.java diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index e586c2c25..55e36c496 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -27,6 +27,7 @@ public enum Mixins { "angelica.MixinActiveRenderInfo" ,"angelica.MixinEntityRenderer" ,"angelica.MixinMinecraft" + ,"angelica.optimizations.MixinRendererLivingEntity" ) ), ANGELICA_VBO( diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/optimizations/MixinRendererLivingEntity.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/optimizations/MixinRendererLivingEntity.java new file mode 100644 index 000000000..b6a29f008 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/angelica/optimizations/MixinRendererLivingEntity.java @@ -0,0 +1,49 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica.optimizations; + +import com.gtnewhorizons.angelica.glsm.GLStateManager; +import net.minecraft.client.renderer.entity.RendererLivingEntity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MathHelper; +import org.lwjgl.opengl.GL11; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; +import org.spongepowered.asm.mixin.Shadow; + +@Mixin(RendererLivingEntity.class) +public abstract class MixinRendererLivingEntity { + + @Shadow protected abstract float getDeathMaxRotation(EntityLivingBase entity); + + /** + * @author mitchej123 + * @reason The vanilla method triggers way too many allocations for no good reason + */ + @Overwrite + protected void rotateCorpse(EntityLivingBase entity, float p_77043_2_, float p_77043_3_, float partialTicks) { + GLStateManager.glRotatef(180.0F - p_77043_3_, 0.0F, 1.0F, 0.0F); + + if (entity.deathTime > 0) { + float f3 = ((float)entity.deathTime + partialTicks - 1.0F) / 20.0F * 1.6F; + f3 = MathHelper.sqrt_float(f3); + + if (f3 > 1.0F) { + f3 = 1.0F; + } + + GL11.glRotatef(f3 * this.getDeathMaxRotation(entity), 0.0F, 0.0F, 1.0F); + } + else if ((entity instanceof EntityLiving entityLiving) && entityLiving.hasCustomNameTag() || (entity instanceof EntityPlayer entityPlayer) && !entityPlayer.getHideCape()) { + + final String s = EnumChatFormatting.getTextWithoutFormattingCodes(entity.getCommandSenderName()); + + if ((s.equals("Dinnerbone") || s.equals("Grumm"))) { + GLStateManager.glTranslatef(0.0F, entity.height + 0.1F, 0.0F); + GLStateManager.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + } + } + } + +}