Implement BufferedOutputStream, ByteArrayInputStream, ByteArrayOutputStream

Author: GRAnimated

data/mcswitch_functions.csv

@@ -1882,7 +1882,7 @@ Address,Quality,Size,Name
 0x00000071000496c8,U,000112,
 0x0000007100049738,U,000168,_ZNK11BiomeSource18getBiomeIndexBlockEiiii
 0x00000071000497e0,U,000364,_ZNK11BiomeSource18getBiomeIndexBlockER15arrayWithLengthIhEiiiib
-0x000000710004994c,U,000112,
+0x000000710004994c,O,000112,_ZN15arrayWithLengthIhE6resizeEj
 0x00000071000499bc,U,000252,_ZN11BiomeSource12containsOnlyEiiiRKNSt3__16vectorIP5BiomeNS0_9allocatorIS3_EEEE
 0x0000007100049ab8,U,000388,_ZN11BiomeSource9findBiomeEiiiNSt3__16vectorIP5BiomeNS0_9allocatorIS3_EEEEP6Random
 0x0000007100049c3c,U,000008,_ZN11BiomeSource6updateEv
@@ -2760,15 +2760,15 @@ Address,Quality,Size,Name
 0x0000007100075850,U,000012,
 0x000000710007585c,U,000024,
 0x0000007100075874,U,000008,
-0x000000710007587c,U,000120,_ZN20BufferedOutputStreamC1EP12OutputStreami
-0x00000071000758f4,U,000020,_ZN12OutputStreamC1Ev
-0x0000007100075908,U,000064,_ZN20BufferedOutputStreamD1Ev
-0x0000007100075948,U,000036,_ZN20BufferedOutputStreamD0Ev
-0x000000710007596c,U,000060,_ZN20BufferedOutputStream5flushEv
-0x00000071000759a8,U,000052,_ZN20BufferedOutputStream5closeEv
-0x00000071000759dc,U,000200,_ZN20BufferedOutputStream5writeE15arrayWithLengthIhEjj
-0x0000007100075aa4,U,000020,_ZN20BufferedOutputStream5writeE15arrayWithLengthIhE
-0x0000007100075ab8,U,000096,_ZN20BufferedOutputStream5writeEj
+0x000000710007587c,O,000120,_ZN20BufferedOutputStreamC1EP12OutputStreami
+0x00000071000758f4,O,000020,_ZN12OutputStreamC2Ev
+0x0000007100075908,O,000064,_ZN20BufferedOutputStreamD1Ev
+0x0000007100075948,O,000036,_ZN20BufferedOutputStreamD0Ev
+0x000000710007596c,O,000060,_ZN20BufferedOutputStream5flushEv
+0x00000071000759a8,O,000052,_ZN20BufferedOutputStream5closeEv
+0x00000071000759dc,O,000200,_ZN20BufferedOutputStream5writeE15arrayWithLengthIhEjj
+0x0000007100075aa4,O,000020,_ZN20BufferedOutputStream5writeE15arrayWithLengthIhE
+0x0000007100075ab8,O,000096,_ZN20BufferedOutputStream5writeEj
 0x0000007100075b18,U,000096,_ZN14BufferedReaderC1Ev
 0x0000007100075b78,U,000020,
 0x0000007100075b8c,U,000200,
@@ -2930,26 +2930,26 @@ Address,Quality,Size,Name
 0x000000710009b39c,U,000020,_ZN15WoodButtonBlock15shouldBlockTickEP5LevelRK8BlockPosPK10BlockState
 0x000000710009b3b0,U,000068,_ZN15WoodButtonBlock10getTextureEPK9DirectionPK10BlockState
 0x000000710009b3f4,U,000004,_ZN15WoodButtonBlock13registerIconsEP12IconRegister
