.h -> .hpp everything

pragma once everywhere
server compilable
2026-03-30 20:13:31 +00:00 · 2026-03-28 01:08:50 +03:00 · 2026-03-28 00:00:19 +03:00 · 2026-03-26 03:55:28 +03:00 · 2026-03-24 17:32:52 +03:00 · 2026-03-24 16:31:46 +02:00
932 changed files with 91671 additions and 97471 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,6 +39,8 @@ if (${PLATFORM} STREQUAL "Desktop")
        set(EXTRA_LIBS pthread m)
    endif()

+    include_directories("glad/include")
+
 elseif (${PLATFORM} STREQUAL "Web")
    set(PLATFORM_CPP "PLATFORM_WEB")
    set(EXTRA_LIBS "idbfs.js")
@@ -114,34 +116,38 @@ CPMAddPackage(
 # TODO: Clear this paths with *
 file(GLOB SERVER_SOURCES
    "project/lib_projects/raknet/jni/RaknetSources/*.cpp"
-    "src/NinecraftApp.cpp"
    "src/Performance.cpp"
    "src/SharedConstants.cpp"
+    "src/Minecraft.cpp"
+    "src/MinecraftServer.cpp"
+    "src/App.cpp"
+    "src/IPlatform.cpp"

-    "src/client/IConfigListener.cpp"
-    "src/client/Minecraft.cpp"
-    "src/client/OptionStrings.cpp"
-    "src/client/Option.cpp"
-    "src/client/Options.cpp"
-    "src/client/OptionsFile.cpp"
-    "src/client/ServerProfiler.cpp"

-    "src/client/gamemode/CreativeMode.cpp"
-    "src/client/gamemode/GameMode.cpp"
-    "src/client/gamemode/SurvivalMode.cpp"
+    # "src/client/IConfigListener.cpp"
+    # "src/client/Minecraft.cpp"
+    # "src/client/OptionStrings.cpp"
+    # "src/client/Option.cpp"
+    # "src/client/Options.cpp"
+    # "src/client/OptionsFile.cpp"
+    # "src/client/ServerProfiler.cpp"

-    "src/client/player/LocalPlayer.cpp"
-    "src/client/player/RemotePlayer.cpp"
-    "src/client/player/input/KeyboardInput.cpp"
+    # "src/client/gamemode/CreativeMode.cpp"
+    # "src/client/gamemode/GameMode.cpp"
+    # "src/client/gamemode/SurvivalMode.cpp"
+
+    # "src/client/player/LocalPlayer.cpp"
+    # "src/client/player/RemotePlayer.cpp"
+    # "src/client/player/input/KeyboardInput.cpp"
+
+    "src/gamemode/*.cpp"

    "src/locale/I18n.cpp"

-    "src/main.cpp"
    "src/main_dedicated.cpp"

    "src/nbt/Tag.cpp"

-    "src/network/ClientSideNetworkHandler.cpp"
    "src/network/NetEventCallback.cpp"
    "src/network/Packet.cpp"
    "src/network/RakNetInstance.cpp"
@@ -152,11 +158,7 @@ file(GLOB SERVER_SOURCES
    "src/platform/HttpClient.cpp"
    "src/platform/PngLoader.cpp"
    "src/platform/time.cpp"
-
-    "src/platform/input/Controller.cpp"
-    "src/platform/input/Keyboard.cpp"
-    "src/platform/input/Mouse.cpp"
-    "src/platform/input/Multitouch.cpp"
+    "src/platform/server/PlatformServer.cpp"

    "src/server/ArgumentsSettings.cpp"
    "src/server/ServerLevel.cpp"
@@ -369,7 +371,7 @@ if(${PLATFORM} MATCHES "Web")
 endif()

 # Client
-target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM})
+target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" "${PLATFORM_CPP}")
 target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS})

 if (OpenSSL_FOUND)
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -0,0 +1,26 @@
+#include "App.hpp"
+#include "IPlatform.hpp"
+
+#include "platform/server/PlatformServer.hpp"
+#include "platform/glfw/PlatformGlfw.hpp"
+
+std::unique_ptr<IPlatform> App::CreatePlatform() {
+#if defined(STANDALONE_SERVER)
+    return std::make_unique<PlatformServer>();
+#elif defined(PLATFORM_DESKTOP)
+    return std::make_unique<PlatformGlfw>();
+#else 
+    static_assert(false, "Unsupported platform!");
+#endif
+}
+
+void App::run() {
+    init();
+
+    m_platform->runMainLoop(*this);
+}
+
+void App::swapBuffers() {
+    m_platform->swapBuffers();
+}
+
--- a/src/App.h
+++ b/src/App.h
@@ -1,87 +0,0 @@
-#ifndef APP_H__
-#define APP_H__
-
-#ifdef __APPLE__
-#define NO_EGL
-#endif
-#ifdef STANDALONE_SERVER
-#define NO_EGL
-#endif
-
-#include "AppPlatform.h"
-#ifndef NO_EGL 
-    #include <EGL/egl.h>
-#endif
-#include "platform/log.h"
-
-typedef struct AppContext {
-#ifndef NO_EGL
-	EGLDisplay display;
-	EGLContext context;
-	EGLSurface surface;
-#endif
-	AppPlatform* platform;
-	bool doRender;
-} AppContext;
-
-
-class App
-{
-public:
-    App()
-	:	_finished(false),
-		_inited(false)
-	{
-		_context.platform = 0;
-	}
-	virtual ~App() {}
-
-	void init(AppContext& c) {
-        _context = c;
-		init();
-		_inited = true;
-    }
-	bool isInited() { return _inited; }
-
-	virtual AppPlatform* platform() { return _context.platform; }
-
-	void onGraphicsReset(AppContext& c) {
-		_context = c;
-		onGraphicsReset();
-	}
-
-    virtual void audioEngineOn () {}
-    virtual void audioEngineOff() {}
-    
-	virtual void destroy() {}
-
-    virtual void loadState(void* state, int stateSize) {}
-    virtual bool saveState(void** state, int* stateSize) { return false; }
-    
-	void swapBuffers() {
-#ifndef NO_EGL
-		if (_context.doRender)
-			eglSwapBuffers(_context.display, _context.surface);
-#endif
-	}
-
-	virtual void draw() {}
-	virtual void update() {};// = 0;
-	virtual void setSize(int width, int height) {}
-	
-	virtual void quit() { _finished = true; }
-	virtual bool wantToQuit() { return _finished; }
-	virtual bool handleBack(bool isDown) { return false; }
-
-protected:
-	virtual void init() {}
-	//virtual void onGraphicsLost() = 0;
-	virtual void onGraphicsReset() = 0;
-
-private:
-	bool _inited;
-	bool _finished;
-    AppContext _context;
-};
-
-#endif//APP_H__
--- a/src/App.hpp
+++ b/src/App.hpp
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <memory>
+#ifdef __APPLE__
+#define NO_EGL
+#endif
+#ifdef STANDALONE_SERVER
+#define NO_EGL
+#endif
+
+#include <IPlatform.hpp>
+#ifndef NO_EGL 
+    #include <EGL/egl.h>
+#endif
+
+
+// typedef struct AppContext {
+// #ifndef NO_EGL
+// 	EGLDisplay display;
+// 	EGLContext context;
+// 	EGLSurface surface;
+// #endif
+// 	AppPlatform* platform;
+// 	bool doRender;
+// } AppContext;
+
+class App {
+protected:
+	std::unique_ptr<IPlatform> m_platform;
+
+public:
+	static std::unique_ptr<IPlatform> CreatePlatform();
+
+    App(std::unique_ptr<IPlatform> platform) : m_platform(std::move(platform)), m_finished(false), m_inited(false) {}
+	App() = delete;
+	virtual ~App() {}
+
+	void run();
+
+	bool isInited() { return m_inited; }
+
+    virtual void audioEngineOn () {}
+    virtual void audioEngineOff() {}
+    
+	virtual void destroy() {}
+
+    virtual void loadState(void* state, int stateSize) {}
+    virtual bool saveState(void** state, int* stateSize) { return false; }
+    
+	void swapBuffers();
+// 	{
+// #ifndef NO_EGL
+// 		if (_context.doRender)
+// 			eglSwapBuffers(_context.display, _context.surface);
+// #endif
+// 		m_platform->swapBuffers();
+// 	}
+
+	virtual void update() = 0;
+	
+	virtual void quit() { m_finished = true; }
+	virtual bool wantToQuit() { return m_finished; }
+	virtual bool handleBack(bool isDown) { return false; }
+
+protected:
+	virtual void init() { m_inited = true;}
+
+private:
+	bool m_inited = false;
+	bool m_finished = false;
+};
--- a/src/AppConstants.h
+++ b/src/AppConstants.h
@@ -1,10 +0,0 @@
-#ifndef _MINECRAFT_APPCONSTANTS_H_
-#define _MINECRAFT_APPCONSTANTS_H_
-
-
-#define APP_VERSION_STRING "Demo"
-#define APP_NAME "Minecraft - Pocket Edition " APP_VERSION_STRING
-
-
-
-#endif
--- a/src/AppPlatform.h
+++ b/src/AppPlatform.h
@@ -1,143 +0,0 @@
-#ifndef APPPLATFORM_H__
-#define APPPLATFORM_H__
-
-#include <vector>
-#include <string>
-#include <cstring>
-#include "client/renderer/TextureData.h"
-
-typedef std::vector<std::string> StringVector;
-
-/*
-typedef struct UserInput
-{
-    static const int STATUS_INVALID = -1;
-    static const int STATUS_NOTINITED = -2;
-    static const int STATUS_OK = 1;
-    static const int STATUS_CANCEL = 0;
-
-    UserInput(int id)
-    :   _id(id),
-        status(STATUS_NOTINITED)
-    {}
-    UserInput(int id, int status)
-    :   _id(id),
-        status(status)
-    {}
-    int getId() { return _id; }
-
-    int status;
-private:
-    int _id;
-} UserInput;
-
-
-class UserInputStatus {
-	int _status;
-public:
-	UserInputStatus(int status)
-	:	_status(status)
-	{}
-	bool isAnswered() { return _status >= 0; }
-	bool isOk() { return _status == UserInput::STATUS_OK; }
-	bool isCancel() { return _status == UserInput::STATUS_CANCEL; }
-};
-*/
-
-class BinaryBlob {
-public:
-	BinaryBlob()
-	:	data(NULL),
-		size(-1) {}
-
-	BinaryBlob(unsigned char* data, unsigned int size)
-	:	data(data),
-		size(size) {}
-
-	unsigned char* data;
-	int size;
-};
-
-class PlatformStringVars {
-public:
-	static const int DEVICE_BUILD_MODEL = 0;
-};
-
-class AppPlatform
-{
-public:
-	AppPlatform() : keyboardVisible(false) {}
-    virtual ~AppPlatform() {}
-
-	virtual void saveScreenshot(const std::string& filename, int glWidth, int glHeight) {}
-	virtual TextureData loadTexture(const std::string& filename_, bool textureFolder) { return TextureData(); }
-	virtual TextureData loadTextureFromMemory(const unsigned char* data, size_t size) { return TextureData(); }
-
-    virtual void playSound(const std::string& fn, float volume, float pitch) {}
-	
-	virtual void hideCursor(bool hide) {}
-
-	virtual void showDialog(int dialogId) {}
-    virtual void createUserInput() {}
-	
-	bool is_big_endian(void)  {
-		union {
-			unsigned int i;
-			char c[4];
-		} bint = {0x01020304};
-		return bint.c[0] == 1;
-	} 
-
-	void createUserInput(int dialogId)
-	{
-		showDialog(dialogId);
-		createUserInput();
-	}
-	virtual int getUserInputStatus() { return 0; }
-	virtual StringVector getUserInput() { return StringVector(); }
-
-	virtual std::string getDateString(int s) { return ""; }
-	//virtual void createUserInputScreen(const char* types) {}
-
-	virtual void uploadPlatformDependentData(int id, void* data) {}
-	virtual BinaryBlob readAssetFile(const std::string& filename) { return BinaryBlob(); }
-	virtual void _tick() {}
-
-	virtual int getScreenWidth() { return 854; }
-	virtual int getScreenHeight() { return 480; }
-    virtual float getPixelsPerMillimeter() { return 10; }
-
-	virtual bool isNetworkEnabled(bool onlyWifiAllowed) { return true; }
-
-	virtual bool isPowerVR() {
-		return false;
-	}
-	virtual int getKeyFromKeyCode(int keyCode, int metaState, int deviceId) {return 0;}
-#ifdef __APPLE__
-    virtual bool isSuperFast() = 0;
-#endif
-
-	virtual void openURL(const std::string& url) {}
-
-	virtual void finish() {}
-	
-	virtual bool supportsTouchscreen() { return false; }
-	
-	virtual void vibrate(int milliSeconds) {}
-
-	virtual std::string getPlatformStringVar(int stringId) {
-		return "<getPlatformStringVar NotImplemented>";
-	}
-
-	virtual void showKeyboard() {
-		keyboardVisible = true;
-	}
-	virtual void hideKeyboard() {
-		keyboardVisible = false;
-	}
-	virtual bool isKeyboardVisible() {return keyboardVisible;}
-protected:
-	bool keyboardVisible;
-};
-
-#endif /*APPPLATFORM_H__*/
--- a/src/AppPlatform_glfw.cpp
+++ b/src/AppPlatform_glfw.cpp
@@ -1,12 +0,0 @@
-#include "AppPlatform_glfw.h"
-
-float AppPlatform_glfw::getPixelsPerMillimeter() {
-    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
-
-    int width_mm, height_mm;
-    glfwGetMonitorPhysicalSize(monitor, &width_mm, &height_mm);
-
-    const GLFWvidmode* mode = glfwGetVideoMode(monitor);
-
-    return (float)mode->width / (float)width_mm;
-}
--- a/src/AppPlatform_glfw.h
+++ b/src/AppPlatform_glfw.h
@@ -1,155 +0,0 @@
-#ifndef APPPLATFORM_GLFW_H__
-#define APPPLATFORM_GLFW_H__
-
-#include "AppPlatform.h"
-#include "platform/log.h"
-#include "platform/HttpClient.h"
-#include "platform/PngLoader.h"
-#include "client/renderer/gles.h"
-#include "world/level/storage/FolderMethods.h"
-#include <png.h>
-#include <cmath>
-#include <fstream>
-#include <sstream>
-#include <GLFW/glfw3.h>
-#include <ctime>
-#include "util/StringUtils.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#include <shellapi.h>
-#endif
-
-#ifdef __EMSCRIPTEN__
-	#include <emscripten/html5.h>
-#endif
-
-static void png_funcReadFile(png_structp pngPtr, png_bytep data, png_size_t length) {
-	((std::istream*)png_get_io_ptr(pngPtr))->read((char*)data, length);
-}
-
-class AppPlatform_glfw: public AppPlatform
-{
-public:
-    AppPlatform_glfw()
-    {
-    }
-
-	BinaryBlob readAssetFile(const std::string& filename) override {
-		FILE* fp = fopen(("data/" + filename).c_str(), "r");
-		if (!fp)
-			return BinaryBlob();
-
-		int size = getRemainingFileSize(fp);
-
-		BinaryBlob blob;
-		blob.size = size;
-		blob.data = new unsigned char[size];
-
-		fread(blob.data, 1, size, fp);
-		fclose(fp);
-
-		return blob;
-	}
-
-    void saveScreenshot(const std::string& filename, int glWidth, int glHeight) override {
-        //@todo
-    }
-
-    __inline unsigned int rgbToBgr(unsigned int p) {
-        return (p & 0xff00ff00) | ((p >> 16) & 0xff) | ((p << 16) & 0xff0000);
-    }
-
-    TextureData loadTexture(const std::string& filename_, bool textureFolder) override
-	{
-		// Support fetching PNG textures via HTTP/HTTPS (for skins, etc)
-		if (Util::startsWith(filename_, "http://") || Util::startsWith(filename_, "https://")) {
-			std::vector<unsigned char> body;
-			if (HttpClient::download(filename_, body) && !body.empty()) {
-				return loadTextureFromMemory(body.data(), body.size());
-			}
-			return TextureData();
-		}
-
-		TextureData out;
-
-		std::string filename = textureFolder? "data/images/" + filename_
-								: filename_;
-		std::ifstream source(filename.c_str(), std::ios::binary);
-
-		if (!source) {
-			LOGI("Couldn't find file: %s\n", filename.c_str());
-			return out;
-		}
-
-		std::vector<unsigned char> fileData((std::istreambuf_iterator<char>(source)), std::istreambuf_iterator<char>());
-		source.close();
-
-		if (fileData.empty()) {
-			LOGI("Couldn't read file: %s\n", filename.c_str());
-			return out;
-		}
-
-		return loadTextureFromMemory(fileData.data(), fileData.size());
-    }
-
-	TextureData loadTextureFromMemory(const unsigned char* data, size_t size) override {
-		return loadPngFromMemory(data, size);
-	}
-
-	virtual std::string getDateString(int s) override {
-		time_t tm = s;
-
-		char mbstr[100];
-		std::strftime(mbstr, sizeof(mbstr), "%F %T", std::localtime(&tm));
-
-		return std::string(mbstr);
-	}
-
-	virtual int getScreenWidth() override { 
-		#ifdef __EMSCRIPTEN__
-			int w, h;
-			emscripten_get_canvas_element_size("canvas", &w, &h);
-
-			return w;
-		#endif
-
-		return 854; 
-	};
-
-	virtual int getScreenHeight() override { 
-		#ifdef __EMSCRIPTEN__
-			int w, h;
-			emscripten_get_canvas_element_size("canvas", &w, &h);
-
-			return h;
-		#endif
-
-		return 480; 
-	};
-
-	virtual float getPixelsPerMillimeter() override;
-
-	virtual bool supportsTouchscreen() override { return false; /* glfw supports only mouse and keyboard */ }
-
-	virtual void hideCursor(bool hide) override {
-		int isHide = hide ? GLFW_CURSOR_NORMAL : GLFW_CURSOR_HIDDEN;
-		glfwSetInputMode(window, GLFW_CURSOR, isHide);
-	}
-
-	virtual void openURL(const std::string& url) override {
-#ifdef _WIN32
-		ShellExecuteA(NULL, "open", url.c_str(), NULL, NULL, SW_SHOWNORMAL);
-#elif __linux__
-		std::string command = "xdg-open " + url;
-		system(command.c_str());
-#elif __EMSCRIPTEN__
-		emscripten_run_script(std::string("window.open('" + url + "', '_blank')").c_str());
-#endif
-	}
-
-	GLFWwindow* window;
-
-private:
-};
-#endif /*APPPLATFORM_GLFW_H__*/
--- a/src/EglConfigPrinter.hpp
+++ b/src/EglConfigPrinter.hpp
@@ -1,5 +1,4 @@
-#ifndef EGLCONFIGPRINTER_H__
-#define EGLCONFIGPRINTER_H__
+#pragma once

 #include <cstdio>
 #include <string>
