From b4b05403fda50307e2b35de91296ab9bb53c2baa Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Sat, 29 Apr 2017 22:20:58 -0500 Subject: Updated to TiCo 2.6.3 Added Zweihander Partially added Sheathe Partially added Crest Mount Partially added materials --- .../finishingAnvil/Container_FinishingAnvil.java | 41 -- .../blocks/finishingAnvil/FinishingAnvil.java | 159 ------ .../blocks/finishingAnvil/Gui_FinishingAnvil.java | 609 --------------------- .../blocks/finishingAnvil/ModelFinishingAnvil.java | 65 --- .../finishingAnvil/RenderItem_FinishingAnvil.java | 48 -- .../finishingAnvil/Renderer_FinishingAnvil.java | 45 -- .../finishingAnvil/TileEntity_FinishingAnvil.java | 195 ------- 7 files changed, 1162 deletions(-) delete mode 100644 src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java delete mode 100644 src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java delete mode 100644 src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java delete mode 100644 src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java delete mode 100644 src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java delete mode 100644 src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java delete mode 100644 src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java (limited to 'src/main/java/lance5057/tDefense/finishingAnvil/blocks') diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java deleted file mode 100644 index c10f3b2..0000000 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Container_FinishingAnvil.java +++ /dev/null @@ -1,41 +0,0 @@ -package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class Container_FinishingAnvil extends Container -{ - public Container_FinishingAnvil(InventoryPlayer inventoryPlayer, TileEntity_FinishingAnvil te) - { - addSlotToContainer(new Slot(te, 0, 39, 32)); - - for(int x = 0; x < 9; x++) - { - addSlotToContainer(new Slot(inventoryPlayer, x, 8 + 18 * x, 142)); - } - - for(int y = 0; y < 3; y++) - { - for(int x = 0; x < 9; x++) - { - addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, - 8 + 18 * x, 84 + y * 18)); - } - } - } - - @Override - public boolean canInteractWith(EntityPlayer p_75145_1_) - { - return true; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int par2) - { - return null; - } -} diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java deleted file mode 100644 index c94648b..0000000 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/FinishingAnvil.java +++ /dev/null @@ -1,159 +0,0 @@ -package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; - -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.WEST; - -import java.util.Random; - -import lance5057.tDefense.TinkersDefense; -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class FinishingAnvil extends BlockContainer -{ - public FinishingAnvil() - { - super(Material.iron); - setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - } - - @Override - public void onBlockAdded(World world, int i, int j, int k) - { - super.onBlockAdded(world, i, j, k); - world.markBlockForUpdate(i, j, k); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float what, float these, float are) - { - final TileEntity tileEntity = world.getTileEntity(x, y, z); - if(tileEntity == null || player.isSneaking()) - return false; - //code to open gui explained later - player.openGui(TinkersDefense.instance, TinkersDefense.GUI_ANVIL_INV, player.worldObj, x, y, z); - return true; - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) - { - dropItems(world, x, y, z); - super.breakBlock(world, x, y, z, par5, par6); - } - - private void dropItems(World world, int x, int y, int z) - { - final Random rand = new Random(); - - final TileEntity tileEntity = world.getTileEntity(x, y, z); - if(!(tileEntity instanceof IInventory)) - return; - final IInventory inventory = (IInventory) tileEntity; - - for(int i = 0; i < inventory.getSizeInventory(); i++) - { - final ItemStack item = inventory.getStackInSlot(i); - - if(item != null && item.stackSize > 0) - { - final float rx = rand.nextFloat() * 0.8F + 0.1F; - final float ry = rand.nextFloat() * 0.8F + 0.1F; - final float rz = rand.nextFloat() * 0.8F + 0.1F; - - final EntityItem entityItem = new EntityItem(world, x + rx, - y + ry, z + rz, new ItemStack(item.getItem(), - item.stackSize, item.getItemDamage())); - - if(item.hasTagCompound()) - { - entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy()); - } - - final float factor = 0.05F; - entityItem.motionX = rand.nextGaussian() * factor; - entityItem.motionY = rand.nextGaussian() * factor + 0.2F; - entityItem.motionZ = rand.nextGaussian() * factor; - world.spawnEntityInWorld(entityItem); - item.stackSize = 0; - } - } - } - - //You don't want the normal render type, or it wont render properly. - @Override - public int getRenderType() - { - return -1; - } - - //It's not an opaque cube, so you need this. - @Override - public boolean isOpaqueCube() - { - return false; - } - - //It's not a normal block, so you need this too. - @Override - public boolean renderAsNormalBlock() - { - return false; - } - - //This is the icon to use for showing the block in your hand. - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister icon) - { - blockIcon = icon.registerIcon("tinkersdefense:item_armoranvil"); - } - - @Override - public TileEntity createNewTileEntity(World w, int md) - { - final TileEntity_FinishingAnvil te = new TileEntity_FinishingAnvil(); - return te; - } - - @Override - public int onBlockPlaced(World p_149660_1_, int p_149660_2_, int p_149660_3_, int p_149660_4_, int p_149660_5_, float p_149660_6_, float p_149660_7_, float p_149660_8_, int p_149660_9_) - { - int j1 = p_149660_9_; - - if((p_149660_9_ == 0 || p_149660_5_ == 2) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ + 1, NORTH)) - { - j1 = 1; - } - - if((j1 == 0 || p_149660_5_ == 3) && p_149660_1_.isSideSolid(p_149660_2_, p_149660_3_, p_149660_4_ - 1, SOUTH)) - { - j1 = 2; - } - - if((j1 == 0 || p_149660_5_ == 4) && p_149660_1_.isSideSolid(p_149660_2_ + 1, p_149660_3_, p_149660_4_, WEST)) - { - j1 = 3; - } - - if((j1 == 0 || p_149660_5_ == 5) && p_149660_1_.isSideSolid(p_149660_2_ - 1, p_149660_3_, p_149660_4_, EAST)) - { - j1 = 4; - } - - return j1; - } -} diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java deleted file mode 100644 index 3636b09..0000000 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Gui_FinishingAnvil.java +++ /dev/null @@ -1,609 +0,0 @@ -package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; - -import java.util.ArrayList; -import java.util.List; - -import lance5057.tDefense.TinkersDefense; -import lance5057.tDefense.armor.ArmorCore; -import lance5057.tDefense.armor.renderers.ArmorRenderer; -import lance5057.tDefense.core.network.Message_FinishingAnvil; -import lance5057.tDefense.finishingAnvil.utilities.Injector; -import lance5057.tDefense.finishingAnvil.utilities.ToolCoreTip; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; -import org.lwjgl.util.glu.Project; - -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.ToolCore; -import cpw.mods.fml.client.FMLClientHandler; -import cpw.mods.fml.client.config.GuiButtonExt; - -public class Gui_FinishingAnvil extends GuiContainer -{ - private ItemStack bigCopy; - NBTTagCompound bigCopyTags; - private final RenderItem bigRender = new RenderItem_FinishingAnvil( - this, - 3.5f, - 3.5f, 1.0f); - - private ItemStack rightCopy1, rightCopy2, rightCopy3; - NBTTagCompound rightCopyTags1, rightCopyTags2, - rightCopyTags3; - private final RenderItem normalRender = new RenderItem_FinishingAnvil( - this, 1.0f, - 1.0f, 1.0f); - - //private Boolean isNull = true; - private ItemStack editItem; - - public final TileEntity_FinishingAnvil inventory; - private ResourceLocation forGui; - - private int leftButtonPosX = 0; - private int leftSelect = 0; - - private int rightButtonPos = 0; - private final int rightSelect = 0; - - String[] renders; - - boolean renderFlat = true; - boolean renderBiped = true; - int rotation = 0; - - InventoryPlayer player; - - private static final ResourceLocation iconLocation = new ResourceLocation( - "tinkersdefense", - "textures/gui/finishinganvil.png"); - - public Gui_FinishingAnvil(InventoryPlayer invPlayer, TileEntity_FinishingAnvil te) - { - super(new Container_FinishingAnvil(invPlayer, te)); - inventory = te; - - renders = new String[4]; - renders[0] = "Head"; - renders[1] = "Accessory"; - renders[2] = "Handle"; - renders[3] = "Extra"; - - player = invPlayer; - } - - @Override - public void initGui() - { - super.initGui(); - buttonList.add(new GuiButtonExt(1, guiLeft + 25, guiTop + 11, 10, 10, - "")); - buttonList.add(new GuiButtonExt(2, guiLeft + 25, guiTop + 61, 10, 10, - "")); - buttonList.add(new GuiButtonExt(3, guiLeft + 38, guiTop + 53, 18, 18, - "")); - - buttonList.add(new GuiButtonExt(4, guiLeft + 5, guiTop + 11, 20, 20, "")); - buttonList.add(new GuiButtonExt(5, guiLeft + 5, guiTop + 31, 20, 20, "")); - buttonList.add(new GuiButtonExt(6, guiLeft + 5, guiTop + 51, 20, 20, "")); - - buttonList.add(new GuiButtonExt(7, guiLeft + 141, guiTop + 11, 10, 10, - "")); - buttonList.add(new GuiButtonExt(8, guiLeft + 141, guiTop + 61, 10, 10, - "")); - - buttonList.add(new GuiButtonExt(9, guiLeft + 151, guiTop + 11, 20, 20, - "")); - buttonList.add(new GuiButtonExt(10, guiLeft + 151, guiTop + 31, 20, 20, - "")); - buttonList.add(new GuiButtonExt(11, guiLeft + 151, guiTop + 51, 20, 20, - "")); - - buttonList.add(new GuiButtonExt(12, guiLeft + 38, guiTop + 11, 18, 18, - "")); - buttonList.add(new GuiButtonExt(13, guiLeft + 120, guiTop + 11, 18, 18, - "3D")); - buttonList.add(new GuiButtonExt(14, guiLeft + 120, guiTop + 53, 18, 18, - "")); - - buttonList.add(new GuiButtonExt(15, guiLeft + 59, guiTop + 60, 10, 10, - "<")); - buttonList.add(new GuiButtonExt(16, guiLeft + 107, guiTop + 60, 10, 10, - ">")); - } - - @Override - protected void actionPerformed(GuiButton button) - { - if(bigCopy != null && bigCopyTags != null) - { - switch(button.id) - { - case 1: - if(leftButtonPosX > 0) - { - leftButtonPosX--; - } - break; - case 2: - if(leftButtonPosX + 3 < ((ToolCore) bigCopy.getItem()).getPartAmount()) - { - leftButtonPosX++; - } - break; - - case 3: - TinkersDefense.INSTANCE.sendToServer(new Message_FinishingAnvil( - inventory.xCoord, inventory.yCoord, - inventory.zCoord, bigCopy)); - break; - - case 4: - leftSelect = 0 + leftButtonPosX; - rightButtonPos = 0; - setRenders(); - break; - case 5: - leftSelect = 1 + leftButtonPosX; - rightButtonPos = 0; - setRenders(); - break; - case 6: - leftSelect = 2 + leftButtonPosX; - rightButtonPos = 0; - setRenders(); - break; - - case 7: - if(rightButtonPos > 0) - { - rightButtonPos--; - } - setRenders(); - break; - - case 13: - renderFlat = !renderFlat; - break; - - case 14: - renderBiped = !renderBiped; - break; - - case 15: - if(rotation <= 0) - { - rotation += 360; - } - rotation -= 8; - break; - - case 16: - if(rotation >= 360) - { - rotation -= 360; - } - rotation += 8; - break; - - default: - if(bigCopy.getItem() instanceof ArmorCore) - { - doArmorEdit(button.id); - } - else - { - doToolEdit(button.id); - } - } - } - } - - public void doToolEdit(int id) - { - switch(id) - { - case 9: - if(bigCopyTags.hasKey("Render" + renders[leftSelect])) - { - bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + (rightButtonPos * TinkersDefense.config.MaterialIndex)); - if(rightButtonPos > 0) - { - bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor()); - } - else - { - bigCopyTags.removeTag(renders[leftSelect] + "Color"); - } - } - break; - - case 10: - if(bigCopyTags.hasKey("Render" + renders[leftSelect])) - { - bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 1) * TinkersDefense.config.MaterialIndex)); - bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor()); - } - break; - - case 11: - if(bigCopyTags.hasKey("Render" + renders[leftSelect])) - { - bigCopyTags.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 2) * TinkersDefense.config.MaterialIndex)); - bigCopyTags.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor()); - } - break; - - case 12: - bigCopyTags.setInteger("RenderHead", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[0])); - bigCopyTags.setInteger("RenderAccessory", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[1])); - bigCopyTags.setInteger("RenderHandle", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[2])); - bigCopyTags.setInteger("RenderExtra", bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[3])); - - bigCopyTags.removeTag(renders[0] + "Color"); - bigCopyTags.removeTag(renders[1] + "Color"); - bigCopyTags.removeTag(renders[2] + "Color"); - bigCopyTags.removeTag(renders[3] + "Color"); - - setRenders(); - break; - - case 8: - rightButtonPos++; - setRenders(); - break; - - } - } - - public void doArmorEdit(int id) - { - NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer"); - final ArmorCore armor = (ArmorCore) bigCopy.getItem(); - final List boxes = armor.getRenderer().boxList; - - switch(id) - { - case 9: - aTags.setBoolean(boxes.get(rightButtonPos + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 9).boxName)); - break; - - case 10: - aTags.setBoolean(boxes.get(rightButtonPos + 1 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 1 + 9).boxName)); - break; - - case 11: - aTags.setBoolean(boxes.get(rightButtonPos + 2 + 9).boxName, !aTags.getBoolean(boxes.get(rightButtonPos + 2 + 9).boxName)); - break; - - case 12: - aTags = armor.getRenderer().defaultTags; - break; - - case 8: - if(rightButtonPos < boxes.size() - 12) - { - rightButtonPos++; - } - break; - - } - } - - @Override - public void drawScreen(int x, int y, float par3) - { - - if(inventory.getStackInSlot(0) != null && inventory.getStackInSlot(0).getItem() instanceof ToolCore) - { - if(bigCopy == null) - { - rightButtonPos = 0; - leftButtonPosX = 0; - bigCopy = inventory.getStackInSlot(0).copy(); - if(bigCopy.hasTagCompound() && bigCopy.getTagCompound().hasKey("InfiTool")) - { - bigCopyTags = bigCopy.getTagCompound().getCompoundTag("InfiTool"); - } - setRenders(); - } - else if(bigCopy != null && inventory.getStackInSlot(0).getItem() != bigCopy.getItem() || inventory.getStackInSlot(0).getItemDamage() != bigCopy.getItemDamage()) - { - bigCopy = null; - } - } - else if(inventory.getStackInSlot(0) == null) - { - bigCopy = null; - } - - super.drawScreen(x, y, par3); - drawTooltip(x, y); - } - - @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) - { - - mc.getTextureManager().bindTexture(iconLocation); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - drawTexturedModalRect(144, 14, 5, 167, 5, 3); - drawTexturedModalRect(144, 64, 0, 167, 5, 3); - drawTexturedModalRect(39, 54, 32, 176, 16, 16); - drawTexturedModalRect(39, 12, 48, 176, 16, 16); - drawTexturedModalRect(28, 14, 5, 167, 5, 3); - drawTexturedModalRect(28, 64, 0, 167, 5, 3); - drawTexturedModalRect(121, 54, 16, 176, 16, 16); - - if(bigCopy != null) - { - - if(!(bigCopy.getItem() instanceof ArmorCore)) - { - if(renderFlat) - { - if(leftSelect > 2) - { - drawTexturedModalRect(7, 13, 16, 192, 16, 16); - drawTexturedModalRect(7, 33, 32, 192, 16, 16); - drawTexturedModalRect(7, 53, 48, 192, 16, 16); - } - else - { - drawTexturedModalRect(7, 13, 0, 192, 16, 16); - drawTexturedModalRect(7, 33, 16, 192, 16, 16); - drawTexturedModalRect(7, 53, 32, 192, 16, 16); - } - - ((GuiButtonExt) buttonList.get(14)).enabled = false; - ((GuiButtonExt) buttonList.get(15)).enabled = false; - ((GuiButtonExt) buttonList.get(12)).displayString = "3D"; - - normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy1, 153, 13); - normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy2, 153, 33); - normalRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), rightCopy3, 153, 53); - - } - } - else - { - final NBTTagCompound aTags = bigCopy.getTagCompound().getCompoundTag("ArmorRenderer"); - final ArmorCore armor = (ArmorCore) bigCopy.getItem(); - final List boxes = armor.getRenderer().boxList; - - drawTexturedModalRect(7, 13, 0, 176, 16, 16); - drawTexturedModalRect(7, 33, 0, 176, 16, 16); - drawTexturedModalRect(7, 53, 0, 176, 16, 16); - - //drawTexturedModalRect(153, 13, xRIcon_one + (rightButtonPos * 16), yRIcon_one + (rightButtonPosY * 16), 16, 16); - - drawTexturedModalRect(153, 13, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 9).boxName) ? 0 : 1) * 16), 176, 16, 16); - drawTexturedModalRect(153, 33, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 1 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16); - drawTexturedModalRect(153, 53, 64 + ((aTags.getBoolean(boxes.get(rightButtonPos + 2 + 9).boxName) ? 0 : 1) * 16), 176, 16, 16); - - } - - if(renderFlat) - { - bigRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), bigCopy, 17, 4); - } - - } - - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) - { - mc.getTextureManager().bindTexture(iconLocation); - final int k = ((width - xSize) / 2); - final int l = (height - ySize) / 2; - drawTexturedModalRect(k, l, 0, 0, xSize + 80, ySize); - - if(!renderFlat) - { - if(bigCopy != null && bigCopy.getItem() instanceof ArmorCore) - { - ((GuiButtonExt) buttonList.get(14)).enabled = true; - ((GuiButtonExt) buttonList.get(15)).enabled = true; - - ((GuiButtonExt) buttonList.get(12)).displayString = "2D"; - - final ArmorCore armor = (ArmorCore) bigCopy.getItem(); - - final ArmorRenderer renderer = (ArmorRenderer) armor.getArmorModel(null, bigCopy, 0); - renderer.isChild = false; - - final float limbs = player.player.prevLimbSwingAmount + (player.player.limbSwingAmount - player.player.prevLimbSwingAmount); - final float limbSwing = player.player.limbSwing - player.player.limbSwingAmount * (1.0F); - - GL11.glPushMatrix(); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glPushMatrix(); - GL11.glLoadIdentity(); - - final ScaledResolution scaledresolution = new ScaledResolution( - mc, mc.displayWidth, mc.displayHeight); - //GL11.glViewport(this.guiLeft, this.guiTop, this.width, this.height); - GL11.glViewport((scaledresolution.getScaledWidth() - 213) / 2 * scaledresolution.getScaleFactor(), (scaledresolution.getScaledHeight() - 240) / 2 * scaledresolution.getScaleFactor(), 320 * scaledresolution.getScaleFactor(), 240 * scaledresolution.getScaleFactor()); - GL11.glTranslatef(-0.34F, 0.23F, -0.1F); - Project.gluPerspective(90.0F, 1.3333334F, 9.0F, 80.0F); - final float f1 = 1.0F; - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glLoadIdentity(); - GL11.glColor3d(1f, 1f, 1f); - RenderHelper.enableStandardItemLighting(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glTranslatef(0.0F, 3.3F, -16.0F); - GL11.glScalef(f1, f1, f1); - final float f2 = 3.0F; - GL11.glScalef(f2, f2, f2); - GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - //renderer.setRotationAngles(limbSwing, limbs, player.player.ticksExisted, 0, player.player.rotationPitch, 0.0625f, player.player); - renderer.render(player.player, limbSwing, limbs, player.player.ticksExisted, 0, 0, 0.1f); - - if(renderBiped) - { - final ModelBiped biped = new ModelBiped(0f); - //biped.bipedHeadwear.isHidden = true; - //biped.bipedHead.isHidden = true; - final ResourceLocation rc = new ResourceLocation( - Minecraft.getMinecraft().thePlayer.getLocationSkin().toString()); - - FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc); - // final ITextureObject tex = FMLClientHandler.instance().getClient().getTextureManager().getTexture(rc); - // if(tex.getGlTextureId() == 1) - // { - // rc = new ResourceLocation( - // "minecraft:textures/entity/steve.png"); - // FMLClientHandler.instance().getClient().renderEngine.bindTexture(rc); - // } - - biped.isChild = false; - biped.render(player.player, limbSwing, limbs, player.player.ticksExisted, 0, 0, 0.0625f); - } - - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - RenderHelper.disableStandardItemLighting(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glMatrixMode(GL11.GL_PROJECTION); - GL11.glViewport(0, 0, mc.displayWidth, mc.displayHeight); - GL11.glPopMatrix(); - GL11.glMatrixMode(GL11.GL_MODELVIEW); - GL11.glPopMatrix(); - //RenderHelper.disableStandardItemLighting(); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - } - else - { - renderFlat = true; - } - } - - } - - protected void drawTooltip(int x, int y) - { - final int buttons[] = {4, 5, 6, 9, 10, 11}; - - for(int i = 0; i < buttons.length; i++) - { - final GuiButtonExt button = ((GuiButtonExt) buttonList.get(buttons[i] - 1)); - final boolean mousehover = x >= button.xPosition && y >= button.yPosition && x < button.xPosition + button.width && y < button.yPosition + button.height; - final int test = button.getHoverState(mousehover); - if(test == 2) - { - final List list = new ArrayList(); - - if(bigCopy.getItem() instanceof ArmorCore) - { - bigCopy.getTagCompound().getCompoundTag("ArmorRenderer"); - final ArmorCore armor = (ArmorCore) bigCopy.getItem(); - final List boxes = armor.getRenderer().boxList; - - switch(i) - { - case 0: - case 1: - case 2: - break; - - case 3: - list.add(boxes.get(rightButtonPos + 9).boxName); - break; - case 4: - list.add(boxes.get(rightButtonPos + 1 + 9).boxName); - break; - case 5: - list.add(boxes.get(rightButtonPos + 2 + 9).boxName); - break; - } - func_146283_a(list, x, y); - } - else if(bigCopy != null && bigCopy.getItem() instanceof ToolCore) - { - final ToolCore tool = (ToolCore) bigCopy.getItem(); - final String toolName = tool.getUnlocalizedName().toLowerCase().substring(tool.getUnlocalizedName().lastIndexOf('.') + 1, tool.getUnlocalizedName().length()); - final ToolCoreTip tt = ((Injector) TinkersDefense.tcInject).tools.get(toolName); - - if(tt != null) - { - switch(i) - { - case 0: - list.add(tt.getPart(1 + leftButtonPosX)); - break; - case 2: - list.add(tt.getPart(3 + leftButtonPosX)); - break; - case 1: - list.add(tt.getPart(2 + leftButtonPosX)); - break; - - case 3: - list.add(tt.getPartName(leftSelect + 1, (rightButtonPos))); - break; - case 4: - list.add(tt.getPartName(leftSelect + 1, (rightButtonPos + 1))); - break; - case 5: - list.add(tt.getPartName(leftSelect + 1, (rightButtonPos + 2))); - break; - } - - if(list.get(0).contains("m5")) - { - list.add(" -by Shadowclaimer"); - } - func_146283_a(list, x, y); - } - - else - { - list.add("Error - No name/desc!"); - func_146283_a(list, x, y); - } - } - } - } - } - - void setRenders() - { - rightCopy1 = bigCopy.copy(); - rightCopyTags1 = (NBTTagCompound) bigCopyTags.copy(); - rightCopyTags1.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos) * TinkersDefense.config.MaterialIndex)); - rightCopyTags1.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor()); - rightCopy1.getTagCompound().setTag("InfiTool", rightCopyTags1); - - rightCopy2 = bigCopy.copy(); - rightCopyTags2 = (NBTTagCompound) bigCopyTags.copy(); - rightCopyTags2.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 1) * TinkersDefense.config.MaterialIndex)); - rightCopyTags2.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor()); - rightCopy2.getTagCompound().setTag("InfiTool", rightCopyTags2); - - rightCopy3 = bigCopy.copy(); - rightCopyTags3 = (NBTTagCompound) bigCopyTags.copy(); - rightCopyTags3.setInteger("Render" + renders[leftSelect], bigCopy.getTagCompound().getCompoundTag("InfiTool").getInteger(renders[leftSelect]) + ((rightButtonPos + 2) * TinkersDefense.config.MaterialIndex)); - rightCopyTags3.setInteger(renders[leftSelect] + "Color", TConstructRegistry.getMaterial(bigCopyTags.getInteger(renders[leftSelect])).primaryColor()); - rightCopy3.getTagCompound().setTag("InfiTool", rightCopyTags3); - } -} diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java deleted file mode 100644 index 843b6c9..0000000 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/ModelFinishingAnvil.java +++ /dev/null @@ -1,65 +0,0 @@ -package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; - -/** - * Armor Anvil - lance5057 - * Created using Tabula 4.1.1 - */ -public class ModelFinishingAnvil extends ModelBase -{ - public ModelRenderer Log; - public ModelRenderer HammerHead; - public ModelRenderer HammerHandle; - public ModelRenderer AnvilBase; - public ModelRenderer AnvilStem; - public ModelRenderer AnvilTop; - - public ModelFinishingAnvil() - { - textureWidth = 64; - textureHeight = 64; - AnvilTop = new ModelRenderer(this, 0, 22); - AnvilTop.setRotationPoint(-4.0F, 6.0F, -6.0F); - AnvilTop.addBox(0.0F, 0.0F, 0.0F, 8, 6, 12, 0.0F); - HammerHead = new ModelRenderer(this, 15, 21); - HammerHead.setRotationPoint(-1.3F, 4.0F, 0.0F); - HammerHead.addBox(0.0F, 0.0F, 0.0F, 3, 2, 2, 0.0F); - setRotateAngle(HammerHead, 0.091106186954104F, -0.5462880558742251F, 0.0F); - AnvilStem = new ModelRenderer(this, 10, 32); - AnvilStem.setRotationPoint(-2.0F, 12.0F, -3.0F); - AnvilStem.addBox(0.0F, 0.0F, 0.0F, 4, 2, 6, 0.0F); - HammerHandle = new ModelRenderer(this, 17, 47); - HammerHandle.setRotationPoint(1.0F, 0.5F, -6.0F); - HammerHandle.addBox(0.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F); - AnvilBase = new ModelRenderer(this, 2, 28); - AnvilBase.setRotationPoint(-4.0F, 14.0F, -5.0F); - AnvilBase.addBox(0.0F, 0.0F, 0.0F, 8, 2, 10, 0.0F); - Log = new ModelRenderer(this, 0, 40); - Log.setRotationPoint(-8.0F, 16.0F, -8.0F); - Log.addBox(0.0F, 0.0F, 0.0F, 16, 8, 16, 0.0F); - HammerHead.addChild(HammerHandle); - } - - @Override - public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) - { - AnvilTop.render(f5); - HammerHead.render(f5); - AnvilStem.render(f5); - AnvilBase.render(f5); - Log.render(f5); - } - - /** - * This is a helper function from Tabula to set the rotation of model parts - */ - public void setRotateAngle(ModelRenderer modelRenderer, float x, float y, float z) - { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } -} diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java deleted file mode 100644 index 834b583..0000000 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/RenderItem_FinishingAnvil.java +++ /dev/null @@ -1,48 +0,0 @@ -package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; - -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -import org.lwjgl.opengl.GL11; - -public class RenderItem_FinishingAnvil extends RenderItem -{ - private final Gui_FinishingAnvil anvilGui; - float sx; - float sy; - float sz; - - RenderItem_FinishingAnvil(Gui_FinishingAnvil gui, float sx, float sy, float sz) - { - super(); - anvilGui = gui; - this.sx = sx; - this.sy = sy; - this.sz = sz; - } - - @Override - public void renderItemAndEffectIntoGUI(FontRenderer fontRenderer, TextureManager textureManager, ItemStack itemStack, int x, int y) - { - if(itemStack == null) - return; - - RenderHelper.enableGUIStandardItemLighting(); - - final Slot slot = anvilGui.inventorySlots.getSlotFromInventory(anvilGui.inventory, 0); - - if(slot.getStack() != null) - { - GL11.glPushMatrix(); - - GL11.glScalef(sx, sy, sz); - super.renderItemAndEffectIntoGUI(fontRenderer, textureManager, itemStack, x, y); - - GL11.glPopMatrix(); - } - } -} diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java deleted file mode 100644 index c3013e4..0000000 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/Renderer_FinishingAnvil.java +++ /dev/null @@ -1,45 +0,0 @@ -package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -public class Renderer_FinishingAnvil extends TileEntitySpecialRenderer -{ - private final ModelFinishingAnvil model; - - public Renderer_FinishingAnvil() - { - model = new ModelFinishingAnvil(); - } - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale) - { - - GL11.glPushMatrix(); - - GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - - final ResourceLocation textures = (new ResourceLocation( - "tinkersdefense:textures/blocks/armoranvil.png")); - - Minecraft.getMinecraft().renderEngine.bindTexture(textures); - - GL11.glPushMatrix(); - - te.getBlockMetadata(); - - GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - - model.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - GL11.glPopMatrix(); - GL11.glPopMatrix(); - - } - -} diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java b/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java deleted file mode 100644 index e0567bb..0000000 --- a/src/main/java/lance5057/tDefense/finishingAnvil/blocks/finishingAnvil/TileEntity_FinishingAnvil.java +++ /dev/null @@ -1,195 +0,0 @@ -package lance5057.tDefense.finishingAnvil.blocks.finishingAnvil; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.Constants; - -public class TileEntity_FinishingAnvil extends TileEntity implements IInventory -{ - public static int invSize = 1; - public ItemStack[] inventory; - - private final String name = "Anvil Inventory"; - - public TileEntity_FinishingAnvil() - { - super(); - inventory = new ItemStack[invSize]; - } - - @Override - public void updateEntity() - { - super.updateEntity(); - } - - @Override - public Packet getDescriptionPacket() - { - final NBTTagCompound tag = new NBTTagCompound(); - writeToNBT(tag); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag); - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) - { - readFromNBT(pkt.func_148857_g()); - } - - @Override - public int getSizeInventory() - { - return invSize; - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return inventory[slot]; - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - ItemStack stack = getStackInSlot(slot); - if(stack != null) - { - if(stack.stackSize > amount) - { - stack = stack.splitStack(amount); - - if(stack.stackSize == 0) - { - setInventorySlotContents(slot, null); - } - } - else - { - setInventorySlotContents(slot, null); - } - - markDirty(); - } - return stack; - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) - { - final ItemStack stack = getStackInSlot(slot); - - if(stack != null) - { - setInventorySlotContents(slot, stack); - } - return stack; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack itemstack) - { - inventory[slot] = itemstack; - - if(itemstack != null && itemstack.stackSize > getInventoryStackLimit()) - { - itemstack.stackSize = getInventoryStackLimit(); - } - - markDirty(); - } - - @Override - public String getInventoryName() - { - return name; - } - - @Override - public boolean hasCustomInventoryName() - { - return name.length() > 0; - } - - @Override - public int getInventoryStackLimit() - { - return 1; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer p_70300_1_) - { - return true; - } - - @Override - public void openInventory() - { - - } - - @Override - public void closeInventory() - { - - } - - @Override - public boolean isItemValidForSlot(int p_94041_1_, ItemStack p_94041_2_) - { - return true; - } - - @Override - public void writeToNBT(NBTTagCompound compound) - { - super.writeToNBT(compound); - writeInventoryToNBT(compound); - } - - @Override - public void readFromNBT(NBTTagCompound compound) - { - super.readFromNBT(compound); - readInventoryFromNBT(compound); - } - - public void readInventoryFromNBT(NBTTagCompound tags) - { - final NBTTagList nbttaglist = tags.getTagList("Items", Constants.NBT.TAG_COMPOUND); - for(int iter = 0; iter < nbttaglist.tagCount(); iter++) - { - final NBTTagCompound tagList = nbttaglist.getCompoundTagAt(iter); - final byte slotID = tagList.getByte("Slot"); - if(slotID >= 0 && slotID < inventory.length) - { - inventory[slotID] = ItemStack.loadItemStackFromNBT(tagList); - } - } - } - - public void writeInventoryToNBT(NBTTagCompound tags) - { - final NBTTagList nbttaglist = new NBTTagList(); - for(int iter = 0; iter < inventory.length; iter++) - { - if(inventory[iter] != null) - { - final NBTTagCompound tagList = new NBTTagCompound(); - tagList.setByte("Slot", (byte) iter); - inventory[iter].writeToNBT(tagList); - nbttaglist.appendTag(tagList); - } - } - - tags.setTag("Items", nbttaglist); - } -} -- cgit v1.2.3