From 3a8fc10cc9ad2c52d22f53c8494c245c0066ab56 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 18 Jun 2016 14:57:13 -0500 Subject: [PATCH] Fix TE resyncs sending a bit too much stuff --- .../common/block/tile/TileAlfPortal.java | 4 ++-- .../botania/common/block/tile/TileAltar.java | 8 ++++---- .../botania/common/block/tile/TileAvatar.java | 8 ++++---- .../botania/common/block/tile/TileBrewery.java | 8 ++++---- .../common/block/tile/TileCacophonium.java | 8 ++++---- .../botania/common/block/tile/TileCamo.java | 4 ++-- .../botania/common/block/tile/TileCell.java | 4 ++-- .../botania/common/block/tile/TileCocoon.java | 4 ++-- .../common/block/tile/TileCraftCrate.java | 8 ++++---- .../common/block/tile/TileEnchanter.java | 4 ++-- .../botania/common/block/tile/TileFakeAir.java | 2 +- .../common/block/tile/TileFloatingFlower.java | 4 ++-- .../block/tile/TileFloatingSpecialFlower.java | 8 ++++---- .../common/block/tile/TileHourglass.java | 8 ++++---- .../common/block/tile/TileIncensePlate.java | 8 ++++---- .../common/block/tile/TileLightRelay.java | 4 ++-- .../common/block/tile/TileManaFlame.java | 4 ++-- .../botania/common/block/tile/TileMod.java | 18 ++++++++---------- .../common/block/tile/TileRuneAltar.java | 8 ++++---- .../common/block/tile/TileSimpleInventory.java | 4 ++-- .../common/block/tile/TileSpawnerClaw.java | 4 ++-- .../common/block/tile/TileSpecialFlower.java | 8 ++++---- .../common/block/tile/TileTerraPlate.java | 4 ++-- .../common/block/tile/TileTinyPotato.java | 4 ++-- .../tile/corporea/TileCorporeaCrystalCube.java | 8 ++++---- .../tile/corporea/TileCorporeaRetainer.java | 8 ++++---- .../common/block/tile/mana/TileBellows.java | 4 ++-- .../common/block/tile/mana/TilePool.java | 6 +++--- .../common/block/tile/mana/TilePump.java | 4 ++-- .../block/tile/mana/TileRFGenerator.java | 4 ++-- .../common/block/tile/mana/TileSpreader.java | 10 +++++----- .../common/block/tile/mana/TileTurntable.java | 4 ++-- 32 files changed, 97 insertions(+), 99 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 38944a87f..25f606725 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -266,13 +266,13 @@ public class TileAlfPortal extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_TICKS_OPEN, ticksOpen); cmp.setInteger(TAG_TICKS_SINCE_LAST_ITEM, ticksSinceLastItem); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { ticksOpen = cmp.getInteger(TAG_TICKS_OPEN); ticksSinceLastItem = cmp.getInteger(TAG_TICKS_SINCE_LAST_ITEM); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index a519c99b0..3c11c78da 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -283,8 +283,8 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setBoolean(TAG_HAS_WATER, hasWater()); cmp.setBoolean(TAG_HAS_LAVA, hasLava()); @@ -292,8 +292,8 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); hasWater = cmp.getBoolean(TAG_HAS_WATER); hasLava = cmp.getBoolean(TAG_HAS_LAVA); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index 67f29ac8e..a7afccf04 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -51,16 +51,16 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setBoolean(TAG_ENABLED, enabled); par1nbtTagCompound.setInteger(TAG_TICKS_ELAPSED, ticksElapsed); par1nbtTagCompound.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); enabled = par1nbtTagCompound.getBoolean(TAG_ENABLED); ticksElapsed = par1nbtTagCompound.getInteger(TAG_TICKS_ELAPSED); mana = par1nbtTagCompound.getInteger(TAG_MANA); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index fe4412b2b..2aa7bb2ef 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -174,15 +174,15 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); mana = par1nbtTagCompound.getInteger(TAG_MANA); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java index 7c47564c9..a4f899098 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java @@ -25,8 +25,8 @@ public class TileCacophonium extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); NBTTagCompound cmp1 = new NBTTagCompound(); if(stack != null) @@ -35,8 +35,8 @@ public class TileCacophonium extends TileMod { } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); NBTTagCompound cmp1 = cmp.getCompoundTag(TAG_STACK); stack = ItemStack.loadItemStackFromNBT(cmp1); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java index c41fc91e0..7ccdfeb93 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -25,7 +25,7 @@ public class TileCamo extends TileMod { public IBlockState camoState; @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { if(camoState != null) { cmp.setString(TAG_CAMO, Block.REGISTRY.getNameForObject(camoState.getBlock()).toString()); cmp.setInteger(TAG_CAMO_META, camoState.getBlock().getMetaFromState(camoState)); @@ -33,7 +33,7 @@ public class TileCamo extends TileMod { } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { Block b = Block.getBlockFromName(cmp.getString(TAG_CAMO)); if (b != null) { camoState = b.getStateFromMeta(cmp.getInteger(TAG_CAMO_META)); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index 60afb0be3..97d4b9c1e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -53,7 +53,7 @@ public class TileCell extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_GENERATION, generation); cmp.setBoolean(TAG_TICKED, ticked); if(ticked) { @@ -67,7 +67,7 @@ public class TileCell extends TileMod { } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { generation = cmp.getInteger(TAG_GENERATION); ticked = cmp.getBoolean(TAG_TICKED); if(ticked) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index 2c421bf16..831045fca 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -105,13 +105,13 @@ public class TileCocoon extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_TIME_PASSED, timePassed); cmp.setInteger(TAG_EMERALDS_GIVEN, emeraldsGiven); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { timePassed = cmp.getInteger(TAG_TIME_PASSED); emeraldsGiven = cmp.getInteger(TAG_EMERALDS_GIVEN); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 02b925c79..4b7959080 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -174,14 +174,14 @@ public class TileCraftCrate extends TileOpenCrate { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_PATTERN, pattern); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); pattern = par1nbtTagCompound.getInteger(TAG_PATTERN); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index f1a2881ae..ee0f9f557 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -313,7 +313,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); cmp.setInteger(TAG_MANA_REQUIRED, manaRequired); cmp.setInteger(TAG_STAGE, stage); @@ -332,7 +332,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); manaRequired = cmp.getInteger(TAG_MANA_REQUIRED); stage = cmp.getInteger(TAG_STAGE); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index 5d4ef3ee5..25700314b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -23,7 +23,7 @@ public class TileFakeAir extends TileMod { private static final String TAG_FLOWER_Y = "flowerY"; private static final String TAG_FLOWER_Z = "flowerZ"; - private BlockPos flowerPos; + private BlockPos flowerPos = BlockPos.ORIGIN; public void setFlower(TileEntity tile) { flowerPos = tile.getPos(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index 7209e4cb9..fa8aa6382 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -46,12 +46,12 @@ public class TileFloatingFlower extends TileMod implements IFloatingFlower { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setString(TAG_ISLAND_TYPE, type.toString()); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java index 9313c95da..b8cb635bf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingSpecialFlower.java @@ -41,14 +41,14 @@ public class TileFloatingSpecialFlower extends TileSpecialFlower implements IFlo } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setString(TAG_ISLAND_TYPE, type.toString()); } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); type = IslandType.ofType(cmp.getString(TAG_ISLAND_TYPE)); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 91f921440..092716fc9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -109,8 +109,8 @@ public class TileHourglass extends TileSimpleInventory { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_TIME, time); par1nbtTagCompound.setFloat(TAG_TIME_FRACTION, timeFraction); par1nbtTagCompound.setBoolean(TAG_FLIP, flip); @@ -120,8 +120,8 @@ public class TileHourglass extends TileSimpleInventory { } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); time = par1nbtTagCompound.getInteger(TAG_TIME); timeFraction = par1nbtTagCompound.getFloat(TAG_TIME_FRACTION); flip = par1nbtTagCompound.getBoolean(TAG_FLIP); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index e24df9698..b79ea0c60 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -105,15 +105,15 @@ public class TileIncensePlate extends TileSimpleInventory { } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_TIME_LEFT, timeLeft); par1nbtTagCompound.setBoolean(TAG_BURNING, burning); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); timeLeft = par1nbtTagCompound.getInteger(TAG_TIME_LEFT); burning = par1nbtTagCompound.getBoolean(TAG_BURNING); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 0ec1e489a..dec033274 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -163,7 +163,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { bindPos = new BlockPos( cmp.getInteger(TAG_BIND_X), cmp.getInteger(TAG_BIND_Y), @@ -172,7 +172,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_BIND_X, bindPos.getX()); cmp.setInteger(TAG_BIND_Y, bindPos.getY()); cmp.setInteger(TAG_BIND_Z, bindPos.getZ()); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 5fb526148..ae53ff8f3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -69,12 +69,12 @@ public class TileManaFlame extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_COLOR, color); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { color = cmp.getInteger(TAG_COLOR); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index 634ee588b..14952b522 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -32,7 +32,7 @@ public class TileMod extends TileEntity implements ITickable { @Override public NBTTagCompound writeToNBT(NBTTagCompound par1nbtTagCompound) { NBTTagCompound ret = super.writeToNBT(par1nbtTagCompound); - writeCustomNBT(ret); + writePacketNBT(ret); return ret; } @@ -45,26 +45,24 @@ public class TileMod extends TileEntity implements ITickable { @Override public void readFromNBT(NBTTagCompound par1nbtTagCompound) { super.readFromNBT(par1nbtTagCompound); - readCustomNBT(par1nbtTagCompound); + readPacketNBT(par1nbtTagCompound); } - public void writeCustomNBT(NBTTagCompound cmp) { - // NO-OP - } + public void writePacketNBT(NBTTagCompound cmp) {} - public void readCustomNBT(NBTTagCompound cmp) { - // NO-OP - } + public void readPacketNBT(NBTTagCompound cmp) {} @Override public final SPacketUpdateTileEntity getUpdatePacket() { - return new SPacketUpdateTileEntity(pos, -999, getUpdateTag()); + NBTTagCompound tag = new NBTTagCompound(); + writePacketNBT(tag); + return new SPacketUpdateTileEntity(pos, -999, tag); } @Override public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) { super.onDataPacket(net, packet); - readCustomNBT(packet.getNbtCompound()); + readPacketNBT(packet.getNbtCompound()); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 33f01f7a7..6683fc508 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -272,16 +272,16 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); par1nbtTagCompound.setInteger(TAG_MANA, mana); par1nbtTagCompound.setInteger(TAG_MANA_TO_GET, manaToGet); } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); mana = par1nbtTagCompound.getInteger(TAG_MANA); manaToGet = par1nbtTagCompound.getInteger(TAG_MANA_TO_GET); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index a9dff6caa..715ad134d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -25,13 +25,13 @@ public abstract class TileSimpleInventory extends TileMod { protected SimpleItemStackHandler itemHandler = createItemHandler(); @Override - public void readCustomNBT(NBTTagCompound par1NBTTagCompound) { + public void readPacketNBT(NBTTagCompound par1NBTTagCompound) { itemHandler = createItemHandler(); itemHandler.deserializeNBT(par1NBTTagCompound); } @Override - public void writeCustomNBT(NBTTagCompound par1NBTTagCompound) { + public void writePacketNBT(NBTTagCompound par1NBTTagCompound) { par1NBTTagCompound.merge(itemHandler.serializeNBT()); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 2ad1b4a26..6251b5b25 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -155,12 +155,12 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index 48ed8dd84..544315950 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -106,8 +106,8 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setString(TAG_SUBTILE_NAME, subTileName); NBTTagCompound subCmp = new NBTTagCompound(); @@ -118,8 +118,8 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); subTileName = cmp.getString(TAG_SUBTILE_NAME); NBTTagCompound subCmp = cmp.getCompoundTag(TAG_SUBTILE_CMP); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 8fa745355..4d1eae1f8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -187,12 +187,12 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 78110a5bc..8807fff4d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -48,12 +48,12 @@ public class TileTinyPotato extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setString(TAG_NAME, name); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { name = cmp.getString(TAG_NAME); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index f8e829c28..715ebb432 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -115,8 +115,8 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.writeCustomNBT(par1nbtTagCompound); + public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { + super.writePacketNBT(par1nbtTagCompound); NBTTagCompound cmp = new NBTTagCompound(); if(requestTarget != null) requestTarget.writeToNBT(cmp); @@ -125,8 +125,8 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public void readCustomNBT(NBTTagCompound par1nbtTagCompound) { - super.readCustomNBT(par1nbtTagCompound); + public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { + super.readPacketNBT(par1nbtTagCompound); NBTTagCompound cmp = par1nbtTagCompound.getCompoundTag(TAG_REQUEST_TARGET); requestTarget = ItemStack.loadItemStackFromNBT(cmp); itemCount = par1nbtTagCompound.getInteger(TAG_ITEM_COUNT); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 21ef1715b..b80e561e7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -71,8 +71,8 @@ public class TileCorporeaRetainer extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); cmp.setBoolean(TAG_PENDING_REQUEST, pendingRequest); cmp.setInteger(TAG_REQUEST_X, requestPos.getX()); @@ -99,8 +99,8 @@ public class TileCorporeaRetainer extends TileMod { } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); pendingRequest = cmp.getBoolean(TAG_PENDING_REQUEST); int x = cmp.getInteger(TAG_REQUEST_X); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 6758332ba..1b2658fc8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -122,12 +122,12 @@ public class TileBellows extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_ACTIVE, active); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { active = cmp.getBoolean(TAG_ACTIVE); } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 564f2cc01..67566cd31 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -303,7 +303,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); cmp.setBoolean(TAG_OUTPUTTING, outputting); cmp.setInteger(TAG_COLOR, color.getMetadata()); @@ -318,7 +318,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); outputting = cmp.getBoolean(TAG_OUTPUTTING); color = EnumDyeColor.byMetadata(cmp.getInteger(TAG_COLOR)); @@ -351,7 +351,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(!worldObj.isRemote) { NBTTagCompound nbttagcompound = new NBTTagCompound(); - writeCustomNBT(nbttagcompound); + writePacketNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, getCurrentMana()); if(player instanceof EntityPlayerMP) ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 8e9221d23..57ffa9bb3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -121,12 +121,12 @@ public class TilePump extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setBoolean(TAG_ACTIVE, active); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { boolean prevActive = active; active = cmp.getBoolean(TAG_ACTIVE); if(worldObj != null && worldObj.isRemote) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 0392a884a..18ef60515 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -121,12 +121,12 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_MANA, mana); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { mana = cmp.getInteger(TAG_MANA); } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index ed5fa28f5..f550b0f31 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -270,8 +270,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void writeCustomNBT(NBTTagCompound cmp) { - super.writeCustomNBT(cmp); + public void writePacketNBT(NBTTagCompound cmp) { + super.writePacketNBT(cmp); UUID identity = getIdentifier(); cmp.setBoolean(TAG_HAS_IDENTITY, true); @@ -309,8 +309,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @Override - public void readCustomNBT(NBTTagCompound cmp) { - super.readCustomNBT(cmp); + public void readPacketNBT(NBTTagCompound cmp) { + super.readPacketNBT(cmp); if(cmp.getBoolean(TAG_HAS_IDENTITY)) { long most = cmp.getLong(TAG_UUID_MOST); @@ -383,7 +383,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(!player.isSneaking()) { if(!worldObj.isRemote) { NBTTagCompound nbttagcompound = new NBTTagCompound(); - writeCustomNBT(nbttagcompound); + writePacketNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, mana); if(player instanceof EntityPlayerMP) ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 6a5927e79..3634200a3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -55,13 +55,13 @@ public class TileTurntable extends TileMod { } @Override - public void writeCustomNBT(NBTTagCompound cmp) { + public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_SPEED, speed); cmp.setBoolean(TAG_BACKWARDS, backwards); } @Override - public void readCustomNBT(NBTTagCompound cmp) { + public void readPacketNBT(NBTTagCompound cmp) { speed = cmp.getInteger(TAG_SPEED); backwards = cmp.getBoolean(TAG_BACKWARDS); }