@@ -122,4 +121,3 @@ public:
    }
 };

-#endif /*EGLCONFIGPRINTER_H__*/
--- a/src/ErrorCodes.h
+++ b/src/ErrorCodes.h
@@ -1,13 +0,0 @@
-#ifndef ERRORCODES_H__
-#define ERRORCODES_H__
-
-namespace ErrorCodes {
-
-enum Enum {
-	Unknown,
-	ContainerRefStillExistsAfterDestruction
-};
-
-}
-
-#endif /*ERRORCODES_H__*/
--- a/src/IPlatform.cpp
+++ b/src/IPlatform.cpp
@@ -0,0 +1,14 @@
+#include <IPlatform.hpp>
+#include <App.hpp>
+#include <fstream>
+
+void IPlatform::runMainLoop(App& app) {
+    while(!app.wantToQuit()) app.update();
+}
+
+ByteVector IPlatform::readAssetFile(const std::string& path) {
+    std::ifstream instream(path, std::ios::in | std::ios::binary);
+    std::vector<uint8_t> data((std::istreambuf_iterator<char>(instream)), std::istreambuf_iterator<char>());
+    
+    return data;
+}
--- a/src/IPlatform.hpp
+++ b/src/IPlatform.hpp
@@ -0,0 +1,81 @@
+#pragma once
+#include <vector>
+#include <string>
+#include "client/renderer/TextureData.hpp"
+#include <cstdint>
+
+typedef std::vector<std::string> StringVector;
+typedef std::vector<uint8_t> ByteVector; 
+
+class App;
+
+class IPlatform {
+public:
+	IPlatform() : keyboardVisible(false), windowSizeChanged(false), m_targetFrametime(0.f) {}
+    virtual ~IPlatform() {}
+
+	virtual bool init() { return true; }
+	virtual void swapBuffers() {}
+
+	virtual void runMainLoop(App& app);
+
+	virtual ByteVector readAssetFile(const std::string& path);
+
+
+	// Mojang functions here
+	virtual TextureData loadTexture(const std::string& filename_, bool textureFolder) { return TextureData(); }
+	virtual TextureData loadTextureFromMemory(const unsigned char* data, size_t size) { return TextureData(); }
+
+    virtual void playSound(const std::string& fn, float volume, float pitch) {}
+	
+	virtual void hideCursor(bool hide) {}
+
+	virtual std::string getDateString(int s) = 0;
+
+	virtual void uploadPlatformDependentData(int id, void* data) {}
+	// virtual BinaryBlob readAssetFile(const std::string& filename) { return BinaryBlob(); }
+	virtual void _tick() {}
+
+	virtual int getScreenWidth() { return 854; }
+	virtual int getScreenHeight() { return 480; }
+    virtual float getPixelsPerMillimeter() { return 10; }
+
+	virtual bool isNetworkEnabled(bool onlyWifiAllowed) { return true; }
+
+	virtual bool isPowerVR() {
+		return false;
+	}
+	virtual int getKeyFromKeyCode(int keyCode, int metaState, int deviceId) {return 0;}
+#ifdef __APPLE__
+    virtual bool isSuperFast() = 0;
+#endif
+
+	virtual void openURL(const std::string& url) {}
+
+	virtual void finish() {}
+	
+	virtual bool supportsTouchscreen() { return false; }
+	
+	virtual void vibrate(int milliSeconds) {}
+
+	virtual std::string getPlatformStringVar(int stringId) = 0;
+
+	virtual void showKeyboard() { keyboardVisible = true; }
+
+	virtual void hideKeyboard() { keyboardVisible = false; }
+
+	virtual bool isKeyboardVisible() { return keyboardVisible; }
+
+	virtual void setTargetFPS(int fps) { m_targetFrametime = 1.0 / fps; }
+
+	bool isWindowSizeChanged() { return windowSizeChanged; }
+
+	virtual void setVSync(bool on) { vsync = on; }
+
+protected:
+	bool keyboardVisible;
+	bool windowSizeChanged;
+	bool vsync;
+
+	double m_targetFrametime;
+};
--- a/src/LicenseCodes.hpp
+++ b/src/LicenseCodes.hpp
@@ -1,5 +1,4 @@
-#ifndef LICENSECODES_H__
-#define LICENSECODES_H__
+#pragma once

 class LicenseCodes
 {
--- a/src/Minecraft.cpp
+++ b/src/Minecraft.cpp
@@ -0,0 +1,502 @@
+#include <Minecraft.hpp>
+#include "gamemode/CreativeMode.hpp"
+#include "gamemode/SurvivalMode.hpp"
+#include "gamemode/CreatorMode.hpp"
+#include "world/entity/player/Player.hpp"
+#include "world/item/Item.hpp"
+#include "world/item/ItemInstance.hpp"
+#include "world/item/crafting/Recipes.hpp"
+#include "world/level/Level.hpp"
+#include "world/level/tile/entity/TileEntity.hpp"
+#include <string>
+#include <cstdlib>
+#include "client/gui/Screen.hpp"
+#include "world/level/storage/ExternalFileLevelStorageSource.hpp"
+
+#if defined(APPLE_DEMO_PROMOTION)
+    #define NO_NETWORK
+#endif
+
+#if defined(RPI)
+	#define CREATORMODE
+#endif
+#include "network/RakNetInstance.hpp"
+#include "network/ClientSideNetworkHandler.hpp"
+#include "network/ServerSideNetworkHandler.hpp"
+//#include "network/Packet.hpp"
+#include "world/entity/player/Inventory.hpp"
+#include "world/level/tile/Tile.hpp"
+#include "world/level/storage/LevelStorageSource.hpp"
+#include "world/level/storage/LevelStorage.hpp"
+#include "world/level/chunk/ChunkSource.hpp"
+
+#include "platform/CThread.hpp"
+#include <IPlatform.hpp>
+#include "util/PerfTimer.hpp"
+#include "util/PerfRenderer.hpp"
+
+#include "world/entity/MobFactory.hpp"
+#include "world/level/MobSpawner.hpp"
+#include "util/Mth.hpp"
+#include "world/entity/MobCategory.hpp"
+#include "server/ServerLevel.hpp"
+
+#ifdef CREATORMODE
+#include "server/CreatorLevel.hpp"
+#endif
+
+#include "network/command/CommandServer.hpp"
+
+/*static*/
+const char* Minecraft::progressMessages[] = {
+	"Locating server",
+	"Building terrain",
+	"Preparing",
+	"Saving chunks"
+};
+
+// int Minecraft::customDebugId = Minecraft::CDI_NONE;
+bool Minecraft::_hasInitedStatics = false;
+
+#if defined(_MSC_VER)
+	#pragma warning( disable : 4355 ) // 'this' pointer in initialization list which is perfectly legal
+#endif
+
+// Minecraft::Minecraft() :
+// #ifdef __APPLE__
+//     _isSuperFast(false),
+// #endif
+
+
+// #if defined(NO_NETWORK)
+//     raknetInstance = new IRakNetInstance();
+// #else
+// 	raknetInstance = new RakNetInstance();
+// #endif
+// #ifndef STANDALONE_SERVER
+// 	soundEngine = new SoundEngine(20.0f);
+// 	soundEngine->init(this, &options);
+// #endif
+// 	//setupPieces();
+
+// 	#if defined(ANDROID) || defined(__APPLE__) || defined(RPI)
+//         signal(SIGPIPE, SIG_IGN);
+//     #endif
+
+// 	externalCacheStoragePath = '.';
+// 	externalCacheStoragePath = '.';
+// }
+
+Minecraft::~Minecraft() {
+	delete netCallback;
+	delete raknetInstance;
+	delete gameMode;
+
+	if (level != NULL) {
+		level->saveGame();
+		if (level->getChunkSource())
+			level->getChunkSource()->saveAll(true);
+		delete level->getLevelStorage();
+		delete level;
+		level = NULL;
+	}
+
+	//delete player;
+	delete storageSource;
+	delete _commandServer;
+
+	MobFactory::clearStaticTestMobs();
+
+	// Note: Don't tear down statics if we run on Android
+	// (we might change this in the future)
+#ifndef ANDROID
+	Biome::teardownBiomes();
+	Item ::teardownItems();
+	Tile ::teardownTiles();
+	Material::teardownMaterials();
+	Recipes ::teardownRecipes();
+	TileEntity::teardownTileEntities();
+#endif
+}
+
+// Only called by server
+void Minecraft::selectLevel( const std::string& levelId, const std::string& levelName, const LevelSettings& settings ) {
+	level = (Level*)new ServerLevel(
+		storageSource->selectLevel(levelId, false),
+		levelName,
+		settings,
+		SharedConstants::GeneratorVersion
+	);
+
+	// note: settings is useless beyond this point, since it's
+	//       either copied to LevelData (or LevelData read from file)
+	setLevel(level, "Generating level");
+	setIsCreativeMode(level->getLevelData()->getGameType() == GameType::Creative);
+	_running = true;
+}
+
+void Minecraft::setLevel(Level* level, const std::string& message, Player* forceInsertPlayer) {
+	LOGI("Seed is %ld\n", level->getSeed());
+	
+	if (level != NULL) {
+		level->raknetInstance = raknetInstance;
+        gameMode->initLevel(level);
+
+		this->level = level;
+		_hasSignaledGeneratingLevelFinished = false;
+#ifdef STANDALONE_SERVER
+		const bool threadedLevelCreation = false;
+#else
+		const bool threadedLevelCreation = true;
+#endif
+
+		if (threadedLevelCreation) {
+			// Threaded
+			// "Lock"
+			isGeneratingLevel = true;
+			generateLevelThread = new CThread(Minecraft::prepareLevel_tspawn, this);
+		} else {
+			// Non-threaded
+			generateLevel("Currently not used", level);
+		}
+    }
+
+    this->lastTickTime = 0;
+	this->_running = true;
+}
+
+void Minecraft::prepareLevel(const std::string& title) {
+	LOGI("status: 1\n");
+	progressStageStatusId = 1;
+
+	Stopwatch A, B, C, D;
+	A.start();
+
+	Stopwatch L;
+
+	// Dont update lights if we load the level (ok, actually just with leveldata version=1.+(?))
+	if (!level->isNew())
+		level->setUpdateLights(false);
+
+	int Max = CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
+	int pp = 0;
+	for (int x = 8; x < (CHUNK_CACHE_WIDTH * CHUNK_WIDTH); x += CHUNK_WIDTH) {
+        for (int z = 8; z < (CHUNK_CACHE_WIDTH * CHUNK_WIDTH); z += CHUNK_WIDTH) {
+            progressStagePercentage = 100 * pp++ / Max;
+            //printf("level generation progress %d\n", progressStagePercentage);
+			B.start();
+            level->getTile(x, 64, z);
+			B.stop();
+			L.start();
+			if (level->isNew())
+				while (level->updateLights())
+					;
+			L.stop();
+        }
+    }
+	A.stop();
+	level->setUpdateLights(true);
+
+	C.start();
+	for (int x = 0; x < CHUNK_CACHE_WIDTH; x++)
+	{
+		for (int z = 0; z < CHUNK_CACHE_WIDTH; z++)
+		{
+			LevelChunk* chunk = level->getChunk(x, z);
+			if (chunk && !chunk->createdFromSave)
+			{
+				chunk->unsaved = false;
+				chunk->clearUpdateMap();
+			}
+		}
+	}
+	C.stop();
+
+	LOGI("status: 3\n");
+	progressStageStatusId = 3;
+	if (level->isNew()) {
+		level->setInitialSpawn(); // @note: should obviously be called from Level itself
+		level->saveLevelData();
+		level->getChunkSource()->saveAll(false);
+		level->saveGame();
+	} else {
+		level->saveLevelData();
+		level->loadEntities();
+	}
+
+	progressStagePercentage = -1;
+	progressStageStatusId = 2;
+	LOGI("status: 2\n");
+
+	D.start();
+	level->prepare();
+	D.stop();
+
+	A.print("Generate level: ");
+	L.print(" - light: ");
+	B.print(" - getTl: ");
+	C.print(" - clear: ");
+	D.print(" - prepr: ");
+	progressStageStatusId = 0;
+}
+
+void Minecraft::update() {
+
+	timer.advanceTime();
+	raknetInstance->runEvents(netCallback);
+
+	TIMER_PUSH("tick");
+	int toTick = timer.ticks;
+	timer.ticks = 0;
+	for (int i = 0; i < toTick; ++i, ++ticks) tick(i, toTick-1);
+
+	TIMER_POP_PUSH("updatelights");
+	{
+		if (level && !isGeneratingLevel) {
+			level->updateLights();
+		}
+	}
+	TIMER_POP();
+
+
+    // Restart the server if (our modded) RakNet reports an error
+    if (level && raknetInstance->isProbablyBroken() && raknetInstance->isServer()) {
+        restartServer();
+    }
+}
+
+void Minecraft::restartServer() {
+    if (!level) return;
+
+	raknetInstance->resetIsBroken();
+
+    hostMultiplayer();
+    if (netCallback) netCallback->levelGenerated(level);
+}
+
+void Minecraft::tick(int nTick, int maxTick) {
+	if (missTime > 0) missTime--;
+
+	TIMER_PUSH("gameMode");
+	if (level) {
+		gameMode->tick();
+	}
+
+	TIMER_POP_PUSH("commandServer");
+	if (level && _commandServer) {
+		_commandServer->tick();
+	}
+	
+	//
+	// Ongoing level generation in a (perhaps) different thread. When it's
+	// ready, _levelGenerated() is called once and any threads are deleted.
+	//
+	if (isGeneratingLevel) {
+		return;
+	} else if (!_hasSignaledGeneratingLevelFinished) {
+		if (generateLevelThread) {
+			delete generateLevelThread;
+			generateLevelThread = NULL;
+		}
+		_levelGenerated();
+	}
+
+	//
+	// Normal game loop, run before or efter level generation
+	//
+	if (level != NULL) {
+		TIMER_POP_PUSH("level");
+		level->tickEntities();
+		level->tick();
+	}
+
+	TIMER_POP();
+}
+
+bool Minecraft::isOnlineClient() {
+    return false;
+}
+
+bool Minecraft::isOnline() {
+	return netCallback != NULL;
+}
+
+void Minecraft::init()
+{
+	// WHY DO WE NEED THIS ON MODERN PLATFORMS :sob:
+	// Global initialization goes here
+	Mth::initMth();
+
+	if (raknetInstance != nullptr) {
+		delete raknetInstance;
+	}
+
+	raknetInstance = new RakNetInstance();
+
+	// If we're running Android, only initialize
+	// the first time class is instanced
+#ifdef ANDROID
+	if (!_hasInitedStatics) {
+		_hasInitedStatics = true;
+#endif
+		Material::initMaterials();
+		MobCategory::initMobCategories();
+		Tile::initTiles();
+		Item::initItems();
+		Biome::initBiomes();
+		TileEntity::initTileEntities();
+
+#ifdef ANDROID
+	}
+#endif
+
+	setIsCreativeMode(false); // false means it's Survival Mode
+
+#if !defined(NO_STORAGE)
+	storageSource = new ExternalFileLevelStorageSource(externalStoragePath, externalCacheStoragePath);
+#else
+	storageSource = new MemoryLevelStorageSource();
+#endif
+
+	// Server-only featire @todo server class app
+	hostMultiplayer();
+}
+
+
+//
+// Multiplayer
+//
+
+void Minecraft::hostMultiplayer(int port) {
+    // Tear down last instance
+    raknetInstance->disconnect();
+    delete netCallback;
+    netCallback = nullptr;
+
+#if !defined(NO_NETWORK)
+	netCallback = new ServerSideNetworkHandler(this, raknetInstance);
+#endif
+}
+
+//
+// Level generation
+//
+/*static*/
+
+void* Minecraft::prepareLevel_tspawn(void *p_param) {
+	Minecraft* mc = (Minecraft*) p_param;
+	mc->generateLevel("Currently not used", mc->level);
+	return 0;
+}
+
+void Minecraft::generateLevel( const std::string& message, Level* level ) {
+	Stopwatch s;
+	s.start();
+	prepareLevel(message);
+	s.stop();
+	s.print("Level generated: ");
+
+	// "Unlock"
+	isGeneratingLevel = false;
+}
+
+void Minecraft::_levelGenerated() {
+	level->validateSpawn();
+
+	if (raknetInstance->isServer())
+		raknetInstance->announceServer(getServerName());
+
+	if (netCallback) {
+		netCallback->levelGenerated(level);
+	}
+
+	_hasSignaledGeneratingLevelFinished = true;
+}
+
+Player* Minecraft::respawnPlayer(int playerId) {
+	for (unsigned int i = 0; i < level->players.size(); ++i) {
+		if (level->players[i]->entityId == playerId) {
+			resetPlayer(level->players[i]);
+			return level->players[i];
+		}
+	}
+	return NULL;
+}
+
+void Minecraft::resetPlayer(Player* player) {
+	level->validateSpawn();
+	player->reset();
+
+	Pos p;
+	if(player->hasRespawnPosition()) {
+		p = player->getRespawnPosition();
+	}
+	else {
+		p = level->getSharedSpawnPos();
+	}
+	player->setPos((float)p.x + 0.5f, (float)p.y + 1.0f, (float)p.z + 0.5f);
+	player->resetPos(true);
+
+	if (isCreativeMode())
+		player->inventory->clearInventoryWithDefault();
+}
+
+int Minecraft::getProgressStatusId() {
+	return progressStageStatusId;
+}
+
+const char* Minecraft::getProgressMessage()
+{
+	return progressMessages[progressStageStatusId];
+}
+
+bool Minecraft::isLevelGenerated()
+{
+	return level != NULL && !isGeneratingLevel;
+}
+
+LevelStorageSource* Minecraft::getLevelSource()
+{
+	return storageSource;
+}
+
+void Minecraft::setIsCreativeMode(bool isCreative)
+{
+#ifdef CREATORMODE
+	delete gameMode;
+	gameMode = new CreatorMode(this);
+	_isCreativeMode = true;
+#else
+	if (!gameMode || isCreative != _isCreativeMode)
+	{
+		delete gameMode;
+		if (isCreative) gameMode = new CreativeMode(*this);
+		else			gameMode = new SurvivalMode(*this);
+		_isCreativeMode = isCreative;
+	}
+#endif
+}
+
+bool Minecraft::isCreativeMode() {
+	return _isCreativeMode;
+}
+
+ICreator* Minecraft::getCreator()
+{
+#ifdef CREATORMODE
+	return ((CreatorMode*)gameMode)->getCreator();
+#else
+	return NULL;
+#endif
+}
+
+void Minecraft::optionUpdated(OptionId option, bool value ) {
+	if(netCallback != NULL && option == OPTIONS_SERVER_VISIBLE) {
+		ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) netCallback;
+		ss->allowIncomingConnections(value);
+	}
+}
+
+void Minecraft::optionUpdated(OptionId option, float value ) {}
+
+void Minecraft::optionUpdated(OptionId option, int value ) {}
--- a/src/Minecraft.hpp
+++ b/src/Minecraft.hpp
@@ -0,0 +1,138 @@
+#pragma once
+
+#include "client/Options.hpp"
+#include "client/Timer.hpp"
+
+//#include "../network/RakNetInstance.hpp"
+#include "world/phys/HitResult.hpp"
+
+#include "App.hpp"
+#include <cstddef>
+
+class Level;
+class LocalPlayer;
+class IInputHolder;
+class Mob;
+class Player;
+class Entity;
+class ICreator;
+class GameMode;
+class CThread;
+class LevelStorageSource;
+class BuildActionIntention;
+class PerfRenderer;
+class LevelSettings;
+class IRakNetInstance;
+class NetEventCallback;
+class CommandServer;
+struct PingedCompatibleServer;
+
+class Minecraft: public App {
+public:
+	using App::App;
+	virtual ~Minecraft();
+
+	virtual void init();
+	virtual void update();
+	virtual void restartServer();
+	virtual void tick(int nTick, int maxTick);
+
+	virtual bool isOnlineClient();
+	virtual bool isOnline();
+
+	virtual void setIsCreativeMode(bool isCreative);
+
+	virtual void optionUpdated(OptionId option, bool value);
+	virtual void optionUpdated(OptionId option, float value);
+	virtual void optionUpdated(OptionId option, int value);
+
+	/**
+	 * @brief Get public name that will be listed in JoinGame menu
+	 */
+	virtual std::string getServerName() { return "Unknown"; }
+
+	void toggleDimension() {}
+	bool isCreativeMode();
+
+	virtual void selectLevel(const std::string& levelId, const std::string& levelName, const LevelSettings& settings);
+	virtual void setLevel(Level* level, const std::string& message = "", Player* forceInsertPlayer = NULL);
+
+	virtual void onBlockDestroyed(Player* player, int x, int y, int z, int face) {}
+
+	void generateLevel( const std::string& message, Level* level );
+	LevelStorageSource* getLevelSource();
+
+	virtual void hostMultiplayer(int port=19132);
+	Player* respawnPlayer(int playerId);
+	void respawnPlayer();
+	void resetPlayer(Player* player);
+	void doActuallyRespawnPlayer();
+
+	void prepareLevel(const std::string& message);
+
+	int getProgressStatusId();
+	const char* getProgressMessage();
+
+	ICreator* getCreator();
+
+	bool isLevelGenerated();
+
+#ifdef __APPLE__
+    bool _isSuperFast = false;
+    bool isSuperFast() { return _isSuperFast; }
+#endif
+
+protected:
+	virtual void _levelGenerated();
+
+private:
+	static void* prepareLevel_tspawn(void *p_param);
+public:
+	Level* level = nullptr;
+	CommandServer* _commandServer = nullptr;
+	GameMode* gameMode = nullptr;
+	IRakNetInstance*  raknetInstance = nullptr;
+	NetEventCallback* netCallback = nullptr;
+
+	int commandPort = 4711;
+
+	int lastTime = 0;
+	int lastTickTime = -1;
+	int missTime = 0;
+	int ticks = 0;
+
+	CThread* generateLevelThread = nullptr;
+	// static int customDebugId;
+
+	HitResult hitResult;
+	volatile int progressStagePercentage = 0;
+
+	// This field is initialized in main()
+	// It sets the base path to where worlds can be written (sdcard on android)
+	std::string externalStoragePath;
+	std::string externalCacheStoragePath;
+protected:
+	Timer timer{20};
+    // @note @attn @warn: this is dangerous as fuck!
+	volatile bool isGeneratingLevel = false;
+	bool _hasSignaledGeneratingLevelFinished = true;
+
+	LevelStorageSource* storageSource;
+	bool _running;
+
+protected:
+	volatile int progressStageStatusId = 0;
+	static const char* progressMessages[];
+
+	int _licenseId;
+
+	bool _isCreativeMode;
+	Player* _pendingRemovePlayer; // @attn @todo @fix: remove this shait and fix the respawn behaviour
+
+	// from NinecraftApp
+	bool _verbose = true;
+	int _lastTickMs = 0;
+
+	static bool _hasInitedStatics;
+};
+
--- a/src/client/Minecraft.cpp
+++ b/src/client/Minecraft.cpp
--- a/src/MinecraftClient.hpp
+++ b/src/MinecraftClient.hpp
@@ -0,0 +1,142 @@
+#pragma once
+#include "client/gui/Font.hpp"
+#include "client/gui/Screen.hpp"
+#include "client/particle/ParticleEngine.hpp"
+#include "client/player/LocalPlayer.hpp"
+#include "client/renderer/GameRenderer.hpp"
+#include "client/renderer/Textures.hpp"
+#include "client/sound/SoundEngine.hpp"
+#include <Minecraft.hpp>
+
+#include <client/MouseHandler.hpp>
+#include <client/gui/Gui.hpp>
+#include <client/gui/screens/ScreenChooser.hpp>
+#include <client/PixelCalc.hpp>
+#include <client/renderer/LevelRenderer.hpp>
+
+class MinecraftClient : public Minecraft {
+public:
+    using Minecraft::Minecraft;
+    ~MinecraftClient();
+
+    void init() override;
+
+    void update() override;
+
+    void setSize(int width, int height);
+    void reloadOptions();
+    
+    bool supportNonTouchScreen();
+	bool useTouchscreen();
+	void grabMouse();
+	void releaseMouse();
+
+    void setScreen(Screen*);
+    void leaveGame(bool renameLevel = false);
+
+	void setLevel(Level* level, const std::string& message = "", Player* forceInsertPlayer = NULL) override;
+
+    void updateStats();
+
+    void restartServer() override;
+
+    bool handleBack(bool isDown) override;
+
+    void onGraphicsReset();
+    void initGLStates();
+
+    void tick(int nTick, int maxTick) override;
+    void tickInput();
+
+    void handleBuildAction(BuildActionIntention* action);
+
+    bool isOnlineClient() override;
+
+    void pauseGame(bool isBackPaused);
+    void gameLostFocus();
+
+    void respawnPlayer();
+
+    void audioEngineOn() override;
+    void audioEngineOff() override;
+
+    void setIsCreativeMode(bool isCreative) override;
+
+    void optionUpdated(OptionId option, bool value) override;
+	void optionUpdated(OptionId option, float value) override;
+	void optionUpdated(OptionId option, int value) override;
+
+    LocalPlayer* getPlayer() { return player; }
+    Font* getFont() { return font; }
+    Textures& textures() { return m_textures; }
+    Options& options() { return m_options;}
+    Screen* getScreen() { return m_screen; }
+    Gui& gui() { return m_gui; }
+    ParticleEngine* getParticleEngine() {return particleEngine; }
+
+    int getScreenWidth() { return width; }
+    int getScreenHeigth() { return height; }
+
+    virtual void hostMultiplayer(int port) override;
+
+    bool isPowerVR() { return _powerVr; }
+	bool isKindleFire(int kindleVersion);
+	bool transformResolution(int* w, int* h);
+
+    virtual std::string getServerName() override;
+
+    void locateMultiplayer();
+	void cancelLocateMultiplayer();
+	bool joinMultiplayer(const PingedCompatibleServer& server);
+	bool joinMultiplayerFromString(const std::string& server);
+
+    void onBlockDestroyed(Player* player, int x, int y, int z, int face) override;
+
+protected:
+    void _reloadInput();
+    void _levelGenerated() override;
+
+    int width = 1, height = 1;
+
+	Font* font = nullptr;
+    // @warn This is unsafe cuz Gui may call some MinecraftClient method while MinecraftClient is not ready 
+    MouseHandler mouseHandler;
+
+    LevelRenderer*  levelRenderer = nullptr;
+	GameRenderer*   gameRenderer = nullptr;
+	ParticleEngine* particleEngine = nullptr;
+	SoundEngine*    soundEngine = nullptr;
+    PerfRenderer* _perfRenderer = nullptr;
+
+	bool mouseGrabbed = false;
+
+    PixelCalc pixelCalc;
+    PixelCalc pixelCalcUi;
+
+    Screen* m_screen = nullptr;
+
+    bool screenMutex = false;
+	bool hasScheduledScreen = false;
+	Screen* scheduledScreen = nullptr;
+
+    int m_frames = 0;
+
+    volatile bool pause = false;
+
+    // @todo make static
+    LocalPlayer*	player = nullptr;
+	IInputHolder*	inputHolder = nullptr;
+	Mob*			cameraTargetPlayer = nullptr;
+
+    bool _supportsNonTouchscreen = false;
+    bool isLookingForMultiplayer = false;
+    bool _powerVr = false;
+
+    Options m_options{*this};
+
+    Textures m_textures{m_options, *m_platform};
+
+    ScreenChooser screenChooser{*this};
+
+    Gui m_gui{*this};
+};
--- a/src/MinecraftServer.cpp
+++ b/src/MinecraftServer.cpp
@@ -0,0 +1,15 @@
+#include "MinecraftServer.hpp"
+#include <Minecraft.hpp>
+#include <network/RakNetInstance.hpp>
+
+
+void MinecraftServer::hostMultiplayer(int port) {
+    Minecraft::hostMultiplayer(port);
+
+    raknetInstance->host("Server", port, 16);
+}
+
+std::string MinecraftServer::getServerName() {
+	// @todo read server name from config
+    return "Dedicated server 0.6.1";
+}
--- a/src/MinecraftServer.hpp
+++ b/src/MinecraftServer.hpp
@@ -0,0 +1,10 @@
+#pragma once
+#include <Minecraft.hpp>
+
+class MinecraftServer : public Minecraft { 
+public:
+    using Minecraft::Minecraft;
+
+    void hostMultiplayer(int port) override;
+    std::string getServerName() override;
+};
--- a/src/NinecraftApp.cpp
+++ b/src/NinecraftApp.cpp
@@ -1,428 +0,0 @@
-#include "NinecraftApp.h"
-//#include <EGL/egl.h>
-
-#ifdef RPI
-//#define NO_STORAGE
-#endif
-
-#include <errno.h>
-
-#include "platform/input/Mouse.h"
-#include "platform/input/Multitouch.h"
-
-#include "world/item/Item.h"
-#include "world/level/Level.h"
-#include "world/level/biome/Biome.h"
-#include "world/level/material/Material.h"
-#include "world/entity/MobCategory.h"
-//#include "world/level/storage/FolderMethods.h"
-#ifndef STANDALONE_SERVER
-#include "client/gui/screens/StartMenuScreen.h"
-#include "client/gui/screens/UsernameScreen.h"
-#endif
-#include "client/player/LocalPlayer.h"
-#ifndef STANDALONE_SERVER
-#include "client/renderer/gles.h"
-#include "client/renderer/Chunk.h"
-#include "client/renderer/LevelRenderer.h"
-#include "client/renderer/Tesselator.h"
-#endif
-// sorry for raknet dependency, but I'm too lazy to find another getTime method
-#include "raknet/GetTime.h"
-#include "network/RakNetInstance.h"
-#include "network/ClientSideNetworkHandler.h"
-#include "client/gui/screens/ProgressScreen.h"
-
-//#include "world/entity/player/Inventory2.h"
-
-#if !defined(DEMO_MODE) && !defined(APPLE_DEMO_PROMOTION) && !defined(NO_STORAGE)
-	#include "world/level/storage/ExternalFileLevelStorageSource.h"
-#else
-	#include "world/level/storage/MemoryLevelStorageSource.h"
-#endif
-#ifndef STANDALONE_SERVER
-#include "client/renderer/Textures.h"
-#include "client/renderer/entity/ItemRenderer.h"
-#endif
-#include "world/item/crafting/Recipes.h"
-#include "world/level/tile/entity/TileEntity.h"
-#ifndef STANDALONE_SERVER
-#include "client/renderer/EntityTileRenderer.h"
-#endif
-
-bool NinecraftApp::_hasInitedStatics = false;
-
-NinecraftApp::NinecraftApp()
-:   _verbose(true),
-	_lastTickMs(0),
-	_frames(0)
-{
-    #if defined(ANDROID) || defined(__APPLE__) || defined(RPI)
-        signal(SIGPIPE, SIG_IGN);
-    #endif
-}
-
-NinecraftApp::~NinecraftApp()
-{
-	teardown();
-}
-
-void NinecraftApp::init()
-{
-	// Global initialization goes here
-	Mth::initMth();
-
-	//#ifdef DEMO_MODE
-	//writeDemoFile();
-	//#endif
-
-	// If we're running Android, only initialize
-	// the first time class is instanced
-	#ifdef ANDROID
-	if (!_hasInitedStatics) {
-		_hasInitedStatics = true;
-	#endif
-		Material::initMaterials();
-		MobCategory::initMobCategories();
-		Tile::initTiles();
-		Item::initItems();
-		Biome::initBiomes();
-		TileEntity::initTileEntities();
-
-	#ifdef ANDROID
-	}
-	#endif
-
-#ifndef STANDALONE_SERVER
-	initGLStates();
-	Tesselator::instance.init();
-	I18n::loadLanguage(platform(), "en_US");
-#endif
-
-	if (!externalStoragePath.empty()) {
-		options.setOptionsFilePath(externalStoragePath);
-	}
-	Minecraft::init();
-
-#if !defined(DEMO_MODE) && !defined(APPLE_DEMO_PROMOTION) && !defined(NO_STORAGE)
-	storageSource = new ExternalFileLevelStorageSource(externalStoragePath, externalCacheStoragePath);
-#else
-	storageSource = new MemoryLevelStorageSource();
-#endif
-	_running = false;
-
-#ifndef STANDALONE_SERVER
-	LOGI("This: %p\n", this);
-	screenChooser.setScreen(SCREEN_STARTMENU);
-
-	if (options.getBooleanValue(OPTIONS_FIRST_LAUNCH)) {
-		options.toggle(OPTIONS_FIRST_LAUNCH);
-		setScreen(new UsernameScreen());
-	}
-#else
-	hostMultiplayer();
-#endif
-}
-
-void NinecraftApp::teardown()
-{
-	// Note: Don't tear down statics if we run on Android
-	// (we might change this in the future)
-#ifndef ANDROID
-	Biome::teardownBiomes();
-	Item ::teardownItems();
-	Tile ::teardownTiles();
-	Material::teardownMaterials();
-	Recipes ::teardownRecipes();
-	TileEntity::teardownTileEntities();
-#endif
-#ifdef WIN32
-	ItemRenderer::teardown_static();
-	if (EntityTileRenderer::instance != NULL) {
-		delete EntityTileRenderer::instance;
-		EntityTileRenderer::instance = NULL;
-	}
-	TileEntityRenderDispatcher::destroy();
-#endif
-}
-
-void NinecraftApp::update()
-{
-	++_frames;
-
-	// Generate Multitouch active pointer list
-	Multitouch::commit();
-
-#ifndef ANDROID_PUBLISH
-	//testCreationAndDestruction();
-	//testJoiningAndDestruction();
-#endif /*ANDROID_PUBLISH*/
-
-	Minecraft::update();
-
-	swapBuffers();
-	Mouse::reset2();
-
-    // Restart the server if (our modded) RakNet reports an error
-    if (level && raknetInstance->isProbablyBroken() && raknetInstance->isServer()) {
-        restartServer();
-    }
-
-#ifndef WIN32
-	updateStats();
-#endif
-}
-
-void NinecraftApp::updateStats()
-{
-#ifndef STANDALONE_SERVER
-	if (Options::debugGl)
-		LOGI("--------------------------------------------\n");
-
-	//*
-	int now = getTimeMs();
-	//int since = now - _lastTickMs;
-
-	if (now >= lastTime + 1000)
-	{
-		if (player) {
-			LOGI("%d fps   \t%3d chunk updates.   (%.2f, %.2f, %.2f)\n",
-				_frames, Chunk::updates, player->x, player->y, player->z);
-			Chunk::resetUpdates();
-
-			//static int _n = 0;
-			//if (++_n % 5 == -1) { // @note: -1
-			//	static char filename[256];
-			//	sprintf(filename, "%s/games/com.mojang/img_%.4d.jpg", externalStoragePath.c_str(), _n/5);
-			//	_context.platform->saveScreenshot(filename, width, height);
-			//}
-
-			LOGI("%s", levelRenderer->gatherStats1().c_str());
-			//printf("Texture swaps (this frame): %d\n", Textures::textureChanges);
-		} else {
-			LOGI("%d fps\n", _frames);
-		}
-
-		//const int* pointerIds;
-		//int pointerCount = Multitouch::getActivePointerIds(&pointerIds);
-		//if (pointerCount) {
-		//	std::string s = "Pointers (";
-		//	s += (char)(48 + pointerCount);
-		//	s += ": ";
-		//	for (int i = 0; i < pointerCount; ++i) {
-		//		s += (char)(48 + pointerIds[i]);
-		//		s += ", ";
-		//	}
-		//	LOGI("%s\n", s.c_str());
-		//}
-
-		lastTime = now;
-		_frames = 0;
-#ifdef GLDEBUG
-		while (1) {
-			int error = glGetError();
-			if (error == GL_NO_ERROR) break;
-
-			LOGI("#################### GL-ERROR: %d\t#####################\n", error);
-			LOGI("#################### GL-ERROR: %d\t#####################\n", error);
-			LOGI("#################### GL-ERROR: %d\t#####################\n", error);
-		}
-#endif
-	}
-	Textures::textureChanges = 0;
-	/**/
-#endif /* STANDALONE_SERVER */
-}
-
-void NinecraftApp::initGLStates()
-{
-#ifndef STANDALONE_SERVER
-	//glShadeModel2(GL_SMOOTH);
-	//glClearDepthf(1.0f);
-	glEnable2(GL_DEPTH_TEST);
-	glDepthFunc(GL_LEQUAL);
-	glDepthRangef(0, 1);
-	glEnable2(GL_ALPHA_TEST);
-	glAlphaFunc(GL_GREATER, 0.1f);
-	glEnable(GL_CULL_FACE);
-	glCullFace(GL_BACK);
-
-	glEnable2(GL_TEXTURE_2D);
-#ifndef _EMSCRIPTEN_
-	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-#endif
-	// Both updates isPowerVR flag in java and returns if the graphics chip is PowerVR SGX or not
-	_powerVr = platform()->isPowerVR();
-#ifdef __APPLE__
-    _isSuperFast = platform()->isSuperFast();
-#endif
-	//glLineWidth(4);
-#endif /* STANDALONE_SERVER */
-}
-
-void NinecraftApp::restartServer() {
-    if (!level) return;
-
-    for (int i = level->players.size()-1; i >= 0; --i) {
-        Player* p = level->players[i];
-        if (p != player)
-            level->removeEntity(p);
-    }
-
-	raknetInstance->resetIsBroken();
-#ifndef STANDALONE_SERVER
-    gui.addMessage("This server has restarted!");
-#endif
-    hostMultiplayer();
-    if (netCallback) netCallback->levelGenerated(level);
-}
-
-bool NinecraftApp::handleBack(bool isDown)
-{
-	if (isGeneratingLevel)
-	{
-		return true;
-	}
-	if (level)
-	{
-		if (!isDown)
-		{
-			if (screen)
-			{
-				if (!screen->handleBackEvent(isDown))
-				{
-					if (player->containerMenu) player->closeContainer();
-					setScreen(NULL);
-				}
-				return true;
-			} else {
-				pauseGame(true);
-			}
-			//leaveGame();
-			return false;
-		}
-		return true;
-	}
-	else if (screen)
-	{
-		return screen->handleBackEvent(isDown);
-	}
-	return false;
-}
-
-void NinecraftApp::onGraphicsReset()
-{
-#ifndef STANDALONE_SERVER
-	initGLStates();
-	Tesselator::instance.init();
-
-	Minecraft::onGraphicsReset();
-#endif
-}
-
-#ifndef ANDROID_PUBLISH
-
-static int _state = -1;
-static int _stateTicksLeft = 0;
-void NinecraftApp::testCreationAndDestruction()
-{
-	if (_state == -1) {
-		_stateTicksLeft = 100;
-		_state = 0;
-	}
-	if (_state == 0) {
-		if (--_stateTicksLeft <= 0)
-			_state = 1;
-	}
-	else if (_state == 1) {
-		getLevelSource()->deleteLevel("perf");
-		int seed = getEpochTimeS();
-		LOGI(">seed %d\n", seed);
-		selectLevel("perf", "perf", LevelSettings(seed, GameType::Creative));
-		hostMultiplayer();
-#ifndef STANDALONE_SERVER
-		setScreen(new ProgressScreen());
-#endif
-		_state = 2;
-		_stateTicksLeft = 1000;//25000;//00;
-	}
-	else if (_state == 2) {
-		if (isLevelGenerated()) {
-			if (--_stateTicksLeft <= 0) {
-				_state = 3;
-			}
-		}
-	} else if (_state == 3) {
-		leaveGame();
-		_state = 1;
-	}
-}
-
-
-void NinecraftApp::testJoiningAndDestruction()
-{
-	if (_state == -1) {
-		//LightUpdate sz[2] = {	LightUpdate(LightLayer::Block, 0, 0, 0, 1, 1, 1), 
-		//						LightUpdate(LightLayer::Sky, 0, 0, 0, 1, 1, 1) };
-		//LOGI("size of lightupdate: %lu == %d\n", sizeof(LightUpdate), (const char*)&sz[1] - (const char*)&sz[0]);
-		_stateTicksLeft = 100;
-		_state = 0;
-	}
-	if (_state == 0) {
-		if (--_stateTicksLeft <= 0) {
-			raknetInstance->clearServerList();
-			locateMultiplayer();
-			_state = 1;
-		}
-	}
-	else if (_state == 1) {
-		if (!raknetInstance->getServerList().empty()) {
-			PingedCompatibleServer s = raknetInstance->getServerList().at(0);
-			if (s.name.GetLength() > 0) {
-				joinMultiplayer(s);
-#ifndef STANDALONE_SERVER
-				setScreen(new ProgressScreen());
-#endif
-				_state = 2;
-				_stateTicksLeft = 80;//1000;
-			}
-		}
-	}
-	else if (_state == 2) {
-		if (isLevelGenerated()) {
-			if (--_stateTicksLeft <= 0) {
-				_state = 3;
-			}
-		}
-	} else if (_state == 3) {
-		leaveGame();
-		_stateTicksLeft = 50;
-		_state = 0;
-	}
-}
-
-#endif /*ANDROID_PUBLISH*/
-
-/*
-void NinecraftApp::writeDemoFile() {
-	std::string path = externalStoragePath + "/games";
-
-	if (createFolderIfNotExists(path.c_str())) {
-	path += "/com.mojang";
-	if (createFolderIfNotExists(path.c_str())) {
-	path += "/minecraftpe";
-	if (createFolderIfNotExists(path.c_str())) {
-		path += "/played_demo";
-		FILE* fp = fopen(path.c_str(), "w");
-		if (fp) fclose(fp);
-	}}}
-}
-
-bool NinecraftApp::hasPlayedDemo() {
-	std::string filename = externalStoragePath + "/games/com.mojang/minecraftpe/played_demo";
-	FILE* fp = fopen(filename.c_str(), "r");
-	if (!fp) return false;
-	fclose(fp);
-	return true;
-}
-*/
--- a/src/NinecraftApp.h
+++ b/src/NinecraftApp.h
@@ -1,52 +0,0 @@
-#ifndef NINECRAFTAPP_H__
-#define NINECRAFTAPP_H__
-
-#include "world/Pos.h"
-#include "App.h"
-#include "client/Minecraft.h"
-#include "world/level/storage/MemoryLevelStorage.h"
-#include <string>
-
-
-class Level;
-class LocalPlayer;
-class ExternalFileLevelStorageSource;
-
-class NinecraftApp: public Minecraft
-{
-public:
-    NinecraftApp();
-	~NinecraftApp();
-
-	void init();
-	void teardown();
-
-	void update();
-
-	virtual bool handleBack(bool isDown);
-
-protected:
-	void onGraphicsReset();
-
-private:
-	void initGLStates();
-    void restartServer();
-
-	void updateStats();
-
-	//void writeDemoFile();
-	//bool hasPlayedDemo();
-
-#ifndef ANDROID_PUBLISH
-	void testCreationAndDestruction();
-	void testJoiningAndDestruction();
-#endif /*ANDROID_PUBLISH*/
-
-	bool _verbose;
-	int _frames;
-	int _lastTickMs;
-
-	static bool _hasInitedStatics;
-};
-
-#endif//NINECRAFTAPP_H__
--- a/src/Performance.cpp
+++ b/src/Performance.cpp
@@ -1,4 +1,4 @@
-#include "Performance.h"
+#include "Performance.hpp"

 /*static*/
 StopwatchHandler Performance::watches;
