dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better legacy tag check

Browse Source
This commit is contained in:
raoulvdberge
2017-02-26 19:38:59 +01:00
parent 80b5da6aad
commit 51daaf498c
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
View File

@@ -50,16 +50,19 @@ public abstract class BlockNode extends BlockBase {
public void breakBlock(World world, BlockPos pos, IBlockState state) { public void breakBlock(World world, BlockPos pos, IBlockState state) {
super.breakBlock(world, pos, state); super.breakBlock(world, pos, state);
INetworkNodeManager manager = API.instance().getNetworkNodeManager(world.provider.getDimension()); // Sanity check
if (world.getBlockState(pos).getBlock() == this) {
INetworkNodeManager manager = API.instance().getNetworkNodeManager(world.provider.getDimension());
INetworkNode node = manager.getNode(pos); INetworkNode node = manager.getNode(pos);
manager.removeNode(pos, true); manager.removeNode(pos, true);
API.instance().markNetworkNodesDirty(world); API.instance().markNetworkNodesDirty(world);
if (node.getNetwork() != null) { if (node.getNetwork() != null) {
node.getNetwork().getNodeGraph().rebuild(); node.getNetwork().getNodeGraph().rebuild();
}
} }
} }

17
src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java
View File

@@ -82,10 +82,19 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
public void read(NBTTagCompound tag) { public void read(NBTTagCompound tag) {
super.read(tag); super.read(tag);
// If we have more than this stored: // Ugly code for checking if this is a legacy tile. Sue me.
// x, y, z, id, Direction boolean hasMeta = tag.hasKey("x") && tag.hasKey("y") && tag.hasKey("z") && tag.hasKey("id");
// Then this is a legacy tag! boolean hasForgeData = tag.hasKey("ForgeData");
if (tag.getSize() > 5) { boolean hasForgeCaps = tag.hasKey("ForgeCaps");
// + 1 because of "Direction".
if (tag.getSize() == 4 + 1 && hasMeta) {
// NO OP
} else if (tag.getSize() == 5 + 1 && hasMeta && (hasForgeData || hasForgeCaps)) {
// NO OP
} else if (tag.getSize() == 6 + 1 && hasMeta && hasForgeData && hasForgeCaps) {
// NO OP
} else {
legacyTagToRead = tag; legacyTagToRead = tag;
} }
} }