LegacyConsole/GabsPuNs-MinecraftConsoles
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-06-16 21:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use BYTE Win Typedef instead of byte typedef from Minecraft.World

Browse Source 
"byte" wasnt working anymore for some reason
This commit is contained in:
GabsPuNs
2026-04-13 17:54:28 -04:00
parent e90e585ef0
commit 40d48948ff
233 changed files with 4751 additions and 930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
Minecraft.World/DataInputStream.cpp
View File

@@ -10,8 +10,8 @@ DataInputStream::DataInputStream(InputStream *in) : stream( in )
{
}
//Reads the next byte of data from this input stream. The value byte is returned as an int in the range 0 to 255.
//If no byte is available because the end of the stream has been reached, the value -1 is returned.
//Reads the next BYTE of data from this input stream. The value BYTE is returned as an int in the range 0 to 255.
//If no BYTE is available because the end of the stream has been reached, the value -1 is returned.
//This method blocks until input data is available, the end of the stream is detected, or an exception is thrown.
//This method simply performs in.read() and returns the result.
int DataInputStream::read()
@@ -23,10 +23,10 @@ int DataInputStream::read()
//The number of bytes actually read is returned as an integer. This method blocks until input data is available,
//end of file is detected, or an exception is thrown.
//If b is null, a NullPointerException is thrown. If the length of b is zero, then no bytes are read and 0 is returned;
//otherwise, there is an attempt to read at least one byte. If no byte is available because the stream is at end of file,
//the value -1 is returned; otherwise, at least one byte is read and stored into b.
//otherwise, there is an attempt to read at least one BYTE. If no BYTE is available because the stream is at end of file,
//the value -1 is returned; otherwise, at least one BYTE is read and stored into b.
//
//The first byte read is stored into element b[0], the next one into b[1], and so on. The number of bytes read is, at most,
//The first BYTE read is stored into element b[0], the next one into b[1], and so on. The number of bytes read is, at most,
//equal to the length of b. Let k be the number of bytes actually read; these bytes will be stored in elements b[0] through b[k-1],
//leaving elements b[k] through b[b.length-1] unaffected.
//
@@ -49,10 +49,10 @@ int DataInputStream::read(byteArray b)
//but a smaller number may be read, possibly zero. The number of bytes actually read is returned as an integer.
//This method blocks until input data is available, end of file is detected, or an exception is thrown.
//
//If len is zero, then no bytes are read and 0 is returned; otherwise, there is an attempt to read at least one byte.
//If no byte is available because the stream is at end of file, the value -1 is returned; otherwise, at least one byte is read and stored into b.
//If len is zero, then no bytes are read and 0 is returned; otherwise, there is an attempt to read at least one BYTE.
//If no BYTE is available because the stream is at end of file, the value -1 is returned; otherwise, at least one BYTE is read and stored into b.
//
//The first byte read is stored into element b[off], the next one into b[off+1], and so on. The number of bytes read is,
//The first BYTE read is stored into element b[off], the next one into b[off+1], and so on. The number of bytes read is,
//at most, equal to len. Let k be the number of bytes actually read; these bytes will be stored in elements b[off] through b[off+k-1],
//leaving elements b[off+k] through b[off+len-1] unaffected.
//
@@ -77,8 +77,8 @@ void DataInputStream::close()
stream->close();
}
//Reads one input byte and returns true if that byte is nonzero, false if that byte is zero. This method is suitable for reading
//the byte written by the writeBoolean method of interface DataOutput.
//Reads one input BYTE and returns true if that BYTE is nonzero, false if that BYTE is zero. This method is suitable for reading
//the BYTE written by the writeBoolean method of interface DataOutput.
//Returns:
//the boolean value read.
bool DataInputStream::readBoolean()
@@ -86,13 +86,13 @@ bool DataInputStream::readBoolean()
return stream->read() != 0;
}
//Reads and returns one input byte. The byte is treated as a signed value in the range -128 through 127, inclusive.
//This method is suitable for reading the byte written by the writeByte method of interface DataOutput.
//Reads and returns one input BYTE. The BYTE is treated as a signed value in the range -128 through 127, inclusive.
//This method is suitable for reading the BYTE written by the writeByte method of interface DataOutput.
//Returns:
//the 8-bit value read.
byte DataInputStream::readByte()
BYTE DataInputStream::readByte()
{
return static_cast<byte>(stream->read());
return static_cast<BYTE>(stream->read());
}
unsigned char DataInputStream::readUnsignedByte()
@@ -100,7 +100,7 @@ unsigned char DataInputStream::readUnsignedByte()
return static_cast<unsigned char>(stream->read());
}
//Reads two input bytes and returns a char value. Let a be the first byte read and b be the second byte. The value returned is:
//Reads two input bytes and returns a char value. Let a be the first BYTE read and b be the second BYTE. The value returned is:
//(char)((a << 8) | (b & 0xff))
//
//This method is suitable for reading bytes written by the writeChar method of interface DataOutput.
@@ -119,7 +119,7 @@ wchar_t DataInputStream::readChar()
//b.length bytes of input data are available, in which case a normal return is made.
//End of file is detected, in which case an EOFException is thrown.
//An I/O error occurs, in which case an IOException other than EOFException is thrown.
//If b is null, a NullPointerException is thrown. If b.length is zero, then no bytes are read. Otherwise, the first byte read is
//If b is null, a NullPointerException is thrown. If b.length is zero, then no bytes are read. Otherwise, the first BYTE read is
//stored into element b[0], the next one into b[1], and so on. If an exception is thrown from this method, then it may be that some but
//not all bytes of b have been updated with data from the input stream.
//
@@ -244,7 +244,7 @@ int64_t DataInputStream::readLong()
return bits;
}
//Reads two input bytes and returns a short value. Let a be the first byte read and b be the second byte. The value returned is:
//Reads two input bytes and returns a short value. Let a be the first BYTE read and b be the second BYTE. The value returned is:
//(short)((a << 8) | (b & 0xff))
//
//This method is suitable for reading the bytes written by the writeShort method of interface DataOutput.
@@ -268,25 +268,25 @@ unsigned short DataInputStream::readUnsignedShort()
//of a Unicode character string encoded in modified UTF-8 format; this string of characters is then returned as a String.
//First, two bytes are read and used to construct an unsigned 16-bit integer in exactly the manner of the readUnsignedShort method .
//This integer value is called the UTF length and specifies the number of additional bytes to be read. These bytes are then converted
//to characters by considering them in groups. The length of each group is computed from the value of the first byte of the group.
//The byte following a group, if any, is the first byte of the next group.
//to characters by considering them in groups. The length of each group is computed from the value of the first BYTE of the group.
//The BYTE following a group, if any, is the first BYTE of the next group.
//
//If the first byte of a group matches the bit pattern 0xxxxxxx (where x means "may be 0 or 1"), then the group consists of just that byte.
//The byte is zero-extended to form a character.
//If the first BYTE of a group matches the bit pattern 0xxxxxxx (where x means "may be 0 or 1"), then the group consists of just that BYTE.
//The BYTE is zero-extended to form a character.
//
//If the first byte of a group matches the bit pattern 110xxxxx, then the group consists of that byte a and a second byte b.
//If there is no byte b (because byte a was the last of the bytes to be read), or if byte b does not match the bit pattern 10xxxxxx,
//If the first BYTE of a group matches the bit pattern 110xxxxx, then the group consists of that BYTE a and a second BYTE b.
//If there is no BYTE b (because BYTE a was the last of the bytes to be read), or if BYTE b does not match the bit pattern 10xxxxxx,
//then a UTFDataFormatException is thrown. Otherwise, the group is converted to the character:
//
//(char)(((a& 0x1F) << 6) | (b & 0x3F))
//
//If the first byte of a group matches the bit pattern 1110xxxx, then the group consists of that byte a and two more bytes b and c.
//If there is no byte c (because byte a was one of the last two of the bytes to be read), or either byte b or byte c does not match the bit
//If the first BYTE of a group matches the bit pattern 1110xxxx, then the group consists of that BYTE a and two more bytes b and c.
//If there is no BYTE c (because BYTE a was one of the last two of the bytes to be read), or either BYTE b or BYTE c does not match the bit
//pattern 10xxxxxx, then a UTFDataFormatException is thrown. Otherwise, the group is converted to the character:
//
// (char)(((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F))
//
//If the first byte of a group matches the pattern 1111xxxx or the pattern 10xxxxxx, then a UTFDataFormatException is thrown.
//If the first BYTE of a group matches the pattern 1111xxxx or the pattern 10xxxxxx, then a UTFDataFormatException is thrown.
//If end of file is encountered at any time during this entire process, then an EOFException is thrown.
//
//After every group has been converted to a character by this process, the characters are gathered, in the same order in which their
@@ -334,11 +334,11 @@ wstring DataInputStream::readUTF()
// 11110000 = 0xF0 // Match only highest four bits
// Matching patterns:
// 10xxxxxx = 0x80 // ERROR, or second/third byte
// 10xxxxxx = 0x80 // ERROR, or second/third BYTE
// 1111xxxx = 0xF0 //ERROR
// 0xxxxxxx = 0x00 // One byte UTF
// 110xxxxx = 0xC0 // Two byte UTF
// 1110xxxx = 0xE0 // Three byte UTF
// 0xxxxxxx = 0x00 // One BYTE UTF
// 110xxxxx = 0xC0 // Two BYTE UTF
// 1110xxxx = 0xE0 // Three BYTE UTF
if( ( (firstByte & 0xC0 ) == 0x80 ) || ( (firstByte & 0xF0) == 0xF0) )
{
// TODO 4J Stu - UTFDataFormatException
@@ -346,14 +346,14 @@ wstring DataInputStream::readUTF()
}
else if( (firstByte & 0x80) == 0x00 )
{
// One byte UTF
// One BYTE UTF
wchar_t readChar = static_cast<wchar_t>(firstByte);
outputString.push_back( readChar );
continue;
}
else if( (firstByte & 0xE0) == 0xC0 )
{
// Two byte UTF
// Two BYTE UTF
// No more bytes to read
if( !(currentByteIndex < UTFLength) )
@@ -365,13 +365,13 @@ wstring DataInputStream::readUTF()
int secondByte = stream->read();
currentByteIndex++;
// No second byte
// No second BYTE
if( secondByte == -1 )
{
// TODO 4J Stu - EOFException
break;
}
// Incorrect second byte pattern
// Incorrect second BYTE pattern
else if( (secondByte & 0xC0 ) != 0x80 )
{
// TODO 4J Stu - UTFDataFormatException
@@ -384,7 +384,7 @@ wstring DataInputStream::readUTF()
}
else if( (firstByte & 0xF0) == 0xE0 )
{
// Three byte UTF
// Three BYTE UTF
// No more bytes to read
if( !(currentByteIndex < UTFLength) )
@@ -396,7 +396,7 @@ wstring DataInputStream::readUTF()
int secondByte = stream->read();
currentByteIndex++;
// No second byte
// No second BYTE
if( secondByte == -1 )
{
// TODO 4J Stu - EOFException
@@ -413,13 +413,13 @@ wstring DataInputStream::readUTF()
int thirdByte = stream->read();
currentByteIndex++;
// No third byte
// No third BYTE
if( thirdByte == -1 )
{
// TODO 4J Stu - EOFException
break;
}
// Incorrect second or third byte pattern
// Incorrect second or third BYTE pattern
else if( ( (secondByte & 0xC0 ) != 0x80 ) || ( (thirdByte & 0xC0 ) != 0x80 ) )
{
// TODO 4J Stu - UTFDataFormatException
@@ -451,11 +451,11 @@ int DataInputStream::readUTFChar()
// 11110000 = 0xF0 // Match only highest four bits
// Matching patterns:
// 10xxxxxx = 0x80 // ERROR, or second/third byte
// 10xxxxxx = 0x80 // ERROR, or second/third BYTE
// 1111xxxx = 0xF0 //ERROR
// 0xxxxxxx = 0x00 // One byte UTF
// 110xxxxx = 0xC0 // Two byte UTF
// 1110xxxx = 0xE0 // Three byte UTF
// 0xxxxxxx = 0x00 // One BYTE UTF
// 110xxxxx = 0xC0 // Two BYTE UTF
// 1110xxxx = 0xE0 // Three BYTE UTF
if( ( (firstByte & 0xC0 ) == 0x80 ) || ( (firstByte & 0xF0) == 0xF0) )
{
// TODO 4J Stu - UTFDataFormatException
@@ -463,21 +463,21 @@ int DataInputStream::readUTFChar()
}
else if( (firstByte & 0x80) == 0x00 )
{
// One byte UTF
// One BYTE UTF
returnValue = firstByte;
}
else if( (firstByte & 0xE0) == 0xC0 )
{
// Two byte UTF
// Two BYTE UTF
int secondByte = stream->read();
// No second byte
// No second BYTE
if( secondByte == -1 )
{
// TODO 4J Stu - EOFException
return returnValue;
}
// Incorrect second byte pattern
// Incorrect second BYTE pattern
else if( (secondByte & 0xC0 ) != 0x80 )
{
// TODO 4J Stu - UTFDataFormatException
@@ -488,11 +488,11 @@ int DataInputStream::readUTFChar()
}
else if( (firstByte & 0xF0) == 0xE0 )
{
// Three byte UTF
// Three BYTE UTF
int secondByte = stream->read();
// No second byte
// No second BYTE
if( secondByte == -1 )
{
// TODO 4J Stu - EOFException
@@ -501,13 +501,13 @@ int DataInputStream::readUTFChar()
int thirdByte = stream->read();
// No third byte
// No third BYTE
if( thirdByte == -1 )
{
// TODO 4J Stu - EOFException
return returnValue;
}
// Incorrect second or third byte pattern
// Incorrect second or third BYTE pattern
else if( ( (secondByte & 0xC0 ) != 0x80 ) || ( (thirdByte & 0xC0 ) != 0x80 ) )
{
// TODO 4J Stu - UTFDataFormatException