--- a/src/Performance.h
+++ b/src/Performance.h
@@ -1,12 +0,0 @@
-#ifndef PERFORMANCE_H__
-#define PERFORMANCE_H__
-
-#include "platform/time.h"
-
-class Performance
-{
-public:
-    static StopwatchHandler watches;
-};
-
-#endif /*PERFORMANCE_H__*/
--- a/src/Performance.hpp
+++ b/src/Performance.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "platform/time.hpp"
+
+class Performance
+{
+public:
+    static StopwatchHandler watches;
+};
+
--- a/src/SharedConstants.cpp
+++ b/src/SharedConstants.cpp
@@ -1,4 +1,4 @@
-#include "SharedConstants.h"
+#include "SharedConstants.hpp"

 namespace Common {

--- a/src/SharedConstants.hpp
+++ b/src/SharedConstants.hpp
@@ -1,5 +1,4 @@
-#ifndef NET_MINECRAFT_SharedConstants_H__
-#define NET_MINECRAFT_SharedConstants_H__
+#pragma once

 #include <string>

@@ -31,4 +30,3 @@ namespace SharedConstants
 	//int FULLBRIGHT_LIGHTVALUE = 15 << 20 | 15 << 4;
 }

-#endif /*NET_MINECRAFT_SharedConstants_H__*/
--- a/src/client/IConfigListener.cpp
+++ b/src/client/IConfigListener.cpp
@@ -1,7 +1,7 @@
-#include "IConfigListener.h"
-#include "Minecraft.h"
+#include "IConfigListener.hpp"
+#include "Minecraft.hpp"
 #ifndef STANDALONE_SERVER
