LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-31 02:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: nuke all widestrings and widechars everywhere

Browse Source
This commit is contained in:
Tropical
2026-04-07 23:20:09 -05:00
parent f1f1d116b3
commit 2912e9ae2e
1323 changed files with 23207 additions and 23399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
targets/java/src/InputOutputStream/DataInputStream.cpp
View File

@@ -162,7 +162,7 @@ unsigned char DataInputStream::readUnsignedByte() {
//
// This method is suitable for reading bytes written by the writeChar method of
// interface DataOutput. Returns: the char value read.
wchar_t DataInputStream::readChar() {
char DataInputStream::readChar() {
if (stream == nullptr) {
fprintf(
stderr,
@@ -171,7 +171,7 @@ wchar_t DataInputStream::readChar() {
}
int a = stream->read();
int b = stream->read();
return (wchar_t)((a << 8) | (b & 0xff));
return (char)((a << 8) | (b & 0xff));
}
// Reads some bytes from an input stream and stores them into the buffer array
@@ -399,8 +399,8 @@ unsigned short DataInputStream::readUnsignedShort() {
//
// Returns:
// a Unicode string.
std::wstring DataInputStream::readUTF() {
std::wstring outputString;
std::string DataInputStream::readUTF() {
std::string outputString;
if (stream == nullptr) {
fprintf(
stderr,
@@ -413,11 +413,11 @@ std::wstring DataInputStream::readUTF() {
//// 4J Stu - I decided while writing DataOutputStream that we didn't need
/// to bother using the UTF8 format / used in the java libs, and just write
/// in/out as wchar_t all the time
/// in/out as char all the time
/*for( unsigned short i = 0; i < UTFLength; i++)
{
wchar_t theChar = readChar();
char theChar = readChar();
outputString.push_back(theChar);
}*/
@@ -447,7 +447,7 @@ std::wstring DataInputStream::readUTF() {
break;
} else if ((firstByte & 0x80) == 0x00) {
// One byte UTF
wchar_t readChar = (wchar_t)firstByte;
char readChar = (char)firstByte;
outputString.push_back(readChar);
continue;
} else if ((firstByte & 0xE0) == 0xC0) {
@@ -473,8 +473,8 @@ std::wstring DataInputStream::readUTF() {
break;
}
wchar_t readChar =
(wchar_t)(((firstByte & 0x1F) << 6) | (secondByte & 0x3F));
char readChar =
(char)(((firstByte & 0x1F) << 6) | (secondByte & 0x3F));
outputString.push_back(readChar);
continue;
} else if ((firstByte & 0xF0) == 0xE0) {
@@ -516,8 +516,8 @@ std::wstring DataInputStream::readUTF() {
break;
}
wchar_t readChar =
(wchar_t)(((firstByte & 0x0F) << 12) |
char readChar =
(char)(((firstByte & 0x0F) << 12) |
((secondByte & 0x3F) << 6) | (thirdByte & 0x3F));
outputString.push_back(readChar);
continue;