From 67738d811e6b3334c8ae44c9d25489b12bbdb8cd Mon Sep 17 00:00:00 2001 From: NuclearW Date: Fri, 6 Jul 2012 17:16:23 -0400 Subject: [PATCH] Move things around to fit together better --- .../blockmeta/PrimitiveChunkletStore.java | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java b/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java index 35e4f1da9..504c578c5 100644 --- a/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java +++ b/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java @@ -63,6 +63,27 @@ public class PrimitiveChunkletStore implements ChunkletStore { out.flush(); } + // For this we assume that store has been initialized to be all false by now + @Override + public void readExternal(ObjectInput in) throws IOException { + byte[] temp = new byte[9]; + + // Could probably reorganize this loop to print nasty things if it does not equal 9 or -1 + while(in.read(temp, 0, 9) == 9) { + int x = addressByteX(temp[0]); + int z = addressByteZ(temp[0]); + boolean[] yColumn = new boolean[64]; + + for(int i = 0; i < 8; i++) { + for(int j = 0; j < 8; j++) { + yColumn[j + (i * 8)] = (temp[++i] & 1 << j) != 0; + } + } + + store[x][z] = yColumn; + } + } + private byte[] constructColumn(int x, int z) { byte[] column = new byte[9]; int index = 1; @@ -91,27 +112,6 @@ public class PrimitiveChunkletStore implements ChunkletStore { return (byte) ((x << 4) + z); } - // For this we assume that store has been initialized to be all false by now - @Override - public void readExternal(ObjectInput in) throws IOException { - byte[] temp = new byte[9]; - - // Could probably reorganize this loop to print nasty things if it does not equal 9 or -1 - while(in.read(temp, 0, 9) == 9) { - int x = addressByteX(temp[0]); - int z = addressByteZ(temp[0]); - boolean[] yColumn = new boolean[64]; - - for(int i = 0; i < 8; i++) { - for(int j = 0; j < 8; j++) { - yColumn[j + (i * 8)] = (temp[++i] & 1 << j) != 0; - } - } - - store[x][z] = yColumn; - } - } - private static int addressByteX(byte address) { return (address & 0xF0) >>> 4; }