-#include "gui/Gui.h"
+#include "gui/Gui.hpp"
 #endif /* STANDALONE_SERVER */
 Config createConfig(Minecraft* mc) {
 	Config c;
--- a/src/client/IConfigListener.hpp
+++ b/src/client/IConfigListener.hpp
@@ -1,7 +1,6 @@
-#ifndef CONFIGLISTENER_H__
-#define CONFIGLISTENER_H__
+#pragma once

-#include "PixelCalc.h"
+#include "PixelCalc.hpp"
 class Minecraft;
 class Options;

@@ -45,4 +44,3 @@ public:
    virtual void onConfigChanged(const Config& config) = 0;
 };

-#endif /*CONFIGLISTENER_H__*/
--- a/src/client/Minecraft.h
+++ b/src/client/Minecraft.h
@@ -1,229 +0,0 @@
-#ifndef NET_MINECRAFT_CLIENT__Minecraft_H__
-#define NET_MINECRAFT_CLIENT__Minecraft_H__
-
-#include "Options.h"
-#ifndef STANDALONE_SERVER
-#include "MouseHandler.h"
-#include "gui/Gui.h"
-#include "gui/screens/ScreenChooser.h"
-#endif
-
-#include "Timer.h"
-
-//#include "../network/RakNetInstance.h"
-#include "../world/phys/HitResult.h"
-
-class Level;
-class LocalPlayer;
-class IInputHolder;
-class Mob;
-class Player;
-class LevelRenderer;
-class GameRenderer;
-class ParticleEngine;
-class Entity;
-class ICreator;
-class GameMode;
-class Textures;
-class CThread;
-class SoundEngine;
-class Screen;
-class Font;
-class LevelStorageSource;
-class BuildActionIntention;
-class PerfRenderer;
-class LevelSettings;
-class IRakNetInstance;
-class NetEventCallback;
-class CommandServer;
-struct PingedCompatibleServer;
-//class ExternalFileLevelStorageSource;
-
-
-#include "../App.h"
-#include "PixelCalc.h"
-class AppPlatform;
-class AppPlatform_android;
-
-class Minecraft: public App
-{
-protected:
-	Minecraft();
-public:
-	virtual ~Minecraft();
-
-	void init();
-	void setSize(int width, int height);
-	void reloadOptions();
-
-	bool supportNonTouchScreen();
-	bool useTouchscreen();
-	void grabMouse();
-	void releaseMouse();
-
-	void handleBuildAction(BuildActionIntention*);
-
-	void toggleDimension(){}
-	bool isCreativeMode();
-	void setIsCreativeMode(bool isCreative);
-	void setScreen(Screen*);
-
-	virtual void selectLevel(const std::string& levelId, const std::string& levelName, const LevelSettings& settings);
-	virtual void setLevel(Level* level, const std::string& message = "", LocalPlayer* forceInsertPlayer = NULL);
-
-	void generateLevel( const std::string& message, Level* level );
-	LevelStorageSource* getLevelSource();
-
-	bool isLookingForMultiplayer;
-	void locateMultiplayer();
-	void cancelLocateMultiplayer();
-	bool joinMultiplayer(const PingedCompatibleServer& server);
-	bool joinMultiplayerFromString(const std::string& server);
-	void hostMultiplayer(int port=19132);
-	Player* respawnPlayer(int playerId);
-	void respawnPlayer();
-	void resetPlayer(Player* player);
-	void doActuallyRespawnPlayer();
-
-	void update();
-
-	void tick(int nTick, int maxTick);
-	void tickInput();
-
-	bool isOnlineClient();
-	bool isOnline();
-	void pauseGame(bool isBackPaused);
-	void gameLostFocus();
-
-	void prepareLevel(const std::string& message);
-
-	void leaveGame(bool renameLevel = false);
-
-	int getProgressStatusId();
-	const char* getProgressMessage();
-
-	ICreator* getCreator();
-
-	// void onGraphicsLost() {}
-	void onGraphicsReset();
-
-	bool isLevelGenerated();
-
-	void handleMouseDown(int button, bool down);
-	
-    void audioEngineOn();
-    void audioEngineOff();
-    
-	bool isPowerVR() { return _powerVr; }
-	bool isKindleFire(int kindleVersion);
-	bool transformResolution(int* w, int* h);
-	void optionUpdated(OptionId option, bool value);
-	void optionUpdated(OptionId option, float value);
-	void optionUpdated(OptionId option, int value);
-#ifdef __APPLE__
-    bool _isSuperFast;
-    bool isSuperFast() { return _isSuperFast; }
-#endif
-
-protected:
-	void _levelGenerated();
-
-private:
-	static void* prepareLevel_tspawn(void *p_param);
-
-	void _reloadInput();
-public:
-	int width;
-	int height;
-
-	// Vars that the platform is allowed to use in the future
-	int commandPort;
-	int reserved_d1, reserved_d2;
-	float reserved_f1, reserved_f2;
-
-	Options options;
-
-	static bool useAmbientOcclusion;
-	//static bool threadInterrupt;
-
-	volatile bool pause;
-
-	LevelRenderer*  levelRenderer;
-	GameRenderer*   gameRenderer;
-	ParticleEngine* particleEngine;
-	SoundEngine*    soundEngine;
-
-	GameMode* gameMode;
-#ifndef STANDALONE_SERVER
-	Textures* textures;
-	ScreenChooser screenChooser;
-	Font* font;
-#endif
-	IRakNetInstance*  raknetInstance;
-	NetEventCallback* netCallback;
-
-	int lastTime;
-	int lastTickTime;
-	float ticksSinceLastUpdate;
-
-	Level* level;
-
-	LocalPlayer*	player;
-	IInputHolder*	inputHolder;
-	Mob*			cameraTargetPlayer;
-#ifndef STANDALONE_SERVER
-	Gui gui;
-#endif
-	CThread* generateLevelThread;
-	Screen* screen;
-	static int customDebugId;
-
-	static const int CDI_NONE = 0;
-	static const int CDI_GRAPHICS = 1;
-#ifndef STANDALONE_SERVER
-	MouseHandler mouseHandler;
-#endif
-	bool mouseGrabbed;
-
-    PixelCalc pixelCalc;
-    PixelCalc pixelCalcUi;
-
-	HitResult hitResult;
-	volatile int progressStagePercentage;
-
-	// This field is initialized in main()
-	// It sets the base path to where worlds can be written (sdcard on android)
-	std::string externalStoragePath;
-	std::string externalCacheStoragePath;
-protected:
-	Timer timer;
-    // @note @attn @warn: this is dangerous as fuck!
-	volatile bool isGeneratingLevel;
-	bool _hasSignaledGeneratingLevelFinished;
-
-	LevelStorageSource* storageSource;
-	bool _running;
-	bool _powerVr;
-
-private:
-	volatile int progressStageStatusId;
-	static const char* progressMessages[];
-
-	int missTime;
-	int ticks;
-	bool screenMutex;
-	bool hasScheduledScreen;
-	Screen* scheduledScreen;
-
-	int _licenseId;
-	bool _supportsNonTouchscreen;
-
-	bool _isCreativeMode;
-	//int _respawnPlayerTicks;
-	Player* _pendingRemovePlayer; // @attn @todo @fix: remove this shait and fix the respawn behaviour
-
-	PerfRenderer* _perfRenderer;
-	CommandServer* _commandServer;
-};
-
-#endif /*NET_MINECRAFT_CLIENT__Minecraft_H__*/
--- a/src/client/MouseHandler.cpp
+++ b/src/client/MouseHandler.cpp
@@ -1,5 +1,5 @@
-#include "MouseHandler.h"
-#include "player/input/ITurnInput.h"
+#include "MouseHandler.hpp"
+#include "player/input/ITurnInput.hpp"

 #ifdef RPI
 #include <SDL/SDL.h>