-0x000000710009b3f8,U,000116,
-0x000000710009b46c,U,000020,_ZN11InputStreamC1Ev
-0x000000710009b480,U,000088,__ct__20ByteArrayInputStreamF25arrayWithLength__tm__3_Uc
-0x000000710009b4d8,U,000064,
-0x000000710009b518,U,000020,
-0x000000710009b52c,U,000140,
-0x000000710009b5b8,U,000004,
-0x000000710009b5bc,U,000036,
-0x000000710009b5e0,U,000060,
-0x000000710009b61c,U,000036,
-0x000000710009b640,U,000100,_ZN21ByteArrayOutputStreamC1Ev
-0x000000710009b6a4,U,000104,_ZN21ByteArrayOutputStreamC2Ej
-0x000000710009b70c,U,000060,_ZN21ByteArrayOutputStreamD1Ev
-0x000000710009b748,U,000036,_ZN21ByteArrayOutputStreamD0Ev
-0x000000710009b76c,U,000104,_ZN21ByteArrayOutputStream5writeEj
-0x000000710009b7d4,U,000020,_ZN21ByteArrayOutputStream5writeE15arrayWithLengthIhE
-0x000000710009b7e8,U,000160,_ZN21ByteArrayOutputStream5writeE15arrayWithLengthIhEjj
-0x000000710009b888,U,000004,_ZN21ByteArrayOutputStream5closeEv
-0x000000710009b88c,U,000012,_ZN21ByteArrayOutputStream11toByteArrayEv
-0x000000710009b898,U,000072,
+0x000000710009b3f8,O,000116,_ZN20ByteArrayInputStreamC1E15arrayWithLengthIhEjj
+0x000000710009b46c,O,000020,_ZN11InputStreamC2Ev
+0x000000710009b480,O,000088,_ZN20ByteArrayInputStreamC1E15arrayWithLengthIhE
+0x000000710009b4d8,O,000064,_ZN20ByteArrayInputStream4readEv
+0x000000710009b518,O,000020,_ZN20ByteArrayInputStream4readE15arrayWithLengthIhE
+0x000000710009b52c,O,000140,_ZN20ByteArrayInputStream4readE15arrayWithLengthIhEjj
+0x000000710009b5b8,O,000004,_ZN20ByteArrayInputStream5closeEv
+0x000000710009b5bc,O,000036,_ZN20ByteArrayInputStream4skipEx
+0x000000710009b5e0,O,000060,_ZN20ByteArrayInputStreamD1Ev
+0x000000710009b61c,O,000036,_ZN20ByteArrayInputStreamD0Ev
+0x000000710009b640,O,000100,_ZN21ByteArrayOutputStreamC1Ev
+0x000000710009b6a4,O,000104,_ZN21ByteArrayOutputStreamC1Ej
+0x000000710009b70c,O,000060,_ZN21ByteArrayOutputStreamD1Ev
+0x000000710009b748,O,000036,_ZN21ByteArrayOutputStreamD0Ev
+0x000000710009b76c,O,000104,_ZN21ByteArrayOutputStream5writeEj
+0x000000710009b7d4,O,000020,_ZN21ByteArrayOutputStream5writeE15arrayWithLengthIhE
+0x000000710009b7e8,O,000160,_ZN21ByteArrayOutputStream5writeE15arrayWithLengthIhEjj
+0x000000710009b888,O,000004,_ZN21ByteArrayOutputStream5closeEv
+0x000000710009b88c,O,000012,_ZN21ByteArrayOutputStream11toByteArrayEv
+0x000000710009b898,O,000072,_ZN15arrayWithLengthIhE15createFromOtherES0_
 0x000000710009b8e0,O,000060,_ZN12ByteArrayTagC1Ev
 0x000000710009b91c,O,000088,_ZN12ByteArrayTagC1E15arrayWithLengthIhEb
 0x000000710009b974,O,000068,_ZN12ByteArrayTagD1Ev
@@ -4265,15 +4265,15 @@ Address,Quality,Size,Name
 0x00000071000b6594,U,000160,
 0x00000071000b6634,U,000128,
 0x00000071000b66b4,U,000004,
-0x00000071000b66b8,U,000004,vtbl_710103AD28_func_0
-0x00000071000b66bc,U,000036,
+0x00000071000b66b8,O,000004,_ZN12OutputStreamD2Ev
+0x00000071000b66bc,O,000036,_ZN12OutputStreamD0Ev
 0x00000071000b66e0,U,000004,
 0x00000071000b66e4,U,000036,
 0x00000071000b6708,U,000060,
 0x00000071000b6744,U,000048,
 0x00000071000b6774,U,000004,
