From df0d9efefc5e9fee0f43d283c01c2dd14d43518c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 20 Aug 2017 14:57:08 -0500 Subject: [PATCH] Pylon items render correctly --- .../client/core/proxy/ClientProxy.java | 2 + .../client/render/tile/RenderTilePylon.java | 38 +++++++++++++++++-- .../botania/common/block/BlockPylon.java | 3 -- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 142d922e5..f296347cd 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -18,6 +18,7 @@ import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.entity.EntityLivingBase; @@ -184,6 +185,7 @@ public class ClientProxy implements IProxy { dootDoot = true; } + TileEntityItemStackRenderer.instance = new RenderTilePylon.ForwardingTEISR(TileEntityItemStackRenderer.instance); } @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index bc27473f6..3ec211103 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -13,8 +13,13 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.MathHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; @@ -29,6 +34,7 @@ import vazkii.botania.client.model.ModelPylonNatura; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Random; @@ -42,15 +48,18 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { private final ModelPylonNatura naturaModel = new ModelPylonNatura(); private final ModelPylonGaia gaiaModel = new ModelPylonGaia(); + // Overrides for when we call this TESR without an actual pylon + private static PylonVariant forceVariant = PylonVariant.MANA; + @Override - public void render(@Nullable TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) { - boolean renderingItem = pylon == null; + public void render(@Nonnull TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress, float unused) { + boolean renderingItem = pylon == ForwardingTEISR.DUMMY; if(!renderingItem && (!pylon.getWorld().isBlockLoaded(pylon.getPos(), false) || pylon.getWorld().getBlockState(pylon.getPos()).getBlock() != ModBlocks.pylon)) return; - PylonVariant type = renderingItem ? PylonVariant.MANA : ModBlocks.pylon.getStateFromMeta(pylon.getBlockMetadata()).getValue(BotaniaStateProps.PYLON_VARIANT); // todo get the type somehow.... + PylonVariant type = renderingItem ? forceVariant : ModBlocks.pylon.getStateFromMeta(pylon.getBlockMetadata()).getValue(BotaniaStateProps.PYLON_VARIANT); IPylonModel model; switch(type) { default: @@ -80,7 +89,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { double worldTime = (double) (ClientTickHandler.ticksInGame + pticks); - worldTime += new Random(pylon == null ? 0 : pylon.getPos().hashCode()).nextInt(360); + worldTime += renderingItem ? 0 : new Random(pylon.getPos().hashCode()).nextInt(360); GlStateManager.translate(d0 + 0.2 + (type == PylonVariant.NATURA ? -0.1 : 0), d1 + 0.05, d2 + 0.8 + (type == PylonVariant.NATURA ? 0.1 : 0)); float scale = type == PylonVariant.NATURA ? 0.8F : 0.6F; @@ -136,4 +145,25 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GlStateManager.enableRescaleNormal(); GlStateManager.popMatrix(); } + + // Dirty hack to make the TEISR aware of the stack metas + public static class ForwardingTEISR extends TileEntityItemStackRenderer { + private static final TilePylon DUMMY = new TilePylon(); + + private final TileEntityItemStackRenderer compose; + + public ForwardingTEISR(TileEntityItemStackRenderer compose) { + this.compose = compose; + } + + @Override + public void renderByItem(ItemStack stack, float partialTicks) { + if(stack.getItem() == Item.getItemFromBlock(ModBlocks.pylon)) { + RenderTilePylon.forceVariant = PylonVariant.values()[MathHelper.clamp(stack.getItemDamage(), 0, PylonVariant.values().length)]; + TileEntityRendererDispatcher.instance.render(DUMMY, 0, 0, 0, partialTicks); + } else { + compose.renderByItem(stack, partialTicks); + } + } + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index c9eeafffe..0aa3138d8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -145,8 +145,5 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi public void registerModels() { String[] names = { "mana", "natura", "gaia" }; ModelHandler.registerCustomItemblock(this, names.length, i -> "pylon_" + names[i]); - for(int i = 0; i < names.length; i++) { - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), i, TilePylon.class); - } } }