Skip to content

Commit ebded88

Browse files
TropheusJTropheusJ
committed
update ponder to fix fluid rendering
1 parent 706f0ad commit ebded88

File tree

12 files changed

+42
-41
lines changed

12 files changed

+42
-41
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,4 @@ local.properties
5656
.gitmodules
5757
Ponder
5858
Ponder/
59+
.Ponder/

‎build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ val fapiVersion = "0.92.5+1.20.1"
88

99
// in-house dependencies
1010
val flywheelVersion = "1.0.0-217"
11-
val ponderVersion = "1.0.67"
11+
val ponderVersion = "1.0.73"
1212
val registrateVersion = "1.3.79-MC1.20.1"
1313
val milkLibVersion = "1.2.60"
1414
val portLibVersion = "2.3.8+1.20.1"

‎src/main/java/com/simibubi/create/compat/emi/CreateEmiAnimations.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.simibubi.create.content.kinetics.deployer.DeployerBlock;
1414
import com.simibubi.create.content.kinetics.saw.SawBlock;
1515
import com.simibubi.create.content.processing.burner.BlazeBurnerBlock.HeatLevel;
16-
import com.simibubi.create.foundation.fluid.FluidRenderer;
1716
import com.simibubi.create.foundation.gui.CustomLightingSettings;
1817

1918
import dev.emi.emi.api.widget.WidgetHolder;
@@ -22,6 +21,7 @@
2221
import net.createmod.catnip.gui.ILightingSettings;
2322
import net.createmod.catnip.gui.UIRenderHelper;
2423
import net.createmod.catnip.gui.element.GuiGameElement;
24+
import net.createmod.catnip.platform.FabricCatnipServices;
2525
import net.createmod.catnip.render.CachedBuffers;
2626
import net.createmod.catnip.render.SpriteShiftEntry;
2727
import net.minecraft.client.Minecraft;
@@ -417,8 +417,8 @@ public static void renderSpout(GuiGraphics graphics, int offset, List<FluidStack
417417
float from = 3f / 16f;
418418
float to = 17f / 16f;
419419
FluidStack fluid = fluids.get(0);
420-
FluidRenderer.renderFluidBox(fluid.getFluid(), fluid.getAmount(), from, from, from, to, to, to, buffer, matrices,
421-
LightTexture.FULL_BRIGHT, false, true, fluid.getTag());
420+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluid, from, from, from, to, to, to, buffer, matrices,
421+
LightTexture.FULL_BRIGHT, false, true);
422422
matrices.popPose();
423423

424424
float width = 1 / 128f * squeeze;
@@ -428,8 +428,8 @@ public static void renderSpout(GuiGraphics graphics, int offset, List<FluidStack
428428
matrices.translate(-0.5f, 0, -0.5f);
429429
from = -width / 2 + 0.5f;
430430
to = width / 2 + 0.5f;
431-
FluidRenderer.renderFluidBox(fluid.getFluid(), fluid.getAmount(), from, 0, from, to, 2, to, buffer, matrices,
432-
LightTexture.FULL_BRIGHT, false, true, fluid.getTag());
431+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluid, from, 0, from, to, 2, to, buffer, matrices,
432+
LightTexture.FULL_BRIGHT, false, true);
433433
buffer.endBatch();
434434
Lighting.setupFor3DItems();
435435
}
@@ -452,8 +452,8 @@ public static void addDrain(WidgetHolder widgets, int x, int y, FluidStack fluid
452452
matrices.scale(scale, scale, scale);
453453
float from = 2 / 16f;
454454
float to = 1f - from;
455-
FluidRenderer.renderFluidBox(fluid.getFluid(), fluid.getAmount(), from, from, from, to, 3/4f, to, buffer, matrices,
456-
LightTexture.FULL_BRIGHT, false, true, fluid.getTag());
455+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluid, from, from, from, to, 3/4f, to, buffer, matrices,
456+
LightTexture.FULL_BRIGHT, false, true);
457457
buffer.endBatch();
458458
});
459459
}

‎src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedItemDrain.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.mojang.blaze3d.vertex.Tesselator;
55
import com.mojang.math.Axis;
66
import com.simibubi.create.AllBlocks;
7-
import com.simibubi.create.foundation.fluid.FluidRenderer;
87