-0x00000071000b6778,U,000004,vtbl_710103AB98_func_0
-0x00000071000b677c,U,000036,
+0x00000071000b6778,O,000004,_ZN11InputStreamD2Ev
+0x00000071000b677c,O,000036,_ZN11InputStreamD0Ev
 0x00000071000b67a0,O,000004,_ZN3TagD2Ev
 0x00000071000b67a4,U,000036,_ZN10NumericTagD0Ev
 0x00000071000b67c8,O,000004,_ZN12ChunkStorageD2Ev
@@ -4743,7 +4743,7 @@ Address,Quality,Size,Name
 0x00000071000c204c,U,000052,
 0x00000071000c2080,U,000008,
 0x00000071000c2088,U,000128,
-0x00000071000c2108,U,000112,
+0x00000071000c2108,M,000112,_ZN15arrayWithLengthIhE4copyEPhS1_j
 0x00000071000c2178,U,000300,
 0x00000071000c22a4,U,000008,
 0x00000071000c22ac,U,000012,
@@ -41810,7 +41810,7 @@ Address,Quality,Size,Name
 0x000000710069109c,O,000044,_Z18PIXBeginNamedEventfPKcz
 0x00000071006910c8,O,000004,_Z16PIXEndNamedEventv
 0x00000071006910cc,U,000044,_Z22PIXSetMarkerDeprecatedfPKcz
-0x00000071006910f8,U,000004,
+0x00000071006910f8,U,000004,_Z7XMemCpyPvPKvj
 0x00000071006910fc,U,000004,
 0x0000007100691100,M,000004,_Z10XMemSet128Pvij
 0x0000007100691104,O,000004,_Z14XPhysicalAllocmmmj
@@ -44992,7 +44992,7 @@ Address,Quality,Size,Name
 0x000000710074ecb8,U,000076,_ZN7Texture4bindEi
 0x000000710074ed04,U,000200,_ZN12TextureAtlasC1EiRKNSt3__112basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEES8_P13BufferedImageb
 0x000000710074edcc,U,000020,
-0x000000710074ede0,M,000148,_ZN18TextureAtlasSprite6createERKNSt3__112basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE
+0x000000710074ede0,U,000148,_ZN18TextureAtlasSprite6createERKNSt3__112basic_stringIwNS0_11char_traitsIwEENS0_9allocatorIwEEEE
 0x000000710074ee74,U,001408,_ZN12TextureAtlas6stitchEv
 0x000000710074f3f4,O,056148,_ZN12TextureAtlas7loadUVsEv
 0x000000710075cf48,U,000124,
@@ -46517,9 +46517,9 @@ Address,Quality,Size,Name
 0x000000710079c770,U,000040,
 0x000000710079c798,U,000012,
 0x000000710079c7a4,U,000012,
-0x000000710079c7b0,U,000172,
-0x000000710079c85c,U,000112,
-0x000000710079c8cc,U,000044,
+0x000000710079c7b0,U,000172,MakeCRCTable__8CStorageFv
+0x000000710079c85c,U,000112,UpdateCRC__8CStorageFUiPUci
+0x000000710079c8cc,U,000044,CRC__8CStorageFPUci
 0x000000710079c8f8,U,000084,SetDefaultImages__8CStorageFPUcUiT1T2T1T2
 0x000000710079c94c,U,000016,DoesSaveExist__8CStorageFPb
 0x000000710079c95c,U,000008,EnoughSpaceForAMinSaveGame__8CStorageFv
@@ -46586,7 +46586,7 @@ Address,Quality,Size,Name
 0x000000710079dfe0,U,000008,
 0x000000710079dfe8,U,000020,
 0x000000710079dffc,U,000020,
-0x000000710079e010,U,000628,
+0x000000710079e010,U,000628,SetSaveImages__8CStorageFPUcUiT1T2T1T2
 0x000000710079e284,U,000180,
 0x000000710079e338,U,000024,
 0x000000710079e350,U,000624,

lib/zlib/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Stripped version of zlib's CMakeLists.txt
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 
 project(zlib C)
 

src/Minecraft.Client/platform/NX/Platform.h

