Changed Tile Updating methodo to reduce performance usage and lag

This commit is contained in:
Ellpeck 2015-12-01 17:28:50 +01:00
parent fdd63c6d5e
commit f62b1ede79
26 changed files with 76 additions and 44 deletions

View file

@ -92,7 +92,7 @@ public class BlockBookletStand extends BlockContainerBase implements IActAddItem
if(tile.assignedPlayer == null){ if(tile.assignedPlayer == null){
tile.assignedPlayer = player.getCommandSenderName(); tile.assignedPlayer = player.getCommandSenderName();
tile.markDirty(); tile.markDirty();
world.markBlockForUpdate(x, y, z); tile.sendUpdate();
} }
} }
} }

View file

@ -53,8 +53,8 @@ public class ItemLaserWrench extends Item implements IActAddItemOrBlock{
if(savedPos.getTileEntity() instanceof TileEntityLaserRelay && LaserRelayConnectionHandler.getInstance().addConnection(savedPos, otherPos)){ if(savedPos.getTileEntity() instanceof TileEntityLaserRelay && LaserRelayConnectionHandler.getInstance().addConnection(savedPos, otherPos)){
ItemPhantomConnector.clearStorage(stack); ItemPhantomConnector.clearStorage(stack);
savedPos.update(); ((TileEntityLaserRelay)savedPos.getTileEntity()).sendUpdate();
otherPos.update(); ((TileEntityLaserRelay)otherPos.getTileEntity()).sendUpdate();
player.addChatComponentMessage(new ChatComponentText(StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".laser.connected.desc"))); player.addChatComponentMessage(new ChatComponentText(StringUtil.localize("tooltip."+ModUtil.MOD_ID_LOWER+".laser.connected.desc")));
} }

View file

@ -96,7 +96,7 @@ public class PacketBookletStandButton implements IMessage{
if(tile instanceof TileEntityBookletStand){ if(tile instanceof TileEntityBookletStand){
if(Objects.equals(player.getCommandSenderName(), ((TileEntityBookletStand)tile).assignedPlayer)){ if(Objects.equals(player.getCommandSenderName(), ((TileEntityBookletStand)tile).assignedPlayer)){
((TileEntityBookletStand)tile).setEntry(message.entryID, message.chapterID, message.pageID, message.pageInIndex); ((TileEntityBookletStand)tile).setEntry(message.entryID, message.chapterID, message.pageID, message.pageInIndex);
world.markBlockForUpdate(message.tileX, message.tileY, message.tileZ); ((TileEntityBookletStand)tile).sendUpdate();
} }
} }

View file

@ -0,0 +1,38 @@
/*
* This file ("VanillaPacketSyncer.java") is part of the Actually Additions Mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2015 Ellpeck
*/
package ellpeck.actuallyadditions.network;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.tileentity.TileEntity;
import java.util.List;
public class VanillaPacketSyncer{
public static void sendTileToNearbyPlayers(TileEntity tile){
List allPlayers = tile.getWorldObj().playerEntities;
for(Object player : allPlayers){
if(player instanceof EntityPlayerMP){
sendTileToPlayer(tile, (EntityPlayerMP)player, 64);
}
}
}
public static void sendTileToPlayer(TileEntity tile, EntityPlayerMP player, int maxDistance){
if(player.getDistance(tile.xCoord, tile.yCoord, tile.zCoord) <= maxDistance){
sendTileToPlayer(tile, player);
}
}
public static void sendTileToPlayer(TileEntity tile, EntityPlayerMP player){
player.playerNetServerHandler.sendPacket(tile.getDescriptionPacket());
}
}

View file

@ -229,13 +229,13 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple
@Override @Override
public ItemStack decrStackSize(int i, int j){ public ItemStack decrStackSize(int i, int j){
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); this.sendUpdate();
return super.decrStackSize(i, j); return super.decrStackSize(i, j);
} }
@Override @Override
public void setInventorySlotContents(int i, ItemStack stack){ public void setInventorySlotContents(int i, ItemStack stack){
super.setInventorySlotContents(i, stack); super.setInventorySlotContents(i, stack);
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); this.sendUpdate();
} }
} }

View file

@ -12,6 +12,7 @@ package ellpeck.actuallyadditions.tile;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import ellpeck.actuallyadditions.config.values.ConfigIntValues; import ellpeck.actuallyadditions.config.values.ConfigIntValues;
import ellpeck.actuallyadditions.network.VanillaPacketSyncer;
import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.ModUtil;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -112,13 +113,17 @@ public abstract class TileEntityBase extends TileEntity{
} }
protected boolean trySendUpdate(){ protected boolean sendUpdateWithInterval(){
if(this.ticksElapsed % ConfigIntValues.TILE_ENTITY_UPDATE_INTERVAL.getValue() == 0){ if(this.ticksElapsed % ConfigIntValues.TILE_ENTITY_UPDATE_INTERVAL.getValue() == 0){
this.worldObj.markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord); this.sendUpdate();
return true; return true;
} }
else{ else{
return false; return false;
} }
} }
public void sendUpdate(){
VanillaPacketSyncer.sendTileToNearbyPlayers(this);
}
} }

