From 2e852ab24e98fdba966482bf1969cab252202aff Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 2 Apr 2019 00:21:22 -0500 Subject: [PATCH] Fix bellows rendering --- .../client/render/tile/RenderTileBellows.java | 18 +++++++++++------- .../common/block/decor/BlockTinyPotato.java | 2 +- .../common/block/mana/BlockBellows.java | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 4da7b68ba..4395cce05 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -14,6 +14,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.ModBlocks; @@ -22,11 +23,6 @@ import vazkii.botania.common.block.tile.mana.TileBellows; import javax.annotation.Nullable; public class RenderTileBellows extends TileEntityRenderer { - - private static final float[] ROTATIONS = new float[] { - 180F, 0F, 90F, 270F - }; - private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BELLOWS); private static final ModelBellows model = new ModelBellows(); @@ -43,11 +39,19 @@ public class RenderTileBellows extends TileEntityRenderer { GlStateManager.translated(d0, d1, d2); Minecraft.getInstance().textureManager.bindTexture(texture); - int meta = 0; // todo 1.13 bellows != null && bellows.getWorld() != null ? bellows.getBlockMetadata() : 0; GlStateManager.translatef(0.5F, 1.5F, 0.5F); GlStateManager.scalef(1F, -1F, -1F); - GlStateManager.rotatef(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F); + float angle = 0; + if(bellows != null) { + switch(bellows.getBlockState().get(BotaniaStateProps.CARDINALS)) { + case SOUTH: break; + case NORTH: angle = 180F; break; + case EAST: angle = 270F; break; + case WEST: angle = 90F; break; + } + } + GlStateManager.rotatef(angle, 0F, 1F, 0F); model.render(Math.max(0.1F, 1F - (bellows == null ? 0 : bellows.movePos + bellows.moving * f + 0.1F))); GlStateManager.color3f(1F, 1F, 1F); GlStateManager.scalef(1F, -1F, -1F); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index 67611d40d..c27fca2e4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -85,7 +85,7 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { @Override public IBlockState getStateForPlacement(BlockItemUseContext ctx) { - return getDefaultState().with(BotaniaStateProps.CARDINALS, ctx.getNearestLookingDirection().getOpposite()); + return getDefaultState().with(BotaniaStateProps.CARDINALS, ctx.getPlacementHorizontalFacing().getOpposite()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 16e0c8c11..47cce46c8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -59,7 +59,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { @Override public IBlockState getStateForPlacement(BlockItemUseContext context) { - return getDefaultState().with(BotaniaStateProps.CARDINALS, context.getNearestLookingDirection().getOpposite()); + return getDefaultState().with(BotaniaStateProps.CARDINALS, context.getPlacementHorizontalFacing()); } @Override