Replace all relevant markBlockForUpdate calls with the VanillaPacketDispatcher equivalent.

This commit is contained in:
Lizbeth Rika committed 2015-04-10 13:54:40 +01:00
1 parent fb8f87634b
commit fd2768d53d
20 files changed
+50 -25

No files matched your search

@@ -29,4 +29,10 @@ public final class VanillaPacketDispatcher {
((EntityPlayerMP) player).playerNetServerHandler.sendPacket(tile.getDescriptionPacket());
}
public static void dispatchTEToNearbyPlayers(World world, int x, int y, int z) {
TileEntity tile = world.getTileEntity(x, y, z);
if(tile != null)
dispatchTEToNearbyPlayers(tile);
}
}
@@ -28,6 +28,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import thaumcraft.api.crafting.IInfusionStabiliser;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.client.lib.LibRenderIDs;
@@ -138,7 +139,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab
if(type != null && type != flower.getIslandType()) {
if(!world.isRemote) {
flower.setIslandType(type);
world.markBlockForUpdate(x, y, z);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z);
}
if(!player.capabilities.isCreativeMode)
@@ -28,6 +28,7 @@ import net.minecraft.stats.Achievement;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.wand.IWandHUD;
@@ -111,7 +112,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
if(par5Entity instanceof EntityItem) {
TilePool tile = (TilePool) par1World.getTileEntity(par2, par3, par4);
if(tile.collideEntityItem((EntityItem) par5Entity))
par1World.markBlockForUpdate(par2, par3, par4);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par1World, par2, par3, par4);
}
}
@@ -23,6 +23,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.item.IPetalApothecary;
import vazkii.botania.api.recipe.IFlowerComponent;
import vazkii.botania.api.recipe.RecipePetals;
@@ -54,7 +55,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I
stack.stackSize--;
if(stack.stackSize == 0)
item.setDead();
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
}
@@ -144,7 +145,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I
didChange = collideEntityItem(item) || didChange;
if(didChange)
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
for(int i = 0; i < getSizeInventory(); i++) {
ItemStack stackAt = getStackInSlot(i);
@@ -226,12 +227,12 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I
@Override
public void setWater(boolean water) {
hasWater = water;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
public void setLava(boolean lava) {
hasLava = lava;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
@Override
@@ -24,6 +24,7 @@ import net.minecraft.util.AxisAlignedBB;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.brew.IBrewContainer;
import vazkii.botania.api.brew.IBrewItem;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.api.recipe.RecipeBrew;
import vazkii.botania.client.core.helper.RenderHelper;
@@ -63,7 +64,7 @@ public class TileBrewery extends TileSimpleInventory implements ISidedInventory,
}
if(did) {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
for(RecipeBrew recipe : BotaniaAPI.brewRecipes)
if(recipe.matches(this) && recipe.getOutput(getStackInSlot(0)) != null) {
this.recipe = recipe;
@@ -29,6 +29,7 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.mana.spark.ISparkAttachable;
import vazkii.botania.api.mana.spark.ISparkEntity;
@@ -273,7 +274,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
}
public void sync() {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
@Override
@@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import vazkii.botania.client.core.helper.RenderHelper;
@@ -64,7 +65,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor
}
if(did)
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
return true;
}
@@ -127,7 +128,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor
if(manaToGet != this.manaToGet) {
worldObj.playSoundEffect(xCoord, yCoord, zCoord, "botania:runeAltarStart", 1F, 1F);
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
}
@@ -19,6 +19,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.mana.spark.ISparkAttachable;
import vazkii.botania.api.mana.spark.ISparkEntity;
@@ -73,7 +74,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable {
else item.setEntityItemStack(new ItemStack(ModItems.manaResource, 1, 4));
item.worldObj.playSoundAtEntity(item, "botania:terrasteelCraft", 1F, 1F);
mana = 0;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
}
}
@@ -15,6 +15,7 @@ import java.util.List;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.mana.IManaReceiver;
import vazkii.botania.common.block.tile.TileMod;
@@ -55,7 +56,7 @@ public class TileDistributor extends TileMod implements IManaReceiver {
for(IManaReceiver pool : validPools) {
pool.recieveMana(manaForEach);
TileEntity tile = (TileEntity) pool;
worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, tile.xCoord, tile.yCoord, tile.zCoord);
}
}
}
@@ -30,6 +30,7 @@ import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.item.IDyablePool;
import vazkii.botania.api.item.IManaDissolvable;
import vazkii.botania.api.mana.IKeyLocked;
@@ -281,7 +282,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
if(player.isSneaking()) {
outputting = !outputting;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
if(!worldObj.isRemote) {
@@ -12,6 +12,7 @@ package vazkii.botania.common.block.tile.mana;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.block.tile.TileMod;
public class TilePump extends TileMod {
@@ -90,7 +91,7 @@ public class TilePump extends TileMod {
public void setActive(boolean active) {
if(!worldObj.isRemote) {
this.active = active;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
}
@@ -35,6 +35,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.BurstProperties;
import vazkii.botania.api.mana.IKeyLocked;
import vazkii.botania.api.mana.ILens;
@@ -187,7 +188,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
if(receiverLastTick != receiver && !worldObj.isRemote) {
requestsClientUpdate = true;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
redstoneLastTick = redstone;
@@ -308,7 +309,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
checkForReceiver();
requestsClientUpdate = true;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
}
}
@@ -515,7 +516,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
@Override
public void markDirty() {
checkForReceiver();
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
@Override
@@ -21,6 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.common.block.tile.TileMod;
public class TileTurntable extends TileMod {
@@ -72,7 +73,7 @@ public class TileTurntable extends TileMod {
if(player.isSneaking())
backwards = !backwards;
else speed = speed == 6 ? 1 : speed + 1;
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xCoord, yCoord, zCoord);
}
public void renderHUD(Minecraft mc, ScaledResolution res) {
@@ -34,6 +34,7 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.IManaBurst;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IClientManaHandler;
import vazkii.botania.api.mana.ILensEffect;
import vazkii.botania.api.mana.IManaCollector;
@@ -568,7 +569,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst {
mana *= ((IManaCollector) tile).getManaYieldMultiplier(this);
((IManaReceiver) tile).recieveMana(mana);
worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, tile.xCoord, tile.yCoord, tile.zCoord);
}
if(block instanceof IManaTrigger)
@@ -18,6 +18,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.tile.mana.TilePool;
@@ -111,7 +112,7 @@ public class EntityPoolMinecart extends EntityMinecart {
}
if(did) {
worldObj.markBlockForUpdate(xp_, y, zp_);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, xp_, y, zp_);
pump.hasCart = true;
if(!pump.active)
pump.setActive(true);
@@ -19,6 +19,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.item.IManaDissolvable;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.common.Botania;
@@ -61,7 +62,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable {
if(!item.worldObj.isRemote) {
pool.recieveMana(t2 ? MANA_PER_T2 : MANA_PER);
stack.stackSize--;
item.worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.xCoord, tile.yCoord, tile.zCoord);
}
for(int i = 0; i < 50; i++) {
@@ -18,6 +18,7 @@ import net.minecraft.stats.Achievement;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.spark.ISparkAttachable;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.achievement.ICraftAchievement;
@@ -45,7 +46,7 @@ public class ItemSpark extends ItemMod implements ICraftAchievement {
spark.setPosition(x + 0.5, y + 1.5, z + 0.5);
world.spawnEntityInWorld(spark);
attach.attachSpark(spark);
world.markBlockForUpdate(x, y, z);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z);
}
return true;
}
@@ -23,6 +23,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.Botania;
import vazkii.botania.common.achievement.ModAchievements;
@@ -195,7 +196,7 @@ public class ItemSpawnerMover extends ItemMod {
tag.setInteger("y", y);
tag.setInteger("z", z);
te.readFromNBT(tag);
world.markBlockForUpdate(x, y, z);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, x, y, z);
}
return true;
@@ -31,6 +31,7 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.wand.ICoordBoundItem;
import vazkii.botania.api.wand.ITileBound;
import vazkii.botania.api.wand.IWandBindable;
@@ -94,7 +95,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
}
}
par3World.markBlockForUpdate(boundTile.posX, boundTile.posY, boundTile.posZ);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile.posX, boundTile.posY, boundTile.posZ);
setBoundTile(par1ItemStack, 0, -1, 0);
}
@@ -19,6 +19,7 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.item.IDyablePool;
import vazkii.botania.api.item.IManaDissolvable;
import vazkii.botania.api.mana.IManaPool;
@@ -52,7 +53,7 @@ public class ItemDye extends Item16Colors implements IManaDissolvable {
if(meta != dyable.getColor()) {
dyable.setColor(meta);
stack.stackSize--;
item.worldObj.markBlockForUpdate(tile.xCoord, tile.yCoord, tile.zCoord);
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.xCoord, tile.yCoord, tile.zCoord);
}
}
}