Refactor byte order handling in IOUtils and Tag classes

Author: Glavo

src/main/java/org/glavo/nbt/internal/IOUtils.java

@@ -18,11 +18,9 @@
 import org.glavo.nbt.tag.Tag;
 
 import java.lang.invoke.MethodHandles;
-import java.nio.ByteOrder;
 
 public final class IOUtils {
     public static final Tag.Unsafe TAG_UNSAFE = Tag.Unsafe.getUnsafe(MethodHandles.lookup());
-    public static final ByteOrder DEFAULT_BYTE_ORDER = ByteOrder.BIG_ENDIAN;
 
     public static final int DEFAULT_BUFFER_SIZE = 8192;
 

src/main/java/org/glavo/nbt/internal/input/NBTReader.java

@@ -35,13 +35,19 @@ public final class NBTReader implements Closeable {
 
     private final InputSource source;
     private final InputBuffer buffer;
+    private final ByteOrder byteOrder;
 
     /// Used for reading UTF-8 strings
     private @Nullable StringBuilder charsBuffer;
 
     public NBTReader(InputSource source, ByteOrder byteOrder) {
         this.source = source;
         this.buffer = InputBuffer.allocate(IOUtils.DEFAULT_BUFFER_SIZE, source.supportDirectBuffer(), byteOrder);
+        this.byteOrder = byteOrder;
+    }
+
+    public ByteOrder byteOrder() {
+        return this.byteOrder;
     }
 
     @Override
@@ -165,7 +171,7 @@ public String readString() throws IOException {
         bytes.position(limit);
 
         // For Minecraft Bedrock Edition, the string is encoded in standard UTF-8
-        if (buffer.order() == ByteOrder.LITTLE_ENDIAN) {
+        if (byteOrder == ByteOrder.LITTLE_ENDIAN) {
             return getUTF8(bytes, offset, len);
         }
 

src/main/java/org/glavo/nbt/tag/Tag.java

@@ -16,7 +16,6 @@
 package org.glavo.nbt.tag;
 
 import org.glavo.nbt.NBTElement;
-import org.glavo.nbt.internal.IOUtils;
 import org.glavo.nbt.internal.input.InputSource;
 import org.glavo.nbt.internal.input.NBTReader;
 import org.glavo.nbt.internal.output.NBTWriter;
@@ -52,7 +51,7 @@ public sealed abstract class Tag implements NBTElement
     }
 
     public static Tag readTag(InputStream inputStream) throws IOException {
-        return readTag(inputStream, IOUtils.DEFAULT_BYTE_ORDER);
+        return readTag(inputStream, ByteOrder.BIG_ENDIAN);
     }
 
     public static Tag readTag(InputStream inputStream, ByteOrder byteOrder) throws IOException {
@@ -66,7 +65,7 @@ public static Tag readTag(InputStream inputStream, ByteOrder byteOrder) throws I
     }
 
     public static CompoundTag<?> readCompoundTag(InputStream inputStream) throws IOException {
-        return readCompoundTag(inputStream, IOUtils.DEFAULT_BYTE_ORDER);
+        return readCompoundTag(inputStream, ByteOrder.BIG_ENDIAN);
     }
 
     public static CompoundTag<?> readCompoundTag(InputStream inputStream, ByteOrder byteOrder) throws IOException {
@@ -125,7 +124,7 @@ public int getIndex() {
     }
 
     public void writeTo(OutputStream outputStream) throws IOException {
-        writeTo(outputStream, IOUtils.DEFAULT_BYTE_ORDER);
+        writeTo(outputStream, ByteOrder.BIG_ENDIAN);
     }
 
     public void writeTo(OutputStream outputStream, ByteOrder byteOrder) throws IOException {