View file

@ -79,7 +79,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IE
} }
} }
if((this.storage.getEnergyStored() != this.lastEnergyStored || this.tank.getFluidAmount() != this.lastTankAmount | this.currentProcessTime != this.lastProcessTime) && this.trySendUpdate()){ if((this.storage.getEnergyStored() != this.lastEnergyStored || this.tank.getFluidAmount() != this.lastTankAmount | this.currentProcessTime != this.lastProcessTime) && this.sendUpdateWithInterval()){
this.lastEnergyStored = this.storage.getEnergyStored(); this.lastEnergyStored = this.storage.getEnergyStored();
this.lastProcessTime = this.currentProcessTime; this.lastProcessTime = this.currentProcessTime;
this.lastTankAmount = this.tank.getFluidAmount(); this.lastTankAmount = this.tank.getFluidAmount();

View file

@ -81,7 +81,7 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements
} }
} }
if((this.storage.getEnergyStored() != this.lastEnergy || this.currentBurnTime != this.lastCurrentBurnTime || this.lastBurnTime != this.maxBurnTime) && this.trySendUpdate()){ if((this.storage.getEnergyStored() != this.lastEnergy || this.currentBurnTime != this.lastCurrentBurnTime || this.lastBurnTime != this.maxBurnTime) && this.sendUpdateWithInterval()){
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
this.lastCurrentBurnTime = this.currentBurnTime; this.lastCurrentBurnTime = this.currentBurnTime;
this.lastBurnTime = this.currentBurnTime; this.lastBurnTime = this.currentBurnTime;

View file

@ -61,7 +61,7 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements
this.brew(); this.brew();
} }
if((this.coffeeCacheAmount != this.lastCoffeeAmount || this.storage.getEnergyStored() != this.lastEnergy || this.tank.getFluidAmount() != this.lastTank || this.brewTime != this.lastBrewTime) && this.trySendUpdate()){ if((this.coffeeCacheAmount != this.lastCoffeeAmount || this.storage.getEnergyStored() != this.lastEnergy || this.tank.getFluidAmount() != this.lastTank || this.brewTime != this.lastBrewTime) && this.sendUpdateWithInterval()){
this.lastCoffeeAmount = coffeeCacheAmount; this.lastCoffeeAmount = coffeeCacheAmount;
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
this.lastTank = this.tank.getFluidAmount(); this.lastTank = this.tank.getFluidAmount();

View file

@ -77,7 +77,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem
} }
} }
if(this.storage.getEnergyStored() != this.lastEnergy && this.trySendUpdate()){ if(this.storage.getEnergyStored() != this.lastEnergy && this.sendUpdateWithInterval()){
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
} }
} }

View file

@ -47,7 +47,7 @@ public class TileEntityEnergizer extends TileEntityInventoryBase implements IEne
} }
} }
if(lastEnergy != this.storage.getEnergyStored() && this.trySendUpdate()){ if(lastEnergy != this.storage.getEnergyStored() && this.sendUpdateWithInterval()){
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
} }
} }

View file

@ -57,7 +57,7 @@ public class TileEntityEnervator extends TileEntityInventoryBase implements IEne
WorldUtil.pushEnergy(worldObj, xCoord, yCoord, zCoord, ForgeDirection.WEST, storage); WorldUtil.pushEnergy(worldObj, xCoord, yCoord, zCoord, ForgeDirection.WEST, storage);
} }
if(lastEnergy != this.storage.getEnergyStored() && this.trySendUpdate()){ if(lastEnergy != this.storage.getEnergyStored() && this.sendUpdateWithInterval()){
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
} }
} }

View file

@ -78,7 +78,7 @@ public class TileEntityFeeder extends TileEntityInventoryBase{
this.markDirty(); this.markDirty();
} }
if((this.lastAnimalAmount != this.currentAnimalAmount || this.lastTimer != this.currentTimer) && this.trySendUpdate()){ if((this.lastAnimalAmount != this.currentAnimalAmount || this.lastTimer != this.currentTimer) && this.sendUpdateWithInterval()){
this.lastAnimalAmount = this.currentAnimalAmount; this.lastAnimalAmount = this.currentAnimalAmount;
this.lastTimer = this.currentTimer; this.lastTimer = this.currentTimer;
} }

View file

