Adding TagWrapper interface to indicate classes which expose their Co…

…mpoundTag data object.

ChunkBase fixed bug in ctor - should call initReferences0

src/main/java/net/querz/mca/ChunkBase.java

@@ -14,7 +14,7 @@
 /**
  * Abstraction for the base of all chunk types which represent chunks composed of sub-chunks {@link SectionBase}.
  */
-public abstract class ChunkBase implements VersionedDataContainer {
+public abstract class ChunkBase implements VersionedDataContainer, TagWrapper {
 	protected int dataVersion;
 	protected boolean partial;
 	protected boolean raw;
@@ -31,7 +31,7 @@ public abstract class ChunkBase implements VersionedDataContainer {
 	 */
 	public ChunkBase(CompoundTag data) {
 		this.data = data;
-		initReferences(ALL_DATA);
+		initReferences0(ALL_DATA);
 	}
 
 	private void initReferences0(long loadFlags) {
@@ -77,7 +77,6 @@ public void setDataVersion(int dataVersion) {
 		this.dataVersion = Math.max(0, dataVersion);
 	}
 
-
 	/**
 	 * Serializes this chunk to a <code>RandomAccessFile</code>.
 	 * @param raf The RandomAccessFile to be written to.
@@ -163,10 +162,16 @@ public CompoundTag getHandle() {
 		return data;
 	}
 
-	public CompoundTag updateHandle(int xPos, int zPos) {
+	public CompoundTag updateHandle() {
 		if (!raw) {
 			data.putInt("DataVersion", dataVersion);
 		}
 		return data;
 	}
+
+	// Note: Not all chunk formats store xz in their NBT, but {@link MCAFileBase} will call this update method
+	// to give them the chance to record them.
+	public CompoundTag updateHandle(int xPos, int zPos) {
+		return updateHandle();
+	}
 }

src/main/java/net/querz/mca/TagWrapper.java

@@ -0,0 +1,18 @@
+package net.querz.mca;
+
+import net.querz.nbt.tag.CompoundTag;
+
+public interface TagWrapper {
+    /**
+     * Updates the data tag held by this wrapper and returns it.
+     * @return A reference to the raw CompoundTag this object is based on.
+     */
+    CompoundTag updateHandle();
+
+    /**
+     * Provides a reference to the wrapped data tag.
+     * May be null for objects which support partial loading such as chunks.
+     * @return A reference to the raw CompoundTag this object is based on.
+     */
+    CompoundTag getHandle();
+}