From 41900317105abeaa1e047bbbb2ff5f6fdcbb678a Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Wed, 7 Sep 2016 17:53:09 -0700 Subject: [PATCH] Fix remaining cases of calling readFrom/writeTo NBT --- src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java | 1 - .../java/WayofTime/bloodmagic/tile/TileDemonCrystal.java | 2 -- .../WayofTime/bloodmagic/tile/TileDemonCrystallizer.java | 4 ---- .../java/WayofTime/bloodmagic/tile/TileDemonPylon.java | 2 -- .../WayofTime/bloodmagic/tile/TileDimensionalPortal.java | 2 -- .../java/WayofTime/bloodmagic/tile/TileSpectralBlock.java | 7 ------- 6 files changed, 18 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java index f052ce53..e158a8da 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileBloodTank.java @@ -55,7 +55,6 @@ public class TileBloodTank extends TileBase implements IFluidHandler @Override public void deserialize(NBTTagCompound tagCompound) { - super.readFromNBT(tagCompound); tank.readFromNBT(tagCompound.getCompoundTag("tank")); capacity = tagCompound.getInteger("capacity"); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index b432613f..44fbc634 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -173,8 +173,6 @@ public class TileDemonCrystal extends TileTicking @Override public void deserialize(NBTTagCompound tag) { - super.readFromNBT(tag); - holder.readFromNBT(tag, "Will"); crystalCount = tag.getInteger("crystalCount"); placement = EnumFacing.getFront(tag.getInteger("placement")); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java index 5b52861f..ebf2ad05 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystallizer.java @@ -90,8 +90,6 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond @Override public void deserialize(NBTTagCompound tag) { - super.readFromNBT(tag); - holder.readFromNBT(tag, "Will"); internalCounter = tag.getDouble("internalCounter"); } @@ -99,8 +97,6 @@ public class TileDemonCrystallizer extends TileTicking implements IDemonWillCond @Override public NBTTagCompound serialize(NBTTagCompound tag) { - super.writeToNBT(tag); - holder.writeToNBT(tag, "Will"); tag.setDouble("internalCounter", internalCounter); return tag; diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java index 9e5cfc9a..ca95170d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonPylon.java @@ -49,8 +49,6 @@ public class TileDemonPylon extends TileTicking implements IDemonWillConduit @Override public void deserialize(NBTTagCompound tag) { - super.readFromNBT(tag); - holder.readFromNBT(tag, "Will"); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java index 54016c6e..f65977a2 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java @@ -20,8 +20,6 @@ public class TileDimensionalPortal extends TileBase public void deserialize(NBTTagCompound tagCompound) { - super.readFromNBT(tagCompound); - portalID = tagCompound.getString(RitualPortal.PORTAL_ID_TAG); masterStoneX = tagCompound.getInteger("masterStoneX"); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java index 955a2c3b..1822a0f3 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileSpectralBlock.java @@ -2,22 +2,15 @@ package WayofTime.bloodmagic.tile; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.registry.ModBlocks; -import WayofTime.bloodmagic.tile.base.TileBase; import WayofTime.bloodmagic.tile.base.TileTicking; import com.google.common.base.Strings; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.play.server.SPacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ITickable; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.ForgeRegistries; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileSpectralBlock extends TileTicking {