mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 06:24:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up dynamic tank renderer

Browse Source
This commit is contained in:
LordGrimmauld 2020-06-16 20:33:36 +02:00
parent b767df3fc3
commit 3e8e4c1cb4
2 changed files with 32 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/main/java/com/simibubi/create/content/contraptions/fluids/FluidTankRenderer.java
View File

@ -16,8 +16,8 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.IFluidTank;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
public class FluidTankRenderer extends SafeTileEntityRenderer<FluidTankTileEntity> { public class FluidTankRenderer extends SafeTileEntityRenderer<FluidTankTileEntity> {
@ -37,31 +37,29 @@ public class FluidTankRenderer extends SafeTileEntityRenderer<FluidTankTileEntit
@Override @Override
protected void renderSafe(FluidTankTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, protected void renderSafe(FluidTankTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer,
int light, int overlay) { int light, int overlay) {
renderFluid(te, partialTicks, ms, buffer, light, overlay); renderFluid(te, ms, buffer, light);
} }
private void renderFluid(FluidTankTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, private void renderFluid(FluidTankTileEntity te, MatrixStack ms, IRenderTypeBuffer buffer,
int light, int overlay) { int light) {
if (te.getWorld().isAreaLoaded(te.getPos(), 0)) { if (te.getWorld() != null && te.getWorld().isAreaLoaded(te.getPos(), 0)) {
IVertexBuilder builder = buffer.getBuffer(RenderType.getTranslucent()); IVertexBuilder builder = buffer.getBuffer(RenderType.getTranslucent());
Matrix4f posMat = ms.peek().getModel(); Matrix4f posMat = ms.peek().getModel();
for (TankRenderInfo tankRenderInfo : getTanksToRender(te)) { for (FluidTankRenderInfo tankRenderInfo : getTanksToRender(te)) {
doRender(builder, tankRenderInfo, posMat, light); doRender(builder, tankRenderInfo, posMat, light);
} }
} }
// Minecraft.getInstance().getBlockRendererDispatcher().renderFluid(te.getPos().up(2), Minecraft.getInstance().world, buffer.getBuffer(RenderType.getSolid()), tank.getFluid().getRawFluid().getDefaultState());
} }
private void doRender(IVertexBuilder builder, TankRenderInfo tankRenderInfo, Matrix4f posMat, int combinedLight) { private void doRender(IVertexBuilder builder, FluidTankRenderInfo tankRenderInfo, Matrix4f posMat, int combinedLight) {
IFluidTank tank = tankRenderInfo.getTank(); IFluidTank tank = tankRenderInfo.getTank();
if (tank.getFluidAmount() == 0) return; if (tank.getFluidAmount() == 0) return;
Fluid fluid = tank.getFluid().getFluid(); Fluid fluid = tank.getFluid().getFluid();
ResourceLocation texture = fluid.getAttributes().getStillTexture(tank.getFluid()); ResourceLocation texture = fluid.getAttributes().getStillTexture(tank.getFluid());
@SuppressWarnings("deprecation")
TextureAtlasSprite still = Minecraft.getInstance().getSpriteAtlas(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(texture); TextureAtlasSprite still = Minecraft.getInstance().getSpriteAtlas(AtlasTexture.LOCATION_BLOCKS_TEXTURE).apply(texture);
int[] cols = decomposeColor(fluid.getAttributes().getColor(tank.getFluid())); int[] cols = decomposeColor(fluid.getAttributes().getColor(tank.getFluid()));
@ -176,64 +174,43 @@ public class FluidTankRenderer extends SafeTileEntityRenderer<FluidTankTileEntit
return new AxisAlignedBB(tankBounds.minX, y1, tankBounds.minZ, tankBounds.maxX, y2, tankBounds.maxZ); return new AxisAlignedBB(tankBounds.minX, y1, tankBounds.minZ, tankBounds.maxX, y2, tankBounds.maxZ);
} }
private Collection<TankRenderInfo> getTanksToRender(FluidTankTileEntity te) { private List<FluidTankRenderInfo> getTanksToRender(FluidTankTileEntity te) {
FluidTankTileEntity upTE = te.getOtherFluidTankTileEntity(Direction.UP); return Collections.singletonList(new FluidTankRenderInfo(te, ((FluidTankBlock) te.getBlockState().getBlock()).getTankBodyShape(te.getWorld(), te.getPos())));
FluidTankTileEntity downTE = te.getOtherFluidTankTileEntity(Direction.DOWN);
FluidTankTileEntity eastTE = te.getOtherFluidTankTileEntity(Direction.EAST);
FluidTankTileEntity westTE = te.getOtherFluidTankTileEntity(Direction.WEST);
FluidTankTileEntity northTE = te.getOtherFluidTankTileEntity(Direction.NORTH);
FluidTankTileEntity southTE = te.getOtherFluidTankTileEntity(Direction.SOUTH);
boolean up = upTE != null && ( upTE.getTank().getFluidAmount() == 0 || te.getTank().getFluid().getRawFluid() != upTE.getTank().getFluid().getRawFluid());
boolean down = downTE != null && (downTE.getTank().getFluidAmount() < downTE.getTank().getCapacity() || te.getTank().getFluid().getRawFluid() != downTE.getTank().getFluid().getRawFluid());
boolean east = eastTE == null || te.getTank().getFluid().getRawFluid() != eastTE.getTank().getFluid().getRawFluid();
boolean west = westTE == null || te.getTank().getFluid().getRawFluid() != westTE.getTank().getFluid().getRawFluid();
boolean north = northTE == null || te.getTank().getFluid().getRawFluid() != northTE.getTank().getFluid().getRawFluid();
boolean south = southTE == null || te.getTank().getFluid().getRawFluid() != southTE.getTank().getFluid().getRawFluid();
return Collections.singletonList(new FluidTankRenderInfo(te.getTank(), up, down, east, west, north, south, ((FluidTankBlock) te.getBlockState().getBlock()).getTankBodyShape(te.getWorld(), te.getPos())));
} }
private static class FluidTankRenderInfo extends TankRenderInfo { private static class FluidTankRenderInfo {
private final boolean up; private final IFluidTank tank;
private final boolean down; private final AxisAlignedBB bounds;
private final boolean east; private final FluidTankTileEntity te;
private final boolean west;
private final boolean north;
private final boolean south;
FluidTankRenderInfo(IFluidTank tank, boolean up, boolean down, boolean east, boolean west, boolean north, boolean south, AxisAlignedBB bounds) { FluidTankRenderInfo(FluidTankTileEntity te, AxisAlignedBB bounds) {
super(tank, bounds); this.te = te;
this.up = up; this.bounds = bounds;
this.down = down; this.tank = te.getTank();
this.east = east;
this.west = west;
this.north = north;
this.south = south;
} }
@Override
public boolean shouldRender(Direction face) { public boolean shouldRender(Direction face) {
FluidTankTileEntity offsetTE = te.getOtherFluidTankTileEntity(face);
switch (face) { switch (face) {
case UP: case UP:
return up return (offsetTE != null && (offsetTE.getTank().getFluidAmount() == 0 || te.getTank().getFluid().getRawFluid() != offsetTE.getTank().getFluid().getRawFluid()))
|| getTank().getFluid().getAmount() < getTank().getCapacity() || getTank().getFluidAmount() < getTank().getCapacity()
&& !getTank().getFluid().getFluid().getAttributes().isLighterThanAir(); && !getTank().getFluid().getFluid().getAttributes().isLighterThanAir();
case DOWN: case DOWN:
return down return (offsetTE != null && (offsetTE.getTank().getFluidAmount() < offsetTE.getTank().getCapacity() || te.getTank().getFluid().getRawFluid() != offsetTE.getTank().getFluid().getRawFluid()))
|| getTank().getFluid().getAmount() < getTank().getCapacity() || getTank().getFluidAmount() < getTank().getCapacity()
&& getTank().getFluid().getFluid().getAttributes().isLighterThanAir(); && getTank().getFluid().getFluid().getAttributes().isLighterThanAir();
case EAST:
return east;
case WEST:
return west;
case NORTH:
return north;
case SOUTH:
return south;
default: default:
return true; return offsetTE == null || te.getTank().getFluid().getRawFluid() != offsetTE.getTank().getFluid().getRawFluid();
} }
}
public IFluidTank getTank() {
return tank;
}
public AxisAlignedBB getBounds() {
return bounds;
} }
} }
} }

54
src/main/java/com/simibubi/create/content/contraptions/fluids/TankRenderInfo.java
View File

@ -1,54 +0,0 @@
package com.simibubi.create.content.contraptions.fluids;
import net.minecraft.util.Direction;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.templates.FluidTank;
import java.util.BitSet;
public class TankRenderInfo {
private final IFluidTank tank;
private final AxisAlignedBB bounds;
private final BitSet faces = new BitSet(6);
public TankRenderInfo(FluidStack stack, int capacity, AxisAlignedBB bounds, Direction... renderFaces) {
FluidTank tank = new FluidTank(capacity);
tank.setFluid(stack);
this.tank = tank;
this.bounds = bounds;
if (renderFaces.length == 0) {
faces.set(0, 6, true);
} else {
for (Direction face : renderFaces) {
faces.set(face.getIndex(), true);
}
}
}
public TankRenderInfo(IFluidTank tank, AxisAlignedBB bounds, Direction... renderFaces) {
this(tank.getFluid(), tank.getCapacity(), bounds, renderFaces);
}
public TankRenderInfo without(Direction face) {
faces.clear(face.getIndex());
return this;
}
public boolean shouldRender(Direction face) {
return faces.get(face.getIndex());
}
public IFluidTank getTank() {
return tank;
}
public AxisAlignedBB getBounds() {
return bounds;
}
public BitSet getFaces() {
return faces;
}
}