98
import net.createmod.catnip.gui.UIRenderHelper;
9+
import net.createmod.catnip.platform.FabricCatnipServices;
1010
import net.minecraft.client.gui.GuiGraphics;
1111
import net.minecraft.client.renderer.LightTexture;
1212
import net.minecraft.client.renderer.MultiBufferSource;
@@ -42,7 +42,7 @@ public void draw(GuiGraphics graphics, int xOffset, int yOffset) {
4242
matrixStack.scale(scale, scale, scale);
4343
float from = 2/16f;
4444
float to = 1f - from;
45-
FluidRenderer.renderFluidBox(fluid.getFluid(), fluid.getAmount(), from, from, from, to, 3/4f, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true, fluid.getTag());
45+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluid, from, from, from, to, 3/4f, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true);
4646
buffer.endBatch();
4747

4848
matrixStack.popPose();

‎src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSpout.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import com.mojang.math.Axis;
99
import com.simibubi.create.AllBlocks;
1010
import com.simibubi.create.AllPartialModels;
11-
import com.simibubi.create.foundation.fluid.FluidRenderer;
1211

1312
import net.createmod.catnip.animation.AnimationTickHolder;
1413
import net.createmod.catnip.gui.UIRenderHelper;
14+
import net.createmod.catnip.platform.FabricCatnipServices;
1515
import net.minecraft.client.gui.GuiGraphics;
1616
import net.minecraft.client.renderer.LightTexture;
1717
import net.minecraft.client.renderer.MultiBufferSource;
@@ -77,7 +77,7 @@ public void draw(GuiGraphics graphics, int xOffset, int yOffset) {
7777
float from = 3f / 16f;
7878
float to = 17f / 16f;
7979
FluidStack fluidStack = fluids.get(0);
80-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), from, from, from, to, to, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true, fluidStack.getTag());
80+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, from, from, from, to, to, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true);
8181
matrixStack.popPose();
8282

8383
float width = 1 / 128f * squeeze;
@@ -87,7 +87,7 @@ public void draw(GuiGraphics graphics, int xOffset, int yOffset) {
8787
matrixStack.translate(-0.5f, 0, -0.5f);
8888
from = -width / 2 + 0.5f;
8989
to = width / 2 + 0.5f;
90-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), from, 0, from, to, 2, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true, fluidStack.getTag());
90+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, from, 0, from, to, 2, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true);
9191
buffer.endBatch();
9292
Lighting.setupFor3DItems();
9393

‎src/main/java/com/simibubi/create/compat/rei/category/animations/AnimatedItemDrain.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.mojang.blaze3d.vertex.Tesselator;
55
import com.mojang.math.Axis;
66
import com.simibubi.create.AllBlocks;
7-
import com.simibubi.create.foundation.fluid.FluidRenderer;
87

98
import net.createmod.catnip.gui.UIRenderHelper;
9+
import net.createmod.catnip.platform.FabricCatnipServices;
1010
import net.minecraft.client.gui.GuiGraphics;
1111
import net.minecraft.client.renderer.LightTexture;
1212
import net.minecraft.client.renderer.MultiBufferSource;
@@ -42,7 +42,7 @@ public void draw(GuiGraphics graphics, int xOffset, int yOffset) {
4242
matrixStack.scale(scale, scale, scale);
4343
float from = 2/16f;
4444
float to = 1f - from;
45-
FluidRenderer.renderFluidBox(fluid.getFluid(), fluid.getAmount(), from, from, from, to, 3/4f, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true, fluid.getTag());
45+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluid, from, from, from, to, 3/4f, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true);
4646
buffer.endBatch();
4747

4848
matrixStack.popPose();

‎src/main/java/com/simibubi/create/compat/rei/category/animations/AnimatedSpout.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import com.mojang.math.Axis;
99
import com.simibubi.create.AllBlocks;
1010
import com.simibubi.create.AllPartialModels;
11-
import com.simibubi.create.foundation.fluid.FluidRenderer;
1211

1312
import net.createmod.catnip.animation.AnimationTickHolder;
1413
import net.createmod.catnip.gui.UIRenderHelper;
14+
import net.createmod.catnip.platform.FabricCatnipServices;
1515
import net.minecraft.client.gui.GuiGraphics;
1616
import net.minecraft.client.renderer.LightTexture;
1717
import net.minecraft.client.renderer.MultiBufferSource;
@@ -77,7 +77,7 @@ public void draw(GuiGraphics graphics, int xOffset, int yOffset) {
7777
float from = 3f / 16f;
7878
float to = 17f / 16f;
7979
FluidStack fluidStack = fluids.get(0);
80-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), from, from, from, to, to, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true, fluidStack.getTag());
80+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, from, from, from, to, to, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true);
8181
matrixStack.popPose();
8282

