Skip to content

Commit 43b4a67

Browse files
IThundxrIThundxr
committed
Update Catnip
1 parent 3a5a170 commit 43b4a67

File tree

8 files changed

+38
-34
lines changed

8 files changed

+38
-34
lines changed

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jei_minecraft_version = 1.20.1
2626
jei_version = 15.20.0.106
2727
curios_minecraft_version = 1.20.1
2828
curios_version = 5.3.1
29-
ponder_version = 1.0.64
29+
ponder_version = 1.0.76
3030
mixin_extras_version = 0.4.1
3131

3232
cc_tweaked_enable = true

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
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;
7+
88
import net.createmod.catnip.gui.UIRenderHelper;
9+
import net.createmod.catnip.platform.ForgeCatnipServices;
910
import net.minecraft.client.gui.GuiGraphics;
1011
import net.minecraft.client.renderer.LightTexture;
1112
import net.minecraft.client.renderer.MultiBufferSource;
1213
import net.minecraft.client.renderer.MultiBufferSource.BufferSource;
14+
1315
import net.minecraftforge.fluids.FluidStack;
1416

1517
public class AnimatedItemDrain extends AnimatedKinetics {
@@ -38,9 +40,9 @@ public void draw(GuiGraphics graphics, int xOffset, int yOffset) {
3840
.getBuilder());
3941
UIRenderHelper.flipForGuiRender(matrixStack);
4042
matrixStack.scale(scale, scale, scale);
41-
float from = 2/16f;
43+
float from = 2 / 16f;
4244
float to = 1f - from;
43-
FluidRenderer.renderFluidBox(fluid.getFluid(), fluid.getAmount(), from, from, from, to, 3/4f, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true, fluid.getTag());
45+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluid, from, from, from, to, 3 / 4f, to, buffer, matrixStack, LightTexture.FULL_BRIGHT, false, true);
4446
buffer.endBatch();
4547

4648
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.ForgeCatnipServices;
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+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, from, from, from, to, to, to, graphics.bufferSource(), 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+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, from, 0, from, to, 2, to, graphics.bufferSource(), 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: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
1111
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
1212
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
13-
import com.simibubi.create.foundation.fluid.FluidRenderer;
1413

1514
import dev.engine_room.flywheel.lib.transform.TransformStack;
1615
import net.createmod.catnip.math.VecHelper;
16+
import net.createmod.catnip.platform.ForgeCatnipServices;
1717
import net.minecraft.client.Minecraft;
1818
import net.minecraft.client.renderer.MultiBufferSource;
1919
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -26,6 +26,7 @@
2626
import net.minecraft.world.item.ItemStack;
2727
import net.minecraft.world.phys.AABB;
2828
import net.minecraft.world.phys.Vec3;
29+
2930
import net.minecraftforge.fluids.FluidStack;
3031

3132
public class ItemDrainRenderer extends SmartBlockEntityRenderer<ItemDrainBlockEntity> {
@@ -149,8 +150,8 @@ protected void renderFluid(ItemDrainBlockEntity be, float partialTicks, PoseStac
149150
float yOffset = (7 / 16f) * level;
150151
ms.pushPose();
151152
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());
153+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, min, yMin - yOffset, min, max, yMin,
154+
max, buffer, ms, light, false, false);
154155
ms.popPose();
155156
}
156157

@@ -174,8 +175,8 @@ protected void renderFluid(ItemDrainBlockEntity be, float partialTicks, PoseStac
174175
if (processingTicks != -1) {
175176
radius = (float) (Math.pow(((2 * processingProgress) - 1), 2) - 1);
176177
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());
178+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack2, (float) bb.minX, (float) bb.minY, (float) bb.minZ,
179+
(float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, false);
179180
}
180181

181182
}

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@
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.ForgeCatnipServices;
1111
import net.createmod.catnip.render.CachedBuffers;
1212
import net.minecraft.client.renderer.MultiBufferSource;
1313
import net.minecraft.client.renderer.RenderType;
1414
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
1515
import net.minecraft.util.Mth;
1616
import net.minecraft.world.phys.AABB;
17+
1718
import net.minecraftforge.fluids.FluidStack;
1819

1920
public class SpoutRenderer extends SafeBlockEntityRenderer<SpoutBlockEntity> {
@@ -51,10 +52,8 @@ protected void renderSafe(SpoutBlockEntity be, float partialTicks, PoseStack ms,
5152
if (!top) ms.translate(0, yOffset, 0);
5253
else ms.translate(0, max - min, 0);
5354

54-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(),
55-
min, min - yOffset, min,
56-
max, min, max,
57-
buffer, ms, light, false, true, fluidStack.getTag());
55+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, min, min - yOffset, min, max, min,
56+
max, buffer, ms, light, false, true);
5857

5958
ms.popPose();
6059
}
@@ -68,8 +67,8 @@ protected void renderSafe(SpoutBlockEntity be, float partialTicks, PoseStack ms,
6867
if (!fluidStack.isEmpty() && processingTicks != -1) {
6968
radius = (float) (Math.pow(((2 * processingProgress) - 1), 2) - 1);
7069
AABB bb = new AABB(0.5, 0.0, 0.5, 0.5, -1.2, 0.5).inflate(radius / 32f);
71-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), (float) bb.minX, (float) bb.minY, (float) bb.minZ,
72-
(float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, true, fluidStack.getTag());
70+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, (float) bb.minX, (float) bb.minY, (float) bb.minZ,
71+
(float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true, true);
7372
}
7473

