From ad9a6272c2cdd1364b7abbb8a382302284cffcc1 Mon Sep 17 00:00:00 2001
From: PepperBell <44146161+PepperCode1@users.noreply.github.com>
Date: Sun, 7 Nov 2021 10:31:19 -0800
Subject: [PATCH] Fully fix GuiGameElements

- Replace all GUI y-flip scalings to not scale normals
- Rotate CustomLightingSettings along XN instead of XP
- Apply custom lighting to all fluids in JEI scenes
- Fix fluid rendering: fix normals, normal scaling, and color
---
 .../compat/jei/category/FanBlastingCategory.java   |  2 ++
 .../compat/jei/category/FanWashingCategory.java    |  2 ++
 .../jei/category/animations/AnimatedItemDrain.java |  4 +++-
 .../jei/category/animations/AnimatedSpout.java     | 10 ++++++++--
 .../create/foundation/fluid/FluidRenderer.java     | 10 +++++-----
 .../foundation/gui/CustomLightingSettings.java     |  4 ++--
 .../create/foundation/gui/GuiGameElement.java      | 14 +++++---------
 .../create/foundation/gui/UIRenderHelper.java      |  4 ++++
 .../create/foundation/ponder/PonderScene.java      |  4 +++-
 .../create/foundation/ponder/PonderUI.java         |  2 +-
 10 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/simibubi/create/compat/jei/category/FanBlastingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/FanBlastingCategory.java
index f60ca5c69..8b2d959f9 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/FanBlastingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/FanBlastingCategory.java
@@ -2,6 +2,7 @@ package com.simibubi.create.compat.jei.category;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics;
 import com.simibubi.create.foundation.gui.GuiGameElement;
 
 import net.minecraft.world.item.Items;
@@ -26,6 +27,7 @@ public class FanBlastingCategory extends ProcessingViaFanCategory<AbstractCookin
 		GuiGameElement.of(Fluids.LAVA)
 			.scale(24)
 			.atLocal(0, 0, 2)
+			.lighting(AnimatedKinetics.DEFAULT_LIGHTING)
 			.render(matrixStack);
 
 		matrixStack.popPose();
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java
index 775e40186..cde5cece7 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/FanWashingCategory.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.simibubi.create.AllItems;
+import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics;
 import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe;
 import com.simibubi.create.content.contraptions.processing.ProcessingOutput;
 import com.simibubi.create.foundation.gui.AllGuiTextures;
@@ -91,6 +92,7 @@ public class FanWashingCategory extends ProcessingViaFanCategory<SplashingRecipe
 		GuiGameElement.of(Fluids.WATER)
 				.scale(24)
 				.atLocal(0, 0, 2)