8383
float width = 1 / 128f * squeeze;
@@ -87,7 +87,7 @@ public void draw(GuiGraphics graphics, int xOffset, int yOffset) {
8787
matrixStack.translate(-0.5f, 0, -0.5f);
8888
from = -width / 2 + 0.5f;
8989
to = width / 2 + 0.5f;
90-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), from, 0, from, to, 2, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true, fluidStack.getTag());
90+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, from, 0, from, to, 2, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true);
9191
buffer.endBatch();
9292
Lighting.setupFor3DItems();
9393

‎src/main/java/com/simibubi/create/content/fluids/drain/ItemDrainRenderer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
99
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
1010
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
11-
import com.simibubi.create.foundation.fluid.FluidRenderer;
1211

1312
import dev.engine_room.flywheel.lib.transform.TransformStack;
1413
import net.createmod.catnip.math.VecHelper;
14+
import net.createmod.catnip.platform.FabricCatnipServices;
1515
import net.minecraft.client.Minecraft;
1616
import net.minecraft.client.renderer.MultiBufferSource;
1717
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -149,8 +149,8 @@ protected void renderFluid(ItemDrainBlockEntity be, float partialTicks, PoseStac
149149
float yOffset = (7 / 16f) * level;
150150
ms.pushPose();
151151
ms.translate(0, yOffset, 0);
152-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), min, yMin - yOffset, min,
153-
max, yMin, max, buffer, ms, light, false, false, fluidStack.getTag());
152+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, min, yMin - yOffset, min,
153+
max, yMin, max, buffer, ms, light, false, false);
154154
ms.popPose();
155155
}
156156

@@ -174,8 +174,8 @@ protected void renderFluid(ItemDrainBlockEntity be, float partialTicks, PoseStac
174174
if (processingTicks != -1) {
175175
radius = (float) (Math.pow(((2 * processingProgress) - 1), 2) - 1);
176176
AABB bb = new AABB(0.5, 1.0, 0.5, 0.5, 0.25, 0.5).inflate(radius / 32f);
177-
FluidRenderer.renderFluidBox(fluidStack2.getFluid(), fluidStack2.getAmount(), (float) bb.minX, (float) bb.minY, (float) bb.minZ,
178-
(float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, false, fluidStack2.getTag());
177+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack2, (float) bb.minX, (float) bb.minY, (float) bb.minZ,
178+
(float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, false);
179179
}
180180

181181
}

‎src/main/java/com/simibubi/create/content/fluids/spout/SpoutRenderer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
66
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
77
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
8-
import com.simibubi.create.foundation.fluid.FluidRenderer;
98

109
import dev.engine_room.flywheel.lib.model.baked.PartialModel;
10+
import net.createmod.catnip.platform.FabricCatnipServices;
1111
import net.createmod.catnip.render.CachedBuffers;
1212
import net.minecraft.client.renderer.MultiBufferSource;
1313
import net.minecraft.client.renderer.RenderType;
@@ -52,10 +52,10 @@ protected void renderSafe(SpoutBlockEntity be, float partialTicks, PoseStack ms,
5252
if (!top) ms.translate(0, yOffset, 0);
5353
else ms.translate(0, max - min, 0);
5454

55-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(),
55+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack,
5656
min, min - yOffset, min,
5757
max, min, max,
58-
buffer, ms, light, false, true, fluidStack.getTag());
58+
buffer, ms, light, false, true);
5959

6060
ms.popPose();
6161
}
@@ -69,8 +69,8 @@ protected void renderSafe(SpoutBlockEntity be, float partialTicks, PoseStack ms,
6969
if (!fluidStack.isEmpty() && processingTicks != -1) {
7070
radius = (float) (Math.pow(((2 * processingProgress) - 1), 2) - 1);
7171
AABB bb = new AABB(0.5, 0.0, 0.5, 0.5, -1.2, 0.5).inflate(radius / 32f);
72-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), (float) bb.minX, (float) bb.minY, (float) bb.minZ,
73-
(float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, true, fluidStack.getTag());
72+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, (float) bb.minX, (float) bb.minY, (float) bb.minZ,
73+
(float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, true);
7474
}
7575

7676
float squeeze = radius;

‎src/main/java/com/simibubi/create/content/fluids/tank/FluidTankRenderer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import com.mojang.blaze3d.vertex.VertexConsumer;
55
import com.simibubi.create.AllPartialModels;
66
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
7-
import com.simibubi.create.foundation.fluid.FluidRenderer;
87

