From 4315a9e460ca3ab50de4360bcd0d8a4234c2532b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 19 Nov 2019 11:58:00 -0600 Subject: [PATCH] Use vanilla to render the pool in a pool minecart, clean up pool tesr a bit --- .../render/entity/RenderPoolMinecart.java | 4 ++-- .../client/render/tile/RenderTilePool.java | 22 +++++++------------ 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index 40901155e..33145a36c 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -30,8 +30,8 @@ public class RenderPoolMinecart extends MinecartRenderer { @Override protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull BlockState state) { - RenderTilePool.forceVariant = BlockPool.Variant.DEFAULT; - RenderTilePool.forceManaNumber = poolCart.getMana(); + super.renderCartContents(poolCart, partialTicks, state); + RenderTilePool.cartMana = poolCart.getMana(); TileEntityRendererDispatcher.instance.getRenderer(TilePool.class).render(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 322bd6d3d..458532ca9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -35,9 +35,8 @@ import java.util.Random; public class RenderTilePool extends TileEntityRenderer { - // Overrides for when we call this TESR without an actual pool - public static BlockPool.Variant forceVariant = BlockPool.Variant.DEFAULT; - public static int forceManaNumber = -1; + // Overrides for when we call this TESR from a cart + public static int cartMana = -1; @Override public void render(@Nullable TilePool pool, double d0, double d1, double d2, float f, int digProgress) { @@ -57,23 +56,19 @@ public class RenderTilePool extends TileEntityRenderer { GlStateManager.translated(d0, d1, d2); } - boolean fab = pool == null ? forceVariant == BlockPool.Variant.FABULOUS : ((BlockPool) pool.getBlockState().getBlock()).variant == BlockPool.Variant.FABULOUS; + boolean fab = pool != null && ((BlockPool) pool.getBlockState().getBlock()).variant == BlockPool.Variant.FABULOUS; Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - int color = 0xFFFFFF; if (fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - if(pool != null) - time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); - color = Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); - } + time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); + int color = Color.HSBtoRGB(time * 0.005F, 0.6F, 1F); - if (fab || forceManaNumber > -1) { int red = (color & 0xFF0000) >> 16; int green = (color & 0xFF00) >> 8; int blue = color & 0xFF; - IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModel(pool == null ? poolForVariant(forceVariant) : pool.getWorld().getBlockState(pool.getPos())); + IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModel(pool.getWorld().getBlockState(pool.getPos())); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(model, 1.0F, red / 255F, green / 255F, blue / 255F); } @@ -81,7 +76,7 @@ public class RenderTilePool extends TileEntityRenderer { GlStateManager.color4f(1, 1, 1, 1); GlStateManager.enableRescaleNormal(); - int mana = pool == null ? forceManaNumber : pool.getCurrentMana(); + int mana = pool == null ? cartMana : pool.getCurrentMana(); int cap = pool == null ? -1 : pool.manaCap; if(cap == -1) cap = TilePool.MAX_MANA; @@ -136,8 +131,7 @@ public class RenderTilePool extends TileEntityRenderer { } GlStateManager.popMatrix(); - forceVariant = BlockPool.Variant.DEFAULT; - forceManaNumber = -1; + cartMana = -1; } private void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) {