Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 15 insertions, 13 deletions

diff --git a/Minecraft.World/File.h b/Minecraft.World/File.h
index 0b710cd4..ae07a4b7 100644
--- a/Minecraft.World/File.h
+++ b/Minecraft.World/File.h
@@ -1,5 +1,9 @@
 #pragma once
-using namespace std;
+
+#include <cstdint>
+#include <vector>
+#include <string>
+
 // 4J Stu - Represents java standard library class
 
 class FileFilter;
@@ -24,11 +28,11 @@ public:
 	bool exists() const;
 	bool isFile() const;
 	bool renameTo(File dest);
-	vector<File *> *listFiles() const; // Array
-	vector<File *> *listFiles(FileFilter *filter) const;
+	std::vector<File *> *listFiles() const; // Array
+	std::vector<File *> *listFiles(FileFilter *filter) const;
 	bool isDirectory() const;
-	__int64 length();
-	__int64 lastModified();
+	int64_t length();
+	int64_t lastModified();
 	const wstring getPath() const; // 4J Jev: TODO
 	wstring getName() const;
 
@@ -43,14 +47,12 @@ private:
 	//File(vector<wstring> *path);
 };
 
-typedef struct
+struct FileKeyHash
 {
-	int operator() (const File &k) const { return File::hash_fnct(k); }
-
-} FileKeyHash;
+	int operator() (const File &k) const;
+};
 
-typedef struct
+struct FileKeyEq
 {
-	bool operator() (const File &x, const File &y) const {return File::eq_test(x,y); }
-
-} FileKeyEq;
\ No newline at end of file
+	bool operator() (const File &x, const File &y) const;
+};
\ No newline at end of file