--- a/src/client/MouseHandler.hpp
+++ b/src/client/MouseHandler.hpp
@@ -1,5 +1,4 @@
-#ifndef NET_MINECRAFT_CLIENT__MouseHandler_H__
-#define NET_MINECRAFT_CLIENT__MouseHandler_H__
+#pragma once

 //package net.minecraft.client;

@@ -25,4 +24,3 @@ private:
 	ITurnInput* _turnInput;
 };

-#endif /*NET_MINECRAFT_CLIENT__MouseHandler_H__*/
--- a/src/client/Option.cpp
+++ b/src/client/Option.cpp
@@ -1,4 +1,4 @@
-#include "Option.h"
+#include "Option.hpp"
 #include <sstream>
 #include <cstdio>

--- a/src/client/Option.hpp
+++ b/src/client/Option.hpp
@@ -1,7 +1,7 @@
 #pragma once 
 #include <sstream>
 #include <type_traits>
-#include <util/Mth.h>
+#include <util/Mth.hpp>
 /*
 template<typename T>
 struct is_option_type : std::false_type {};
--- a/src/client/OptionStrings.cpp
+++ b/src/client/OptionStrings.cpp
@@ -1,4 +1,4 @@
-#include "OptionStrings.h"
+#include "OptionStrings.hpp"

 const char* OptionStrings::Multiplayer_Username        = "mp_username";
 const char* OptionStrings::Multiplayer_ServerVisible   = "mp_server_visible_default";
--- a/src/client/OptionStrings.hpp
+++ b/src/client/OptionStrings.hpp
@@ -1,5 +1,4 @@
-#ifndef NET_MINECRAFT_CLIENT__OptionStrings_H__
-#define NET_MINECRAFT_CLIENT__OptionStrings_H__
+#pragma once

 class OptionStrings {
 public:
@@ -33,4 +32,3 @@ public:

 };

-#endif /*NET_MINECRAFT_CLIENT__OptionsStrings_H__*/
--- a/src/client/Options.cpp
+++ b/src/client/Options.cpp
@@ -1,11 +1,6 @@
-#include "Options.h"
-#include "OptionStrings.h"
-#include "Minecraft.h"
-#include "../platform/log.h"
-#include "../world/Difficulty.h"
-#include <cmath>
-
-#include <memory>
+#include "Options.hpp"
+#include "world/Difficulty.hpp"
+#include <MinecraftClient.hpp>

 bool Options::debugGl = false;

@@ -290,13 +285,13 @@ void Options::setOptionsFilePath(const std::string& path) {
 }

 void Options::notifyOptionUpdate(OptionId key, bool value) {
-	minecraft->optionUpdated(key, value);
+	minecraft.optionUpdated(key, value);
 }

 void Options::notifyOptionUpdate(OptionId key, float value) {
-	minecraft->optionUpdated(key, value);
+	minecraft.optionUpdated(key, value);
 }

 void Options::notifyOptionUpdate(OptionId key, int value) {
-	minecraft->optionUpdated(key, value);
+	minecraft.optionUpdated(key, value);
 }
--- a/src/client/Options.hpp
+++ b/src/client/Options.hpp
@@ -1,5 +1,4 @@
-#ifndef NET_MINECRAFT_CLIENT__Options_H__
-#define NET_MINECRAFT_CLIENT__Options_H__
+#pragma once

 #define SOUND_MIN_VALUE 0.0f
 #define SOUND_MAX_VALUE 1.0f
@@ -12,14 +11,13 @@

 //package net.minecraft.client;

-//#include "locale/Language.h"
+//#include "locale/Language.hpp"

 #include <string>
-#include <cstdio>
-#include "../platform/input/Keyboard.h"
-#include "../util/StringUtils.h"
-#include "OptionsFile.h"
-#include "Option.h"
+#include <platform/input/Keyboard.hpp>
+#include <util/StringUtils.hpp>
+#include "OptionsFile.hpp"
+#include "Option.hpp"
 #include <array>

 enum OptionId {
@@ -88,7 +86,7 @@ enum OptionId {
 	OPTIONS_COUNT
 };

-class Minecraft;
+class MinecraftClient;
 typedef std::vector<std::string> StringVector;

 class Options
@@ -96,7 +94,7 @@ class Options
 public:
    static bool debugGl;

-    Options(Minecraft* minecraft, const std::string& workingDirectory = "") 
+    Options(MinecraftClient& minecraft, const std::string& workingDirectory = "") 
 	: minecraft(minecraft) {
        // elements werent initialized so i was getting a garbage pointer and a crash
        m_options.fill(nullptr);
@@ -161,7 +159,6 @@ private:
 	std::array<Option*, OPTIONS_COUNT> m_options;
 	OptionsFile optionsFile;

-	Minecraft* minecraft;
+	MinecraftClient& minecraft;
 };

-#endif /*NET_MINECRAFT_CLIENT__Options_H__*/
--- a/src/client/OptionsFile.cpp
+++ b/src/client/OptionsFile.cpp
@@ -1,8 +1,8 @@
-#include "OptionsFile.h"
+#include "OptionsFile.hpp"
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <platform/log.h>
+#include <platform/log.hpp>

 #if defined(_WIN32)
    #include <direct.h>
--- a/src/client/OptionsFile.hpp
+++ b/src/client/OptionsFile.hpp
@@ -1,5 +1,4 @@
-#ifndef NET_MINECRAFT_CLIENT__OptionsFile_H__
-#define NET_MINECRAFT_CLIENT__OptionsFile_H__
+#pragma once

 //package net.minecraft.client;
 #include <string>
@@ -18,4 +17,3 @@ private:
 	std::string settingsPath;
 };

-#endif /* NET_MINECRAFT_CLIENT__OptionsFile_H__ */
--- a/src/client/PixelCalc.hpp
+++ b/src/client/PixelCalc.hpp
--- a/src/client/Timer.hpp
+++ b/src/client/Timer.hpp
@@ -1,8 +1,7 @@
-#ifndef NET_MINECRAFT_CLIENT__Timer_H__
-#define NET_MINECRAFT_CLIENT__Timer_H__
+#pragma once

 //package net.minecraft.client;
-#include "../platform/time.h"
+#include "platform/time.hpp"

 class Timer
 {
@@ -121,4 +120,3 @@ private:
 	float adjustTime;
 };

