diff --git a/build.gradle b/build.gradle index c5b957a26ba..cd115536792 100644 --- a/build.gradle +++ b/build.gradle @@ -9,16 +9,23 @@ buildscript { repositories { mavenCentral() + mavenLocal() maven { name = 'ForgeFS' url = 'http://files.minecraftforge.net/maven' } - } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + + } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.1-SNAPSHOT' } } + repositories { ivy { name 'Forge FS legacy' @@ -69,9 +76,9 @@ if (configFile2.exists()){ dependencies { compile "mantle:Mantle:${config.mantle_version}:dev" - compile name: 'ForgeMultipart', version: "${config.minecraft_version}-${config.FMP_version}", ext: 'jar' - compile name: 'CodeChickenLib', version: "${config.minecraft_version}-${config.CCLIB_version}", ext: 'jar' - compile name: 'NotEnoughItems', version: "${config.NEI_version}", type: 'jar' + //compile name: 'ForgeMultipart', version: "${config.minecraft_version}-${config.FMP_version}", ext: 'jar' + //compile name: 'CodeChickenLib', version: "${config.minecraft_version}-${config.CCLIB_version}", ext: 'jar' + //compile name: 'NotEnoughItems', version: "${config.NEI_version}", type: 'jar' } // Finds and sets version data diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java index 5ce463731a0..f0825d23846 100644 --- a/src/main/java/tconstruct/blocks/ConveyorBase.java +++ b/src/main/java/tconstruct/blocks/ConveyorBase.java @@ -36,7 +36,7 @@ public boolean isBlockReplaceable (World world, int x, int y, int z) } @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool (World world, int x, int y, int z) + public AxisAlignedBB func_149668_a (World world, int x, int y, int z) { return null; } @@ -118,19 +118,19 @@ public boolean func_149686_d () } @Override - public boolean isOpaqueCube () + public boolean func_149662_c () { return false; } @Override - public int getRenderBlockPass () + public int func_149701_w () { return 1; } @Override - public int getRenderType () + public int func_149645_b () { return SlimeChannelRender.model; } @@ -149,7 +149,7 @@ public void func_149651_a (IIconRegister iconRegister) @Override @SideOnly(Side.CLIENT) - public IIcon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { if (meta >= 8) return icons[0]; diff --git a/src/main/java/tconstruct/blocks/CraftingStationBlock.java b/src/main/java/tconstruct/blocks/CraftingStationBlock.java index d8af4a85d29..b05dfbe15f7 100644 --- a/src/main/java/tconstruct/blocks/CraftingStationBlock.java +++ b/src/main/java/tconstruct/blocks/CraftingStationBlock.java @@ -6,6 +6,7 @@ import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -40,7 +41,7 @@ public String[] getTextureNames () } @Override - public IIcon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { return icons[meta * 3 + getTextureIndex(side)]; } @@ -62,13 +63,13 @@ public boolean func_149686_d () } @Override - public boolean isOpaqueCube () + public boolean func_149662_c () { return false; } @Override - public int getRenderType () + public int func_149645_b () { return TableRender.tabelModelID; } @@ -104,11 +105,23 @@ public Object getModInstance () } @Override - public void getSubBlocks (Block b, CreativeTabs tab, List list) + public void func_149666_a (Item b, CreativeTabs tab, List list) { for (int iter = 0; iter < 1; iter++) { list.add(new ItemStack(b, 1, iter)); } } + + @Override + public TileEntity func_149915_a (World var1, int metadata) + { + switch (metadata) + { + case 0: + return new CraftingStationLogic(); + default: + return null; + } + } } diff --git a/src/main/java/tconstruct/blocks/DryingRack.java b/src/main/java/tconstruct/blocks/DryingRack.java index 05493fd0301..a773395e027 100644 --- a/src/main/java/tconstruct/blocks/DryingRack.java +++ b/src/main/java/tconstruct/blocks/DryingRack.java @@ -8,7 +8,6 @@ import tconstruct.library.TConstructRegistry; import mantle.blocks.abstracts.InventoryBlock; import tconstruct.library.tools.AbilityHelper; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -40,7 +39,7 @@ public TileEntity func_149915_a (World world, int metadata) } @Override - public int getRenderBlockPass () + public int func_149701_w () { return 1; } @@ -78,7 +77,7 @@ public void onBlockPlacedBy (World world, int x, int y, int z, EntityLiving livi /* Activation */ @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) + public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { return activateDryingRack(world, x, y, z, player); } @@ -203,12 +202,12 @@ public void setBlockBoundsBasedOnState (IBlockAccess world, int x, int y, int z) public void addCollisionBoxesToList (World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity entity) { this.setBlockBoundsBasedOnState(world, x, y, z); - super.addCollisionBoxesToList(world, x, y, z, aabb, list, entity); + super.func_149743_a(world, x, y, z, aabb, list, entity); } /* Rendering */ @Override - public int getRenderType () + public int func_149645_b () { return DryingRackRender.model; } @@ -222,9 +221,9 @@ public String[] getTextureNames () } @Override - public IIcon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { - return Blocks.planks.getIcon(side, 0); + return Blocks.planks.func_149691_a(side, 0); } public int getTextureIndex (int side) @@ -244,7 +243,7 @@ public boolean func_149686_d () } @Override - public boolean isOpaqueCube () + public boolean func_149662_c () { return false; } diff --git a/src/main/java/tconstruct/blocks/EquipBlock.java b/src/main/java/tconstruct/blocks/EquipBlock.java index 85fd780abf9..16b2d0b4414 100644 --- a/src/main/java/tconstruct/blocks/EquipBlock.java +++ b/src/main/java/tconstruct/blocks/EquipBlock.java @@ -58,13 +58,13 @@ public boolean func_149686_d () } @Override - public boolean isOpaqueCube () + public boolean func_149662_c () { return false; } @Override - public int getRenderType () + public int func_149645_b () { return FrypanRender.frypanModelID; } @@ -122,7 +122,7 @@ public void func_149689_a (World par1World, int par2, int par3, int par4, Entity @Override public void func_149749_a (World par1World, int x, int y, int z, int par5, int meta) { - TileEntity te = par1World.getBlockTileEntity(x, y, z); + TileEntity te = par1World.func_147438_o(x, y, z); if (te != null && te instanceof EquipLogic) { diff --git a/src/main/java/tconstruct/blocks/GlassPaneStained.java b/src/main/java/tconstruct/blocks/GlassPaneStained.java index c8b6019687a..647063b0b65 100644 --- a/src/main/java/tconstruct/blocks/GlassPaneStained.java +++ b/src/main/java/tconstruct/blocks/GlassPaneStained.java @@ -34,7 +34,7 @@ public int getRenderBlockPass () } @Override - public int damageDropped (int par1) + public int func_149692_a (int par1) { return par1; } diff --git a/src/main/java/tconstruct/blocks/GravelOre.java b/src/main/java/tconstruct/blocks/GravelOre.java index 32f0cd4e667..4daf7cac5d0 100644 --- a/src/main/java/tconstruct/blocks/GravelOre.java +++ b/src/main/java/tconstruct/blocks/GravelOre.java @@ -37,7 +37,7 @@ public void registerIcons (IIconRegister iconRegister) } @Override - public IIcon getIcon (int side, int meta) + public IIcon func_149691_a (int side, int meta) { return icons[meta]; } @@ -52,7 +52,7 @@ public float getBlockHardness (World world, int x, int y, int z) } @Override - public int damageDropped (int meta) + public int func_149692_a (int meta) { /*if (meta == 1) return 0;*/ diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index 46672147af2..c6ce3383208 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -11,6 +11,7 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -157,13 +158,13 @@ public TileEntity func_149915_a (World world, int metadata) } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) + public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int side, float clickX, float clickY, float clickZ) { ItemStack heldItem = player.inventory.getCurrentItem(); if (heldItem != null) { FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(player.getCurrentEquippedItem()); - LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z); + LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z); if (liquid != null) { int amount = logic.fill(ForgeDirection.UNKNOWN, liquid, false); @@ -237,11 +238,11 @@ public TileEntity createNewTileEntity (World world) } @Override - public void getSubBlocks (int id, CreativeTabs tab, List list) + public void getSubBlocks (Item i, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { - list.add(new ItemStack(id, 1, iter)); + list.add(new ItemStack(i, 1, iter)); } } @@ -254,7 +255,7 @@ public int damageDropped (int meta) /* Updates */ public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockID) { - TileEntity logic = world.getBlockTileEntity(x, y, z); + TileEntity logic = world.func_147438_o(x, y, z); if (logic instanceof IServantLogic) { ((IServantLogic) logic).notifyMasterOfChange(); @@ -267,7 +268,7 @@ public boolean removeBlockByPlayer (World world, EntityPlayer player, int x, int player.addExhaustion(0.025F); int meta = world.getBlockMetadata(x, y, z); ItemStack stack = new ItemStack(this, 1, meta); - LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z); + LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z); FluidStack liquid = logic.tank.getFluid(); if (liquid != null) { @@ -311,7 +312,7 @@ public void func_149689_a (World world, int x, int y, int z, EntityLivingBase li if (liquidTag != null) { FluidStack liquid = FluidStack.loadFluidStackFromNBT(liquidTag); - LavaTankLogic logic = (LavaTankLogic) world.getBlockTileEntity(x, y, z); + LavaTankLogic logic = (LavaTankLogic) world.func_147438_o(x, y, z); logic.tank.setFluid(liquid); } } diff --git a/src/main/java/tconstruct/blocks/component/SmelteryScan.java b/src/main/java/tconstruct/blocks/component/SmelteryScan.java index 5207f5d6bd7..0c7499742dc 100644 --- a/src/main/java/tconstruct/blocks/component/SmelteryScan.java +++ b/src/main/java/tconstruct/blocks/component/SmelteryScan.java @@ -130,15 +130,14 @@ public void readNetworkNBT (NBTTagCompound tags) { super.readNetworkNBT(tags); - NBTTagList tanks = tags.getTagList("Tanks"); + NBTTagList tanks = tags.func_150295_c("Tanks",11); if (tanks != null) { lavaTanks.clear(); for (int i = 0; i < tanks.tagCount(); ++i) { - NBTTagIntArray tag = (NBTTagIntArray) tanks.tagAt(i); - int[] coord = tag.intArray; + int[] coord = tanks.func_150306_c(i); layerAirCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } @@ -152,7 +151,7 @@ public void writeNetworkNBT (NBTTagCompound tags) NBTTagList tanks = new NBTTagList(); for (CoordTuple coord : lavaTanks) { - tanks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); + tanks.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); } tags.setTag("Tanks", tanks); } diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 3b9535b17ae..d4ac04e1f97 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -517,9 +517,9 @@ public void func_145839_a (NBTTagCompound tags) super.func_145839_a(tags); readNetworkNBT(tags); - structure.func_145839_a(tags); - multitank.func_145839_a(tags); - smeltery.func_145839_a(tags); + structure.readFromNBT(tags); + multitank.readFromNBT(tags); + smeltery.readFromNBT(tags); } public void readNetworkNBT (NBTTagCompound tags) @@ -539,9 +539,9 @@ public void func_145841_b (NBTTagCompound tags) super.func_145841_b(tags); writeNetworkNBT(tags); - structure.func_145841_b(tags); - multitank.func_145841_b(tags); - smeltery.func_145841_b(tags); + structure.writeToNBT(tags); + multitank.writeToNBT(tags); + smeltery.writeToNBT(tags); } public void writeNetworkNBT (NBTTagCompound tags) diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java index 17d23f76c07..98736b13bf5 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java @@ -293,7 +293,7 @@ public int getLiquidAmount () /* Updating */ @Override - public void updateEntity () + public void func_145845_h () { if (castingDelay > 0) { @@ -370,7 +370,7 @@ public void writeCustomNBT (NBTTagCompound tags) if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145841_b(nbt); + liquid.writeToNBT(nbt); tags.setTag("Fluid", nbt); } tags.setBoolean("Initialized", init); diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java index 9c0d9dbad09..b5c254118a9 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java @@ -547,7 +547,7 @@ public void writeCustomNBT (NBTTagCompound tags) if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145841_b(nbt); + liquid.writeToNBT(nbt); tags.setTag("Fluid", nbt); } tags.setInteger("LastProvider", this.convertFDToInt(this.lastProvider)); diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java index 19ce3ea16fa..842dd310dcb 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java @@ -367,7 +367,7 @@ public void writeCustomNBT (NBTTagCompound tags) if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145841_b(nbt); + liquid.writeToNBT(nbt); tags.setTag("Fluid", nbt); } tags.setBoolean("Initialized", init); diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index ecab98cbec7..36a4381517e 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -35,7 +35,7 @@ public String getDefaultName () } @Override - public void updateEntity () + public void func_145845_h () { if (!field_145850_b.isRemote && maxTime > 0 && currentTime < maxTime) { diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java index a52ff1c4281..ea31911a75e 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java @@ -66,7 +66,7 @@ public boolean activateFaucet () } @Override - public void updateEntity () + public void func_145845_h () { if (liquid != null) { @@ -157,7 +157,7 @@ public void writeCustomNBT (NBTTagCompound tags) if (liquid != null) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145841_b(nbt); + liquid.writeToNBT(nbt); tags.setTag("Fluid", nbt); } } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 5c63b097c6a..50c18f0e9d5 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -1078,12 +1078,12 @@ public void func_145839_a (NBTTagCompound tags) meltingTemps = tags.getIntArray("MeltingTemps"); activeTemps = tags.getIntArray("ActiveTemps"); - NBTTagList liquidTag = tags.getTagList("Liquids"); + NBTTagList liquidTag = tags.func_150295_c("Liquids", 9); moltenMetal.clear(); for (int iter = 0; iter < liquidTag.tagCount(); iter++) { - NBTTagCompound nbt = (NBTTagCompound) liquidTag.tagAt(iter); + NBTTagCompound nbt = (NBTTagCompound) liquidTag.func_150305_b(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); if (fluid != null) moltenMetal.add(fluid); @@ -1120,7 +1120,7 @@ public void func_145841_b (NBTTagCompound tags) for (FluidStack liquid : moltenMetal) { NBTTagCompound nbt = new NBTTagCompound(); - liquid.func_145841_b(nbt); + liquid.writeToNBT(nbt); taglist.appendTag(nbt); } diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java index 4922ee8dee3..67b02cb3198 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java @@ -147,7 +147,7 @@ public void func_145839_a (NBTTagCompound tags) { super.func_145839_a(tags); readNetworkNBT(tags); - multitank.func_145839_a(tags); + multitank.readFromNBT(tags); } public void readNetworkNBT (NBTTagCompound tags) @@ -161,7 +161,7 @@ public void func_145841_b (NBTTagCompound tags) { super.func_145839_a(tags); writeNetworkNBT(tags); - multitank.func_145841_b(tags); + multitank.writeToNBT(tags); } public void writeNetworkNBT (NBTTagCompound tags) diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java index 49c541e76bf..cef9b72cab8 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -74,7 +74,7 @@ public void func_145839_a (NBTTagCompound par1NBTTagCompound) for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.tagAt(i); + NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.func_150305_b(i); byte b0 = nbttagcompound1.getByte("Slot"); if (b0 >= 0 && b0 < this.inventory.length) diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java index 470405d3996..09fde295b6d 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java @@ -31,12 +31,12 @@ public SlimeGrass() { super(Material.field_151577_b); func_149711_c(0.6f); - this.setTickRandomly(true); + this.func_149675_a(true); this.func_149647_a(TConstructRegistry.blockTab); } @Override - public int damageDropped (int meta) + public int func_149692_a (int meta) { if (meta == 1) //dirt return 0; @@ -137,11 +137,11 @@ else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9) } } - public int idDropped (int metadata, Random random, int fortune) + public Block blockDropped (int metadata, Random random, int fortune) { if (metadata == 1) - return Blocks.dirt.blockID; + return Blocks.dirt; else - return TRepo.craftedSoil.blockID; + return TRepo.craftedSoil; } } diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java index 025d7347072..861b293f2a4 100644 --- a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java +++ b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java @@ -82,7 +82,7 @@ public void harvestBlock (World world, EntityPlayer player, int x, int y, int z, } @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) { ItemStack stack = player.getCurrentEquippedItem(); if ((stack != null) && (ComparisonHelper.areEquivalent(stack.getItem(), this)) && (!player.isSneaking())) diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index f4556376082..4526f1b8953 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -31,24 +31,24 @@ public Landmine(EnumCreatureType par3EnumCreatureType, Material par4Material) super(par4Material); this.triggerMobType = EnumCreatureType.monster; this.func_149647_a(TConstructRegistry.blockTab); - this.setTickRandomly(true); + this.func_149675_a(true); float var5 = 0.0625F; this.func_149676_a(var5, 0.0F, var5, 1.0F - var5, 0.03125F, 1.0F - var5); } public IIcon getBlockTexture (IBlockAccess world, int x, int y, int z, int side) { - Block block = world.getBlock(x, y - 1, z); + Block block = world.func_147439_a(x, y - 1, z); if (block != null) { return block.getBlockTexture(world, x, y - 1, z, side); } - return Blocks.sponge.getIcon(side, world.getBlockMetadata(x, y, z)); + return Blocks.sponge.func_149691_a(side, world.getBlockMetadata(x, y, z)); } public IIcon getIcon (int side, int meta) { - return Blocks.sponge.getIcon(1, meta); + return Blocks.sponge.func_149691_a(1, meta); } public void registerIcons (IIconRegister par1IconRegister) @@ -193,7 +193,7 @@ private void setStateIfMobInteractsWithPlate (World world, int posX, int posY, i { Entity var10 = (Entity) var9.next(); - if (!var10.doesEntityNotTriggerPressurePlate()) + if (!var10.func_145773_az()) { var6 = true; break; diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java index 991ff412e9f..df6e0851502 100644 --- a/src/main/java/tconstruct/blocks/traps/Punji.java +++ b/src/main/java/tconstruct/blocks/traps/Punji.java @@ -48,7 +48,7 @@ public void func_149670_a (World world, int x, int y, int z, Entity entity) /* Right-click adds sticks */ @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ) + public boolean func_149727_a (World world, int x, int y, int z, EntityPlayer player, int par6, float hitX, float hitY, float hitZ) { /*if (world.isRemote) return false;*/ diff --git a/src/main/java/tconstruct/client/entity/CartRender.java b/src/main/java/tconstruct/client/entity/CartRender.java index a34c0a5fcc9..b09f3c963a2 100644 --- a/src/main/java/tconstruct/client/entity/CartRender.java +++ b/src/main/java/tconstruct/client/entity/CartRender.java @@ -32,7 +32,7 @@ public CartRender() public void renderPullcart (CartEntity cart, double posX, double posY, double posZ, float par8, float par9) { GL11.glPushMatrix(); - long var10 = (long) cart.entityId * 493286711L; + long var10 = (long) cart.field_145783_c * 493286711L; var10 = var10 * var10 * 4392167121L + var10 * 98761L; float var12 = (((float) (var10 >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float var13 = (((float) (var10 >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; diff --git a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java index 5726669cb2d..2d5b84efa58 100644 --- a/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java +++ b/src/main/java/tconstruct/client/gui/ArmorExtendedGui.java @@ -21,8 +21,8 @@ public class ArmorExtendedGui extends InventoryEffectRenderer public InventoryPlayer inv; public ArmorExtended stats; - private float xSize_lo; - private float ySize_lo; + private float field_146999_f_lo; + private float field_147000_g_lo; public ArmorExtendedGui(InventoryPlayer inventoryplayer, ArmorExtended holder) { @@ -35,8 +35,8 @@ public void initGui () { super.initGui(); - int cornerX = guiLeft; - int cornerY = (this.field_146294_l - this.ySize) / 2; + int cornerX = field_147003_i; + int cornerY = (this.field_146294_l - this.field_147000_g) / 2; this.field_146292_n.clear(); // InventoryTab tab = new InventoryTab(2, cornerX, cornerY - 28, new ItemStack(Block.workbench), 0); @@ -52,20 +52,20 @@ public void initGui () protected void drawGuiContainerForegroundLayer (int par1, int par2) { //fontRenderer.drawString(StatCollector.translateToLocal("inventory.armorextended"), 60, 6, 0x404040); - //fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); + //fontRenderer.drawString(StatCollector.translateToLocal("container.inventory"), 17, (field_147000_g - 96) + 2, 0x404040); } public void drawScreen (int par1, int par2, float par3) { super.drawScreen(par1, par2, par3); - this.xSize_lo = (float) par1; - this.ySize_lo = (float) par2; + this.field_146999_f_lo = (float) par1; + this.field_147000_g_lo = (float) par2; // if (stats.inventory[2] != null && stats.inventory[2].getItem() == TContent.knapsack) // { // if (this.field_146292_n.size() < 3) // { - // int cornerX = guiLeft; - // int cornerY = (this.height - this.ySize) / 2; + // int cornerX = field_147003_i; + // int cornerY = (this.height - this.field_147000_g) / 2; // InventoryTab tab = new InventoryTab(4, cornerX + 56, cornerY - 28, new ItemStack(TContent.knapsack), 1); // this.field_146292_n.add(tab); // } @@ -81,14 +81,14 @@ public void drawScreen (int par1, int par2, float par3) private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/armorextended.png"); - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) + protected void func_146976_a (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); //mc.renderEngine.bindTexture("/mods/tinker/textures/gui/armorextended.png"); this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = guiLeft; - int cornerY = (field_146294_l - ySize) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); + int cornerX = field_147003_i; + int cornerY = (field_146294_l - field_147000_g) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g); if (!stats.isStackInSlot(0)) drawTexturedModalRect(cornerX + 79, cornerY + 16, 176, 9, 18, 18); @@ -105,9 +105,9 @@ protected void drawGuiContainerBackgroundLayer (float f, int i, int j) if (!stats.isStackInSlot(6)) drawTexturedModalRect(cornerX + 151, cornerY + 52, 230, 36, 18, 18); - cornerX = this.guiLeft; - cornerY = this.guiTop; - drawPlayerOnGui(this.field_146297_k, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.xSize_lo, (float) (cornerY + 75 - 50) - this.ySize_lo); + cornerX = this.field_147003_i; + cornerY = this.field_147009_r; + drawPlayerOnGui(this.field_146297_k, cornerX + 33, cornerY + 75, 30, (float) (cornerX + 51) - this.field_146999_f_lo, (float) (cornerY + 75 - 50) - this.field_147000_g_lo); } public static void drawPlayerOnGui (Minecraft par0Minecraft, int par1, int par2, int par3, float par4, float par5) @@ -143,6 +143,7 @@ public static void drawPlayerOnGui (Minecraft par0Minecraft, int par1, int par2, OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit); } + /*protected void keyTyped(char par1, int par2) { if (par2 == TControls.armorKey.keyCode) diff --git a/src/main/java/tconstruct/client/gui/CraftingStationGui.java b/src/main/java/tconstruct/client/gui/CraftingStationGui.java index 6ee59f5f223..4d99e5937ee 100644 --- a/src/main/java/tconstruct/client/gui/CraftingStationGui.java +++ b/src/main/java/tconstruct/client/gui/CraftingStationGui.java @@ -32,7 +32,7 @@ public CraftingStationGui(InventoryPlayer inventory, CraftingStationLogic logic, { super(logic.getGuiContainer(inventory, world, x, y, z)); this.logic = logic; - //text = new GuiTextField(this.field_146289_q, this.xSize / 2 - 5, 8, 30, 12); + //text = new GuiTextField(this.field_146289_q, this.field_146999_f / 2 - 5, 8, 30, 12); //this.text.setText(""); title = "\u00A7nRepair and Modification"; body = "The main way to repair or change your tools or armor.\n\nPlace an item and a material on the left to get started."; @@ -40,13 +40,13 @@ public CraftingStationGui(InventoryPlayer inventory, CraftingStationLogic logic, } @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) + protected void func_146979_b (int par1, int par2) { this.field_146289_q.drawString(StatCollector.translateToLocal(logic.tinkerTable ? "crafters.TinkerTable" : logic.getInvName()), 8, 6, 0x202020); - this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.ySize - 96 + 2, 0x202020); + this.field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, this.field_147000_g - 96 + 2, 0x202020); if (logic.chest != null) - this.field_146289_q.drawString(StatCollector.translateToLocal(logic.chest.get().func_145825_b()), -108, this.ySize - 160, 0x202020); - //this.field_146289_q.drawString(toolName + "_", this.xSize / 2 - 18, 8, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal(logic.chest.get().func_145825_b()), -108, this.field_147000_g - 160, 0x202020); + //this.field_146289_q.drawString(toolName + "_", this.field_146999_f / 2 - 18, 8, 0xffffff); if (logic.tinkerTable) { @@ -64,7 +64,7 @@ void drawToolStats () { ToolCore tool = (ToolCore) stack.getItem(); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); - this.drawCenteredString(field_146289_q, "\u00A7n" + tool.getToolName(), xSize + 63, 8, 0xffffff); + this.drawCenteredString(field_146289_q, "\u00A7n" + tool.getToolName(), field_146999_f + 63, 8, 0xffffff); drawModularToolStats(stack, tool, tags); } @@ -72,7 +72,7 @@ else if (stack.getItem() instanceof ArmorCore) { ArmorCore armor = (ArmorCore) stack.getItem(); NBTTagCompound tags = stack.getTagCompound().getCompoundTag("TinkerArmor"); - this.drawCenteredString(field_146289_q, "\u00A7n" + armor.getClass().getSimpleName(), xSize + 63, 8, 0xffffff); + this.drawCenteredString(field_146289_q, "\u00A7n" + armor.getClass().getSimpleName(), field_146999_f + 63, 8, 0xffffff); drawModularArmorStats(stack, armor, tags); } @@ -85,7 +85,7 @@ void drawModularArmorStats (ItemStack stack, ArmorCore tool, NBTTagCompound tags int offset = 0; if (modifiers > 0) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; } } @@ -104,14 +104,14 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) { if (maxDur >= 10000) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation1"), xSize + 8, base + offset * 11, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation1"), field_146999_f + 8, base + offset * 11, 0xffffff); offset++; - field_146289_q.drawString("- " + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString("- " + availableDurability + "/" + maxDur, field_146999_f + 8, base + offset * 10, 0xffffff); offset++; } else { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation2") + availableDurability + "/" + maxDur, field_146999_f + 8, base + offset * 10, 0xffffff); offset++; } } @@ -129,16 +129,16 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff); else - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation3") + attack / 2f + heart, field_146999_f + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundDamage != 0) { heart = stoneboundDamage == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); String bloss = stoneboundDamage > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - this.field_146289_q.drawString(bloss + (int) stoneboundDamage / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(bloss + (int) stoneboundDamage / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff); offset++; } offset++; @@ -151,9 +151,9 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) int drawSpeed = tags.getInteger("DrawSpeed"); float flightSpeed = tags.getFloat("FlightSpeed"); float trueDraw = drawSpeed / 20f * flightSpeed; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation6") + df.format(trueDraw) + "s", field_146999_f + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation7") + df.format(flightSpeed) + "x", field_146999_f + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -167,28 +167,28 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) float shatter = tags.getFloat("BreakChance"); float accuracy = tags.getFloat("Accuracy"); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation10"), xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation10"), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; String heart = attack == 2 ? StatCollector.translateToLocal("gui.partcrafter9") : StatCollector.translateToLocal("gui.partcrafter10"); if (attack % 2 == 0) - this.field_146289_q.drawString("- " + attack / 2 + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString("- " + attack / 2 + heart, field_146999_f + 8, base + offset * 10, 0xffffff); else - this.field_146289_q.drawString("- " + attack / 2f + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString("- " + attack / 2f + heart, field_146999_f + 8, base + offset * 10, 0xffffff); offset++; int minAttack = attack; int maxAttack = attack * 2; heart = StatCollector.translateToLocal("gui.partcrafter10"); - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation11"), xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation11"), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(df.format(minAttack / 2f) + "-" + df.format(maxAttack / 2f) + heart, field_146999_f + 8, base + offset * 10, 0xffffff); offset++; offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation8") + df.format(mass), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; - this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", xSize + 8, base + offset * 10, 0xffffff); + this.field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation9") + df.format(accuracy - 4) + "%", field_146999_f + 8, base + offset * 10, 0xffffff); offset++; - /*this.field_146289_q.drawString("Chance to break: " + df.format(shatter)+"%", xSize + 8, base + offset * 10, 0xffffff); + /*this.field_146289_q.drawString("Chance to break: " + df.format(shatter)+"%", field_146999_f + 8, base + offset * 10, 0xffffff); offset++;*/ offset++; } @@ -204,21 +204,21 @@ void drawModularToolStats (ItemStack stack, ToolCore tool, NBTTagCompound tags) float trueSpeed = mineSpeed + stoneboundSpeed; float trueSpeed2 = mineSpeed + stoneboundSpeed; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation12"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation12"), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; - field_146289_q.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString("- " + df.format(trueSpeed) + ", " + df.format(trueSpeed2), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - field_146289_q.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(bloss + df.format(stoneboundSpeed), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; } offset++; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation13"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation13"), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; field_146289_q - .drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), xSize + 8, base + offset * 10, 0xffffff); + .drawString("- " + getHarvestLevelName(tags.getInteger("HarvestLevel")) + ", " + getHarvestLevelName(tags.getInteger("HarvestLevel2")), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -253,15 +253,15 @@ else if (categories.contains("harvest")) trueSpeed += stoneboundSpeed; if (trueSpeed < 0) trueSpeed = 0; - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation14") + df.format(trueSpeed), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; if (stoneboundSpeed != 0) { String bloss = stoneboundSpeed > 0 ? StatCollector.translateToLocal("gui.toolstation4") : StatCollector.translateToLocal("gui.toolstation5"); - field_146289_q.drawString(bloss + df.format(stoneboundSpeed), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(bloss + df.format(stoneboundSpeed), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; } - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation15") + getHarvestLevelName(tags.getInteger("HarvestLevel")), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -269,7 +269,7 @@ else if (categories.contains("utility")) { float mineSpeed = tags.getInteger("MiningSpeed"); float trueSpeed = mineSpeed / (100f); - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation16") + trueSpeed, field_146999_f + 8, base + offset * 10, 0xffffff); offset++; offset++; } @@ -277,12 +277,12 @@ else if (categories.contains("utility")) int modifiers = tags.getInteger("Modifiers"); if (modifiers > 0) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation18") + tags.getInteger("Modifiers"), field_146999_f + 8, base + offset * 10, 0xffffff); offset++; } if (tags.hasKey("Tooltip1")) { - field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation17"), xSize + 8, base + offset * 10, 0xffffff); + field_146289_q.drawString(StatCollector.translateToLocal("gui.toolstation17"), field_146999_f + 8, base + offset * 10, 0xffffff); } boolean displayToolTips = true; @@ -294,7 +294,7 @@ else if (categories.contains("utility")) if (tags.hasKey(tooltip)) { String tipName = tags.getString(tooltip); - field_146289_q.drawString("- " + tipName, xSize + 8, base + (offset + tipNum) * 10, 0xffffff); + field_146289_q.drawString("- " + tipName, field_146999_f + 8, base + (offset + tipNum) * 10, 0xffffff); } else displayToolTips = false; @@ -324,8 +324,8 @@ protected String getHarvestLevelName (int num) void drawToolInformation () { - this.drawCenteredString(field_146289_q, title, xSize + 63, 8, 0xffffff); - field_146289_q.drawSplitString(body, xSize + 8, 24, 115, 0xffffff); + this.drawCenteredString(field_146289_q, title, field_146999_f + 63, 8, 0xffffff); + field_146289_q.drawSplitString(body, field_146999_f + 8, 24, 115, 0xffffff); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/tinkertable.png"); @@ -334,18 +334,18 @@ void drawToolInformation () private static final ResourceLocation chest = new ResourceLocation("tinker", "textures/gui/chestside.png"); @Override - protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) + protected void func_146976_a (float par1, int par2, int par3) { // Draw the background GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (this.field_146294_l - this.xSize) / 2; - int cornerY = (this.field_146295_m - this.ySize) / 2; - this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); + int cornerX = (this.field_146294_l - this.field_146999_f) / 2; + int cornerY = (this.field_146295_m - this.field_147000_g) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.field_146999_f, this.field_147000_g); if (active) { - this.drawTexturedModalRect(cornerX + 62, cornerY, 0, this.ySize, 112, 22); + this.drawTexturedModalRect(cornerX + 62, cornerY, 0, this.field_147000_g, 112, 22); } this.field_146297_k.getTextureManager().bindTexture(icons); @@ -363,9 +363,9 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146297_k.getTextureManager().bindTexture(chest); if (logic.doubleChest == null) - this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.ySize); + this.drawTexturedModalRect(cornerX - 116, cornerY, 0, 0, 121, this.field_147000_g); else - this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 122, this.ySize + 21); + this.drawTexturedModalRect(cornerX - 116, cornerY, 125, 0, 122, this.field_147000_g + 21); } // Draw description @@ -373,9 +373,9 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146297_k.getTextureManager().bindTexture(description); - cornerX = (this.field_146294_l + this.xSize) / 2; - cornerY = (this.field_146295_m - this.ySize) / 2; - this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.ySize + 30); + cornerX = (this.field_146294_l + this.field_146999_f) / 2; + cornerY = (this.field_146295_m - this.field_147000_g) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, 126, this.field_147000_g + 30); } } diff --git a/src/main/java/tconstruct/client/gui/FrypanGui.java b/src/main/java/tconstruct/client/gui/FrypanGui.java index 99ccf674e37..38ff10a67d6 100644 --- a/src/main/java/tconstruct/client/gui/FrypanGui.java +++ b/src/main/java/tconstruct/client/gui/FrypanGui.java @@ -23,18 +23,18 @@ public FrypanGui(InventoryPlayer inventoryplayer, FrypanLogic frypan, World worl protected void drawGuiContainerForegroundLayer (int par1, int par2) { field_146289_q.drawString(StatCollector.translateToLocal("crafters.Frypan"), 60, 6, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/frypan.png"); - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) + protected void func_146976_a (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (field_146294_l - xSize) / 2; - int cornerY = (field_146295_m - ySize) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); + int cornerX = (field_146294_l - field_146999_f) / 2; + int cornerY = (field_146295_m - field_147000_g) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g); if (logic.fuel > 0) { int fuel = logic.gaugeFuelScaled(12); diff --git a/src/main/java/tconstruct/client/gui/FurnaceGui.java b/src/main/java/tconstruct/client/gui/FurnaceGui.java index f2ccc2fe762..62ebdf30e66 100644 --- a/src/main/java/tconstruct/client/gui/FurnaceGui.java +++ b/src/main/java/tconstruct/client/gui/FurnaceGui.java @@ -30,20 +30,20 @@ public FurnaceGui(InventoryPlayer inventory, FurnaceLogic furnace) protected void drawGuiContainerForegroundLayer (int par1, int par2) { String s = this.logic.isInvNameLocalized() ? this.logic.getInvName() : I18n.getStringParams(this.logic.getInvName()); - this.field_146289_q.drawString(s, this.xSize / 2 - this.field_146289_q.getStringWidth(s) / 2, 6, 4210752); - this.field_146289_q.drawString(I18n.getStringParams("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + this.field_146289_q.drawString(s, this.field_146999_f / 2 - this.field_146289_q.getStringWidth(s) / 2, 6, 4210752); + this.field_146289_q.drawString(I18n.getStringParams("container.inventory"), 8, this.field_147000_g - 96 + 2, 4210752); } /** * Draw the background layer for the GuiContainer (everything behind the items) */ - protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) + protected void func_146976_a (float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146297_k.getTextureManager().bindTexture(furnaceGuiTextures); - int k = (this.field_146294_l - this.xSize) / 2; - int l = (this.field_146295_m - this.ySize) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + int k = (this.field_146294_l - this.field_146999_f) / 2; + int l = (this.field_146295_m - this.field_147000_g) / 2; + this.drawTexturedModalRect(k, l, 0, 0, this.field_146999_f, this.field_147000_g); int i1; if (this.logic.isBurning()) diff --git a/src/main/java/tconstruct/client/gui/GuiLandmine.java b/src/main/java/tconstruct/client/gui/GuiLandmine.java index e6d84e7ec02..83103c30763 100644 --- a/src/main/java/tconstruct/client/gui/GuiLandmine.java +++ b/src/main/java/tconstruct/client/gui/GuiLandmine.java @@ -60,7 +60,7 @@ protected void drawItemStackTooltip (ItemStack par1ItemStack, int par2, int par3 } @Override - protected void drawGuiContainerForegroundLayer (int i, int j) + protected void func_146979_b (int i, int j) { if (container.te != null) { @@ -70,17 +70,17 @@ protected void drawGuiContainerForegroundLayer (int i, int j) { field_146289_q.drawString("Landmine", 8, 5, 4210752); } - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 3, 4210752); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, field_147000_g - 96 + 3, 4210752); } @Override - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) + protected void func_146976_a (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); field_146297_k.renderEngine.bindTexture(background); - int x = (field_146294_l - xSize) / 2; - int y = (field_146295_m - ySize) / 2; - this.drawTexturedModalRect(x, y, 0, 0, xSize, ySize); + int x = (field_146294_l - field_146999_f) / 2; + int y = (field_146295_m - field_147000_g) / 2; + this.drawTexturedModalRect(x, y, 0, 0, field_146999_f, field_147000_g); } } diff --git a/src/main/java/tconstruct/client/gui/KnapsackGui.java b/src/main/java/tconstruct/client/gui/KnapsackGui.java index c2abc5eb240..de2df0dbcf1 100644 --- a/src/main/java/tconstruct/client/gui/KnapsackGui.java +++ b/src/main/java/tconstruct/client/gui/KnapsackGui.java @@ -26,8 +26,8 @@ public void initGui () { super.initGui(); - int cornerX = guiLeft; - int cornerY = (this.field_146294_l - this.ySize) / 2; + int cornerX = field_147003_i; + int cornerY = (this.field_146294_l - this.field_147000_g) / 2; this.field_146292_n.clear(); TabRegistry.updateTabValues(cornerX, cornerY, InventoryTabKnapsack.class); @@ -45,18 +45,18 @@ public void initGui () protected void drawGuiContainerForegroundLayer (int par1, int par2) { field_146289_q.drawString(StatCollector.translateToLocal("inventory.knapsack"), 8, 6, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 4, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 4, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/knapsack.png"); - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) + protected void func_146976_a (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = guiLeft; - int cornerY = (field_146294_l - ySize) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); + int cornerX = field_147003_i; + int cornerY = (field_146294_l - field_147000_g) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g); } /*protected void keyTyped(char par1, int par2) diff --git a/src/main/java/tconstruct/client/gui/PatternChestGui.java b/src/main/java/tconstruct/client/gui/PatternChestGui.java index c3f43d25dfc..96a75b6eb2b 100644 --- a/src/main/java/tconstruct/client/gui/PatternChestGui.java +++ b/src/main/java/tconstruct/client/gui/PatternChestGui.java @@ -18,24 +18,24 @@ public PatternChestGui(InventoryPlayer inventoryplayer, PatternChestLogic holder { super(holder.getGuiContainer(inventoryplayer, world, x, y, z)); logic = holder; - xSize = 194; - ySize = 168; + field_146999_f = 194; + field_147000_g = 168; } protected void drawGuiContainerForegroundLayer (int par1, int par2) { field_146289_q.drawString(StatCollector.translateToLocal("inventory.PatternChest"), 60, 6, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 17, (ySize - 96) + 2, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 17, (field_147000_g - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternchest.png"); - protected void drawGuiContainerBackgroundLayer (float f, int i, int j) + protected void func_146976_a (float f, int i, int j) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (field_146294_l - xSize) / 2; - int cornerY = (field_146295_m - ySize) / 2; - drawTexturedModalRect(cornerX, cornerY, 0, 0, xSize, ySize); + int cornerX = (field_146294_l - field_146999_f) / 2; + int cornerY = (field_146295_m - field_147000_g) / 2; + drawTexturedModalRect(cornerX, cornerY, 0, 0, field_146999_f, field_147000_g); } } diff --git a/src/main/java/tconstruct/client/gui/StencilTableGui.java b/src/main/java/tconstruct/client/gui/StencilTableGui.java index 95907b75ed9..d9622297eaf 100644 --- a/src/main/java/tconstruct/client/gui/StencilTableGui.java +++ b/src/main/java/tconstruct/client/gui/StencilTableGui.java @@ -31,21 +31,21 @@ public void onGuiClosed () } @Override - protected void drawGuiContainerForegroundLayer (int par1, int par2) + protected void func_146979_b (int par1, int par2) { field_146289_q.drawString(StatCollector.translateToLocal("crafters.PatternShaper"), 50, 6, 0x404040); - field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (ySize - 96) + 2, 0x404040); + field_146289_q.drawString(StatCollector.translateToLocal("container.inventory"), 8, (field_147000_g - 96) + 2, 0x404040); } private static final ResourceLocation background = new ResourceLocation("tinker", "textures/gui/patternshaper.png"); - protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) + protected void func_146976_a (float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.field_146297_k.getTextureManager().bindTexture(background); - int cornerX = (this.field_146294_l - this.xSize) / 2; - int cornerY = (this.field_146295_m - this.ySize) / 2; - this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.xSize, this.ySize); + int cornerX = (this.field_146294_l - this.field_146999_f) / 2; + int cornerY = (this.field_146295_m - this.field_147000_g) / 2; + this.drawTexturedModalRect(cornerX, cornerY, 0, 0, this.field_146999_f, this.field_147000_g); if (!logic.isStackInSlot(0)) { this.drawTexturedModalRect(cornerX + 47, cornerY + 34, 176, 0, 18, 18); @@ -55,8 +55,8 @@ protected void drawGuiContainerBackgroundLayer (float par1, int par2, int par3) public void initGui () { super.initGui(); - int cornerX = (this.field_146294_l - this.xSize) / 2; - int cornerY = (this.field_146295_m - this.ySize) / 2; + int cornerX = (this.field_146294_l - this.field_146999_f) / 2; + int cornerY = (this.field_146295_m - this.field_147000_g) / 2; this.field_146292_n.clear(); /*ToolGuiElement repair = TConstruct.toolButtons.get(0); diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index a76495cb115..1a8967efae8 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -28,8 +28,8 @@ public static void addTabsToInventory (GuiContainer gui) if (gui.getClass() == GuiInventory.class) { //Values are public at runtime. - int cornerX = gui.guiLeft; - int cornerY = gui.guiTop; + int cornerX = gui.field_146999_f; + int cornerY = gui.field_147009_r; gui.field_146292_n.clear(); updateTabValues(cornerX, cornerY, InventoryTabVanilla.class); diff --git a/src/main/java/tconstruct/entity/CartEntity.java b/src/main/java/tconstruct/entity/CartEntity.java index f01041974ac..eac75fd34df 100644 --- a/src/main/java/tconstruct/entity/CartEntity.java +++ b/src/main/java/tconstruct/entity/CartEntity.java @@ -714,7 +714,7 @@ protected void readEntityFromNBT (NBTTagCompound par1NBTTagCompound) for (int var3 = 0; var3 < var2.tagCount(); ++var3) { - NBTTagCompound var4 = (NBTTagCompound) var2.tagAt(var3); + NBTTagCompound var4 = (NBTTagCompound) var2.func_150305_b(var3); int var5 = var4.getByte("Slot") & 255; if (var5 >= 0 && var5 < this.cargoItems.length) diff --git a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java index 9076a869fb6..0d44580d18f 100644 --- a/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java +++ b/src/main/java/tconstruct/items/blocks/ItemBlockLandmine.java @@ -68,14 +68,14 @@ public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, { TRepo.landmine.func_149689_a(world, x, y, z, player, stack); - TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z); + TileEntityLandmine te = (TileEntityLandmine) world.func_147438_o(x, y, z); if (te == null) { te = (TileEntityLandmine) TRepo.landmine.createTileEntity(world, metadata); } te.triggerType = stack.getItemDamage(); - world.setBlockTileEntity(x, y, z, te); + world.func_147455_a(x, y, z, te); TRepo.landmine.func_149714_e(world, x, y, z, metadata); } diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java index dee6c89782b..a13d7d0b23d 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushItem.java @@ -4,6 +4,7 @@ import tconstruct.common.TRepo; import mantle.blocks.abstracts.MultiItemBlock; +import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -41,9 +42,9 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { - Block block = world.getBlock(x, y, z); + Block block = world.func_147439_a(x, y, z); - if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && world.isAirBlock(x, y + 1, z)) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.func_147465_d(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) diff --git a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java index 2e4565680a3..73d781b6b95 100644 --- a/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java +++ b/src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java @@ -4,6 +4,7 @@ import tconstruct.common.TRepo; import mantle.blocks.abstracts.MultiItemBlock; +import mantle.world.WorldHelper; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -47,9 +48,9 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack)) { - Block block = world.getBlock(x, y, z); + Block block = world.func_147439_a(x, y, z); - if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && world.isAirBlock(x, y + 1, z)) + if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && WorldHelper.isAirBlock(world, x, y + 1, z)) { world.func_147465_d(x, y + 1, z, blockB, stack.getItemDamage() % 4, 3); if (!player.capabilities.isCreativeMode) diff --git a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java index ecf526d7bf4..9392b4c0eee 100644 --- a/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java +++ b/src/main/java/tconstruct/items/blocks/WoolSlab1Item.java @@ -24,12 +24,12 @@ public WoolSlab1Item(Block b) @Override public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { - int id = world.getBlock(x, y, z); + Block b = world.func_147439_a(x, y, z); int meta = world.getBlockMetadata(x, y, z); int trueMeta = meta % 8; boolean flag = (id & 8) != 0; - if ((side == 1 && flag || side == 0 && !flag) && id == this && trueMeta == stack.getItemDamage()) + if ((side == 1 && flag || side == 0 && !flag) && b == this.block && trueMeta == stack.getItemDamage()) { if (world.func_147465_d(x, y, z, Blocks.wool, trueMeta, 3)) { diff --git a/src/main/java/tconstruct/library/component/MultiFluidTank.java b/src/main/java/tconstruct/library/component/MultiFluidTank.java index e98a6883464..ec7b4c2ca5a 100644 --- a/src/main/java/tconstruct/library/component/MultiFluidTank.java +++ b/src/main/java/tconstruct/library/component/MultiFluidTank.java @@ -185,7 +185,7 @@ public void readNetworkNBT (NBTTagCompound tags) for (int iter = 0; iter < liquidTag.tagCount(); iter++) { - NBTTagCompound nbt = (NBTTagCompound) liquidTag.tagAt(iter); + NBTTagCompound nbt = (NBTTagCompound) liquidTag.func_150305_b(iter); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt); if (fluid != null) fluidlist.add(fluid); diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index d8b64cd99c9..39ad1cd9117 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -497,41 +497,38 @@ public void cleanup () public void readFromNBT (NBTTagCompound tags) { super.readFromNBT(tags); - NBTTagList layerAir = tags.getTagList("AirLayer"); + NBTTagList layerAir = tags.func_150295_c("AirLayer",11); if (layerAir != null) { layerAirCoords.clear(); for (int i = 0; i < layerAir.tagCount(); ++i) { - NBTTagIntArray tag = (NBTTagIntArray) layerAir.tagAt(i); - int[] coord = tag.func_150302_c(); + int[] coord = layerAir.func_150306_c(i); layerAirCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } - NBTTagList blocks = tags.getTagList("Blocks"); + NBTTagList blocks = tags.func_150295_c("Blocks", 11); if (blocks != null) { blockCoords.clear(); for (int i = 0; i < blocks.tagCount(); ++i) { - NBTTagIntArray tag = (NBTTagIntArray) blocks.tagAt(i); - int[] coord = tag.func_150302_c(); + int[] coord = blocks.func_150306_c(i); blockCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } - NBTTagList air = tags.getTagList("Air"); + NBTTagList air = tags.func_150295_c("Air", 11); if (air != null) { airCoords.clear(); for (int i = 0; i < air.tagCount(); ++i) { - NBTTagIntArray tag = (NBTTagIntArray) air.tagAt(i); - int[] coord = tag.func_150302_c(); + int[] coord = air.func_150306_c(i); airCoords.add(new CoordTuple(coord[0], coord[1], coord[2])); } } @@ -550,21 +547,21 @@ public void writeToNBT (NBTTagCompound tags) NBTTagList layerAir = new NBTTagList(); for (CoordTuple coord : layerAirCoords) { - layerAir.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); + layerAir.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); } tags.setTag("AirLayer", layerAir); NBTTagList blocks = new NBTTagList(); for (CoordTuple coord : blockCoords) { - blocks.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); + blocks.appendTag(new NBTTagIntArray(new int[] { coord.x, coord.y, coord.z })); } tags.setTag("Blocks", blocks); NBTTagList air = new NBTTagList(); for (CoordTuple coord : airCoords) { - air.appendTag(new NBTTagIntArray("coord", new int[] { coord.x, coord.y, coord.z })); + air.appendTag(new NBTTagIntArray( new int[] { coord.x, coord.y, coord.z })); } tags.setTag("Air", air); tags.setInteger("structureTop", structureTop); diff --git a/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java b/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java index 73dd25b69cf..d8baf95fbf6 100644 --- a/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java +++ b/src/main/java/tconstruct/modifiers/armor/AModMoveSpeed.java @@ -50,7 +50,7 @@ public void modify (ItemStack[] input, ItemStack armor) attributes = baseTag.getTagList("AttributeModifiers"); for (int iter = 0; iter < attributes.tagCount(); iter++) { - NBTTagCompound tag = (NBTTagCompound) attributes.tagAt(iter); + NBTTagCompound tag = (NBTTagCompound) attributes.func_150305_b(iter); if (tag.getString("AttributeName").equals(key)) attributes.removeTag(iter); } diff --git a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java index 1627dd316fa..27fccfea021 100644 --- a/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java +++ b/src/main/java/tconstruct/modifiers/tools/TActiveOmniMod.java @@ -67,7 +67,7 @@ public boolean beforeBlockBreak (ToolCore tool, ItemStack stack, int x, int y, i if (tags.getBoolean("Lava") && block.quantityDropped(meta, 0, random) != 0) { - ItemStack smeltStack = new ItemStack(block.IDropped(meta, random, 0), block.quantityDropped(meta, 0, random), block.damageDropped(meta)); + ItemStack smeltStack = new ItemStack(block.IDropped(meta, random, 0), block.quantityDropped(meta, 0, random), block.func_149692_a(meta)); if (smeltStack.getItem() == null) return false; ItemStack result = FurnaceRecipes.smelting().getSmeltingResult(smeltStack); diff --git a/src/main/java/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java index 0bd8484731c..8c9a76d8330 100644 --- a/src/main/java/tconstruct/util/player/ArmorExtended.java +++ b/src/main/java/tconstruct/util/player/ArmorExtended.java @@ -261,7 +261,7 @@ public void readFromNBT (EntityPlayer entityplayer) NBTTagList tagList = tags.getTagList("TConstruct.Inventory"); for (int i = 0; i < tagList.tagCount(); ++i) { - NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.tagAt(i); + NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.func_150305_b(i); int j = nbttagcompound.getByte("Slot") & 255; ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); diff --git a/src/main/java/tconstruct/util/player/KnapsackInventory.java b/src/main/java/tconstruct/util/player/KnapsackInventory.java index 22acf9aed49..19914315f7f 100644 --- a/src/main/java/tconstruct/util/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/util/player/KnapsackInventory.java @@ -152,7 +152,7 @@ public void readFromNBT (EntityPlayer entityplayer) NBTTagList tagList = tags.getTagList("TConstruct.Knapsack"); for (int i = 0; i < tagList.tagCount(); ++i) { - NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.tagAt(i); + NBTTagCompound nbttagcompound = (NBTTagCompound) tagList.func_150305_b(i); int j = nbttagcompound.getByte("Slot") & 255; ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound); diff --git a/src/main/java/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java index f6768779ab8..b2ac7d3636c 100644 --- a/src/main/java/tconstruct/util/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/util/player/TPlayerHandler.java @@ -77,8 +77,8 @@ public void onPlayerLogin (EntityPlayer entityplayer) compound.setTag("display", new NBTTagCompound()); compound.getCompoundTag("display").setString("Name", "\u00A7f" + "Fudgy_Fetus' Full Guard Pattern"); NBTTagList list = new NBTTagList(); - list.appendTag(new NBTTagString("Lore", "\u00A72\u00A7o" + "The creator and the creation")); - list.appendTag(new NBTTagString("Lore", "\u00A72\u00A7o" + "are united at last!")); + list.appendTag(new NBTTagString("\u00A72\u00A7o" + "The creator and the creation")); + list.appendTag(new NBTTagString("\u00A72\u00A7o" + "are united at last!")); compound.getCompoundTag("display").setTag("Lore", list); pattern.setTagCompound(compound); @@ -93,7 +93,7 @@ public void onPlayerLogin (EntityPlayer entityplayer) compound.setTag("display", new NBTTagCompound()); compound.getCompoundTag("display").setString("Name", "\u00A78" + "Cheaty Inventory"); NBTTagList list = new NBTTagList(); - list.appendTag(new NBTTagString("Lore", "\u00A72\u00A7o" + "Nyaa~")); + list.appendTag(new NBTTagString("\u00A72\u00A7o" + "Nyaa~")); compound.getCompoundTag("display").setTag("Lore", list); pattern.setTagCompound(compound);