+				.lighting(AnimatedKinetics.DEFAULT_LIGHTING)
 				.render(matrixStack);
 
 		matrixStack.popPose();
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java
index d6bde42d1..6c9356f98 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java
@@ -5,6 +5,7 @@ import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.fluid.FluidRenderer;
+import com.simibubi.create.foundation.gui.UIRenderHelper;
 
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -35,7 +36,8 @@ public class AnimatedItemDrain extends AnimatedKinetics {
 		BufferSource buffer = MultiBufferSource.immediate(Tesselator.getInstance()
 			.getBuilder());
 		PoseStack ms = new PoseStack();
-		ms.scale(scale, -scale, scale);
+		UIRenderHelper.flipForGuiRender(ms);
+		ms.scale(scale, scale, scale);
 		float from = 2/16f;
 		float to = 1f - from;
 		FluidRenderer.renderTiledFluidBB(fluid, from, from, from, to, 3/4f, to, buffer, ms, LightTexture.FULL_BRIGHT, false);
diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java
index d63059004..2e19f9068 100644
--- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java
+++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java
@@ -2,12 +2,14 @@ package com.simibubi.create.compat.jei.category.animations;
 
 import java.util.List;
 
+import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.math.Vector3f;
 import com.simibubi.create.AllBlockPartials;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.foundation.fluid.FluidRenderer;
+import com.simibubi.create.foundation.gui.UIRenderHelper;
 import com.simibubi.create.foundation.utility.AnimationTickHolder;
 
 import net.minecraft.client.renderer.LightTexture;
@@ -63,10 +65,12 @@ public class AnimatedSpout extends AnimatedKinetics {
 			.scale(scale)
 			.render(matrixStack);
 
+		AnimatedKinetics.DEFAULT_LIGHTING.applyLighting();
 		BufferSource buffer = MultiBufferSource.immediate(Tesselator.getInstance()
 			.getBuilder());
 		matrixStack.pushPose();
-		matrixStack.scale(16, -16, 16);
+		UIRenderHelper.flipForGuiRender(matrixStack);
+		matrixStack.scale(16, 16, 16);
 		float from = 2/16f;
 		float to = 1f - from;
 		FluidRenderer.renderTiledFluidBB(fluids.get(0), from, from, from, to, to, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false);
@@ -74,11 +78,13 @@ public class AnimatedSpout extends AnimatedKinetics {
 
 		float width = 1 / 128f * squeeze;
 		matrixStack.translate(scale / 2f, scale * 1.5f, scale / 2f);
-		matrixStack.scale(16, -16, 16);
+		UIRenderHelper.flipForGuiRender(matrixStack);
+		matrixStack.scale(16, 16, 16);
 		matrixStack.translate(-width / 2, 0, -width / 2);
 		FluidRenderer.renderTiledFluidBB(fluids.get(0), 0, -0.001f, 0, width, 2.001f, width, buffer, matrixStack, LightTexture.FULL_BRIGHT,
 			false);
 		buffer.endBatch();
+		Lighting.setupFor3DItems();
 
 		matrixStack.popPose();
 	}
diff --git a/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java b/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
index ca6073be4..b1ae88b42 100644
--- a/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
+++ b/src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java
@@ -8,7 +8,6 @@ import com.mojang.blaze3d.vertex.PoseStack.Pose;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import com.simibubi.create.foundation.render.RenderTypes;
 import com.simibubi.create.foundation.utility.AngleHelper;
-import com.simibubi.create.foundation.utility.Color;
 import com.simibubi.create.foundation.utility.Iterate;
 
 import net.minecraft.client.Minecraft;
@@ -125,15 +124,16 @@ public class FluidRenderer {
 				.isHorizontal()) {
 				ms.pushPose();
 
-				if (side.getAxisDirection() == AxisDirection.NEGATIVE)
+				if (side.getAxisDirection() == AxisDirection.NEGATIVE) {
 					msr.translate(center)
 						.rotateY(180)
 						.translateBack(center);
+					side = Direction.get(AxisDirection.POSITIVE, side.getAxis());
+				}
 
 				boolean X = side.getAxis() == Axis.X;
-				int darkColor = Color.mixColors(color, 0xff000011, 1 / 4f);
 				renderTiledHorizontalFace(X ? xMax : zMax, side, X ? zMin : xMin, yMin, X ? zMax : xMax, yMax, builder,
-					ms, light, darkColor, fluidTexture);
+					ms, light, color, fluidTexture);
 
 				ms.popPose();
 				continue;
@@ -222,7 +222,7 @@ public class FluidRenderer {
 			.uv(u, v)
 			.overlayCoords(OverlayTexture.NO_OVERLAY)
 			.uv2(light)
-			.normal(n.getX(), n.getY(), n.getZ())
+			.normal(peek.normal(), n.getX(), n.getY(), n.getZ())
 			.endVertex();
 	}
 
diff --git a/src/main/java/com/simibubi/create/foundation/gui/CustomLightingSettings.java b/src/main/java/com/simibubi/create/foundation/gui/CustomLightingSettings.java
index 7b66d7554..8f3e34e63 100644
--- a/src/main/java/com/simibubi/create/foundation/gui/CustomLightingSettings.java
+++ b/src/main/java/com/simibubi/create/foundation/gui/CustomLightingSettings.java
@@ -22,12 +22,12 @@ public class CustomLightingSettings implements ILightingSettings {
 	protected void init(float yRot1, float xRot1, float yRot2, float xRot2, boolean doubleLight) {
 		light1 = Vector3f.ZP.copy();
 		light1.transform(Vector3f.YP.rotationDegrees(yRot1));
-		light1.transform(Vector3f.XP.rotationDegrees(xRot1));
+		light1.transform(Vector3f.XN.rotationDegrees(xRot1));
 
 		if (doubleLight) {
 			light2 = Vector3f.ZP.copy();
 			light2.transform(Vector3f.YP.rotationDegrees(yRot2));
-			light2.transform(Vector3f.XP.rotationDegrees(xRot2));
+			light2.transform(Vector3f.XN.rotationDegrees(xRot2));
 		} else {
 			light2 = VecHelper.ZERO_3F;
 		}
diff --git a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java
index 3d3ac9b03..8db001422 100644
--- a/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java
+++ b/src/main/java/com/simibubi/create/foundation/gui/GuiGameElement.java
@@ -124,7 +124,7 @@ public class GuiGameElement {
 			matrixStack.translate(x, y, z);
 			matrixStack.scale((float) scale, (float) scale, (float) scale);
 			matrixStack.translate(xLocal, yLocal, zLocal);
-			matrixStack.scale(1, -1, 1);
+			UIRenderHelper.flipForGuiRender(matrixStack);
 			matrixStack.translate(rotationOffset.x, rotationOffset.y, rotationOffset.z);
 			matrixStack.mulPose(Vector3f.ZP.rotationDegrees((float) zRot));
 			matrixStack.mulPose(Vector3f.XP.rotationDegrees((float) xRot));
@@ -271,19 +271,15 @@ public class GuiGameElement {
 			matrixStack.scale(16.0F, 16.0F, 16.0F);
 			MultiBufferSource.BufferSource buffer = Minecraft.getInstance().renderBuffers().bufferSource();
 			boolean flatLighting = !bakedModel.usesBlockLight();
-			if (useDefaultLighting) {
-				if (flatLighting) {
-					Lighting.setupForFlatItems();
-				}
+			if (useDefaultLighting && flatLighting) {
+				Lighting.setupForFlatItems();
 			}
 
 			renderer.render(stack, ItemTransforms.TransformType.GUI, false, matrixStack, buffer, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, bakedModel);
 			buffer.endBatch();
 			RenderSystem.enableDepthTest();
-			if (useDefaultLighting) {
-				if (flatLighting) {
-					Lighting.setupFor3DItems();
-				}
+			if (useDefaultLighting && flatLighting) {
+				Lighting.setupFor3DItems();
 			}
 
 			matrixStack.popPose();
diff --git a/src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java b/src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java
index 7e49a0950..d8cb7a228 100644
--- a/src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java
+++ b/src/main/java/com/simibubi/create/foundation/gui/UIRenderHelper.java
@@ -249,6 +249,10 @@ public class UIRenderHelper {
 		RenderSystem.disableBlend();
 	}
 
+	public static void flipForGuiRender(PoseStack poseStack) {
+		poseStack.mulPoseMatrix(Matrix4f.createScaleMatrix(1, -1, 1));
+	}
+
 	public static class CustomRenderTarget extends RenderTarget {
 
 		public CustomRenderTarget(boolean pUseDepth) {
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
index 41cbb3e5d..f41c5147c 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderScene.java
@@ -22,6 +22,7 @@ import com.jozufozu.flywheel.util.transform.MatrixTransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Vector4f;
+import com.simibubi.create.foundation.gui.UIRenderHelper;
 import com.simibubi.create.foundation.ponder.content.PonderIndex;
 import com.simibubi.create.foundation.ponder.content.PonderTag;
 import com.simibubi.create.foundation.ponder.elements.PonderOverlayElement;
@@ -468,7 +469,8 @@ public class PonderScene {
 			float f = 30 * scaleFactor;
 
 			if (!overlayCompatible) {
-				ms.scale(f, -f, f);
+				UIRenderHelper.flipForGuiRender(ms);
+				ms.scale(f, f, f);
 				ms.translate((basePlateSize + basePlateOffsetX) / -2f, -1f + yOffset,
 					(basePlateSize + basePlateOffsetZ) / -2f);
 			} else {
diff --git a/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java b/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
index 09f327398..8ca1ac4e5 100644
--- a/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
+++ b/src/main/java/com/simibubi/create/foundation/ponder/PonderUI.java
@@ -450,7 +450,7 @@ public class PonderUI extends NavigatableSimiScreen {
 			RenderSystem.enableDepthTest();
 			ms.pushPose();
 			ms.translate(story.basePlateOffsetX, 0, story.basePlateOffsetZ);
-			ms.scale(1, -1, 1);
+			UIRenderHelper.flipForGuiRender(ms);
 
 			float flash = finishingFlash.getValue(partialTicks) * .9f;
 			float alpha = flash;