From 52efa99d344e9ccdae10a0ca72e01939e5acdf3b Mon Sep 17 00:00:00 2001 From: mDiyo Date: Mon, 18 Feb 2013 00:56:20 -0800 Subject: [PATCH] Tankard --- resources/tinkertextures/ConstructBlocks.png | Bin 30412 -> 20086 bytes tinker/tconstruct/TContent.java | 11 +- tinker/tconstruct/blocks/LavaTankBlock.java | 76 +++++------ .../{SearedBrick.java => MetalOre.java} | 4 +- tinker/tconstruct/blocks/SmelteryBlock.java | 105 +++++++++++--- .../tconstruct/blocks/ToolStationBlock.java | 119 ++++++++++++---- .../client/CastingTableSpecialRenderer.java | 128 ++++++++++++++++++ tinker/tconstruct/client/SmelteryRender.java | 13 +- tinker/tconstruct/client/TProxyClient.java | 32 +++-- tinker/tconstruct/client/TankRender.java | 38 ++++++ .../entityrender/PlayerArmorRender.java | 115 ++++++++++++++++ ...kItemBlock.java => MetalOreItemBlock.java} | 8 +- .../tconstruct/items/SmelteryItemBlock.java | 29 ++++ tinker/tconstruct/items/TArmor.java | 20 ++- .../tconstruct/logic/CastingTableLogic.java | 19 +++ ...blockLogic.java => MultiServantLogic.java} | 2 +- .../tconstruct/logic/SmelteryDrainLogic.java | 6 +- tinker/tconstruct/logic/SmelteryLogic.java | 2 +- 18 files changed, 599 insertions(+), 128 deletions(-) rename tinker/tconstruct/blocks/{SearedBrick.java => MetalOre.java} (74%) create mode 100644 tinker/tconstruct/client/CastingTableSpecialRenderer.java create mode 100644 tinker/tconstruct/client/entityrender/PlayerArmorRender.java rename tinker/tconstruct/items/{SearedBrickItemBlock.java => MetalOreItemBlock.java} (58%) create mode 100644 tinker/tconstruct/items/SmelteryItemBlock.java rename tinker/tconstruct/logic/{MultiblockLogic.java => MultiServantLogic.java} (95%) diff --git a/resources/tinkertextures/ConstructBlocks.png b/resources/tinkertextures/ConstructBlocks.png index 7f69c769fa45ac99c67f6d0887b7bbc44e34f4d8..cfeb5066fd35d4a77d4bddb2f2229095f940e759 100644 GIT binary patch literal 20086 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 literal 30412 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 diff --git a/tinker/tconstruct/TContent.java b/tinker/tconstruct/TContent.java index 438c6764..2c26a9e1 100644 --- a/tinker/tconstruct/TContent.java +++ b/tinker/tconstruct/TContent.java @@ -154,17 +154,18 @@ public class TContent implements IFuelHandler GameRegistry.registerBlock(craftedSoil, tinker.tconstruct.items.CraftedSoilItemBlock.class, "CraftedSoil"); //Smeltery - smeltery = new SmelteryBlock(PHConstruct.smeltery); - GameRegistry.registerBlock(smeltery, "Smeltery"); + smeltery = new SmelteryBlock(PHConstruct.smeltery).setBlockName("Smeltery"); + GameRegistry.registerBlock(smeltery, SmelteryItemBlock.class, "Smeltery"); GameRegistry.registerTileEntity(tinker.tconstruct.logic.SmelteryLogic.class, "TConstruct.Smeltery"); - //GameRegistry.registerTileEntity(tinker.tconstruct.logic.SmelteryLogic.class, "TConstruct.Smeltery"); + GameRegistry.registerTileEntity(tinker.tconstruct.logic.SmelteryDrainLogic.class, "TConstruct.SmelteryDrain"); + GameRegistry.registerTileEntity(tinker.tconstruct.logic.MultiServantLogic.class, "TConstruct.Servants"); lavaTank = new LavaTankBlock(PHConstruct.lavaTank); GameRegistry.registerBlock(lavaTank, "LavaTank"); GameRegistry.registerTileEntity(tinker.tconstruct.logic.LavaTankLogic.class, "TConstruct.LavaTank"); - searedBrick = new SearedBrick(PHConstruct.searedBrick, 80, Material.iron, 10.0F, 6); - GameRegistry.registerBlock(searedBrick, tinker.tconstruct.items.SearedBrickItemBlock.class, "SearedBrick"); + searedBrick = new MetalOre(PHConstruct.searedBrick, 80, Material.iron, 10.0F, 6); + GameRegistry.registerBlock(searedBrick, tinker.tconstruct.items.MetalOreItemBlock.class, "SearedBrick"); MinecraftForge.setBlockHarvestLevel(searedBrick, 0, "pickaxe", 2); MinecraftForge.setBlockHarvestLevel(searedBrick, 1, "pickaxe", 4); MinecraftForge.setBlockHarvestLevel(searedBrick, 2, "pickaxe", 4); diff --git a/tinker/tconstruct/blocks/LavaTankBlock.java b/tinker/tconstruct/blocks/LavaTankBlock.java index 5926dcd1..9a591f52 100644 --- a/tinker/tconstruct/blocks/LavaTankBlock.java +++ b/tinker/tconstruct/blocks/LavaTankBlock.java @@ -5,10 +5,12 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import tinker.tconstruct.TConstruct; +import tinker.tconstruct.TContent; import tinker.tconstruct.client.TankRender; import tinker.tconstruct.logic.LavaTankLogic; @@ -16,7 +18,7 @@ public class LavaTankBlock extends BlockContainer { public LavaTankBlock(int id) { - super(id, 49, Material.iron); + super(id, 38, Material.iron); setCreativeTab(TConstruct.blockTab); setBlockName("TConstruct.LavaTank"); setStepSound(Block.soundGlassFootstep); @@ -34,11 +36,41 @@ public class LavaTankBlock extends BlockContainer return false; } + @Override + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + { + if (par5 == 0) + return super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); + return true; + } + + @Override + public String getTextureFile () + { + return TContent.blockTexture; + } + @Override public int getRenderType () { return TankRender.tankModelID; } + + public int getBlockTextureFromSideAndMetadata (int side, int meta) + { + if (side == 0 || side == 1) + { + return blockIndexInTexture + 1 + meta * 3; + } + /*else if (side == 1) + { + return blockIndexInTexture + 1 + meta * 3; + }*/ + else + { + return blockIndexInTexture + meta * 3; + } + } @Override public TileEntity createNewTileEntity (World world, int metadata) @@ -71,46 +103,4 @@ public class LavaTankBlock extends BlockContainer { return createNewTileEntity(world, 0); } - - /*public void addCollidingBlockToList (World world, int x, int y, int z, AxisAlignedBB box, List list, Entity entity) - { - int meta = world.getBlockMetadata(x, y, z); - - if (meta < 5) - { - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.0625F, 1.0F); - super.addCollidingBlockToList(world, x, y, z, box, list, entity); - } - - if (meta != 2 && meta != 4 && meta != 7 && meta != 9) - { - setBlockBounds(0.0F, 0.0F, 0.0F, 0.125F, 1.0F, 1.0F); - super.addCollidingBlockToList(world, x, y, z, box, list, entity); - } - - if (meta != 3 && meta != 4 && meta != 8 && meta != 9) - { - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 0.125F); - super.addCollidingBlockToList(world, x, y, z, box, list, entity); - } - - if (meta != 3 && meta != 1 && meta != 8 && meta != 6) - { - setBlockBounds(0.875F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - super.addCollidingBlockToList(world, x, y, z, box, list, entity); - } - - if (meta != 1 && meta != 2 && meta != 6 && meta != 7) - { - setBlockBounds(0.0F, 0.0F, 0.875F, 1.0F, 1.0F, 1.0F); - super.addCollidingBlockToList(world, x, y, z, box, list, entity); - } - - setBlockBoundsForItemRender(); - } - - public void setBlockBoundsForItemRender () - { - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - }*/ } diff --git a/tinker/tconstruct/blocks/SearedBrick.java b/tinker/tconstruct/blocks/MetalOre.java similarity index 74% rename from tinker/tconstruct/blocks/SearedBrick.java rename to tinker/tconstruct/blocks/MetalOre.java index 325044ef..f8dce84a 100644 --- a/tinker/tconstruct/blocks/SearedBrick.java +++ b/tinker/tconstruct/blocks/MetalOre.java @@ -3,9 +3,9 @@ package tinker.tconstruct.blocks; import net.minecraft.block.material.Material; import net.minecraft.world.World; -public class SearedBrick extends TConstructBlock +public class MetalOre extends TConstructBlock { - public SearedBrick(int id, int tex, Material material, float hardness, int sub) + public MetalOre(int id, int tex, Material material, float hardness, int sub) { super(id, tex, material, hardness, sub); } diff --git a/tinker/tconstruct/blocks/SmelteryBlock.java b/tinker/tconstruct/blocks/SmelteryBlock.java index 0f10be49..ff926e28 100644 --- a/tinker/tconstruct/blocks/SmelteryBlock.java +++ b/tinker/tconstruct/blocks/SmelteryBlock.java @@ -1,10 +1,13 @@ package tinker.tconstruct.blocks; +import java.util.List; import java.util.Random; import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -15,6 +18,8 @@ import tinker.tconstruct.TConstruct; import tinker.tconstruct.TContent; import tinker.tconstruct.TGuiHandler; import tinker.tconstruct.client.SmelteryRender; +import tinker.tconstruct.logic.MultiServantLogic; +import tinker.tconstruct.logic.SmelteryDrainLogic; import tinker.tconstruct.logic.SmelteryLogic; public class SmelteryBlock extends InventoryBlock @@ -31,13 +36,14 @@ public class SmelteryBlock extends InventoryBlock this.setCreativeTab(TConstruct.blockTab); this.setBlockName("tconstruct.Smeltery"); } - + @Override public int getRenderType () { return SmelteryRender.smelteryModel; } + @Override public String getTextureFile () { return TContent.blockTexture; @@ -45,23 +51,35 @@ public class SmelteryBlock extends InventoryBlock public int getBlockTextureFromSideAndMetadata (int side, int meta) { - /*if (side == 0 || side == 1) + if (meta < 2) { - return blockIndexInTexture + 3 + meta * 4; - }*/ - if (side == 3) + if (side == 3) + { + return blockIndexInTexture + 1 + meta * 3; + } + else + { + return blockIndexInTexture + meta * 3; + } + } + else if (meta < 4) { - return blockIndexInTexture + 1 + meta * 3; + return blockIndexInTexture + meta + 4; } else { - return blockIndexInTexture + meta * 3; + if (side == 0) + return blockIndexInTexture + meta*3 - 2; + else if (side == 1) + return blockIndexInTexture + meta*3 - 1; + else + return blockIndexInTexture + meta*3 - 3; } } public int getBlockTexture (IBlockAccess world, int x, int y, int z, int side) { - InventoryLogic logic = (InventoryLogic) world.getBlockTileEntity(x, y, z); + TileEntity logic = world.getBlockTileEntity(x, y, z); short direction = (logic instanceof IFacingLogic) ? ((IFacingLogic) logic).getDirection() : 0; int meta = world.getBlockMetadata(x, y, z); if (meta == 0) //Smeltery @@ -89,15 +107,24 @@ public class SmelteryBlock extends InventoryBlock if (meta == 1) { if (side == direction) - return blockIndexInTexture + 1 + 3; - else if (side / 2 == direction / 2) return blockIndexInTexture + 2 + 3; + else if (side / 2 == direction / 2) + return blockIndexInTexture + 1 + 3; else return blockIndexInTexture + 3; } + else if (meta < 4) + { + return blockIndexInTexture + meta + 4; + } else { - return blockIndexInTexture + meta +4; + if (side == 0) + return blockIndexInTexture + meta*3 - 2; + else if (side == 1) + return blockIndexInTexture + meta*3 - 1; + else + return blockIndexInTexture + meta*3 - 3; } } @@ -121,12 +148,12 @@ public class SmelteryBlock extends InventoryBlock { if (isActive(world, x, y, z)) { - InventoryLogic logic = (InventoryLogic) world.getBlockTileEntity(x, y, z); + TileEntity logic = world.getBlockTileEntity(x, y, z); byte face = 0; if (logic instanceof IFacingLogic) - face = ((IFacingLogic)logic).getDirection(); + face = ((IFacingLogic) logic).getDirection(); float f = (float) x + 0.5F; - float f1 = (float) y + 0.0F + (random.nextFloat() * 6F) / 16F; + float f1 = (float) y + 0.5F + (random.nextFloat() * 6F) / 16F; float f2 = (float) z + 0.5F; float f3 = 0.52F; float f4 = random.nextFloat() * 0.6F - 0.3F; @@ -174,29 +201,63 @@ public class SmelteryBlock extends InventoryBlock { return TConstruct.instance; } + + @Override + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) + { + if (player.isSneaking() || world.getBlockMetadata(x, y, z) != 0) + return false; + + Integer integer = getGui(world, x, y, z, player); + if (integer == null || integer == -1) + { + return false; + } + else + { + player.openGui(getModInstance(), integer, world, x, y, z); + return true; + } + } @Override - public TileEntity createNewTileEntity(World world, int metadata) + public TileEntity createNewTileEntity (World world, int metadata) { - return new SmelteryLogic(); + switch (metadata) + { + case 0: return new SmelteryLogic(); + case 1: return new SmelteryDrainLogic(); + case 2: return new MultiServantLogic(); + default: return null; + } } - + @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving entityliving) + public void onBlockPlacedBy (World world, int x, int y, int z, EntityLiving entityliving) { super.onBlockPlacedBy(world, x, y, z, entityliving); - onBlockPlacedElsewhere(world, x, y, z, entityliving); + if (world.getBlockMetadata(x, y, z) == 0) + onBlockPlacedElsewhere(world, x, y, z, entityliving); } - - public void onBlockPlacedElsewhere(World world, int x, int y, int z, EntityLiving entityliving) + + public void onBlockPlacedElsewhere (World world, int x, int y, int z, EntityLiving entityliving) { SmelteryLogic logic = (SmelteryLogic) world.getBlockTileEntity(x, y, z); logic.checkValidPlacement(); } - + @Override public void breakBlock (World world, int x, int y, int z, int par5, int par6) //Don't drop inventory { world.removeBlockTileEntity(x, y, z); } + + @Override + public void getSubBlocks (int id, CreativeTabs tab, List list) + { + for (int iter = 0; iter < 3; iter++) + { + list.add(new ItemStack(id, 1, iter)); + } + } } diff --git a/tinker/tconstruct/blocks/ToolStationBlock.java b/tinker/tconstruct/blocks/ToolStationBlock.java index 967ce018..855258c9 100644 --- a/tinker/tconstruct/blocks/ToolStationBlock.java +++ b/tinker/tconstruct/blocks/ToolStationBlock.java @@ -30,6 +30,7 @@ public class ToolStationBlock extends InventoryBlock this.setHardness(2f); } + /* Rendering */ public String getTextureFile () { return TContent.blockTexture; @@ -96,33 +97,103 @@ public class ToolStationBlock extends InventoryBlock return true; } + public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z) + { + int metadata = world.getBlockMetadata(x, y, z); + if (metadata == 5) + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); + return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); + } + + /* Activation */ + @Override + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) + { + int md = world.getBlockMetadata(x, y, z); + if (md == 14) + { + return activateCastingTable(world, x, y, z, player); + } + else + return super.onBlockActivated(world, x, y, z, player, side, clickX, clickY, clickZ); + } + + boolean activateCastingTable (World world, int x, int y, int z, EntityPlayer player) + { + if (!world.isRemote) + { + System.out.println("Castses"); + CastingTableLogic logic = (CastingTableLogic) world.getBlockTileEntity(x, y, z); + if (!logic.isStackInSlot(0)) + { + ItemStack stack = player.getCurrentEquippedItem(); + stack = player.inventory.decrStackSize(player.inventory.currentItem, 1); + logic.setInventorySlotContents(0, stack); + } + else + { + /*ItemStack insideStack = logic.takeItemInColumn(0); + + if (insideStack == null) + {r + insideStack = logic.takeItemInColumn(1 - 0); + } + + if (insideStack != null) + { + this.spawnItem(world, x, y, z, insideStack); + }*/ + } + + world.markBlockForUpdate(x, y, z); + } + return true; + } + + /* Data */ public int damageDropped (int meta) { return meta; } public TileEntity createNewTileEntity (World world, int metadata) - { + { switch (metadata) { - case 0: return new ToolStationLogic(); - case 1: return new PartCrafterLogic(); - case 2: return new PartCrafterLogic(); - case 3: return new PartCrafterLogic(); - case 4: return new PartCrafterLogic(); - case 5: return new PatternChestLogic(); - case 6: return new PatternChestLogic(); - case 7: return new PatternChestLogic(); - case 8: return new PatternChestLogic(); - case 9: return new PatternChestLogic(); - case 10: return new PatternShaperLogic(); - case 11: return new PatternShaperLogic(); - case 12: return new PatternShaperLogic(); - case 13: return new PatternShaperLogic(); - case 14: return new CastingTableLogic(); - default: return null; - } - } + case 0: + return new ToolStationLogic(); + case 1: + return new PartCrafterLogic(); + case 2: + return new PartCrafterLogic(); + case 3: + return new PartCrafterLogic(); + case 4: + return new PartCrafterLogic(); + case 5: + return new PatternChestLogic(); + case 6: + return new PatternChestLogic(); + case 7: + return new PatternChestLogic(); + case 8: + return new PatternChestLogic(); + case 9: + return new PatternChestLogic(); + case 10: + return new PatternShaperLogic(); + case 11: + return new PatternShaperLogic(); + case 12: + return new PatternShaperLogic(); + case 13: + return new PatternShaperLogic(); + case 14: + return new CastingTableLogic(); + default: + return null; + } + } @Override public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) @@ -153,18 +224,10 @@ public class ToolStationBlock extends InventoryBlock { list.add(new ItemStack(id, 1, iter)); } - + for (int iter = 10; iter < 15; iter++) { list.add(new ItemStack(id, 1, iter)); } } - - public AxisAlignedBB getSelectedBoundingBoxFromPool (World world, int x, int y, int z) - { - int metadata = world.getBlockMetadata(x, y, z); - if (metadata == 5) - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY - 0.125, (double) z + this.maxZ); - return AxisAlignedBB.getAABBPool().addOrModifyAABBInPool((double) x + this.minX, (double) y + this.minY, (double) z + this.minZ, (double) x + this.maxX, (double) y + this.maxY, (double) z + this.maxZ); - } } diff --git a/tinker/tconstruct/client/CastingTableSpecialRenderer.java b/tinker/tconstruct/client/CastingTableSpecialRenderer.java new file mode 100644 index 00000000..8eb53872 --- /dev/null +++ b/tinker/tconstruct/client/CastingTableSpecialRenderer.java @@ -0,0 +1,128 @@ +package tinker.tconstruct.client; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.texturefx.TextureCompassFX; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityItemFrame; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Direction; +import net.minecraft.util.MathHelper; +import net.minecraft.world.storage.MapData; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import tinker.tconstruct.logic.CastingTableLogic; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/* Special renderer, only used for drawing tools */ + +@SideOnly(Side.CLIENT) +public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer +{ + @Override + public void renderTileEntityAt(TileEntity logic, double var2, double var4, double var6, float var8) + { + //System.out.println("Render!!!"); + this.render((CastingTableLogic)logic, var2, var4, var6, var8); + } + + public void render(CastingTableLogic logic, double posX, double posY, double posZ, float var8) + { + GL11.glPushMatrix(); + float var10 = (float) (posX - 0.5F); + float var11 = (float) (posY - 0.5F); + float var12 = (float) (posZ - 0.5F); + GL11.glTranslatef(var10, var11, var12); + this.func_82402_b(logic); + GL11.glPopMatrix(); + } + + private void func_82402_b(CastingTableLogic logic) + { + ItemStack stack = logic.getStackInSlot(0); + + if (stack != null) + { + EntityItem entityitem = new EntityItem(logic.worldObj, 0.0D, 0.0D, 0.0D, stack); + entityitem.func_92014_d().stackSize = 1; + entityitem.hoverStart = 0.0F; + GL11.glPushMatrix(); + GL11.glTranslatef(1F, 1.4375F, 0.61F); + GL11.glRotatef(90F, 1, 0F, 0F); + GL11.glScalef(1.94F, 1.94F, 1.94F); + /*GL11.glTranslatef(-0.453125F * (float)Direction.offsetX[logic.hangingDirection], -0.18F, -0.453125F * (float)Direction.offsetZ[logic.hangingDirection]); + GL11.glRotatef(180.0F + logic.rotationYaw, 0.0F, 1.0F, 0.0F); + GL11.glRotatef((float)(-90 * logic.getRotation()), 0.0F, 0.0F, 1.0F); + + switch (logic.getRotation()) + { + case 1: + GL11.glTranslatef(-0.16F, -0.16F, 0.0F); + break; + case 2: + GL11.glTranslatef(0.0F, -0.32F, 0.0F); + break; + case 3: + GL11.glTranslatef(0.16F, -0.16F, 0.0F); + }*/ + + /*if (var3.func_92014_d().getItem() == Item.map) + { + this.renderManager.renderEngine.bindTexture(this.renderManager.renderEngine.getTexture("/misc/mapbg.png")); + Tessellator var4 = Tessellator.instance; + GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + GL11.glScalef(0.00390625F, 0.00390625F, 0.00390625F); + GL11.glTranslatef(-65.0F, -107.0F, -3.0F); + GL11.glNormal3f(0.0F, 0.0F, -1.0F); + var4.startDrawingQuads(); + byte var5 = 7; + var4.addVertexWithUV((double)(0 - var5), (double)(128 + var5), 0.0D, 0.0D, 1.0D); + var4.addVertexWithUV((double)(128 + var5), (double)(128 + var5), 0.0D, 1.0D, 1.0D); + var4.addVertexWithUV((double)(128 + var5), (double)(0 - var5), 0.0D, 1.0D, 0.0D); + var4.addVertexWithUV((double)(0 - var5), (double)(0 - var5), 0.0D, 0.0D, 0.0D); + var4.draw(); + MapData var6 = Item.map.getMapData(var3.func_92014_d(), logic.worldObj); + + if (var6 != null) + { + this.renderManager.itemRenderer.mapItemRenderer.renderMap((EntityPlayer)null, this.renderManager.renderEngine, var6); + } + } + else*/ + //{ + /*if (var3.func_92014_d().getItem() == Item.compass) + { + double var8 = TextureCompassFX.field_82391_c.field_76868_i; + double var9 = TextureCompassFX.field_82391_c.field_76866_j; + TextureCompassFX.field_82391_c.field_76868_i = 0.0D; + TextureCompassFX.field_82391_c.field_76866_j = 0.0D; + TextureCompassFX.func_82390_a(logic.xCoord, logic.zCoord, (double)MathHelper.wrapAngleTo180_float((float)(180)), false, true); + TextureCompassFX.field_82391_c.field_76868_i = var8; + TextureCompassFX.field_82391_c.field_76866_j = var9; + this.renderManager.renderEngine.updateDynamicTexture(TextureCompassFX.field_82391_c, -1); + }*/ + + RenderItem.field_82407_g = true; + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); + RenderItem.field_82407_g = false; + + /*if (var3.func_92014_d().getItem() == Item.compass) + { + TextureCompassFX.field_82391_c.onTick(); + this.renderManager.renderEngine.updateDynamicTexture(TextureCompassFX.field_82391_c, -1); + }*/ + //} + + GL11.glPopMatrix(); + } + } +} diff --git a/tinker/tconstruct/client/SmelteryRender.java b/tinker/tconstruct/client/SmelteryRender.java index a2cd23a5..e51b4114 100644 --- a/tinker/tconstruct/client/SmelteryRender.java +++ b/tinker/tconstruct/client/SmelteryRender.java @@ -26,7 +26,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { if (modelID == smelteryModel) { - renderDo(renderer, block, metadata); + renderStandardInvBlock(renderer, block, metadata); } } @@ -35,11 +35,10 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler { if (modelID == smelteryModel) { - switch (world.getBlockMetadata(x, y, z)) - { - case 0: return renderSmeltery(world, x, y, z, block, modelID, renderer); - case 1: - } + if (world.getBlockMetadata(x, y, z) == 0) + return renderSmeltery(world, x, y, z, block, modelID, renderer); + else + renderer.renderStandardBlock(block, x, y, z); } return false; } @@ -116,7 +115,7 @@ public class SmelteryRender implements ISimpleBlockRenderingHandler return smelteryModel; } - private void renderDo(RenderBlocks renderblocks, Block block, int meta) + private void renderStandardInvBlock(RenderBlocks renderblocks, Block block, int meta) { Tessellator tessellator = Tessellator.instance; GL11.glTranslatef(-0.5F, -0.5F, -0.5F); diff --git a/tinker/tconstruct/client/TProxyClient.java b/tinker/tconstruct/client/TProxyClient.java index b059bdb0..bfe0dfda 100644 --- a/tinker/tconstruct/client/TProxyClient.java +++ b/tinker/tconstruct/client/TProxyClient.java @@ -17,8 +17,10 @@ import org.w3c.dom.Document; import tinker.tconstruct.*; import tinker.tconstruct.client.entityrender.*; import tinker.tconstruct.client.liquidrender.*; -import tinker.tconstruct.tools.ToolCore; +import tinker.tconstruct.logic.*; +import tinker.tconstruct.tools.*; import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -71,9 +73,13 @@ public class TProxyClient extends TProxyCommon MinecraftForgeClient.registerItemRenderer(tool.itemID, render); } + //Special Renderers + ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer()); + //Entities RenderingRegistry.registerEntityRenderingHandler(tinker.tconstruct.entity.CartEntity.class, new CartRender()); RenderingRegistry.registerEntityRenderingHandler(tinker.tconstruct.entity.Skyla.class, new SkylaRender()); + //RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, new PlayerArmorRender()); // <-- Works, woo! } @@ -96,17 +102,24 @@ public class TProxyClient extends TProxyCommon LanguageRegistry.instance().addStringLocalization("ToolStation.Parts.name", "Part Builder"); LanguageRegistry.instance().addStringLocalization("ToolStation.PatternChest.name", "Pattern Chest"); LanguageRegistry.instance().addStringLocalization("ToolStation.PatternShaper.name", "Stencil Table"); - LanguageRegistry.instance().addStringLocalization("ToolStation.PatternShaper.name", "Casting Table"); + LanguageRegistry.instance().addStringLocalization("ToolStation.CastingTable.name", "Casting Table"); LanguageRegistry.instance().addStringLocalization("CraftedSoil.Slime.name", "Slimy Mud"); LanguageRegistry.instance().addStringLocalization("CraftedSoil.Grout.name", "Grout"); - LanguageRegistry.instance().addStringLocalization("SearedBrick.Brick.name", "Seared Bricks"); - LanguageRegistry.instance().addStringLocalization("SearedBrick.Cobalt.name", "Cobalt Ore"); - LanguageRegistry.instance().addStringLocalization("SearedBrick.Ardite.name", "Ardite Ore"); - LanguageRegistry.instance().addStringLocalization("SearedBrick.Copper.name", "Copper Ore"); - LanguageRegistry.instance().addStringLocalization("SearedBrick.Tin.name", "Tin Ore"); - LanguageRegistry.instance().addStringLocalization("SearedBrick.Aluminum.name", "Aluminum Ore"); - LanguageRegistry.instance().addStringLocalization("SearedBrick.Slag.name", "Slag"); + + LanguageRegistry.instance().addStringLocalization("MetalOre.NetherSlag.name", "Netherack Slag"); + LanguageRegistry.instance().addStringLocalization("MetalOre.Cobalt.name", "Cobalt Ore"); + LanguageRegistry.instance().addStringLocalization("MetalOre.Ardite.name", "Ardite Ore"); + LanguageRegistry.instance().addStringLocalization("MetalOre.Copper.name", "Copper Ore"); + LanguageRegistry.instance().addStringLocalization("MetalOre.Tin.name", "Tin Ore"); + LanguageRegistry.instance().addStringLocalization("MetalOre.Aluminum.name", "Aluminum Ore"); + LanguageRegistry.instance().addStringLocalization("MetalOre.Slag.name", "Stone Slag"); + + LanguageRegistry.instance().addStringLocalization("Smeltery.Controller.name", "Smeltery"); + LanguageRegistry.instance().addStringLocalization("Smeltery.Drain.name", "Smeltery Drain"); + LanguageRegistry.instance().addStringLocalization("Smeltery.Brick.name", "Seared Bricks"); + LanguageRegistry.instance().addStringLocalization("Smeltery.Gague.name", "Seared Glass"); + LanguageRegistry.instance().addStringLocalization("Smeltery.Window.name", "Seared Window"); for (int mat = 0; mat < materialTypes.length; mat++) { @@ -139,7 +152,6 @@ public class TProxyClient extends TProxyCommon LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName); } - LanguageRegistry.addName(TContent.smeltery, "Smeltery"); LanguageRegistry.addName(TContent.manualBook, "Tinker's Log"); LanguageRegistry.addName(TContent.blankPattern, "Blank Pattern"); LanguageRegistry.addName(TContent.pickaxe, "Pickaxe"); diff --git a/tinker/tconstruct/client/TankRender.java b/tinker/tconstruct/client/TankRender.java index f66479bd..3e63ef80 100644 --- a/tinker/tconstruct/client/TankRender.java +++ b/tinker/tconstruct/client/TankRender.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.ForgeHooksClient; import org.lwjgl.opengl.GL11; @@ -20,6 +21,8 @@ public class TankRender implements ISimpleBlockRenderingHandler if (modelID == tankModelID) { renderDo(renderer, block, metadata); + renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); + renderDoRe(renderer, block, metadata); } } @@ -28,6 +31,9 @@ public class TankRender implements ISimpleBlockRenderingHandler { if (modelID == tankModelID) { + renderer.setRenderBounds(0.1875, 0, 0.1875, 0.8125, 0.125, 0.8125); + renderer.renderStandardBlock(block, x, y+1, z); + renderer.setRenderBounds(0, 0, 0, 1, 1, 1); renderer.renderStandardBlock(block, x, y, z); LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z); if (logic.getLiquidAmount() > 0) @@ -35,6 +41,7 @@ public class TankRender implements ISimpleBlockRenderingHandler Block liquidBlock = Block.blocksList[logic.liquid.itemID]; if (liquidBlock != null) { + ForgeHooksClient.bindTexture(liquidBlock.getTextureFile(), 0); renderer.setRenderBounds(0.03, 0.03, 0.03, 0.97, logic.getLiquidAmount()/4020f, 0.97); renderer.renderStandardBlock(liquidBlock, x, y, z); } @@ -85,4 +92,35 @@ public class TankRender implements ISimpleBlockRenderingHandler tessellator.draw(); GL11.glTranslatef(0.5F, 0.5F, 0.5F); } + + private void renderDoRe(RenderBlocks renderblocks, Block block, int meta) + { + Tessellator tessellator = Tessellator.instance; + GL11.glTranslatef(-0.5F, 0.5F, -0.5F); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderBottomFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(0, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderTopFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(1, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, -1F); + renderblocks.renderEastFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(2, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 0.0F, 1.0F); + renderblocks.renderWestFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(3, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 0.0F, 0.0F); + renderblocks.renderNorthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(4, meta)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderSouthFace(block, 0.0D, 0.0D, 0.0D, block.getBlockTextureFromSideAndMetadata(5, meta)); + tessellator.draw(); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + } } diff --git a/tinker/tconstruct/client/entityrender/PlayerArmorRender.java b/tinker/tconstruct/client/entityrender/PlayerArmorRender.java new file mode 100644 index 00000000..28f50ade --- /dev/null +++ b/tinker/tconstruct/client/entityrender/PlayerArmorRender.java @@ -0,0 +1,115 @@ +package tinker.tconstruct.client.entityrender; + +import net.minecraft.client.model.ModelBiped; +import net.minecraft.client.renderer.entity.RenderPlayer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumArmorMaterial; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.common.IArmorModelProvider; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class PlayerArmorRender extends RenderPlayer +{ + private ModelBiped modelBipedMain; + private ModelBiped modelArmorChestplate; + private ModelBiped modelArmor; + public static String[] armorFilenamePrefix = new String[] {"cloth", "chain", "iron", "diamond", "gold"}; + public static float NAME_TAG_RANGE = 64.0f; + public static float NAME_TAG_RANGE_SNEAK = 32.0f; + + public PlayerArmorRender() + { + super(); + this.modelBipedMain = (ModelBiped)this.mainModel; + this.modelArmorChestplate = new ModelBiped(1.0F); + this.modelArmor = new ModelBiped(0.5F); + } + + /** + * Set the specified armor model as the player model. Args: player, armorSlot, partialTick + */ + protected int setArmorModel(EntityPlayer par1EntityPlayer, int slot, float par3) + { + ItemStack stack = par1EntityPlayer.inventory.armorItemInSlot(3 - slot); + + if (stack != null) + { + Item armoritem = stack.getItem(); + + if (armoritem instanceof ItemArmor) + { + ItemArmor var6 = (ItemArmor)armoritem; + this.loadTexture(ForgeHooksClient.getArmorTexture(stack, "/armor/" + armorFilenamePrefix[var6.renderIndex] + "_" + (slot == 2 ? 2 : 1) + ".png")); + ModelBiped var7; + if (armoritem instanceof IArmorModelProvider) + { + var7 = ((IArmorModelProvider) armoritem).provideArmorModel(slot); + } + else + { + var7 = slot == 2 ? this.modelArmor : this.modelArmorChestplate; + var7.bipedHead.showModel = slot == 0; + var7.bipedHeadwear.showModel = slot == 0; + var7.bipedBody.showModel = slot == 1 || slot == 2; + var7.bipedRightArm.showModel = slot == 1; + var7.bipedLeftArm.showModel = slot == 1; + var7.bipedRightLeg.showModel = slot == 2 || slot == 3; + var7.bipedLeftLeg.showModel = slot == 2 || slot == 3; + } + this.setRenderPassModel(var7); + + if (var7 != null) + { + var7.onGround = this.mainModel.onGround; + } + + if (var7 != null) + { + var7.isRiding = this.mainModel.isRiding; + } + + if (var7 != null) + { + var7.isChild = this.mainModel.isChild; + } + + float var8 = 1.0F; + + if (var6.getArmorMaterial() == EnumArmorMaterial.CLOTH) + { + int var9 = var6.getColor(stack); + float var10 = (float)(var9 >> 16 & 255) / 255.0F; + float var11 = (float)(var9 >> 8 & 255) / 255.0F; + float var12 = (float)(var9 & 255) / 255.0F; + GL11.glColor3f(var8 * var10, var8 * var11, var8 * var12); + + if (stack.isItemEnchanted()) + { + return 31; + } + + return 16; + } + + GL11.glColor3f(var8, var8, var8); + + if (stack.isItemEnchanted()) + { + return 15; + } + + return 1; + } + } + + return -1; + } +} diff --git a/tinker/tconstruct/items/SearedBrickItemBlock.java b/tinker/tconstruct/items/MetalOreItemBlock.java similarity index 58% rename from tinker/tconstruct/items/SearedBrickItemBlock.java rename to tinker/tconstruct/items/MetalOreItemBlock.java index ecc6b80f..ed7f31fd 100644 --- a/tinker/tconstruct/items/SearedBrickItemBlock.java +++ b/tinker/tconstruct/items/MetalOreItemBlock.java @@ -3,14 +3,14 @@ package tinker.tconstruct.items; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -public class SearedBrickItemBlock extends ItemBlock +public class MetalOreItemBlock extends ItemBlock { public static final String blockType[] = { - "Brick", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag" + "NetherSlag", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag" }; - public SearedBrickItemBlock(int id) + public MetalOreItemBlock(int id) { super(id); setMaxDamage(0); @@ -24,6 +24,6 @@ public class SearedBrickItemBlock extends ItemBlock public String getItemNameIS(ItemStack itemstack) { - return (new StringBuilder()).append("SearedBrick.").append(blockType[itemstack.getItemDamage()]).toString(); + return (new StringBuilder()).append("MetalOre.").append(blockType[itemstack.getItemDamage()]).toString(); } } diff --git a/tinker/tconstruct/items/SmelteryItemBlock.java b/tinker/tconstruct/items/SmelteryItemBlock.java new file mode 100644 index 00000000..37891718 --- /dev/null +++ b/tinker/tconstruct/items/SmelteryItemBlock.java @@ -0,0 +1,29 @@ +package tinker.tconstruct.items; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class SmelteryItemBlock extends ItemBlock +{ + public static final String blockType[] = + { + "Controller", "Drain", "Brick", "Gague", "Window" + }; + + public SmelteryItemBlock(int id) + { + super(id); + setMaxDamage(0); + setHasSubtypes(true); + } + + public int getMetadata(int meta) + { + return meta; + } + + public String getItemNameIS(ItemStack itemstack) + { + return (new StringBuilder()).append("Smeltery.").append(blockType[itemstack.getItemDamage()]).toString(); + } +} diff --git a/tinker/tconstruct/items/TArmor.java b/tinker/tconstruct/items/TArmor.java index 1e2ee9d1..008a4ba2 100644 --- a/tinker/tconstruct/items/TArmor.java +++ b/tinker/tconstruct/items/TArmor.java @@ -1,17 +1,20 @@ package tinker.tconstruct.items; +import net.minecraft.client.model.ModelBiped; import net.minecraft.item.EnumArmorMaterial; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.IArmorModelProvider; import net.minecraftforge.common.IArmorTextureProvider; public class TArmor extends ItemArmor - implements IArmorTextureProvider + implements IArmorTextureProvider, IArmorModelProvider { - + private ModelBiped modelArmorChestplate; public TArmor(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, int par4) { super(par1, par2EnumArmorMaterial, par3, par4); + this.modelArmorChestplate = new ModelBiped(4.0F); } @Override @@ -20,4 +23,17 @@ public class TArmor extends ItemArmor return "/tinkertextures/armor/wood_1.png"; } + @Override + public ModelBiped provideArmorModel (int armorSlot) + { + /*modelArmorChestplate.bipedHead.showModel = armorSlot == 0; + modelArmorChestplate.bipedHeadwear.showModel = armorSlot == 0; + modelArmorChestplate.bipedBody.showModel = armorSlot == 1 || armorSlot == 2; + modelArmorChestplate.bipedRightArm.showModel = armorSlot == 1; + modelArmorChestplate.bipedLeftArm.showModel = armorSlot == 1; + modelArmorChestplate.bipedRightLeg.showModel = armorSlot == 2 || armorSlot == 3; + modelArmorChestplate.bipedLeftLeg.showModel = armorSlot == 2 || armorSlot == 3;*/ + return modelArmorChestplate; + } + } diff --git a/tinker/tconstruct/logic/CastingTableLogic.java b/tinker/tconstruct/logic/CastingTableLogic.java index 204f16c9..1af846d5 100644 --- a/tinker/tconstruct/logic/CastingTableLogic.java +++ b/tinker/tconstruct/logic/CastingTableLogic.java @@ -2,6 +2,10 @@ package tinker.tconstruct.logic; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet132TileEntityData; import net.minecraft.world.World; import tinker.common.InventoryLogic; @@ -25,4 +29,19 @@ public class CastingTableLogic extends InventoryLogic return null; } + /* Packets */ + @Override + public Packet getDescriptionPacket () + { + NBTTagCompound tag = new NBTTagCompound(); + writeToNBT(tag); + return new Packet132TileEntityData(xCoord, yCoord, zCoord, 1, tag); + } + + @Override + public void onDataPacket (INetworkManager net, Packet132TileEntityData packet) + { + readFromNBT(packet.customParam1); + worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord); + } } diff --git a/tinker/tconstruct/logic/MultiblockLogic.java b/tinker/tconstruct/logic/MultiServantLogic.java similarity index 95% rename from tinker/tconstruct/logic/MultiblockLogic.java rename to tinker/tconstruct/logic/MultiServantLogic.java index 20df9f74..d6380da8 100644 --- a/tinker/tconstruct/logic/MultiblockLogic.java +++ b/tinker/tconstruct/logic/MultiServantLogic.java @@ -4,7 +4,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import tinker.common.CoordTuple; -public class MultiblockLogic extends TileEntity +public class MultiServantLogic extends TileEntity { boolean hasMaster; CoordTuple master; diff --git a/tinker/tconstruct/logic/SmelteryDrainLogic.java b/tinker/tconstruct/logic/SmelteryDrainLogic.java index a01b1689..01e949d7 100644 --- a/tinker/tconstruct/logic/SmelteryDrainLogic.java +++ b/tinker/tconstruct/logic/SmelteryDrainLogic.java @@ -3,14 +3,14 @@ package tinker.tconstruct.logic; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.LiquidStack; -public class SmelteryDrainLogic extends MultiblockLogic +public class SmelteryDrainLogic extends MultiServantLogic implements ILiquidTank { boolean isDrain; - public SmelteryDrainLogic(boolean drain) + public SmelteryDrainLogic() { - isDrain = drain; + isDrain = true; } @Override diff --git a/tinker/tconstruct/logic/SmelteryLogic.java b/tinker/tconstruct/logic/SmelteryLogic.java index 8b80f792..d714b61a 100644 --- a/tinker/tconstruct/logic/SmelteryLogic.java +++ b/tinker/tconstruct/logic/SmelteryLogic.java @@ -329,7 +329,7 @@ public class SmelteryLogic extends InventoryLogic hasLavaTank = true; } - if (eastID == TContent.searedBrick.blockID) + if (eastID == TContent.smeltery.blockID) numBricks++; else if (eastID == TContent.lavaTank.blockID) {