-#endif /*NET_MINECRAFT_CLIENT__Timer_H__*/
--- a/src/client/gamemode/CreativeMode.cpp
+++ b/src/client/gamemode/CreativeMode.cpp
@@ -1,69 +0,0 @@
-#include "CreativeMode.h"
-#include "../Minecraft.h"
-#ifndef STANDALONE_SERVER
-#include "../particle/ParticleEngine.h"
-#endif
-#include "../player/LocalPlayer.h"
-#ifndef STANDALONE_SERVER
-#include "../renderer/LevelRenderer.h"
-#include "../sound/SoundEngine.h"
-#endif
-#include "../../world/level/Level.h"
-//#include "../../network/Packet.h"
-#include "../../network/packet/RemoveBlockPacket.h"
-#include "../../world/entity/player/Abilities.h"
-
-static const int DestructionTickDelay = 5;
-
-CreativeMode::CreativeMode(Minecraft* minecraft)
-: 	super(minecraft)
-{
-}
-
-void CreativeMode::startDestroyBlock(int x, int y, int z, int face) {
-	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
-		return;
-
-	creativeDestroyBlock(x, y, z, face);
-	destroyDelay = DestructionTickDelay;
-}
-
-void CreativeMode::creativeDestroyBlock(int x, int y, int z, int face) {
-	minecraft->level->extinguishFire(x, y, z, face);
-	destroyBlock(x, y, z, face);
-}
-
-void CreativeMode::continueDestroyBlock(int x, int y, int z, int face) {
-	destroyDelay--;
-	if (destroyDelay <= 0) {
-		destroyDelay = DestructionTickDelay;
-		creativeDestroyBlock(x, y, z, face);
-	}
-}
-
-void CreativeMode::stopDestroyBlock() {
-	destroyDelay = 0;
-}
-
-void CreativeMode::initAbilities( Abilities& abilities ) {
-	abilities.mayfly = true;
-	abilities.instabuild = true;
-	abilities.invulnerable = true;
-}
-
-bool CreativeMode::isCreativeType() {
-	return true;
-}
-
-void CreativeMode::releaseUsingItem( Player* player ) {
-	if(player->getCarriedItem() != NULL) {
-		int oldItemId = player->getCarriedItem()->id;
-		int oldAux = player->getAuxData();
-		super::releaseUsingItem(player);
-		if(player->getCarriedItem() != NULL && player->getCarriedItem()->id == oldItemId) {
-			player->getCarriedItem()->setAuxValue(oldAux);
-		}
-	} else {
-		super::releaseUsingItem(player);
-	}
-}
--- a/src/client/gamemode/CreativeMode.h
+++ b/src/client/gamemode/CreativeMode.h
@@ -1,27 +0,0 @@
-#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
-#define NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
-
-//package net.minecraft.client.gamemode;
-
-#include "GameMode.h"
-
-class CreativeMode: public GameMode
-{
-	typedef GameMode super;
-public:
-    CreativeMode(Minecraft* minecraft);
-
-    void startDestroyBlock(int x, int y, int z, int face);
-    void continueDestroyBlock(int x, int y, int z, int face);
-    void stopDestroyBlock();
-
-	bool isCreativeType();
-
-	void initAbilities(Abilities& abilities);
-
-	void releaseUsingItem(Player* player);
-private:
-	void creativeDestroyBlock(int x, int y, int z, int face);
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__*/
--- a/src/client/gamemode/SurvivalMode.cpp
+++ b/src/client/gamemode/SurvivalMode.cpp
@@ -1,98 +0,0 @@
-#include "SurvivalMode.h"
-#include "../Minecraft.h"
-#include "../player/LocalPlayer.h"
-#ifndef STANDALONE_SERVER
-#include "../particle/ParticleEngine.h"
-#include "../sound/SoundEngine.h"
-#endif
-#include "../../world/level/Level.h"
-#include "../../world/entity/player/Abilities.h"
-
-SurvivalMode::SurvivalMode( Minecraft* minecraft )
-:	super(minecraft),
-	xDestroyBlock(-1),
-	yDestroyBlock(-1),
-	zDestroyBlock(-1)
-{
-}
-
-void SurvivalMode::continueDestroyBlock( int x, int y, int z, int face ) {
-	if (destroyDelay > 0) {
-		destroyDelay--;
-		return;
-	}
-
-	if (x == xDestroyBlock && y == yDestroyBlock && z == zDestroyBlock) {
-		int t = minecraft->level->getTile(x, y, z);
-		if (t == 0) return;
-		Tile* tile = Tile::tiles[t];
-
-		destroyProgress += tile->getDestroyProgress(minecraft->player);
-
-		if ((++destroyTicks & 3) == 1) {
-#ifndef STANDALONE_SERVER
-			if (tile != NULL) {
-				minecraft->soundEngine->play(tile->soundType->getStepSound(), x + 0.5f, y + 0.5f, z + 0.5f, (tile->soundType->getVolume() + 1) / 8, tile->soundType->getPitch() * 0.5f);
-			}
-#endif
-		}
-
-		if (destroyProgress >= 1) {
-			destroyBlock(x, y, z, face);
-			destroyProgress = 0;
-			oDestroyProgress = 0;
-			destroyTicks = 0;
-			destroyDelay = 5;
-		}
-	} else {
-		destroyProgress = 0;
-		oDestroyProgress = 0;
-		destroyTicks = 0;
-		xDestroyBlock = x;
-		yDestroyBlock = y;
-		zDestroyBlock = z;
-	}
-}
-
-bool SurvivalMode::destroyBlock( int x, int y, int z, int face ) {
-	int t = minecraft->level->getTile(x, y, z);
-	int data = minecraft->level->getData(x, y, z);
-	bool changed = GameMode::destroyBlock(x, y, z, face);
-	bool couldDestroy = minecraft->player->canDestroy(Tile::tiles[t]);
-
-	ItemInstance* item = minecraft->player->inventory->getSelected();
-	if (item != NULL) {
-		item->mineBlock(t, x, y, z);
-		if (item->count == 0) {
-			//item->snap(minecraft->player);
-			minecraft->player->inventory->clearSlot(minecraft->player->inventory->selected);
-		}
-	}
-	if (changed && couldDestroy) {
-		ItemInstance instance(t, 1, data);
-		Tile::tiles[t]->playerDestroy(minecraft->level, minecraft->player, x, y, z, data);
-	}
-	return changed;
-}
-
-void SurvivalMode::stopDestroyBlock() {
-	destroyProgress = 0;
-	destroyDelay = 0;
-}
-
-void SurvivalMode::initAbilities( Abilities& abilities ) {
-	abilities.flying = false;
-	abilities.mayfly = false;
-	abilities.instabuild = false;
-	abilities.invulnerable = false;
-}
-
-void SurvivalMode::startDestroyBlock( int x, int y, int z, int face ) {
-	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
-		return;
-
-	int t = minecraft->level->getTile(x, y, z);
-	if (t > 0 && destroyProgress == 0) Tile::tiles[t]->attack(minecraft->level, x, y, z, minecraft->player);
-	if (t > 0 && Tile::tiles[t]->getDestroyProgress(minecraft->player) >= 1)
-		destroyBlock(x, y, z, face);
-}
--- a/src/client/gamemode/SurvivalMode.h
+++ b/src/client/gamemode/SurvivalMode.h
@@ -1,31 +0,0 @@
-#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__SurvivalMode_H__
-#define NET_MINECRAFT_CLIENT_GAMEMODE__SurvivalMode_H__
-
-#include "GameMode.h"
-
-class Abilities;
-class Minecraft;
-
-class SurvivalMode: public GameMode
-{
-	typedef GameMode super;
-public:
-	SurvivalMode(Minecraft* minecraft);
-
-	bool destroyBlock(int x, int y, int z, int face);
-	void startDestroyBlock(int x, int y, int z, int face);
-	void continueDestroyBlock(int x, int y, int z, int face);
-	void stopDestroyBlock();
-
-	bool canHurtPlayer() { return true; }
-
-	bool isSurvivalType() { return true; }
-
-	void initAbilities( Abilities& abilities );
-private:
-	int xDestroyBlock;
-	int yDestroyBlock;
-	int zDestroyBlock;
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__SurvivalMode_H__*/
--- a/src/client/gui/Font.cpp
+++ b/src/client/gui/Font.cpp
@@ -1,10 +1,10 @@
-#include "Font.h"
+#include "Font.hpp"

-//#include "SharedConstants.h"
-#include "../Options.h"
-#include "../renderer/Textures.h"
-#include "../renderer/Tesselator.h"
-#include "../../util/Mth.h"
+//#include "SharedConstants.hpp"
+#include "client/Options.hpp"
+#include "client/renderer/Textures.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "util/Mth.hpp"
 #include <cstring>

 Font::Font( Options* options, const std::string& name, Textures* textures )
--- a/src/client/gui/Font.hpp
+++ b/src/client/gui/Font.hpp
@@ -1,12 +1,11 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__Font_H__
-#define NET_MINECRAFT_CLIENT_GUI__Font_H__
+#pragma once

 //package net.minecraft.client.gui;

 #include <string>
 #include <cctype>

-#include "../renderer/gles.h"
+#include "client/renderer/gles.hpp"

 class Textures;
 class Options;
@@ -60,4 +59,3 @@ private:
 	unsigned char _charOffset;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI__Font_H__*/
--- a/src/client/gui/Gui.cpp
+++ b/src/client/gui/Gui.cpp
@@ -1,67 +1,52 @@
-#include "Gui.h"
-#include "Font.h"
-#include "client/Options.h"
-#include "platform/input/Keyboard.h"
-#include "screens/IngameBlockSelectionScreen.h"
-#include "screens/ChatScreen.h"
-#include "screens/ConsoleScreen.h"
-#include "../Minecraft.h"
-#include "../player/LocalPlayer.h"
-#include "../renderer/Tesselator.h"
-#include "../renderer/TileRenderer.h"
-#include "../renderer/LevelRenderer.h"
-#include "../renderer/GameRenderer.h"
-#include "../renderer/entity/ItemRenderer.h"
-#include "../player/input/IInputHolder.h"
-#include "../gamemode/GameMode.h"
-#include "../gamemode/CreativeMode.h"
-#include "../renderer/Textures.h"
-#include "../../AppConstants.h"
-#include "../../world/entity/player/Inventory.h"
-#include "../../world/level/material/Material.h"
-#include "../../world/item/Item.h"
-#include "../../world/item/ItemInstance.h"
-#include "../../platform/input/Mouse.h"
-#include "../../world/level/Level.h"
-#include "../../world/PosTranslator.h"
-#include "../../platform/time.h"
+#include "Gui.hpp"
+#include "Font.hpp"
+#include "MinecraftClient.hpp"
+#include "client/Options.hpp"
+#include "platform/input/Keyboard.hpp"
+#include "screens/IngameBlockSelectionScreen.hpp"
+#include "screens/ChatScreen.hpp"
+#include "screens/ConsoleScreen.hpp"
+#include <Minecraft.hpp>
+#include "client/player/LocalPlayer.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/TileRenderer.hpp"
+#include "client/renderer/LevelRenderer.hpp"
+#include "client/renderer/GameRenderer.hpp"
+#include "client/renderer/entity/ItemRenderer.hpp"
+#include "client/player/input/IInputHolder.hpp"
+#include "client/gamemode/GameMode.hpp"
+#include "client/gamemode/CreativeMode.hpp"
+#include "client/renderer/Textures.hpp"
+#include "AppConstants.hpp"
+#include "world/entity/player/Inventory.hpp"
+#include "world/level/material/Material.hpp"
+#include "world/item/Item.hpp"
+#include "world/item/ItemInstance.hpp"
+#include "platform/input/Mouse.hpp"
+#include "world/level/Level.hpp"
+#include "world/PosTranslator.hpp"
+#include "platform/time.hpp"
 #include <cmath>
 #include <algorithm>
 #include <sstream>

+#define MAX_MESSAGE_WIDTH 240
+
 float Gui::InvGuiScale = 1.0f / 3.0f;
 float Gui::GuiScale = 1.0f / Gui::InvGuiScale;
 const float Gui::DropTicks = 40.0f;

 //#include <android/log.h>

-Gui::Gui(Minecraft* minecraft)
-:	minecraft(minecraft),
-	tickCount(0),
-	progress(0),
-	overlayMessageTime(0),
-	animateOverlayMessageColor(false),
-	chatScrollOffset(0),
-	tbr(1),
-	_inventoryNeedsUpdate(true),
-	_flashSlotId(-1),
-	_flashSlotStartTime(-1),
-	_slotFont(NULL),
-	_numSlots(4),
-	_currentDropTicks(-1),
-	_currentDropSlot(-1),
-	MAX_MESSAGE_WIDTH(240),
-	itemNameOverlayTime(2),
-	_openInventorySlot(minecraft->useTouchscreen())
-{
+// @todo virtual controlConfigurationChanged() when player switches from keyboard to touch for example 
+Gui::Gui(MinecraftClient& minecraft) : minecraft(minecraft), _openInventorySlot(minecraft.useTouchscreen()) {
 	glGenBuffers2(1, &_inventoryRc.vboId);
 	glGenBuffers2(1, &rcFeedbackInner.vboId);
 	glGenBuffers2(1, &rcFeedbackOuter.vboId);
 	//Gui::InvGuiScale = 1.0f / (int) (3 * Minecraft::width / 854);
 }

-Gui::~Gui()
-{
+Gui::~Gui() {
 	if (_slotFont)
 		delete _slotFont;

@@ -69,17 +54,16 @@ Gui::~Gui()
 }

 void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
-
-	if (!minecraft->level || !minecraft->player)
+	if (!minecraft.level || !minecraft.getPlayer())
 		return;

 	//minecraft->gameRenderer->setupGuiScreen();
-	Font* font = minecraft->font;
+	Font* font = minecraft.getFont();

-	const bool isTouchInterface = minecraft->useTouchscreen();
+	const bool isTouchInterface = minecraft.useTouchscreen();
 	
-	const int screenWidth = (int)(minecraft->width * InvGuiScale);
-	const int screenHeight = (int)(minecraft->height * InvGuiScale);
+	const int screenWidth = (int)(minecraft.getScreenWidth() * InvGuiScale);
+	const int screenHeight = (int)(minecraft.getScreenHeigth() * InvGuiScale);
 	blitOffset = -90;
 	renderProgressIndicator(isTouchInterface, screenWidth, screenHeight, a);

@@ -91,9 +75,9 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
    // F: 3
 	int ySlot = screenHeight - 16 - 3;

-	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
-		if (minecraft->gameMode->canHurtPlayer()) {
-			minecraft->textures->loadAndBindTexture("gui/icons.png");
+	if (!minecraft.options.getBooleanValue(OPTIONS_HIDEGUI)) {
+		if (minecraft.gameMode->canHurtPlayer()) {
+			minecraft.getTextures()->loadAndBindTexture("gui/icons.png");
 			Tesselator& t = Tesselator::instance;
 			t.beginOverride();
 			t.colorABGR(0xffffffff);
@@ -103,7 +87,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 		}
 	}

-	if(minecraft->player->getSleepTimer() > 0) {
+	if(minecraft.getPlayer()->getSleepTimer() > 0) {
 		glDisable(GL_DEPTH_TEST);
 		glDisable(GL_ALPHA_TEST);

@@ -112,7 +96,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 		glEnable(GL_ALPHA_TEST);
 		glEnable(GL_DEPTH_TEST);
 	}
-	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
+	if (!minecraft.options.getBooleanValue(OPTIONS_HIDEGUI)) {
 	renderToolBar(a, ySlot, screenWidth);

 	glEnable(GL_BLEND);
--- a/src/client/gui/Gui.hpp
+++ b/src/client/gui/Gui.hpp
@@ -1,16 +1,15 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__Gui_H__
-#define NET_MINECRAFT_CLIENT_GUI__Gui_H__
+#pragma once

 //package net.minecraft.client.gui;

-#include "GuiComponent.h"
-#include "Font.h"
-#include "../player/input/touchscreen/TouchAreaModel.h"
-#include "../renderer/RenderChunk.h"
-#include "../../util/Random.h"
-#include "../IConfigListener.h"
+#include "GuiComponent.hpp"
+#include "Font.hpp"
+#include "client/player/input/touchscreen/TouchAreaModel.hpp"
+#include "client/renderer/RenderChunk.hpp"
+#include "util/Random.hpp"
+#include "client/IConfigListener.hpp"

-class Minecraft;
+class MinecraftClient;
 class ItemInstance;
 class Textures;
 class Tesselator;
@@ -27,7 +26,7 @@ typedef std::vector<GuiMessage> GuiMessageList;
 class Gui: public GuiComponent, IConfigListener
 {
 public:
-    Gui(Minecraft* minecraft);
+    Gui(MinecraftClient& minecraft);
 	~Gui();

 	int getSlotIdAt(int x, int y);
@@ -90,45 +89,43 @@ private:
 	void tickItemDrop();
 	float cubeSmoothStep(float percentage, float min, float max);
 public:
-	float progress;
+	float progress = 0.f;
 	std::string selectedName;
 	static float InvGuiScale;
 	static float GuiScale;

 private:
-	int MAX_MESSAGE_WIDTH;
 	//ItemRenderer itemRenderer;
 	GuiMessageList guiMessages;
-	int chatScrollOffset;
+	int chatScrollOffset = 0;
 	Random random;

-	Minecraft* minecraft;
-	int tickCount;
-	float itemNameOverlayTime;
+	MinecraftClient& minecraft;
+	int tickCount = 0;
+	float itemNameOverlayTime = 2;
 	std::string overlayMessageString;
-	int overlayMessageTime;
-	bool animateOverlayMessageColor;
+	int overlayMessageTime = 0;
+	bool animateOverlayMessageColor = false;

-	float tbr;
+	float tbr = 1.f;

 	RenderChunk _inventoryRc;
-	bool _inventoryNeedsUpdate;
+	bool _inventoryNeedsUpdate = true;
 	
-	int _flashSlotId;
-	float _flashSlotStartTime;
+	int _flashSlotId = -1;
+	float _flashSlotStartTime = -1;

-	Font* _slotFont;
-	int _numSlots;
+	Font* _slotFont = nullptr;
+	int _numSlots = 4;

 	RenderChunk rcFeedbackOuter;
 	RenderChunk rcFeedbackInner;

 	// For dropping
 	static const float DropTicks;
-	float  _currentDropTicks;
-	int    _currentDropSlot;
+	float  _currentDropTicks = -1;
+	int    _currentDropSlot = -1;

 	bool   _openInventorySlot;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI__Gui_H__*/
--- a/src/client/gui/GuiComponent.cpp
+++ b/src/client/gui/GuiComponent.cpp
@@ -1,8 +1,8 @@
-#include "GuiComponent.h"
+#include "GuiComponent.hpp"

-#include "../renderer/Tesselator.h"
-#include "../renderer/gles.h"
-#include "Font.h"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/gles.hpp"
+#include "Font.hpp"


 GuiComponent::GuiComponent()
--- a/src/client/gui/GuiComponent.hpp
+++ b/src/client/gui/GuiComponent.hpp
@@ -1,5 +1,4 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__GuiComponent_H__
-#define NET_MINECRAFT_CLIENT_GUI__GuiComponent_H__
+#pragma once

 //package net.minecraft.client.gui;

@@ -31,4 +30,3 @@ protected:
 	
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI__GuiComponent_H__*/
--- a/src/client/gui/Screen.cpp
+++ b/src/client/gui/Screen.cpp
@@ -1,12 +1,12 @@
-#include "Screen.h"
-#include "components/Button.h"
-#include "components/TextBox.h"
-#include "../Minecraft.h"
-#include "../renderer/Tesselator.h"
-#include "../sound/SoundEngine.h"
-#include "../../platform/input/Keyboard.h"
-#include "../../platform/input/Mouse.h"
-#include "../renderer/Textures.h"
+#include "Screen.hpp"
+#include "components/Button.hpp"
+#include "components/TextBox.hpp"
+#include <Minecraft.hpp>
+#include "client/renderer/Tesselator.hpp"
+#include "client/sound/SoundEngine.hpp"
+#include "platform/input/Keyboard.hpp"
+#include "platform/input/Mouse.hpp"
+#include "client/renderer/Textures.hpp"

 Screen::Screen()
 :   passEvents(false),
--- a/src/client/gui/Screen.hpp
+++ b/src/client/gui/Screen.hpp
@@ -1,10 +1,9 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__Screen_H__
-#define NET_MINECRAFT_CLIENT_GUI__Screen_H__
+#pragma once

 //package net.minecraft.client.gui;

 #include <vector>
-#include "GuiComponent.h"
+#include "GuiComponent.hpp"

 class Font;
 class Minecraft;
@@ -80,4 +79,3 @@ private:
 	Button* clickedButton;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI__Screen_H__*/
--- a/src/client/gui/TweenData.h
+++ b/src/client/gui/TweenData.h
@@ -1,11 +0,0 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__TweenData_H__
-#define NET_MINECRAFT_CLIENT_GUI__TweenData_H__
-
-typedef struct TweenData {
-	float cur;
-	float dur;
-	float start;
-	float stop;
-} TweenData;
-
-#endif /*NET_MINECRAFT_CLIENT_GUI__TweenData_H__*/
--- a/src/client/gui/TweenData.hpp
+++ b/src/client/gui/TweenData.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+typedef struct TweenData {
+	float cur;
+	float dur;
+	float start;
+	float stop;
+} TweenData;
+
--- a/src/client/gui/components/Button.cpp
+++ b/src/client/gui/components/Button.cpp
@@ -1,6 +1,6 @@
-#include "Button.h"
-#include "../../Minecraft.h"
-#include "../../renderer/Textures.h"
+#include "Button.hpp"
+#include "client/Minecraft.hpp"
+#include "client/renderer/Textures.hpp"

 Button::Button(int id, const std::string& msg)
 :	GuiElement(true, true, 0, 0, 200, 24),
--- a/src/client/gui/components/Button.hpp
+++ b/src/client/gui/components/Button.hpp
@@ -1,11 +1,10 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__Button_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__Button_H__
+#pragma once

 //package net.minecraft.client.gui;

 #include <string>
-#include "GuiElement.h"
-#include "../../Options.h"
+#include "GuiElement.hpp"
+#include "client/Options.hpp"

 class Font;
 class Minecraft;
@@ -77,4 +76,3 @@ public:
 };
 }

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__Button_H__*/
--- a/src/client/gui/components/GButton.cpp
+++ b/src/client/gui/components/GButton.cpp
@@ -1 +1 @@
-#include "GuiElement.h"
+#include "GuiElement.hpp"
--- a/src/client/gui/components/GButton.hpp
+++ b/src/client/gui/components/GButton.hpp
@@ -1,6 +1,5 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__GButton_H__
-#define NET_MINECRAFT_CLIENT_GUI__GButton_H__
-#include "Button.h"
+#pragma once
+#include "Button.hpp"

 class GButton: public Button {
 	typedef Button super;
@@ -52,4 +51,3 @@ private:
 };


-#endif /*NET_MINECRAFT_CLIENT_GUI__GButton_H__*/
--- a/src/client/gui/components/GuiElement.cpp
+++ b/src/client/gui/components/GuiElement.cpp
@@ -1,4 +1,4 @@
-#include "GuiElement.h"
+#include "GuiElement.hpp"

 GuiElement::GuiElement( bool active/*=false*/, bool visible/*=true*/, int x /*= 0*/, int y /*= 0*/, int width/*=24*/, int height/*=24*/ )
 : active(active),
--- a/src/client/gui/components/GuiElement.hpp
+++ b/src/client/gui/components/GuiElement.hpp
@@ -1,6 +1,5 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__GuiElement_H__
-#define NET_MINECRAFT_CLIENT_GUI__GuiElement_H__
-#include "../GuiComponent.h"
+#pragma once
+#include "client/gui/GuiComponent.hpp"

 class Tesselator;
 class Minecraft;
@@ -31,4 +30,3 @@ public:
 	int height;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI__GuiElement_H__*/
--- a/src/client/gui/components/GuiElementContainer.cpp
+++ b/src/client/gui/components/GuiElementContainer.cpp
@@ -1,4 +1,4 @@
-#include "GuiElementContainer.h"
+#include "GuiElementContainer.hpp"
 #include <algorithm>
 GuiElementContainer::GuiElementContainer( bool active/*=false*/, bool visible/*=true*/, int x /*= 0*/, int y /*= 0*/, int width/*=24*/, int height/*=24*/ )
 : GuiElement(active, visible, x, y, width, height) {
--- a/src/client/gui/components/GuiElementContainer.hpp
+++ b/src/client/gui/components/GuiElementContainer.hpp
@@ -1,6 +1,5 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__GuiElementContainer_H__
-#define NET_MINECRAFT_CLIENT_GUI__GuiElementContainer_H__
-#include "GuiElement.h"
+#pragma once
+#include "GuiElement.hpp"
 #include <vector>
 class Tesselator;
 class Minecraft;
@@ -25,4 +24,3 @@ protected:
 	std::vector<GuiElement*> children;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI__GuiElementContainer_H__*/
--- a/src/client/gui/components/ImageButton.cpp
+++ b/src/client/gui/components/ImageButton.cpp
@@ -1,10 +1,10 @@
-#include "ImageButton.h"
-#include "../../renderer/Tesselator.h"
-#include "../../Minecraft.h"
-#include "../../../platform/log.h"
-#include "../../../util/Mth.h"
-#include "../../renderer/Textures.h"
-#include <client/Option.h>
+#include "ImageButton.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/Minecraft.hpp"
+#include "platform/log.hpp"
+#include "util/Mth.hpp"
+#include "client/renderer/Textures.hpp"
+#include <client/Option.hpp>


 ImageButton::ImageButton(int id, const std::string& msg)
--- a/src/client/gui/components/ImageButton.hpp
+++ b/src/client/gui/components/ImageButton.hpp
@@ -1,7 +1,6 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ImageButton_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ImageButton_H__
+#pragma once

-#include "Button.h"
+#include "Button.hpp"

 typedef struct IntRectangle {
 	IntRectangle()
@@ -94,4 +93,3 @@ private:
 };


-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ImageButton_H__*/
--- a/src/client/gui/components/InventoryPane.cpp
+++ b/src/client/gui/components/InventoryPane.cpp
@@ -1,12 +1,12 @@
-#include "InventoryPane.h"
-#include "../Gui.h"
-#include "../../Minecraft.h"
-#include "../../player/input/touchscreen/TouchAreaModel.h"
-#include "../../renderer/entity/ItemRenderer.h"
-#include "../../renderer/Tesselator.h"
-#include "../../renderer/Textures.h"
-#include "../../../world/item/ItemInstance.h"
-#include "../../../world/entity/player/Inventory.h"
+#include "InventoryPane.hpp"
+#include "client/gui/Gui.hpp"
+#include "client/Minecraft.hpp"
+#include "client/player/input/touchscreen/TouchAreaModel.hpp"
+#include "client/renderer/entity/ItemRenderer.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/Textures.hpp"
+#include "world/item/ItemInstance.hpp"
+#include "world/entity/player/Inventory.hpp"

 namespace Touch {

--- a/src/client/gui/components/InventoryPane.hpp
+++ b/src/client/gui/components/InventoryPane.hpp
@@ -1,8 +1,7 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__InventoryPane_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__InventoryPane_H__
+#pragma once

-#include "ScrollingPane.h"
-#include "ImageButton.h"
+#include "ScrollingPane.hpp"
+#include "ImageButton.hpp"

 class Minecraft;
 class ItemInstance;
@@ -59,4 +58,3 @@ public:

 }

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__InventoryPane_H__*/
--- a/src/client/gui/components/ItemPane.cpp
+++ b/src/client/gui/components/ItemPane.cpp
@@ -1,9 +1,9 @@
-#include "ItemPane.h"
-#include "../Gui.h"
-#include "../../renderer/gles.h"
-#include "../../renderer/Tesselator.h"
-#include "NinePatch.h"
-#include "../../renderer/entity/ItemRenderer.h"
+#include "ItemPane.hpp"
+#include "client/gui/Gui.hpp"
+#include "client/renderer/gles.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "NinePatch.hpp"
+#include "client/renderer/entity/ItemRenderer.hpp"

 const int rgbActive = 0xfff0f0f0;
 const int rgbInactive = 0xc0635558;
--- a/src/client/gui/components/ItemPane.hpp
+++ b/src/client/gui/components/ItemPane.hpp
@@ -1,10 +1,9 @@
-#ifndef ITEMPANE_H__
-#define ITEMPANE_H__
+#pragma once

 #include <string>
 #include <vector>
-#include "ScrollingPane.h"
-#include "../../../world/item/ItemInstance.h"
+#include "ScrollingPane.hpp"
+#include "world/item/ItemInstance.hpp"

 class Font;
 class Textures;
@@ -92,4 +91,3 @@ public:
 	NinePatchLayer* guiSlotItemSelected;
 };

-#endif /*ITEMPANE_H__*/
--- a/src/client/gui/components/KeyOption.cpp
+++ b/src/client/gui/components/KeyOption.cpp
@@ -1,5 +1,5 @@
-#include "KeyOption.h"
-#include <client/Minecraft.h>
+#include "KeyOption.hpp"
+#include <client/Minecraft.hpp>

 KeyOption::KeyOption(Minecraft* minecraft, OptionId optId) 
    : Touch::TButton((int)optId, Keyboard::getKeyName(minecraft->options.getIntValue(optId))) {}
--- a/src/client/gui/components/KeyOption.hpp
+++ b/src/client/gui/components/KeyOption.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "Button.h"
-#include <client/Options.h>
+#include "Button.hpp"
+#include <client/Options.hpp>

 class KeyOption : public Touch::TButton {
 public:
--- a/src/client/gui/components/LargeImageButton.cpp
+++ b/src/client/gui/components/LargeImageButton.cpp
@@ -1,10 +1,10 @@
-#include "LargeImageButton.h"
-#include "../../renderer/Tesselator.h"
-#include "../../Minecraft.h"
-#include "../../../util/Mth.h"
-#include "../../../platform/log.h"
-#include "../../../util/Mth.h"
-#include "../../renderer/Textures.h"
+#include "LargeImageButton.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/Minecraft.hpp"
+#include "util/Mth.hpp"
+#include "platform/log.hpp"
+#include "util/Mth.hpp"
+#include "client/renderer/Textures.hpp"


 LargeImageButton::LargeImageButton(int id, const std::string& msg)
--- a/src/client/gui/components/LargeImageButton.hpp
+++ b/src/client/gui/components/LargeImageButton.hpp
@@ -1,7 +1,6 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__LargeImageButton_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__LargeImageButton_H__
+#pragma once

-#include "ImageButton.h"
+#include "ImageButton.hpp"

 class LargeImageButton: public ImageButton
 {
@@ -18,4 +17,3 @@ private:
 	float _buttonScale;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__LargeImageButton_H__*/
--- a/src/client/gui/components/NinePatch.cpp
+++ b/src/client/gui/components/NinePatch.cpp
@@ -1,4 +1,4 @@
-#include "NinePatch.h"
+#include "NinePatch.hpp"

 NinePatchDescription::NinePatchDescription( float x, float y, float x1, float x2, float x3, float y1, float y2, float y3, float w, float e, float n, float s ) :   u0(x), u1(x + x1), u2(x + x2), u3(x + x3),
 	v0(y), v1(y + y1), v2(y + y2), v3(y + y3),
--- a/src/client/gui/components/NinePatch.hpp
+++ b/src/client/gui/components/NinePatch.hpp
@@ -1,11 +1,10 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__NinePatch_H__
-#define NET_MINECRAFT_CLIENT_GUI__NinePatch_H__
+#pragma once

-#include "ImageButton.h"
-#include "../../renderer/TextureData.h"
-#include "../../renderer/Textures.h"
-#include "../../renderer/Tesselator.h"
-#include "../../Minecraft.h"
+#include "ImageButton.hpp"
+#include "client/renderer/TextureData.hpp"
+#include "client/renderer/Textures.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/Minecraft.hpp"

 class Tesselator;

@@ -75,4 +74,3 @@ private:
 	int height;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI__NinePatch_H__*/
--- a/src/client/gui/components/OptionsGroup.cpp
+++ b/src/client/gui/components/OptionsGroup.cpp
@@ -1,11 +1,11 @@
-#include "OptionsGroup.h"
-#include "../../Minecraft.h"
-#include "ImageButton.h"
-#include "OptionsItem.h"
-#include "Slider.h"
-#include "../../../locale/I18n.h"
-#include "TextOption.h"
-#include "KeyOption.h"
+#include "OptionsGroup.hpp"
+#include "client/Minecraft.hpp"
+#include "ImageButton.hpp"
+#include "OptionsItem.hpp"
+#include "Slider.hpp"
+#include "locale/I18n.hpp"
+#include "TextOption.hpp"
+#include "KeyOption.hpp"

 OptionsGroup::OptionsGroup( std::string labelID )  {
 	label = I18n::get(labelID);
--- a/src/client/gui/components/OptionsGroup.hpp
+++ b/src/client/gui/components/OptionsGroup.hpp
@@ -1,12 +1,11 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
+#pragma once

 //package net.minecraft.client.gui;

 #include <string>
-#include "GuiElementContainer.h"
-#include "ScrollingPane.h"
-#include "../../Options.h"
+#include "GuiElementContainer.hpp"
+#include "ScrollingPane.hpp"
+#include "client/Options.hpp"

 class Font;
 class Minecraft;
@@ -29,4 +28,3 @@ protected:
 	std::string label;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/
--- a/src/client/gui/components/OptionsItem.cpp
+++ b/src/client/gui/components/OptionsItem.cpp
@@ -1,7 +1,7 @@
-#include "OptionsItem.h"
-#include "../../Minecraft.h"
-#include "../../../locale/I18n.h"
-#include "../../../util/Mth.h"
+#include "OptionsItem.hpp"
+#include "client/Minecraft.hpp"
+#include "locale/I18n.hpp"
+#include "util/Mth.hpp"
 OptionsItem::OptionsItem( OptionId optionId, std::string label, GuiElement* element )
 : GuiElementContainer(false, true, 0, 0, 24, 12),
  m_optionId(optionId),
--- a/src/client/gui/components/OptionsItem.hpp
+++ b/src/client/gui/components/OptionsItem.hpp
@@ -1,11 +1,10 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsItem_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsItem_H__
+#pragma once

 #include <string>
 #include <vector>
-#include "GuiElementContainer.h"
-#include "../../../world/item/ItemInstance.h"
-#include "../../../client/Options.h"
+#include "GuiElementContainer.hpp"
+#include "world/item/ItemInstance.hpp"
+#include "client/Options.hpp"
 class Font; 
 class Textures;
 class NinePatchLayer;
@@ -24,4 +23,3 @@ private:
 	std::string m_label;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsItem_H__*/
--- a/src/client/gui/components/RolledSelectionListH.cpp
+++ b/src/client/gui/components/RolledSelectionListH.cpp
@@ -1,14 +1,14 @@
-#include "RolledSelectionListH.h"
-#include "../../Minecraft.h"
-#include "../../renderer/Tesselator.h"
-#include "../../renderer/gles.h"
-#include "../../../platform/input/Mouse.h"
-#include "../../../platform/input/Multitouch.h"
-#include "../../../util/Mth.h"
-#include "../../renderer/Textures.h"
+#include "RolledSelectionListH.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/gles.hpp"
+#include "platform/input/Mouse.hpp"
+#include "platform/input/Multitouch.hpp"
+#include "util/Mth.hpp"
+#include "client/renderer/Textures.hpp"
+#include "MinecraftClient.hpp"


-RolledSelectionListH::RolledSelectionListH( Minecraft* minecraft, int width, int height, int x0, int x1, int y0, int y1, int itemWidth )
+RolledSelectionListH::RolledSelectionListH( MinecraftClient& minecraft, int width, int height, int x0, int x1, int y0, int y1, int itemWidth )
 :	minecraft(minecraft),
 	width(width),
 	height(height),
@@ -172,7 +172,7 @@ void RolledSelectionListH::render( int xm, int ym, float a )

 	//LOGI("x: %f\n", xo);

-	minecraft->textures->loadAndBindTexture("gui/background.png");
+	minecraft.textures().loadAndBindTexture("gui/background.png");
 	glColor4f2(1.0f, 1, 1, 1);
 	float s = 32;
 	t.begin();
@@ -280,7 +280,7 @@ void RolledSelectionListH::render( int xm, int ym, float a )
 void RolledSelectionListH::renderHoleBackground( /*float x0, float x1,*/ float y0, float y1, int a0, int a1 )
 {
 	Tesselator& t = Tesselator::instance;
-	minecraft->textures->loadAndBindTexture("gui/background.png");
+	minecraft.textures().loadAndBindTexture("gui/background.png");
 	glColor4f2(1.0f, 1, 1, 1);
 	float s = 32;
 	t.begin();
--- a/src/client/gui/components/RolledSelectionListH.hpp
+++ b/src/client/gui/components/RolledSelectionListH.hpp
@@ -1,8 +1,7 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__RolledSelectionListH_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__RolledSelectionListH_H__
+#pragma once

-#include "../GuiComponent.h"
-class Minecraft;
+#include "client/gui/GuiComponent.hpp"
+class MinecraftClient;
 class Tesselator;


@@ -12,7 +11,7 @@ class RolledSelectionListH : public GuiComponent
 	static const int DRAG_OUTSIDE	= -2;
 	static const int DRAG_NORMAL	=  0;
 public:
-	RolledSelectionListH(Minecraft* minecraft, int width, int height, int x0, int x1, int y0, int y1, int itemWidth);
+	RolledSelectionListH(MinecraftClient& minecraft, int width, int height, int x0, int x1, int y0, int y1, int itemWidth);

 	virtual int getItemAtPosition(int x, int y);

@@ -45,7 +44,7 @@ protected:
 	virtual void clickedHeader(int headerMouseX, int headerMouseY) {}
 	int getItemAtXPositionRaw(int x);
 protected:
-	Minecraft* minecraft;
+	MinecraftClient& minecraft;

 	float x0;
 	float x1;
@@ -79,4 +78,3 @@ private:
 	float _lastxoo;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__RolledSelectionListH_H__*/
--- a/src/client/gui/components/RolledSelectionListV.cpp
+++ b/src/client/gui/components/RolledSelectionListV.cpp
@@ -1,10 +1,10 @@
-#include "RolledSelectionListV.h"
-#include "../../Minecraft.h"
-#include "../../renderer/Tesselator.h"
-#include "../../renderer/gles.h"
-#include "../../../platform/input/Mouse.h"
-#include "../../../util/Mth.h"
-#include "../../renderer/Textures.h"
+#include "RolledSelectionListV.hpp"
+#include "client/Minecraft.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/gles.hpp"
+#include "platform/input/Mouse.hpp"
+#include "util/Mth.hpp"
+#include "client/renderer/Textures.hpp"


 RolledSelectionListV::RolledSelectionListV( Minecraft* minecraft_, int width_, int height_, int x0_, int x1_, int y0_, int y1_, int itemHeight_ )
--- a/src/client/gui/components/RolledSelectionListV.hpp
+++ b/src/client/gui/components/RolledSelectionListV.hpp
@@ -1,7 +1,6 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__RolledSelectionListV_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__RolledSelectionListV_H__
+#pragma once

-#include "../GuiComponent.h"
+#include "client/gui/GuiComponent.hpp"
 class Minecraft;
 class Tesselator;

@@ -91,4 +90,3 @@ private:
 	float _stickPixels;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__RolledSelectionListV_H__*/
--- a/src/client/gui/components/ScrolledSelectionList.cpp
+++ b/src/client/gui/components/ScrolledSelectionList.cpp
@@ -1,9 +1,9 @@
-#include "ScrolledSelectionList.h"
-#include "../../Minecraft.h"
-#include "../../renderer/Tesselator.h"
-#include "../../renderer/gles.h"
-#include "../../../platform/input/Mouse.h"
-#include "../../renderer/Textures.h"
+#include "ScrolledSelectionList.hpp"
+#include "client/Minecraft.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/gles.hpp"
+#include "platform/input/Mouse.hpp"
+#include "client/renderer/Textures.hpp"

 static int Abs(int d) {
 	return d >= 0? d : -d;
--- a/src/client/gui/components/ScrolledSelectionList.hpp
+++ b/src/client/gui/components/ScrolledSelectionList.hpp
@@ -1,7 +1,6 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ScrolledSelectionList_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ScrolledSelectionList_H__
+#pragma once

-#include "../GuiComponent.h"
+#include "client/gui/GuiComponent.hpp"
 class Minecraft;
 class Tesselator;

@@ -66,4 +65,3 @@ private:
 	int headerHeight;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ScrolledSelectionList_H__*/
--- a/src/client/gui/components/ScrollingPane.cpp
+++ b/src/client/gui/components/ScrollingPane.cpp
@@ -1,8 +1,8 @@
-#include "ScrollingPane.h"
-#include "../../renderer/gles.h"
-#include "../Gui.h"
-#include "../../../util/Mth.h"
-#include "../../../SharedConstants.h"
+#include "ScrollingPane.hpp"
+#include "client/renderer/gles.hpp"
+#include "client/gui/Gui.hpp"
+#include "util/Mth.hpp"
+#include "SharedConstants.hpp"

 #define STR(x) (x.toString().c_str())

--- a/src/client/gui/components/ScrollingPane.hpp
+++ b/src/client/gui/components/ScrollingPane.hpp
@@ -1,11 +1,10 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ScrollingPane_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ScrollingPane_H__
+#pragma once

-#include "../GuiComponent.h"
-#include "ImageButton.h"
-#include "../../player/input/touchscreen/TouchAreaModel.h"
-#include "../../../world/phys/Vec3.h"
-#include "../../Timer.h"
+#include "client/gui/GuiComponent.hpp"
+#include "ImageButton.hpp"
+#include "client/player/input/touchscreen/TouchAreaModel.hpp"
+#include "world/phys/Vec3.hpp"
+#include "client/Timer.hpp"

 enum ScrollingPaneFlags {
 	SF_LockX		= 1 << 0,
@@ -200,4 +199,3 @@ private:
 	float _ly;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__ScrollingPane_H__*/
--- a/src/client/gui/components/Slider.cpp
+++ b/src/client/gui/components/Slider.cpp
@@ -1,9 +1,9 @@
-#include "Slider.h"
-#include "../../Minecraft.h"
-#include "../../renderer/Textures.h"
-#include "../Screen.h"
-#include "../../../locale/I18n.h"
-#include "../../../util/Mth.h"
+#include "Slider.hpp"
+#include "client/Minecraft.hpp"
+#include "client/renderer/Textures.hpp"
+#include "client/gui/Screen.hpp"
+#include "locale/I18n.hpp"
+#include "util/Mth.hpp"
 #include <algorithm>
 #include <assert.h>

--- a/src/client/gui/components/Slider.hpp
+++ b/src/client/gui/components/Slider.hpp
@@ -1,9 +1,8 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__Slider_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__Slider_H__
+#pragma once

-#include "GuiElement.h"
-#include "../../../client/Options.h"
-#include <client/Option.h>
+#include "GuiElement.hpp"
+#include "client/Options.hpp"
+#include <client/Option.hpp>

 class Slider : public GuiElement {
 	typedef GuiElement super;
@@ -45,4 +44,3 @@ protected:
 	OptionInt* m_option;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__Slider_H__*/
--- a/src/client/gui/components/TextBox.cpp
+++ b/src/client/gui/components/TextBox.cpp
@@ -1,8 +1,8 @@
-#include "TextBox.h"
-#include "../Gui.h"
-#include "../../Minecraft.h"
-#include "../../../AppPlatform.h"
-#include "../../../platform/input/Mouse.h"
+#include "TextBox.hpp"
+#include "client/gui/Gui.hpp"
+#include "client/Minecraft.hpp"
+#include "AppPlatform.hpp"
+#include "platform/input/Mouse.hpp"

 // delegate constructors
 TextBox::TextBox(int id, const std::string& msg)
--- a/src/client/gui/components/TextBox.hpp
+++ b/src/client/gui/components/TextBox.hpp
@@ -1,13 +1,12 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__TextBox_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__TextBox_H__
+#pragma once

 //package net.minecraft.client.gui;

 #include <string>
-#include "GuiElement.h"
-#include "../../Options.h"
-#include "../../../platform/input/Mouse.h"
-#include "../../../platform/input/Keyboard.h"
+#include "GuiElement.hpp"
+#include "client/Options.hpp"
+#include "platform/input/Mouse.hpp"
+#include "platform/input/Keyboard.hpp"

 class Font;
 class Minecraft;
@@ -41,4 +40,3 @@ public:
 	bool blink;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__TextBox_H__*/
--- a/src/client/gui/components/TextOption.cpp
+++ b/src/client/gui/components/TextOption.cpp
@@ -1,5 +1,5 @@
-#include "TextOption.h"
-#include <client/Minecraft.h>
+#include "TextOption.hpp"
+#include <client/Minecraft.hpp>

 TextOption::TextOption(Minecraft* minecraft, OptionId optId) 
    : TextBox((int)optId, minecraft->options.getOpt(optId)->getStringId()) 
--- a/src/client/gui/components/TextOption.hpp
+++ b/src/client/gui/components/TextOption.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "TextBox.h"
-#include <client/Options.h>
+#include "TextBox.hpp"
+#include <client/Options.hpp>

 class TextOption : public TextBox {
 public:
--- a/src/client/gui/screens/ArmorScreen.cpp
+++ b/src/client/gui/screens/ArmorScreen.cpp
@@ -1,18 +1,18 @@
-#include "ArmorScreen.h"
-#include "../Screen.h"
-#include "../components/NinePatch.h"
-#include "../../Minecraft.h"
-#include "../../player/LocalPlayer.h"
-#include "../../renderer/Tesselator.h"
-#include "../../renderer/entity/ItemRenderer.h"
-#include "../../../world/item/Item.h"
-#include "../../../world/item/ItemCategory.h"
-#include "../../../world/entity/player/Inventory.h"
-#include "../../../world/entity/item/ItemEntity.h"
-#include "../../../world/level/Level.h"
-#include "../../../network/RakNetInstance.h"
-#include "../../renderer/entity/EntityRenderDispatcher.h"
-#include "../../../world/item/ArmorItem.h"
+#include "ArmorScreen.hpp"
+#include "client/gui/Screen.hpp"
+#include "client/gui/components/NinePatch.hpp"
+#include "client/Minecraft.hpp"
+#include "client/player/LocalPlayer.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/entity/ItemRenderer.hpp"
+#include "world/item/Item.hpp"
+#include "world/item/ItemCategory.hpp"
+#include "world/entity/player/Inventory.hpp"
+#include "world/entity/item/ItemEntity.hpp"
+#include "world/level/Level.hpp"
+#include "network/RakNetInstance.hpp"
+#include "client/renderer/entity/EntityRenderDispatcher.hpp"
+#include "world/item/ArmorItem.hpp"

 static void setIfNotSet(bool& ref, bool condition) {
 	ref = (ref || condition);
--- a/src/client/gui/screens/ArmorScreen.hpp
+++ b/src/client/gui/screens/ArmorScreen.hpp
@@ -1,10 +1,9 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_SCREENS__ArmorScreen_H__
-#define NET_MINECRAFT_CLIENT_GUI_SCREENS__ArmorScreen_H__
+#pragma once

-#include "BaseContainerScreen.h"
+#include "BaseContainerScreen.hpp"

-#include "../components/InventoryPane.h"
-#include "../components/Button.h"
+#include "client/gui/components/InventoryPane.hpp"
+#include "client/gui/components/Button.hpp"

 class Font;
 class CItem;
@@ -76,4 +75,3 @@ private:
 	Player* player;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__ArmorScreen_H__*/
--- a/src/client/gui/screens/BaseContainerScreen.hpp
+++ b/src/client/gui/screens/BaseContainerScreen.hpp
@@ -1,12 +1,11 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI__BaseContainerScreen_H__
-#define NET_MINECRAFT_CLIENT_GUI__BaseContainerScreen_H__
+#pragma once

 //package net.minecraft.client.gui.screens;

 #include <vector>
-#include "../Screen.h"
-#include "../../Minecraft.h"
-#include "../../player/LocalPlayer.h"
+#include "client/gui/Screen.hpp"
+#include "client/Minecraft.hpp"
+#include "client/player/LocalPlayer.hpp"

 class BaseContainerMenu;

@@ -47,4 +46,3 @@ protected:
 	BaseContainerMenu* menu;
 };

-#endif /*NET_MINECRAFT_CLIENT_GUI__BaseContainerScreen_H__*/
--- a/src/client/gui/screens/ChatScreen.cpp
+++ b/src/client/gui/screens/ChatScreen.cpp
@@ -1,9 +1,9 @@
-#include "ChatScreen.h"
-#include "DialogDefinitions.h"
-#include "../Gui.h"
-#include "../../Minecraft.h"
-#include "../../../AppPlatform.h"
-#include "../../../platform/log.h"
+#include "ChatScreen.hpp"
+#include "DialogDefinitions.hpp"
+#include "client/gui/Gui.hpp"
+#include "client/Minecraft.hpp"
+#include "AppPlatform.hpp"
+#include "platform/log.hpp"

 void ChatScreen::init() {
 	minecraft->platform()->createUserInput(DialogDefinitions::DIALOG_NEW_CHAT_MESSAGE);
--- a/src/client/gui/screens/ChatScreen.h
+++ b/src/client/gui/screens/ChatScreen.h
@@ -1,21 +0,0 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_SCREENS__ChatScreen_H__
-#define NET_MINECRAFT_CLIENT_GUI_SCREENS__ChatScreen_H__
-
-#include "../Screen.h"
-
-class ChatScreen: public Screen
-{
-public:
-	ChatScreen() {}
-	virtual ~ChatScreen() {}
-
-	void init();
-
-	void render(int xm, int ym, float a);
-
-	void buttonClicked(Button* button) {};
-
-private:
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__ChatScreen_H__*/
--- a/src/client/gui/screens/ChatScreen.hpp
+++ b/src/client/gui/screens/ChatScreen.hpp
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "client/gui/Screen.hpp"
+
+class ChatScreen: public Screen
+{
+public:
+	ChatScreen() {}
+	virtual ~ChatScreen() {}
+
+	void init();
+
+	void render(int xm, int ym, float a);
+
+	void buttonClicked(Button* button) {};
+
+private:
+};
+
--- a/src/client/gui/screens/ChestScreen.cpp
+++ b/src/client/gui/screens/ChestScreen.cpp
@@ -1,28 +1,28 @@
-#include "ChestScreen.h"
-#include "touch/TouchStartMenuScreen.h"
-#include "../Screen.h"
-#include "../components/NinePatch.h"
-#include "../../Minecraft.h"
-#include "../../player/LocalPlayer.h"
-#include "../../renderer/Tesselator.h"
-#include "../../renderer/entity/ItemRenderer.h"
-#include "../../../world/item/Item.h"
-#include "../../../world/item/ItemCategory.h"
-#include "../../../world/entity/player/Inventory.h"
-#include "../../../world/entity/item/ItemEntity.h"
-#include "../../../world/level/Level.h"
-#include "../../../locale/I18n.h"
-#include "../../../util/StringUtils.h"
-#include "../../../network/packet/ContainerSetSlotPacket.h"
-#include "../../../network/RakNetInstance.h"
-#include "../../../world/level/tile/entity/TileEntity.h"
-#include "../../../world/level/tile/entity/ChestTileEntity.h"
-#include "../../../world/inventory/ContainerMenu.h"
-#include "../../../util/Mth.h"
+#include "ChestScreen.hpp"
+#include "touch/TouchStartMenuScreen.hpp"
+#include "client/gui/Screen.hpp"
+#include "client/gui/components/NinePatch.hpp"
+#include "client/Minecraft.hpp"
+#include "client/player/LocalPlayer.hpp"
+#include "client/renderer/Tesselator.hpp"
+#include "client/renderer/entity/ItemRenderer.hpp"
+#include "world/item/Item.hpp"
+#include "world/item/ItemCategory.hpp"
+#include "world/entity/player/Inventory.hpp"
+#include "world/entity/item/ItemEntity.hpp"
+#include "world/level/Level.hpp"
+#include "locale/I18n.hpp"
+#include "util/StringUtils.hpp"
+#include "network/packet/ContainerSetSlotPacket.hpp"
+#include "network/RakNetInstance.hpp"
+#include "world/level/tile/entity/TileEntity.hpp"
+#include "world/level/tile/entity/ChestTileEntity.hpp"
+#include "world/inventory/ContainerMenu.hpp"
+#include "util/Mth.hpp"

 //static NinePatchLayer* guiPaneFrame = NULL;

-static __inline void setIfNotSet(bool& ref, bool condition) {
+static inline void setIfNotSet(bool& ref, bool condition) {
 	ref = (ref || condition);
 }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kolyah35	7418263193	.h -> .hpp everything	2026-03-28 01:08:50 +03:00
Kolyah35	7d3257669a	pragma once everywhere	2026-03-28 00:00:19 +03:00
Kolyah35	a45c01d013	server compilable	2026-03-26 03:55:28 +03:00
Kolyah35	cbd81b47ce	ADD: EpikIzCool to credits	2026-03-24 17:32:52 +03:00
Kolyah35	c146791845	Merge pull request 'Fix Whool and block variations n slabs n stuff' (#13 ) from EpikIzCool/minecraft-pe-0.6.1:main into main Reviewed-on: https://192.168.0.2:3000/Kolyah35/minecraft-pe-0.6.1/pulls/13	2026-03-24 16:31:46 +02:00
EpikIzCool	a7c75d2ad2	Touch thingie	2026-03-24 00:29:52 +02:00
EpikIzCool	468ae4a211	Whool Fix part 1	2026-03-24 00:24:16 +02:00