From 4433d3b3df3d0b9a1ce7a2468c3d27975add9ab8 Mon Sep 17 00:00:00 2001
From: Sen <sen@sen.gay>
Date: Tue, 27 May 2025 21:38:31 +0200
Subject: [PATCH] change nbt format: fix visibility

---
 common/src/main/java/common/nbt/NBTBase.java              | 2 +-
 common/src/main/java/common/nbt/NBTTagByte.java           | 2 +-
 common/src/main/java/common/nbt/NBTTagByteArray.java      | 2 +-
 common/src/main/java/common/nbt/NBTTagCompound.java       | 2 +-
 common/src/main/java/common/nbt/NBTTagDouble.java         | 2 +-
 common/src/main/java/common/nbt/NBTTagDoubleList.java     | 8 ++++----
 common/src/main/java/common/nbt/NBTTagEnd.java            | 2 +-
 common/src/main/java/common/nbt/NBTTagFloat.java          | 2 +-
 common/src/main/java/common/nbt/NBTTagFloatList.java      | 8 ++++----
 common/src/main/java/common/nbt/NBTTagInt.java            | 2 +-
 common/src/main/java/common/nbt/NBTTagIntArray.java       | 2 +-
 common/src/main/java/common/nbt/NBTTagIntArrayList.java   | 8 ++++----
 common/src/main/java/common/nbt/NBTTagList.java           | 8 ++++----
 common/src/main/java/common/nbt/NBTTagLong.java           | 2 +-
 common/src/main/java/common/nbt/NBTTagShort.java          | 2 +-
 common/src/main/java/common/nbt/NBTTagString.java         | 2 +-
 common/src/main/java/common/nbt/NBTTagStringList.java     | 8 ++++----
 common/src/main/java/common/nbt/NBTTagTagList.java        | 8 ++++----
 .../java/server/worldgen/structure/MapGenStructure.java   | 2 +-
 19 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/common/src/main/java/common/nbt/NBTBase.java b/common/src/main/java/common/nbt/NBTBase.java