@@ -40,6 +40,9 @@ int XMemCreateDecompressionContext(_XMEMCODEC_TYPE type, const void* param_2, un
 void XMemDestroyCompressionContext(void* ctxt);
 void XMemDestroyDecompressionContext(void* ctxt);
 
+// the last argument is 32 bit on Wii U Edition, but 64 bit on Switch, so I bet it's a size_t
+void XMemCpy(void* buf, const void* data, size_t size);
+
 unsigned int TlsAlloc();
 int TlsFree(unsigned int unk);
 void* TlsGetValue(unsigned int index);

src/Minecraft.Core/System.cpp

@@ -9,7 +9,7 @@ void InitializeCriticalSection(nn::os::MutexType* mutex) {
 }
 
 long System::currentRealTimeMillis() {
-    nn::time::PosixTime t;  // they left uninitialized
+    nn::time::PosixTime t;
     nn::time::StandardUserSystemClock::GetCurrentTime(&t);
     return t.time;
 }
@@ -61,7 +61,6 @@ void System::ReverseULONG(unsigned int* v) {
     *(reinterpret_cast<unsigned char*>(v) + 3) = lb;
 }
 
-
 // NON_MATCHING | Score 260 (lower is better)
 // Not sure but this (along with the others) probably uses some compiler intrinsic
 // I had to arrange this using odd then even
@@ -82,5 +81,3 @@ void System::ReverseCHAR16A(char16_t* str, int len) {
     for (int i = 0; i < len; i++)
         System::ReverseUSHORT(reinterpret_cast<unsigned short*>(str + i));
 }
-
-

src/Minecraft.Core/io/BufferedOutputStream.cpp

@@ -0,0 +1,47 @@
+#include "Minecraft.Core/io/BufferedOutputStream.h"
+
+#include "Minecraft.World/ArrayWithLength.h"
+
+BufferedOutputStream::BufferedOutputStream(OutputStream* outputStream, int bufferSize) {
+    mOutputStream = outputStream;
+    mBuffer = arrayWithLength<unsigned char>(bufferSize, true);
+    mSize = 0;
+}
+
+BufferedOutputStream::~BufferedOutputStream() {
+    delete mBuffer.data;
+    mBuffer.data = nullptr;
+}
+
+void BufferedOutputStream::write(unsigned int byte) {
+    mBuffer[mSize++] = byte;
+    if (mSize == mBuffer.length) {
+        flush();
+    }
+}
+
+void BufferedOutputStream::write(arrayWithLength<unsigned char> array) {
+    write(array, 0, array.length);
+}
+
+void BufferedOutputStream::write(arrayWithLength<unsigned char> array, unsigned int start,
+                                 unsigned int length) {
+    if (length >= mBuffer.length) {
+        flush();
+        mOutputStream->write(array, start, length);
+        return;
+    }
+    for (unsigned int i = 0; i < length; ++i) {
+        write(array[start + i]);
+    }
+}
+
+void BufferedOutputStream::close() {
+    flush();
+    mOutputStream->close();
+}
+
+void BufferedOutputStream::flush() {
+    mOutputStream->write(mBuffer, 0, mSize);
+    mSize = 0;
+}

src/Minecraft.Core/io/ByteArrayInputStream.cpp

@@ -0,0 +1,57 @@
+#include "Minecraft.Client/platform/NX/Platform.h"
+#include "Minecraft.Core/io/ByteArrayInputStream.h"
+
+ByteArrayInputStream::ByteArrayInputStream(arrayWithLength<unsigned char> array, unsigned int start,
+                                           unsigned int length) {
+    mLength = std::min(start + length, array.length);
+    mCurrentPos = start;
+    mNextPos = start;
+    mBuffer = array;
+}
+
+ByteArrayInputStream::ByteArrayInputStream(arrayWithLength<unsigned char> array) {
+    mLength = array.length;
+    mCurrentPos = 0;
+    mNextPos = 0;
+    mBuffer = array;
+}
+
+ByteArrayInputStream::~ByteArrayInputStream() {
+    delete[] mBuffer.data;
+}
+
+int ByteArrayInputStream::read() {
+    if (mNextPos < mLength)
+        return mBuffer[mNextPos++];
+    return -1;
+}
+
+int ByteArrayInputStream::read(arrayWithLength<unsigned char> array) {
+    return read(array, 0, array.length);
+}
+
+int ByteArrayInputStream::read(arrayWithLength<unsigned char> array, unsigned int start,
+                               unsigned int length) {
+    if (mNextPos == mLength)
+        return -1;
+
+    int amount = std::min(length, mLength - mNextPos);
+    XMemCpy(&array[start], &mBuffer[mNextPos], amount);
+    mNextPos += amount;
+
+    return amount;
+}
+
+void ByteArrayInputStream::close() {}
+
+long long ByteArrayInputStream::skip(long long amount) {
+    int newPos = mNextPos + amount;
+
+    if (newPos > mLength)
+        newPos = mLength;
+
+    int difference = newPos - mNextPos;
+    mNextPos = newPos;
+
+    return difference;
+}

src/Minecraft.Core/io/ByteArrayInputStream.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "Minecraft.Core/io/InputStream.h"
+
+class ByteArrayInputStream : public InputStream {
+public:
+    ByteArrayInputStream(arrayWithLength<unsigned char> array, unsigned int start, unsigned int length);
+    ByteArrayInputStream(arrayWithLength<unsigned char> array);
+
+    virtual ~ByteArrayInputStream() override;
+    virtual int read() override;
+    virtual int read(arrayWithLength<unsigned char>) override;
+    virtual int read(arrayWithLength<unsigned char>, unsigned int, unsigned int) override;
+    virtual void close() override;
+    virtual long long skip(long long) override;
+
+    arrayWithLength<unsigned char> mBuffer;
+    unsigned int mLength;
+    unsigned int mCurrentPos;
+    unsigned int mNextPos;
+};

src/Minecraft.Core/io/ByteArrayOutputStream.cpp

@@ -0,0 +1,45 @@
+#include "Minecraft.Core/io/ByteArrayOutputStream.h"
+
+#include "Minecraft.Client/platform/NX/Platform.h"
+
+ByteArrayOutputStream::ByteArrayOutputStream() {
+    mSize = 0;
+    mBuffer = arrayWithLength<unsigned char>(0x20, true);
+}
+
+ByteArrayOutputStream::ByteArrayOutputStream(unsigned int size) {
+    mSize = 0;
+    mBuffer = arrayWithLength<unsigned char>(size, true);
+}
+
+ByteArrayOutputStream::~ByteArrayOutputStream() {
+    delete[] mBuffer.data;
+}
+
+void ByteArrayOutputStream::write(unsigned int byte) {
+    if (mSize + 1 >= mBuffer.length)
+        mBuffer.resize(mBuffer.length * 2);
+
+    mBuffer[mSize] = byte;
+    mSize++;
+}
+
+void ByteArrayOutputStream::write(arrayWithLength<unsigned char> array) {
+    write(array, 0, array.length);
+}
+
+void ByteArrayOutputStream::write(arrayWithLength<unsigned char> array, unsigned int start,
+                                  unsigned int length) {
+    if (mSize + length >= mBuffer.length)
+        mBuffer.resize(std::max(mSize + length + 1, mBuffer.length * 2));
+
+    XMemCpy(&mBuffer[mSize], &array[start], length);
+
+    mSize += length;
+}
+
+void ByteArrayOutputStream::close() {}
+
+arrayWithLength<unsigned char> ByteArrayOutputStream::toByteArray() {
+    return arrayWithLength<unsigned char>::createFromOther(mBuffer);
+}

src/Minecraft.Core/io/ByteArrayOutputStream.h

@@ -6,7 +6,9 @@
 
 class ByteArrayOutputStream : public OutputStream {
 public:
+    ByteArrayOutputStream();
     ByteArrayOutputStream(unsigned int);
+
     virtual ~ByteArrayOutputStream() override;
     virtual void write(unsigned int) override;
     virtual void write(arrayWithLength<unsigned char>) override;

src/Minecraft.Core/io/ConsoleSaveFileInputStream.h

@@ -7,11 +7,11 @@ class FileEntry;
 
 class ConsoleSaveFileInputStream : public InputStream {
 public:
-    virtual unsigned int read() override;
-    virtual void read(arrayWithLength<unsigned char>) override;
-    virtual void read(arrayWithLength<unsigned char>, unsigned int, unsigned int) override;
+    virtual int read() override;
+    virtual int read(arrayWithLength<unsigned char>) override;
+    virtual int read(arrayWithLength<unsigned char>, unsigned int, unsigned int) override;
     virtual void close() override;
-    virtual void skip(long long) override;
+    virtual long long skip(long long) override;
 
     ConsoleSaveFile* mConsoleSaveFile;
     FileEntry* mFileEntry;