7574
float squeeze = radius;

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
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.ForgeCatnipServices;
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;
1616
import net.minecraft.core.Direction;
1717
import net.minecraft.util.Mth;
1818
import net.minecraft.world.level.block.state.BlockState;
19+
1920
import net.minecraftforge.fluids.FluidStack;
2021
import net.minecraftforge.fluids.capability.templates.FluidTank;
2122

@@ -73,8 +74,8 @@ protected void renderSafe(FluidTankBlockEntity be, float partialTicks, PoseStack
7374

7475
ms.pushPose();
7576
ms.translate(0, clampedLevel - totalHeight, 0);
76-
FluidRenderer.renderFluidBox(fluidStack.getFluid(), fluidStack.getAmount(), xMin, yMin, zMin, xMax, yMax, zMax,
77-
buffer, ms, light, false, true, fluidStack.getTag());
77+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(fluidStack, xMin, yMin, zMin, xMax, yMax, zMax, buffer,
78+
ms, light, false, true);
7879
ms.popPose();
7980
}
8081

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour;
55
import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
66
import com.simibubi.create.foundation.blockEntity.renderer.SmartBlockEntityRenderer;
7-
import com.simibubi.create.foundation.fluid.FluidRenderer;
87

98
import dev.engine_room.flywheel.lib.transform.TransformStack;
109
import net.createmod.catnip.animation.AnimationTickHolder;
1110
import net.createmod.catnip.data.IntAttached;
12-
import net.createmod.catnip.math.VecHelper;
1311
import net.createmod.catnip.math.AngleHelper;
12+
import net.createmod.catnip.math.VecHelper;
13+
import net.createmod.catnip.platform.ForgeCatnipServices;
1414
import net.minecraft.client.Minecraft;
1515
import net.minecraft.client.renderer.MultiBufferSource;
1616
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
@@ -23,6 +23,7 @@
2323
import net.minecraft.world.item.ItemStack;
2424
import net.minecraft.world.level.block.state.BlockState;
2525
import net.minecraft.world.phys.Vec3;
26+
2627
import net.minecraftforge.fluids.FluidStack;
2728
import net.minecraftforge.items.IItemHandlerModifiable;
2829
import net.minecraftforge.items.ItemStackHandler;
@@ -171,8 +172,8 @@ protected float renderFluids(BasinBlockEntity basin, float partialTicks, PoseSta
171172

172173
float partial = Mth.clamp(units / totalUnits, 0, 1);
173174
xMax += partial * 12 / 16f;
174-
FluidRenderer.renderFluidBox(renderedFluid.getFluid(), renderedFluid.getAmount(), xMin, yMin, zMin, xMax, yMax, zMax, buffer, ms, light,
175-
false, false, renderedFluid.getTag());
175+
ForgeCatnipServices.FLUID_RENDERER.renderFluidBox(renderedFluid, xMin, yMin, zMin, xMax, yMax, zMax,
176+
buffer, ms, light, false, false);
176177

177178
xMin = xMax;
178179
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import com.mojang.blaze3d.vertex.VertexConsumer;
77

88
import dev.engine_room.flywheel.lib.transform.TransformStack;
9-
import net.createmod.catnip.render.BasicFluidRenderer;
109
import net.createmod.catnip.math.AngleHelper;
10+
import net.createmod.catnip.render.FluidRenderHelper;
1111
import net.minecraft.client.Minecraft;
1212
import net.minecraft.client.renderer.MultiBufferSource;
1313
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -16,18 +16,18 @@
1616
import net.minecraft.util.Mth;
1717
import net.minecraft.world.inventory.InventoryMenu;
1818
import net.minecraft.world.level.material.Fluid;
19+
1920
import net.minecraftforge.api.distmarker.Dist;
2021
import net.minecraftforge.api.distmarker.OnlyIn;
2122
import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
2223
import net.minecraftforge.fluids.FluidStack;
2324
import net.minecraftforge.fluids.FluidType;
2425

2526
@OnlyIn(Dist.CLIENT)
26-
public class FluidRenderer extends BasicFluidRenderer {
27-
27+
public class FluidRenderer {
2828
public static void renderFluidStream(FluidStack fluidStack, Direction direction, float radius, float progress,
2929
boolean inbound, MultiBufferSource buffer, PoseStack ms, int light) {
30-
renderFluidStream(fluidStack, direction, radius, progress, inbound, getFluidBuilder(buffer), ms, light);
30+
renderFluidStream(fluidStack, direction, radius, progress, inbound, FluidRenderHelper.getFluidBuilder(buffer), ms, light);
3131
}
3232

3333
public static void renderFluidStream(FluidStack fluidStack, Direction direction, float radius, float progress,
@@ -71,14 +71,14 @@ public static void renderFluidStream(FluidStack fluidStack, Direction direction,
7171
}
7272

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

7676
ms.popPose();
7777
}
7878

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

8484
}

0 commit comments

Comments
 (0)