From a1d05345dfe2c6c6f1a2475d3e90a804c5c5401a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 19 Nov 2019 23:10:03 -0600 Subject: [PATCH] Fix pump render completely. Closes #3022 --- .../vazkii/botania/client/render/tile/RenderTilePump.java | 3 ++- .../java/vazkii/botania/common/block/tile/mana/TilePump.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 9f7867e03..44a9c18da 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -5,7 +5,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.util.Direction; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.mana.TilePump; @@ -31,6 +30,8 @@ public class RenderTilePump extends TileEntityRenderer { break; } GlStateManager.translated(-0.5, 0, -0.5); + double diff = Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * partialTicks)); + GlStateManager.translated(0, 0, diff / 14); GlStateManager.color4f(1, 1, 1, 1); Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(headModel, 1, 1, 1, 1); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 808ccf73c..8f477e56d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -38,11 +38,11 @@ public class TilePump extends TileMod implements ITickableTileEntity { public static TileEntityType TYPE; private static final String TAG_ACTIVE = "active"; - private float innerRingPos; + public float innerRingPos; public boolean active = false; public boolean hasCart = false; public boolean hasCartOnTop = false; - private float moving = 0F; + public float moving = 0F; public int comparator; public boolean hasRedstone = false;