@ -68,7 +68,7 @@ public class TileEntityFermentingBarrel extends TileEntityInventoryBase implemen
} }
} }
if((this.canolaTank.getFluidAmount() != this.lastCanola || this.oilTank.getFluidAmount() != this.lastOil || this.currentProcessTime != this.lastProcessTime) && this.trySendUpdate()){ if((this.canolaTank.getFluidAmount() != this.lastCanola || this.oilTank.getFluidAmount() != this.lastOil || this.currentProcessTime != this.lastProcessTime) && this.sendUpdateWithInterval()){
this.lastProcessTime = this.currentProcessTime; this.lastProcessTime = this.currentProcessTime;
this.lastCanola = this.canolaTank.getFluidAmount(); this.lastCanola = this.canolaTank.getFluidAmount();
this.lastOil = this.oilTank.getFluidAmount(); this.lastOil = this.oilTank.getFluidAmount();

View file

@ -146,7 +146,7 @@ public class TileEntityFluidCollector extends TileEntityInventoryBase implements
} }
} }
if(lastTankAmount != this.tank.getFluidAmount() && this.trySendUpdate()){ if(lastTankAmount != this.tank.getFluidAmount() && this.sendUpdateWithInterval()){
lastTankAmount = this.tank.getFluidAmount(); lastTankAmount = this.tank.getFluidAmount();
} }
} }

View file

@ -94,7 +94,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements
} }
} }
if((lastEnergy != this.storage.getEnergyStored() || this.lastFirstSmelt != this.firstSmeltTime || this.lastSecondSmelt != this.secondSmeltTime) && this.trySendUpdate()){ if((lastEnergy != this.storage.getEnergyStored() || this.lastFirstSmelt != this.firstSmeltTime || this.lastSecondSmelt != this.secondSmeltTime) && this.sendUpdateWithInterval()){
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
this.lastFirstSmelt = this.firstSmeltTime; this.lastFirstSmelt = this.firstSmeltTime;
this.lastSecondSmelt = this.secondSmeltTime; this.lastSecondSmelt = this.secondSmeltTime;

View file

@ -126,7 +126,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements IEnerg
} }
} }
if((lastEnergy != this.storage.getEnergyStored() || this.lastFirstCrush != this.firstCrushTime || this.lastSecondCrush != this.secondCrushTime) && this.trySendUpdate()){ if((lastEnergy != this.storage.getEnergyStored() || this.lastFirstCrush != this.firstCrushTime || this.lastSecondCrush != this.secondCrushTime) && this.sendUpdateWithInterval()){
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
this.lastFirstCrush = this.firstCrushTime; this.lastFirstCrush = this.firstCrushTime;
this.lastSecondCrush = this.secondCrushTime; this.lastSecondCrush = this.secondCrushTime;

View file

@ -99,7 +99,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
} }
//Update the Client //Update the Client
if((this.sideToPut != this.lastPutSide || this.sideToPull != this.lastPullSide || this.slotToPullStart != this.lastPullStart || this.slotToPullEnd != this.lastPullEnd || this.slotToPutStart != this.lastPutStart || this.slotToPutEnd != this.lastPutEnd || this.isPullWhitelist != lastPullWhite || this.isPutWhitelist != this.lastPutWhite) && this.trySendUpdate()){ if((this.sideToPut != this.lastPutSide || this.sideToPull != this.lastPullSide || this.slotToPullStart != this.lastPullStart || this.slotToPullEnd != this.lastPullEnd || this.slotToPutStart != this.lastPutStart || this.slotToPutEnd != this.lastPutEnd || this.isPullWhitelist != lastPullWhite || this.isPutWhitelist != this.lastPutWhite) && this.sendUpdateWithInterval()){
this.lastPutSide = this.sideToPut; this.lastPutSide = this.sideToPut;
this.lastPullSide = this.sideToPull; this.lastPullSide = this.sideToPull;
this.lastPullStart = this.slotToPullStart; this.lastPullStart = this.slotToPullStart;

View file

@ -59,7 +59,7 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I
this.nextRepairTick = 0; this.nextRepairTick = 0;
} }
if(this.lastEnergy != this.storage.getEnergyStored() && this.trySendUpdate()){ if(this.lastEnergy != this.storage.getEnergyStored() && this.sendUpdateWithInterval()){
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
} }
} }

View file

