From e2ecb66ef2ffe8b754fc28351495a9a6dd234f96 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Thu, 4 Apr 2013 21:02:49 -0700 Subject: [PATCH] Broken potion launcher --- mods/tinker/common/InventoryBlock.java | 1 - mods/tinker/golems/blocks/GolemCoreBlock.java | 115 ++ mods/tinker/golems/blocks/GolemHeadBlock.java | 1014 +++++++++++++++++ .../golems/blocks/GolemPedestalBlock.java | 147 +++ .../tinker/golems/client/GolemCoreRender.java | 117 ++ .../golems/client/GolemCoreSpecialRender.java | 64 ++ mods/tinker/golems/logic/GolemCoreLogic.java | 113 ++ .../golems/logic/GolemPedestalLogic.java | 358 ++++++ mods/tinker/tconstruct/PHConstruct.java | 20 +- mods/tinker/tconstruct/TConstruct.java | 2 +- mods/tinker/tconstruct/TContent.java | 118 +- .../tconstruct/blocks/LiquidMetalBase.java | 2 +- .../client/CastingTableSpecialRenderer.java | 2 +- .../tconstruct/client/TProxyClient.java | 10 + .../client/entityrender/ThrownItemRender.java | 92 ++ mods/tinker/tconstruct/entity/BlueSlime.java | 11 +- .../tconstruct/entity/LaunchedPotion.java | 192 ++++ .../tconstruct/entity/UnstableCreeper.java | 10 +- .../tconstruct/library/AbilityHelper.java | 32 +- mods/tinker/tconstruct/library/ToolCore.java | 48 +- .../tconstruct/tools/PotionLauncher.java | 122 ++ mods/tinker/textures/GGE/GUIPedestal.png | Bin 0 -> 1250 bytes mods/tinker/textures/GGE/ItemLBInnerSide.png | Bin 0 -> 739 bytes mods/tinker/textures/GGE/ItemLBOuterSide.png | Bin 0 -> 477 bytes mods/tinker/textures/GGE/ItemLBPoleSide.png | Bin 0 -> 772 bytes mods/tinker/textures/GGE/achievementsbg.png | Bin 0 -> 395 bytes mods/tinker/textures/GGE/b.png | Bin 0 -> 163 bytes mods/tinker/textures/GGE/core.png | Bin 0 -> 3130 bytes mods/tinker/textures/GGE/corestone.png | Bin 0 -> 2985 bytes mods/tinker/textures/GGE/elderpork.png | Bin 0 -> 426 bytes mods/tinker/textures/GGE/face.png | Bin 0 -> 3258 bytes mods/tinker/textures/GGE/glowlogside.png | Bin 0 -> 3357 bytes mods/tinker/textures/GGE/glowlogtop.png | Bin 0 -> 3327 bytes mods/tinker/textures/GGE/glowsapling.png | Bin 0 -> 338 bytes mods/tinker/textures/GGE/lifebench top.png | Bin 0 -> 3104 bytes mods/tinker/textures/GGE/lifebenchside.png | Bin 0 -> 511 bytes mods/tinker/textures/GGE/lifebenchtop.png | Bin 0 -> 894 bytes mods/tinker/textures/GGE/notebook.png | Bin 0 -> 441 bytes mods/tinker/textures/GGE/recharger.png | Bin 0 -> 3237 bytes mods/tinker/textures/GGE/transparency.png | Bin 0 -> 182 bytes mods/tinker/textures/GGE/wand.png | Bin 0 -> 3298 bytes mods/tinker/textures/blocks/golemcore.png | Bin 0 -> 402 bytes .../tinker/textures/blocks/golemhead_face.png | Bin 0 -> 3358 bytes .../tinker/textures/blocks/golemhead_side.png | Bin 0 -> 2992 bytes mods/tinker/textures/blocks/golemhead_top.png | Bin 0 -> 3196 bytes mods/tinker/textures/blocks/pedestal.png | Bin 0 -> 3157 bytes .../tinker/textures/blocks/pedestalbottom.png | Bin 0 -> 3436 bytes mods/tinker/textures/blocks/pedestalside.png | Bin 0 -> 3501 bytes mods/tinker/textures/blocks/pedestaltop.png | Bin 0 -> 3518 bytes mods/tinker/textures/blocks/pedestaltopp.png | Bin 0 -> 3552 bytes mods/tinker/textures/blocks/pedestaltops.png | Bin 0 -> 3518 bytes mods/tinker/textures/items/materials.png | Bin 32188 -> 0 bytes mods/tinker/textures/items/patterns.png | Bin 11375 -> 0 bytes mods/tinker/textures/items/potionlauncher.png | Bin 0 -> 1015 bytes test/NegaFood.java | 14 + test/XinStick.java | 4 +- test/mod_Test.java | 8 +- 57 files changed, 2543 insertions(+), 73 deletions(-) create mode 100644 mods/tinker/golems/blocks/GolemCoreBlock.java create mode 100644 mods/tinker/golems/blocks/GolemHeadBlock.java create mode 100644 mods/tinker/golems/blocks/GolemPedestalBlock.java create mode 100644 mods/tinker/golems/client/GolemCoreRender.java create mode 100644 mods/tinker/golems/client/GolemCoreSpecialRender.java create mode 100644 mods/tinker/golems/logic/GolemCoreLogic.java create mode 100644 mods/tinker/golems/logic/GolemPedestalLogic.java create mode 100644 mods/tinker/tconstruct/client/entityrender/ThrownItemRender.java create mode 100644 mods/tinker/tconstruct/entity/LaunchedPotion.java create mode 100644 mods/tinker/tconstruct/tools/PotionLauncher.java create mode 100644 mods/tinker/textures/GGE/GUIPedestal.png create mode 100644 mods/tinker/textures/GGE/ItemLBInnerSide.png create mode 100644 mods/tinker/textures/GGE/ItemLBOuterSide.png create mode 100644 mods/tinker/textures/GGE/ItemLBPoleSide.png create mode 100644 mods/tinker/textures/GGE/achievementsbg.png create mode 100644 mods/tinker/textures/GGE/b.png create mode 100644 mods/tinker/textures/GGE/core.png create mode 100644 mods/tinker/textures/GGE/corestone.png create mode 100644 mods/tinker/textures/GGE/elderpork.png create mode 100644 mods/tinker/textures/GGE/face.png create mode 100644 mods/tinker/textures/GGE/glowlogside.png create mode 100644 mods/tinker/textures/GGE/glowlogtop.png create mode 100644 mods/tinker/textures/GGE/glowsapling.png create mode 100644 mods/tinker/textures/GGE/lifebench top.png create mode 100644 mods/tinker/textures/GGE/lifebenchside.png create mode 100644 mods/tinker/textures/GGE/lifebenchtop.png create mode 100644 mods/tinker/textures/GGE/notebook.png create mode 100644 mods/tinker/textures/GGE/recharger.png create mode 100644 mods/tinker/textures/GGE/transparency.png create mode 100644 mods/tinker/textures/GGE/wand.png create mode 100644 mods/tinker/textures/blocks/golemcore.png create mode 100644 mods/tinker/textures/blocks/golemhead_face.png create mode 100644 mods/tinker/textures/blocks/golemhead_side.png create mode 100644 mods/tinker/textures/blocks/golemhead_top.png create mode 100644 mods/tinker/textures/blocks/pedestal.png create mode 100644 mods/tinker/textures/blocks/pedestalbottom.png create mode 100644 mods/tinker/textures/blocks/pedestalside.png create mode 100644 mods/tinker/textures/blocks/pedestaltop.png create mode 100644 mods/tinker/textures/blocks/pedestaltopp.png create mode 100644 mods/tinker/textures/blocks/pedestaltops.png delete mode 100644 mods/tinker/textures/items/materials.png delete mode 100644 mods/tinker/textures/items/patterns.png create mode 100644 mods/tinker/textures/items/potionlauncher.png create mode 100644 test/NegaFood.java diff --git a/mods/tinker/common/InventoryBlock.java b/mods/tinker/common/InventoryBlock.java index 94de53d2..a3cc1802 100644 --- a/mods/tinker/common/InventoryBlock.java +++ b/mods/tinker/common/InventoryBlock.java @@ -150,7 +150,6 @@ public abstract class InventoryBlock extends BlockContainer public void registerIcons(IconRegister iconRegister) { String[] textureNames = getTextureNames(); - //System.out.println("TextureNames: :"+this.getClass().getSimpleName()); this.icons = new Icon[textureNames.length]; for (int i = 0; i < this.icons.length; ++i) diff --git a/mods/tinker/golems/blocks/GolemCoreBlock.java b/mods/tinker/golems/blocks/GolemCoreBlock.java new file mode 100644 index 00000000..57e4b922 --- /dev/null +++ b/mods/tinker/golems/blocks/GolemCoreBlock.java @@ -0,0 +1,115 @@ +package mods.tinker.golems.blocks; + +import mods.tinker.common.InventoryBlock; +import mods.tinker.golems.client.GolemCoreRender; +import mods.tinker.golems.logic.GolemCoreLogic; +import mods.tinker.tconstruct.TConstruct; +import mods.tinker.tconstruct.library.TConstructRegistry; +import net.minecraft.block.material.Material; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public class GolemCoreBlock extends InventoryBlock +{ + public GolemCoreBlock(int id) + { + super(id, Material.rock); + this.setCreativeTab(TConstructRegistry.blockTab); + } + + public boolean isOpaqueCube() + { + return false; + } + + public boolean renderAsNormalBlock() + { + return false; + } + + public int getRenderType() + { + return GolemCoreRender.model; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + { + if (!world.isRemote) + { + GolemCoreLogic logic = (GolemCoreLogic)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 stack = logic.decrStackSize(0, 1); + if (stack != null) + addItemToInventory(player, world, x, y, z, stack); + } + + world.markBlockForUpdate(x, y, z); + } + return true; + } + + protected void addItemToInventory (EntityPlayer player, World world, int x, int y, int z, ItemStack stack) + { + if (!world.isRemote) + { + EntityItem entityitem = new EntityItem(world, (double) x + 0.5D, (double) y + 0.9325D, (double) z + 0.5D, stack); + world.spawnEntityInWorld(entityitem); + entityitem.onCollideWithPlayer(player); + } + } + + public int damageDropped(int meta) + { + return meta; + } + + @Override + public Icon getBlockTextureFromSideAndMetadata(int side, int meta) + { + return icons[0]; + } + + @Override + public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + { + return true; + } + + @Override + public TileEntity createTileEntity (World world, int metadata) + { + return new GolemCoreLogic(); + } + + @Override + public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) + { + return null; //Not sure if gui block or not, probably not + } + + @Override + public Object getModInstance () + { + return TConstruct.instance; + } + + @Override + public String[] getTextureNames () + { + return new String[] { "golemcore" }; + } +} diff --git a/mods/tinker/golems/blocks/GolemHeadBlock.java b/mods/tinker/golems/blocks/GolemHeadBlock.java new file mode 100644 index 00000000..98a1e654 --- /dev/null +++ b/mods/tinker/golems/blocks/GolemHeadBlock.java @@ -0,0 +1,1014 @@ +package mods.tinker.golems.blocks; + +import mods.tinker.golems.logic.GolemCoreLogic; +import mods.tinker.tconstruct.TContent; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class GolemHeadBlock extends Block +{ + /*public static int headSideTex = ModLoader.addOverride("/terrain.png", "/GGE/golemheadside.png"); + public static int headTopTex = ModLoader.addOverride("/terrain.png", "/GGE/golemheadtop&bottom.png"); + public static int face;*/ + + public GolemHeadBlock(int id) + { + super(id, Material.ground); + //setTickRandomly(true); + } + + public Icon[] icons; + public String[] textureNames = new String[] { "golemhead_face", "golemhead_side", "golemhead_top"}; + + @Override + public void registerIcons(IconRegister iconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = iconRegister.registerIcon("tinker:"+textureNames[i]); + } + } + + @Override + public void onNeighborBlockChange (World world, int x, int y, int z, int blockID) + { + if (buildGolem(world, x, y, z, world.getBlockMetadata(x, y, z))) + { + //mod_Golems.trigger("headachievement"); + } + } + + /*public int getBlockTextureFromSideAndMetadata(int i, int j) + { + if (i == 1) + { + return headTopTex; + } + if (i == 0) + { + return headTopTex; + } + int k = face; + if (j == 2 && i == 2) + { + return k; + } + if (j == 3 && i == 5) + { + return k; + } + if (j == 0 && i == 3) + { + return k; + } + if (j == 1 && i == 4) + { + return k; + } + else + { + return headSideTex; + } + }*/ + + /*public int getBlockTextureFromSide(int i) + { + int j = face; + if (i == 1) + { + return blockIndexInTexture; + } + if (i == 0) + { + return blockIndexInTexture; + } + if (i == 3) + { + return j; + } + else + { + return blockIndexInTexture + 16; + } + }*/ + + @Override + public void onBlockPlacedBy (World world, int i, int j, int k, EntityLiving entityliving, ItemStack par6ItemStack) + { + int l = MathHelper.floor_double((double) ((entityliving.rotationYaw * 4F) / 360F) + 2.5D) & 3; + world.setBlockMetadataWithNotify(i, j, k, l, 3); + if (!buildGolem(world, i, j, k, l)) + { + for (int i1 = 0; (double) i1 < Math.random() * 5D + 3D; i1++) + { + world.spawnParticle("largesmoke", (double) i + Math.random(), (double) j + 1.2D + Math.random() / 2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + } + } + /*else + { + mod_Golems.trigger("headachievement"); + }*/ + } + + private boolean idIsInvalid (int i) + { + return Block.blocksList[i] != null && (!Block.blocksList[i].renderAsNormalBlock() && i != TContent.golemCore.blockID || i == 43 || i == 44 || i == Block.chest.blockID); + } + + private boolean buildGolem (World world, int x, int y, int z, int metadata) + { + /*int pedestalHeight = 0; + for (int yPos = 1; yPos <= 3; yPos++) + { + if (world.getBlockId(x, y - yPos, z) == TContent.golemPedestal.blockID) + { + pedestalHeight = yPos; + } + } + + if (pedestalHeight == 0) + { + return false; + } + for (int height = pedestalHeight; height >= 0; height--) + { + if (world.getBlockId(x, y - height, z) == 0) + { + return false; + } + } + + int l1 = 0; + int i2 = 0; + ItemStack itemstack = null; + GolemCoreLogic coreLogic = null; + int golemBlockIDs[][] = new int[3][3]; + int golemBlockMetas[][] = new int[3][3]; + for (int arrX = 0; arrX < 3; arrX++) + { + for (int arrY = 0; arrY < 3; arrY++) + { + golemBlockIDs[arrX][arrY] = 0; + } + } + + for (int iterX = -1; iterX <= 1; iterX++) + { + for (int iterY = 0; iterY < 3; iterY++) + { + if (iterY + (3 - pedestalHeight) >= 3 || iterY + (3 - pedestalHeight) == 0 && iterX != 0) + { + continue; + } + if (metadata == 0) + { + int bID = world.getBlockId(x - iterX, y - iterY, z); + if (idIsInvalid(bID)) + { + bID = 0; + return false; + } + if (bID == blockID) + { + i2++; + } + golemBlockIDs[iterX + 1][iterY + (3 - pedestalHeight)] = bID; + golemBlockMetas[iterX + 1][iterY + (3 - pedestalHeight)] = bID == blockID ? 0 : world.getBlockMetadata(x - iterX, y - iterY, z); + } + if (metadata == 1) + { + int l3 = world.getBlockId(x, y - iterY, z - iterX); + if (idIsInvalid(l3)) + { + l3 = 0; + return false; + } + if (l3 == blockID) + { + i2++; + } + golemBlockIDs[iterX + 1][iterY + (3 - pedestalHeight)] = l3; + golemBlockMetas[iterX + 1][iterY + (3 - pedestalHeight)] = l3 == blockID ? 0 : world.getBlockMetadata(x, y - iterY, z - iterX); + } + if (metadata == 2) + { + int i4 = world.getBlockId(x + iterX, y - iterY, z); + if (idIsInvalid(i4)) + { + i4 = 0; + return false; + } + if (i4 == blockID) + { + i2++; + } + golemBlockIDs[iterX + 1][iterY + (3 - pedestalHeight)] = i4; + golemBlockMetas[iterX + 1][iterY + (3 - pedestalHeight)] = i4 == blockID ? 0 : world.getBlockMetadata(x + iterX, y - iterY, z); + } + if (metadata == 3) + { + int bID = world.getBlockId(x, y - iterY, z + iterX); + if (idIsInvalid(bID)) + { + bID = 0; + return false; + } + if (bID == blockID) + { + i2++; + } + golemBlockIDs[iterX + 1][iterY + (3 - pedestalHeight)] = bID; + golemBlockMetas[iterX + 1][iterY + (3 - pedestalHeight)] = bID == blockID ? 0 : world.getBlockMetadata(x, y - iterY, z + iterX); + } + if (i2 > 1) + { + return false; + } + if (golemBlockIDs[iterX + 1][iterY + (3 - pedestalHeight)] != 0 && Block.blocksList[golemBlockIDs[iterX + 1][iterY]] != null + && !Block.blocksList[golemBlockIDs[iterX + 1][iterY]].renderAsNormalBlock() && (iterX + 1 == 0 || iterX + 1 == 2) && iterY == 2 + && golemBlockIDs[iterX + 1][iterY] != TContent.golemCore.blockID) + { + return false; + } + if (golemBlockIDs[iterX + 1][iterY + (3 - pedestalHeight)] == TContent.golemCore.blockID) + { + l1++; + if (metadata == 0) + { + coreLogic = (GolemCoreLogic) world.getBlockTileEntity(x - iterX, y - iterY, z); + } + if (metadata == 1) + { + coreLogic = (GolemCoreLogic) world.getBlockTileEntity(x, y - iterY, z - iterX); + } + if (metadata == 2) + { + coreLogic = (GolemCoreLogic) world.getBlockTileEntity(x + iterX, y - iterY, z); + } + if (metadata == 3) + { + coreLogic = (GolemCoreLogic) world.getBlockTileEntity(x, y - iterY, z + iterX); + } + itemstack = coreLogic.getKey(); + } + if (l1 > 1) + { + return false; + } + } + } + + boolean flag = false; + for (int j3 = 0; j3 < 3; j3++) + { + for (int k4 = 0; k4 < 3; k4++) + { + if (golemBlockIDs[k4][j3] == this.blockID) + { + flag = true; + } + } + } + + if (!flag) + { + return false; + } + if (golemBlockIDs[0][2] != 0 && Block.blocksList[golemBlockIDs[0][2]].renderAsNormalBlock() || golemBlockIDs[2][2] != 0 && Block.blocksList[golemBlockIDs[2][2]].renderAsNormalBlock()) + { + return false; + } + if (l1 > 0 + && (golemBlockIDs[0][0] == TContent.golemCore.blockID || golemBlockIDs[0][1] == TContent.golemCore.blockID || golemBlockIDs[2][0] == TContent.golemCore.blockID || golemBlockIDs[2][1] == TContent.golemCore.blockID)) + { + return false; + } + TileEntity tileentity = world.getBlockTileEntity(x, y - pedestalHeight, z); + if (!(tileentity instanceof TileEntityGolemPedestal)) + { + return false; + } + TileEntityGolemPedestal tileentitygolempedestal = (TileEntityGolemPedestal) tileentity; + if (tileentitygolempedestal.subtractSoul(l1 == 1 ? 8 : 1) && world.getBlockId(x, y - pedestalHeight, z) == TContent.golemPedestal.blockID) + { + EntityGenericGolem entitygenericgolem = new EntityGenericGolem(world); + EntityPlayerSP entityplayersp = ModLoader.getMinecraftInstance().thePlayer; + double d = ((EntityPlayer) (entityplayersp)).posX - (double) (float) ((double) x + 0.5D); + double d1 = ((EntityPlayer) (entityplayersp)).posZ - (double) (float) ((double) z + 0.5D); + entitygenericgolem.setBody(golemBlockIDs, golemBlockMetas, y, pedestalHeight); + entitygenericgolem.setPositionAndRotation((double) x + 0.5D, (y - pedestalHeight) + 1, (double) z + 0.5D, (float) ((Math.atan2(d1, d) * 180D) / 3.1415927410125732D) - 90F, 0.0F); + if (l1 > 0) + { + entitygenericgolem.setCore(itemstack); + } + if (coreLogic != null) + { + //((GolemCoreBlock) mod_Golems.golemCore).killDisplayItem(world, coreLogic.xCoord, coreLogic.yCoord, coreLogic.zCoord); + //coreLogic.key = null; + } + if (!buildInterrupt(world, x, y, z, metadata, golemBlockIDs, golemBlockMetas, pedestalHeight, coreLogic != null, itemstack, coreLogic) && world.spawnEntityInWorld(entitygenericgolem)) + { + delBlocks(world, x, y, z, metadata, golemBlockIDs, pedestalHeight); + world.spawnParticle("hugeexplosion", (double) x + Math.random(), (double) y + 1.2D, (double) z + Math.random(), 0.0D, 0.0D, 0.0D); + return true; + } + else + { + return false; + } + } + else + { + return false; + }*/ + return false; + } + + public boolean buildInterrupt (World world, int i, int j, int k, int l, int ai[][], int ai1[][], int i1, boolean flag, ItemStack itemstack, GolemCoreLogic tileentitygolemcore) + { + /*EntityPlayerSP entityplayersp = ModLoader.getMinecraftInstance().thePlayer; + double d = ((EntityPlayer) (entityplayersp)).posX - (double) (float) ((double) i + 0.5D); + double d1 = ((EntityPlayer) (entityplayersp)).posZ - (double) (float) ((double) k + 0.5D); + int j1 = world.difficultySetting; + int k1 = 0; + for (int l1 = 0; l1 < 3; l1++) + { + for (int i2 = 0; i2 < 3; i2++) + { + if (ai[l1][i2] != 0) + { + k1++; + } + } + } + + boolean flag1 = ai[0][1] != 0 || ai[2][1] != 0; + if (isAll(ai, ai1, Block.tnt.blockID, -1) || i1 == 3 && ai[1][1] == Block.tnt.blockID && ai[1][2] == Block.cloth.blockID && ai1[1][2] == 5 && !flag1 && j1 >= 1) + { + EntityCreeper entitycreeper = new EntityCreeper(world); + entitycreeper.setPositionAndRotation((double) i + 0.5D, (j - i1) + 1, (double) k + 0.5D, (float) ((Math.atan2(d1, d) * 180D) / 3.1415927410125732D) - 90F, 0.0F); + world.spawnEntityInWorld(entitycreeper); + delBlocks(world, i, j, k, l, ai, i1); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + mod_Golems.trigger("creeper"); + return true; + } + if (isAll(ai, ai1, Block.netherrack.blockID, -1) && i1 == 3 && j1 >= 1) + { + EntityBlaze entityblaze = new EntityBlaze(world); + entityblaze.setPositionAndRotation((double) i + 0.5D, (j - i1) + 1, (double) k + 0.5D, (float) ((Math.atan2(d1, d) * 180D) / 3.1415927410125732D) - 90F, 0.0F); + world.spawnEntityInWorld(entityblaze); + delBlocks(world, i, j, k, l, ai, i1); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + mod_Golems.trigger("blaze"); + return true; + } + if (isAll(ai, ai1, Block.obsidian.blockID, -1) && i1 == 3 && countBlock(ai, ai1, Block.obsidian.blockID, -1) == 2 && j1 >= 1) + { + EntityEnderman entityenderman = new EntityEnderman(world); + entityenderman.setPositionAndRotation((double) i + 0.5D, (j - i1) + 1, (double) k + 0.5D, (float) ((Math.atan2(d1, d) * 180D) / 3.1415927410125732D) - 90F, 0.0F); + world.spawnEntityInWorld(entityenderman); + delBlocks(world, i, j, k, l, ai, i1); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + mod_Golems.trigger("enderman"); + return true; + } + if (hasBlock(ai, ai1, Block.tnt.blockID, -1) && hasBlock(ai, ai1, Block.netherrack.blockID, -1)) + { + boolean flag2 = false; + Entity aentity[][] = new Entity[3][3]; + for (int j2 = 0; j2 < 3; j2++) + { + for (int l2 = 0; l2 < 3; l2++) + { + aentity[j2][l2] = null; + if (ai[j2][l2] == Block.tnt.blockID) + { + EntityTNTPrimed entitytntprimed = new EntityTNTPrimed(world); + entitytntprimed.fuse = 80; + aentity[j2][l2] = entitytntprimed; + } + } + } + + replEntity(world, i, j, k, l, ai, aentity, i1); + i1 = updateBody(ai, ai1); + EntityGenericGolem entitygenericgolem = new EntityGenericGolem(world); + entitygenericgolem.setBody(ai, ai1, l, i1); + entitygenericgolem.setPositionAndRotation((double) i + 0.5D, (j - i1) + 1, (double) k + 0.5D, (float) ((Math.atan2(d1, d) * 180D) / 3.1415927410125732D) - 90F, 0.0F); + if (flag) + { + entitygenericgolem.setCore(itemstack); + } + world.spawnEntityInWorld(entitygenericgolem); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + mod_Golems.trigger("boom"); + return true; + } + if (i1 == 3 && !flag1 && ai[1][2] == Block.blockSteel.blockID && ai[1][1] == Block.blockSteel.blockID) + { + List list = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getAABBPool().getAABB(i, j, k, (double) i + 1.0D, (double) j + 1.0D, (double) k + 1.0D).expand(4D, 16D, 4D)); + Entity entity; + for (Iterator iterator = list.iterator(); iterator.hasNext(); world.addWeatherEffect(new EntityLightningBolt(world, entity.posX, entity.posY, entity.posZ))) + { + Object obj = iterator.next(); + entity = (Entity) obj; + } + + mod_Golems.trigger("zap"); + } + else + { + if (isAll(ai, ai1, Block.cloth.blockID, 0) && countBlock(ai, ai1, Block.cloth.blockID, 0) == 4) + { + EntitySheep entitysheep = new EntitySheep(world); + entitysheep.setPositionAndRotation((double) i + 0.5D, (j - i1) + 1, (double) k + 0.5D, (float) ((Math.atan2(d1, d) * 180D) / 3.1415927410125732D) - 90F, 0.0F); + world.spawnEntityInWorld(entitysheep); + delBlocks(world, i, j, k, l, ai, i1); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + mod_Golems.trigger("sheep"); + return true; + } + if (countBlock(ai, ai1, Block.furnaceIdle.blockID, -1) >= (int) (Math.random() * 2D + 2D)) + { + ItemStack aitemstack[][] = new ItemStack[3][3]; + aitemstack[0][1] = new ItemStack(Block.lavaMoving, 1); + aitemstack[2][1] = new ItemStack(Block.lavaMoving, 1); + aitemstack[1][0] = new ItemStack(Block.lavaMoving, 1); + aitemstack[1][1] = new ItemStack(Block.lavaMoving, 1); + aitemstack[1][2] = new ItemStack(Block.lavaMoving, 1); + replBlocks(world, i, j, k, l, ai, aitemstack, i1); + mod_Golems.trigger("meltdown"); + return true; + } + if (hasBlock(ai, ai1, Block.stoneBrick.blockID, -1) && Math.random() <= 0.40000000000000002D) + { + boolean flag3 = false; + Entity aentity1[][] = new Entity[3][3]; + for (int k2 = 0; k2 < 3; k2++) + { + for (int i3 = 0; i3 < 3; i3++) + { + aentity1[k2][i3] = null; + if (ai[k2][i3] == Block.stoneBrick.blockID) + { + aentity1[k2][i3] = Math.random() <= 0.59999999999999998D ? ((Entity) (new EntitySilverfish(world))) : null; + } + } + } + + replEntity(world, i, j, k, l, ai, aentity1, i1); + i1 = updateBody(ai, ai1); + EntityGenericGolem entitygenericgolem1 = new EntityGenericGolem(world); + entitygenericgolem1.setBody(ai, ai1, l, i1); + entitygenericgolem1.setPositionAndRotation((double) i + 0.5D, (j - i1) + 1, (double) k + 0.5D, (float) ((Math.atan2(d1, d) * 180D) / 3.1415927410125732D) - 90F, 0.0F); + if (flag) + { + entitygenericgolem1.setCore(itemstack); + } + world.spawnEntityInWorld(entitygenericgolem1); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + mod_Golems.trigger("silverfish"); + return true; + } + if (countBlock(ai, ai1, Block.melon.blockID, -1) == 4) + { + delBlocks(world, i, j, k, l, ai, i1); + EntityGSpawn entitygspawn = new EntityGSpawn(world); + entitygspawn.setPosition(i, j, k); + entitygspawn.skin = "http://s3.amazonaws.com/MinecraftSkins/loligator704.png"; + world.spawnEntityInWorld(entitygspawn); + mod_Golems.trigger("loligator"); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + return true; + } + if (countBlock(ai, ai1, Block.cloth.blockID, 13) == 3 && ai[1][1] == Block.cloth.blockID && ai1[1][1] == 0) + { + delBlocks(world, i, j, k, l, ai, i1); + EntityGSpawn entitygspawn1 = new EntityGSpawn(world); + entitygspawn1.setPosition(i, j, k); + entitygspawn1.skin = "http://s3.amazonaws.com/MinecraftSkins/coalheartly.png"; + world.spawnEntityInWorld(entitygspawn1); + mod_Golems.trigger("bitterman"); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + return true; + } + if (countBlock(ai, ai1, Block.cloth.blockID, 11) == 3 && ai[1][1] == Block.blockLapis.blockID) + { + delBlocks(world, i, j, k, l, ai, i1); + EntityGSpawn entitygspawn2 = new EntityGSpawn(world); + entitygspawn2.setPosition(i, j, k); + entitygspawn2.skin = "http://s3.amazonaws.com/MinecraftSkins/BILLYTG101.png"; + world.spawnEntityInWorld(entitygspawn2); + mod_Golems.trigger("yourstruly"); + return true; + } + if (countBlock(ai, ai1, Block.cloth.blockID, 12) == 2 && ai[1][1] == Block.blockGold.blockID && ai[1][2] == Block.cloth.blockID && ai1[1][2] == 0) + { + delBlocks(world, i, j, k, l, ai, i1); + EntityGSpawn entitygspawn3 = new EntityGSpawn(world); + entitygspawn3.setPosition(i, j, k); + entitygspawn3.skin = "http://s3.amazonaws.com/MinecraftSkins/Notch.png"; + world.spawnEntityInWorld(entitygspawn3); + mod_Golems.trigger("king"); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + return true; + } + + if (isAll(ai, ai1, Block.blockClay.blockID, -1) && i1 == 3 && countBlock(ai, ai1, Block.blockClay.blockID, -1) == 2 && j1 >= 1) + { + EntityZombie entityzombie = new EntityZombie(world); + entityzombie.setPositionAndRotation((double) i + 0.5D, (j - i1) + 1, (double) k + 0.5D, (float) ((Math.atan2(d1, d) * 180D) / 3.1415927410125732D) - 90F, 0.0F); + world.spawnEntityInWorld(entityzombie); + delBlocks(world, i, j, k, l, ai, i1); + world.spawnParticle("hugeexplosion", (double) i + Math.random(), (double) j + 1.2D, (double) k + Math.random(), 0.0D, 0.0D, 0.0D); + mod_Golems.trigger("zombie"); + return true; + } + }*/ + return false; + } + + private void delBlocks (World world, int i, int j, int k, int l, int ai[][], int i1) + { + for (int j1 = -1; j1 <= 1; j1++) + { + for (int k1 = 0; k1 < i1; k1++) + { + if (k1 == 0 && j1 != 0 || ai[j1 + 1][(k1 - i1) + 3] == 0) + { + continue; + } + if (l == 0) + { + world.setBlock(i - j1, j - k1, k, 0); + } + if (l == 1) + { + world.setBlock(i, j - k1, k - j1, 0); + } + if (l == 2) + { + world.setBlock(i + j1, j - k1, k, 0); + } + if (l == 3) + { + world.setBlock(i, j - k1, k + j1, 0); + } + } + } + + if (i1 == 2 && (ai[0][1] != 0 || ai[2][1] != 0)) + { + if (l == 0) + { + if (ai[0][1] != 0) + { + world.setBlock(i + 1, j, k, 0); + } + if (ai[2][1] != 0) + { + world.setBlock(i - 1, j, k, 0); + } + } + if (l == 1) + { + if (ai[0][1] != 0) + { + world.setBlock(i, j, k + 1, 0); + } + if (ai[2][1] != 0) + { + world.setBlock(i, j, k - 1, 0); + } + } + if (l == 2) + { + if (ai[0][1] != 0) + { + world.setBlock(i - 1, j, k, 0); + } + if (ai[2][1] != 0) + { + world.setBlock(i + 1, j, k, 0); + } + } + if (l == 3) + { + if (ai[0][1] != 0) + { + world.setBlock(i, j, k - 1, 0); + } + if (ai[2][1] != 0) + { + world.setBlock(i, j, k + 1, 0); + } + } + } + } + + private boolean hasBlock (int ai[][], int ai1[][], int i, int j) + { + for (int k = 0; k < 3; k++) + { + for (int l = 0; l < 3; l++) + { + if (ai[k][l] == i && (ai1[k][l] == j || j == -1)) + { + return true; + } + } + } + + return false; + } + + private void replBlocks (World world, int i, int j, int k, int l, int ai[][], ItemStack aitemstack[][], int i1) + { + for (int j1 = -1; j1 <= 1; j1++) + { + for (int k1 = 0; k1 < i1; k1++) + { + if (aitemstack[j1 + 1][(k1 - i1) + 3] == null) + { + aitemstack[j1 + 1][(k1 - i1) + 3] = new ItemStack(0, 0, 0); + } + if (k1 == 0 && j1 != 0 || ai[j1 + 1][(k1 - i1) + 3] == 0) + { + continue; + } + if (l == 0) + { + world.setBlock(i - j1, j - k1, k, aitemstack[j1 + 1][(k1 - i1) + 3].itemID, aitemstack[j1 + 1][(k1 - i1) + 3].getItemDamage(), 3); + } + if (l == 1) + { + world.setBlock(i, j - k1, k - j1, aitemstack[j1 + 1][(k1 - i1) + 3].itemID, aitemstack[j1 + 1][(k1 - i1) + 3].getItemDamage(), 3); + } + if (l == 2) + { + world.setBlock(i + j1, j - k1, k, aitemstack[j1 + 1][(k1 - i1) + 3].itemID, aitemstack[j1 + 1][(k1 - i1) + 3].getItemDamage(), 3); + } + if (l == 3) + { + world.setBlock(i, j - k1, k + j1, aitemstack[j1 + 1][(k1 - i1) + 3].itemID, aitemstack[j1 + 1][(k1 - i1) + 3].getItemDamage(), 3); + } + } + } + + if (i1 == 2 && (ai[0][1] != 0 || ai[2][1] != 0)) + { + if (l == 0) + { + if (ai[0][1] != 0) + { + world.setBlock(i + 1, j, k, aitemstack[0][1].itemID, aitemstack[0][1].getItemDamage(), 3); + } + if (ai[2][1] != 0) + { + world.setBlock(i - 1, j, k, aitemstack[2][1].itemID, aitemstack[2][1].getItemDamage(), 3); + } + } + if (l == 1) + { + if (ai[0][1] != 0) + { + world.setBlock(i, j, k + 1, aitemstack[0][1].itemID, aitemstack[0][1].getItemDamage(), 3); + } + if (ai[2][1] != 0) + { + world.setBlock(i, j, k - 1, aitemstack[2][1].itemID, aitemstack[2][1].getItemDamage(), 3); + } + } + if (l == 2) + { + if (ai[0][1] != 0) + { + world.setBlock(i - 1, j, k, aitemstack[0][1].itemID, aitemstack[0][1].getItemDamage(), 3); + } + if (ai[2][1] != 0) + { + world.setBlock(i + 1, j, k, aitemstack[2][1].itemID, aitemstack[2][1].getItemDamage(), 3); + } + } + if (l == 3) + { + if (ai[0][1] != 0) + { + world.setBlock(i, j, k - 1, aitemstack[0][1].itemID, aitemstack[0][1].getItemDamage(), 3); + } + if (ai[2][1] != 0) + { + world.setBlock(i, j, k + 1, aitemstack[2][1].itemID, aitemstack[2][1].getItemDamage(), 3); + } + } + } + } + + private void replEntity (World world, int i, int j, int k, int l, int ai[][], Entity aentity[][], int i1) + { + for (int j1 = -1; j1 <= 1; j1++) + { + for (int k1 = 0; k1 < i1; k1++) + { + if (k1 == 0 && j1 != 0) + { + continue; + } + Entity entity8 = aentity[j1 + 1][(k1 - i1) + 3]; + if (ai[j1 + 1][(k1 - i1) + 3] == 0) + { + if (entity8 != null) + { + entity8.setDead(); + } + continue; + } + if (l == 0) + { + world.setBlock(i - j1, j - k1, k, 0); + if (entity8 != null) + { + entity8.setPosition(((float) i - (float) j1) + 0.5F, ((float) j - (float) k1) + 0.5F, (float) k + 0.5F); + world.spawnEntityInWorld(entity8); + ai[j1 + 1][(k1 - i1) + 3] = 0; + } + } + if (l == 1) + { + world.setBlock(i, j - k1, k - j1, 0); + if (entity8 != null) + { + entity8.setPosition(((float) i - (float) j1) + 0.5F, ((float) j - (float) k1) + 0.5F, (float) k + 0.5F); + world.spawnEntityInWorld(entity8); + ai[j1 + 1][(k1 - i1) + 3] = 0; + } + } + if (l == 2) + { + world.setBlock(i + j1, j - k1, k, 0); + if (entity8 != null) + { + entity8.setPosition(((float) i - (float) j1) + 0.5F, ((float) j - (float) k1) + 0.5F, (float) k + 0.5F); + world.spawnEntityInWorld(entity8); + ai[j1 + 1][(k1 - i1) + 3] = 0; + } + } + if (l != 3) + { + continue; + } + world.setBlock(i, j - k1, k + j1, 0); + if (entity8 != null) + { + entity8.setPosition(((float) i - (float) j1) + 0.5F, ((float) j - (float) k1) + 0.5F, (float) k + 0.5F); + world.spawnEntityInWorld(entity8); + ai[j1 + 1][(k1 - i1) + 3] = 0; + } + } + } + + if (i1 == 2 && (ai[0][1] != 0 || ai[2][1] != 0)) + { + Object obj = null; + if (l == 0) + { + if (ai[0][1] != 0) + { + world.setBlock(i + 1, j, k, 0); + Entity entity; + if ((entity = aentity[0][1]) != null) + { + entity.setPosition((float) i + 1.0F + 0.5F, (float) j + 0.5F, (float) k + 0.5F); + world.spawnEntityInWorld(aentity[0][1]); + ai[2][1] = 0; + } + } + else if (aentity[0][1] != null) + { + aentity[0][1].setDead(); + } + if (ai[2][1] != 0) + { + world.setBlock(i - 1, j, k, 0); + Entity entity1; + if ((entity1 = aentity[2][1]) != null) + { + entity1.setPosition(((float) i - 1.0F) + 0.5F, (float) j + 0.5F, (float) k + 0.5F); + world.spawnEntityInWorld(aentity[2][1]); + ai[2][1] = 0; + } + } + else if (aentity[2][1] != null) + { + aentity[2][1].setDead(); + } + } + if (l == 1) + { + if (ai[0][1] != 0) + { + world.setBlock(i, j, k + 1, 0); + Entity entity2; + if ((entity2 = aentity[0][1]) != null) + { + entity2.setPosition((float) i + 0.5F, (float) j + 0.5F, (float) k + 1.0F + 0.5F); + world.spawnEntityInWorld(aentity[0][1]); + ai[2][1] = 0; + } + } + else if (aentity[0][1] != null) + { + aentity[0][1].setDead(); + } + if (ai[2][1] != 0) + { + world.setBlock(i, j, k - 1, 0); + Entity entity3; + if ((entity3 = aentity[2][1]) != null) + { + entity3.setPosition((float) i + 0.5F, (float) j + 0.5F, ((float) k - 1.0F) + 0.5F); + world.spawnEntityInWorld(aentity[2][1]); + ai[2][1] = 0; + } + } + else if (aentity[2][1] != null) + { + aentity[2][1].setDead(); + } + } + if (l == 2) + { + if (ai[0][1] != 0) + { + world.setBlock(i - 1, j, k, 0); + Entity entity4; + if ((entity4 = aentity[0][1]) != null) + { + entity4.setPosition(((float) i - 1.0F) + 0.5F, (float) j + 0.5F, (float) k + 0.5F); + world.spawnEntityInWorld(aentity[0][1]); + ai[2][1] = 0; + } + } + else if (aentity[0][1] != null) + { + aentity[0][1].setDead(); + } + if (ai[2][1] != 0) + { + world.setBlock(i + 1, j, k, 0); + Entity entity5; + if ((entity5 = aentity[2][1]) != null) + { + entity5.setPosition((float) i + 1.0F + 0.5F, (float) j + 0.5F, (float) k + 0.5F); + world.spawnEntityInWorld(aentity[2][1]); + ai[2][1] = 0; + } + } + else if (aentity[2][1] != null) + { + aentity[2][1].setDead(); + } + } + if (l == 3) + { + if (ai[0][1] != 0) + { + world.setBlock(i, j, k - 1, 0); + Entity entity6; + if ((entity6 = aentity[0][1]) != null) + { + entity6.setPosition((float) i + 0.5F, (float) j + 0.5F, (float) k + 1.0F + 0.5F); + world.spawnEntityInWorld(aentity[0][1]); + } + } + else if (aentity[0][1] != null) + { + aentity[0][1].setDead(); + } + if (ai[2][1] != 0) + { + world.setBlock(i, j, k + 1, 0); + Entity entity7; + if ((entity7 = aentity[2][1]) != null) + { + entity7.setPosition((float) i + 0.5F, (float) j + 0.5F, (float) k + 1.0F + 0.5F); + world.spawnEntityInWorld(aentity[2][1]); + } + } + else if (aentity[2][1] != null) + { + aentity[2][1].setDead(); + } + } + } + } + + private int updateBody (int ai[][], int ai1[][]) + { + for (int i = 0; ai[1][2] == 0 && i < 3;) + { + i++; + for (int i1 = 0; i1 < 3; i1++) + { + int j2 = ai[i1][0]; + int l2 = ai[i1][1]; + ai[i1][0] = ai[i1][2]; + ai[i1][1] = j2; + ai[i1][2] = l2; + } + + int j1 = 0; + while (j1 < 3) + { + int k2 = ai1[j1][0]; + int i3 = ai1[j1][1]; + ai1[j1][0] = ai1[j1][2]; + ai1[j1][1] = k2; + ai1[j1][2] = i3; + j1++; + } + } + + if (ai[1][1] == 0) + { + for (int j = 0; j < 3; j++) + { + int k1 = ai[j][0]; + ai[j][0] = ai[j][1]; + ai[j][1] = k1; + } + + for (int k = 0; k < 3; k++) + { + int l1 = ai1[k][0]; + ai1[k][0] = ai1[k][1]; + ai1[k][1] = l1; + } + } + int l = 0; + for (int i2 = 0; i2 < 3; i2++) + { + if (ai[1][i2] != 0) + { + l = 3 - i2; + } + } + + if (l == 1) + { + ai[0][1] = 0; + ai[2][1] = 0; + ai1[0][1] = 0; + ai1[2][1] = 0; + } + return 0; + } + + private boolean isAll (int ai[][], int ai1[][], int i, int j) + { + boolean flag = false; + for (int k = 0; k < 3; k++) + { + for (int l = 0; l < 3; l++) + { + if (ai[k][l] != i && ai[k][l] != 0 && ai[k][l] != this.blockID && (ai1[k][l] != j || j == -1)) + { + return false; + } + if (ai[k][l] == i && (ai1[k][l] == j || j == -1)) + { + flag = true; + } + } + } + + return flag; + } + + private int countBlock (int ai[][], int ai1[][], int i, int j) + { + int k = 0; + for (int l = 0; l < 3; l++) + { + for (int i1 = 0; i1 < 3; i1++) + { + if (ai[l][i1] == i && (ai1[l][i1] == j || j == -1)) + { + k++; + } + } + } + + return k; + } +} diff --git a/mods/tinker/golems/blocks/GolemPedestalBlock.java b/mods/tinker/golems/blocks/GolemPedestalBlock.java new file mode 100644 index 00000000..1bdc5fe7 --- /dev/null +++ b/mods/tinker/golems/blocks/GolemPedestalBlock.java @@ -0,0 +1,147 @@ +package mods.tinker.golems.blocks; + +import java.util.Random; + +import mods.tinker.common.InventoryBlock; +import mods.tinker.golems.logic.GolemPedestalLogic; +import net.minecraft.block.material.Material; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class GolemPedestalBlock extends InventoryBlock +{ + /*public static int texTop; + public static int texTopp; + public static int texSide; + public static int texBottom;*/ + + public GolemPedestalBlock(int i) + { + super(i, Material.wood); + /*texTop = ModLoader.addOverride("/terrain.png", "/GGE/pedestaltop.png"); + texTopp = ModLoader.addOverride("/terrain.png", "/GGE/pedestaltopp.png"); + texSide = ModLoader.addOverride("/terrain.png", "/GGE/pedestalside.png"); + texBottom = ModLoader.addOverride("/terrain.png", "/GGE/pedestalbottom.png");*/ + } + + /*public int getBlockTextureFromSideAndMetadata(int i, int j) + { + if (i == 1) + { + return j == 0 ? texTop : texTopp; + } + if (i == 0) + { + return texBottom; + } + if (i == 2 || i == 4) + { + return texSide; + } + else + { + return texSide; + } + }*/ + + /*public int idDropped(int i, Random random, int j) + { + return super.idDropped(i, random, j); + }*/ + + /*public void onBlockPlacedBy(World world, int i, int j, int k, EntityLiving entityliving) + { + super.onBlockPlacedBy(world, i, j, k, entityliving); + ItemStack itemstack = ((EntityPlayer)entityliving).getCurrentEquippedItem(); + world.setBlockMetadata(i, j, k, itemstack.getItemDamage()); + }*/ + + public void onBlockRemoval(World world, int i, int j, int k) + { + Random random = new Random(); + GolemPedestalLogic tileentitygolempedestal = (GolemPedestalLogic)world.getBlockTileEntity(i, j, k); + if (tileentitygolempedestal != null) + { + label0: + for (int l = 0; l < tileentitygolempedestal.getSizeInventory(); l++) + { + ItemStack itemstack = tileentitygolempedestal.getStackInSlot(l); + if (itemstack == null) + { + continue; + } + float f = random.nextFloat() * 0.8F + 0.1F; + float f1 = random.nextFloat() * 0.8F + 0.1F; + float f2 = random.nextFloat() * 0.8F + 0.1F; + do + { + if (itemstack.stackSize <= 0) + { + continue label0; + } + int i1 = random.nextInt(21) + 10; + if (i1 > itemstack.stackSize) + { + i1 = itemstack.stackSize; + } + itemstack.stackSize -= i1; + EntityItem entityitem = new EntityItem(world, (float)i + f, (float)j + f1, (float)k + f2, new ItemStack(itemstack.itemID, i1, itemstack.getItemDamage())); + float f3 = 0.05F; + entityitem.motionX = (float)random.nextGaussian() * f3; + entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)random.nextGaussian() * f3; + world.spawnEntityInWorld(entityitem); + } + while (true); + } + } + //super.onBlockRemoval(world, i, j, k); + } + + public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) + { + /*ItemStack itemstack = entityplayer.getCurrentEquippedItem(); + if (world.isRemote) + { + return true; + } + if (itemstack == null || itemstack != null && (itemstack.itemID >= 256 || itemstack.itemID == 0 || itemstack.itemID == Block.slowSand.blockID)) + { + ModLoader.openGUI(entityplayer, new GuiGolemPedestal(entityplayer.inventory, world, i, j, k)); + return true; + } + else + { + return false; + }*/ + return false; + } + + @Override + public TileEntity createTileEntity (World world, int metadata) + { + return new GolemPedestalLogic(); + } + + @Override + public Integer getGui (World world, int x, int y, int z, EntityPlayer entityplayer) + { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object getModInstance () + { + return null; + } + + @Override + public String[] getTextureNames () + { + return null; + } +} diff --git a/mods/tinker/golems/client/GolemCoreRender.java b/mods/tinker/golems/client/GolemCoreRender.java new file mode 100644 index 00000000..f1b76bbb --- /dev/null +++ b/mods/tinker/golems/client/GolemCoreRender.java @@ -0,0 +1,117 @@ +package mods.tinker.golems.client; + +import org.lwjgl.opengl.GL11; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.src.ModLoader; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class GolemCoreRender implements ISimpleBlockRenderingHandler +{ + public static int model = RenderingRegistry.getNextAvailableRenderId(); + + @Override + public void renderInventoryBlock (Block block, int metadata, int modelID, RenderBlocks renderer) + { + /*Tessellator tessellator = Tessellator.instance; + double d = 0.1875D; + World world = ModLoader.getMinecraftInstance().theWorld; + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, -1F, 0.0F); + renderblocks.renderBottomFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(0)); + renderblocks.renderBottomFace(block, -0.5D, 0.5D - d, -0.5D, block.getBlockTextureFromSide(0)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 0.0F); + renderblocks.renderTopFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(1)); + renderblocks.renderTopFace(block, -0.5D, -1.5D + d, -0.5D, block.getBlockTextureFromSide(1)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(1.0F, 0.0F, 0.0F); + renderblocks.renderEastFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(2)); + renderblocks.renderEastFace(block, -0.5D, -0.5D, 0.5D - d, block.getBlockTextureFromSide(2)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(-1F, 1.0F, 0.0F); + renderblocks.renderWestFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(3)); + renderblocks.renderWestFace(block, -0.5D, -0.5D, -1.5D + d, block.getBlockTextureFromSide(3)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, 1.0F); + renderblocks.renderNorthFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(4)); + renderblocks.renderNorthFace(block, 0.5D - d, -0.5D, -0.5D, block.getBlockTextureFromSide(4)); + tessellator.draw(); + tessellator.startDrawingQuads(); + tessellator.setNormal(0.0F, 1.0F, -1F); + renderblocks.renderSouthFace(block, -0.5D, -0.5D, -0.5D, block.getBlockTextureFromSide(5)); + renderblocks.renderSouthFace(block, -1.5D + d, -0.5D, -0.5D, block.getBlockTextureFromSide(5)); + tessellator.draw();*/ + renderInvBlock(renderer, block, metadata); + } + + @Override + public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) + { + renderer.setRenderBounds(0.0F, 0F, 0.0F, 1.0F, 0.1875F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.8125F, 0.0F, 1.0F, 1.0F, 1.0F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.1875F, 0.0F, 0.1875F, 0.8125F, 0.1875F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.8175, 0.1875F, 0.0F, 1f, 0.8125F, 0.1875F); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.0F, 0.1875F, 0.8175, 0.1875F, 0.8125F, 1f); + renderer.renderStandardBlock(block, x, y, z); + renderer.setRenderBounds(0.8175F, 0.1875F, 0.8175, 1f, 0.8125F, 1f); + renderer.renderStandardBlock(block, x, y, z); + return true; + } + + @Override + public boolean shouldRender3DInInventory () + { + return true; + } + + @Override + public int getRenderId () + { + return model; + } + + public static void renderInvBlock (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/mods/tinker/golems/client/GolemCoreSpecialRender.java b/mods/tinker/golems/client/GolemCoreSpecialRender.java new file mode 100644 index 00000000..b5dab01e --- /dev/null +++ b/mods/tinker/golems/client/GolemCoreSpecialRender.java @@ -0,0 +1,64 @@ +package mods.tinker.golems.client; + +import mods.tinker.common.fancyitem.FancyEntityItem; +import mods.tinker.golems.logic.GolemCoreLogic; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/* Special renderer, only used for drawing tools */ + +@SideOnly(Side.CLIENT) +public class GolemCoreSpecialRender extends TileEntitySpecialRenderer +{ + @Override + public void renderTileEntityAt (TileEntity logic, double var2, double var4, double var6, float var8) + { + this.render((GolemCoreLogic) logic, var2, var4, var6, var8); + } + + public void render (GolemCoreLogic 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); + + ItemStack stack = logic.getStackInSlot(0); + if (stack != null) + renderItem(logic, stack); + + GL11.glPopMatrix(); + } + + void renderItem(GolemCoreLogic logic, ItemStack stack) + { + FancyEntityItem entityitem = new FancyEntityItem(logic.worldObj, 0.0D, 0.0D, 0.0D, stack); + entityitem.getEntityItem().stackSize = 1; + entityitem.hoverStart = 0.0F; + GL11.glPushMatrix(); + GL11.glTranslatef(1F, 0.675F, 1.0F); + //GL11.glRotatef(90F, 1, 0F, 0F); + GL11.glScalef(1.4F, 1.4F, 1.4F); + if (stack.getItem() instanceof ItemBlock) + { + GL11.glScalef(1.6F, 1.6F, 1.6F); + GL11.glTranslatef(0F, 0.045F, 0.0f); + } + + RenderItem.renderInFrame = true; + RenderManager.instance.renderEntityWithPosYaw(entityitem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); + RenderItem.renderInFrame = false; + + GL11.glPopMatrix(); + } +} diff --git a/mods/tinker/golems/logic/GolemCoreLogic.java b/mods/tinker/golems/logic/GolemCoreLogic.java new file mode 100644 index 00000000..e2cecfb6 --- /dev/null +++ b/mods/tinker/golems/logic/GolemCoreLogic.java @@ -0,0 +1,113 @@ +package mods.tinker.golems.logic; + +import mods.tinker.common.InventoryLogic; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +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; + +public class GolemCoreLogic extends InventoryLogic + implements IInventory +{ + + public GolemCoreLogic() + { + super(1); + } + + public ItemStack getKey() + { + return inventory[0]; + } + + public void setKey(ItemStack itemstack) + { + inventory[0] = itemstack; + onInventoryChanged(); + } + + public void clear() + { + inventory[0] = null; + } + + public int getSizeInventory() + { + return 1; + } + + public ItemStack getStackInSlot(int slot) + { + return inventory[0]; + } + + public int getInventoryStackLimit() + { + return 1; + } + + public boolean canInteractWith(EntityPlayer entityplayer) + { + return true; + } + + public void openChest() {} + public void closeChest() {} + + public boolean isUseableByPlayer(EntityPlayer entityplayer) + { + return true; + } + + @Override + public ItemStack getStackInSlotOnClosing (int i) + { + return null; + } + + @Override + public boolean isInvNameLocalized () + { + return false; + } + + @Override + public boolean isStackValidForSlot (int i, ItemStack itemstack) + { + return true; + } + + @Override + public Container getGuiContainer (InventoryPlayer inventoryplayer, World world, int x, int y, int z) + { + return null; + } + + @Override + protected String getDefaultName () + { + return "golems.core"; + } + + /* 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/mods/tinker/golems/logic/GolemPedestalLogic.java b/mods/tinker/golems/logic/GolemPedestalLogic.java new file mode 100644 index 00000000..e1b20cbe --- /dev/null +++ b/mods/tinker/golems/logic/GolemPedestalLogic.java @@ -0,0 +1,358 @@ +package mods.tinker.golems.logic; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.src.ModLoader; +import net.minecraft.tileentity.TileEntity; + +public class GolemPedestalLogic extends TileEntity + implements IInventory +{ + public ItemStack supply; + public static int cost[] = null; + public static int souls[] = null; + + public GolemPedestalLogic() + { + supply = null; + if (cost == null) + { + cost = new int[512]; + souls = new int[512]; + cost[Block.planks.blockID] = 0; + cost[Block.wood.blockID] = 32; + cost[Block.cloth.blockID] = 8; + cost[Block.cobblestoneMossy.blockID] = 16; + cost[Block.obsidian.blockID] = 8; + cost[Block.pumpkin.blockID] = 8; + cost[Block.netherrack.blockID] = 64; + cost[Block.slowSand.blockID] = 1; + cost[Block.glowStone.blockID] = 1; + cost[Block.pumpkinLantern.blockID] = 8; + cost[Block.blockDiamond.blockID] = 1; + cost[Block.blockGold.blockID] = 1; + cost[Block.blockSteel.blockID] = 1; + cost[Block.blockLapis.blockID] = 1; + cost[Block.jukebox.blockID] = 1; + cost[Block.music.blockID] = 1; + cost[Block.melon.blockID] = 8; + cost[Block.torchRedstoneIdle.blockID] = 6; + cost[Block.torchRedstoneActive.blockID] = cost[Block.torchRedstoneIdle.blockID]; + cost[Item.redstone.itemID] = 6; + cost[Item.beefRaw.itemID] = 8; + cost[Item.beefCooked.itemID] = cost[Item.beefRaw.itemID]; + cost[Item.porkRaw.itemID] = cost[Item.beefRaw.itemID]; + cost[Item.porkCooked.itemID] = cost[Item.beefRaw.itemID]; + cost[Item.enderPearl.itemID] = 1; + cost[Item.eyeOfEnder.itemID] = 1; + cost[Item.blazeRod.itemID] = 2; + cost[Block.mushroomBrown.blockID] = 16; + cost[Block.mushroomRed.blockID] = cost[Block.mushroomBrown.blockID]; + cost[Block.netherStalk.blockID] = 6; + cost[Item.lightStoneDust.itemID] = 4; + cost[Item.diamond.itemID] = 1; + cost[Item.ingotIron.itemID] = 8; + cost[Item.ingotGold.itemID] = 2; + cost[Item.reed.itemID] = 8; + cost[Item.sugar.itemID] = cost[Item.reed.itemID]; + cost[Item.bucketLava.itemID] = 1; + cost[Item.cake.itemID] = 1; + cost[Item.bucketMilk.itemID] = 1; + cost[Item.wheat.itemID] = 32; + cost[Item.bread.itemID] = 8; + cost[Block.plantYellow.blockID] = 32; + cost[Block.plantRed.blockID] = cost[Block.plantYellow.blockID]; + cost[Block.dragonEgg.blockID] = 1; + cost[Block.tallGrass.blockID] = 64; + cost[Block.sapling.blockID] = 64; + cost[Item.ghastTear.itemID] = 8; + cost[Item.goldNugget.itemID] = 18; + cost[Item.spiderEye.itemID] = 16; + cost[Item.fermentedSpiderEye.itemID] = 6; + cost[Item.bowlSoup.itemID] = 0; + cost[Item.fishRaw.itemID] = 1; + cost[Item.fishCooked.itemID] = cost[Item.fishRaw.itemID]; + cost[Item.magmaCream.itemID] = 2; + cost[Item.blazePowder.itemID] = 4; + cost[Item.speckledMelon.itemID] = 1; + cost[Item.paper.itemID] = 8; + cost[Item.book.itemID] = 2; + cost[Item.egg.itemID] = 4; + cost[Item.slimeBall.itemID] = 2; + cost[Item.saddle.itemID] = 1; + cost[Item.feather.itemID] = 48; + cost[Item.gunpowder.itemID] = 16; + cost[Item.appleRed.itemID] = 8; + cost[Item.appleGold.itemID] = 1; + cost[Item.dyePowder.itemID] = 64; + cost[Item.bone.itemID] = 2; + cost[Item.rottenFlesh.itemID] = 48; + cost[Item.cookie.itemID] = 16; + cost[Item.melon.itemID] = 32; + cost[Item.chickenCooked.itemID] = 8; + cost[Item.chickenRaw.itemID] = cost[Item.chickenCooked.itemID]; + cost[Item.silk.itemID] = 64; + cost[Block.cactus.blockID] = 32; + souls[Block.planks.blockID] = 0; + souls[Block.wood.blockID] = 1; + souls[Block.cloth.blockID] = 1; + souls[Block.cobblestoneMossy.blockID] = 1; + souls[Block.obsidian.blockID] = 1; + souls[Block.pumpkin.blockID] = 1; + souls[Block.netherrack.blockID] = 1; + souls[Block.slowSand.blockID] = 1; + souls[Block.glowStone.blockID] = 2; + souls[Block.pumpkinLantern.blockID] = 1; + souls[Block.blockDiamond.blockID] = 27; + souls[Block.blockGold.blockID] = 2; + souls[Block.blockSteel.blockID] = 2; + souls[Block.blockLapis.blockID] = 3; + souls[Block.jukebox.blockID] = 3; + souls[Block.music.blockID] = 1; + souls[Block.melon.blockID] = 1; + souls[Block.torchRedstoneIdle.blockID] = 1; + souls[Block.torchRedstoneActive.blockID] = souls[Block.torchRedstoneIdle.blockID]; + souls[Item.redstone.itemID] = 1; + souls[Item.beefRaw.itemID] = 1; + souls[Item.beefCooked.itemID] = souls[Item.beefRaw.itemID]; + souls[Item.porkRaw.itemID] = souls[Item.beefRaw.itemID]; + souls[Item.porkCooked.itemID] = souls[Item.beefRaw.itemID]; + souls[Item.enderPearl.itemID] = 1; + souls[Item.eyeOfEnder.itemID] = 2; + souls[Item.blazeRod.itemID] = 2; + souls[Block.mushroomBrown.blockID] = 1; + souls[Block.mushroomRed.blockID] = souls[Block.mushroomBrown.blockID]; + souls[Block.netherStalk.blockID] = 1; + souls[Item.lightStoneDust.itemID] = 1; + souls[Item.diamond.itemID] = 3; + souls[Item.ingotIron.itemID] = 1; + souls[Item.ingotGold.itemID] = 1; + souls[Item.reed.itemID] = 1; + souls[Item.sugar.itemID] = souls[Item.reed.itemID]; + souls[Item.bucketLava.itemID] = 1; + souls[Item.cake.itemID] = 1; + souls[Item.bucketMilk.itemID] = 1; + souls[Item.wheat.itemID] = 1; + souls[Item.bread.itemID] = 1; + souls[Block.plantYellow.blockID] = 1; + souls[Block.plantRed.blockID] = souls[Block.plantYellow.blockID]; + souls[Block.dragonEgg.blockID] = 1; + souls[Block.tallGrass.blockID] = 1; + souls[Block.sapling.blockID] = 1; + souls[Item.ghastTear.itemID] = 1; + souls[Item.goldNugget.itemID] = 1; + souls[Item.spiderEye.itemID] = 1; + souls[Item.fermentedSpiderEye.itemID] = 1; + souls[Item.bowlSoup.itemID] = 1; + souls[Item.fishRaw.itemID] = 1; + souls[Item.fishCooked.itemID] = souls[Item.fishRaw.itemID]; + souls[Item.magmaCream.itemID] = 1; + souls[Item.blazePowder.itemID] = 1; + souls[Item.speckledMelon.itemID] = 1; + souls[Item.paper.itemID] = 1; + souls[Item.book.itemID] = 1; + souls[Item.egg.itemID] = 1; + souls[Item.slimeBall.itemID] = 1; + souls[Item.saddle.itemID] = 1; + souls[Item.feather.itemID] = 1; + souls[Item.gunpowder.itemID] = 1; + souls[Item.appleRed.itemID] = 1; + souls[Item.appleGold.itemID] = 3; + souls[Item.dyePowder.itemID] = 1; + souls[Item.bone.itemID] = 1; + souls[Item.rottenFlesh.itemID] = 1; + souls[Item.cookie.itemID] = 1; + souls[Item.melon.itemID] = 1; + souls[Item.chickenCooked.itemID] = 1; + souls[Item.chickenRaw.itemID] = souls[Item.chickenCooked.itemID]; + souls[Item.silk.itemID] = 1; + souls[Block.cactus.blockID] = 1; + } + } + + public int getSizeInventory() + { + return 9; + } + + public ItemStack getStackInSlot(int i) + { + if (supply != null && supply.getItem() == null) + { + supply = null; + } + return supply; + } + + public boolean subtractSoul(int i) + { + System.out.println("SUBTRACT WHY"); + if (supply == null || supply.itemID >= 512 || cost[supply.itemID] == 0) + { + worldObj.playSoundAtEntity(ModLoader.getMinecraftInstance().thePlayer, "mob.blaze.death", 1.0F, 0.5F); + ModLoader.getMinecraftInstance().thePlayer.addChatMessage("I require more souls..."); + return false; + } + int j = cost[supply.itemID]; + int k = souls[supply.itemID]; + int l = (supply.stackSize / j) * k; + System.out.println((new StringBuilder()).append("Subtracting amt").append(i).append(" s").append(k).append(" c").append(j).append(" ss").append(supply.stackSize).append(" id").append(supply.itemID).append(" sa").append(l).append(" calc").append(Math.ceil((double)i / (double)k)).toString()); + if (l < i) + { + worldObj.playSoundAtEntity(ModLoader.getMinecraftInstance().thePlayer, "mob.blaze.death", 1.0F, 0.5F); + ModLoader.getMinecraftInstance().thePlayer.addChatMessage("I need more souls..."); + return false; + } + supply.stackSize -= Math.ceil((double)i / (double)k) * (double)j; + if (supply.stackSize == 0) + { + supply = null; + } + else if (supply.stackSize < 0) + { + throw new UnsupportedOperationException((new StringBuilder()).append("If you are getting this error then your golems mod has derped, \nplease contact billythegoat101 on the minecraftforums with the error code: LERN YO MATHS [i").append(supply.itemID).append(",ss").append(supply.stackSize).append(",a").append(i).append("]").toString()); + } + return true; + } + + public ItemStack decrStackSize(int i, int j) + { + if (supply != null && supply.getItem() == null) + { + supply = null; + } + if (supply != null) + { + if (supply.stackSize <= j) + { + ItemStack itemstack = supply; + supply = null; + onInventoryChanged(); + return itemstack; + } + ItemStack itemstack1 = supply.splitStack(j); + if (supply.stackSize == 0) + { + supply = null; + } + onInventoryChanged(); + return itemstack1; + } + else + { + return null; + } + } + + public void setInventorySlotContents(int i, ItemStack itemstack) + { + supply = itemstack; + if (itemstack != null && itemstack.stackSize > getInventoryStackLimit()) + { + itemstack.stackSize = getInventoryStackLimit(); + } + if (supply != null && supply.getItem() == null) + { + supply = null; + } + onInventoryChanged(); + } + + public void writeToNBT(NBTTagCompound nbttagcompound) + { + super.writeToNBT(nbttagcompound); + if (supply == null) + { + supply = new ItemStack(0, 0, 0); + } + NBTTagList nbttaglist = new NBTTagList(); + if (supply != null) + { + NBTTagCompound nbttagcompound1 = new NBTTagCompound(); + nbttagcompound1.setByte("Slot", (byte)0); + supply.writeToNBT(nbttagcompound1); + nbttaglist.appendTag(nbttagcompound1); + } + nbttagcompound.setTag("Items", nbttaglist); + } + + public void readFromNBT(NBTTagCompound nbttagcompound) + { + super.readFromNBT(nbttagcompound); + supply = new ItemStack(0, 0, 0); + NBTTagList nbttaglist = nbttagcompound.getTagList("Items"); + for (int i = 0; i < nbttaglist.tagCount(); i++) + { + NBTTagCompound nbttagcompound1 = (NBTTagCompound)nbttaglist.tagAt(i); + int j = nbttagcompound1.getByte("Slot") & 0xff; + if (j >= 0 && j < 1) + { + supply = ItemStack.loadItemStackFromNBT(nbttagcompound1); + } + } + + if (supply != null && supply.getItem() == null) + { + supply = null; + } + } + + public String getInvName() + { + return "golempedestalinv"; + } + + public int getInventoryStackLimit() + { + return 64; + } + + public boolean canInteractWith(EntityPlayer entityplayer) + { + return true; + } + + public void openChest() + { + } + + public void closeChest() + { + } + + public void clear() + { + supply = null; + } + + public boolean isUseableByPlayer(EntityPlayer entityplayer) + { + return true; + } + + @Override + public ItemStack getStackInSlotOnClosing (int i) + { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isInvNameLocalized () + { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isStackValidForSlot (int i, ItemStack itemstack) + { + // TODO Auto-generated method stub + return false; + } +} diff --git a/mods/tinker/tconstruct/PHConstruct.java b/mods/tinker/tconstruct/PHConstruct.java index eae80e57..4383c698 100644 --- a/mods/tinker/tconstruct/PHConstruct.java +++ b/mods/tinker/tconstruct/PHConstruct.java @@ -54,8 +54,10 @@ public class PHConstruct { enableTCactus = config.get("Difficulty Changes", "Enable mod cactus tools", true).getBoolean(true); enableTBone = config.get("Difficulty Changes", "Enable mod bone tools", true).getBoolean(true); - unstableCreeper = config.get("Mob Spawning", "Activate Nitro Creeper Spawns", true).getBoolean(true); + redCreeper = config.get("Mob Spawning", "Activate Nitro Creeper Spawns", true).getBoolean(true); blueSlime = config.get("Mob Spawning", "Activate Blue Slime Spawns", true).getBoolean(true); + redCreeperWeight = config.get("Mob Spawning", "Spawn Weight for Nitro Creeper", 7).getInt(7); + blueSlimeWeight = config.get("Mob Spawning", "Spawn Weight for Blue Slime", 10).getInt(10); woodCrafter = config.getBlock("Wood Tool Station", 1471).getInt(1471); heldItemBlock = config.getBlock("Held Item Block", 1472).getInt(1472); @@ -69,6 +71,10 @@ public class PHConstruct { metalStill = config.getBlock("Liquid Metal Still", 1480).getInt(1480); //landmine = config.getBlock("Landmine", 1481).getInt(1481); + golemCore = config.getBlock("Golem Core", 1481).getInt(1481); + golemHead = config.getBlock("Golem Head", 1482).getInt(1482); + golemPedestal = config.getBlock("Golem Pedestal", 1483).getInt(1483); + manual = config.getItem("Patterns and Misc", "Tinker's Manual", 14018).getInt(14018); blankPattern = config.getItem("Patterns and Misc", "Blank Patterns", 14019).getInt(14019); materials = config.getItem("Patterns and Misc", "Materials", 14020).getInt(14020); @@ -107,6 +113,8 @@ public class PHConstruct { mattock = config.getItem("Tools", "Mattock", 14060).getInt(14060); lumberaxe = config.getItem("Tools", "Lumber Axe", 14061).getInt(14061); longbow = config.getItem("Tools", "Longbow", 14062).getInt(14062); + shortbow = config.getItem("Tools", "Shortbow", 14063).getInt(14063); + potionLauncher = config.getItem("Tools", "Potion Launcher", 14064).getInt(14064); buckets = config.getItem("Patterns and Misc", "Buckets", 14101).getInt(14101); uselessItem = config.getItem("Patterns and Misc", "Title Icon", 14102).getInt(14102); @@ -159,6 +167,10 @@ public class PHConstruct { public static int oreSlag; public static int metalBlock; //public static int axle; + + public static int golemCore; + public static int golemHead; + public static int golemPedestal; //Traps //public static int landmine; @@ -195,6 +207,8 @@ public class PHConstruct { public static int frypan; public static int battlesign; public static int longbow; + public static int shortbow; + public static int potionLauncher; public static int mattock; public static int lumberaxe; @@ -236,8 +250,10 @@ public class PHConstruct { public static int netherDensity; //Mobs - public static boolean unstableCreeper; + public static boolean redCreeper; + public static int redCreeperWeight; public static boolean blueSlime; + public static int blueSlimeWeight; //Difficulty modifiers public static boolean keepHunger; diff --git a/mods/tinker/tconstruct/TConstruct.java b/mods/tinker/tconstruct/TConstruct.java index 8d4b9e79..e904d161 100644 --- a/mods/tinker/tconstruct/TConstruct.java +++ b/mods/tinker/tconstruct/TConstruct.java @@ -25,7 +25,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author: mDiyo */ -@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.2.12") +@Mod(modid = "TConstruct", name = "TConstruct", version = "1.5.1_1.2.15") @NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = mods.tinker.tconstruct.TPacketHandler.class) public class TConstruct { diff --git a/mods/tinker/tconstruct/TContent.java b/mods/tinker/tconstruct/TContent.java index 4a424b57..3b387aaa 100644 --- a/mods/tinker/tconstruct/TContent.java +++ b/mods/tinker/tconstruct/TContent.java @@ -7,14 +7,72 @@ import java.util.List; import mods.tinker.common.IPattern; import mods.tinker.common.RecipeRemover; import mods.tinker.common.fancyitem.FancyEntityItem; -import mods.tinker.tconstruct.blocks.*; -import mods.tinker.tconstruct.crafting.*; -import mods.tinker.tconstruct.entity.*; -import mods.tinker.tconstruct.items.*; -import mods.tinker.tconstruct.library.*; -import mods.tinker.tconstruct.logic.*; -import mods.tinker.tconstruct.modifiers.*; -import mods.tinker.tconstruct.tools.*; +import mods.tinker.tconstruct.blocks.EquipBlock; +import mods.tinker.tconstruct.blocks.LavaTankBlock; +import mods.tinker.tconstruct.blocks.LiquidMetalFlowing; +import mods.tinker.tconstruct.blocks.LiquidMetalStill; +import mods.tinker.tconstruct.blocks.MetalOre; +import mods.tinker.tconstruct.blocks.SearedBlock; +import mods.tinker.tconstruct.blocks.SmelteryBlock; +import mods.tinker.tconstruct.blocks.TConstructBlock; +import mods.tinker.tconstruct.blocks.ToolStationBlock; +import mods.tinker.tconstruct.crafting.LiquidCasting; +import mods.tinker.tconstruct.crafting.PatternBuilder; +import mods.tinker.tconstruct.crafting.Smeltery; +import mods.tinker.tconstruct.crafting.ToolBuilder; +import mods.tinker.tconstruct.entity.BlueSlime; +import mods.tinker.tconstruct.entity.Crystal; +import mods.tinker.tconstruct.entity.LaunchedPotion; +import mods.tinker.tconstruct.entity.UnstableCreeper; +import mods.tinker.tconstruct.items.CraftedSoilItemBlock; +import mods.tinker.tconstruct.items.CraftingItem; +import mods.tinker.tconstruct.items.FilledBucket; +import mods.tinker.tconstruct.items.LavaTankItemBlock; +import mods.tinker.tconstruct.items.LiquidItemBlock; +import mods.tinker.tconstruct.items.MetalItemBlock; +import mods.tinker.tconstruct.items.MetalOreItemBlock; +import mods.tinker.tconstruct.items.MetalPattern; +import mods.tinker.tconstruct.items.Pattern; +import mods.tinker.tconstruct.items.PatternManual; +import mods.tinker.tconstruct.items.SearedTableItemBlock; +import mods.tinker.tconstruct.items.SmelteryItemBlock; +import mods.tinker.tconstruct.items.StrangeFood; +import mods.tinker.tconstruct.items.TitleIcon; +import mods.tinker.tconstruct.items.ToolPart; +import mods.tinker.tconstruct.items.ToolShard; +import mods.tinker.tconstruct.items.ToolStationItemBlock; +import mods.tinker.tconstruct.library.TConstructRegistry; +import mods.tinker.tconstruct.library.ToolCore; +import mods.tinker.tconstruct.logic.CastingTableLogic; +import mods.tinker.tconstruct.logic.FaucetLogic; +import mods.tinker.tconstruct.logic.FrypanLogic; +import mods.tinker.tconstruct.logic.LavaTankLogic; +import mods.tinker.tconstruct.logic.LiquidTextureLogic; +import mods.tinker.tconstruct.logic.MultiServantLogic; +import mods.tinker.tconstruct.logic.PartCrafterLogic; +import mods.tinker.tconstruct.logic.PatternChestLogic; +import mods.tinker.tconstruct.logic.PatternShaperLogic; +import mods.tinker.tconstruct.logic.SmelteryDrainLogic; +import mods.tinker.tconstruct.logic.SmelteryLogic; +import mods.tinker.tconstruct.logic.ToolStationLogic; +import mods.tinker.tconstruct.modifiers.ModBlaze; +import mods.tinker.tconstruct.modifiers.ModBoolean; +import mods.tinker.tconstruct.modifiers.ModDurability; +import mods.tinker.tconstruct.modifiers.ModElectric; +import mods.tinker.tconstruct.modifiers.ModInteger; +import mods.tinker.tconstruct.modifiers.ModLapisBase; +import mods.tinker.tconstruct.modifiers.ModLapisIncrease; +import mods.tinker.tconstruct.modifiers.ModRedstone; +import mods.tinker.tconstruct.modifiers.ModRepair; +import mods.tinker.tconstruct.tools.Axe; +import mods.tinker.tconstruct.tools.BattleSign; +import mods.tinker.tconstruct.tools.Broadsword; +import mods.tinker.tconstruct.tools.FryingPan; +import mods.tinker.tconstruct.tools.Longsword; +import mods.tinker.tconstruct.tools.Mattock; +import mods.tinker.tconstruct.tools.Pickaxe; +import mods.tinker.tconstruct.tools.PotionLauncher; +import mods.tinker.tconstruct.tools.Rapier; import mods.tinker.tconstruct.tools.Shovel; import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; @@ -69,6 +127,8 @@ public class TContent implements IFuelHandler public static ToolCore mattock; public static ToolCore lumberaxe; + + public static Item potionLauncher; //Tool parts public static Item pickaxeHead; @@ -108,6 +168,21 @@ public class TContent implements IFuelHandler //Tool modifiers public static ModElectric modE; + + //Golems + public static Block glowSapling; + public static Block glowLeaves; + public static Block glowLog; + + public static Block golemCore; + public static Block golemPedestal; + public static Block golemHead; + + public static Item golemWand; + public static Item golemRecharger; + public static Item corestone; + public static Item notebook; + public static Item note; public TContent() { @@ -124,21 +199,23 @@ public class TContent implements IFuelHandler void createEntities () { EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 1, TConstruct.instance, 32, 3, true); + //EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1, TConstruct.instance, 32, 5, true); + //EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(Skyla.class, "Skyla", 10, TConstruct.instance, 32, 5, true); + //EntityRegistry.registerModEntity(Skyla.class, "Skyla", 10, TConstruct.instance, 32, 5, true); EntityRegistry.registerModEntity(UnstableCreeper.class, "UnstableCreeper", 11, TConstruct.instance, 64, 5, true); EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true); - EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); + //EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13, TConstruct.instance, 64, 5, true); BiomeGenBase[] overworldBiomes = new BiomeGenBase[] { BiomeGenBase.ocean, BiomeGenBase.plains, BiomeGenBase.desert, BiomeGenBase.extremeHills, BiomeGenBase.forest, BiomeGenBase.taiga, BiomeGenBase.swampland, BiomeGenBase.river, BiomeGenBase.frozenOcean, BiomeGenBase.frozenRiver, BiomeGenBase.icePlains, BiomeGenBase.iceMountains, BiomeGenBase.beach, BiomeGenBase.desertHills, BiomeGenBase.forestHills, BiomeGenBase.taigaHills, BiomeGenBase.extremeHillsEdge, BiomeGenBase.jungle, BiomeGenBase.jungleHills }; - if (PHConstruct.unstableCreeper) - EntityRegistry.addSpawn(UnstableCreeper.class, 7, 4, 6, EnumCreatureType.monster, overworldBiomes); + if (PHConstruct.redCreeper) + EntityRegistry.addSpawn(UnstableCreeper.class, PHConstruct.redCreeperWeight, 4, 6, EnumCreatureType.monster, overworldBiomes); if (PHConstruct.blueSlime) - EntityRegistry.addSpawn(BlueSlime.class, 10, 4, 4, EnumCreatureType.monster, overworldBiomes); + EntityRegistry.addSpawn(BlueSlime.class, PHConstruct.blueSlimeWeight, 4, 4, EnumCreatureType.monster, overworldBiomes); //EntityRegistry.addSpawn(MetalSlime.class, 1, 4, 4, EnumCreatureType.monster, overworldBiomes); } @@ -205,6 +282,18 @@ public class TContent implements IFuelHandler GameRegistry.registerBlock(liquidMetalFlowing, LiquidItemBlock.class, "metalFlow"); GameRegistry.registerBlock(liquidMetalStill, LiquidItemBlock.class, "metalStill"); GameRegistry.registerTileEntity(LiquidTextureLogic.class, "LiquidTexture"); + + //Golems + /*golemCore = new GolemCoreBlock(PHConstruct.golemCore).setUnlocalizedName("golemcore"); + GameRegistry.registerBlock(golemCore, "Golem Core"); + GameRegistry.registerTileEntity(GolemCoreLogic.class, "TConstruct.GolemCore"); + + golemHead = new GolemHeadBlock(PHConstruct.golemHead).setUnlocalizedName("golemhead"); + GameRegistry.registerBlock(golemHead, "Golem Head"); + + golemPedestal = new GolemPedestalBlock(PHConstruct.golemPedestal).setUnlocalizedName("golempedestal"); + GameRegistry.registerBlock(golemPedestal, "Golem Pedestal"); + GameRegistry.registerTileEntity(GolemPedestalLogic.class, "TConstruct.GolemPedestal");*/ } void registerItems () @@ -243,6 +332,7 @@ public class TContent implements IFuelHandler //longbow = new RangedWeapon(PHConstruct.longbow); mattock = new Mattock(PHConstruct.mattock); //lumberaxe = new LumberAxe(PHConstruct.lumberaxe, lumberaxeTexture); + potionLauncher = new PotionLauncher(PHConstruct.potionLauncher); pickaxeHead = new ToolPart(PHConstruct.pickaxeHead, "PickaxeHead", "_pickaxe_head").setUnlocalizedName("tconstruct.PickaxeHead"); shovelHead = new ToolPart(PHConstruct.shovelHead, "ShovelHead", "_shovel_head").setUnlocalizedName("tconstruct.ShovelHead"); diff --git a/mods/tinker/tconstruct/blocks/LiquidMetalBase.java b/mods/tinker/tconstruct/blocks/LiquidMetalBase.java index 67d62fca..ee87b788 100644 --- a/mods/tinker/tconstruct/blocks/LiquidMetalBase.java +++ b/mods/tinker/tconstruct/blocks/LiquidMetalBase.java @@ -365,7 +365,7 @@ public abstract class LiquidMetalBase extends Block } /** - * Can add to the passed in vector for a movement vector to be applied to the entity. Args: x, y, z, entity, vec3d + * Can add to the passed in vector for a movement vector to be applied to the entity. Args: x, y, z, entity, Vec3 */ public void velocityToAddToEntity (World par1World, int par2, int par3, int par4, Entity par5Entity, Vec3 par6Vec3) { diff --git a/mods/tinker/tconstruct/client/CastingTableSpecialRenderer.java b/mods/tinker/tconstruct/client/CastingTableSpecialRenderer.java index 7d45bf29..abb3fd26 100644 --- a/mods/tinker/tconstruct/client/CastingTableSpecialRenderer.java +++ b/mods/tinker/tconstruct/client/CastingTableSpecialRenderer.java @@ -62,7 +62,7 @@ public class CastingTableSpecialRenderer extends TileEntitySpecialRenderer if (stack.getItem() instanceof ItemBlock) { GL11.glRotatef(90F, -1, 0F, 0F); - GL11.glTranslatef(0F, -10.1F, 0.2275F); + GL11.glTranslatef(0F, -0.1F, 0.2275F); } RenderItem.renderInFrame = true; diff --git a/mods/tinker/tconstruct/client/TProxyClient.java b/mods/tinker/tconstruct/client/TProxyClient.java index 06a7aeac..786adbbd 100644 --- a/mods/tinker/tconstruct/client/TProxyClient.java +++ b/mods/tinker/tconstruct/client/TProxyClient.java @@ -9,16 +9,21 @@ import javax.xml.parsers.DocumentBuilderFactory; import mods.tinker.common.fancyitem.FancyEntityItem; import mods.tinker.common.fancyitem.FancyItemRender; +import mods.tinker.golems.client.GolemCoreRender; +import mods.tinker.golems.client.GolemCoreSpecialRender; +import mods.tinker.golems.logic.GolemCoreLogic; import mods.tinker.tconstruct.TConstruct; import mods.tinker.tconstruct.TContent; import mods.tinker.tconstruct.TProxyCommon; import mods.tinker.tconstruct.client.entityrender.CartRender; import mods.tinker.tconstruct.client.entityrender.CrystalRender; +import mods.tinker.tconstruct.client.entityrender.ThrownItemRender; import mods.tinker.tconstruct.client.entityrender.SkylaRender; import mods.tinker.tconstruct.client.entityrender.SlimeRender; import mods.tinker.tconstruct.entity.BlueSlime; import mods.tinker.tconstruct.entity.CartEntity; import mods.tinker.tconstruct.entity.Crystal; +import mods.tinker.tconstruct.entity.LaunchedPotion; import mods.tinker.tconstruct.entity.Skyla; import mods.tinker.tconstruct.entity.UnstableCreeper; import mods.tinker.tconstruct.library.client.TConstructClientRegistry; @@ -87,6 +92,7 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerBlockHandler(new TankRender()); RenderingRegistry.registerBlockHandler(new SearedRender()); RenderingRegistry.registerBlockHandler(new FluidRender()); + RenderingRegistry.registerBlockHandler(new GolemCoreRender()); //Tools //MinecraftForgeClient.preloadTexture(TContent.blockTexture); @@ -98,6 +104,7 @@ public class TProxyClient extends TProxyCommon //Special Renderers ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer()); + ClientRegistry.bindTileEntitySpecialRenderer(GolemCoreLogic.class, new GolemCoreSpecialRender()); //Entities RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender()); @@ -106,6 +113,7 @@ public class TProxyClient extends TProxyCommon RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender()); RenderingRegistry.registerEntityRenderingHandler(UnstableCreeper.class, new RenderCreeper()); RenderingRegistry.registerEntityRenderingHandler(BlueSlime.class, new SlimeRender(new ModelSlime(16), new ModelSlime(0), 0.25F)); + RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new ThrownItemRender(Item.potion, 16384)); //RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class, new PlayerArmorRender()); // <-- Works, woo! addRenderMappings(); @@ -168,6 +176,8 @@ public class TProxyClient extends TProxyCommon LanguageRegistry.instance().addStringLocalization("entity.TConstruct.UnstableCreeper.name", "en_US", "Nitro Creeper"); LanguageRegistry.instance().addStringLocalization("entity.TConstruct.EdibleSlime.name", "en_US", "Blue Slime"); + LanguageRegistry.instance().addStringLocalization("entity.tconstruct.UnstableCreeper.name", "en_US", "Nitro Creeper"); + LanguageRegistry.instance().addStringLocalization("entity.tconstruct.EdibleSlime.name", "en_US", "Blue Slime"); LanguageRegistry.instance().addStringLocalization("entity.TConstruct.MetalSlime.name", "en_US", "Metal Slime"); //LanguageRegistry.instance().addStringLocalization("item.tconstruct.diary.diary.name", "en_US", "Tinker's Log"); LanguageRegistry.instance().addStringLocalization("item.tconstruct.Pattern.blank_pattern.name", "en_US", "Blank Pattern"); diff --git a/mods/tinker/tconstruct/client/entityrender/ThrownItemRender.java b/mods/tinker/tconstruct/client/entityrender/ThrownItemRender.java new file mode 100644 index 00000000..4ac148a7 --- /dev/null +++ b/mods/tinker/tconstruct/client/entityrender/ThrownItemRender.java @@ -0,0 +1,92 @@ +package mods.tinker.tconstruct.client.entityrender; + +import mods.tinker.tconstruct.entity.LaunchedPotion; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemPotion; +import net.minecraft.potion.PotionHelper; +import net.minecraft.util.Icon; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ThrownItemRender extends Render +{ + private Item field_94151_a; + private int field_94150_f; + + public ThrownItemRender(Item par1, int par2) + { + this.field_94151_a = par1; + this.field_94150_f = par2; + } + + public ThrownItemRender(Item par1) + { + this(par1, 0); + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render> 16 & 255) / 255.0F; + float f3 = (float)(i >> 8 & 255) / 255.0F; + float f4 = (float)(i & 255) / 255.0F; + GL11.glColor3f(f2, f3, f4); + GL11.glPushMatrix(); + this.func_77026_a(tessellator, ItemPotion.func_94589_d("potion_contents")); + GL11.glPopMatrix(); + GL11.glColor3f(1.0F, 1.0F, 1.0F); + } + + this.func_77026_a(tessellator, icon); + GL11.glDisable(GL12.GL_RESCALE_NORMAL); + GL11.glPopMatrix(); + } + } + + private void func_77026_a(Tessellator par1Tessellator, Icon par2Icon) + { + float f = par2Icon.getMinU(); + float f1 = par2Icon.getMaxU(); + float f2 = par2Icon.getMinV(); + float f3 = par2Icon.getMaxV(); + float f4 = 1.0F; + float f5 = 0.5F; + float f6 = 0.25F; + GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); + GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); + par1Tessellator.startDrawingQuads(); + par1Tessellator.setNormal(0.0F, 1.0F, 0.0F); + par1Tessellator.addVertexWithUV((double)(0.0F - f5), (double)(0.0F - f6), 0.0D, (double)f, (double)f3); + par1Tessellator.addVertexWithUV((double)(f4 - f5), (double)(0.0F - f6), 0.0D, (double)f1, (double)f3); + par1Tessellator.addVertexWithUV((double)(f4 - f5), (double)(f4 - f6), 0.0D, (double)f1, (double)f2); + par1Tessellator.addVertexWithUV((double)(0.0F - f5), (double)(f4 - f6), 0.0D, (double)f, (double)f2); + par1Tessellator.draw(); + } +} diff --git a/mods/tinker/tconstruct/entity/BlueSlime.java b/mods/tinker/tconstruct/entity/BlueSlime.java index 2b0a3d1e..568ff66a 100644 --- a/mods/tinker/tconstruct/entity/BlueSlime.java +++ b/mods/tinker/tconstruct/entity/BlueSlime.java @@ -28,11 +28,14 @@ public class BlueSlime extends EntityLiving implements IMob { super(world); this.texture = "/mods/tinker/textures/mob/slimeedible.png"; - int i = 1 << Math.max(1, this.rand.nextInt(4)); + int offset = Math.max(1, this.rand.nextInt(4)); + if (offset >= 3) + offset--; + int size = 1 << offset; this.yOffset = 0.0F; this.slimeJumpDelay = this.rand.nextInt(120) + 40; - this.setSlimeSize(i); - this.jumpMovementFactor = 0.004F * i + 0.01F; + this.setSlimeSize(size); + this.jumpMovementFactor = 0.004F * size + 0.01F; } protected void damageEntity (DamageSource damageSource, int damage) @@ -128,7 +131,7 @@ public class BlueSlime extends EntityLiving implements IMob this.worldObj.skylightSubtracted = i1; } - return light <= this.rand.nextInt(10); + return light <= this.rand.nextInt(8); } } diff --git a/mods/tinker/tconstruct/entity/LaunchedPotion.java b/mods/tinker/tconstruct/entity/LaunchedPotion.java new file mode 100644 index 00000000..cd8d4d81 --- /dev/null +++ b/mods/tinker/tconstruct/entity/LaunchedPotion.java @@ -0,0 +1,192 @@ +package mods.tinker.tconstruct.entity; + +import java.util.Iterator; +import java.util.List; + +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class LaunchedPotion extends EntityThrowable +{ + /** + * The damage value of the thrown potion that this EntityPotion represents. + */ + private ItemStack potionDamage; + + public LaunchedPotion(World par1World) + { + super(par1World); + } + + public LaunchedPotion(World par1World, EntityLiving par2EntityLiving, int par3) + { + this(par1World, par2EntityLiving, new ItemStack(Item.potion, 1, par3)); + } + + public LaunchedPotion(World par1World, EntityLiving par2EntityLiving, ItemStack par3ItemStack) + { + super(par1World, par2EntityLiving); + this.potionDamage = par3ItemStack; + } + + @SideOnly(Side.CLIENT) + public LaunchedPotion(World par1World, double par2, double par4, double par6, int par8) + { + this(par1World, par2, par4, par6, new ItemStack(Item.potion, 1, par8)); + } + + public LaunchedPotion(World par1World, double par2, double par4, double par6, ItemStack par8ItemStack) + { + super(par1World, par2, par4, par6); + this.potionDamage = par8ItemStack; + } + + /** + * Gets the amount of gravity to apply to the thrown entity with each tick. + */ + protected float getGravityVelocity() + { + return 0.05F; + } + + protected float func_70182_d() + { + return 1.0F; + } + + protected float func_70183_g() + { + return -10.0F; + } + + public void setPotionDamage(int par1) + { + if (this.potionDamage == null) + { + this.potionDamage = new ItemStack(Item.potion, 1, 0); + } + + this.potionDamage.setItemDamage(par1); + } + + /** + * Returns the damage value of the thrown potion that this EntityPotion represents. + */ + public int getPotionDamage() + { + if (this.potionDamage == null) + { + this.potionDamage = new ItemStack(Item.potion, 1, 0); + } + + return this.potionDamage.getItemDamage(); + } + + /** + * Called when this EntityThrowable hits a block or entity. + */ + protected void onImpact(MovingObjectPosition par1MovingObjectPosition) + { + if (!this.worldObj.isRemote) + { + List list = Item.potion.getEffects(this.potionDamage); + + if (list != null && !list.isEmpty()) + { + AxisAlignedBB axisalignedbb = this.boundingBox.expand(4.0D, 2.0D, 4.0D); + List list1 = this.worldObj.getEntitiesWithinAABB(EntityLiving.class, axisalignedbb); + + if (list1 != null && !list1.isEmpty()) + { + Iterator iterator = list1.iterator(); + + while (iterator.hasNext()) + { + EntityLiving entityliving = (EntityLiving)iterator.next(); + double d0 = this.getDistanceSqToEntity(entityliving); + + if (d0 < 16.0D) + { + double d1 = 1.0D - Math.sqrt(d0) / 4.0D; + + if (entityliving == par1MovingObjectPosition.entityHit) + { + d1 = 1.0D; + } + + Iterator iterator1 = list.iterator(); + + while (iterator1.hasNext()) + { + PotionEffect potioneffect = (PotionEffect)iterator1.next(); + int i = potioneffect.getPotionID(); + + if (Potion.potionTypes[i].isInstant()) + { + Potion.potionTypes[i].affectEntity(this.getThrower(), entityliving, potioneffect.getAmplifier(), d1); + } + else + { + int j = (int)(d1 * (double)potioneffect.getDuration() + 0.5D); + + if (j > 20) + { + entityliving.addPotionEffect(new PotionEffect(i, j, potioneffect.getAmplifier())); + } + } + } + } + } + } + } + + this.worldObj.playAuxSFX(2002, (int)Math.round(this.posX), (int)Math.round(this.posY), (int)Math.round(this.posZ), this.getPotionDamage()); + this.setDead(); + } + } + + /** + * (abstract) Protected helper method to read subclass entity data from NBT. + */ + public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) + { + super.readEntityFromNBT(par1NBTTagCompound); + + if (par1NBTTagCompound.hasKey("Potion")) + { + this.potionDamage = ItemStack.loadItemStackFromNBT(par1NBTTagCompound.getCompoundTag("Potion")); + } + else + { + this.setPotionDamage(par1NBTTagCompound.getInteger("potionValue")); + } + + if (this.potionDamage == null) + { + this.setDead(); + } + } + + /** + * (abstract) Protected helper method to write subclass entity data to NBT. + */ + public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) + { + super.writeEntityToNBT(par1NBTTagCompound); + + if (this.potionDamage != null) + { + par1NBTTagCompound.setCompoundTag("Potion", this.potionDamage.writeToNBT(new NBTTagCompound())); + } + } +} diff --git a/mods/tinker/tconstruct/entity/UnstableCreeper.java b/mods/tinker/tconstruct/entity/UnstableCreeper.java index 19f843dd..55d9d36e 100644 --- a/mods/tinker/tconstruct/entity/UnstableCreeper.java +++ b/mods/tinker/tconstruct/entity/UnstableCreeper.java @@ -10,7 +10,7 @@ public class UnstableCreeper extends EntityCreeper protected int timeSinceIgnited; protected int lastActiveTime; - protected int explosionRadius = 3; + protected float explosionRadius = 1.5f; public UnstableCreeper(World world) { @@ -31,11 +31,11 @@ public class UnstableCreeper extends EntityCreeper if (this.getPowered()) { - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (this.explosionRadius * 2), flag); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (this.explosionRadius + 0.75f * (worldObj.difficultySetting-1))* 2, false); } else { - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) this.explosionRadius, flag); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (this.explosionRadius + 0.75f * (worldObj.difficultySetting-1)), false); } this.setDead(); @@ -87,11 +87,11 @@ public class UnstableCreeper extends EntityCreeper if (this.getPowered()) { - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (this.explosionRadius * 2), flag); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (this.explosionRadius + 0.75f * (worldObj.difficultySetting-1))* 2, flag); } else { - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) this.explosionRadius, flag); + this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (this.explosionRadius + 0.75f * (worldObj.difficultySetting-1)), flag); } this.setDead(); diff --git a/mods/tinker/tconstruct/library/AbilityHelper.java b/mods/tinker/tconstruct/library/AbilityHelper.java index 03431531..354f0a01 100644 --- a/mods/tinker/tconstruct/library/AbilityHelper.java +++ b/mods/tinker/tconstruct/library/AbilityHelper.java @@ -297,7 +297,7 @@ public class AbilityHelper charge -= mineSpeed; ToolCore tool = (ToolCore) stack.getItem(); - stack.setItemDamage(1 + (tool.getMaxCharge() - charge) * (stack.getMaxDamage() - 1) / tool.getMaxCharge()); + stack.setItemDamage(1 + (tool.getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / tool.getMaxCharge(stack)); tags.setInteger("charge", charge); if (entity instanceof EntityPlayer) chargeFromArmor(stack, (EntityPlayer) entity); @@ -317,7 +317,7 @@ public class AbilityHelper IElectricItem electricArmor = (IElectricItem) armor.getItem(); ToolCore tool = (ToolCore) stack.getItem(); - if (electricArmor.canProvideEnergy() && electricArmor.getTier() >= ((IElectricItem) stack.getItem()).getTier()) + if (electricArmor.canProvideEnergy(stack) && electricArmor.getTier(stack) >= ((IElectricItem) stack.getItem()).getTier(stack)) { int chargeAmount = tool.charge(stack, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true); chargeAmount = discharge(armor, chargeAmount, Integer.MAX_VALUE, true, false); @@ -337,22 +337,22 @@ public class AbilityHelper } } - public static int discharge (ItemStack itemStack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) + public static int discharge (ItemStack stack, int amount, int tier, boolean ignoreTransferLimit, boolean simulate) { - IElectricItem ielectricitem = (IElectricItem) itemStack.getItem(); + IElectricItem ielectricitem = (IElectricItem) stack.getItem(); if (ielectricitem instanceof ICustomElectricItem) { - return ((ICustomElectricItem) ielectricitem).discharge(itemStack, amount, tier, ignoreTransferLimit, simulate); + return ((ICustomElectricItem) ielectricitem).discharge(stack, amount, tier, ignoreTransferLimit, simulate); } - else if (amount >= 0 && itemStack.stackSize <= 1 && ielectricitem.getTier() <= tier) + else if (amount >= 0 && stack.stackSize <= 1 && ielectricitem.getTier(stack) <= tier) { - if (amount > ielectricitem.getTransferLimit() && !ignoreTransferLimit) + if (amount > ielectricitem.getTransferLimit(stack) && !ignoreTransferLimit) { - amount = ielectricitem.getTransferLimit(); + amount = ielectricitem.getTransferLimit(stack); } - NBTTagCompound tags = itemStack.getTagCompound();//StackUtil.getOrCreateNbtData(itemStack); + NBTTagCompound tags = stack.getTagCompound(); int charge = tags.getInteger("charge"); if (amount > charge) @@ -365,24 +365,24 @@ public class AbilityHelper if (!simulate) { tags.setInteger("charge", charge); - itemStack.itemID = charge > 0 ? ielectricitem.getChargedItemId() : ielectricitem.getEmptyItemId(); + stack.itemID = charge > 0 ? ielectricitem.getChargedItemId(stack) : ielectricitem.getEmptyItemId(stack); - if (itemStack.getItem() instanceof IElectricItem) + if (stack.getItem() instanceof IElectricItem) { - ielectricitem = (IElectricItem) itemStack.getItem(); + ielectricitem = (IElectricItem) stack.getItem(); - if (itemStack.getMaxDamage() > 2) + if (stack.getMaxDamage() > 2) { - itemStack.setItemDamage(1 + (ielectricitem.getMaxCharge() - charge) * (itemStack.getMaxDamage() - 2) / ielectricitem.getMaxCharge()); + stack.setItemDamage(1 + (ielectricitem.getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / ielectricitem.getMaxCharge(stack)); } else { - itemStack.setItemDamage(0); + stack.setItemDamage(0); } } else { - itemStack.setItemDamage(0); + stack.setItemDamage(0); } } diff --git a/mods/tinker/tconstruct/library/ToolCore.java b/mods/tinker/tconstruct/library/ToolCore.java index ebc12216..154402d6 100644 --- a/mods/tinker/tconstruct/library/ToolCore.java +++ b/mods/tinker/tconstruct/library/ToolCore.java @@ -253,15 +253,15 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox if (power != 0) { - if (power <= this.getMaxCharge() / 3) + if (power <= this.getMaxCharge(stack) / 3) color = "\u00a74"; - else if (power > this.getMaxCharge() * 2 / 3) + else if (power > this.getMaxCharge(stack) * 2 / 3) color = "\u00a72"; else color = "\u00a76"; } - String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge()).append(" En").toString(); + String charge = new StringBuilder().append(color).append(tags.getInteger("charge")).append("/").append(getMaxCharge(stack)).append(" En").toString(); list.add(charge); } if (tags.hasKey("InfiTool")) @@ -557,37 +557,37 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox } @Override - public boolean canProvideEnergy () + public boolean canProvideEnergy (ItemStack itemStack) { return true; } @Override - public int getChargedItemId () + public int getChargedItemId (ItemStack itemStack) { return this.itemID; } @Override - public int getEmptyItemId () + public int getEmptyItemId (ItemStack itemStack) { return this.itemID; } @Override - public int getMaxCharge () + public int getMaxCharge (ItemStack itemStack) { return 10000; } @Override - public int getTier () + public int getTier (ItemStack itemStack) { return 0; } @Override - public int getTransferLimit () + public int getTransferLimit (ItemStack itemStack) { return 32; } @@ -601,16 +601,16 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox if (amount > 0) { - if (amount > getTransferLimit() && !ignoreTransferLimit) + if (amount > getTransferLimit(stack) && !ignoreTransferLimit) { - amount = getTransferLimit(); + amount = getTransferLimit(stack); } int charge = tags.getInteger("charge"); - if (amount > getMaxCharge() - charge) + if (amount > getMaxCharge(stack) - charge) { - amount = getMaxCharge() - charge; + amount = getMaxCharge(stack) - charge; } charge += amount; @@ -618,7 +618,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox if (!simulate) { tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge() - charge) * (stack.getMaxDamage() - 2) / getMaxCharge()); + stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 2) / getMaxCharge(stack)); } return amount; @@ -637,9 +637,9 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox if (amount > 0) { - if (amount > getTransferLimit() && !ignoreTransferLimit) + if (amount > getTransferLimit(stack) && !ignoreTransferLimit) { - amount = getTransferLimit(); + amount = getTransferLimit(stack); } int charge = tags.getInteger("charge"); @@ -654,7 +654,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox if (!simulate) { tags.setInteger("charge", charge); - stack.setItemDamage(1 + (getMaxCharge() - charge) * (stack.getMaxDamage() - 1) / getMaxCharge()); + stack.setItemDamage(1 + (getMaxCharge(stack) - charge) * (stack.getMaxDamage() - 1) / getMaxCharge(stack)); } return amount; @@ -663,16 +663,16 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox else return 0; } - - @Override - public boolean canUse (ItemStack itemStack, int amount) - { - return false; - } - + @Override public boolean canShowChargeToolTip (ItemStack itemStack) { return false; } + + @Override + public boolean canUse (ItemStack itemStack, int amount) + { + return false; + } } diff --git a/mods/tinker/tconstruct/tools/PotionLauncher.java b/mods/tinker/tconstruct/tools/PotionLauncher.java new file mode 100644 index 00000000..9dc978e4 --- /dev/null +++ b/mods/tinker/tconstruct/tools/PotionLauncher.java @@ -0,0 +1,122 @@ +package mods.tinker.tconstruct.tools; + +import mods.tinker.tconstruct.entity.LaunchedPotion; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.item.EnumAction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class PotionLauncher extends Item +{ + @SideOnly(Side.CLIENT) + private Icon[] icons; + public static final String[] textureNames = new String[] { "potionlauncher" }; + + public PotionLauncher(int par1) + { + super(par1); + this.maxStackSize = 1; + this.setCreativeTab(CreativeTabs.tabCombat); + this.setMaxDamage(3); + } + + public ItemStack onEaten (ItemStack stack, World world, EntityPlayer player) + { + if (stack.getItemDamage() == 0) + stack.setItemDamage(1); + return stack; + } + + public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int time) + { + if (stack.getItemDamage() == 1) + stack.setItemDamage(2); + } + + /** + * How long it takes to use or consume an item + */ + public int getMaxItemUseDuration (ItemStack stack) + { + int meta = stack.getItemDamage(); + if (meta == 1) + return 72000; + else if (meta == 2) + return 0; + + return 30; + } + + /** + * returns the action that specifies what animation to play when the items is being used + */ + public EnumAction getItemUseAction (ItemStack stack) + { + if (stack.getItemDamage() == 0) + return EnumAction.bow; + else + return EnumAction.none; + } + + /** + * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer + */ + public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) + { + if (stack.getItemDamage() == 2) + { + world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + + if (!world.isRemote) + { + world.spawnEntityInWorld(new LaunchedPotion(world, player, stack)); + } + + stack.damageItem(1, player); + System.out.println("Rawr! "+stack.getItemDamage()); + } + + else + { + if (player.capabilities.isCreativeMode) + { + player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); + } + } + return stack; + } + + /** + * Return the enchantability factor of the item, most of the time is based on material. + */ + public int getItemEnchantability () + { + return 1; + } + + @SideOnly(Side.CLIENT) + public void updateIcons (IconRegister par1IconRegister) + { + this.icons = new Icon[textureNames.length]; + + for (int i = 0; i < this.icons.length; ++i) + { + this.icons[i] = par1IconRegister.registerIcon("tinker:" + textureNames[i]); + } + } + + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage (int meta) + { + return icons[0]; + } +} diff --git a/mods/tinker/textures/GGE/GUIPedestal.png b/mods/tinker/textures/GGE/GUIPedestal.png new file mode 100644 index 0000000000000000000000000000000000000000..2de45bac521a067b25c61579f1c312215166330f GIT binary patch literal 1250 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;3=GT+0X`wF zKtUidH#ZLr4ejpkK6dQb|Ns9Xf}`YU2n_oWNSg9F7wAdGk|4ie28U-i(m u-#^a_W^{P+@OwSyn_!PgDxP@J%Nz3qzy2$_I`L5>$XHKTKbLh*2~7YlFMzuM literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/ItemLBInnerSide.png b/mods/tinker/textures/GGE/ItemLBInnerSide.png new file mode 100644 index 0000000000000000000000000000000000000000..4f86b2ee2a427796c979aef4fc351a5dc287a04f GIT binary patch literal 739 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 UNcK!JXaE2J07*qoM6N<$f-+3jlK=n! literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/corestone.png b/mods/tinker/textures/GGE/corestone.png new file mode 100644 index 0000000000000000000000000000000000000000..9435d96102b19b2ea00be30d5da09ccda7e442c2 GIT binary patch literal 2985 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/elderpork.png b/mods/tinker/textures/GGE/elderpork.png new file mode 100644 index 0000000000000000000000000000000000000000..c28c42c39bac4e127d2ffec705678ae67326f344 GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sChfiPptYBdRW@uAAP%xs~yH!WYIK)_mvm#B?8xoC+@a1INTa=$c*J(0EHi!(~~b zYRZ~4rkk-B3UTWN!4=%wNy``{{c`Sd_>loigbj~$g SOz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/glowlogtop.png b/mods/tinker/textures/GGE/glowlogtop.png new file mode 100644 index 0000000000000000000000000000000000000000..a1e3fe27d1d261cb9b432214a2a7037d69408bdb GIT binary patch literal 3327 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 JPDHLkV1g)JH9`OY literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/glowsapling.png b/mods/tinker/textures/GGE/glowsapling.png new file mode 100644 index 0000000000000000000000000000000000000000..7c3db18992da950ea4c3317e7b5fe5be959f28e5 GIT binary patch literal 338 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 B-QNHJ literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/lifebenchtop.png b/mods/tinker/textures/GGE/lifebenchtop.png new file mode 100644 index 0000000000000000000000000000000000000000..00fe69ffd16771a73469c18b65e33c7ffde75f52 GIT binary patch literal 894 zcmV-^1A+XBP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01l=A01l=Bhuo=e00007bV*G`2ipr9 z2s9oG(>U({00RC=L_t(I%Y~B5Y8z(&g}=E-vaXhF2|4m@bU{Y09a$ik7_#WfWZ8uY z_yxT1!u$3G+P*?peT0&1nm|IKo8r>6F%c-WA_osr$D_(cgq?x~q2CoV|4{$i& z;ggPzjzkayn5IcM9447e;`=_!%gacT#OdiN&1RFqV1Q*=L?RJ<-^cSjHa9nsP1D42 z9BQ>1<#L%^E=Tg^OFYlRwrwVp3FGmYxo6KPl}enQopF7AO{G$y-|r(GA0G?DFu1+F zMSK04=g}yOi;JkLitD;)nuf0H#N%;du^5$Bi`z$!2!epwY=(4rcqlTN4APS)0EAVQ z|I1`H$+H$#l`*mgjJRIjRwE0tdLG7`6-*_=X>{|p4gvVO)8U(U?*RDj!v~&5A^>zc9eTYUtE;Q1K@d-?N*wF!mq_50Qr2L#ETcWu8Z7m zw`tdE3_o(G(`hD?2|@@K78cms+hgYYj7B4D+XkRsuM>Iv7+u$q4h{~)a5$vi?f$1U zk|ZI70AT9-2qBpIK9}`6sZ{FU51P#;zbOi}w{Ll>DCBZEWLYK@3L%6*mSqgXpin6A zNvFg6?QN=+3W-Dlbvm8W@AoN}%XC5^s=iOD)#74ni`i^OCX*o^kF(wFGObqmBNW0N zj~NUGj7B4*lamu++cu8lpsFf2H#amI4HQMeG);sMghC-CNy4^mJkKNgQ8a*m0J2_N UJ-?qa9RL6T07*qoM6N<$f}V_!hyVZp literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/notebook.png b/mods/tinker/textures/GGE/notebook.png new file mode 100644 index 0000000000000000000000000000000000000000..3836208a9a290cb8e2590f4120642f3bc65ab4f5 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sChfiPptYBdR_`6}}N;)s> zU(h^#GN=CG#KQl-{)D_-B4DDb)u^Sa<$WaM!pg>~SBjkyyjDNIo@M_0bI-JxX)jD? zpY2#YVe#b0*A~mfB}lMEP7~#~tJ=HwLDtqorLoiEXWtdkIjzLe6s4Xja9~^Rk||3v zcga3}Uc}sxIjdKQb=NxYS<6`8{I)9;$y%a zg9TT4w@K_8*ZsH8G0Gf2xM|HI=BcZiFCUExF$N?_yIK hR4rNLME)$@$Czci-z&2>8W_k744$rjF6*2UngI4|v6%n> literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/recharger.png b/mods/tinker/textures/GGE/recharger.png new file mode 100644 index 0000000000000000000000000000000000000000..9051f69b774e8f08e2634c5f4fe496ba75ff7a0b GIT binary patch literal 3237 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 XwGz<~#G(_a00000NkvXXu0mjfRO}Fi literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/transparency.png b/mods/tinker/textures/GGE/transparency.png new file mode 100644 index 0000000000000000000000000000000000000000..1c65debf45c7f4dfae489e94e77356d8923093de GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}K#X;^)4C~IxyaaOClDyqr82*Fc zg1yTp14TFsJR*x37`TN&n2}-D90{Nxdx@v7EBkF82@!R!qy8YGO%hib8p2Nrr;Er*A-tUMf3KoY&LEF@)oK@{j-j?U@-k{xJQEnScHk ONQbAZpUXO@geCyHyD#Se literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/GGE/wand.png b/mods/tinker/textures/GGE/wand.png new file mode 100644 index 0000000000000000000000000000000000000000..d8e63b7ddacfa4d3a7f53465b4a77faffd7204f0 GIT binary patch literal 3298 zcmV<83?1`{P)Oz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8 z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc- z5#WRK{dmp}uFlRjj{U%*%WZ25jX z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG z3;bXU&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3 zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}* z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C z$c5yc>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWwr)$3XQ?}=hpK0&Z&W{| zep&sA23f;Q!%st`QJ}G3cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>={htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2 zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd zlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!hR|78Dq|Iq-afF%KE1Brn_fm;Im z_u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA zUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B zJh;4Nr^(LEJ3myURP{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o z4K@u`jhx2fBXC4{U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0 z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ? z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P` z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGirvLyBrvX))ON#&i00(qQO+^RW3mXXx0tt_@YybcP6iGxu zR5;76lTApJQ51%sGdN^wC6yK-MOq_>AO=Y*l@=AXi3oyf*&?Mvs7;F&X$vD-SSAs* z5GtERF@i*DE3<{23;lF%v~JAsggv@l83F;-<5?=W^fk+;d;fg;iowVp>}9 z-19r>Nr)nebzEXj;z!sN?lish^M~>w2+{E3p6FjU^hkuSl`|4Tf%~p7n9xLr(Sw_) z=De#-0f;6Qk4g*`r=o^=P4>a|=UZ)BW6TVjdf!3!TX2F|yW8B4S|B5}16HD!62mbh>dwdZ?PVW!JxkR#FE z$-mByCVBBqA}Vos-#R_LhmMva{~foeU!tqs%{|G099!%x+l=c~RjNE*#I5?Z1Uj&^ z3>Q4rVsbiM-Lh|SUO_|k9&OBw6N=~290(Xdb0dm;hS(_7HoCP-0R0jLW*jNZQNgYa ze2mP};(RfHhjl0tf{_^9ZC=4dfU>;JsyMh?h1nT;(*^?)wHKi~2&WF^uRMtWWx1QQ zK7E0%_halV_-?aPFy3mI!C)VFy`MOHqIe0w09v0x&6QMTE_evV78snFw*iSq=Zwi2 zn3#YkFW|sl*s=|Zd~oST66JO^YV&zjUX-TQK38cmv^<9Ds-#Jr7za+r`Pme=)c_q1 gtf_}#7ZZ{4ZhJl{XC*ALN_5eJi{bK&>eY@Rq1|;~Uj?o4Jfhe%w@3~Y|r9B`j zj0DpQ$tF6BQ$emPlxobJ_E`JAKenJv^wq-L1u}sElZQ`qW%_?XoI#)fWy2uQ8NPsQ wMNzQ!X_~V3;tzRaw5}T33(Mtl^uYA)4{lX$H)9>@=Kufz07*qoM6N<$g6uW6;Q#;t literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/golemhead_face.png b/mods/tinker/textures/blocks/golemhead_face.png new file mode 100644 index 0000000000000000000000000000000000000000..265c8478443225dfe97180b96a57a695962ec08a GIT binary patch literal 3358 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/golemhead_side.png b/mods/tinker/textures/blocks/golemhead_side.png new file mode 100644 index 0000000000000000000000000000000000000000..27634f02eb5b53709031ff18bd8f87cc1738a92f GIT binary patch literal 2992 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/golemhead_top.png b/mods/tinker/textures/blocks/golemhead_top.png new file mode 100644 index 0000000000000000000000000000000000000000..ac18aca224e785d81a712b0080f51796c2b1749f GIT binary patch literal 3196 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/pedestalbottom.png b/mods/tinker/textures/blocks/pedestalbottom.png new file mode 100644 index 0000000000000000000000000000000000000000..ceb0faf51ca0c2204035983546c1eb0ed44989c6 GIT binary patch literal 3436 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/pedestaltop.png b/mods/tinker/textures/blocks/pedestaltop.png new file mode 100644 index 0000000000000000000000000000000000000000..c10428cda2c3aece116bba70576b0aeeb4f32b7a GIT binary patch literal 3518 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/blocks/pedestaltopp.png b/mods/tinker/textures/blocks/pedestaltopp.png new file mode 100644 index 0000000000000000000000000000000000000000..1d9bf4e81d15101720c5d92a1707c1c12ddedbe1 GIT binary patch literal 3552 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 literal 0 HcmV?d00001 diff --git a/mods/tinker/textures/items/materials.png b/mods/tinker/textures/items/materials.png deleted file mode 100644 index 37386c5f6e2d6ad3da01f7297d757856cb7e9c50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 32188 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 VY&(B}uSW)eJ6eXCmACC*{(s@YcM|{r diff --git a/mods/tinker/textures/items/patterns.png b/mods/tinker/textures/items/patterns.png deleted file mode 100644 index c264315c5cd8d1813526b3b598f104d72daf35e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11375 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 Z6rbJ6;m&y-dNml(Qqxf_zWM0c{{RE=F4+J8 diff --git a/mods/tinker/textures/items/potionlauncher.png b/mods/tinker/textures/items/potionlauncher.png new file mode 100644 index 0000000000000000000000000000000000000000..9129d408ab546f67708c186143b6fb0367c77bb2 GIT binary patch literal 1015 zcmVVGd000McNliru-2?>z2L=bqs%8KH1B6LL zK~z}7wU~%4zm84M)(vDa1uC$v-1A<|- z%lFLtecwAX&}JA@MvWd1tzB?Ek;L5IM6OEL_ol~&n*f(LcC?@XeO|$hw1H`sJwKct z8?NQ&CYv8Ft<{1;^tlCJ{AH2xi4?zG%VTbDdIo>+s2MOnHyIcrZiA3cv* zlu#;Yb}GCeynI6ISk43mHjn%9R#AYV|9QSD&`TQKDR83yQ}h8)k6ul zHVt(IIP80)?Rd_HCTKmXI!(5uKz`(Nh6;22@lM4CXwj2-!>ngZ&nA@93QuVZ* zo2~Lugg=ZMY(3fYbjZFyn|G<8Ic*zYd?Lle`|ISc**8kbRzN#VawjhC%OvI>Xd%Xs;dC+YF0qg8T0)C{6YYW z=^?ev+YsFWXo2`3cAPij6XGMf@(UR@>JS$j?b?9o9)JtPB}!z!o>i;q1y;8spB4qu;i%PXAT|EPEx}}~- lDhTK5dzONBSNztS_FEtY=!?rJ7E1sC002ovPDHLkV1mQJ(eD5N literal 0 HcmV?d00001 diff --git a/test/NegaFood.java b/test/NegaFood.java new file mode 100644 index 00000000..54bd4f76 --- /dev/null +++ b/test/NegaFood.java @@ -0,0 +1,14 @@ +package test; + +import net.minecraft.item.ItemFood; + +public class NegaFood extends ItemFood +{ + + public NegaFood() + { + super(10001, -20, 0, false); + setAlwaysEdible(); + } + +} diff --git a/test/XinStick.java b/test/XinStick.java index 462b2f8e..67450524 100644 --- a/test/XinStick.java +++ b/test/XinStick.java @@ -1,6 +1,6 @@ package test; -import mods.tinker.tconstruct.entity.BlueSlime; +import mods.tinker.tconstruct.entity.UnstableCreeper; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -28,7 +28,7 @@ public class XinStick extends Item //spawnItem(player.posX, player.posY, player.posZ, tool, world); //CartEntity cart = new CartEntity(world, 1); //cart.cartType = 1; - spawnEntity(player.posX, player.posY+1, player.posZ, new BlueSlime(world), world, player); + spawnEntity(player.posX, player.posY+1, player.posZ, new UnstableCreeper(world), world, player); return stack; } diff --git a/test/mod_Test.java b/test/mod_Test.java index c5bf91ab..8e539a25 100644 --- a/test/mod_Test.java +++ b/test/mod_Test.java @@ -5,6 +5,7 @@ import javax.script.ScriptException; import net.minecraft.client.settings.KeyBinding; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; +import net.minecraft.item.ItemFood; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.PostInit; @@ -24,13 +25,14 @@ public class mod_Test { public static Item xinstick; public static Item TArmorChestplate; + public static Item negaFood; public KeyBinding grabKey; EntityPlayer player; @PreInit public void preInit(FMLPreInitializationEvent evt) { - System.out.println("Test!"); + //System.out.println("Test!"); } @Init @@ -67,6 +69,8 @@ public class mod_Test static { xinstick = new XinStick(10000).setUnlocalizedName("xinstick"); - LanguageRegistry.addName(xinstick, "XinRecord"); + negaFood = new NegaFood().setUnlocalizedName("negaFood"); + LanguageRegistry.addName(xinstick, "XinBroken"); + LanguageRegistry.addName(negaFood, "Negafood"); } }