Fix entity illustration rendering

Ladysnake · May 20, 2024 · fe2f55c · fe2f55c
1 parent f18b907
commit fe2f55c
Showing 1 changed file with 64 additions and 2 deletions.
diff --git a/...ient/java/org/ladysnake/blabber/impl/client/illustrations/EntityIllustrationRenderer.java b/...ient/java/org/ladysnake/blabber/impl/client/illustrations/EntityIllustrationRenderer.java
@@ -17,15 +17,19 @@
  */
 package org.ladysnake.blabber.impl.client.illustrations;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.ingame.InventoryScreen;
+import net.minecraft.client.render.DiffuseLighting;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
 import org.ladysnake.blabber.api.client.illustration.DialogueIllustrationRenderer;
 import org.ladysnake.blabber.impl.common.illustrations.PositionTransform;
 import org.ladysnake.blabber.impl.common.illustrations.entity.DialogueIllustrationEntity;
@@ -58,12 +62,70 @@ public void render(DrawContext context, TextRenderer textRenderer, PositionTrans
         int fakedMouseX = stareTarget.x().isPresent() ? stareTarget.anchor().isPresent() ? positionTransform.transformX(stareTarget.anchor().get(), stareTarget.x().getAsInt()) : stareTarget.x().getAsInt() + (x1 + x2) / 2 : mouseX;
         int fakedMouseY = stareTarget.y().isPresent() ? stareTarget.anchor().isPresent() ? positionTransform.transformY(stareTarget.anchor().get(), stareTarget.y().getAsInt()) : stareTarget.y().getAsInt() + (y1 + y2) / 2 : mouseY;
 
-        InventoryScreen.drawEntity(context,
+        drawEntity(context,
                 x1,
                 y1,
+                x2,
+                y2,
                 illustration.entitySize(),
+                illustration.yOffset(),
                 fakedMouseX,
                 fakedMouseY,
                 e);
     }
+
+    // Copy-pasted from MC 1.20.4 InventoryScreen#drawEntity
+    public static void drawEntity(DrawContext context, int x1, int y1, int x2, int y2, int size, float f, float mouseX, float mouseY, LivingEntity entity) {
+        float g = (float)(x1 + x2) / 2.0F;
+        float h = (float)(y1 + y2) / 2.0F;
+        context.enableScissor(x1, y1, x2, y2);
+        float i = (float)Math.atan((double)((g - mouseX) / 40.0F));
+        float j = (float)Math.atan((double)((h - mouseY) / 40.0F));
+        Quaternionf quaternionf = (new Quaternionf()).rotateZ(3.1415927F);
+        Quaternionf quaternionf2 = (new Quaternionf()).rotateX(j * 20.0F * 0.017453292F);
+        quaternionf.mul(quaternionf2);
+        float k = entity.bodyYaw;
+        float l = entity.getYaw();
+        float m = entity.getPitch();
+        float n = entity.prevHeadYaw;
+        float o = entity.headYaw;
+        entity.bodyYaw = 180.0F + i * 20.0F;
+        entity.setYaw(180.0F + i * 40.0F);
+        entity.setPitch(-j * 20.0F);
+        entity.headYaw = entity.getYaw();
+        entity.prevHeadYaw = entity.getYaw();
+        float p = 1;
+        Vector3f vector3f = new Vector3f(0.0F, entity.getHeight() / 2.0F + f * p, 0.0F);
+        float q = (float)size / p;
+        drawEntity(context, g, h, q, vector3f, quaternionf, quaternionf2, entity);
+        entity.bodyYaw = k;
+        entity.setYaw(l);
+        entity.setPitch(m);
+        entity.prevHeadYaw = n;
+        entity.headYaw = o;
+        context.disableScissor();
+    }
+
+    public static void drawEntity(DrawContext context, float x, float y, float size, Vector3f vector3f, Quaternionf quaternionf, @Nullable Quaternionf quaternionf2, LivingEntity entity) {
+        context.getMatrices().push();
+        context.getMatrices().translate((double)x, (double)y, 50.0);
+        context.getMatrices().scale(size, size, -size);
+        context.getMatrices().translate(vector3f.x, vector3f.y, vector3f.z);
+        context.getMatrices().multiply(quaternionf);
+        DiffuseLighting.method_34742();
+        EntityRenderDispatcher entityRenderDispatcher = MinecraftClient.getInstance().getEntityRenderDispatcher();
+        if (quaternionf2 != null) {
+            quaternionf2.conjugate();
+            entityRenderDispatcher.setRotation(quaternionf2);
+        }
+
+        entityRenderDispatcher.setRenderShadows(false);
+        RenderSystem.runAsFancy(() -> {
+            entityRenderDispatcher.render(entity, 0.0, 0.0, 0.0, 0.0F, 1.0F, context.getMatrices(), context.getVertexConsumers(), 15728880);
+        });
+        context.draw();
+        entityRenderDispatcher.setRenderShadows(true);
+        context.getMatrices().pop();
+        DiffuseLighting.enableGuiDepthLighting();
+    }
 }