index 4db0708..7802273 100755
--- a/common/src/main/java/common/nbt/NBTBase.java
+++ b/common/src/main/java/common/nbt/NBTBase.java
@@ -47,7 +47,7 @@ public abstract class NBTBase {
 	abstract void write(DataOutput output) throws IOException;
 	abstract void read(DataInput input, int depth, SizeTracker tracker) throws IOException;
 	public abstract String toString();
-	public abstract byte getId();
+	protected abstract byte getId();
 	public abstract NBTBase copy();
 
 	public boolean equals(Object other) {
diff --git a/common/src/main/java/common/nbt/NBTTagByte.java b/common/src/main/java/common/nbt/NBTTagByte.java
index 9cb7267..893b942 100755
--- a/common/src/main/java/common/nbt/NBTTagByte.java
+++ b/common/src/main/java/common/nbt/NBTTagByte.java
@@ -28,7 +28,7 @@ class NBTTagByte extends NBTBase
         this.data = input.readByte();
     }
 
-    public byte getId()
+    protected byte getId()
     {
         return (byte)1;
     }
diff --git a/common/src/main/java/common/nbt/NBTTagByteArray.java b/common/src/main/java/common/nbt/NBTTagByteArray.java
index 06b9853..9d8cca9 100755
--- a/common/src/main/java/common/nbt/NBTTagByteArray.java
+++ b/common/src/main/java/common/nbt/NBTTagByteArray.java
@@ -28,7 +28,7 @@ class NBTTagByteArray extends NBTBase {
 		input.readFully(this.data);
 	}
 
-	public byte getId() {
+	protected byte getId() {
 		return (byte)7;
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagCompound.java b/common/src/main/java/common/nbt/NBTTagCompound.java
index 71e68dc..9135f64 100755
--- a/common/src/main/java/common/nbt/NBTTagCompound.java
+++ b/common/src/main/java/common/nbt/NBTTagCompound.java
@@ -45,7 +45,7 @@ public class NBTTagCompound extends NBTBase {
 		return this.tags.keySet();
 	}
 
-	public byte getId() {
+	protected byte getId() {
 		return (byte)10;
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagDouble.java b/common/src/main/java/common/nbt/NBTTagDouble.java
index 7463b1c..e760b93 100755
--- a/common/src/main/java/common/nbt/NBTTagDouble.java
+++ b/common/src/main/java/common/nbt/NBTTagDouble.java
@@ -28,7 +28,7 @@ class NBTTagDouble extends NBTBase
         this.data = input.readDouble();
     }
 
-    public byte getId()
+    protected byte getId()
     {
         return (byte)6;
     }
diff --git a/common/src/main/java/common/nbt/NBTTagDoubleList.java b/common/src/main/java/common/nbt/NBTTagDoubleList.java
index bc698d1..5b0185a 100644
--- a/common/src/main/java/common/nbt/NBTTagDoubleList.java
+++ b/common/src/main/java/common/nbt/NBTTagDoubleList.java
@@ -1,19 +1,19 @@
 package common.nbt;
 
 public class NBTTagDoubleList extends NBTTagList<NBTTagDouble> {
-	public byte getId() {
+	protected byte getId() {
 		return 14;
 	}
 
-	public byte getType() {
+	protected byte getType() {
 		return 6;
 	}
 
-	public NBTTagList<NBTTagDouble> createInstance() {
+	protected NBTTagList<NBTTagDouble> createInstance() {
 		return new NBTTagDoubleList();
 	}
 
-	public NBTTagDouble getDefault() {
+	protected NBTTagDouble getDefault() {
 		return new NBTTagDouble(0.0);
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagEnd.java b/common/src/main/java/common/nbt/NBTTagEnd.java
index 167c8b2..0b6ed6a 100755
--- a/common/src/main/java/common/nbt/NBTTagEnd.java
+++ b/common/src/main/java/common/nbt/NBTTagEnd.java
@@ -12,7 +12,7 @@ class NBTTagEnd extends NBTBase {
 	void write(DataOutput output) throws IOException {
 	}
 
-	public byte getId() {
+	protected byte getId() {
 		return (byte)0;
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagFloat.java b/common/src/main/java/common/nbt/NBTTagFloat.java
index 80e5904..30df2df 100755
--- a/common/src/main/java/common/nbt/NBTTagFloat.java
+++ b/common/src/main/java/common/nbt/NBTTagFloat.java
@@ -28,7 +28,7 @@ class NBTTagFloat extends NBTBase
         this.data = input.readFloat();
     }
 
-    public byte getId()
+    protected byte getId()
     {
         return (byte)5;
     }
diff --git a/common/src/main/java/common/nbt/NBTTagFloatList.java b/common/src/main/java/common/nbt/NBTTagFloatList.java
index 689ed81..4459ce4 100644
--- a/common/src/main/java/common/nbt/NBTTagFloatList.java
+++ b/common/src/main/java/common/nbt/NBTTagFloatList.java
@@ -1,19 +1,19 @@
 package common.nbt;
 
 public class NBTTagFloatList extends NBTTagList<NBTTagFloat> {
-	public byte getId() {
+	protected byte getId() {
 		return 13;
 	}
 
-	public byte getType() {
+	protected byte getType() {
 		return 5;
 	}
 
-	public NBTTagList<NBTTagFloat> createInstance() {
+	protected NBTTagList<NBTTagFloat> createInstance() {
 		return new NBTTagFloatList();
 	}
 
-	public NBTTagFloat getDefault() {
+	protected NBTTagFloat getDefault() {
 		return new NBTTagFloat(0.0f);
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagInt.java b/common/src/main/java/common/nbt/NBTTagInt.java
index 99d38ee..b15bbe2 100755
--- a/common/src/main/java/common/nbt/NBTTagInt.java
+++ b/common/src/main/java/common/nbt/NBTTagInt.java
@@ -28,7 +28,7 @@ class NBTTagInt extends NBTBase
         this.data = input.readInt();
     }
 
-    public byte getId()
+    protected byte getId()
     {
         return (byte)3;
     }
diff --git a/common/src/main/java/common/nbt/NBTTagIntArray.java b/common/src/main/java/common/nbt/NBTTagIntArray.java
index ffd9259..cd9fb0b 100755
--- a/common/src/main/java/common/nbt/NBTTagIntArray.java
+++ b/common/src/main/java/common/nbt/NBTTagIntArray.java
@@ -32,7 +32,7 @@ class NBTTagIntArray extends NBTBase {
 		}
 	}
 
-	public byte getId() {
+	protected byte getId() {
 		return (byte)11;
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagIntArrayList.java b/common/src/main/java/common/nbt/NBTTagIntArrayList.java
index 22b262c..ad8eff0 100644
--- a/common/src/main/java/common/nbt/NBTTagIntArrayList.java
+++ b/common/src/main/java/common/nbt/NBTTagIntArrayList.java
@@ -1,19 +1,19 @@
 package common.nbt;
 
 public class NBTTagIntArrayList extends NBTTagList<NBTTagIntArray> {
-	public byte getId() {
+	protected byte getId() {
 		return 15;
 	}
 
-	public byte getType() {
+	protected byte getType() {
 		return 11;
 	}
 
-	public NBTTagList<NBTTagIntArray> createInstance() {
+	protected NBTTagList<NBTTagIntArray> createInstance() {
 		return new NBTTagIntArrayList();
 	}
 
-	public NBTTagIntArray getDefault() {
+	protected NBTTagIntArray getDefault() {
 		return new NBTTagIntArray(new int[0]);
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagList.java b/common/src/main/java/common/nbt/NBTTagList.java
index 90963ba..3426a06 100755
--- a/common/src/main/java/common/nbt/NBTTagList.java
+++ b/common/src/main/java/common/nbt/NBTTagList.java
@@ -33,10 +33,10 @@ abstract class NBTTagList<K extends NBTBase> extends NBTBase {
 		}
 	}
 
-	public abstract byte getId();
-	public abstract byte getType();
-	public abstract NBTTagList<K> createInstance();
-	public abstract K getDefault();
+	protected abstract byte getId();
+	protected abstract byte getType();
+	protected abstract NBTTagList<K> createInstance();
+	protected abstract K getDefault();
 
 	public String toString() {
 		StringBuilder sb = new StringBuilder("[");
diff --git a/common/src/main/java/common/nbt/NBTTagLong.java b/common/src/main/java/common/nbt/NBTTagLong.java
index 47061cb..469e7b4 100755
--- a/common/src/main/java/common/nbt/NBTTagLong.java
+++ b/common/src/main/java/common/nbt/NBTTagLong.java
@@ -28,7 +28,7 @@ class NBTTagLong extends NBTBase
         this.data = input.readLong();
     }
 
-    public byte getId()
+    protected byte getId()
     {
         return (byte)4;
     }
diff --git a/common/src/main/java/common/nbt/NBTTagShort.java b/common/src/main/java/common/nbt/NBTTagShort.java
index 0b3a9cc..89370e7 100755
--- a/common/src/main/java/common/nbt/NBTTagShort.java
+++ b/common/src/main/java/common/nbt/NBTTagShort.java
@@ -28,7 +28,7 @@ class NBTTagShort extends NBTBase
         this.data = input.readShort();
     }
 
-    public byte getId()
+    protected byte getId()
     {
         return (byte)2;
     }
diff --git a/common/src/main/java/common/nbt/NBTTagString.java b/common/src/main/java/common/nbt/NBTTagString.java
index 4e91ab2..bda3e44 100755
--- a/common/src/main/java/common/nbt/NBTTagString.java
+++ b/common/src/main/java/common/nbt/NBTTagString.java
@@ -27,7 +27,7 @@ class NBTTagString extends NBTBase {
 		tracker.read(2 * this.data.length());
 	}
 
-	public byte getId() {
+	protected byte getId() {
 		return (byte)8;
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagStringList.java b/common/src/main/java/common/nbt/NBTTagStringList.java
index d83838f..411ecf6 100644
--- a/common/src/main/java/common/nbt/NBTTagStringList.java
+++ b/common/src/main/java/common/nbt/NBTTagStringList.java
@@ -1,19 +1,19 @@
 package common.nbt;
 
 public class NBTTagStringList extends NBTTagList<NBTTagString> {
-	public byte getId() {
+	protected byte getId() {
 		return 9;
 	}
 
-	public byte getType() {
+	protected byte getType() {
 		return 8;
 	}
 
-	public NBTTagList<NBTTagString> createInstance() {
+	protected NBTTagList<NBTTagString> createInstance() {
 		return new NBTTagStringList();
 	}
 
-	public NBTTagString getDefault() {
+	protected NBTTagString getDefault() {
 		return new NBTTagString("");
 	}
 
diff --git a/common/src/main/java/common/nbt/NBTTagTagList.java b/common/src/main/java/common/nbt/NBTTagTagList.java
index 5c9ab1e..908e4ad 100644
--- a/common/src/main/java/common/nbt/NBTTagTagList.java
+++ b/common/src/main/java/common/nbt/NBTTagTagList.java
@@ -1,19 +1,19 @@
 package common.nbt;
 
 public class NBTTagTagList extends NBTTagList<NBTTagCompound> {
-	public byte getId() {
+	protected byte getId() {
 		return 12;
 	}
 
-	public byte getType() {
+	protected byte getType() {
 		return 10;
 	}
 
-	public NBTTagList<NBTTagCompound> createInstance() {
+	protected NBTTagList<NBTTagCompound> createInstance() {
 		return new NBTTagTagList();
 	}
 
-	public NBTTagCompound getDefault() {
+	protected NBTTagCompound getDefault() {
 		return new NBTTagCompound();
 	}
 
diff --git a/server/src/main/java/server/worldgen/structure/MapGenStructure.java b/server/src/main/java/server/worldgen/structure/MapGenStructure.java
index 1443565..570f066 100755
--- a/server/src/main/java/server/worldgen/structure/MapGenStructure.java
+++ b/server/src/main/java/server/worldgen/structure/MapGenStructure.java
@@ -209,7 +209,7 @@ public abstract class MapGenStructure extends MapGenBase
                 {
                     NBTBase nbtbase = tag.get(s);
 
-                    if (nbtbase.getId() == 10)
+                    if (nbtbase instanceof NBTTagCompound)
                     {
                         NBTTagCompound nbttagcompound1 = (NBTTagCompound)nbtbase;