Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix C-style struct functor definitions

Browse Source
This commit is contained in:
void_17
2026-03-02 14:51:05 +07:00
parent dea1d62074
commit def238ff08
6 changed files with 102 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Minecraft.World/File.cpp
View File

@@ -12,13 +12,13 @@
const wchar_t File::pathSeparator = L'\\'; const wchar_t File::pathSeparator = L'\\';
#ifdef _XBOX #ifdef _XBOX
const wstring File::pathRoot = L"GAME:"; // Path root after pathSeparator has been removed const std::wstring File::pathRoot = L"GAME:"; // Path root after pathSeparator has been removed
#else #else
const wstring File::pathRoot = L""; // Path root after pathSeparator has been removed const std::wstring File::pathRoot = L""; // Path root after pathSeparator has been removed
#endif #endif
//Creates a new File instance from a parent abstract pathname and a child pathname string. //Creates a new File instance from a parent abstract pathname and a child pathname string.
File::File( const File &parent, const wstring& child ) File::File( const File &parent, const std::wstring& child )
{ {
m_abstractPathName = parent.getPath() + pathSeparator + child; m_abstractPathName = parent.getPath() + pathSeparator + child;
} }
@@ -67,7 +67,7 @@ File::File( const wstring& pathname ) //: parent( NULL )
*/ */
} }
File::File( const wstring& parent, const wstring& child ) //: m_abstractPathName( child ) File::File( const std::wstring& parent, const std::wstring& child ) //: m_abstractPathName( child )
{ {
m_abstractPathName = pathRoot + pathSeparator + parent + pathSeparator + child; m_abstractPathName = pathRoot + pathSeparator + parent + pathSeparator + child;
//this->parent = new File( parent ); //this->parent = new File( parent );
@@ -149,9 +149,9 @@ bool File::mkdir() const
// //
bool File::mkdirs() const bool File::mkdirs() const
{ {
vector<wstring> path = stringSplit( m_abstractPathName, pathSeparator ); std::vector<std::wstring> path = stringSplit( m_abstractPathName, pathSeparator );
wstring pathToHere = L""; std::wstring pathToHere = L"";
AUTO_VAR(itEnd, path.end()); AUTO_VAR(itEnd, path.end());
for( AUTO_VAR(it, path.begin()); it != itEnd; it++ ) for( AUTO_VAR(it, path.begin()); it != itEnd; it++ )
{ {
@@ -237,7 +237,7 @@ bool File::renameTo(File dest)
// 4J Stu - The wstringtofilename function returns a pointer to the same location in memory every time it is // 4J Stu - The wstringtofilename function returns a pointer to the same location in memory every time it is
// called, therefore we were getting sourcePath and destPath having the same value. The solution here is to // called, therefore we were getting sourcePath and destPath having the same value. The solution here is to
// make a copy of the sourcePath by storing it in a std::string // make a copy of the sourcePath by storing it in a std::string
string sourcePath = wstringtofilename(getPath()); std::string sourcePath = wstringtofilename(getPath());
const char *destPath = wstringtofilename(dest.getPath()); const char *destPath = wstringtofilename(dest.getPath());
#ifdef _DURANGO #ifdef _DURANGO
__debugbreak(); // TODO __debugbreak(); // TODO
@@ -272,9 +272,9 @@ bool File::renameTo(File dest)
//An array of abstract pathnames denoting the files and directories in the directory denoted by this abstract pathname. //An array of abstract pathnames denoting the files and directories in the directory denoted by this abstract pathname.
//The array will be empty if the directory is empty. Returns null if this abstract pathname does not denote a directory, //The array will be empty if the directory is empty. Returns null if this abstract pathname does not denote a directory,
//or if an I/O error occurs. //or if an I/O error occurs.
vector<File *> *File::listFiles() const std::vector<File *> *File::listFiles() const
{ {
vector<File *> *vOutput = new vector<File *>(); std::vector<File *> *vOutput = new vector<File *>();
// TODO 4J Stu - Also need to check for I/O errors? // TODO 4J Stu - Also need to check for I/O errors?
if( !isDirectory() ) if( !isDirectory() )
@@ -386,8 +386,8 @@ vector<File *> *File::listFiles() const
FindClose( hFind); FindClose( hFind);
} }
#else #else
char path[MAX_PATH]; char path[MAX_PATH] {};
sprintf( path, "%s\\*", wstringtofilename( getPath() ) ); snprintf( path, MAX_PATH, "%s\\*", wstringtofilename( getPath() ) );
HANDLE hFind = FindFirstFile( path, &wfd); HANDLE hFind = FindFirstFile( path, &wfd);
if(hFind != INVALID_HANDLE_VALUE) if(hFind != INVALID_HANDLE_VALUE)
{ {
@@ -415,13 +415,13 @@ vector<File *> *File::listFiles() const
//Returns: //Returns:
//An array of abstract pathnames denoting the files and directories in the directory denoted by this abstract pathname. //An array of abstract pathnames denoting the files and directories in the directory denoted by this abstract pathname.
//The array will be empty if the directory is empty. Returns null if this abstract pathname does not denote a directory, or if an I/O error occurs. //The array will be empty if the directory is empty. Returns null if this abstract pathname does not denote a directory, or if an I/O error occurs.
vector<File *> *File::listFiles(FileFilter *filter) const std::vector<File *> *File::listFiles(FileFilter *filter) const
{ {
// TODO 4J Stu - Also need to check for I/O errors? // TODO 4J Stu - Also need to check for I/O errors?
if( !isDirectory() ) if( !isDirectory() )
return NULL; return NULL;
vector<File *> *vOutput = new vector<File *>(); std::vector<File *> *vOutput = new std::vector<File *>();
#ifdef __PS3__ #ifdef __PS3__
const char *lpFileName=wstringtofilename(getPath()); const char *lpFileName=wstringtofilename(getPath());
@@ -521,7 +521,7 @@ bool File::isDirectory() const
//Returns the length of the file denoted by this abstract pathname. The return value is unspecified if this pathname denotes a directory. //Returns the length of the file denoted by this abstract pathname. The return value is unspecified if this pathname denotes a directory.
//Returns: //Returns:
//The length, in bytes, of the file denoted by this abstract pathname, or 0L if the file does not exist //The length, in bytes, of the file denoted by this abstract pathname, or 0L if the file does not exist
__int64 File::length() int64_t File::length()
{ {
#ifdef __PS3__ #ifdef __PS3__
//extern const char* getPS3HomePath(); //extern const char* getPS3HomePath();
@@ -624,7 +624,7 @@ __int64 File::length()
//Returns: //Returns:
//A long value representing the time the file was last modified, measured in milliseconds since the epoch (00:00:00 GMT, January 1, 1970), //A long value representing the time the file was last modified, measured in milliseconds since the epoch (00:00:00 GMT, January 1, 1970),
//or 0L if the file does not exist or if an I/O error occurs //or 0L if the file does not exist or if an I/O error occurs
__int64 File::lastModified() int64_t File::lastModified()
{ {
WIN32_FILE_ATTRIBUTE_DATA fileInfoBuffer; WIN32_FILE_ATTRIBUTE_DATA fileInfoBuffer;
#ifdef _UNICODE #ifdef _UNICODE
@@ -657,7 +657,7 @@ __int64 File::lastModified()
} }
} }
const wstring File::getPath() const const std::wstring File::getPath() const
{ {
/* /*
wstring path; wstring path;
@@ -672,7 +672,7 @@ const wstring File::getPath() const
return m_abstractPathName; return m_abstractPathName;
} }
wstring File::getName() const std::wstring File::getName() const
{ {
unsigned int sep = (unsigned int )(m_abstractPathName.find_last_of( this->pathSeparator )); unsigned int sep = (unsigned int )(m_abstractPathName.find_last_of( this->pathSeparator ));
return m_abstractPathName.substr( sep + 1, m_abstractPathName.length() ); return m_abstractPathName.substr( sep + 1, m_abstractPathName.length() );
@@ -700,3 +700,9 @@ int File::hash_fnct(const File &k)
return (int) hashCode; return (int) hashCode;
} }
int FileKeyHash::operator() (const File &k) const
{ return File::hash_fnct(k); }
bool FileKeyEq::operator() (const File &x, const File &y) const
{ return File::eq_test(x,y); }

28
Minecraft.World/File.h
View File

@@ -1,5 +1,9 @@
#pragma once #pragma once
using namespace std;
#include <cstdint>
#include <vector>
#include <string>
// 4J Stu - Represents java standard library class // 4J Stu - Represents java standard library class
class FileFilter; class FileFilter;
@@ -24,11 +28,11 @@ public:
bool exists() const; bool exists() const;
bool isFile() const; bool isFile() const;
bool renameTo(File dest); bool renameTo(File dest);
vector<File *> *listFiles() const; // Array std::vector<File *> *listFiles() const; // Array
vector<File *> *listFiles(FileFilter *filter) const; std::vector<File *> *listFiles(FileFilter *filter) const;
bool isDirectory() const; bool isDirectory() const;
__int64 length(); int64_t length();
__int64 lastModified(); int64_t lastModified();
const wstring getPath() const; // 4J Jev: TODO const wstring getPath() const; // 4J Jev: TODO
wstring getName() const; wstring getName() const;
@@ -43,14 +47,12 @@ private:
//File(vector<wstring> *path); //File(vector<wstring> *path);
}; };
typedef struct struct FileKeyHash
{ {
int operator() (const File &k) const { return File::hash_fnct(k); } int operator() (const File &k) const;
};
} FileKeyHash; struct FileKeyEq
typedef struct
{ {
bool operator() (const File &x, const File &y) const {return File::eq_test(x,y); } bool operator() (const File &x, const File &y) const;
};
} FileKeyEq;

66
Minecraft.World/JavaIntHash.h
View File

@@ -1,13 +1,15 @@
#pragma once #pragma once
#include <cstdint>
// Java doesn't have a default hash value for ints, however, the hashmap itself does some "supplemental" hashing, so // Java doesn't have a default hash value for ints, however, the hashmap itself does some "supplemental" hashing, so
// our ints actually get hashed by code as implemented below. std templates *do* have a standard hash for ints, but it // our ints actually get hashed by code as implemented below. std templates *do* have a standard hash for ints, but it
// would appear to be a bit expensive so matching the java one for now anyway. This code implements the supplemental // would appear to be a bit expensive so matching the java one for now anyway. This code implements the supplemental
// hashing that happens in java so we can match what their maps are doing with ints. // hashing that happens in java so we can match what their maps are doing with ints.
typedef struct struct IntKeyHash
{ {
int operator() (const int &k) const inline int operator()(const int &k) const
{ {
int h = k; int h = k;
h += ~(h << 9); h += ~(h << 9);
@@ -16,62 +18,64 @@ typedef struct
h ^= (((unsigned int)h) >> 10); h ^= (((unsigned int)h) >> 10);
return h; return h;
} }
};
} IntKeyHash; struct IntKeyEq
typedef struct
{ {
bool operator() (const int &x, const int &y) const { return x==y; } inline bool operator()(const int &x, const int &y) const
} IntKeyEq; { return x==y; }
};
// This hash functor is taken from the IntHashMap java class used by the game, so that we can use a standard std hashmap with this hash rather // This hash functor is taken from the IntHashMap java class used by the game, so that we can use a standard std hashmap with this hash rather
// than implement the class itself // than implement the class itself
typedef struct struct IntKeyHash2
{ {
int operator() (const int &k) const inline int operator()(const int &k) const
{ {
unsigned int h = (unsigned int)k; unsigned int h = static_cast<unsigned int>(k);
h ^= (h >> 20) ^ (h >> 12); h ^= (h >> 20) ^ (h >> 12);
return (int)(h ^ (h >> 7) ^ (h >> 4)); return static_cast<int>(h ^ (h >> 7) ^ (h >> 4));
} }
} IntKeyHash2; };
// This hash functor is taken from the LongHashMap java class used by the game, so that we can use a standard std hashmap with this hash rather // This hash functor is taken from the LongHashMap java class used by the game, so that we can use a standard std hashmap with this hash rather
// than implement the class itself // than implement the class itself
typedef struct struct LongKeyHash
{ {
int hash(const int &k) const inline int hash(const int &k) const
{ {
unsigned int h = (unsigned int)k; unsigned int h = static_cast<unsigned int>(k);
h ^= (h >> 20) ^ (h >> 12); h ^= (h >> 20) ^ (h >> 12);
return (int)(h ^ (h >> 7) ^ (h >> 4)); return static_cast<int>(h ^ (h >> 7) ^ (h >> 4));
} }
int operator() (const __int64 &k) const inline int operator()(const int64_t &k) const
{ {
return hash((int) ( k ^ (((__uint64)k) >> 32 ))); return hash(static_cast<int>(k ^ ((static_cast<uint64_t>(k)) >> 32)));
} }
} LongKeyHash; };
typedef struct struct LongKeyEq
{ {
bool operator() (const __int64 &x, const __int64 &y) const { return x==y; } inline bool operator() (const int64_t &x, const int64_t &y) const
} LongKeyEq; { return x == y; }
};
typedef struct enum eINSTANCEOF;
struct eINSTANCEOFKeyHash
{ {
int operator() (const eINSTANCEOF &k) const int operator()(const eINSTANCEOF &k) const
{ {
unsigned int h = (unsigned int)k; unsigned int h = static_cast<unsigned int>(k);
h ^= (h >> 20) ^ (h >> 12); h ^= (h >> 20) ^ (h >> 12);
return (int)(h ^ (h >> 7) ^ (h >> 4)); return static_cast<int>(h ^ (h >> 7) ^ (h >> 4));
} }
} eINSTANCEOFKeyHash; };
typedef struct struct eINSTANCEOFKeyEq
{ {
bool operator() (const eINSTANCEOF &x, const eINSTANCEOF &y) const { return x==y; } inline bool operator()(const eINSTANCEOF &x, const eINSTANCEOF &y) const
} eINSTANCEOFKeyEq; { return x == y; }
};

16
Minecraft.World/Player.h
View File

@@ -539,13 +539,15 @@ private:
#endif #endif
}; };
typedef struct struct PlayerKeyHash
{ {
int operator() (const shared_ptr<Player> k) const { return Player::hash_fnct (k); } inline int operator() (const shared_ptr<Player> k) const
{ return Player::hash_fnct (k); }
};
} PlayerKeyHash; struct PlayerKeyEq
typedef struct
{ {
bool operator() (const shared_ptr<Player> x, const shared_ptr<Player> y) const { return Player::eq_test (x, y); } inline bool operator() (const shared_ptr<Player> x, const shared_ptr<Player> y) const
} PlayerKeyEq; { return Player::eq_test (x, y); }
};

4
Minecraft.World/TickNextTickData.cpp
View File

@@ -2,7 +2,7 @@
#include "TickNextTickData.h" #include "TickNextTickData.h"
__int64 TickNextTickData::C = 0; int64_t TickNextTickData::C = 0;
TickNextTickData::TickNextTickData(int x, int y, int z, int tileId) TickNextTickData::TickNextTickData(int x, int y, int z, int tileId)
{ {
@@ -33,7 +33,7 @@ int TickNextTickData::hashCode() const
return (((x * 1024 * 1024) + (z * 1024) + y) * 256) + tileId; return (((x * 1024 * 1024) + (z * 1024) + y) * 256) + tileId;
} }
TickNextTickData *TickNextTickData::delay(__int64 l) TickNextTickData *TickNextTickData::delay(int64_t l)
{ {
this->m_delay = l; this->m_delay = l;
return this; return this;

32
Minecraft.World/TickNextTickData.h
View File

@@ -1,26 +1,28 @@
#pragma once #pragma once
#include <cstdint>
// 4J Stu - In Java TickNextTickData implements Comparable<TickNextTickData> // 4J Stu - In Java TickNextTickData implements Comparable<TickNextTickData>
// We don't need to do that as it is only as helper for the java sdk sorting operations // We don't need to do that as it is only as helper for the java sdk sorting operations
class TickNextTickData class TickNextTickData
{ {
private: private:
static __int64 C; static int64_t C;
public: public:
int x, y, z, tileId; int x, y, z, tileId;
__int64 m_delay; int64_t m_delay;
private: private:
__int64 c; int64_t c;
public: public:
TickNextTickData(int x, int y, int z, int tileId); TickNextTickData(int x, int y, int z, int tileId);
bool equals(const void *o) const; bool equals(const void *o) const;
int hashCode() const; int hashCode() const;
TickNextTickData *delay(__int64 l); TickNextTickData *delay(int64_t l);
int compareTo(const TickNextTickData *tnd) const; int compareTo(const TickNextTickData *tnd) const;
static bool compare_fnct(const TickNextTickData &x, const TickNextTickData &y); static bool compare_fnct(const TickNextTickData &x, const TickNextTickData &y);
@@ -28,19 +30,21 @@ public:
static bool eq_test(const TickNextTickData &x, const TickNextTickData &y); static bool eq_test(const TickNextTickData &x, const TickNextTickData &y);
}; };
typedef struct struct TickNextTickDataKeyHash
{ {
int operator() (const TickNextTickData &k) const { return TickNextTickData::hash_fnct (k); } int operator() (const TickNextTickData &k) const
{ return TickNextTickData::hash_fnct (k); }
};
} TickNextTickDataKeyHash; struct TickNextTickDataKeyEq
typedef struct
{ {
bool operator() (const TickNextTickData &x, const TickNextTickData &y) const { return TickNextTickData::eq_test (x, y); } bool operator() (const TickNextTickData &x, const TickNextTickData &y) const
} TickNextTickDataKeyEq; { return TickNextTickData::eq_test (x, y); }
};
typedef struct struct TickNextTickDataKeyCompare
{ {
bool operator() (const TickNextTickData &x, const TickNextTickData &y) const { return TickNextTickData::compare_fnct (x, y); } bool operator() (const TickNextTickData &x, const TickNextTickData &y) const
{ return TickNextTickData::compare_fnct (x, y); }
} TickNextTickDataKeyCompare; };