Skip to content

Commit

Permalink
Change back the RenderUpdate
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander committed Apr 6, 2014
1 parent cf6b286 commit a1b8d62
Show file tree
Hide file tree
Showing 21 changed files with 63 additions and 73 deletions.
4 changes: 3 additions & 1 deletion capes.txt
View file
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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----------------------------------------
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/LavaTankBlock.java
View file
Expand Up @@ -293,7 +293,7 @@ public int damageDropped (int meta)
}

/* 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)
Expand Down
43 changes: 21 additions & 22 deletions src/main/java/tconstruct/blocks/SearedBlock.java
View file
Expand Up @@ -2,6 +2,16 @@

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;
Expand All @@ -15,16 +25,6 @@
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
{
Expand Down Expand Up @@ -183,12 +183,12 @@ else if (logic.isStackInSlot(0))
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 */
Expand Down Expand Up @@ -260,11 +260,11 @@ public boolean shouldSideBeRendered (IBlockAccess par1IBlockAccess, int par2, in
}

@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));
}
}

Expand Down Expand Up @@ -362,7 +362,7 @@ public boolean canConnectRedstone (IBlockAccess world, int x, int y, int z, int
}

@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)
{
Expand All @@ -372,7 +372,7 @@ public void onNeighborBlockChange (World world, int x, int y, int z, Block neigh
}

@Override
public TileEntity createNewTileEntity (World var1, int metadata)
public TileEntity createNewTileEntity (World world, int metadata)
{
switch (metadata)
{
Expand All @@ -385,6 +385,5 @@ public TileEntity createNewTileEntity (World var1, int metadata)
default:
return null;
}

}
}
}
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/AdaptiveDrainLogic.java
View file
Expand Up @@ -177,6 +177,6 @@ public Packet getDescriptionPacket ()
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);
}
}
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/AdaptiveSmelteryLogic.java
View file
Expand Up @@ -579,7 +579,7 @@ public void writeNetworkNBT (NBTTagCompound tags)
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
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/tconstruct/blocks/logic/CastingBasinLogic.java
View file
Expand Up @@ -142,7 +142,7 @@ public int fill (FluidStack resource, boolean doFill)
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;
}
Expand All @@ -166,7 +166,7 @@ else if (resource.isFluidEqual(this.liquid))
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;
Expand All @@ -177,7 +177,7 @@ else if (resource.isFluidEqual(this.liquid))
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;
Expand All @@ -194,15 +194,15 @@ else if (resource.isFluidEqual(this.liquid))
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;
}

@Override
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;
}

Expand Down Expand Up @@ -315,7 +315,7 @@ public void updateEntity ()
if (renderOffset > 0)
{
renderOffset -= 6;
worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
worldObj.func_147479_m(xCoord, yCoord, zCoord);
}

tick++;
Expand Down Expand Up @@ -401,8 +401,8 @@ public Packet getDescriptionPacket ()
@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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/CastingChannelLogic.java
View file
Expand Up @@ -516,7 +516,7 @@ public Packet getDescriptionPacket ()
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)
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/tconstruct/blocks/logic/CastingTableLogic.java
View file
Expand Up @@ -142,7 +142,7 @@ public int fill (FluidStack resource, boolean doFill)
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;
}
Expand All @@ -166,7 +166,7 @@ else if (resource.isFluidEqual(this.liquid))
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;
Expand All @@ -177,7 +177,7 @@ else if (resource.isFluidEqual(this.liquid))
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;
Expand All @@ -194,15 +194,15 @@ else if (resource.isFluidEqual(this.liquid))
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;
}

@Override
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;
}

Expand Down Expand Up @@ -316,7 +316,7 @@ public void updateEntity ()
if (renderOffset > 0)
{
renderOffset -= 6;
worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
worldObj.func_147479_m(xCoord, yCoord, zCoord);
}

tick++;
Expand Down Expand Up @@ -400,7 +400,7 @@ public Packet getDescriptionPacket ()
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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/DryingRackLogic.java
View file
Expand Up @@ -115,7 +115,7 @@ public Packet getDescriptionPacket ()
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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/logic/FaucetLogic.java
View file
Expand Up @@ -180,7 +180,7 @@ public Packet getDescriptionPacket ()
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
Expand Down Expand Up @@ -244,4 +244,4 @@ public FluidTankInfo[] getTankInfo (ForgeDirection from)
// TODO Auto-generated method stub
return null;
}
}
}
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/FurnaceLogic.java
View file
Expand Up @@ -299,7 +299,7 @@ public Packet getDescriptionPacket ()
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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/logic/LavaTankLogic.java
View file
Expand Up @@ -158,7 +158,7 @@ public Packet getDescriptionPacket ()
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 */
Expand All @@ -174,7 +174,7 @@ public void updateEntity ()
if (renderOffset > 0)
{
renderOffset -= 6;
worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
worldObj.func_147479_m(xCoord, yCoord, zCoord);
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/logic/LiquidTextureLogic.java
View file
Expand Up @@ -19,7 +19,7 @@ public boolean canUpdate ()
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 ()
Expand Down Expand Up @@ -62,7 +62,7 @@ public Packet getDescriptionPacket ()
@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);
}
}
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/RedwireLogic.java
View file
Expand Up @@ -62,6 +62,6 @@ public Packet getDescriptionPacket ()
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);
}
}
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/SmelteryDrainLogic.java
View file
Expand Up @@ -183,6 +183,6 @@ public Packet getDescriptionPacket ()
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);
}
}
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/blocks/logic/SmelteryLogic.java
View file
Expand Up @@ -1038,7 +1038,7 @@ public int fill (FluidStack resource, boolean doFill)
}
}
needsUpdate = true;
worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
worldObj.func_147479_m(xCoord, yCoord, zCoord);
}
return amount;
}
Expand Down Expand Up @@ -1167,7 +1167,7 @@ public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
{
readFromNBT(packet.func_148857_g());
markDirty();
worldObj.markBlockRangeForRenderUpdate(xCoord, yCoord, zCoord, xCoord, yCoord, zCoord);
worldObj.func_147479_m(xCoord, yCoord, zCoord);
this.needsUpdate = true;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/blocks/logic/TankAirLogic.java
View file
Expand Up @@ -181,7 +181,7 @@ public void writeNetworkNBT (NBTTagCompound tags)
@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());
}
Expand Down

0 comments on commit a1b8d62

Please sign in to comment.