@ -81,7 +81,7 @@ public class TileEntityOilGenerator extends TileEntityInventoryBase implements I
} }
} }
if((this.storage.getEnergyStored() != this.lastEnergy || this.tank.getFluidAmount() != this.lastTank || this.lastBurnTime != this.currentBurnTime) && this.trySendUpdate()){ if((this.storage.getEnergyStored() != this.lastEnergy || this.tank.getFluidAmount() != this.lastTank || this.lastBurnTime != this.currentBurnTime) && this.sendUpdateWithInterval()){
this.lastEnergy = this.storage.getEnergyStored(); this.lastEnergy = this.storage.getEnergyStored();
this.lastTank = this.tank.getFluidAmount(); this.lastTank = this.tank.getFluidAmount();
this.lastBurnTime = this.currentBurnTime; this.lastBurnTime = this.currentBurnTime;

View file

@ -16,7 +16,6 @@ import ellpeck.actuallyadditions.blocks.BlockPhantom;
import ellpeck.actuallyadditions.blocks.InitBlocks; import ellpeck.actuallyadditions.blocks.InitBlocks;
import ellpeck.actuallyadditions.util.Util; import ellpeck.actuallyadditions.util.Util;
import ellpeck.actuallyadditions.util.WorldPos; import ellpeck.actuallyadditions.util.WorldPos;
import ellpeck.actuallyadditions.util.WorldUtil;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
@ -55,7 +54,14 @@ public class TileEntityPhantomface extends TileEntityInventoryBase implements IP
this.rangeBefore = this.range; this.rangeBefore = this.range;
this.boundPosBefore = this.boundPosition; this.boundPosBefore = this.boundPosition;
this.boundBlockBefore = this.boundPosition == null ? null : this.boundPosition.getBlock(); this.boundBlockBefore = this.boundPosition == null ? null : this.boundPosition.getBlock();
WorldUtil.updateTileAndTilesAround(this);
this.getWorldObj().markBlockForUpdate(this.xCoord+1, this.yCoord, this.zCoord);
this.getWorldObj().markBlockForUpdate(this.xCoord-1, this.yCoord, this.zCoord);
this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord+1, this.zCoord);
this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord-1, this.zCoord);
this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord+1);
this.getWorldObj().markBlockForUpdate(this.xCoord, this.yCoord, this.zCoord-1);
this.markDirty();
} }
} }
else{ else{

View file

@ -57,7 +57,7 @@ public class TileEntityRangedCollector extends TileEntityInventoryBase implement
} }
} }
if(this.isWhitelist != this.lastWhitelist && this.trySendUpdate()){ if(this.isWhitelist != this.lastWhitelist && this.sendUpdateWithInterval()){
this.lastWhitelist = this.isWhitelist; this.lastWhitelist = this.isWhitelist;
} }
} }

View file

@ -43,7 +43,7 @@ public class TileEntitySmileyCloud extends TileEntityBase implements IStringReac
public void updateEntity(){ public void updateEntity(){
super.updateEntity(); super.updateEntity();
if(!worldObj.isRemote){ if(!worldObj.isRemote){
if(!Objects.equals(this.name, this.nameBefore) && this.trySendUpdate()){ if(!Objects.equals(this.name, this.nameBefore) && this.sendUpdateWithInterval()){
this.nameBefore = this.name; this.nameBefore = this.name;
this.markDirty(); this.markDirty();
} }

View file

@ -47,7 +47,7 @@ public class TileEntityXPSolidifier extends TileEntityInventoryBase implements I
} }
} }
if(this.lastAmount != this.amount && this.trySendUpdate()){ if(this.lastAmount != this.amount && this.sendUpdateWithInterval()){
this.lastAmount = this.amount; this.lastAmount = this.amount;
} }
} }

View file

@ -86,12 +86,6 @@ public class WorldPos{
return this.z; return this.z;
} }
public void update(){
if(this.getWorld() != null){
this.getWorld().markBlockForUpdate(this.x, this.y, this.z);
}
}
public WorldPos copy(){ public WorldPos copy(){
return new WorldPos(this.getWorld(), this.x, this.y, this.z); return new WorldPos(this.getWorld(), this.x, this.y, this.z);
} }

View file

@ -111,17 +111,6 @@ public class WorldUtil{
return true; return true;
} }
public static void updateTileAndTilesAround(TileEntity tile){
tile.getWorldObj().markBlockForUpdate(tile.xCoord+1, tile.yCoord, tile.zCoord);
tile.getWorldObj().markBlockForUpdate(tile.xCoord-1, tile.yCoord, tile.zCoord);
tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord+1, tile.zCoord);
tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord-1, tile.zCoord);
tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord+1);
tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord-1);
tile.getWorldObj().markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord);
tile.markDirty();
}
public static void pushFluid(World world, int x, int y, int z, ForgeDirection side, FluidTank tank){ public static void pushFluid(World world, int x, int y, int z, ForgeDirection side, FluidTank tank){
TileEntity tile = getTileEntityFromSide(side, world, x, y, z); TileEntity tile = getTileEntityFromSide(side, world, x, y, z);
if(tile != null && tank.getFluid() != null && tile instanceof IFluidHandler){ if(tile != null && tank.getFluid() != null && tile instanceof IFluidHandler){