diff --git a/src/main/java/noppes/npcs/blocks/BlockScripted.java b/src/main/java/noppes/npcs/blocks/BlockScripted.java index f1b4b9266..c34283704 100644 --- a/src/main/java/noppes/npcs/blocks/BlockScripted.java +++ b/src/main/java/noppes/npcs/blocks/BlockScripted.java @@ -25,6 +25,8 @@ import noppes.npcs.constants.EnumGuiType; import java.util.Random; public class BlockScripted extends BlockContainer { + + public int renderId = -1; public static final AxisAlignedBB AABB = AxisAlignedBB.getBoundingBox(0.001f, 0.001f, 0.001f, 0.998f, 0.998f, 0.998f); public static final AxisAlignedBB AABB_EMPTY = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0); @@ -109,12 +111,12 @@ public class BlockScripted extends BlockContainer { @Override public boolean canRenderInPass(int pass) { - return false; + return super.canRenderInPass(pass); } @Override public int getRenderType() { - return 0; + return renderId; } @Override public boolean isOpaqueCube() { diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java b/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java index b2d3bf8b4..78ad090ec 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java @@ -15,9 +15,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import noppes.npcs.*; import noppes.npcs.api.IBlock; import noppes.npcs.api.block.ITextPlane; +import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; @@ -48,6 +50,8 @@ public class TileScripted extends TileEntity implements IScriptBlockHandler { public ItemStack itemModel = new ItemStack(CustomItems.scripted); public Block blockModel = null; + private boolean hideModel; + private int metadata; public boolean needsClientUpdate = false; @@ -68,6 +72,7 @@ public class TileScripted extends TileEntity implements IScriptBlockHandler { public TileEntity renderTile; public boolean renderTileErrored = true; + public boolean renderFullBlock = true; public ITickable renderTileUpdate = null; public TextPlane text1 = new TextPlane(); @@ -219,12 +224,32 @@ public class TileScripted extends TileEntity implements IScriptBlockHandler { EventHooks.onScriptBlockUpdate(this); ticksExisted = 0; if(needsClientUpdate){ - markDirty(); + worldObj.func_147451_t(xCoord, yCoord, zCoord); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - worldObj.notifyBlocksOfNeighborChange(xCoord,yCoord,zCoord,getBlockType(),3); + worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, CustomItems.scripted); + + Chunk chunk = worldObj.getChunkFromChunkCoords(xCoord >> 4, zCoord >> 4); + chunk.setBlockMetadata(xCoord & 15, yCoord, zCoord & 15, metadata); + blockMetadata = metadata; + needsClientUpdate = false; } } + + if (worldObj.isRemote) { + boolean markForUpdate = false; + boolean prevHideModel = this.hideModel; + boolean hideModel = BlockScriptedRenderer.overrideModel(); + + if (hideModel != prevHideModel) { + this.hideModel = hideModel; + markForUpdate = true; + } + + if (markForUpdate) { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + } } @Override @@ -232,11 +257,22 @@ public class TileScripted extends TileEntity implements IScriptBlockHandler { handleUpdateTag(pkt.func_148857_g()); } + @Override + @SideOnly(Side.CLIENT) + public boolean shouldRenderInPass(int arg0) { + if (blockModel != null && blockModel.isOpaqueCube() + && !BlockScriptedRenderer.overrideModel()) { + return true; + } + return super.shouldRenderInPass(arg0); + } + public void handleUpdateTag(NBTTagCompound tag){ int light = lightValue; setDisplayNBT(tag); if(light != lightValue) checkLight(worldObj,xCoord,yCoord,zCoord); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } public boolean checkLight(World world, int x, int y, int z) @@ -273,6 +309,9 @@ public class TileScripted extends TileEntity implements IScriptBlockHandler { if(NoppesUtilPlayer.compareItems(item, itemModel, false, false) && b != blockModel) return; + metadata = item.getItemDamage(); + blockMetadata = metadata; + itemModel = item; blockModel = b; needsClientUpdate = true; @@ -408,6 +447,11 @@ public class TileScripted extends TileEntity implements IScriptBlockHandler { return this.customTileData; } + @Override + public void markDirty() { + super.markDirty(); + } + public class TextPlane implements ITextPlane { public boolean textHasChanged = true; public TextBlock textBlock; diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 175e15bc9..3071d68f0 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -27,10 +27,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; -import noppes.npcs.CommonProxy; -import noppes.npcs.CustomNpcs; -import noppes.npcs.LogWriter; -import noppes.npcs.PacketHandlerPlayer; +import noppes.npcs.*; import noppes.npcs.api.IWorld; import noppes.npcs.blocks.tiles.*; import noppes.npcs.client.controllers.*; @@ -53,7 +50,8 @@ import noppes.npcs.client.gui.script.GuiScriptItem; import noppes.npcs.client.model.*; import noppes.npcs.client.renderer.*; import noppes.npcs.client.renderer.blocks.*; -import noppes.npcs.client.renderer.customitem.CustomItemRenderer; +import noppes.npcs.client.renderer.items.CustomItemRenderer; +import noppes.npcs.client.renderer.items.ScriptedBlockItemRenderer; import noppes.npcs.config.ConfigClient; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.StringCache; @@ -103,6 +101,7 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileBlockAnvil.class, new BlockCarpentryBenchRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileMailbox.class, new BlockMailboxRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileScripted.class, new BlockScriptedRenderer()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(CustomItems.scripted), new ScriptedBlockItemRenderer()); RenderingRegistry.registerBlockHandler(new BlockBorderRenderer()); if(!ConfigMain.DisableExtraBlock){ diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockScriptedRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockScriptedRenderer.java index 96aa40e7e..8904892b5 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockScriptedRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockScriptedRenderer.java @@ -1,18 +1,17 @@ package noppes.npcs.client.renderer.blocks; +import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.ForgeHooksClient; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockScripted; @@ -28,26 +27,58 @@ public class BlockScriptedRenderer extends BlockRendererInterface{ private static final RenderBlocks renderBlocks = new RenderBlocks(); private static final Random random = new Random(); + public BlockScriptedRenderer() { + ((BlockScripted) CustomItems.scripted).renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(this); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + TileScripted tile = (TileScripted) world.getTileEntity(x, y, z); + Block blockModel = tile.blockModel; + + if (!overrideModel() && blockModel != null) { + GL11.glPushMatrix(); + GL11.glRotatef(tile.rotationY, 0, 1, 0); + GL11.glRotatef(tile.rotationX, 1, 0, 0); + GL11.glRotatef(tile.rotationZ, 0, 0, 1); + GL11.glScalef(tile.scaleX, tile.scaleY, tile.scaleZ); + if (blockModel != CustomItems.scripted) { + tile.renderFullBlock = renderer.renderBlockByRenderType(blockModel, x, y, z); + } else { + renderer.renderStandardBlock(blockModel, x, y, z); + tile.renderFullBlock = true; + } + GL11.glPopMatrix(); + } else { + renderer.renderStandardBlock(CustomItems.scripted, x, y, z); + tile.renderFullBlock = true; + } + + return true; + } + + public int getRenderId() { + return CustomItems.scripted.getRenderType(); + } + @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks) { TileScripted tile = (TileScripted) te; - GL11.glPushMatrix(); - GL11.glDisable(GL11.GL_BLEND); - RenderHelper.enableStandardItemLighting(); - GL11.glTranslatef((float) (x + 0.5), (float) y, (float) (z + 0.5)); - if (overrideModel()) { - GL11.glTranslatef(0, 0.5F, 0); - renderItem(te, new ItemStack(CustomItems.scripted)); - } else { + if (!tile.renderFullBlock) { + GL11.glPushMatrix(); + GL11.glDisable(GL11.GL_BLEND); + RenderHelper.enableStandardItemLighting(); + GL11.glTranslatef((float) (x + 0.5), (float) y, (float) (z + 0.5)); GL11.glRotatef(tile.rotationY, 0, 1, 0); GL11.glRotatef(tile.rotationX, 1, 0, 0); GL11.glRotatef(tile.rotationZ, 0, 0, 1); GL11.glScalef(tile.scaleX, tile.scaleY, tile.scaleZ); GL11.glTranslatef(0, 0.5F, 0); renderItem(te, tile.itemModel); + GL11.glPopMatrix(); } - GL11.glPopMatrix(); if (!tile.text1.text.isEmpty()) { drawText(tile.text1, x, y, z); @@ -152,7 +183,7 @@ public class BlockScriptedRenderer extends BlockRendererInterface{ GL11.glPopMatrix(); } - private boolean overrideModel() { + public static boolean overrideModel() { ItemStack held = Minecraft.getMinecraft().thePlayer.getHeldItem(); if (held == null) return false; @@ -166,7 +197,7 @@ public class BlockScriptedRenderer extends BlockRendererInterface{ } @Override - public int getRenderId() { - return 0; + public boolean shouldRender3DInInventory(int modelId) { + return false; } } diff --git a/src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java b/src/main/java/noppes/npcs/client/renderer/items/CustomItemRenderer.java similarity index 99% rename from src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java rename to src/main/java/noppes/npcs/client/renderer/items/CustomItemRenderer.java index a400bbde8..e672281f0 100644 --- a/src/main/java/noppes/npcs/client/renderer/customitem/CustomItemRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/items/CustomItemRenderer.java @@ -1,4 +1,4 @@ -package noppes.npcs.client.renderer.customitem; +package noppes.npcs.client.renderer.items; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; diff --git a/src/main/java/noppes/npcs/client/renderer/items/ScriptedBlockItemRenderer.java b/src/main/java/noppes/npcs/client/renderer/items/ScriptedBlockItemRenderer.java new file mode 100644 index 000000000..1f0784f81 --- /dev/null +++ b/src/main/java/noppes/npcs/client/renderer/items/ScriptedBlockItemRenderer.java @@ -0,0 +1,77 @@ +package noppes.npcs.client.renderer.items; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; +import noppes.npcs.CustomItems; +import org.lwjgl.opengl.GL11; + +public class ScriptedBlockItemRenderer implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return type != ItemRenderType.FIRST_PERSON_MAP; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + RenderBlocks renderBlocks = (RenderBlocks) data[0]; + if (type == ItemRenderType.INVENTORY) { + GL11.glTranslatef(0, -0.1f, 0); + renderBlock(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED) { + GL11.glTranslatef(0.5F, 0.4F, 0.5F); + renderBlock(item, renderBlocks); + } else if (type == ItemRenderType.ENTITY) { + renderBlock(item, renderBlocks); + } else if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { + GL11.glTranslatef(0.5F, 0.4F, 0.5F); + renderBlock(item, renderBlocks); + } + } + + private void renderBlock(ItemStack item, RenderBlocks renderBlocks) { + Tessellator tessellator = Tessellator.instance; + + Block block = CustomItems.scripted; + int p_147800_2_ = item.getItemDamage(); + + block.setBlockBoundsForItemRender(); + renderBlocks.setRenderBoundsFromBlock(block); + GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(-0.5F, -0.4F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1.0F, 0.0F); + renderBlocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, renderBlocks.getBlockIconFromSideAndMetadata(block, 0, p_147800_2_)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderBlocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, renderBlocks.getBlockIconFromSideAndMetadata(block, 1, p_147800_2_)); + tessellator.draw(); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1.0F); + renderBlocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, renderBlocks.getBlockIconFromSideAndMetadata(block, 2, p_147800_2_)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderBlocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, renderBlocks.getBlockIconFromSideAndMetadata(block, 3, p_147800_2_)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1.0F, 0.0F, 0.0F); + renderBlocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, renderBlocks.getBlockIconFromSideAndMetadata(block, 4, p_147800_2_)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderBlocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderBlocks.getBlockIconFromSideAndMetadata(block, 5, p_147800_2_)); + tessellator.draw(); + } +}