diff --git a/capes.txt b/capes.txt index d1458f58..ccbee65c 100644 --- a/capes.txt +++ b/capes.txt @@ -1,6 +1,7 @@ mDiyoNoWantCape:https://dl.dropboxusercontent.com/u/42769935/mCape.png fuj1n:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png progwml6:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png +alexbegt:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png jadedcat:https://dl.dropboxusercontent.com/u/57416963/Minecraft/Capes/jadedcat.png Myrathi:https://dl.dropboxusercontent.com/u/39079855/minecraft_dev/TE_Cape_Myrathi.png Fudgy_Fetus:https://dl.dropboxusercontent.com/u/27415688/fudgecape.png @@ -9,7 +10,6 @@ pillbox:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/defaul Hysting:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png Xythyl:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png andrejsavikin:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_blue.png -alexbegt:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png DentedLeftFender:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/default_green.png Pokefenn:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png sondrex76:http://i.imgur.com/a7QMfjc.png @@ -49,6 +49,8 @@ SatanicSanta:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png GPuzzle:https://dl.dropboxusercontent.com/s/etrersgka8n7g3s/vineCape.png ajloveslily14:https://dl.dropboxusercontent.com/s/8yl77gjf4cygnzo/cape.png multisofteis:http://i.imgur.com/AgGBsX8.png +Drullkus:https://dl.dropboxusercontent.com/u/48633261/cape.png +--------------------------------------------------DRULLKUS WANTED A CAPE----------------------------------------------- --------------------------------------------------PATRONS - TEMPORARY-------------------------------------------------- Reaverblade:https://raw.github.com/SlimeKnights/TinkersConstruct/master/capes/patron_slime.png ----------------------------------------FINALISED - ONLY ALLOW REMOVAL OF CAPES---------------------------------------- diff --git a/src/main/java/tconstruct/blocks/LavaTankBlock.java b/src/main/java/tconstruct/blocks/LavaTankBlock.java index 74f49c10..464e19a6 100644 --- a/src/main/java/tconstruct/blocks/LavaTankBlock.java +++ b/src/main/java/tconstruct/blocks/LavaTankBlock.java @@ -293,7 +293,7 @@ public class LavaTankBlock extends BlockContainer } /* Updates */ - public void onNeighborBlockChange (World world, int x, int y, int z, int nBlockID) + public void onNeighborBlockChange (World world, int x, int y, int z, Block nBlockID) { TileEntity logic = world.getTileEntity(x, y, z); if (logic instanceof IServantLogic) diff --git a/src/main/java/tconstruct/blocks/SearedBlock.java b/src/main/java/tconstruct/blocks/SearedBlock.java index 558a3684..9a384854 100644 --- a/src/main/java/tconstruct/blocks/SearedBlock.java +++ b/src/main/java/tconstruct/blocks/SearedBlock.java @@ -2,6 +2,16 @@ package tconstruct.blocks; import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import tconstruct.TConstruct; +import tconstruct.blocks.logic.CastingBasinLogic; +import tconstruct.blocks.logic.CastingTableLogic; +import tconstruct.blocks.logic.FaucetLogic; +import tconstruct.client.block.SearedRender; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.event.SmelteryEvent; +import tconstruct.library.tools.AbilityHelper; import mantle.blocks.abstracts.InventoryBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -15,16 +25,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import tconstruct.TConstruct; -import tconstruct.blocks.logic.CastingBasinLogic; -import tconstruct.blocks.logic.CastingTableLogic; -import tconstruct.blocks.logic.FaucetLogic; -import tconstruct.client.block.SearedRender; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.event.SmelteryEvent; -import tconstruct.library.tools.AbilityHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SearedBlock extends InventoryBlock { @@ -183,12 +183,12 @@ public class SearedBlock extends InventoryBlock public void addItemToInventory (EntityPlayer player, World world, int x, int y, int z, ItemStack stack) { AbilityHelper.spawnItemAtPlayer(player, 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); } - */ + /*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); + }*/ } /* Rendering */ @@ -260,11 +260,11 @@ public class SearedBlock extends InventoryBlock } @Override - public void getSubBlocks (Item b, CreativeTabs tab, List list) + public void getSubBlocks (Item id, CreativeTabs tab, List list) { for (int iter = 0; iter < 3; iter++) { - list.add(new ItemStack(b, 1, iter)); + list.add(new ItemStack(id, 1, iter)); } } @@ -362,7 +362,7 @@ public class SearedBlock extends InventoryBlock } @Override - public void onNeighborBlockChange (World world, int x, int y, int z, Block neighborBlock) + public void onNeighborBlockChange (World world, int x, int y, int z, Block neighborBlockID) { if (world.isBlockIndirectlyGettingPowered(x, y, z) && world.getBlockMetadata(x, y, z) == 1) { @@ -372,7 +372,7 @@ public class SearedBlock extends InventoryBlock } @Override - public TileEntity createNewTileEntity (World var1, int metadata) + public TileEntity createNewTileEntity (World world, int metadata) { switch (metadata) { @@ -385,6 +385,5 @@ public class SearedBlock extends InventoryBlock default: return null; } - } -} +} \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java index aef27720..9a2183a6 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java @@ -177,6 +177,6 @@ public class AdaptiveDrainLogic extends MultiServantLogic implements IFluidHandl public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readFromNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java index 587aeac2..0143842b 100644 --- a/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java @@ -579,7 +579,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readNetworkNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override diff --git a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java index 63208986..1c45de88 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java @@ -142,7 +142,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl castingDelay = recipe.coolTime; } renderOffset = copyLiquid.amount; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); this.liquid = copyLiquid; needsUpdate = true; } @@ -166,7 +166,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl renderOffset = roomInTank; castingDelay = TConstruct.basinCasting.getCastingDelay(this.liquid, inventory[0]); this.liquid.amount = this.capacity; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } return roomInTank; @@ -177,7 +177,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (doFill) { this.liquid.amount += resource.amount; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } return resource.amount; @@ -194,7 +194,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl public void markDirty () // Isn't actually called? { super.markDirty(); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } @@ -202,7 +202,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl public ItemStack decrStackSize (int slot, int quantity) { ItemStack stack = super.decrStackSize(slot, quantity); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); return stack; } @@ -315,7 +315,7 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl if (renderOffset > 0) { renderOffset -= 6; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } tick++; @@ -401,8 +401,8 @@ public class CastingBasinLogic extends InventoryLogic implements IFluidTank, IFl @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); readFromNBT(packet.func_148857_g()); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override diff --git a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java index ada3ccd6..25622c99 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java @@ -516,7 +516,7 @@ public class CastingChannelLogic extends TileEntity implements IFluidHandler public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - this.worldObj.markBlockRangeForRenderUpdate(this.xCoord, this.yCoord, this.zCoord, xCoord, yCoord, zCoord); + this.worldObj.func_147479_m(this.xCoord, this.yCoord, this.zCoord); } public int convertFDToInt (ForgeDirection dir) diff --git a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java index 9a8c82a2..7ffa5fc8 100644 --- a/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java +++ b/src/main/java/tconstruct/blocks/logic/CastingTableLogic.java @@ -142,7 +142,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl castingDelay = recipe.coolTime; } renderOffset = copyLiquid.amount; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); this.liquid = copyLiquid; needsUpdate = true; } @@ -166,7 +166,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl renderOffset = roomInTank; castingDelay = TConstruct.tableCasting.getCastingDelay(this.liquid, inventory[0]); this.liquid.amount = this.capacity; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } return roomInTank; @@ -177,7 +177,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (doFill) { this.liquid.amount += resource.amount; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } return resource.amount; @@ -194,7 +194,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl public void markDirty () // Isn't actually called? { super.markDirty(); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); needsUpdate = true; } @@ -202,7 +202,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl public ItemStack decrStackSize (int slot, int quantity) { ItemStack stack = super.decrStackSize(slot, quantity); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); return stack; } @@ -316,7 +316,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl if (renderOffset > 0) { renderOffset -= 6; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } tick++; @@ -400,7 +400,7 @@ public class CastingTableLogic extends InventoryLogic implements IFluidTank, IFl public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readFromNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override diff --git a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java index 58aebdd2..64e5e934 100644 --- a/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java +++ b/src/main/java/tconstruct/blocks/logic/DryingRackLogic.java @@ -115,7 +115,7 @@ public class DryingRackLogic extends InventoryLogic public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override diff --git a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java index 00fd16ae..f80f3418 100644 --- a/src/main/java/tconstruct/blocks/logic/FaucetLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FaucetLogic.java @@ -180,7 +180,7 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override @@ -244,4 +244,4 @@ public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogi // TODO Auto-generated method stub return null; } -} +} \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java index e2528bac..026c3241 100644 --- a/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java +++ b/src/main/java/tconstruct/blocks/logic/FurnaceLogic.java @@ -299,7 +299,7 @@ public class FurnaceLogic extends InventoryLogic implements IActiveLogic, IFacin public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readNetworkNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } @Override diff --git a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java index d9603769..9e3ae6f8 100644 --- a/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LavaTankLogic.java @@ -158,7 +158,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } /* Updating */ @@ -174,7 +174,7 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler if (renderOffset > 0) { renderOffset -= 6; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } } \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java index 2d041e08..7dc87dd4 100644 --- a/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java +++ b/src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java @@ -19,7 +19,7 @@ public class LiquidTextureLogic extends TileEntity public void setLiquidType (int tex) { texturePos = tex; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } public int getLiquidType () @@ -62,7 +62,7 @@ public class LiquidTextureLogic extends TileEntity @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); readCustomNBT(packet.func_148857_g()); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java index 05d0825d..606e5664 100644 --- a/src/main/java/tconstruct/blocks/logic/RedwireLogic.java +++ b/src/main/java/tconstruct/blocks/logic/RedwireLogic.java @@ -62,6 +62,6 @@ public class RedwireLogic extends TileEntity public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readCustomNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java index f896eee1..24118860 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java @@ -183,6 +183,6 @@ public class SmelteryDrainLogic extends MultiServantLogic implements IFluidHandl public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { readFromNBT(packet.func_148857_g()); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } } \ No newline at end of file diff --git a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java index 7f3bf88e..869273dd 100644 --- a/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/main/java/tconstruct/blocks/logic/SmelteryLogic.java @@ -1038,7 +1038,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } } needsUpdate = true; - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); } return amount; } @@ -1167,7 +1167,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci { readFromNBT(packet.func_148857_g()); markDirty(); - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); this.needsUpdate = true; } diff --git a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java index f6d62385..4c66c4f3 100644 --- a/src/main/java/tconstruct/blocks/logic/TankAirLogic.java +++ b/src/main/java/tconstruct/blocks/logic/TankAirLogic.java @@ -181,7 +181,7 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide @Override public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet) { - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); readNetworkNBT(packet.func_148857_g()); } diff --git a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java index 6d5eba72..e8449413 100644 --- a/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java +++ b/src/main/java/tconstruct/blocks/logic/TileEntityLandmine.java @@ -257,7 +257,7 @@ public class TileEntityLandmine extends TileEntity implements IInventory { if (shouldUpdateLogic) { - worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord); + worldObj.func_147479_m(xCoord, yCoord, zCoord); shouldUpdateLogic = false; } if (soundcountything > 0) diff --git a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java index bf1cc96c..03e2a70a 100644 --- a/src/main/java/tconstruct/blocks/slime/SlimeSapling.java +++ b/src/main/java/tconstruct/blocks/slime/SlimeSapling.java @@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import tconstruct.common.TContent; import tconstruct.common.TRepo; import tconstruct.library.TConstructRegistry; import tconstruct.worldgen.SlimeTreeGen; @@ -48,9 +49,9 @@ public class SlimeSapling extends BlockSapling } @Override - protected boolean canPlaceBlockOn (Block p_149854_1_) + public boolean canPlaceBlockOn (Block id) { - return p_149854_1_ == Blocks.grass || p_149854_1_ == Blocks.dirt || p_149854_1_ == TRepo.slimeGrass || p_149854_1_ == TRepo.craftedSoil; + return id == Blocks.grass || id == Blocks.dirt || id == TRepo.slimeGrass || id == TRepo.craftedSoil; } @Override @@ -116,7 +117,6 @@ public class SlimeSapling extends BlockSapling world.setBlock(x, y, z, this, md + 8, 3); } - @Override public int damageDropped (int i) { return i % 8; diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java index 5de60f48..b39d43a3 100644 --- a/src/main/java/tconstruct/blocks/traps/Landmine.java +++ b/src/main/java/tconstruct/blocks/traps/Landmine.java @@ -122,7 +122,7 @@ public class Landmine extends MantleBlock * neighbor changed (coordinates passed are their own) Args: x, y, z, * neighbor blockID */ - public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, int par5) + public void onNeighborBlockChange (World par1World, int par2, int par3, int par4, Block par5) { boolean var6 = false; @@ -230,7 +230,7 @@ public class Landmine extends MantleBlock * par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, * this.blockID); par1World.notifyBlocksOfNeighborChange(posX, posY * - 1, posZ, this.blockID); - * par1World.markBlockRangeForRenderUpdate(posX, posY, posZ, posX, + * par1World.func_147479_m(posX, posY, posZ, posX, * posY, posZ); par1World.playSoundEffect((double)posX + 0.5D, * (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", 0.3F, * 0.6F); @@ -241,7 +241,7 @@ public class Landmine extends MantleBlock * if (!var6 && var5) { par1World.setBlockMetadataWithNotify(posX, posY, * posZ, 0); par1World.notifyBlocksOfNeighborChange(posX, posY, posZ, * this.blockID); par1World.notifyBlocksOfNeighborChange(posX, posY - 1, - * posZ, this.blockID); par1World.markBlockRangeForRenderUpdate(posX, + * posZ, this.blockID); par1World.func_147479_m(posX, * posY, posZ, posX, posY, posZ); par1World.playSoundEffect((double)posX * + 0.5D, (double)posY + 0.1D, (double)posZ + 0.5D, "random.click", * 0.3F, 0.5F); } diff --git a/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java b/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java index b5805078..c640c768 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java +++ b/src/main/java/tconstruct/modifiers/tools/ModAutoSmelt.java @@ -17,18 +17,7 @@ public class ModAutoSmelt extends ModBoolean NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); if (tags.getBoolean("Silk Touch")) return false; - return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); // Will - // fail - // if - // the - // modifier - // is - // false - // or - // the - // tag - // doesn't - // exist + return tags.getInteger("Modifiers") > 0 && !tags.getBoolean(key); //Will fail if the modifier is false or the tag doesn't exist } }