98
import dev.engine_room.flywheel.lib.transform.TransformStack;
10-
import net.createmod.catnip.render.CachedBuffers;
11-
import net.createmod.catnip.data.Iterate;
129
import net.createmod.catnip.animation.LerpedFloat;
10+
import net.createmod.catnip.data.Iterate;
11+
import net.createmod.catnip.platform.FabricCatnipServices;
12+
import net.createmod.catnip.render.CachedBuffers;
1313
import net.minecraft.client.renderer.MultiBufferSource;
1414
import net.minecraft.client.renderer.RenderType;
1515
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -74,8 +74,8 @@ protected void renderSafe(FluidTankBlockEntity be, float partialTicks, PoseStack
7474

7575
ms.pushPose();
7676
ms.translate(0, clampedLevel - totalHeight, 0);
77-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), xMin, yMin, zMin, xMax, yMax, zMax,
78-
buffer, ms, light, false, true, fluidStack.getTag());
77+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, xMin, yMin, zMin, xMax, yMax, zMax,
78+
buffer, ms, light, false, true);
7979
ms.popPose();
8080
}
8181

‎src/main/java/com/simibubi/create/content/processing/basin/BasinRenderer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
77
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
88
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
9-
import com.simibubi.create.foundation.fluid.FluidRenderer;
109

1110
import dev.engine_room.flywheel.lib.transform.TransformStack;
1211
import net.createmod.catnip.animation.AnimationTickHolder;
1312
import net.createmod.catnip.data.LongAttached;
1413
import net.createmod.catnip.math.AngleHelper;
1514
import net.createmod.catnip.math.VecHelper;
15+
import net.createmod.catnip.platform.FabricCatnipServices;
1616
import net.minecraft.client.Minecraft;
1717
import net.minecraft.client.renderer.MultiBufferSource;
1818
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -174,8 +174,8 @@ protected float renderFluids(BasinBlockEntity basin, float partialTicks, PoseSta
174174

175175
float partial = Mth.clamp(units / totalUnits, 0, 1);
176176
xMax += partial * 12 / 16f;
177-
FluidRenderer.renderFluidBox(renderedFluid.getFluid(), renderedFluid.getAmount(), xMin, yMin, zMin, xMax, yMax, zMax, buffer, ms, light,
178-
false, false, renderedFluid.getTag());
177+
FabricCatnipServices.FLUID_RENDERER.renderFluidBox(renderedFluid, xMin, yMin, zMin, xMax, yMax, zMax, buffer, ms, light,
178+
false, false);
179179

180180
xMin = xMax;
181181
}

‎src/main/java/com/simibubi/create/foundation/fluid/FluidRenderer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import dev.engine_room.flywheel.lib.transform.TransformStack;
77
import net.createmod.catnip.math.AngleHelper;
8-
import net.createmod.catnip.render.BasicFluidRenderer;
8+
import net.createmod.catnip.render.FluidRenderHelper;
99
import net.minecraft.client.renderer.MultiBufferSource;
1010
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
1111
import net.minecraft.core.Direction;
@@ -20,11 +20,11 @@
2020
import io.github.fabricators_of_create.porting_lib.fluids.FluidStack;
2121

2222
@Environment(EnvType.CLIENT)
23-
public class FluidRenderer extends BasicFluidRenderer {
23+
public class FluidRenderer {
2424

2525
public static void renderFluidStream(FluidStack fluidStack, Direction direction, float radius, float progress,
2626
boolean inbound, MultiBufferSource buffer, PoseStack ms, int light) {
27-
renderFluidStream(fluidStack, direction, radius, progress, inbound, getFluidBuilder(buffer), ms, light);
27+
renderFluidStream(fluidStack, direction, radius, progress, inbound, FluidRenderHelper.getFluidBuilder(buffer), ms, light);
2828
}
2929

3030
public static void renderFluidStream(FluidStack fluidStack, Direction direction, float radius, float progress,
@@ -68,14 +68,14 @@ public static void renderFluidStream(FluidStack fluidStack, Direction direction,
6868
}
6969

7070
if (progress != 1)
71-
renderStillTiledFace(Direction.DOWN, hMin, hMin, hMax, hMax, yMin, builder, ms, light, color, stillTexture);
71+
FluidRenderHelper.renderStillTiledFace(Direction.DOWN, hMin, hMin, hMax, hMax, yMin, builder, ms, light, color, stillTexture);
7272

7373
ms.popPose();
7474
}
7575

7676
public static void renderFlowingTiledFace(Direction dir, float left, float down, float right, float up,
7777
float depth, VertexConsumer builder, PoseStack ms, int light, int color, TextureAtlasSprite texture) {
78-
renderTiledFace(dir, left, down, right, up, depth, builder, ms, light, color, texture, 0.5f);
78+
FluidRenderHelper.renderTiledFace(dir, left, down, right, up, depth, builder, ms, light, color, texture, 0.5f);
7979
}
8080

8181
}

0 commit comments

Comments
 (0)