Add grass item support

.github/workflows/build.yml

@@ -60,16 +60,13 @@ jobs:
 
       - name: Build
         working-directory: ${{github.workspace}}/build
-        run: |
-          cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
-          cmake --build . --config $BUILD_TYPE --target MinecraftPE-server --parallel
+        run: cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
       
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: mcpe-windows
           path: |
-            ${{github.workspace}}/build/MinecraftPE-server.exe
             ${{github.workspace}}/build/MinecraftPE.exe
             ${{github.workspace}}/build/libpng16.dll
             ${{github.workspace}}/build/OpenAL32.dll
@@ -303,12 +300,6 @@ jobs:
           files: mcpe-windows/MinecraftPE.exe mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/libz.dll
           dest: minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
 
-      - name: Zip Windows Server Artifacts
-        uses: vimtor/action-zip@v1.2
-        with:
-          files: mcpe-windows/MinecraftPE-server.exe
-          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}-windows.zip
-
       - name: Zip Linux Artifacts
         uses: vimtor/action-zip@v1.2
         with:
@@ -319,7 +310,7 @@ jobs:
         uses: vimtor/action-zip@v1.2
         with:
           files: mcpe-linux/MinecraftPE-server
-          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}-linux.zip
+          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
 
       - name: Rename Android Artifacts
         run: |
@@ -352,11 +343,7 @@ jobs:
             ./data.zip
             ./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
-            ./minecraftpe-server-${{ steps.ref.outputs.hash }}-windows.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.apk
             ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.apk
-            ./minecraftpe-server-${{ steps.ref.outputs.hash }}-linux.zip
-            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
-            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-web.zip

CMakeLists.txt

@@ -3,9 +3,10 @@ project(MinecraftPE)
 
 include(cmake/CPM.cmake)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
+
 include(cmake/EnumOption.cmake)
 
 if(EMSCRIPTEN)
@@ -33,11 +34,9 @@ if (${PLATFORM} STREQUAL "Desktop")
         add_definitions(-D_CRT_SECURE_NO_WARNINGS)
         include_directories(misc/windows)
         set(EXTRA_LIBS ws2_32 winhttp)
-        add_definitions(-DLUA_DL_DLL=1)
     elseif(UNIX)
         find_library(pthread NAMES pthread)
         set(EXTRA_LIBS pthread m)
-        add_definitions(-DLUA_USE_DLOPEN=1)
     endif()
 
 elseif (${PLATFORM} STREQUAL "Web")
@@ -96,46 +95,6 @@ else()
             "GLFW_BUILD_TESTS OFF"
             "GLFW_BUILD_DOCS OFF"
     )
-
-    CPMAddPackage("gh:halx99/sol2#support-lua-5.5")
-    CPMAddPackage("gh:lua/lua#master")
-
-    add_library(
-        lua STATIC
-        ${lua_SOURCE_DIR}/lapi.c
-        ${lua_SOURCE_DIR}/lauxlib.c
-        ${lua_SOURCE_DIR}/lbaselib.c
-        ${lua_SOURCE_DIR}/lcode.c
-        ${lua_SOURCE_DIR}/lcorolib.c
-        ${lua_SOURCE_DIR}/lctype.c
-        ${lua_SOURCE_DIR}/ldblib.c
-        ${lua_SOURCE_DIR}/ldebug.c
-        ${lua_SOURCE_DIR}/ldo.c
-        ${lua_SOURCE_DIR}/ldump.c
-        ${lua_SOURCE_DIR}/lfunc.c
-        ${lua_SOURCE_DIR}/lgc.c
-        ${lua_SOURCE_DIR}/linit.c
-        ${lua_SOURCE_DIR}/liolib.c
-        ${lua_SOURCE_DIR}/llex.c
-        ${lua_SOURCE_DIR}/lmathlib.c
-        ${lua_SOURCE_DIR}/lmem.c
-        ${lua_SOURCE_DIR}/loadlib.c
-        ${lua_SOURCE_DIR}/lobject.c
-        ${lua_SOURCE_DIR}/lopcodes.c
-        ${lua_SOURCE_DIR}/loslib.c
-        ${lua_SOURCE_DIR}/lparser.c
-        ${lua_SOURCE_DIR}/lstate.c
-        ${lua_SOURCE_DIR}/lstring.c
-        ${lua_SOURCE_DIR}/lstrlib.c
-        ${lua_SOURCE_DIR}/ltable.c
-        ${lua_SOURCE_DIR}/ltablib.c
-        ${lua_SOURCE_DIR}/ltm.c
-        ${lua_SOURCE_DIR}/lua.c
-        ${lua_SOURCE_DIR}/lundump.c
-        ${lua_SOURCE_DIR}/lutf8lib.c
-        ${lua_SOURCE_DIR}/lvm.c
-        ${lua_SOURCE_DIR}/lzio.c
-    )
 endif()
 
 CPMAddPackage(
@@ -152,6 +111,7 @@ CPMAddPackage(
         "ALSOFT_STATIC_LIBGCC ON"
 )
 
+# TODO: Clear this paths with *
 file(GLOB SERVER_SOURCES
     "project/lib_projects/raknet/jni/RaknetSources/*.cpp"
     "src/NinecraftApp.cpp"
@@ -190,6 +150,7 @@ file(GLOB SERVER_SOURCES
 
     "src/platform/CThread.cpp"
     "src/platform/HttpClient.cpp"
+    "src/platform/PngLoader.cpp"
     "src/platform/time.cpp"
 
     "src/platform/input/Controller.cpp"
@@ -255,9 +216,6 @@ file(GLOB SERVER_SOURCES
     "src/world/level/tile/entity/*.cpp"
 
     "src/world/phys/HitResult.cpp"
-    "src/commands/*.cpp"
-
-    "src/plugins/*.cpp"
 ) 
 
 file(GLOB CLIENT_SOURCES 
@@ -341,10 +299,6 @@ file(GLOB CLIENT_SOURCES
 
     "src/AppPlatform_glfw.cpp"
     "src/main.cpp"
-
-    "src/commands/*.cpp"
-    "src/plugins/*.cpp"
-
 )
 
 if (${PLATFORM} STREQUAL "Desktop")
@@ -352,21 +306,21 @@ if (${PLATFORM} STREQUAL "Desktop")
 endif()
 
 # Server
-add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
-set_target_properties("${PROJECT_NAME}-server" PROPERTIES ENABLE_EXPORTS TRUE)
-target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
+if(UNIX)
+    add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
 
-target_include_directories("${PROJECT_NAME}-server" PUBLIC 
-    "${CMAKE_SOURCE_DIR}/src/"
-    "${lua_SOURCE_DIR}/"
+    target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
 
-    "project/lib_projects/raknet/jni/RaknetSources"
-)
+    target_include_directories("${PROJECT_NAME}-server" PUBLIC 
+        "${CMAKE_SOURCE_DIR}/glad/include/"
+        "${CMAKE_SOURCE_DIR}/src/"
+        "project/lib_projects/raknet/jni/RaknetSources"
+    )
 
-target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS} lua sol2::sol2)
+    target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT})
+endif()
 
 add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
-set_target_properties(${PROJECT_NAME} PROPERTIES ENABLE_EXPORTS TRUE)
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP})
 
@@ -376,8 +330,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     "${openal_SOURCE_DIR}/include"
     "${glfw_SOURCE_DIR}/include"
     "lib/include"
-    "${lua_SOURCE_DIR}/"
-
 )
 
 if(${PLATFORM} MATCHES "Web")
@@ -425,7 +377,7 @@ endif()
 
 # Client
 target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM})
-target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS} lua sol2::sol2)
+target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS})
 
 if (OpenSSL_FOUND)
     target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)

data/lang/en_US.lang

@@ -229,12 +229,6 @@ options.fancyGraphics=Fancy graphics
 options.renderDebug=Debug render
 options.anaglyph3d=3D anaglyph
 
-options.windowScale =Window Scaling
-
-options.menuStyle =Menu Style 
-options.menuStyle.pocket =Pocket Edition
-options.menuStyle.xperia =Xperia/Pi
-options.menuStyle.java =Java Beta
 
 performance.max=Max FPS
 performance.balanced=Balanced

project/android/jni/Android.mk

@@ -110,7 +110,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/renderer/Textures.cpp \
 ../../../src/client/renderer/TileRenderer.cpp \
 ../../../src/client/renderer/gles.cpp \
-../../../src/world/level/LevelConstants.cpp \
 ../../../src/client/renderer/culling/Frustum.cpp \
 ../../../src/client/renderer/entity/ArrowRenderer.cpp \
 ../../../src/client/renderer/entity/ChickenRenderer.cpp \
@@ -141,12 +140,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/network/Packet.cpp \
 ../../../src/network/RakNetInstance.cpp \
 ../../../src/network/ServerSideNetworkHandler.cpp \
-../../../src/commands/Command.cpp \
-../../../src/commands/CommandHelp.cpp \
-../../../src/commands/CommandKick.cpp \
-../../../src/commands/CommandBan.cpp \
-../../../src/commands/CommandManager.cpp \
-../../../src/commands/CommandOp.cpp \
 ../../../src/server/ServerLevel.cpp \
 ../../../src/server/ServerPlayer.cpp \
 ../../../src/util/DataIO.cpp \

project/android_java/jni/Android.mk

@@ -232,7 +232,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/level/tile/entity/TileEntity.cpp \
 ../../../src/world/level/tile/entity/FurnaceTileEntity.cpp \
 ../../../src/world/phys/HitResult.cpp
-../../../src/world/level/LevelConstants.cpp
 
 LOCAL_CFLAGS := -Wno-psabi $(LOCAL_CFLAGS)
 

project/android_java/src/com/mojang/minecraftpe/sound/SoundPlayer.java

@@ -129,7 +129,6 @@ public class SoundPlayer
 			new SoundId(R.raw.eat1, "random.eat"),
 			new SoundId(R.raw.eat2, "random.eat"),
 			new SoundId(R.raw.eat3, "random.eat"),
-			new SoundId(R.raw.burp1, "random.burp"),
 			new SoundId(R.raw.fuse, "random.fuse"),
 
 			new SoundId(R.raw.zpig1, "mob.zombiepig.zpig"),

project/lib_projects/raknet/jni/RaknetSources/GetTime.cpp

@@ -140,7 +140,7 @@ RakNet::TimeUS GetTimeUS_Windows( void )
 #if _MSC_VER >= 1400 && defined (_M_X64)
 		GetProcessAffinityMask(mProc, (PDWORD_PTR)&mProcMask, (PDWORD_PTR)&mSysMask);
 #else
-		GetProcessAffinityMask(mProc, (PDWORD_PTR)&mProcMask, (PDWORD_PTR)&mSysMask);
+		GetProcessAffinityMask(mProc, &mProcMask, &mSysMask);
 #endif
 		mThread = GetCurrentThread();
 

project/lib_projects/raknet/jni/RaknetSources/Rand.cpp

@@ -142,8 +142,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 	// so-- that's why the only change I made is to restrict to odd seeds.
 	//
 
-	unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
-	int j;
+	register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
+	register int j;
 
 	for ( left = 0, *s++ = x, j = N; --j;
 		*s++ = ( x *= 69069U ) & 0xFFFFFFFFU )
@@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 
 unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left )
 {
-	unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
-	int j;
+	register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
+	register int j;
 
 	if ( left < -1 )
 		seedMT( 4357U );

src/NinecraftApp.cpp

@@ -136,7 +136,7 @@ void NinecraftApp::teardown()
 	Recipes ::teardownRecipes();
 	TileEntity::teardownTileEntities();
 #endif
-#if defined(WIN32) && !defined(STANDALONE_SERVER)
+#ifdef WIN32
 	ItemRenderer::teardown_static();
 	if (EntityTileRenderer::instance != NULL) {
 		delete EntityTileRenderer::instance;

src/client/Minecraft.cpp

@@ -2,7 +2,6 @@
 #include "Options.h"
 #include "client/Options.h"
 #include "client/player/input/IBuildInput.h"
-#include "commands/CommandManager.hpp"
 #include "platform/input/Keyboard.h"
 #include "world/item/Item.h"
 #include "world/item/ItemInstance.h"
@@ -11,11 +10,11 @@
 
 
 #if defined(APPLE_DEMO_PROMOTION)
-#define NO_NETWORK
+    #define NO_NETWORK
 #endif
 
 #if defined(RPI)
-#define CREATORMODE
+	#define CREATORMODE
 #endif
 #include "../network/RakNetInstance.h"
 #include "../network/ClientSideNetworkHandler.h"
@@ -92,19 +91,15 @@
 #include "../network/command/CommandServer.h"
 #include "gamemode/CreatorMode.h"
 
-
-#ifndef STANDALONE_SERVER
 #include "../world/level/GrassColor.h"
 #include "renderer/LevelRenderer.h"
 #include "particle/ParticleEngine.h"
-#endif
 #include "../world/level/Level.h"
-
 static void checkGlError(const char* tag) {
 #ifdef GLDEBUG
 	while (1) {
-		const int errCode = glGetError();
-		if (errCode == GL_NO_ERROR) break;
+        const int errCode = glGetError();
+        if (errCode == GL_NO_ERROR) break;
 
 		LOGE("################\nOpenGL-error @ %s : #%d\n", tag, errCode);
 	}
@@ -122,7 +117,7 @@ const char* Minecraft::progressMessages[] = {
 int Minecraft::customDebugId = Minecraft::CDI_NONE;
 
 #if defined(_MSC_VER)
-#pragma warning( disable : 4355 ) // 'this' pointer in initialization list which is perfectly legal
+	#pragma warning( disable : 4355 ) // 'this' pointer in initialization list which is perfectly legal
 #endif
 
 bool Minecraft::useAmbientOcclusion = false;
@@ -180,18 +175,17 @@ Minecraft::Minecraft() :
 	width(1), height(1),
 	//_respawnPlayerTicks(-1),
 #ifdef __APPLE__
-	_isSuperFast(false),
+    _isSuperFast(false),
 #endif
 	_powerVr(false),
 	commandPort(4711),
 	reserved_d1(0),reserved_d2(0),
-	reserved_f1(0),reserved_f2(0), options(this),
-	m_commandManager()
+	reserved_f1(0),reserved_f2(0), options(this)
 {
-	//#ifdef ANDROID
+//#ifdef ANDROID
 
 #if defined(NO_NETWORK)
-	raknetInstance = new IRakNetInstance();
+    raknetInstance = new IRakNetInstance();
 #else
 	raknetInstance = new RakNetInstance();
 #endif
@@ -267,12 +261,11 @@ void Minecraft::selectLevel( const std::string& levelId, const std::string& leve
 
 void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, LocalPlayer* forceInsertPlayer /* = NULL */) {
 	cameraTargetPlayer = NULL;
+	LOGI("Seed is %ld\n", level->getSeed());
 
 	if (level != NULL) {
-		LOGI("Seed is %ld\n", level->getSeed());
-
 		level->raknetInstance = raknetInstance;
-		gameMode->initLevel(level);
+        gameMode->initLevel(level);
 
 		if (!player && forceInsertPlayer)
 		{
@@ -287,7 +280,6 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc
 			}
 		}
 		this->level = level;
-
 		_hasSignaledGeneratingLevelFinished = false;
 #ifdef STANDALONE_SERVER
 		const bool threadedLevelCreation = false;
@@ -304,18 +296,18 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc
 			// Non-threaded
 			generateLevel("Currently not used", level);
 		}
-	} else {
-		player = NULL;
-	}
+    } else {
+        player = NULL;
+    }
 
-	this->lastTickTime = 0;
+    this->lastTickTime = 0;
 	this->_running = true;
 }
 
 void Minecraft::leaveGame(bool renameLevel /*=false*/)
 {
-	if (isGeneratingLevel || !_hasSignaledGeneratingLevelFinished)
-		return;
+    if (isGeneratingLevel || !_hasSignaledGeneratingLevelFinished)
+        return;
     
 	isGeneratingLevel = false;
 	bool saveLevel = level && (!level->isClientSide || renameLevel);
@@ -371,29 +363,29 @@ void Minecraft::prepareLevel(const std::string& title) {
 	if (!level->isNew())
 		level->setUpdateLights(false);
 
-	int Max = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH;
+	int Max = CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
 	int pp = 0;
-	for (int x = 8; x < (LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH); x += LevelConstants::CHUNK_WIDTH) {
-        for (int z = 8; z < (LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH); z += LevelConstants::CHUNK_WIDTH) {
+	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);
+            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 < LevelConstants::CHUNK_CACHE_WIDTH; x++)
+	for (int x = 0; x < CHUNK_CACHE_WIDTH; x++)
 	{
-		for (int z = 0; z < LevelConstants::CHUNK_CACHE_WIDTH; z++)
+		for (int z = 0; z < CHUNK_CACHE_WIDTH; z++)
 		{
 			LevelChunk* chunk = level->getChunk(x, z);
 			if (chunk && !chunk->createdFromSave)
@@ -474,16 +466,16 @@ void Minecraft::update() {
 	}
 	TIMER_POP();
 
-#ifndef STANDALONE_SERVER
-	if (gameMode != NULL) gameMode->render(timer.a);
-	TIMER_PUSH("sound");
-	soundEngine->update(player, timer.a);
-	TIMER_POP_PUSH("render");
-	gameRenderer->render(timer.a);
-	TIMER_POP();
-#else
+	#ifndef STANDALONE_SERVER
+		if (gameMode != NULL) gameMode->render(timer.a);
+		TIMER_PUSH("sound");
+		soundEngine->update(player, timer.a);
+		TIMER_POP_PUSH("render");
+		gameRenderer->render(timer.a);
+		TIMER_POP();
+	#else
 	CThread::sleep(1);
-#endif
+	#endif
 #ifndef STANDALONE_SERVER
 	Multitouch::resetThisUpdate();
 #endif
@@ -493,14 +485,14 @@ void Minecraft::update() {
 	checkGlError("Update finished");
 
 	if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-		//#ifndef PLATFORM_DESKTOP
+//#ifndef PLATFORM_DESKTOP
 		if (!PerfTimer::enabled) {
 			PerfTimer::reset();
 			PerfTimer::enabled = true;
 		}
 		_perfRenderer->renderFpsMeter(1);
 		checkGlError("render debug");
-		//#endif
+//#endif
 	} else {
 		PerfTimer::enabled = false;
 	}
@@ -577,17 +569,17 @@ void Minecraft::tick(int nTick, int maxTick) {
 #ifndef STANDALONE_SERVER
 	textures->loadAndBindTexture("terrain.png");
 	if (!pause && !(screen && !screen->renderGameBehind())) {
-#if !defined(RPI)
-#ifdef __APPLE__
-		if (isSuperFast())
-#endif
-		{
+		#if !defined(RPI)
+			#ifdef __APPLE__
+			if (isSuperFast())
+			#endif
+			{
 			if (nTick == maxTick) {
 				TIMER_POP_PUSH("textures");
 				textures->tick(true);
 			}
-		}
-#endif
+			}
+		#endif
 	}
 	TIMER_POP_PUSH("particles");
 	if (!pause) {
@@ -649,8 +641,8 @@ void Minecraft::tickInput() {
 	while (Mouse::next()) {
 		//if (Mouse::getButtonState(MouseAction::ACTION_LEFT))
 		//	LOGI("mouse-down-at: %d, %d\n", Mouse::getX(), Mouse::getY());
-		int passedTime = getTimeMs() - lastTickTime;
-		if (passedTime > 200) continue; // @note: As long Mouse::clear CLEARS the whole buffer, it's safe to break here
+        	int passedTime = getTimeMs() - lastTickTime;
+        	if (passedTime > 200) continue; // @note: As long Mouse::clear CLEARS the whole buffer, it's safe to break here
 		// But since it might be rewritten anyway (and hopefully there aren't a lot of messages, we just continue.
 
 		const MouseAction& e = Mouse::getEvent();
@@ -681,14 +673,14 @@ void Minecraft::tickInput() {
 		}
 		/*
 		if (mouseDiggable && options.useMouseForDigging) {
-		if (Mouse::getEventButton() == MouseAction::ACTION_LEFT && Mouse::getEventButtonState()) {
-		handleMouseClick(MouseAction::ACTION_LEFT);
-		lastClickTick = ticks;
-		}
-		if (Mouse::getEventButton() == MouseAction::ACTION_RIGHT && Mouse::getEventButtonState()) {
-		handleMouseClick(MouseAction::ACTION_RIGHT);
-		lastClickTick = ticks;
-		}
+			if (Mouse::getEventButton() == MouseAction::ACTION_LEFT && Mouse::getEventButtonState()) {
+				handleMouseClick(MouseAction::ACTION_LEFT);
+				lastClickTick = ticks;
+			}
+			if (Mouse::getEventButton() == MouseAction::ACTION_RIGHT && Mouse::getEventButtonState()) {
+				handleMouseClick(MouseAction::ACTION_RIGHT);
+				lastClickTick = ticks;
+			}
 		}
 		*/
 	}
@@ -709,20 +701,20 @@ void Minecraft::tickInput() {
 				if (slot >= 0 && slot < gui.getNumSlots())
 					player->inventory->selectSlot(slot);
 
-#if defined(WIN32)
-				if (digit >= 1 && GetAsyncKeyState(VK_CONTROL) < 0) {
-					// Set adventure settings here!
-					AdventureSettingsPacket p(level->adventureSettings);
-					p.toggle((AdventureSettingsPacket::Flags)(1 << slot));
-					p.fillIn(level->adventureSettings);
-					raknetInstance->send(p);
-				}
-				if (digit == 0) {
-					Pos pos((int)player->x, (int)player->y-1, (int)player->z);
-					SetSpawnPositionPacket p(pos);
-					raknetInstance->send(p);
-				}
-#endif
+				#if defined(WIN32)
+					if (digit >= 1 && GetAsyncKeyState(VK_CONTROL) < 0) {
+						// Set adventure settings here!
+						AdventureSettingsPacket p(level->adventureSettings);
+						p.toggle((AdventureSettingsPacket::Flags)(1 << slot));
+						p.fillIn(level->adventureSettings);
+						raknetInstance->send(p);
+					}
+					if (digit == 0) {
+						Pos pos((int)player->x, (int)player->y-1, (int)player->z);
+						SetSpawnPositionPacket p(pos);
+						raknetInstance->send(p);
+					}
+				#endif
 			}
 
 			if (key == Keyboard::KEY_LEFT_CTRL) {
@@ -741,27 +733,12 @@ void Minecraft::tickInput() {
 				options.toggle(OPTIONS_RENDER_DEBUG);
 			}
 
-			// TODO: replace it with client /give command :face_vomiting:
-			// if (key == Keyboard::KEY_F4) {
-			// 	player->inventory->add(new ItemInstance(Tile::redBrick));
-			// 	player->inventory->add(new ItemInstance(Item::ironIngot, 64));
-			// 	player->inventory->add(new ItemInstance(Item::ironIngot, 34));
-			// 	player->inventory->add(new ItemInstance(Tile::stonecutterBench));
-			// 	player->inventory->add(new ItemInstance(Tile::workBench));
-			// 	player->inventory->add(new ItemInstance(Tile::furnace));
-			// 	player->inventory->add(new ItemInstance(Tile::wood, 54));
-			// 	player->inventory->add(new ItemInstance(Item::stick, 14));
-			// 	player->inventory->add(new ItemInstance(Item::coal, 31));
-			// 	player->inventory->add(new ItemInstance(Tile::sand, 6));
-
-			// }
-
 			if (key == Keyboard::KEY_F5) {
 				options.toggle(OPTIONS_THIRD_PERSON_VIEW);
 				/*
 				ImprovedNoise noise;
 				for (int i = 0; i < 16; ++i)
-				printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
+					printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
 				*/
 			}
 
@@ -774,88 +751,88 @@ void Minecraft::tickInput() {
 				options.set(OPTIONS_VIEW_DISTANCE, (dst + 1) % 4);
 			}
 
-#ifdef CHEATS
-			if (key == Keyboard::KEY_U) {
-				onGraphicsReset();
-				player->heal(100);
-			}
-
-			if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
-				setIsCreativeMode(!isCreativeMode());
-
-			if (key == Keyboard::KEY_P) // Step forward in time
-				level->setTime( level->getTime() + 1000);
-
-			if (key == Keyboard::KEY_G) {
-				setScreen(new ArmorScreen());
-				/*
-				std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
-				LOGI("boxes: %d\n", (int)boxs.size());
-				*/
-			}
-
-			if (key == Keyboard::KEY_Y) {
-				textures->reloadAll();
-				player->hurtTo(2);
-			}
-			if (key == Keyboard::KEY_Z || key == 108) {
-				for (int i = 0; i < 1; ++i) {
-					Mob* mob = NULL;
-					int forceId = 0;//MobTypes::Sheep;
-
-					int types[] = {
-						MobTypes::Sheep,
-						MobTypes::Pig,
-						MobTypes::Chicken,
-						MobTypes::Cow,
-					};
-
-					int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
-					mob = MobFactory::CreateMob(mobType, level);
-
-					//((Animal*)mob)->setAge(-1000);
-					float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
-					float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
-					if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
-						delete mob;
+			#ifdef CHEATS
+				if (key == Keyboard::KEY_U) {
+					onGraphicsReset();
+					player->heal(100);
 				}
-			}
 
-			if (key == Keyboard::KEY_X) {
-				const EntityList& entities = level->getAllEntities();
-				for (int i = entities.size()-1; i >= 0; --i) {
-					Entity* e = entities[i];
-					if (!e->isPlayer())
-						level->removeEntity(e);
+				if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
+					setIsCreativeMode(!isCreativeMode());
+
+				if (key == Keyboard::KEY_P) // Step forward in time
+					level->setTime( level->getTime() + 1000);
+
+				if (key == Keyboard::KEY_G) {
+					setScreen(new ArmorScreen());
+					/*
+					std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
+					LOGI("boxes: %d\n", (int)boxs.size());
+					*/
 				}
-			}
 
-			if (key == Keyboard::KEY_C /*|| key == 4*/) {
-				player->inventory->clearInventoryWithDefault();
-				// @todo: Add saving here for benchmarking
-			}
-			if (key == Keyboard::KEY_H) {
-				setScreen( new PrerenderTilesScreen() );
-			}
-
-			if (key == Keyboard::KEY_O) {
-				for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
-					if (player->inventory->getItem(i))
-						player->inventory->dropSlot(i, false);
-			}
-			if (key == Keyboard::KEY_M) {
-				Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
-				options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
-					Difficulty::NORMAL : Difficulty::PEACEFUL);
-				//setIsCreativeMode( !isCreativeMode() );
-			}
-
-			if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-				if (key >= '0' && key <= '9') {
-					_perfRenderer->debugFpsMeterKeyPress(key - '0');
+				if (key == Keyboard::KEY_Y) {
+					textures->reloadAll();
+					player->hurtTo(2);
 				}
-			}
-#endif
+				if (key == Keyboard::KEY_Z || key == 108) {
+					for (int i = 0; i < 1; ++i) {
+						Mob* mob = NULL;
+						int forceId = 0;//MobTypes::Sheep;
+
+						int types[] = {
+							MobTypes::Sheep,
+							MobTypes::Pig,
+							MobTypes::Chicken,
+							MobTypes::Cow,
+						};
+
+						int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
+						mob = MobFactory::CreateMob(mobType, level);
+
+						//((Animal*)mob)->setAge(-1000);
+						float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
+						float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
+						if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
+							delete mob;
+					}
+				}
+
+				if (key == Keyboard::KEY_X) {
+					const EntityList& entities = level->getAllEntities();
+					for (int i = entities.size()-1; i >= 0; --i) {
+						Entity* e = entities[i];
+						if (!e->isPlayer())
+							level->removeEntity(e);
+					}
+				}
+
+				if (key == Keyboard::KEY_C /*|| key == 4*/) {
+					player->inventory->clearInventoryWithDefault();
+					// @todo: Add saving here for benchmarking
+				}
+				if (key == Keyboard::KEY_H) {
+					setScreen( new PrerenderTilesScreen() );
+				}
+
+				if (key == Keyboard::KEY_O) {
+					for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
+						if (player->inventory->getItem(i))
+							player->inventory->dropSlot(i, false);
+				}
+				if (key == Keyboard::KEY_M) {
+					Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
+					options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
+						Difficulty::NORMAL : Difficulty::PEACEFUL);
+					//setIsCreativeMode( !isCreativeMode() );
+				}
+
+				if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
+					if (key >= '0' && key <= '9') {
+						_perfRenderer->debugFpsMeterKeyPress(key - '0');
+					}
+				}
+			#endif
 
 			if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
 				if (key >= '0' && key <= '9') {
@@ -866,36 +843,33 @@ void Minecraft::tickInput() {
 			if (key == Keyboard::KEY_ESCAPE)
 				pauseGame(false);
 
-#ifdef PLATFORM_DESKTOP
-			if (key == Keyboard::KEY_P) {
-				static bool isWireFrame = false;
-				isWireFrame = !isWireFrame;
-				glPolygonMode(GL_FRONT, isWireFrame? GL_LINE : GL_FILL);
-				//glPolygonMode(GL_BACK, isWireFrame? GL_LINE : GL_FILL);
+			#ifndef OPENGL_ES
+				if (key == Keyboard::KEY_P) {
+					static bool isWireFrame = false;
+					isWireFrame = !isWireFrame;
+					glPolygonMode(GL_FRONT, isWireFrame? GL_LINE : GL_FILL);
+					//glPolygonMode(GL_BACK, isWireFrame? GL_LINE : GL_FILL);
+				}
+			#endif
+		}
+		#ifdef WIN32
+			if (key == Keyboard::KEY_M) {
+				for (int i = 0; i < 5 * SharedConstants::TicksPerSecond; ++i)
+					level->tick();
 			}
-#endif
-		}
-#ifdef WIN32
-		if (key == Keyboard::KEY_M) {
-			for (int i = 0; i < 5 * SharedConstants::TicksPerSecond; ++i)
-				level->tick();
-		}
-
-#endif
+		#endif
 	}
 
 	TIMER_POP_PUSH("handlemouse");
 	
 	static bool prevMouseDownLeft = false;
 
-	if (!useTouchscreen()) {
-		if (Mouse::getButtonState(MouseAction::ACTION_LEFT) == 0) {
-			gameMode->stopDestroyBlock();
-		}
+	if (Mouse::getButtonState(MouseAction::ACTION_LEFT) == 0) {
+		gameMode->stopDestroyBlock();
+	}
 
-		if (!Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
-			gameMode->releaseUsingItem(player);
-		}
+	if (!Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
+		gameMode->releaseUsingItem(player);
 	}
 
 	if (useTouchscreen()) {
@@ -906,9 +880,6 @@ void Minecraft::tickInput() {
 			handleBuildAction(&bai);
 		} else {
 			gameMode->stopDestroyBlock();
-			if (player && player->isUsingItem()) {
-                gameMode->releaseUsingItem(player);
-            }
 		}
 	} else {
 		// Desktop: left mouse = destroy/attack
@@ -961,35 +932,35 @@ void Minecraft::handleBuildAction(BuildActionIntention* action) {
 	}
 	if(player->isUsingItem())
 		return;
-	bool mayUse = true;
+    bool mayUse = true;
 
 	if (!hitResult.isHit()) {
 		if (action->isRemove() && !gameMode->isCreativeType()) {
 			missTime = 10;
 		}
-	} else if (hitResult.type == ENTITY) {
-		if (action->isAttack()) {
+    } else if (hitResult.type == ENTITY) {
+        if (action->isAttack()) {
 			player->swing();
 			//LOGI("attacking!\n");
 			InteractPacket packet(InteractPacket::Attack, player->entityId, hitResult.entity->entityId);
 			raknetInstance->send(packet);
-			gameMode->attack(player, hitResult.entity);
+            gameMode->attack(player, hitResult.entity);
 		} else if (action->isInteract()) {
 			if (hitResult.entity->interactPreventDefault())
 				mayUse = false;
 			//LOGI("interacting!\n");
 			InteractPacket packet(InteractPacket::Interact, player->entityId, hitResult.entity->entityId);
 			raknetInstance->send(packet);
-			gameMode->interact(player, hitResult.entity);
-		}
-	} else if (hitResult.type == TILE) {
+            gameMode->interact(player, hitResult.entity);
+        }
+    } else if (hitResult.type == TILE) {
 		int x = hitResult.x;
-		int y = hitResult.y;
-		int z = hitResult.z;
-		int face = hitResult.f;
+        int y = hitResult.y;
+        int z = hitResult.z;
+        int face = hitResult.f;
 
 		int oldTileId = level->getTile(x, y, z);
-		Tile* oldTile = Tile::tiles[oldTileId];
+        Tile* oldTile = Tile::tiles[oldTileId];
 
 		//bool tryDestroyBlock = false;
 
@@ -998,7 +969,7 @@ void Minecraft::handleBuildAction(BuildActionIntention* action) {
 				return;
 
 			//LOGI("tile: %s - %d, %d, %d. b: %f - %f\n", oldTile->getDescriptionId().c_str(), x, y, z, oldTile->getBrightness(level, x, y, z), oldTile->getBrightness(level, x, y+1, z));
-			level->extinguishFire(x, y, z, hitResult.f);
+            level->extinguishFire(x, y, z, hitResult.f);
 			
 			if (action->isFirstRemove()) {
 				gameMode->startDestroyBlock(x, y, z, hitResult.f);
@@ -1008,16 +979,16 @@ void Minecraft::handleBuildAction(BuildActionIntention* action) {
 
 			particleEngine->crack(x, y, z, hitResult.f);
 			player->swing();
-		}
+        }
 		else {
 			ItemInstance* item = player->inventory->getSelected();
-			if (gameMode->useItemOn(player, level, item, x, y, z, face, hitResult.pos)) {
-				mayUse = false;
-				player->swing();
-#ifdef RPI
-			} else if (item && item->id == ((Item*)Item::sword_iron)->id) {
-				player->swing();
-#endif
+ 			if (gameMode->useItemOn(player, level, item, x, y, z, face, hitResult.pos)) {
+			    mayUse = false;
+			    player->swing();
+			#ifdef RPI
+				} else if (item && item->id == ((Item*)Item::sword_iron)->id) {
+					player->swing();
+			#endif
 			}
 			if (item && item->count <= 0) {
 				player->inventory->clearSlot(player->inventory->selected);
@@ -1043,7 +1014,7 @@ void Minecraft::handleBuildAction(BuildActionIntention* action) {
 
 bool Minecraft::isOnlineClient()
 {
-	return (level != NULL && level->isClientSide);
+    return (level != NULL && level->isClientSide);
 }
 
 bool Minecraft::isOnline()
@@ -1110,8 +1081,8 @@ void Minecraft::setScreen( Screen* screen )
 
 		if (screen->isInGameScreen() && level) {
 			level->saveLevelData();
-			level->saveGame();
-		}
+            level->saveGame();
+        }
 
 		//noRender = false;
 	} else {
@@ -1148,7 +1119,7 @@ void Minecraft::releaseMouse()
 
 bool Minecraft::useTouchscreen() {
 #if defined(TARGET_OS_IPHONE)
-	return true;
+    return true;
 #elif defined(RPI)
 	return false;
 #endif
@@ -1159,7 +1130,6 @@ bool Minecraft::supportNonTouchScreen() {
 }
 void Minecraft::init()
 {
-	LevelChunk::ChunkBlockCount = LevelConstants::CHUNK_BLOCK_COUNT;
 #ifndef STANDALONE_SERVER
 	checkGlError("Init enter");
 
@@ -1172,8 +1142,7 @@ void Minecraft::init()
 	textures->addDynamicTexture(new WaterSideTexture());
 	textures->addDynamicTexture(new LavaTexture());
 	textures->addDynamicTexture(new LavaSideTexture());
-	textures->addDynamicTexture(new FireTexture(0));
-	textures->addDynamicTexture(new FireTexture(1));
+	textures->addDynamicTexture(new FireTexture());
 	gui.texturesLoaded(textures);
 
 	levelRenderer = new LevelRenderer(this);
@@ -1181,7 +1150,7 @@ void Minecraft::init()
 	particleEngine = new ParticleEngine(level, textures);
 
 	// 4j's code for reference
-	//	FoliageColor::init(textures->loadTexturePixels(L"misc/foliagecolor.png"));
+//	FoliageColor::init(textures->loadTexturePixels(L"misc/foliagecolor.png"));
 
 
 	// my code
@@ -1210,8 +1179,6 @@ void Minecraft::init()
 	checkGlError("Init complete");
 #endif
 
-	PluginsManager::get().init(*this);
-	
 	options.load();
 
 	setIsCreativeMode(false); // false means it's Survival Mode
@@ -1220,78 +1187,55 @@ void Minecraft::init()
 
 void Minecraft::setSize(int w, int h) {
 #ifndef STANDALONE_SERVER
-	transformResolution(&w, &h);
+    transformResolution(&w, &h);
 
 	width  = w;
 	height = h;
-	int screenWidth;
-	int screenHeight;
-	//#ifdef PLATFORM_DESKTOP
-	if (options.getBooleanValue(OPTIONS_WINDOW_SCALE)){ // scales with resolution using a formula instead of having hardcoded if checks
-		int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);
-		if (guiScale == 0) {
-			guiScale = 1000;
+
+	int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);
+
+	// determine gui scale, optionally overriding auto
+	if (guiScale != 0) {
+		// manual selection: 1->small, 2->medium, 3->large, 4->larger, 5->largest
+		switch (guiScale) {
+		case 1: Gui::GuiScale = 2.0f; break;
+		case 2: Gui::GuiScale = 3.0f; break;
+		case 3: Gui::GuiScale = 4.0f; break;
+		case 4: Gui::GuiScale = 5.0f; break;
+		case 5: Gui::GuiScale = 6.0f; break;
+		default: Gui::GuiScale = 1.0f; break; // auto
 		}
-
-		// determine gui scale, optionally overriding auto
-
-
-		Gui::GuiScale = (float)Mth::Min(guiScale, Mth::Max(1, Mth::Min(width / 320, height / 240)));
-
-
-
 	} else {
-
-
-		int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);
-
-		// determine gui scale, optionally overriding auto
-		if (guiScale != 0) {
-			// manual selection: 1->small, 2->medium, 3->large, 4->larger, 5->largest
-			switch (guiScale) {
-			case 1: Gui::GuiScale = 2.0f; break;
-			case 2: Gui::GuiScale = 3.0f; break;
-			case 3: Gui::GuiScale = 4.0f; break;
-			case 4: Gui::GuiScale = 5.0f; break;
-			case 5: Gui::GuiScale = 6.0f; break;
-			default: Gui::GuiScale = 1.0f; break; // auto
-			}
-		} else {
-			// auto compute from resolution
-			if (width >= 1000) {
+		// auto compute from resolution
+		if (width >= 1000) {
+        #ifdef __APPLE__
+            Gui::GuiScale = (width > 2000)? 8.0f : 4.0f;
+        #else
+            Gui::GuiScale = 4.0f;
+        #endif
+    }
+		else if (width >= 800) {
 #ifdef __APPLE__
-				Gui::GuiScale = (width > 2000)? 8.0f : 4.0f;
+        Gui::GuiScale = 4.0f;
 #else
-				Gui::GuiScale = 4.0f;
+		Gui::GuiScale = 3.0f;
 #endif
-			}
-			else if (width >= 800) {
-#ifdef __APPLE__
-				Gui::GuiScale = 4.0f;
-#else
-				Gui::GuiScale = 3.0f;
-#endif
-			}
-			else if (width >= 400)
-				Gui::GuiScale = 2.0f;
-			else
-				Gui::GuiScale = 1.0f;
-		}
-
-
-
-		// if (platform()) {
-		// 	float pixelsPerMillimeter = options.getProgressValue(&Option::PIXELS_PER_MILLIMETER);
-		// 	pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
-		// 	pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
-		// }
-
+    }
+		else if (width >= 400)
+			Gui::GuiScale = 2.0f;
+		else
+			Gui::GuiScale = 1.0f;
 	}
 
-
 	Gui::InvGuiScale = 1.0f / Gui::GuiScale;
-	screenWidth  = (int)(width  * Gui::InvGuiScale);
-	screenHeight = (int)(height * Gui::InvGuiScale);
+	int screenWidth  = (int)(width  * Gui::InvGuiScale);
+	int screenHeight = (int)(height * Gui::InvGuiScale);
+
+	// if (platform()) {
+	// 	float pixelsPerMillimeter = options.getProgressValue(&Option::PIXELS_PER_MILLIMETER);
+	// 	pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
+	// 	pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
+	// }
 
 	Config config = createConfig(this);
 	gui.onConfigChanged(config);
@@ -1324,9 +1268,9 @@ void Minecraft::reloadOptions() {
 
 	LOGI("Reloading-options\n");
 
-	// @todo @fix Android and iOS behaves a bit differently when leaving
-	//            an options screen (Android recreates OpenGL surface)
-	setSize(width, height);
+    // @todo @fix Android and iOS behaves a bit differently when leaving
+    //            an options screen (Android recreates OpenGL surface)
+    setSize(width, height);
 }
 
 void Minecraft::_reloadInput() {
@@ -1337,17 +1281,17 @@ void Minecraft::_reloadInput() {
 	if (useTouchHolder) {
 		inputHolder = new TouchInputHolder(this, &options);
 	} else {
-#if defined(ANDROID) || defined(__APPLE__) 
-		inputHolder = new CustomInputHolder(
-			new XperiaPlayInput(&options),
-			new ControllerTurnInput(2, ControllerTurnInput::MODE_DELTA),
-			new IBuildInput());
-#else
-		inputHolder = new CustomInputHolder(
-			new KeyboardInput(&options),
-			new MouseTurnInput(MouseTurnInput::MODE_DELTA, width/2, height/2),
-			new MouseBuildInput());
-#endif
+		#if defined(ANDROID) || defined(__APPLE__) 
+			inputHolder = new CustomInputHolder(
+				new XperiaPlayInput(&options),
+				new ControllerTurnInput(2, ControllerTurnInput::MODE_DELTA),
+				new IBuildInput());
+		#else
+			inputHolder = new CustomInputHolder(
+				new KeyboardInput(&options),
+				new MouseTurnInput(MouseTurnInput::MODE_DELTA, width/2, height/2),
+				new MouseBuildInput());
+		#endif
 	}
 
 	mouseHandler.setTurnInput(inputHolder->getTurnInput());
@@ -1400,8 +1344,11 @@ bool Minecraft::joinMultiplayerFromString( const std::string& server )
 		ip = server;
 	}
 
+	printf("%s \n", port.c_str());
+	
 	if (isLookingForMultiplayer && netCallback) {
 		isLookingForMultiplayer = false;
+		printf("test");
 		int portNum = atoi(port.c_str());
 		return raknetInstance->connect(ip.c_str(), portNum);
 	}
@@ -1409,18 +1356,18 @@ bool Minecraft::joinMultiplayerFromString( const std::string& server )
 }
 
 void Minecraft::hostMultiplayer(int port) {
-	// Tear down last instance
-	raknetInstance->disconnect();
-	delete netCallback;
-	netCallback = NULL;
+    // Tear down last instance
+    raknetInstance->disconnect();
+    delete netCallback;
+    netCallback = NULL;
 
 #if !defined(NO_NETWORK)
 	netCallback = new ServerSideNetworkHandler(this, raknetInstance);
-#ifdef STANDALONE_SERVER
-	raknetInstance->host("Server", port, 16);
-#else
-	raknetInstance->host(options.getStringValue(OPTIONS_USERNAME), port);
-#endif
+    #ifdef STANDALONE_SERVER
+        raknetInstance->host("Server", port, 16);
+    #else
+        raknetInstance->host(options.getStringValue(OPTIONS_USERNAME), port);
+    #endif
 #endif
 }
 
@@ -1474,9 +1421,9 @@ void Minecraft::_levelGenerated()
 		player->resetPos(false);
 	}
 
-	if (level && level->dimension) {
+    if (level && level->dimension) {
         
-		level->dimension->FogType = options.getIntValue(OPTIONS_FOG_TYPE);
+       level->dimension->FogType = options.getIntValue(OPTIONS_FOG_TYPE);
 	}
 
 
@@ -1507,14 +1454,14 @@ void Minecraft::_levelGenerated()
 
 std::string Minecraft::gatherStats1() {
 #ifndef STANDALONE_SERVER
-	return levelRenderer->gatherStats1();
+    return levelRenderer->gatherStats1();
 #endif
 	return "Blank";
 }
 
 std::string Minecraft::gatherStats2() {
 #ifndef STANDALONE_SERVER
-	return levelRenderer->gatherStats2();
+    return levelRenderer->gatherStats2();
 #endif
 	return "Blank";
 }
@@ -1527,7 +1474,7 @@ std::string Minecraft::gatherStats3() {
 }
 
 std::string Minecraft::gatherStats4() {
-	return level->gatherChunkSourceStats();
+    return level->gatherChunkSourceStats();
 }
 
 
@@ -1619,12 +1566,12 @@ LevelStorageSource* Minecraft::getLevelSource()
 
 void Minecraft::audioEngineOn() {
 #ifndef STANDALONE_SERVER
-	soundEngine->enable(true);
+    soundEngine->enable(true);
 #endif
 }
 void Minecraft::audioEngineOff() {
 #ifndef STANDALONE_SERVER
-	soundEngine->enable(false);
+    soundEngine->enable(false);
 #endif
 }
 
@@ -1695,25 +1642,17 @@ void Minecraft::optionUpdated(OptionId option, bool value ) {
 }
 
 void Minecraft::optionUpdated(OptionId option, float value ) {
-	// #ifndef STANDALONE_SERVER
-	// 	if(option == OPTIONS_PIXELS_PER_MILLIMETER) {
-	// 		pixelCalcUi.setPixelsPerMillimeter(value * Gui::InvGuiScale);
-	// 		pixelCalc.setPixelsPerMillimeter(value);
-	// 	}
-	// #endif
+// #ifndef STANDALONE_SERVER
+// 	if(option == OPTIONS_PIXELS_PER_MILLIMETER) {
+// 		pixelCalcUi.setPixelsPerMillimeter(value * Gui::InvGuiScale);
+// 		pixelCalc.setPixelsPerMillimeter(value);
+// 	}
+// #endif
 }
 
 void Minecraft::optionUpdated(OptionId option, int value ) {
-	if(option == OPTIONS_GUI_SCALE) {
-		// reapply screen scaling using current window size
-		setSize(width, height);
-	}
-}
-
-void Minecraft::addMessage(const std::string& msg) {
-#ifndef STANDALONE_SERVER
-	gui.addMessage(msg);
-#else 
-	LOGI("%s \n", msg.c_str());
-#endif
+    if(option == OPTIONS_GUI_SCALE) {
+        // reapply screen scaling using current window size
+        setSize(width, height);
+    }
 }

src/client/Minecraft.h

@@ -2,9 +2,6 @@
 #define NET_MINECRAFT_CLIENT__Minecraft_H__
 
 #include "Options.h"
-#include "commands/CommandManager.hpp"
-#include <plugins/PluginsManager.hpp>
-
 #ifndef STANDALONE_SERVER
 #include "MouseHandler.h"
 #include "gui/Gui.h"
@@ -131,17 +128,11 @@ public:
 	void optionUpdated(OptionId option, bool value);
 	void optionUpdated(OptionId option, float value);
 	void optionUpdated(OptionId option, int value);
-
-	int getTicks() { return ticks; }
-
-	void addMessage(const std::string& msg);
 #ifdef __APPLE__
     bool _isSuperFast;
     bool isSuperFast() { return _isSuperFast; }
 #endif
 
-	CommandManager& commandManager() { return m_commandManager; }
-
 protected:
 	void _levelGenerated();
 
@@ -214,8 +205,7 @@ public:
 	std::string externalCacheStoragePath;
 protected:
 	Timer timer;
-
-	// @note @attn @warn: this is dangerous as fuck!
+    // @note @attn @warn: this is dangerous as fuck!
 	volatile bool isGeneratingLevel;
 	bool _hasSignaledGeneratingLevelFinished;
 
@@ -243,8 +233,6 @@ private:
 
 	PerfRenderer* _perfRenderer;
 	CommandServer* _commandServer;
-
-	CommandManager m_commandManager;
 };
 
 #endif /*NET_MINECRAFT_CLIENT__Minecraft_H__*/

src/client/Options.cpp

@@ -82,10 +82,6 @@ OptionBool restoredAnims("restoredAnims", true);
 
 OptionInt debugStyle("debugStyle", 0, 0, 1);
 
-OptionInt menuStyle("menuStyle",0, 0, 2);
-
-OptionBool windowScale("windowScale", false);
-
 OptionInt keyForward("key.forward", Keyboard::KEY_W);
 OptionInt keyLeft("key.left", Keyboard::KEY_A);
 OptionInt keyBack("key.back", Keyboard::KEY_S);
@@ -138,7 +134,6 @@ void Options::initTable() {
 
 
     m_options[OPTIONS_GUI_SCALE] = &guiScale;
-	m_options[OPTIONS_WINDOW_SCALE] = &windowScale;
 
 	m_options[OPTIONS_SKIN] = &skin;
 	m_options[OPTIONS_USERNAME] = &username;
@@ -175,8 +170,6 @@ void Options::initTable() {
 
     m_options[OPTIONS_SERVER_VISIBLE] = &serverVisible;
 
-	m_options[OPTIONS_MENU_STYLE] = &menuStyle;
-
     m_options[OPTIONS_KEY_FORWARD] = &keyForward;
     m_options[OPTIONS_KEY_LEFT] = &keyLeft;
     m_options[OPTIONS_KEY_BACK] = &keyBack;

src/client/Options.h

@@ -37,7 +37,6 @@ enum OptionId {
     OPTIONS_BAR_ON_TOP,
     OPTIONS_ALLOW_SPRINT,
     OPTIONS_AUTOJUMP,
-	OPTIONS_WINDOW_SCALE,
 
     // Graphics
     OPTIONS_RENDER_DEBUG,
@@ -52,7 +51,6 @@ enum OptionId {
     OPTIONS_FANCY_GRAPHICS,
 	OPTIONS_NORMAL_LIGHTING,
 
-
     // Cheats / debug
     OPTIONS_FLY_SPEED,
     OPTIONS_CAMERA_SPEED,
@@ -97,8 +95,6 @@ enum OptionId {
 	OPTIONS_BEAUTIFUL_SKY,
 	OPTIONS_VIGNETTE,
 	OPTIONS_DEBUG_STYLE,
-	OPTIONS_COMPLETE_LIGHTING,
-	OPTIONS_MENU_STYLE,
 	// Should be last!
 	OPTIONS_COUNT
 };

src/client/gamemode/GameMode.cpp

@@ -90,12 +90,8 @@ bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x
 	float clickY = hit.y - y;
 	float clickZ = hit.z - z;
 	if (level->isClientSide) {
-		LOGI("%f %f %f \n", player->x, player->y, player->z);
-
 		item = player->inventory->getSelected();
-		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ, player->x, player->y, player->z,
-		player->bb.x0, player->bb.y0, player->bb.z0, player->bb.x1, player->bb.y1, player->bb.z1);
-
+		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ);
 		minecraft->raknetInstance->send(packet);
 	}
     int t = level->getTile(x, y, z);
@@ -104,7 +100,7 @@ bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x
 		return true;
 
 	if (item == NULL) return false;
-	if (isCreativeType()) {
+	if(isCreativeType()) {
 		int aux = item->getAuxValue();
 		int count = item->count;
 		bool success = item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
@@ -121,8 +117,7 @@ bool GameMode::useItem( Player* player, Level* level, ItemInstance* item ) {
 
 	ItemInstance* itemInstance = item->use(level, player);
 	if(level->isClientSide) {
-		UseItemPacket packet(item, player->entityId, player->aimDirection, player->x, player->y, player->z,
-		player->bb.x0, player->bb.y0, player->bb.z0, player->bb.x1, player->bb.y1, player->bb.z1);
+		UseItemPacket packet(item, player->entityId, player->aimDirection);
 		minecraft->raknetInstance->send(packet);
 	}
 	if (itemInstance != item || (itemInstance != NULL && itemInstance->count != oldCount)) {

src/client/gamemode/SurvivalMode.cpp

@@ -68,7 +68,6 @@ bool SurvivalMode::destroyBlock( int x, int y, int z, int face ) {
 			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);

src/client/gui/Gui.cpp

@@ -224,59 +224,59 @@ void Gui::handleClick(int button, int x, int y) {
 	}
 }
 
-	void Gui::handleKeyPressed(int key)
-	{
-		bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
-		if (isChatting) {
-			// Allow scrolling the chat history with the mouse/keyboard when chat is open
-			if (key == 38) { // VK_UP
-				scrollChat(1);
-				return;
-			} else if (key == 40) { // VK_DOWN
-				scrollChat(-1);
-				return;
-			} else if (key == 33) { // VK_PRIOR (Page Up)
-				// Scroll by a page
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(maxVisible);
-				return;
-			} else if (key == 34) { // VK_NEXT (Page Down)
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(-maxVisible);
-				return;
-			}
-		}
-
-		if (key == Keyboard::KEY_F1) {
-			minecraft->options.toggle(OPTIONS_HIDEGUI);
-		}
-
-		if (key == 99)
-		{
-			if (minecraft->player->inventory->selected > 0)
-			{
-				minecraft->player->inventory->selected--;
-			}
-		}
-		else if (key == 4)
-		{
-			if (minecraft->player->inventory->selected < (getNumSlots() - 2))
-			{
-				minecraft->player->inventory->selected++;
-			}
-		}
-		else if (key == 100)
-		{
-			minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-		}
-		else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
-		{
-			minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
+void Gui::handleKeyPressed(int key)
+{
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
+	if (isChatting) {
+		// Allow scrolling the chat history with the mouse/keyboard when chat is open
+		if (key == 38) { // VK_UP
+			scrollChat(1);
+			return;
+		} else if (key == 40) { // VK_DOWN
+			scrollChat(-1);
+			return;
+		} else if (key == 33) { // VK_PRIOR (Page Up)
+			// Scroll by a page
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(maxVisible);
+			return;
+		} else if (key == 34) { // VK_NEXT (Page Down)
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(-maxVisible);
+			return;
 		}
 	}
 
+	if (key == Keyboard::KEY_F1) {
+		minecraft->options.toggle(OPTIONS_HIDEGUI);
+	}
+
+	if (key == 99)
+	{
+		if (minecraft->player->inventory->selected > 0)
+		{
+			minecraft->player->inventory->selected--;
+		}
+	}
+	else if (key == 4)
+	{
+		if (minecraft->player->inventory->selected < (getNumSlots() - 2))
+		{
+			minecraft->player->inventory->selected++;
+		}
+	}
+	else if (key == 100)
+	{
+		minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
+	}
+	else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
+	{
+		minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
+	}
+}
+
 void Gui::scrollChat(int delta) {
 	if (delta == 0)
 		return;
@@ -755,6 +755,7 @@ void Gui::renderDebugInfo() {
 
 	// Position
 	float px = p->x, py = p->y - p->heightOffset, pz = p->z;
+	posTranslator.to(px, py, pz);
 	int bx = (int)floorf(px), by = (int)floorf(py), bz = (int)floorf(pz);
 	int cx = bx >> 4, cz = bz >> 4;
 
@@ -781,25 +782,6 @@ void Gui::renderDebugInfo() {
 	long day       = worldTime / Level::TICKS_PER_DAY;
 	long seed      = lvl ? lvl->getSeed() : 0;
 
-	// Block looking at
-	std::string CurrentTile = "Air";
-	if (minecraft->hitResult.type == TILE) {
-		int LookingX = minecraft->hitResult.x;
-		int LookingY = minecraft->hitResult.y;
-		int LookingZ = minecraft->hitResult.z;
-
-		int tileID = minecraft->level->getTile(LookingX, LookingY, LookingZ);
-		if (tileID > 0 && tileID < 256){
-			Tile* LookingTile = Tile::tiles[tileID];
-			if (LookingTile != NULL) {
-				CurrentTile = LookingTile->getDescriptionId();
-			} else {
-				CurrentTile = "Unknown Tile";
-			}
-		} else {
-			CurrentTile = "Air";
-		}
-	}
 	// Build lines (NULL entry = blank gap)
 	Font* font = minecraft->font;
 
@@ -838,9 +820,6 @@ void Gui::renderDebugInfo() {
 
 	sprintf(buf, "Biome: %s", biomeName);
 	drawString(font, buf, 2, 124, 0xE0E0E0);
-
-	sprintf(buf, "Looking at: %s", CurrentTile.c_str());
-		drawString(font, buf, 2, 134, 0xE0E0E0);
 	}
 	else if (minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE) == 1){
 	

src/client/gui/components/GuiElementContainer.cpp

@@ -35,6 +35,17 @@ void GuiElementContainer::removeChild( GuiElement* element ) {
 		children.erase(it);
 }
 
+bool GuiElementContainer::containsPointInChildren(int x, int y) const {
+	for (std::vector<GuiElement*>::const_iterator it = children.begin(); it != children.end(); ++it) {
+		GuiElement* child = *it;
+		if (child == NULL || !child->visible) continue;
+		if (child->pointInside(x, y)) return true;
+		const GuiElementContainer* container = dynamic_cast<const GuiElementContainer*>(child);
+		if (container != NULL && container->containsPointInChildren(x, y)) return true;
+	}
+	return false;
+}
+
 void GuiElementContainer::tick( Minecraft* minecraft ) {
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->tick(minecraft);

src/client/gui/components/GuiElementContainer.h

@@ -13,6 +13,7 @@ public:
 	virtual void setupPositions();
 	virtual void addChild(GuiElement* element);
 	virtual void removeChild(GuiElement* element);
+	bool containsPointInChildren(int x, int y) const;
 
 	virtual void tick( Minecraft* minecraft );
 

src/client/gui/components/OptionsGroup.cpp

@@ -6,14 +6,36 @@
 #include "../../../locale/I18n.h"
 #include "TextOption.h"
 #include "KeyOption.h"
+#include <algorithm>
+#include "../Gui.h"
+#include "../Screen.h"
+#include "../../../platform/input/Mouse.h"
+#include "../../../util/Mth.h"
 
-OptionsGroup::OptionsGroup( std::string labelID )  {
+OptionsGroup::OptionsGroup( std::string labelID )
+: contentHeight(0),
+	scrollOffsetY(0.0f),
+	maxScrollOffsetY(0.0f),
+	trackingScrollGesture(false),
+	scrollingGesture(false),
+	touchDispatched(false),
+	dragStartX(0),
+	dragStartY(0),
+	lastDragY(0),
+	touchStartX(0),
+	touchStartY(0) {
 	label = I18n::get(labelID);
 }
 
 void OptionsGroup::setupPositions() {
+	const int labelHeight = 18;
+	const int bottomPadding = 36;
+	const float requestedScroll = scrollOffsetY;
+	const int scrollOffset = (int)requestedScroll;
+	int curY = y + labelHeight - scrollOffset;
+	const int contentStartY = y + labelHeight;
+
 	// First we write the header and then we add the items
-	int curY = y + 18;
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->width = width - 5;
 		
@@ -22,16 +44,109 @@ void OptionsGroup::setupPositions() {
 		(*it)->setupPositions();
 		curY += (*it)->height + 3;
 	}
-	height = curY;
+	curY += bottomPadding;
+	contentHeight = std::max(0, curY - contentStartY + scrollOffset);
+	maxScrollOffsetY = std::max(0, contentHeight - (height - labelHeight));
+	const float clampedScroll = Mth::clamp(requestedScroll, 0.0f, maxScrollOffsetY);
+	if (clampedScroll != requestedScroll) {
+		scrollOffsetY = clampedScroll;
+		setupPositions();
+	}
 }
 
 void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
 	float padX = 10.0f;
 	float padY = 5.0f;
+	const int labelHeight = 18;
 	
 	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
 
+	glEnable2(GL_SCISSOR_TEST);
+	glScissor(
+		Gui::GuiScale * x,
+		minecraft->height - Gui::GuiScale * (y + height),
+		Gui::GuiScale * width,
+		Gui::GuiScale * (height - labelHeight)
+	);
+
 	super::render(minecraft, xm, ym);
+	glDisable2(GL_SCISSOR_TEST);
+}
+
+void OptionsGroup::tick(Minecraft* minecraft) {
+	int xm = Mouse::getX();
+	int ym = Mouse::getY();
+	if (minecraft->screen != NULL) {
+		minecraft->screen->toGUICoordinate(xm, ym);
+	}
+
+	bool leftDown = Mouse::isButtonDown(MouseAction::ACTION_LEFT);
+
+	if (trackingScrollGesture && leftDown) {
+		int dy = ym - lastDragY;
+		int dx = xm - dragStartX;
+		if (!scrollingGesture) {
+			int totalDx = xm - dragStartX;
+			int totalDy = ym - dragStartY;
+			if (std::abs(totalDx) >= ScrollStartThreshold || std::abs(totalDy) >= ScrollStartThreshold) {
+				if (std::abs(totalDy) >= std::abs(totalDx)) {
+					scrollingGesture = true;
+				} else if (!touchDispatched) {
+					super::mouseClicked(minecraft, touchStartX, touchStartY, MouseAction::ACTION_LEFT);
+					touchDispatched = true;
+				}
+			}
+		}
+		if (scrollingGesture && dy != 0) {
+			scrollByPixels((float)dy);
+		}
+		lastDragY = ym;
+	}
+	super::tick(minecraft);
+}
+
+void OptionsGroup::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	touchDispatched = false;
+
+	if (buttonNum == MouseAction::ACTION_LEFT && pointInside(x, y)) {
+		trackingScrollGesture = true;
+		dragStartX = x;
+		dragStartY = y;
+		lastDragY = y;
+		touchStartX = x;
+		touchStartY = y;
+		return;
+	}
+
+	super::mouseClicked(minecraft, x, y, buttonNum);
+}
+
+void OptionsGroup::mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum) {
+	bool wasScrolling = scrollingGesture;
+	bool wasTracking = trackingScrollGesture;
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	if (buttonNum == MouseAction::ACTION_LEFT && wasTracking && !touchDispatched && pointInside(touchStartX, touchStartY)) {
+		super::mouseClicked(minecraft, touchStartX, touchStartY, buttonNum);
+		touchDispatched = true;
+	}
+
+	if (!wasScrolling) {
+		super::mouseReleased(minecraft, x, y, buttonNum);
+	}
+}
+
+void OptionsGroup::scrollByPixels(float deltaY) {
+	if (deltaY == 0.0f || maxScrollOffsetY <= 0.0f) return;
+
+	scrollOffsetY = Mth::clamp(scrollOffsetY - deltaY, 0.0f, maxScrollOffsetY);
+	setupPositions();
+}
+
+bool OptionsGroup::isScrollingGestureActive() const {
+	return trackingScrollGesture || scrollingGesture;
 }
 
 OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {

src/client/gui/components/OptionsGroup.h

@@ -17,7 +17,12 @@ public:
 	OptionsGroup(std::string labelID);
 	virtual void setupPositions();
 	virtual void render(Minecraft* minecraft, int xm, int ym);
+	virtual void tick(Minecraft* minecraft);
+	virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum);
+	virtual void mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum);
 	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
+	void scrollByPixels(float deltaY);
+	bool isScrollingGestureActive() const;
 protected:
 
 	void createToggle(OptionId optId, Minecraft* minecraft);
@@ -27,6 +32,18 @@ protected:
 	void createKey(OptionId optId, Minecraft* minecraft);
 
 	std::string label;
+	int contentHeight;
+	float scrollOffsetY;
+	float maxScrollOffsetY;
+	bool trackingScrollGesture;
+	bool scrollingGesture;
+	bool touchDispatched;
+	int dragStartX;
+	int dragStartY;
+	int lastDragY;
+	int touchStartX;
+	int touchStartY;
+	static const int ScrollStartThreshold = 5;
 };
 
 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/

src/client/gui/components/OptionsItem.cpp

@@ -56,28 +56,6 @@ void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 		}
 		text += ": " + scaleText;
 	}
-	if (m_optionId == OPTIONS_MENU_STYLE) {
-		int value = minecraft->options.getIntValue(OPTIONS_MENU_STYLE);
-		std::string scaleText;
-		switch (value) {
-		case 0: scaleText = I18n::get("options.menuStyle.pocket"); break;
-		case 1: scaleText = I18n::get("options.menuStyle.xperia"); break;
-		case 2: scaleText = I18n::get("options.menuStyle.java"); break;
-		}
-		text += ": " + scaleText;
-	}
-	if (m_optionId == OPTIONS_VIEW_DISTANCE) {
-		int value = minecraft->options.getIntValue(OPTIONS_VIEW_DISTANCE);
-		std::string scaleText;
-		switch (value) {
-		case 0: scaleText = I18n::get("options.renderDistance.far"); break;
-		case 1: scaleText = I18n::get("options.renderDistance.normal"); break;
-		case 2: scaleText = I18n::get("options.renderDistance.short"); break;
-		case 3: scaleText = I18n::get("options.renderDistance.tiny"); break;
-		default: scaleText = "Debug"; break;
-		}
-		text += ": " + scaleText;
-	}
 
 	minecraft->font->draw(text, (float)x, (float)y + yOffset, 0x909090, false);
 	super::render(minecraft, xm, ym);

src/client/gui/screens/ConsoleScreen.cpp

@@ -8,7 +8,6 @@
 #include "../../../network/ServerSideNetworkHandler.h"
 #include "../../../network/packet/ChatPacket.h"
 #include "../../../platform/log.h"
-#include "util/StringUtils.h"
 
 #include <sstream>
 #include <cstdlib>
@@ -55,37 +54,141 @@ void ConsoleScreen::charPressed(char inputChar)
         _input += inputChar;
 }
 
+// ---------------------------------------------------------------------------
+// execute: run _input as a command, print result, close screen
+// ---------------------------------------------------------------------------
 void ConsoleScreen::execute()
 {
-    if (!minecraft->level) return;
-
     if (_input.empty()) {
-        return minecraft->setScreen(NULL);
+        minecraft->setScreen(NULL);
+        return;
     }
 
-    // if (_input[0] == '/') {
-    //     // Command
-    //     _input = Util::stringTrim(_input.substr(1));
-        
-    //     std::istringstream iss(minecraft->commandManager().execute(*minecraft, *minecraft->player, _input));
-    //     for (std::string line; std::getline(iss, line); ) {
-    //         minecraft->gui.addMessage(line);
-    //     }
-    // } else {
-        // @ai @rewrite
+    if (_input[0] == '/') {
+        // Command
+        std::string result = processCommand(_input);
+        if (!result.empty())
+            minecraft->gui.addMessage(result);
+    } else {
+        // Chat message: <name> message
+        std::string msg = std::string("<") + minecraft->player->name + "> " + _input;
         if (minecraft->netCallback && minecraft->raknetInstance->isServer()) {
-            static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(_input);
+            // Hosting a LAN game: displayGameMessage shows locally + broadcasts MessagePacket to clients
+            static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(msg);
         } else if (minecraft->netCallback) {
-            ChatPacket chatPkt(_input);
+            // Connected client: send ChatPacket to server; server echoes it back as MessagePacket
+            ChatPacket chatPkt(msg);
             minecraft->raknetInstance->send(chatPkt);
         } else {
-            minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input);
+            // Singleplayer: show locally only
+            minecraft->gui.addMessage(msg);
         }
-    // }
+    }
 
     minecraft->setScreen(NULL);
 }
 
+// ---------------------------------------------------------------------------
+// processCommand
+// ---------------------------------------------------------------------------
+static std::string trim(const std::string& s) {
+    size_t a = s.find_first_not_of(" \t");
+    if (a == std::string::npos) return "";
+    size_t b = s.find_last_not_of(" \t");
+    return s.substr(a, b - a + 1);
+}
+
+std::string ConsoleScreen::processCommand(const std::string& raw)
+{
+    // strip leading '/'
+    std::string line = raw;
+    if (!line.empty() && line[0] == '/') line = line.substr(1);
+    line = trim(line);
+
+    // tokenise
+    std::vector<std::string> args;
+    {
+        std::istringstream ss(line);
+        std::string tok;
+        while (ss >> tok) args.push_back(tok);
+    }
+
+    if (args.empty()) return "";
+
+    Level* level = minecraft->level;
+    if (!level) return "No level loaded.";
+
+    // -----------------------------------------------------------------------
+    // /time ...
+    // -----------------------------------------------------------------------
+    if (args[0] == "time") {
+        if (args.size() < 2)
+            return "Usage: /time <add|set|query> ...";
+
+        const std::string& sub = args[1];
+
+        // -- time add <value> -----------------------------------------------
+        if (sub == "add") {
+            if (args.size() < 3) return "Usage: /time add <value>";
+            long delta = std::atol(args[2].c_str());
+            long newTime = level->getTime() + delta;
+            level->setTime(newTime);
+            std::ostringstream out;
+            out << "Set the time to " << (newTime % Level::TICKS_PER_DAY);
+            return out.str();
+        }
+
+        // -- time set <value|day|night|noon|midnight> -----------------------
+        if (sub == "set") {
+            if (args.size() < 3) return "Usage: /time set <value|day|night|noon|midnight>";
+            const std::string& val = args[2];
+
+            long t = -1;
+            if      (val == "day")      t = 1000;
+            else if (val == "noon")     t = 6000;
+            else if (val == "night")    t = 13000;
+            else if (val == "midnight") t = 18000;
+            else {
+                // numeric — accept positive integers only
+                bool numeric = true;
+                for (char c : val)
+                    if (!std::isdigit((unsigned char)c)) { numeric = false; break; }
+                if (!numeric) return std::string("Unknown value: ") + val;
+                t = std::atol(val.c_str());
+            }
+
+            // Preserve the total day count so only the time-of-day changes
+            long dayCount = level->getTime() / Level::TICKS_PER_DAY;
+            long newTime  = dayCount * Level::TICKS_PER_DAY + (t % Level::TICKS_PER_DAY);
+            level->setTime(newTime);
+            std::ostringstream out;
+            out << "Set the time to " << t;
+            return out.str();
+        }
+
+        // -- time query <daytime|gametime|day> ------------------------------
+        if (sub == "query") {
+            if (args.size() < 3) return "Usage: /time query <daytime|gametime|day>";
+            const std::string& what = args[2];
+
+            long total   = level->getTime();
+            long daytime = total % Level::TICKS_PER_DAY;
+            long day     = total / Level::TICKS_PER_DAY;
+
+            std::ostringstream out;
+            if      (what == "daytime")  { out << "The time of day is " << daytime; }
+            else if (what == "gametime") { out << "The game time is "   << total;   }
+            else if (what == "day")      { out << "The day is "         << day;     }
+            else return std::string("Unknown query: ") + what;
+            return out.str();
+        }
+
+        return "Unknown sub-command. Usage: /time <add|set|query> ...";
+    }
+
+    return std::string("Unknown command: /") + args[0];
+}
+
 // ---------------------------------------------------------------------------
 // render
 // ---------------------------------------------------------------------------

src/client/gui/screens/ConsoleScreen.h

@@ -25,6 +25,7 @@ public:
 
 private:
     void execute();
+    std::string processCommand(const std::string& cmd);
 
     std::string _input;
     int         _cursorBlink; // tick counter for cursor blink

src/client/gui/screens/DeathScreen.cpp

@@ -23,15 +23,12 @@ DeathScreen::~DeathScreen()
 
 void DeathScreen::init()
 {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bRespawn = new Touch::TButton(1, "Respawn!");
 		bTitle = new Touch::TButton(2, "Main menu");
-	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
+	} else {
 		bRespawn = new Button(1, "Respawn!");
 		bTitle = new Button(2, "Main menu");
-	} else {
-		bRespawn = new Button(1, 0, 0, 200, 20, "Respawn");
-		bTitle = new Button(2, 0, 0, 200, 20, "Title menu");
 	}
 	buttons.push_back(bRespawn);
 	buttons.push_back(bTitle);
@@ -42,23 +39,13 @@ void DeathScreen::init()
 
 void DeathScreen::setupPositions()
 {
-if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
-    bRespawn->width = 200;
-    bTitle->width = 200;
-
-    int centerX = (width / 2) - (bRespawn->width / 2);
-    bRespawn->x = centerX;
-    bTitle->x = centerX;
-
-    bRespawn->y = (height / 2);
-    bTitle->y = bRespawn->y + 24;
-} else {
 	bRespawn->width = bTitle->width = width / 4;
+
 	bRespawn->y = bTitle->y = height / 2;
 	bRespawn->x = width/2 - bRespawn->width - 10;
 	bTitle->x = width/2 + 10;
-}
-//	LOGI("xyz: %d, %d (%d, %d)\n", bTitle->x, bTitle->y, width, height);
+
+	LOGI("xyz: %d, %d (%d, %d)\n", bTitle->x, bTitle->y, width, height);
 }
 
 void DeathScreen::tick() {
@@ -69,20 +56,10 @@ void DeathScreen::render( int xm, int ym, float a )
 {
 	fillGradient(0, 0, width, height, 0x60500000, 0xa0803030);
 
-if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
-	glPushMatrix2();
-	glScalef2(2, 2, 2);
-	drawCenteredString(font, "Game over!", width / 2 / 2, height / 8, 0xffffff);
-	glPopMatrix2();
-	std::stringstream ss;
-	ss << "Score: &e" << minecraft->player->getScore();
-	drawCenteredString(font, ss.str(), width / 2, (height / 4) + 32, 0xffffff);
-} else {
 	glPushMatrix2();
 	glScalef2(2, 2, 2);
 	drawCenteredString(font, "You died!", width / 2 / 2, height / 8, 0xffffff);
 	glPopMatrix2();
-}
 
 	if (_tick >= WAIT_TICKS)
 		Screen::render(xm, ym, a);

src/client/gui/screens/IngameBlockSelectionScreen.cpp

@@ -12,7 +12,6 @@
 #include "../../renderer/Textures.h"
 #include "../../gamemode/GameMode.h"
 #include "ArmorScreen.h"
-#include "crafting/WorkbenchScreen.h"
 #include "../components/Button.h"
 
 #if defined(__APPLE__)
@@ -28,8 +27,7 @@ IngameBlockSelectionScreen::IngameBlockSelectionScreen()
 	InventoryRows(1),
 	InventoryCols(1),
 	InventorySize(1),
-	bArmor(1, "Armor"),
-	bCrafting(1, "Crafting")
+	bArmor(1, "Armor")
 {
 }
 
@@ -45,19 +43,6 @@ void IngameBlockSelectionScreen::init()
 							(float)getSlotPosX(InventoryCols) + 4, 
 							(float)getSlotPosY(InventoryRows) + 4);
 
-	if (!minecraft->isCreativeMode()) {
-		bArmor.width = 42;
-		bCrafting.width = 42;
-
-		bArmor.x = 0;
-		bArmor.y = height - bArmor.height;
-
-		bCrafting.x = 0;
-		bCrafting.y = height - bCrafting.height - 30;
-		buttons.push_back(&bArmor);
-		buttons.push_back(&bCrafting);
-	}
-
 	ItemInstance* selected = inventory->getSelected();
 	if (!selected || selected->isNull()) {
 		selectedItem = 0;
@@ -73,6 +58,13 @@ void IngameBlockSelectionScreen::init()
 	}
 	if (!isAllowed(selectedItem))
 		selectedItem = 0;
+
+	if (!minecraft->isCreativeMode()) {
+		bArmor.width = 42;
+		bArmor.x = 0;
+		bArmor.y = height - bArmor.height;
+		buttons.push_back(&bArmor);
+	}
 }
 
 void IngameBlockSelectionScreen::removed()
@@ -132,7 +124,7 @@ void IngameBlockSelectionScreen::renderSlots()
 	//w.printEvery(1000, "render-blocksel");
 
 	glDisable2(GL_RESCALE_NORMAL);
-	Lighting::turnOff();
+	Lighting::turnOn(minecraft);
 }
 
 int IngameBlockSelectionScreen::getSlotPosX(int slotX) {
@@ -257,7 +249,7 @@ void IngameBlockSelectionScreen::mouseClicked(int x, int y, int buttonNum)
 			//minecraft->soundEngine->playUI("random.click", 1, 1);
 		} else {
 			_pendingQuit = !_area.isInside((float)x, (float)y)
-			            && !bArmor.isInside(x, y) && !bCrafting.isInside(x, y);
+			            && !bArmor.isInside(x, y);
 		}
 	}
 	if (!_pendingQuit)
@@ -346,8 +338,5 @@ void IngameBlockSelectionScreen::buttonClicked( Button* button )
 	if (button == &bArmor) {
 		minecraft->setScreen(new ArmorScreen());
 	}
-	if (button == &bCrafting) {
-		minecraft->setScreen(new WorkbenchScreen(Recipe::SIZE_2X2));
-	}
 	super::buttonClicked(button);
 }

src/client/gui/screens/IngameBlockSelectionScreen.h

@@ -52,7 +52,6 @@ private:
 	bool _pendingQuit;
 
 	Button bArmor;
-	Button bCrafting;
 
 	RectangleArea _area;
 };

src/client/gui/screens/OptionsScreen.cpp

@@ -121,6 +121,7 @@ void OptionsScreen::setupPositions() {
 			(*it)->x = categoryButtons[0]->width;
 			(*it)->y = bHeader->height;
 			(*it)->width = width - categoryButtons[0]->width;
+			(*it)->height = height - bHeader->height;
 
 			(*it)->setupPositions();
 		}
@@ -197,7 +198,6 @@ void OptionsScreen::generateOptionScreens() {
 	optionPanes[1]->addOptionItem(OPTIONS_DIFFICULTY, minecraft)
 		.addOptionItem(OPTIONS_SERVER_VISIBLE, minecraft)
 		.addOptionItem(OPTIONS_THIRD_PERSON_VIEW, minecraft)
-		.addOptionItem(OPTIONS_WINDOW_SCALE, minecraft)
 		.addOptionItem(OPTIONS_GUI_SCALE, minecraft)
 		.addOptionItem(OPTIONS_SENSITIVITY, minecraft)
 		.addOptionItem(OPTIONS_MUSIC_VOLUME, minecraft)
@@ -224,7 +224,6 @@ void OptionsScreen::generateOptionScreens() {
 		// .addOptionItem(&Option::ANAGLYPH, minecraft)
 		.addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft)
 		.addOptionItem(OPTIONS_VSYNC, minecraft)
-		.addOptionItem(OPTIONS_VIEW_DISTANCE, minecraft)
 		.addOptionItem(OPTIONS_RENDER_DEBUG, minecraft)
 		.addOptionItem(OPTIONS_ANAGLYPH_3D, minecraft)
 		.addOptionItem(OPTIONS_VIEW_BOBBING, minecraft)
@@ -235,7 +234,6 @@ void OptionsScreen::generateOptionScreens() {
 
 	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
-		.addOptionItem(OPTIONS_MENU_STYLE, minecraft)
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
 		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
 		.addOptionItem(OPTIONS_TINTED_SIDE, minecraft)
@@ -261,6 +259,12 @@ void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
 	super::mouseReleased(x, y, buttonNum);
 }
 
+void OptionsScreen::mouseWheel(int dx, int dy, int xm, int ym) {
+	if (currentOptionsGroup != NULL && currentOptionsGroup->pointInside(xm, ym) && dy != 0) {
+		currentOptionsGroup->scrollByPixels((float)dy * 18.0f);
+	}
+}
+
 void OptionsScreen::keyPressed(int eventKey) {
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->keyPressed(minecraft, eventKey);

src/client/gui/screens/OptionsScreen.h

@@ -27,6 +27,7 @@ public:
 
 	virtual void mouseClicked(int x, int y, int buttonNum);
 	virtual void mouseReleased(int x, int y, int buttonNum);
+	virtual void mouseWheel(int dx, int dy, int xm, int ym);
 	virtual void keyPressed(int eventKey);
 	virtual void charPressed(char inputChar);
 	

src/client/gui/screens/PauseScreen.cpp

@@ -10,18 +10,18 @@
 #include "client/gui/screens/OptionsScreen.h"
 
 PauseScreen::PauseScreen(bool wasBackPaused)
-	:	saveStep(0),
+:	saveStep(0),
 	visibleTime(0),
 	bContinue(0),
 	bQuit(0),
 	bOptions(0),
 	bQuitAndSaveLocally(0),
 	bServerVisibility(0),
-	//	bThirdPerson(0),
+//	bThirdPerson(0),
 	wasBackPaused(wasBackPaused),
 	// bSound(OPTIONS_SOUND_VOLUME, 1, 0),
 	bThirdPerson(OPTIONS_THIRD_PERSON_VIEW),
-	bHideGui(OPTIONS_HIDEGUI)
+    bHideGui(OPTIONS_HIDEGUI)
 {
 	ImageDef def;
 	def.setSrc(IntRectangle(160, 144, 39, 31));
@@ -34,7 +34,7 @@ PauseScreen::PauseScreen(bool wasBackPaused)
 	// bSound.setImageDef(def, true);
 	defSrc.y += defSrc.h;
 	bThirdPerson.setImageDef(def, true);
-	bHideGui.setImageDef(def, true);
+    bHideGui.setImageDef(def, true);
 	//void setImageDef(ImageDef& imageDef, bool setButtonSize);
 }
 
@@ -44,31 +44,24 @@ PauseScreen::~PauseScreen() {
 	delete bQuitAndSaveLocally;
 	delete bServerVisibility;
 	delete bOptions;
-	//	delete bThirdPerson;
+//	delete bThirdPerson;
 }
 
 void PauseScreen::init() {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bContinue = new Touch::TButton(1, "Back to game");
 		bOptions = new Touch::TButton(5, "Options");
 		bQuit = new Touch::TButton(2, "Quit to title");
 		bQuitAndSaveLocally = new Touch::TButton(3, "Quit and copy map");
 		bServerVisibility = new Touch::TButton(4, "");
-		//		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
-	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
+//		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
+	} else {
 		bContinue = new Button(1, "Back to game");
 		bOptions = new Button(5, "Options");
 		bQuit = new Button(2, "Quit to title");
 		bQuitAndSaveLocally = new Button(3, "Quit and copy map");
 		bServerVisibility = new Button(4, "");
-		//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
-	} else {
-		bContinue = new Button(1, 0, 0, 200, 20, "Back to game");
-		bServerVisibility = new Button(4, 0, 0, 200, 20, "");
-		bOptions = new Button(5, 0, 0, 200, 20, "Options...");
-		bQuit = new Button(2, 0, 0, 200, 20, "Save and quit to title");
-		bQuitAndSaveLocally = new Button(3, 0, 0, 200, 20, "Copy and quit map");
-		//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
+//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
 	}
 
 	buttons.push_back(bContinue);
@@ -79,12 +72,12 @@ void PauseScreen::init() {
 	bHideGui.updateImage(&minecraft->options);
 	// buttons.push_back(&bSound);
 	buttons.push_back(&bThirdPerson);
-	//buttons.push_back(&bHideGui);
+    //buttons.push_back(&bHideGui);
 
 	// If Back wasn't pressed, set up additional items (more than Quit to menu
 	// and Back to game) here
     
-#if !defined(APPLE_DEMO_PROMOTION) && !defined(RPI)
+    #if !defined(APPLE_DEMO_PROMOTION) && !defined(RPI)
 	if (true || !wasBackPaused) {
 		if (minecraft->raknetInstance) {
 			if (minecraft->raknetInstance->isServer()) {
@@ -92,14 +85,14 @@ void PauseScreen::init() {
 				buttons.push_back(bServerVisibility);
 			}
 			else {
-#if !defined(DEMO_MODE)
-				buttons.push_back(bQuitAndSaveLocally);
-#endif
+                #if !defined(DEMO_MODE)
+                buttons.push_back(bQuitAndSaveLocally);
+				#endif
 			}
 		}
 	}
-#endif
-	//	buttons.push_back(bThirdPerson);
+    #endif
+//	buttons.push_back(bThirdPerson);
 
 	for (unsigned int i = 0; i < buttons.size(); ++i) {
 		// if (buttons[i] == &bSound) continue;
@@ -110,48 +103,27 @@ void PauseScreen::init() {
 }
 
 void PauseScreen::setupPositions() {
-	saveStep = 0;
+    saveStep = 0;
 	int yBase = 16;
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
-		yBase = 50;
 
-		bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 200;
-		bQuitAndSaveLocally->width = bServerVisibility->width = 200;
+	bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 160;
+	bQuitAndSaveLocally->width = bServerVisibility->width = 160;
 
-		bContinue->x = (width - bContinue->width) / 2;
-		bContinue->y = yBase + 24 * 1;
+	bContinue->x = (width - bContinue->width) / 2;
+	bContinue->y = yBase + 32 * 1;
 
-		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 24 * 2;
+	bOptions->x = (width - bOptions->width) / 2;
+	bOptions->y = yBase + 32 * 2;
 
-		bOptions->x = (width - bOptions->width) / 2;
-		bOptions->y = yBase + 24 * 3 + 24;
-
-		bQuit->x = (width - bQuit->width) / 2;
-		bQuit->y = yBase + 24 * 4 + 24;
-
-	} else {
-		bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 160;
-		bQuitAndSaveLocally->width = bServerVisibility->width = 160;
-
-		bContinue->x = (width - bContinue->width) / 2;
-		bContinue->y = yBase + 32 * 1;
-
-		bOptions->x = (width - bOptions->width) / 2;
-		bOptions->y = yBase + 32 * 2;
-
-		bQuit->x = (width - bQuit->width) / 2;
-		bQuit->y = yBase + 32 * 3;
+	bQuit->x = (width - bQuit->width) / 2;
+	bQuit->y = yBase + 32 * 3;
 
 #if APPLE_DEMO_PROMOTION
-		bQuit->y += 16;
+    bQuit->y += 16;
 #endif
     
-		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;
-	}
-
-
+	bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
+	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;
 
 	// bSound.y = bThirdPerson.y = 8;
 	// bSound.x = 4;
@@ -189,9 +161,9 @@ void PauseScreen::buttonClicked(Button* button) {
 		minecraft->setScreen(NULL);
 		//minecraft->grabMouse();
 	}
-	if (button->id == bQuit->id) {
+    if (button->id == bQuit->id) {
 		minecraft->leaveGame();
-	}
+    }
 	if (button->id == bQuitAndSaveLocally->id) {
 		minecraft->leaveGame(true);
 	}
@@ -225,5 +197,5 @@ void PauseScreen::updateServerVisibilityText()
 	ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) minecraft->netCallback;
 	bServerVisibility->msg = ss->allowsIncomingConnections()?
 		"Server is visible"
-		:   "Server is invisible";
+	:   "Server is invisible";
 }

src/client/gui/screens/ScreenChooser.cpp

@@ -21,7 +21,7 @@ Screen* ScreenChooser::createScreen( ScreenId id )
 	Screen* screen = NULL;
 
 	// :sob:
-	if (_mc->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
+	if (/* _mc->useTouchscreen() */ true) {
 		switch (id) {
 		case SCREEN_STARTMENU:	     screen = new Touch::StartMenuScreen();	break;
 		case SCREEN_SELECTWORLD:     screen = new Touch::SelectWorldScreen();break;

src/client/gui/screens/StartMenuScreen.cpp

@@ -23,62 +23,49 @@
 
 // Some kind of default settings, might be overridden in ::init
 StartMenuScreen::StartMenuScreen()
+:	bHost(    2, 0, 0, 160, 24, "Start Game"),
+	bJoin(    3, 0, 0, 160, 24, "Join Game"),
+	bOptions( 4, 0, 0, 160, 24, "Options"),
+	bQuit(    5, "")
 {
 }
 
 StartMenuScreen::~StartMenuScreen()
 {
-	delete bHost;
-	delete bJoin;
-	delete bOptions;
-	delete bQuit;
 }
 
 void StartMenuScreen::init()
 {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
-		bHost = new Button(    2, 0, 0, 200, 20, "Singleplayer");
-		bJoin = new Button(    3, 0, 0, 200, 20, "Multiplayer");
-		bOptions = new Button( 4, 0, 0, 200, 20, "Options...");
-		bQuit = new Button( 5, 0, 0, 200, 20, "Ouit Game");
-	} else {
-		bHost = new Button(    2, 0, 0, 160, 24, "Start Game");
-		bJoin = new Button(    3, 0, 0, 160, 24, "Join Game");
-		bOptions = new Button( 4, 0, 0, 160, 24, "Options");
-		bQuit = new Button( 5, 0, 0, 160, 24, "Ouit Game");
-	}
-	bJoin->active = bHost->active = bOptions->active = true;
+	bJoin.active = bHost.active = bOptions.active = true;
 
 	if (minecraft->options.getStringValue(OPTIONS_USERNAME).empty()) {
 		return; // tick() will redirect to UsernameScreen
 	}
 
-	buttons.push_back(bHost);
-	buttons.push_back(bJoin);
+	buttons.push_back(&bHost);
+	buttons.push_back(&bJoin);
 	//buttons.push_back(&bTest);
-	buttons.push_back(bQuit);
 
-	tabButtons.push_back(bHost);
-	tabButtons.push_back(bJoin);
-	tabButtons.push_back(bQuit);
+	tabButtons.push_back(&bHost);
+	tabButtons.push_back(&bJoin);
 
 	#ifndef RPI
-		buttons.push_back(bOptions);
-		tabButtons.push_back(bOptions);
+		buttons.push_back(&bOptions);
+		tabButtons.push_back(&bOptions);
 	#endif
 
-    //// add quit button (top right X icon) – match OptionsScreen style
-    //{
-    //    ImageDef def;
-    //    def.name = "gui/touchgui.png";
-    //    def.width = 34;
-    //    def.height = 26;
-    //    def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
-    //    bQuit.setImageDef(def, true);
-    //    bQuit.scaleWhenPressed = false;
-    //    buttons.push_back(&bQuit);
-    //    // don't include in tab navigation
-    //}
+    // add quit button (top right X icon) – match OptionsScreen style
+    {
+        ImageDef def;
+        def.name = "gui/touchgui.png";
+        def.width = 34;
+        def.height = 26;
+        def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
+        bQuit.setImageDef(def, true);
+        bQuit.scaleWhenPressed = false;
+        buttons.push_back(&bQuit);
+        // don't include in tab navigation
+    }
 
 	copyright = "\xffMojang AB";//. Do not distribute!";
 
@@ -106,30 +93,20 @@ void StartMenuScreen::init()
 }
 
 void StartMenuScreen::setupPositions() {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
-		int yBase = (height / 2) - 20;
+	int yBase = height / 2;
 
-		bHost->y =	 yBase;
-		bJoin->y =	 bHost->y + 24;
-		bOptions->y = bJoin->y + 24;
-		bQuit->y = bOptions->y + 24;
-	} else {
-		int yBase = height / 2;
-		bHost->y =	 yBase;
-		bJoin->y =	 bHost->y + 24 + 4;
-		bOptions->y = bJoin->y + 24 + 4;
-		bQuit->y = bOptions->y + 24 + 4;
-	}
+	bHost.y =	 yBase;
+	bJoin.y =	 bHost.y + 24 + 4;
+	bOptions.y = bJoin.y + 24 + 4;
 
 	// Center buttons
-	bHost->x = (width - bHost->width) / 2;
-	bJoin->x = (width - bJoin->width) / 2;
-	bOptions->x = (width - bOptions->width) / 2;
-	bQuit->x = (width - bQuit->width) / 2;
+	bHost.x = (width - bHost.width) / 2;
+	bJoin.x = (width - bJoin.width) / 2;
+	bOptions.x = (width - bOptions.width) / 2;
 
-    //// position quit icon at top-right (use image-defined size)
-    //bQuit.x = width - bQuit.width;
-    //bQuit.y = 0;
+    // position quit icon at top-right (use image-defined size)
+    bQuit.x = width - bQuit.width;
+    bQuit.y = 0;
 }
 
 void StartMenuScreen::tick() {
@@ -137,7 +114,7 @@ void StartMenuScreen::tick() {
 
 void StartMenuScreen::buttonClicked(Button* button) {
 
-	if (button->id == bHost->id)
+	if (button->id == bHost.id)
 	{
         #if defined(DEMO_MODE) || defined(APPLE_DEMO_PROMOTION)
 			minecraft->setScreen( new SimpleChooseLevelScreen("_DemoLevel") );
@@ -145,16 +122,16 @@ void StartMenuScreen::buttonClicked(Button* button) {
 			minecraft->screenChooser.setScreen(SCREEN_SELECTWORLD);
 		#endif
 	}
-	if (button->id == bJoin->id)
+	if (button->id == bJoin.id)
 	{
 		minecraft->locateMultiplayer();
 		minecraft->screenChooser.setScreen(SCREEN_JOINGAME);
 	}
-	if (button->id == bOptions->id)
+	if (button->id == bOptions.id)
 	{
 		minecraft->setScreen(new OptionsScreen());
 	}
-	if (button->id == bQuit->id)
+	if (button == &bQuit)
 	{
 		minecraft->quit();
 	}

src/client/gui/screens/StartMenuScreen.h

@@ -23,10 +23,10 @@ public:
 	bool isInGameScreen();
 private:
 
-	Button* bHost;
-	Button* bJoin;
-	Button* bOptions;
-	Button* bQuit; 
+	Button bHost;
+	Button bJoin;
+	Button bOptions;
+	ImageButton bQuit; // X button in top-right corner
 
 	std::string copyright;
 	int copyrightPosX;

src/client/gui/screens/crafting/PaneCraftingScreen.cpp

@@ -16,12 +16,7 @@
 #include "../../../../world/level/Level.h"
 #include "../../../../world/item/DyePowderItem.h"
 #include "../../../../world/item/crafting/Recipe.h"
-#include "network/RakNetInstance.h"
-#include "network/packet/WantCreatePacket.h"
 #include "platform/input/Keyboard.h"
-#include <cstdint>
-#include <iostream>
-#include <string>
 
 static NinePatchLayer* guiPaneFrame = NULL;
 
@@ -198,26 +193,6 @@ void PaneCraftingScreen::setupPositions() {
 }
 
 void PaneCraftingScreen::tick() {
-	if (minecraft->isOnline()) {
-		// TODO: Make better algorithm
-		static std::map<uint8_t, uint16_t> oldMap = {};
-		std::map<uint8_t, uint16_t> newMap = {};
-
-		for (int i = Inventory::MAX_SELECTION_SIZE; i < minecraft->player->inventory->getContainerSize(); ++i) {
-			auto itm = minecraft->player->inventory->getItem(i);
-
-			if (itm != NULL) {
-				newMap[itm->id] += itm->count;
-			}
-		}
-
-		if (oldMap != newMap) {
-			oldMap = newMap;
-			newMap = {};
-			recheckRecipes();
-		}
-	}
-
 	if (pane) pane->tick();
 }
 
@@ -464,29 +439,25 @@ void PaneCraftingScreen::craftSelectedItem()
 	ItemInstance resultItem = currentItem->item;
 
 	if (minecraft->player) {
-		if (minecraft->isOnline()) {
-			WantCreatePacket packet(minecraft->player->entityId, resultItem.count, resultItem.getAuxValue(), resultItem.id);
-			minecraft->raknetInstance->send(packet);
-		}
 		// Remove all items required for the recipe and ...
 		for (unsigned int i = 0; i < currentItem->neededItems.size(); ++i) {
 			CItem::ReqItem& req = currentItem->neededItems[i];
 
-			// If the recipe allows any aux-value as ingredients, first deplete
-			// aux == 0 from inventory. Since I'm not sure if this always is
-			// correct, let's only do it for ingredient sandstone for now.
-			ItemInstance toRemove = req.item;
+            // If the recipe allows any aux-value as ingredients, first deplete
+            // aux == 0 from inventory. Since I'm not sure if this always is
+            // correct, let's only do it for ingredient sandstone for now.
+            ItemInstance toRemove = req.item;
 
-			if (Tile::sandStone->id == req.item.id
-			&& Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
-				toRemove.setAuxValue(0);
-				toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
-				toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
-			}
+            if (Tile::sandStone->id == req.item.id
+             && Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
+                 toRemove.setAuxValue(0);
+                 toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
+                 toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
+            }
 
-			if (toRemove.count > 0) {
-				minecraft->player->inventory->removeResource(toRemove);
-			}
+            if (toRemove.count > 0) {
+                minecraft->player->inventory->removeResource(toRemove);
+            }
 		}
 		// ... add the new one! (in this order, to fill empty slots better)
 		// if it doesn't fit, throw it on the ground!

src/client/model/HumanoidModel.cpp

@@ -40,9 +40,10 @@ HumanoidModel::HumanoidModel( float g /*= 0*/, float yOffset /*= 0*/, int texW /
 	head.addBox(-4, -8, -4, 8, 8, 8, g); // Head
 	head.setPos(0, 0 + yOffset, 0);
 
-	hair.addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Outer head layer (hat)
-	hair.setPos(0, 0 + yOffset, 0);
-
+	if (modernSkin) {
+		hair.addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Outer head layer (hat)
+		hair.setPos(0, 0 + yOffset, 0);
+	}
 
 	body.addBox(-4, 0, -2, 8, 12, 4, g); // Body
 	body.setPos(0, 0 + yOffset, 0);
@@ -98,17 +99,17 @@ void HumanoidModel::render(Entity* e, float time, float r, float bob, float yRot
 	setupAnim(time, r, bob, yRot, xRot, scale);
 	
 	// Sync overlay with head rotation/position
-	
-	hair.xRot = head.xRot;
-	hair.yRot = head.yRot;
-	hair.zRot = head.zRot;
-	hair.y = head.y;
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.xRot = head.xRot;
+		hair.yRot = head.yRot;
+		hair.zRot = head.zRot;
+		hair.y = head.y;
+	}
 
 	head.render(scale);
-	
-	hair.render(scale);
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.render(scale);
+	}
 	body.render(scale);
 	arm0.render(scale);
 	arm1.render(scale);
@@ -122,12 +123,12 @@ void HumanoidModel::render( HumanoidModel* model, float scale )
 	head.yRot = model->head.yRot;
 	head.y = model->head.y;
 	head.xRot = model->head.xRot;
-	
-	hair.yRot = head.yRot;
-	hair.xRot = head.xRot;
-	hair.zRot = head.zRot;
-	hair.y = head.y;
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.yRot = head.yRot;
+		hair.xRot = head.xRot;
+		hair.zRot = head.zRot;
+		hair.y = head.y;
+	}
 
 	arm0.xRot = model->arm0.xRot;
 	arm0.zRot = model->arm0.zRot;
@@ -272,7 +273,7 @@ void HumanoidModel::onGraphicsReset()
 	arm1.onGraphicsReset();
 	leg0.onGraphicsReset();
 	leg1.onGraphicsReset();
-	hair.onGraphicsReset();
+	//hair.onGraphicsReset();
 }
 
 //void renderHair(float scale) {

src/client/player/LocalPlayer.cpp

@@ -355,11 +355,7 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, const std::string&
 	armorTypeHash(0),
 	sprinting(false),
 	sprintDoubleTapTimer(0),
-	prevForwardHeld(false),
-	xBob(0.0f),
-	yBob(0.0f),
-	xBobO(0.0f),
-	yBobO(0.0f)
+	prevForwardHeld(false)
 {
 	this->dimension = dimension;
 	_init();
@@ -460,7 +456,7 @@ void LocalPlayer::tick() {
 		{
 			sentInventoryItemId   = newItemId;
 			sentInventoryItemData = newItemData;
-			PlayerEquipmentPacket packet(entityId, newItemId, newItemData, inventory->selected, inventory->getSlot(newItemId, newItemData));
+			PlayerEquipmentPacket packet(entityId, newItemId, newItemData);
 			minecraft->raknetInstance->send(packet);
 		}
 	}
@@ -554,10 +550,6 @@ void LocalPlayer::aiStep() {
 
 	//if (onGround && abilities.flying)
 	//	abilities.flying = false;
-	yBobO = yBob;
-	xBobO = xBob;
-	xBob += (xRot - xBob) * 0.5;
-	yBob += (yRot - yBob) * 0.5;
 
 	if (interpolateOnly())
 		updateAi();

src/client/player/LocalPlayer.h

@@ -22,10 +22,6 @@ public:
 	virtual void reset();
 
 	void tick();
-
-	float yBob, xBob;	// shredder added from b1.8/4j for the hand swaying animation
-	float yBobO, xBobO; // shredder added from b1.8/4j for the hand swaying animation
-
     void move(float xa, float ya, float za);
 
     void aiStep();

src/client/renderer/GameRenderer.cpp

@@ -101,22 +101,12 @@ void GameRenderer::setupCamera(float a, int eye) {
 
 	float stereoScale = 0.07f;
 	if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) glTranslatef2(-(eye * 2 - 1) * stereoScale, 0, 0);
-	if (mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		if (zoom != 1) {
-			glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
-			glScalef2(zoom, zoom, 1);
-			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance * 2.0f);
-		} else {
-			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance * 2.0f);
-		}
+	if (zoom != 1) {
+		glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
+		glScalef2(zoom, zoom, 1);
+		gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
 	} else {
-		if (zoom != 1) {
-			glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
-			glScalef2(zoom, zoom, 1);
-			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
-		} else {
-			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
-		}
+		gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
 	}
 
 	glMatrixMode(GL_MODELVIEW);
@@ -347,15 +337,12 @@ void GameRenderer::renderLevel(float a) {
 		Lighting::turnOff();
 		glDisable2(GL_BLEND);
 		glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		Lighting::turnOff();
 		setupFog(0);
 		glEnable2(GL_BLEND);
 		glDisable2(GL_CULL_FACE);
-		glDepthMask(GL_FALSE); // @TODO commenting this out fixes Ice transparency and clouds are no longer visilbe underwater like normal beta - shredder
+		glDepthMask(GL_FALSE);
 		glDisable2(GL_ALPHA_TEST);
 		mc->textures->loadAndBindTexture("terrain.png");
-		// @TODO - below is a commented out double render system that fixes ice transparency, but probs harm performance, add it as an option - shredder
-
 		//if (mc->options.fancyGraphics) {
 		//    glColorMask(false, false, false, false);
 		//    int visibleWaterChunks = levelRenderer->render(cameraEntity, 1, a);
@@ -690,7 +677,7 @@ void GameRenderer::pick(float a) {
 	float range = mc->gameMode->getPickRange();
 	bool isPicking = true;
 
-	bool freeform = mc->useTouchscreen() && !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
+	bool freeform = mc->useTouchscreen(); //&& !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
 
 	if (freeform) {
 		isPicking = updateFreeformPickDirection(a, pickDirection);

src/client/renderer/ItemInHandRenderer.cpp

@@ -280,9 +280,6 @@ void ItemInHandRenderer::render( float a )
 	float h = oHeight + (height - oHeight) * a;
 	Player* player = mc->player;
 	// if (selectedTile==NULL) return;
-	LocalPlayer* localPlayer = (LocalPlayer*)(player);
-
-	float xr = player->xRotO + (player->xRot - player->xRotO) * a; // shredder added for hand swaying
 
 	glPushMatrix2();
 	glRotatef2(player->xRotO + (player->xRot - player->xRotO) * a, 1, 0, 0);
@@ -291,16 +288,6 @@ void ItemInHandRenderer::render( float a )
 	Lighting::turnOn(mc);
 	glPopMatrix2();
 
-	 if (localPlayer) // shredder added, basically does the hand swaying animation from b1.8
-	{
-        float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
-        float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
-		// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
-		float yr = player->yRotO + (player->yRot - player->yRotO) * a;
-        glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
-        glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
-    }
-
 	float br = mc->level->getBrightness(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
 
 	ItemInstance* item;// = selectedItem;

src/client/renderer/LevelRenderer.cpp

@@ -26,7 +26,6 @@
 #include "../../client/player/LocalPlayer.h"
 
 #include "../../world/level/GrassColor.h"
-#include "Lighting.h"
 
 #ifdef GFX_SMALLER_CHUNKS
 /* static */ const int LevelRenderer::CHUNK_SIZE = 8;
@@ -69,7 +68,7 @@ LevelRenderer::LevelRenderer( Minecraft* mc)
 	destroyProgress(0)
 {
 #ifdef OPENGL_ES
-	int maxChunksWidth = 2 * LevelConstants::LEVEL_WIDTH / CHUNK_SIZE + 1;
+	int maxChunksWidth = 2 * LEVEL_WIDTH / CHUNK_SIZE + 1;
 	numListsOrBuffers = maxChunksWidth * maxChunksWidth * (128/CHUNK_SIZE) * 3;
 	chunkBuffers = new GLuint[numListsOrBuffers];
 	glGenBuffers2(numListsOrBuffers, chunkBuffers);
@@ -576,7 +575,7 @@ void LevelRenderer::render(const AABB& b) const
 	//	t.color(255, 255, 255, 255); // again not needed, for some reason the vanilla source code tints it... white? maybe this was used for something else in MCPE's dev at one point? - shredder
 
 	//	t.offset(((Mob*)mc->player)->getPos(0).negated()); // why does this even exist normally, it just makes the thing... not render
-	glLineWidth(2.0f); // make it more thick - shredder
+
 	t.begin(GL_LINE_STRIP);
 	t.vertex(b.x0, b.y0, b.z0);
 	t.vertex(b.x1, b.y0, b.z0);
@@ -1158,22 +1157,23 @@ void LevelRenderer::renderSky(float alpha) {
 		glDisable(GL_FOG);
 	glDisable(GL_ALPHA_TEST);
 
-	// re ported this again from beta 1.6.6, thanks to the mcpe 0.1 decomp team's code for some bit of help about the void layer - shredder 
+	// thanks to the mcpe 0.1 decomp project a bit for this part, was not getting the gl states correctly, gles is painful - shredder
 
 	// Sunrise
 	if (mc->options.getBooleanValue(OPTIONS_BEAUTIFUL_SKY)) {
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	Lighting::turnOff();
+
 	float* c = level->dimension->getSunriseColor(level->getTimeOfDay(alpha), alpha);
 	if (c != nullptr)
 	{
 		glDisable(GL_TEXTURE_2D);
-//		glShadeModel(GL_SMOOTH); //
+
 
 		glPushMatrix();
 		glRotatef(90.0f, 1.0f, 0.0f, 0.0f);
 		glRotatef(level->getTimeOfDay(alpha) > 0.5f ? 180 : 0, 0.0f, 0.0f, 1.0f);
+
 		t.begin(GL_TRIANGLE_FAN);
 		t.color(c[0], c[1], c[2], c[3]);
 		t.vertex(0.0f, 100.0f, 0.0f);
@@ -1190,12 +1190,11 @@ void LevelRenderer::renderSky(float alpha) {
 
 		t.draw();
 		glPopMatrix();
-//		glShadeModel(GL_FLAT); //
 	}
 
 	// gets the time of day and rotates the sun and moon png based on the time
 	glEnable(GL_TEXTURE_2D);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+	glBlendFunc(GL_ONE, GL_ONE);
 	glPushMatrix();
 
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
@@ -1327,8 +1326,8 @@ void LevelRenderer::renderAdvancedClouds(float alpha) {
 
 	float cloudTime = (float)ticks + alpha;
 
-	float xo = (px + cloudTime * 0.03f) / ss;
-	float zo = pz / ss + 0.33f;
+	double xo = (px + cloudTime * 0.03f) / ss;
+	double zo = pz / ss + 0.33f;
 
 	float yy = 108.0f - py + 0.33f;
 
@@ -1451,55 +1450,54 @@ void LevelRenderer::playSound(const std::string& name, float x, float y, float z
 	// @todo: deny sounds here if sound is off (rather than waiting 'til SoundEngine)
 	float dd = 16;
 
-    if (volume > 1) dd *= volume;
-    if (mc->cameraTargetPlayer != NULL && mc->cameraTargetPlayer->distanceToSqr(x, y, z) < dd * dd) {
-        mc->soundEngine->play(name, x, y, z, volume, pitch);
-    }
+	if (volume > 1) dd *= volume;
+	if (mc->cameraTargetPlayer->distanceToSqr(x, y, z) < dd * dd) {
+		mc->soundEngine->play(name, x, y, z, volume, pitch);
+	}
 }
 
 void LevelRenderer::addParticle(const std::string& name, float x, float y, float z, float xa, float ya, float za, int data) {
-	if (mc->cameraTargetPlayer != NULL) {
-		float xd = mc->cameraTargetPlayer->x - x;
-		float yd = mc->cameraTargetPlayer->y - y;
-		float zd = mc->cameraTargetPlayer->z - z;
-		float distanceSquared = xd * xd + yd * yd + zd * zd;
 
-		//Particle* p = NULL;
-		//if (name == "hugeexplosion") p = new HugeExplosionSeedParticle(level, x, y, z, xa, ya, za);
-		//else if (name == "largeexplode") p = new HugeExplosionParticle(textures, level, x, y, z, xa, ya, za);
+	float xd = mc->cameraTargetPlayer->x - x;
+	float yd = mc->cameraTargetPlayer->y - y;
+	float zd = mc->cameraTargetPlayer->z - z;
+	float distanceSquared = xd * xd + yd * yd + zd * zd;
 
-		//if (p) {
-		//	if (distanceSquared < 32 * 32) {
-		//		mc->particleEngine->add(p);
-		//	} else { delete p; }
-		//	return;
-		//}
+	//Particle* p = NULL;
+	//if (name == "hugeexplosion") p = new HugeExplosionSeedParticle(level, x, y, z, xa, ya, za);
+	//else if (name == "largeexplode") p = new HugeExplosionParticle(textures, level, x, y, z, xa, ya, za);
 
-		const float particleDistance = 16;
-		if (distanceSquared > particleDistance * particleDistance) return;
+	//if (p) {
+	//	if (distanceSquared < 32 * 32) {
+	//		mc->particleEngine->add(p);
+	//	} else { delete p; }
+	//	return;
+	//}
 
-		//static Stopwatch sw;
-		//sw.start();
+	const float particleDistance = 16;
+	if (distanceSquared > particleDistance * particleDistance) return;
 
-		if (name == "bubble") mc->particleEngine->add(new BubbleParticle(level, x, y, z, xa, ya, za));
-		else if (name == "crit") mc->particleEngine->add(new CritParticle2(level, x, y, z, xa, ya, za));
-		else if (name == "smoke") mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za));
-		//else if (name == "note") mc->particleEngine->add(new NoteParticle(level, x, y, z, xa, ya, za));
-		else if (name == "explode") mc->particleEngine->add(new ExplodeParticle(level, x, y, z, xa, ya, za));
-		else if (name == "flame") mc->particleEngine->add(new FlameParticle(level, x, y, z, xa, ya, za));
-		else if (name == "lava") mc->particleEngine->add(new LavaParticle(level, x, y, z));
-		//else if (name == "splash") mc->particleEngine->add(new SplashParticle(level, x, y, z, xa, ya, za));
-		else if (name == "largesmoke") mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za, 2.5f));
-		else if (name == "reddust") mc->particleEngine->add(new RedDustParticle(level, x, y, z, xa, ya, za));
-		else if (name == "iconcrack") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, xa, ya, za, Item::items[data]));
-		else if (name == "snowballpoof") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::snowBall));
-		//else if (name == "snowballpoof") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::snowBall));
-		//else if (name == "slime") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::slimeBall));
-		//else if (name == "heart") mc->particleEngine->add(new HeartParticle(level, x, y, z, xa, ya, za));
+	//static Stopwatch sw;
+	//sw.start();
 
-		//sw.stop();
-		//sw.printEvery(50, "add-particle-string");
-	}
+	if (name == "bubble") mc->particleEngine->add(new BubbleParticle(level, x, y, z, xa, ya, za));
+	else if (name == "crit") mc->particleEngine->add(new CritParticle2(level, x, y, z, xa, ya, za));
+	else if (name == "smoke") mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za));
+	//else if (name == "note") mc->particleEngine->add(new NoteParticle(level, x, y, z, xa, ya, za));
+	else if (name == "explode") mc->particleEngine->add(new ExplodeParticle(level, x, y, z, xa, ya, za));
+	else if (name == "flame") mc->particleEngine->add(new FlameParticle(level, x, y, z, xa, ya, za));
+	else if (name == "lava") mc->particleEngine->add(new LavaParticle(level, x, y, z));
+	//else if (name == "splash") mc->particleEngine->add(new SplashParticle(level, x, y, z, xa, ya, za));
+	else if (name == "largesmoke") mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za, 2.5f));
+	else if (name == "reddust") mc->particleEngine->add(new RedDustParticle(level, x, y, z, xa, ya, za));
+	else if (name == "iconcrack") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, xa, ya, za, Item::items[data]));
+	else if (name == "snowballpoof") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::snowBall));
+	//else if (name == "snowballpoof") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::snowBall));
+	//else if (name == "slime") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::slimeBall));
+	//else if (name == "heart") mc->particleEngine->add(new HeartParticle(level, x, y, z, xa, ya, za));
+
+	//sw.stop();
+	//sw.printEvery(50, "add-particle-string");
 }
 
 /*

src/client/renderer/entity/EntityRenderer.cpp

@@ -130,11 +130,10 @@ void EntityRenderer::postRender(Entity* entity, float x, float y, float z, float
 		if (pow > 0) {
 			renderShadow(entity, x, y, z, pow, a);
 		}
-	}
+		//}
 		if (entity->isOnFire()) renderFlame(entity, x, y, z, a);
+	}
 }
-// duplicate renderflame below is the pre b1.6.6 way flame rendered on player and mobs, probs gonna make it an option. - shredder
-/*
 void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
 	glDisable(GL_LIGHTING);
 	int tex = ((Tile*)Tile::fire)->tex;
@@ -180,75 +179,6 @@ void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a)
 	glPopMatrix2();
 	glEnable2(GL_LIGHTING);
 }
-*/
-// new renderflame ported from b1.6.6, fixes player height offset and also uses the newer style - shredder
-void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
-    glDisable(GL_LIGHTING);
-    int tex = ((Tile*)Tile::fire)->tex;
-
-    int xt = (tex & 0xf) << 4;
-    int yt = tex & 0xf0;
-
-    float u0 = (xt) / 256.0f;
-    float u1 = (xt + 15.99f) / 256.0f;
-    float v0 = (yt) / 256.0f;
-    float v1 = (yt + 15.99f) / 256.0f;
-
-    glPushMatrix2();
-    glTranslatef2((float) x, (float) y, (float) z);
-
-    float s = e->bbWidth * 1.4f;
-    glScalef2(s, s, s);
-    bindTexture("terrain.png");
-    Tesselator& t = Tesselator::instance;
-
-    float r = 0.5f; 
-    float xo = 0.0f;
-
-    float h = e->bbHeight / s;
-	float yo = (float)(e->y - e->bb.y0) / s; 
-
-    glRotatef2(-entityRenderDispatcher->playerRotY, 0, 1, 0);
-    glTranslatef2(0, 0, -0.3f + ((int) h) * 0.02f);
-    glColor4f2(1, 1, 1, 1);
-    
-    float zo = 0.0f; 
-    int cycle_counter = 0;
-
-    t.begin();
-    while (h > 0.0f) {
-        float current_u0 = u0;
-        float current_u1 = u1;
-        float current_v0 = v0;
-        float current_v1 = v1;
-
-        if (cycle_counter % 2 != 0) {
-            current_v0 = (yt + 16) / 256.0f;
-            current_v1 = (yt + 16 + 15.99f) / 256.0f;
-        }
-
-        if ((cycle_counter / 2) % 2 == 0) {
-            float tmp = current_u1;
-            current_u1 = current_u0;
-            current_u0 = tmp;
-        }
-
-        t.vertexUV(r - xo, 0.0f - yo, zo, current_u1, current_v1);
-        t.vertexUV(-r - xo, 0.0f - yo, zo, current_u0, current_v1);
-        t.vertexUV(-r - xo, 1.4f - yo, zo, current_u0, current_v0);
-        t.vertexUV(r - xo, 1.4f - yo, zo, current_u1, current_v0);
-        
-        h -= 0.45f;
-        yo -= 0.45f;
-        r *= 0.9f;   
-        zo += 0.03f;
-        cycle_counter++;
-    }
-    t.draw();
-    
-    glPopMatrix2();
-    glEnable2(GL_LIGHTING);
-}
 
 void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float pow, float a) { //
 	glEnable2(GL_BLEND);
@@ -257,12 +187,8 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 	//Textures* textures = entityRenderDispatcher->textures;
 	//textures->bind(textures->loadTexture("%clamp%/environment/shadow.png"));
 	Textures* textures = entityRenderDispatcher->textures;
-	textures->loadAndBindTexture("/misc/shadow.png"); 
 
 
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
 
 
 	Level* level = getLevel();
@@ -295,13 +221,14 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 					renderTileShadow(Tile::tiles[t], x, y + e->getShadowHeightOffs(), z, xt, yt, zt, pow, r, xo, yo + e->getShadowHeightOffs(), zo);
 				}
 			}
+			textures->loadAndBindTexture(("/misc/shadow.png"));
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 			tt.draw();
 
 			glColor4f2(1, 1, 1, 1);
 			glDisable2(GL_BLEND);
 			glDepthMask(true);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 }
 
 Level* EntityRenderer::getLevel() {

src/client/renderer/entity/ItemRenderer.cpp

@@ -130,12 +130,13 @@ static const signed short _18[] = {79, 80, 81, -1, 79, 80, 81, -1, 79, 80, 81, -
 static const signed short _24[] = {11, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _35[] = {52, 59, 58, 57, 56, 55, 54, 53, 67, 66, 65, 64, 63, 62, 61, 60};
 static const signed short _44[] = {28, 32, 30, 29, 31, 33, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
+static const signed short _31[] = {37, 82, -1, 38, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _98[] = {1, 2, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _155[] = {34, 36, 35, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _263[] = {230, 151, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 static const signed short _351[] = {-1, 152, 154, -1, 193, 215, 216, -1, -1, 217, 218, 219, 220, 221, 222, 144};
 
-static const signed short _mapper[] = {-1, 7, 9, 8, 0, 5, -2, -1, -1, -1, -1, -1, 14, 15, 39, 38, 37, -2, -2, -1, 49, 41, 46, -1, -2, -1, -1, -1, -1, -1, 235, -1, -1, -1, -1, -2, -1, 134, 135, 136, 137, 43, 44, -1, -2, 6, 76, 71, 4, 47, 129, -1, -1, 22, 74, -1, 40, 45, 72, -1, -1, 75, -1, -1, -1, 128, -1, 21, -1, -1, -1, -1, -1, 42, -1, -1, -1, -1, -1, -1, 48, 77, 10, 236, -1, 69, -1, 20, -1, 50, -1, -1, -1, -1, -1, -1, 68, -1, -2, -1, -1, -1, 130, 78, -1, -1, -1, 70, 23, 25, -1, -1, 19, -1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, 51, -1, -1, -1, -1, -1, 82, -1, -1, 174, 173, 175, 231, 234, 147, 190, -2, 153, 150, 149, 146, 185, 166, 164, 167, 186, 170, 169, 171, 187, 177, 176, 178, 165, 195, 194, 188, 181, 180, 182, 189, 191, 228, 168, 172, 145, 179, 183, 142, 233, 232, 198, 200, 201, 202, -1, -1, -1, -1, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 192, 156, 157, 133, -1, 148, 131, -1, -1, -1, -1, -1, -1, -1, 226, -1, 199, -1, 159, 158, 138, 224, 225, -1, -1, -1, -1, -1, -1, -1, 227, -1, -1, -2, 223, 229, -1, 132, -1, -1, -1, 184, 196, -1, 143, 160, 161, 162, 163, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 155, 197};
+static const signed short _mapper[] = {-1, 7, 9, 8, 0, 5, -2, -1, -1, -1, -1, -1, 14, 15, 39, 38, 37, -2, -2, -1, 49, 41, 46, -1, -2, -1, -1, -1, -1, -1, 235, -2, -1, -1, -1, -2, -1, 134, 135, 136, 137, 43, 44, -1, -2, 6, 76, 71, 4, 47, 129, -1, -1, 22, 74, -1, 40, 45, 72, -1, -1, 75, -1, -1, -1, 128, -1, 21, -1, -1, -1, -1, -1, 42, -1, -1, -1, -1, -1, -1, 48, 77, 10, 236, -1, 69, -1, 20, -1, 50, -1, -1, -1, -1, -1, -1, 68, -1, -2, -1, -1, -1, 130, 78, -1, -1, -1, 70, 23, 25, -1, -1, 19, -1, 26, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 24, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -2, 27, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 73, -1, 51, -1, -1, -1, -1, -1, 82, -1, -1, 174, 173, 175, 231, 234, 147, 190, -2, 153, 150, 149, 146, 185, 166, 164, 167, 186, 170, 169, 171, 187, 177, 176, 178, 165, 195, 194, 188, 181, 180, 182, 189, 191, 228, 168, 172, 145, 179, 183, 142, 233, 232, 198, 200, 201, 202, -1, -1, -1, -1, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 192, 156, 157, 133, -1, 148, 131, -1, -1, -1, -1, -1, -1, -1, 226, -1, 199, -1, 159, 158, 138, 224, 225, -1, -1, -1, -1, -1, -1, -1, 227, -1, -1, -2, 223, 229, -1, 132, -1, -1, -1, 184, 196, -1, 143, 160, 161, 162, 163, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 155, 197};
 
 #define IRMAPCASE(x) case x: return  _##x [item->getAuxValue() & 15]
 
@@ -153,6 +154,7 @@ int ItemRenderer::getAtlasPos(const ItemInstance* item) {
 		IRMAPCASE(17);
 		IRMAPCASE(18);
 		IRMAPCASE(24);
+		IRMAPCASE(31);
 		IRMAPCASE(35);
 		IRMAPCASE(44);
 		IRMAPCASE(98);

src/client/renderer/entity/MobRenderer.cpp

@@ -218,8 +218,6 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, floa
 
 	glScalef2(-s, -s, s);
 
-	glDisable(GL_LIGHTING);
-
 	glDepthMask(false);
 	glDisable2(GL_DEPTH_TEST);
 	glEnable2(GL_BLEND);
@@ -243,7 +241,6 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, floa
 
 	glDepthMask(true);
 	font->draw(name, (float) fnameWidth, 0, 0xffffffff);
-	glEnable(GL_LIGHTING);
 	glDisable2(GL_BLEND);
 	glColor4f2(1, 1, 1, 1);
 	glPopMatrix2();

src/client/renderer/entity/PlayerRenderer.cpp

@@ -77,10 +77,10 @@ void PlayerRenderer::render(Entity* mob_, float x, float y, float z, float rot,
 		model = desired;
 		humanoidModel = desired;
 	}
-	/* LOGI("[PlayerRenderer] %s: skin=%s, modelTex=%dx%d, desired=%s\n", 
-		((Player*)mob)->name.c_str(), mob->getTexture().c_str(), 
-		humanoidModel->texWidth, humanoidModel->texHeight,
-		(desired == playerModel64 ? "64" : "32")); */
+//	LOGI("[PlayerRenderer] %s: skin=%s, modelTex=%dx%d, desired=%s\n", // don't log it always, only for debug - shredder
+//		((Player*)mob)->name.c_str(), mob->getTexture().c_str(), 
+//		humanoidModel->texWidth, humanoidModel->texHeight,
+//		(desired == playerModel64 ? "64" : "32"));
 	HumanoidMobRenderer::render(mob_, x, y, z, rot, a);
 }
 

src/client/renderer/ptexture/DynamicTexture.cpp

@@ -393,8 +393,8 @@ void LavaSideTexture::tick() {
 		}
 }
 
-FireTexture::FireTexture(int id)
-	:   super(((Tile*)Tile::fire)->tex + id * 16),
+FireTexture::FireTexture()
+	:   super(((Tile*)Tile::fire)->tex),
 	_tick(0),
 	_frame(0)
 {

src/client/renderer/ptexture/DynamicTexture.h

@@ -106,7 +106,7 @@ class FireTexture: public DynamicTexture
 	float* heata;
 
 public:
-    FireTexture(int id);
+    FireTexture();
 	~FireTexture();
 
     void tick();

src/client/sound/Sound.cpp

@@ -111,7 +111,6 @@
 #include "data/eat1.pcm"
 #include "data/eat2.pcm"
 #include "data/eat3.pcm"
-#include "data/burp1.pcm"
 #include "data/fuse.pcm"
 
 SoundDesc SA_cloth1((char*)PCM_cloth1);
@@ -222,7 +221,6 @@ SoundDesc SA_creeperdeath((char*)PCM_creeperdeath);
 SoundDesc SA_eat1((char*)PCM_eat1);
 SoundDesc SA_eat2((char*)PCM_eat2);
 SoundDesc SA_eat3((char*)PCM_eat3);
-SoundDesc SA_burp1((char*)PCM_burp1);
 SoundDesc SA_fuse((char*)PCM_fuse);
 
 #endif /*!PRE_ANDROID23 && !__APPLE__*/

src/client/sound/Sound.h

@@ -172,7 +172,6 @@ extern SoundDesc SA_creeperdeath;
 extern SoundDesc SA_eat1;
 extern SoundDesc SA_eat2;
 extern SoundDesc SA_eat3;
-extern SoundDesc SA_burp1;
 extern SoundDesc SA_fuse;
 
 #endif /*!PRE_ANDROID23 && !__APPLE__*/

src/client/sound/SoundEngine.cpp

@@ -144,7 +144,6 @@ void SoundEngine::init( Minecraft* mc, Options* options )
 	sounds.add("random.eat", SA_eat1);
 	sounds.add("random.eat", SA_eat2);
 	sounds.add("random.eat", SA_eat3);
-	sounds.add("random.burp", SA_burp1);
 	sounds.add("random.fuse", SA_fuse);
 
 #endif

src/client/sound/SoundEngine.mm

@@ -227,7 +227,6 @@ void SoundEngine::init( Minecraft* mc, Options* options )
     sounds.add( "random.eat",  _pp("eat1"));
     sounds.add( "random.eat",  _pp("eat2"));
     sounds.add( "random.eat",  _pp("eat3"));
-    sounds.add( "random.burp",  _pp("burp1"));
     sounds.add( "random.fuse", _pp("fuse"));
 
     sounds.add(	"step.cloth", _pp("cloth1"));

src/commands/Command.cpp

@@ -1,10 +0,0 @@
-#include "Command.hpp"
-#include "world/level/Level.h"
-#include <client/Minecraft.h>
-
-bool Command::isPlayerOp(Minecraft& mc, Player& player) {
-    std::string nicknameLower = player.name;
-    std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
-
-    return mc.level->ops.find(nicknameLower) != mc.level->ops.end();
-}

src/commands/Command.hpp

@@ -1,28 +0,0 @@
-#pragma once
-#include <string>
-#include <vector>
-
-enum CommandFlags {
-    COMMAND_FLAG_SINGLEPLAYER_ONLY = (1 << 1),
-    COMMAND_FLAG_NO_ARGS = (1 << 2),
-};
-
-class Minecraft;
-class Player;
-
-class Command {
-public:
-    const std::string& getName() { return m_name; }
-    const CommandFlags getFlags() { return m_flags; }
-
-    bool isPlayerOp(Minecraft& mc, Player& player);
-
-    virtual std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) = 0;
-    virtual std::string help(Minecraft& mc) = 0;
-
-protected:
-    Command(const std::string& name, CommandFlags flags = (CommandFlags)0) : m_name(name), m_flags(flags) {}
-
-    const std::string m_name;
-    const CommandFlags m_flags;
-};

src/commands/CommandBan.cpp

@@ -1,49 +0,0 @@
-#include "CommandBan.hpp"
-#include "commands/Command.hpp"
-#include "network/RakNetInstance.h"
-#include "raknet/RakPeerInterface.h"
-#include "world/level/Level.h"
-#include <algorithm>
-#include <client/Minecraft.h>
-#include <network/packet/LoginStatusPacket.h>
-
-CommandBan::CommandBan() : Command("ban") {}
-
-std::string CommandBan::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
-    if (!isPlayerOp(mc, player)) {
-        return "You aren't enough priveleged to run this command";
-    }
-    
-    if (args.empty()) {
-        return help(mc);
-    }
-
-    std::string nicknameLower = args[0];
-    std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
-
-    auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [nicknameLower] (auto& it) -> bool {
-        std::string lower = it->name;
-        std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-
-        return lower == nicknameLower;
-    });
-
-    if (it != mc.level->players.end()) {
-        if (*it == (Player*)mc.player) {
-            return "banip: you can't ban urself lol";
-        }
-    } else {
-        for (auto& banned : mc.level->bannedPpl) {
-            if (nicknameLower == banned) {
-                return args[0] + " already banned!";
-            }
-        }
-    }
-
-    mc.level->bannedPpl.insert(nicknameLower);
-    return "ban: successfully banned player " + args[0];
-}
-
-std::string CommandBan::help(Minecraft& mc) {
-    return "Usage: /ban <player>";
-}

src/commands/CommandBan.hpp

@@ -1,9 +0,0 @@
-#include "Command.hpp"
-
-class CommandBan : public Command {
-public:
-    CommandBan();
-
-    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    std::string help(Minecraft& mc);
-};

src/commands/CommandBanIp.cpp

@@ -1,65 +0,0 @@
-#include "CommandBanIp.hpp"
-#include "commands/Command.hpp"
-#include "network/RakNetInstance.h"
-#include "raknet/RakPeerInterface.h"
-#include "world/level/Level.h"
-#include <algorithm>
-#include <client/Minecraft.h>
-
-CommandBanIp::CommandBanIp() : Command("banip") {}
-
-std::string CommandBanIp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
-    if (!isPlayerOp(mc, player)) {
-        return "You aren't enough priveleged to run this command";
-    }
-    
-    if (args.empty()) {
-        return help(mc);
-    }
-
-    std::string nicknameLower = args[0];
-    std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
-
-    auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [nicknameLower] (auto& it) -> bool {
-        std::string lower = it->name;
-        std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-
-        return lower == nicknameLower;
-    });
-
-    std::string clientIp;
-
-    if (it != mc.level->players.end()) {
-        if (*it == (Player*)mc.player) {
-            return "banip: you can't ban urself lol";
-        }
-        
-        RakNet::SystemAddress sysAddress = mc.raknetInstance->getPeer()->GetSystemAddressFromGuid((*it)->owner);
-
-        char ip[32];
-        sysAddress.ToString(false, ip);
-
-        clientIp = ip;
-
-        auto sourceId = (*it)->owner;
-
-        (*it)->reallyRemoveIfPlayer = true;
-        mc.level->removeEntity((*it));
-        mc.raknetInstance->getPeer()->CloseConnection(sourceId, true);
-    } else {
-        for (auto& banned : mc.level->bannedIps) {
-            if (clientIp == banned) {
-                return args[0] + " already banned!";
-            }
-        }
-
-        clientIp = args[0];
-    }
-
-    mc.level->bannedIps.insert(clientIp);
-    return "banip: successfully banned player by ip " + args[0];
-}
-
-std::string CommandBanIp::help(Minecraft& mc) {
-    return "Usage: /banip <player>";
-}

src/commands/CommandBanIp.hpp

@@ -1,9 +0,0 @@
-#include "Command.hpp"
-
-class CommandBanIp : public Command {
-public:
-    CommandBanIp();
-
-    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    std::string help(Minecraft& mc);
-};

src/commands/CommandHelp.cpp

@@ -1,35 +0,0 @@
-#include "CommandHelp.hpp"
-#include "commands/Command.hpp"
-#include "CommandManager.hpp"
-#include <client/Minecraft.h>
-#include <sstream>
-
-CommandHelp::CommandHelp() : Command("help") {}
-
-std::string CommandHelp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
-    if (args.empty()) {
-        auto cmds = mc.commandManager().getListAllCommands();
-
-        std::ostringstream output;
-
-        output << "List of all commands:" << std::endl;
-        
-        for (auto& cmd : cmds) {
-            output << " - " + cmd << std::endl;;
-        }
-
-        return output.str();
-    }
-
-    Command* cmd = mc.commandManager().getCommand(args[0]);
-
-    if (cmd != nullptr) {
-        return cmd->help(mc);
-    }
-
-    return "help: command " + args[0] + " not found";
-}
-
-std::string CommandHelp::help(Minecraft& mc) {
-    return "Usage: /help <command>";
-}

src/commands/CommandHelp.hpp

@@ -1,9 +0,0 @@
-#include "Command.hpp"
-
-class CommandHelp : public Command {
-public:
-    CommandHelp();
-
-    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    std::string help(Minecraft& mc);
-};

src/commands/CommandKick.cpp

@@ -1,48 +0,0 @@
-#include "CommandKick.hpp"
-#include "commands/Command.hpp"
-#include "network/RakNetInstance.h"
-#include "raknet/RakPeerInterface.h"
-#include "world/level/Level.h"
-#include <algorithm>
-#include <client/Minecraft.h>
-
-CommandKick::CommandKick() : Command("kick") {}
-
-std::string CommandKick::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
-    if (!isPlayerOp(mc, player)) {
-        return "You aren't enough priveleged to run this command";
-    }
-    
-    if (args.empty()) {
-        return help(mc);
-    }
-
-    std::string nicknameLower = args[0];
-    std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
-
-    auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [args, nicknameLower] (auto& it) -> bool {
-        std::string lower = it->name;
-        std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-
-        return lower == nicknameLower;
-    });
-
-    if (it == mc.level->players.end()) {
-        return "kick: can't find player with name " + args[0];
-    }
-
-    if (*it == (Player*)mc.player) {
-        return "kick: you can't kick urself lol";
-    }
-
-    auto sourceId = (*it)->owner;
-
-    (*it)->reallyRemoveIfPlayer = true;
-    mc.level->removeEntity((*it));
-    mc.raknetInstance->getPeer()->CloseConnection(sourceId, true);
-    return "kick: successfully kicked player " + args[0];
-}
-
-std::string CommandKick::help(Minecraft& mc) {
-    return "Usage: /kick <player>";
-}

src/commands/CommandKick.hpp

@@ -1,9 +0,0 @@
-#include "Command.hpp"
-
-class CommandKick : public Command {
-public:
-    CommandKick();
-
-    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    std::string help(Minecraft& mc);
-};

src/commands/CommandManager.cpp

@@ -1,79 +0,0 @@
-#include "CommandManager.hpp"
-#include <algorithm>
-#include <string>
-#include <vector>
-#include "client/Minecraft.h"
-#include "commands/Command.hpp"
-#include "commands/CommandHelp.hpp"
-#include "commands/CommandKick.hpp"
-#include "commands/CommandOp.hpp"
-#include "commands/CommandBan.hpp"
-#include "commands/CommandBanIp.hpp"
-#include "commands/CommandPardon.hpp"
-#include "network/packet/ChatPacket.h"
-#include "network/RakNetInstance.h"
-#include "world/level/Level.h"
-
-CommandManager::CommandManager() {
-    registerAllCommands();
-}
-
-void CommandManager::registerAllCommands() {
-    m_commands.push_back(new CommandHelp());
-    m_commands.push_back(new CommandKick());
-    m_commands.push_back(new CommandOp());
-    m_commands.push_back(new CommandBan());
-    m_commands.push_back(new CommandBanIp());
-    m_commands.push_back(new CommandPardon());
-}
-
-std::vector<std::string> CommandManager::getListAllCommands() {
-    std::vector<std::string> ret;
-
-    for (auto& cmd : m_commands) {
-        ret.push_back(cmd->getName());
-    }
-
-    return ret;
-}
-
-std::string CommandManager::execute(Minecraft& mc, Player& player, const std::string& input) {
-    std::istringstream ss(input);
-    std::string cmd;
-
-    ss >> cmd;
-
-    auto it = std::find_if(m_commands.begin(), m_commands.end(), [cmd](auto& it) -> bool {
-        return it->getName() == cmd;
-    });
-
-    if (it == m_commands.end()) {
-        return "Command /" + cmd + " not found";
-    }
-
-    std::vector<std::string> args;
-
-    std::string tok;
-    while (ss >> tok) args.push_back(tok);
-    
-    if (!mc.level->isClientSide || (*it)->getFlags() & CommandFlags::COMMAND_FLAG_SINGLEPLAYER_ONLY) {
-        return (*it)->execute(mc, player, args);
-    } else {
-        ChatPacket packet("/" + input);
-        mc.raknetInstance->send(packet);
-    }
-
-    return "";
-}
-
-Command* CommandManager::getCommand(const std::string& name) {
-    auto it = std::find_if(m_commands.begin(), m_commands.end(), [name](auto& it) -> bool {
-        return it->getName() == name;
-    });
-
-    if (it == m_commands.end()) {
-        return *it;
-    }
-
-    return nullptr;
-}

src/commands/CommandManager.hpp

@@ -1,21 +0,0 @@
-#pragma once
-#include <string>
-#include <vector>
-
-#include "Command.hpp"
-
-class CommandManager {
-public:
-    CommandManager();
-
-    std::vector<std::string> getListAllCommands();
-
-    std::string execute(Minecraft& mc, Player& player, const std::string& input);
-
-    Command* getCommand(const std::string& name);
-
-private:
-    void registerAllCommands();
-    
-    std::vector<Command*> m_commands;
-};

src/commands/CommandOp.cpp

@@ -1,31 +0,0 @@
-#include "CommandOp.hpp"
-#include "commands/Command.hpp"
-#include "world/level/Level.h"
-#include <algorithm>
-#include <client/Minecraft.h>
-
-CommandOp::CommandOp() : Command("op") {}
-
-std::string CommandOp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
-    if (!isPlayerOp(mc, player)) {
-        return "You aren't enough priveleged to run this command";
-    }
-    
-    if (args.empty()) {
-        return help(mc);
-    }
-
-    std::string nicknameLower = args[0];
-    std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
-    
-    if (mc.level->ops.find(nicknameLower) != mc.level->ops.end()) {
-        return "op: player " + args[0] + " already opped";
-    }
-
-    mc.level->ops.emplace(nicknameLower);
-    return "op: successfully opped player " + args[0];
-}
-
-std::string CommandOp::help(Minecraft& mc) {
-    return "Usage: /op <player>";
-}

src/commands/CommandOp.hpp

@@ -1,9 +0,0 @@
-#include "Command.hpp"
-
-class CommandOp : public Command {
-public:
-    CommandOp();
-
-    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    std::string help(Minecraft& mc);
-};

src/commands/CommandPardon.cpp

@@ -1,40 +0,0 @@
-#include "CommandPardon.hpp"
-#include "commands/Command.hpp"
-#include "network/RakNetInstance.h"
-#include "raknet/RakPeerInterface.h"
-#include "world/level/Level.h"
-#include <algorithm>
-#include <client/Minecraft.h>
-
-CommandPardon::CommandPardon() : Command("pardon") {}
-
-std::string CommandPardon::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
-    if (!isPlayerOp(mc, player)) {
-        return "You aren't enough priveleged to run this command";
-    }
-    
-    if (args.empty()) {
-        return help(mc);
-    }
-
-    std::string nicknameLower = args[0];
-    std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
-
-    if (mc.level->bannedPpl.find(nicknameLower) != mc.level->bannedPpl.end()) {
-        mc.level->bannedPpl.erase(nicknameLower);
-
-        return "pardon: successfully unbanned player " + args[0];
-    }
-
-    if (mc.level->bannedIps.find(nicknameLower) != mc.level->bannedIps.end()) {
-        mc.level->bannedIps.erase(nicknameLower);
-        
-        return "pardon: successfully unbanned ip " + args[0];
-    }
-
-    return "Player/Ip doesnt banned";
-}
-
-std::string CommandPardon::help(Minecraft& mc) {
-    return "Usage: /pardon <player>";
-}

src/commands/CommandPardon.hpp

@@ -1,9 +0,0 @@
-#include "Command.hpp"
-
-class CommandPardon : public Command {
-public:
-    CommandPardon();
-
-    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    std::string help(Minecraft& mc);
-};

src/main_dedicated.cpp

@@ -1,30 +1,25 @@
-#include <fstream>
 #include <iostream>
 #include "NinecraftApp.h"
 #include "AppPlatform.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
-#ifdef __linux__
 #include <unistd.h>
-#endif
 
 #include "world/level/LevelSettings.h"
 #include "world/level/Level.h"
 #include "server/ArgumentsSettings.h"
 #include "platform/time.h"
 #include "SharedConstants.h"
-#include "world/level/LevelConstants.h"
-#include <plugins/PluginsManager.hpp>
 
 #define MAIN_CLASS NinecraftApp
 static App* g_app = 0;
 static int g_exitCode = 0;
 void signal_callback_handler(int signum) {
 	std::cout << "Signum caught: " << signum << std::endl;
+	if(signum == 2 || signum == 3){ // SIGINT ||  SIGQUIT
 
-	if (signum == 2 || signum == 3) { // SIGINT ||  SIGQUIT
-		if (g_app != 0) {
+		if(g_app != 0) {
 			g_app->quit();
 		} else {
 			exit(g_exitCode);
@@ -32,242 +27,47 @@ void signal_callback_handler(int signum) {
 	}
 }
 
-std::string findStringInConfig(std::string line, std::string config) {
-    auto valuePos = config.find(line);
-
-    if (line.empty()) {
-        throw std::runtime_error("Key cannot be empty");
-    }
-
-    if (valuePos == std::string::npos) {
-        throw std::runtime_error("Cannot find value");
-    }
- 
-    std::string valueStr = "";
-
-    valuePos += 1 + line.size();
-
-    while (true) {
-        auto sym = config.at(valuePos);
-
-        if (sym == '\n') {
-            break;
-        }
-
-        if (valuePos == config.size()) {
-            throw std::runtime_error("Cannot find end of the line");
-        }
-
-        valueStr += sym;
-        valuePos++;
-    }
-
-    return valueStr;
-}
-
 int main(int numArguments, char* pszArgs[]) {
-	std::ifstream serverProperties("server.properties");
-
-	int port = 0;
-	int gamemode = 0;
-	int worldSize = 0;
-
-	std::string levelDir = "";
-	std::string cachePath = "";
-	std::string externalPath = "";
-	std::string levelName = "";
-
-	if (serverProperties.is_open()) {
-		std::string propString;
-        std::string line;
-        
-        while (std::getline(serverProperties, line)) {
-            propString += line;
-			propString += "\n";
-        }
-
-        if (propString.empty()) {
-            throw std::runtime_error("Config cannot be empty");
-        }
-
-		port = std::stoi(findStringInConfig("port", propString));
-		worldSize = std::stoi(findStringInConfig("world-size", propString));
-
-		if (worldSize < 16 || worldSize > 32) {
-			throw std::runtime_error("Incorrect world size.");
-		}
-
-		LevelConstants::CHUNK_CACHE_WIDTH = worldSize;
-		LevelConstants::LEVEL_WIDTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH;
-		LevelConstants::LEVEL_DEPTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_DEPTH;
-		
-		cachePath = findStringInConfig("level-cachepath", propString);
-		externalPath = findStringInConfig("level-externalpath", propString);
-		levelName = findStringInConfig("level-name", propString);
-		levelDir = findStringInConfig("level-dir", propString);
-
-		std::string gamemodeStr = findStringInConfig("gamemode", propString);
-
-		if (gamemodeStr == "survival") {
-			gamemode = GameType::Survival;
-		} else if (gamemodeStr == "creative") {
-			gamemode = GameType::Creative;
-		} else {
-			gamemode = GameType::Survival;
-		}
-		
-		printf("%d %s %s %d %d\n", port, cachePath.c_str(), externalPath.c_str(), gamemode, LevelConstants::CHUNK_CACHE_WIDTH);
-	} else {
-		std::ofstream defaultProperties("server.properties");
-
-		if (defaultProperties.is_open()) {
-			ArgumentsSettings defaultSettings(0, NULL);
-
-			std::stringstream buffer;
-			
-			buffer << "// MCPE Server properties" << std::endl;
-			buffer << "port=" << defaultSettings.getPort() << std::endl;
-			buffer << "level-dir=" << defaultSettings.getLevelDir() << std::endl;
-			buffer << "level-cachepath=" << defaultSettings.getCachePath() << std::endl;
-			buffer << "level-externalpath=" << defaultSettings.getExternalPath() << std::endl;
-			buffer << "gamemode=survival" << std::endl;
-			buffer << "level-name=" << defaultSettings.getLevelName() << std::endl;
-			buffer << "world-size=16" << std::endl;
-
-			defaultProperties << buffer.str();
-
-			printf("%s \n", buffer.str().c_str());
-
-			printf("Edit a config file first!\n");
-
-			defaultProperties.close();
-			exit(0);
-		} else {
-			throw std::runtime_error("Cannot create default config.");
-		}
+	ArgumentsSettings aSettings(numArguments, pszArgs);
+	if(aSettings.getShowHelp()) {
+		ArgumentsSettings defaultSettings(0, NULL);
+		printf("Minecraft Pockect Edition Server %s\n", Common::getGameVersionString("").c_str());
+		printf("-------------------------------------------------------\n");
+		printf("--cachepath - Path to where the server can store temp stuff (not sure if this is used) [default: \"%s\"]\n", defaultSettings.getCachePath().c_str());
+		printf("--externalpath - The path to the place where the server should store the levels. [default: \"%s\"]\n", defaultSettings.getExternalPath().c_str());
+		printf("--levelname - The name of the server [default: \"%s\"]\n", defaultSettings.getLevelName().c_str());
+		printf("--leveldir - The name of the server [default: \"%s\"]\n", defaultSettings.getLevelDir().c_str());
+		printf("--help - Shows this message.\n");
+		printf("--port - The port to run the server on. [default: %d]\n", defaultSettings.getPort());
+		printf("--serverkey - The key that the server should use for API calls. [default: \"%s\"]\n", defaultSettings.getServerKey().c_str());
+		printf("-------------------------------------------------------\n");
+		return 0;
 	}
-
-	printf("Level Name: %s\n", levelName.c_str());
-	
+	printf("Level Name: %s\n", aSettings.getLevelName().c_str());
 	AppContext appContext;
 	appContext.platform = new AppPlatform();
 	App* app = new MAIN_CLASS();
 	signal(SIGINT, signal_callback_handler);
 	g_app = app;
-	((MAIN_CLASS*)g_app)->externalStoragePath = externalPath;
-	((MAIN_CLASS*)g_app)->externalCacheStoragePath = cachePath;
+	((MAIN_CLASS*)g_app)->externalStoragePath = aSettings.getExternalPath();
+	((MAIN_CLASS*)g_app)->externalCacheStoragePath = aSettings.getCachePath();
 
 	g_app->init(appContext);
-	LevelSettings settings(getEpochTimeS(), gamemode);
+	LevelSettings settings(getEpochTimeS(), GameType::Creative);
 	float startTime = getTimeS();
-	((MAIN_CLASS*)g_app)->selectLevel(levelDir, levelName, settings);
-	((MAIN_CLASS*)g_app)->hostMultiplayer(port);
-	PluginsManager::get().loadPlugins();
-
-	// Reading ops
-	std::ifstream ops("ops.txt");
-
-	if (ops.is_open()) {
-        std::string line;
-        
-        while (std::getline(ops, line)) {
-			if (!line.empty()) {
-            	((MAIN_CLASS*)g_app)->level->ops.insert(line);
-			}
-        }
-	} else {
-		std::ofstream opsDefault("ops.txt");
-
-		if (!opsDefault.is_open()) {
-			throw std::runtime_error("Cannot create ops list.");
-		}
-	}
-
-	// Reading banned ppl
-	std::ifstream banned("banned-players.txt");
-
-	if (banned.is_open()) {
-        std::string line;
-        
-        while (std::getline(banned, line)) {
-			if (!line.empty()) {
-            	((MAIN_CLASS*)g_app)->level->bannedPpl.insert(line);
-			}
-        }
-	} else {
-		std::ofstream bannedPpl("banned-players.txt");
-
-		if (!bannedPpl.is_open()) {
-			throw std::runtime_error("Cannot create banned players list.");
-		}
-	}
-
-	std::ifstream bannedIps("banned-ips.txt");
-
-	if (bannedIps.is_open()) {
-        std::string line;
-        
-        while (std::getline(bannedIps, line)) {
-			if (!line.empty()) {
-            	((MAIN_CLASS*)g_app)->level->bannedIps.insert(line);
-			}
-        }
-	} else {
-		std::ofstream bannedIp("banned-ips.txt");
-
-		if (!bannedIp.is_open()) {
-			throw std::runtime_error("Cannot create banned players list.");
-		}
-	}
+	((MAIN_CLASS*)g_app)->selectLevel(aSettings.getLevelDir(), aSettings.getLevelName(),  settings);
+	((MAIN_CLASS*)g_app)->hostMultiplayer(aSettings.getPort());
 
 	std::cout << "Level has been generated in " << getTimeS() - startTime << std::endl;
 	((MAIN_CLASS*)g_app)->level->saveLevelData();
 	std::cout << "Level has been saved!" << std::endl;
-	PluginsManager::get().emit("ServerLoaded");
 
 	while(!app->wantToQuit()) {
 		app->update();
 		//pthread_yield();
 		sleepMs(20);
 	}
-	
-	std::ofstream opsWrite("ops.txt"); 
-
-	if (opsWrite.is_open()) {
-		for (auto& op : ((MAIN_CLASS*)g_app)->level->ops) {
-			opsWrite << op << std::endl;
-		}
-		opsWrite.close();
-	} else {
-		throw std::runtime_error("Cannot open ops list.");
-	}
-
-	std::ofstream bannedWrite("banned-players.txt"); 
-
-	if (bannedWrite.is_open()) {
-		for (auto& banned : ((MAIN_CLASS*)g_app)->level->bannedPpl) {
-			bannedWrite << banned << std::endl;
-		}
-		bannedWrite.close();
-	} else {
-		throw std::runtime_error("Cannot open banned players list.");
-	}
-
-	std::ofstream bannedIpsWrite("banned-ips.txt"); 
-
-	if (bannedIpsWrite.is_open()) {
-		for (auto& banned : ((MAIN_CLASS*)g_app)->level->bannedIps) {
-			bannedIpsWrite << banned << std::endl;
-		}
-		bannedIpsWrite.close();
-	} else {
-		throw std::runtime_error("Cannot open banned players list.");
-	}
-
-	PluginsManager::get().emit("ServerShutdown");
-
 	((MAIN_CLASS*)g_app)->level->saveLevelData();
-
 	delete app;
 	appContext.platform->finish();
 	delete appContext.platform;

src/network/ClientSideNetworkHandler.cpp

@@ -1,7 +1,6 @@
 
 #include "ClientSideNetworkHandler.h"
 #include "client/Options.h"
-#include "network/packet/LoginStatusPacket.h"
 #include "packet/PacketInclude.h"
 #include "RakNetInstance.h"
 #include "../world/level/chunk/ChunkSource.h"
@@ -11,9 +10,6 @@
 #include "../world/entity/player/Inventory.h"
 #include "../client/Minecraft.h"
 #include "../client/gamemode/GameMode.h"
-#include "world/item/ItemInstance.h"
-#include "world/level/LevelConstants.h"
-#include <cstddef>
 #ifndef STANDALONE_SERVER
 #include "../client/gui/screens/DisconnectionScreen.h"
 #endif
@@ -46,9 +42,6 @@ ClientSideNetworkHandler::ClientSideNetworkHandler(Minecraft* minecraft, IRakNet
 	requestNextChunkPosition(0),
     requestNextChunkIndex(0)
 {
-	NumRequestChunks = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH;
-	requestNextChunkIndexList.resize(NumRequestChunks);
-	chunksLoaded.resize(NumRequestChunks);
 	rakPeer = raknetInstance->getPeer();
 }
 
@@ -66,7 +59,7 @@ void ClientSideNetworkHandler::requestNextChunk()
 
         //LOGI("requesting chunks @ (%d, %d)\n", chunk.x, chunk.y);
         
-		//raknetInstance->send(new RequestChunkPacket(requestNextChunkPosition % LevelConstants::CHUNK_CACHE_WIDTH, requestNextChunkPosition / LevelConstants::CHUNK_CACHE_WIDTH));
+		//raknetInstance->send(new RequestChunkPacket(requestNextChunkPosition % CHUNK_CACHE_WIDTH, requestNextChunkPosition / CHUNK_CACHE_WIDTH));
 		requestNextChunkIndex++;
         requestNextChunkPosition++;
 	}
@@ -74,16 +67,16 @@ void ClientSideNetworkHandler::requestNextChunk()
 
 bool ClientSideNetworkHandler::areAllChunksLoaded()
 {
-	return (requestNextChunkPosition >= (LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH));
+	return (requestNextChunkPosition >= (CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH));
 }
 
 bool ClientSideNetworkHandler::isChunkLoaded(int x, int z)
 {
-	if (x < 0 || x >= LevelConstants::CHUNK_CACHE_WIDTH || z < 0 || z >= LevelConstants::CHUNK_CACHE_WIDTH) {
+	if (x < 0 || x >= CHUNK_CACHE_WIDTH || z < 0 || z >= CHUNK_CACHE_WIDTH) {
 		LOGE("Error: Tried to request chunk (%d, %d)\n", x, z);
 		return true;
 	}
-	return chunksLoaded[x * LevelConstants::CHUNK_CACHE_WIDTH + z];
+	return chunksLoaded[x * CHUNK_CACHE_WIDTH + z];
 	//return areAllChunksLoaded();
 }
 
@@ -93,7 +86,7 @@ void ClientSideNetworkHandler::onConnect(const RakNet::RakNetGUID& hostGuid)
 	serverGuid = hostGuid;
 
 	clearChunksLoaded();
-	LoginPacket packet(minecraft->options.getStringValue(OPTIONS_USERNAME).c_str(), SharedConstants::NetworkProtocolVersion, true);
+	LoginPacket packet(minecraft->options.getStringValue(OPTIONS_USERNAME).c_str(), SharedConstants::NetworkProtocolVersion);
 	raknetInstance->send(packet);
 }
 
@@ -104,11 +97,6 @@ void ClientSideNetworkHandler::onUnableToConnect()
 
 void ClientSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
 {
-	LevelConstants::CHUNK_CACHE_WIDTH = 16;
-	LevelConstants::LEVEL_WIDTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH;
-	LevelConstants::LEVEL_DEPTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_DEPTH;
-	
-	// TODO: Good disconnecting
 	LOGI("onDisconnect\n");
 	if (level)
 	{
@@ -121,13 +109,9 @@ void ClientSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
 			}
 		}
 	}
-	minecraft->leaveGame();	
-// 	minecraft->setLevel(NULL);
-// #ifndef STANDALONE_SERVER
-// 	minecraft->gui.addMessage("Disconnected from server");
-// 	// TODO: screen with error
-//     minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
-// #endif
+#ifndef STANDALONE_SERVER
+	minecraft->gui.addMessage("Disconnected from server");
+#endif
 }
 
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginStatusPacket* packet) {
@@ -146,18 +130,6 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginSta
 		LOGI("Disconnect! Server is outdated!\n");
 #ifndef STANDALONE_SERVER
 		minecraft->setScreen(new DisconnectionScreen("Could not connect: Outdated server!"));
-#endif
-	}
-	if (packet->status == LoginStatus::Failed_TakenNickname) {
-		LOGI("Disconnect! Nickname is taken!\n");
-#ifndef STANDALONE_SERVER
-		minecraft->setScreen(new DisconnectionScreen("Could not connect: Nickname is taken!"));
-#endif
-	}
-	if (packet->status == LoginStatus::Failed_Banned) {
-		LOGI("Disconnect! You're banned from this server!\n");
-#ifndef STANDALONE_SERVER
-		minecraft->setScreen(new DisconnectionScreen("Could not connect: You're banned from this server!"));
 #endif
 	}
 }
@@ -174,19 +146,6 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, StartGam
 	}
 #endif
 
-	// @todo @note i think its trash
-	// we can put it directly to selectLevel?
-	if (packet->chunkCacheWidth != 0) {
-		printf("lol \n");		
-		LevelConstants::CHUNK_CACHE_WIDTH = packet->chunkCacheWidth;
-		LevelConstants::LEVEL_WIDTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH;
-		LevelConstants::LEVEL_DEPTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_DEPTH;
-		LevelChunk::ChunkBlockCount = LevelConstants::CHUNK_BLOCK_COUNT;
-	}
-	NumRequestChunks = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH;
-	requestNextChunkIndexList.resize(NumRequestChunks);
-	chunksLoaded.resize(NumRequestChunks);
-
 	const std::string& levelId = LevelStorageSource::TempLevelId;
 	LevelStorageSource* storageSource = minecraft->getLevelSource();
 	storageSource->deleteLevel(levelId);
@@ -223,7 +182,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, SetTimeP
 	if (!level)
 		return;
 
-	// LOGI("SetTimePacket\n");
+	LOGI("SetTimePacket\n");
 	level->setTime(packet->time);
 }
 
@@ -279,7 +238,7 @@ void ClientSideNetworkHandler::handle( const RakNet::RakNetGUID& source, AddPain
 }
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AddMobPacket* packet)
 {
-	// LOGI("AddMobPacket (%p)\n", level);
+	LOGI("AddMobPacket (%p)\n", level);
 
 	if (!level) {
 		LOGW("Trying to add a mob with no level!\n");
@@ -365,7 +324,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveEn
 	if (!level) return;
 
 	Entity* entity = level->getEntity(packet->entityId);
-	// LOGI("RemoveEntityPacket %p %p, %d\n", entity, minecraft->player, entity?(int)(entity->isPlayer()): -1);
+	LOGI("RemoveEntityPacket %p %p, %d\n", entity, minecraft->player, entity?(int)(entity->isPlayer()): -1);
 	if (!entity) return;
 
 	level->removeEntity(entity);
@@ -385,7 +344,6 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AddItemE
 }
 
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, TakeItemEntityPacket* packet) {
-	// printf("TakeItemEntityPacket \n");
 	if (!level) return;
 
 	Entity* e = level->getEntity(packet->itemId);
@@ -428,54 +386,6 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
 	}
 }
 
-void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, SendInventoryPacket* packet) {
-	if (!level) return;
-
-	if (packet->entityId == minecraft->player->entityId) {
-		auto items = packet->items;
-		
-		minecraft->player->inventory->replace(items);
-
-		for (int i = 0; i < packet->linkedSlot.size(); i++) {
-			minecraft->player->inventory->linkSlot(i, packet->linkedSlot[i].inventorySlot, true);
-			LOGI("%i -> %i\n", packet->linkedSlot[i].inventorySlot, i);
-		}
-	}
-}
-
-void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet) {
-	if (!level) return;
-
-	LOGI("TakeItemPacket\n");
-
-	ItemInstance* item = new ItemInstance();
-
-	item->count = packet->count;
-	item->id = packet->itemId;
-	item->setAuxValue(packet->auxValue);
-
-	// if (minecraft->player->entityId == packet->playerId) {
-	if (!minecraft->player->inventory->add(item)) {
-		minecraft->player->drop(new ItemInstance(*item), false);
-	}
-	// }
-}
-
-void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet) {
-	// Idk how it works...
-	if (!level) return;
-
-	ItemInstance item;
-
-	item.count = packet->count;
-	item.id = packet->itemId;
-	item.setAuxValue(packet->auxValue);
-
-	// if (minecraft->player->entityId == packet->playerId) {
-	minecraft->player->inventory->removeResource(item);
-	// }
-}
-
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MoveEntityPacket* packet)
 {
 	if (!level)
@@ -565,19 +475,19 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
 	//unsigned char* blockIds = chunk->getBlockData();
 	DataLayer& blockData = chunk->data;
 
-	const int setSize = LevelConstants::LEVEL_HEIGHT / 8;
-	const int setShift = 4; // power of LevelConstants::LEVEL_HEIGHT / 8
+	const int setSize = LEVEL_HEIGHT / 8;
+	const int setShift = 4; // power of LEVEL_HEIGHT / 8
 
 	bool recalcHeight = false;
 
-	int x0 = 16, x1 = 0, z0 = 16, z1 = 0, y0 = LevelConstants::LEVEL_HEIGHT, y1 = 0;
+	int x0 = 16, x1 = 0, z0 = 16, z1 = 0, y0 = LEVEL_HEIGHT, y1 = 0;
 	int rx = packet->x << 4;
 	int rz = packet->z << 4;
 
-	unsigned char* readBlockBuffer = new unsigned char[setSize];
-	unsigned char* readDataBuffer = new unsigned char[setSize / 2];
+	unsigned char readBlockBuffer[setSize];
+	unsigned char readDataBuffer[setSize / 2];
 
-	for (int i = 0; i < LevelConstants::CHUNK_COLUMNS; i++)
+	for (int i = 0; i < CHUNK_COLUMNS; i++)
 	{
 		unsigned char updateBits = 0;
 		packet->chunkData.Read(updateBits);
@@ -586,8 +496,8 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
 		{
 			recalcHeight = true;
 
-			int colX = (i % LevelConstants::CHUNK_WIDTH);
-			int colZ = (i / LevelConstants::CHUNK_WIDTH);
+			int colX = (i % CHUNK_WIDTH);
+			int colZ = (i / CHUNK_WIDTH);
 			int colDataPosition = colX << 11 | colZ << 7;
 
 			for (int set = 0; set < 8; set++)
@@ -621,33 +531,30 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
 				{
 					y0 = ((1 << set) << setShift);
 				}
-				if (((1 << set) << setShift) + (LevelConstants::LEVEL_HEIGHT / 8) - 1 > y1)
+				if (((1 << set) << setShift) + (LEVEL_HEIGHT / 8) - 1 > y1)
 				{
-					y1 = ((1 << set) << setShift) + (LevelConstants::LEVEL_HEIGHT / 8) - 1;
+					y1 = ((1 << set) << setShift) + (LEVEL_HEIGHT / 8) - 1;
 				}
 			}
-			if ((i % LevelConstants::CHUNK_WIDTH) < x0)
+			if ((i % CHUNK_WIDTH) < x0)
 			{
-				x0 = (i % LevelConstants::CHUNK_WIDTH);
+				x0 = (i % CHUNK_WIDTH);
 			}
-			if ((i % LevelConstants::CHUNK_WIDTH) > x1)
+			if ((i % CHUNK_WIDTH) > x1)
 			{
-				x1 = (i % LevelConstants::CHUNK_WIDTH);
+				x1 = (i % CHUNK_WIDTH);
 			}
-			if ((i / LevelConstants::CHUNK_WIDTH) < z0)
+			if ((i / CHUNK_WIDTH) < z0)
 			{
-				z0 = (i / LevelConstants::CHUNK_WIDTH);
+				z0 = (i / CHUNK_WIDTH);
 			}
-			if ((i / LevelConstants::CHUNK_WIDTH) > z1)
+			if ((i / CHUNK_WIDTH) > z1)
 			{
-				z1 = (i / LevelConstants::CHUNK_WIDTH);
+				z1 = (i / CHUNK_WIDTH);
 			}
 		}
 	}
 
-	delete[] readBlockBuffer;
-	delete[] readDataBuffer;
-
  	if (recalcHeight)
  	{
 // 		chunk->recalcHeightmap();
@@ -672,7 +579,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
 	//chunk->terrainPopulated = true;
 	chunk->unsaved = false;
 
-	chunksLoaded[packet->x * LevelConstants::CHUNK_CACHE_WIDTH + packet->z] = true;
+	chunksLoaded[packet->x * CHUNK_CACHE_WIDTH + packet->z] = true;
 
 	if (areAllChunksLoaded())
 	{
@@ -720,18 +627,18 @@ void ClientSideNetworkHandler::arrangeRequestChunkOrder() {
 	clearChunksLoaded();
 
     // Default sort is around center of the world
-    int cx = LevelConstants::CHUNK_CACHE_WIDTH / 2;
-    int cz = LevelConstants::CHUNK_CACHE_WIDTH / 2;
+    int cx = CHUNK_CACHE_WIDTH / 2;
+    int cz = CHUNK_CACHE_WIDTH / 2;
 
     // If player exists, let's sort around him
     Player* p = minecraft? minecraft->player : NULL;
     if (p) {
-        cx = Mth::floor(p->x / (float)LevelConstants::CHUNK_WIDTH);
-        cz = Mth::floor(p->z / (float)LevelConstants::CHUNK_DEPTH);
+        cx = Mth::floor(p->x / (float)CHUNK_WIDTH);
+        cz = Mth::floor(p->z / (float)CHUNK_DEPTH);
     }
 
     _ChunkSorter sorter(cx, cz);
-    std::sort(requestNextChunkIndexList.begin(), requestNextChunkIndexList.end(), sorter);
+    std::sort(requestNextChunkIndexList, requestNextChunkIndexList + NumRequestChunks, sorter);
 }
 
 void ClientSideNetworkHandler::levelGenerated(Level* level)
@@ -821,7 +728,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, SetEntit
 	if (!level)
 		return;
 
-	// LOGI("SetEntityDataPacket\n");
+	LOGI("SetEntityDataPacket\n");
 
 	Entity* e = level->getEntity(packet->id);
 	if (e) {
@@ -875,10 +782,6 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AnimateP
 	}
 }
 
-void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet)
-{
-}
-
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemPacket* packet)
 {
 }
@@ -888,7 +791,6 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, SetHealt
 	if (!level || !minecraft->player)
 		return;
 
-	printf("SetHealthPacket \n");
 	minecraft->player->hurtTo(packet->health);
 }
 
@@ -984,11 +886,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
 void ClientSideNetworkHandler::handle( const RakNet::RakNetGUID& source, ChatPacket* packet )
 {
 #ifndef STANDALONE_SERVER
-	// minecraft->gui.displayClientMessage(packet->message);
-	std::istringstream iss(packet->message);
-	for (std::string line; std::getline(iss, line); ) {
-		minecraft->gui.addMessage(line);
-	}
+	minecraft->gui.displayClientMessage(packet->message);
 #endif
 }
 
@@ -1021,8 +919,8 @@ void ClientSideNetworkHandler::clearChunksLoaded()
 {
 	// Init the chunk positions
 	for (int i = 0; i < NumRequestChunks; ++i) {
-		requestNextChunkIndexList[i].x = i / LevelConstants::CHUNK_WIDTH;
-		requestNextChunkIndexList[i].y = i % LevelConstants::CHUNK_WIDTH;
+		requestNextChunkIndexList[i].x = i/CHUNK_WIDTH;
+		requestNextChunkIndexList[i].y = i%CHUNK_WIDTH;
 		chunksLoaded[i] = false;
 	}
 }

src/network/ClientSideNetworkHandler.h

@@ -77,11 +77,6 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, ChatPacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, AdventureSettingsPacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet);
-	virtual void handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet);
-	virtual void handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet);
-	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet);
-	virtual void handle(const RakNet::RakNetGUID& source, SendInventoryPacket* packet);
-
 private:
 
 	void requestNextChunk();
@@ -102,11 +97,11 @@ private:
 	BlockUpdateList	bufferedBlockUpdates;
 	int	requestNextChunkPosition;
 
-    int NumRequestChunks;
+    static const int NumRequestChunks = CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
     
     int requestNextChunkIndex;
-    std::vector<IntPair> requestNextChunkIndexList;
-	std::vector<bool> chunksLoaded;
+    IntPair requestNextChunkIndexList[NumRequestChunks];
+	bool chunksLoaded[NumRequestChunks];
 };
 
 #endif

src/network/NATPunchHandler.cpp

@@ -0,0 +1,33 @@
+#include "NATPunchHandler.h"
+#include "../raknet/TCPInterface.h"
+#include "../raknet/HTTPConnection.h"
+#include "PHPDirectoryServer2.h"
+
+using namespace RakNet;
+NATPuchHandler::NATPuchHandler() {
+	tcpInterface = new TCPInterface;
+}
+NATPuchHandler::~NATPuchHandler() {
+	delete tcpInterface;
+}
+
+void NATPuchHandler::initialize() {
+	tcpInterface->Start(0, 64);
+}
+
+void NATPuchHandler::registerToGameList(const RakNet::RakString& serverName, int port) {
+	HTTPConnection httpConnection;
+	httpConnection.Init(tcpInterface, "johanbernhardsson.se");
+	PHPDirectoryServer2 directoryServer;
+	directoryServer.Init(&httpConnection, "/DirectoryServer.php");
+	directoryServer.UploadTable("", serverName, port, true);
+}
+
+void NATPuchHandler::removeFromGameList() {
+
+}
+
+void NATPuchHandler::close() {
+
+}
+

src/network/NATPunchHandler.h

@@ -0,0 +1,24 @@
+#ifndef _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_
+#define _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_
+#include "../raknet/TCPInterface.h"
+#include "../raknet/RakString.h"
+class NATPuchHandler {
+public:
+	enum NATPuchHandlerStatus {
+		NATPuchInitilized = 0,
+		NATPuchFetchingServerList = 1,
+		NATPuchConnecting = 2,
+		NATPuchConnected = 3,
+		NATPuchDissconnected = 4
+	};
+	NATPuchHandler();
+	~NATPuchHandler();
+	void initialize();
+	void registerToGameList(const RakNet::RakString& serverName, int port);
+	void removeFromGameList();
+	void close();
+private:
+	RakNet::TCPInterface *tcpInterface;
+};
+
+#endif /* _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_ */

src/network/NetEventCallback.h

@@ -18,8 +18,6 @@ class RemovePlayerPacket;
 class RemoveEntityPacket;
 class MoveEntityPacket;
 //class TeleportEntityPacket;
-class RemoveItemPacket;
-class TakeItemPacket;
 class MovePlayerPacket;
 class PlaceBlockPacket;
 class RemoveBlockPacket;
@@ -50,7 +48,6 @@ class ContainerClosePacket;
 class ContainerSetSlotPacket;
 class ContainerSetDataPacket;
 class ContainerSetContentPacket;
-class WantCreatePacket;
 class ChatPacket;
 class SignUpdatePacket;
 class Minecraft;
@@ -122,9 +119,6 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet) {}
 	virtual void handle(const RakNet::RakNetGUID& source, AdventureSettingsPacket* packet) {}
 	virtual void handle(const RakNet::RakNetGUID& source, AnimatePacket* packet) {}
-	virtual void handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet) {}
-	virtual void handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet) {}
-	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet) {}
 
 	//
 	// Common implementation for Client and Server

src/network/Packet.cpp

@@ -2,7 +2,6 @@
 #include "Packet.h"
 #include "../world/level/chunk/LevelChunk.h"
 
-#include "network/packet/TakeItemPacket.h"
 #include "packet/PacketInclude.h"
 
 Packet::Packet()
@@ -42,12 +41,6 @@ Packet* MinecraftPackets::createPacket(int id)
 	case PACKET_ADDITEMENTITY:
 		packet = new AddItemEntityPacket();
 		break;
-	case PACKET_REMOVEITEM:
-		packet = new RemoveItemPacket();
-		break;
-	case PACKET_TAKEITEM:
-		packet = new TakeItemPacket();
-		break;
 	case PACKET_TAKEITEMENTITY:
 		packet = new TakeItemEntityPacket();
 		break;
@@ -75,9 +68,6 @@ Packet* MinecraftPackets::createPacket(int id)
 	case PACKET_RESPAWN:
 		packet = new RespawnPacket();
 		break;
-	case PACKET_WANTCREATEITEM:
-		packet = new WantCreatePacket();
-		break;
 	case PACKET_REMOVEENTITY:
 		packet = new RemoveEntityPacket();
 		break;

src/network/Packet.h

@@ -33,9 +33,6 @@ enum MinecraftPacketIds
 	PACKET_REMOVEENTITY,
 	PACKET_ADDITEMENTITY,
 	PACKET_TAKEITEMENTITY,
-	PACKET_TAKEITEM,
-	PACKET_REMOVEITEM,
-	PACKET_WANTCREATEITEM,
 
 	PACKET_MOVEENTITY,
 	PACKET_MOVEENTITY_POS,

src/network/RakNetInstance.cpp

@@ -173,7 +173,6 @@ bool RakNetInstance::isMyLocalGuid(const RakNet::RakNetGUID& guid)
 void RakNetInstance::runEvents(NetEventCallback* callback)
 {
 	RakNet::Packet* currentEvent;
-	bool disconnect = false;
 
 	while ((currentEvent = rakPeer->Receive()) != NULL)
 	{
@@ -201,7 +200,6 @@ void RakNetInstance::runEvents(NetEventCallback* callback)
 				case ID_DISCONNECTION_NOTIFICATION:
 				case ID_CONNECTION_LOST:
 					callback->onDisconnect(currentEvent->guid);
-					disconnect = true;
 					break;
 				case ID_UNCONNECTED_PONG:
 					{
@@ -235,9 +233,8 @@ void RakNetInstance::runEvents(NetEventCallback* callback)
 				}
 			}
 		}
-		if (!disconnect) {
-			rakPeer->DeallocatePacket(currentEvent);
-		}
+
+		rakPeer->DeallocatePacket(currentEvent);
 		//delete activeBitStream;
 	}
 

src/network/ServerSideNetworkHandler.cpp

@@ -5,16 +5,6 @@
 #include "../world/entity/player/Inventory.h"
 #include "../world/Container.h"
 #include "../world/inventory/BaseContainerMenu.h"
-#include "network/packet/ChatPacket.h"
-#include "network/packet/ContainerSetSlotPacket.h"
-#include "network/packet/LoginStatusPacket.h"
-#include "network/packet/MovePlayerPacket.h"
-#include "network/packet/RemoveBlockPacket.h"
-#include "network/packet/SendInventoryPacket.h"
-#include "network/packet/UpdateBlockPacket.h"
-#include "network/packet/RemoveItemPacket.h"
-#include "network/packet/TakeItemPacket.h"
-#include "network/packet/WantCreatePacket.h"
 #include "packet/PacketInclude.h"
 
 #include "RakNetInstance.h"
@@ -23,24 +13,11 @@
 #include "../client/gamemode/GameMode.h"
 #include "../raknet/RakPeerInterface.h"
 #include "../raknet/PacketPriority.h"
-#include "platform/log.h"
-#include "util/Mth.h"
-#include "util/StringUtils.h"
-#include "world/item/ItemInstance.h"
-#include "world/level/LevelConstants.h"
-#include "world/level/storage/LevelStorage.h"
-#include "world/phys/Vec3.h"
-#include "world/item/crafting/Recipe.h"
-#include "world/item/crafting/Recipes.h"
-#include <cstddef>
-#include <cstdio>
 #ifndef STANDALONE_SERVER
 #include "../client/sound/SoundEngine.h"
 #endif
 #include "../server/ServerPlayer.h"
 #include "../world/entity/item/FallingTile.h"
-#include <plugins/LuaPlayer.hpp>
-#include <plugins/MessageEvent.hpp>
 
 #define TIMES(x) for(int itc ## __LINE__ = 0; itc ## __LINE__ < x; ++ itc ## __LINE__)
 
@@ -76,11 +53,11 @@ void ServerSideNetworkHandler::tileChanged(int x, int y, int z)
 
 Packet* ServerSideNetworkHandler::getAddPacketFromEntity( Entity* entity ) {
 	if (entity->isMob() && !entity->isPlayer()) { //@fix: This code is duplicated. See if it can be unified.
-		// if (minecraft->player) {
+		if (minecraft->player) {
 			// I guess this should always be true, but it crashed somewhere in this
 			// function once and I only see this one as a potential problem
 			return new AddMobPacket((Mob*)entity);
-		// }
+		}
 	}
 	else if (entity->isPlayer()) {
 
@@ -157,62 +134,9 @@ void ServerSideNetworkHandler::displayGameMessage(const std::string& message)
 	raknetInstance->send(packet);
 }
 
-void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MessagePacket* packet)
-{
-	auto player = getPlayer(source);
-
-	if (player == nullptr) return; // @todo maybe kick?
-	
-	auto msg = std::string(packet->message.C_String());
-
-	MessageEvent event;
-	event.m_decline = false;
-	
-	PluginsManager::get().emit("Message", LuaPlayer(source), msg, event);
-	
-	if (!event.m_decline) {
-		if (packet->message[0] == '/') {
-			// This is a command
-			auto cmd = Util::stringTrim(msg.substr(1));
-
-			if (PluginsManager::get().emitCommands(cmd, source)) {
-				ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, cmd));
-				return sendPrivate(resp, source);	
-			} else {
-				return;
-			}
-		}
-
-		displayGameMessage("<" + player->name + "> " + msg);
-	}
-}
-
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChatPacket* packet)
 {
-	auto player = getPlayer(source);
-
-	if (player == nullptr) return; // @todo maybe kick?
-	
-	MessageEvent event;
-	event.m_decline = false;
-	
-	PluginsManager::get().emit("Message", LuaPlayer(source), packet->message, event);
-	
-	if (!event.m_decline) {
-		if (packet->message[0] == '/') {
-			// This is a command
-			auto cmd = Util::stringTrim(packet->message.substr(1));
-
-			if (PluginsManager::get().emitCommands(cmd, source)) {
-				ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, cmd));
-				return sendPrivate(resp, source);	
-			} else {
-				return;
-			}
-		}
-
-		displayGameMessage("<" + player->name + "> " + packet->message);
-	}
+	displayGameMessage(packet->message);
 }
 
 void ServerSideNetworkHandler::onNewClient(const RakNet::RakNetGUID& clientGuid)
@@ -232,9 +156,6 @@ void ServerSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
 
 		if (player->owner == guid)
 		{
-			PluginsManager::get().emit("PlayerDisconnect", LuaPlayer(guid));
-			minecraft->level->getLevelStorage()->savePlayer(*player);
-
 			std::string message = player->name;
 			message += " disconnected from the game";
 			displayGameMessage(message);
@@ -265,42 +186,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	//
 	bool oldClient = packet->clientNetworkVersion < SharedConstants::NetworkProtocolLowestSupportedVersion;
 	bool oldServer = packet->clientNetworkLowestSupportedVersion > SharedConstants::NetworkProtocolVersion;
-	if (oldClient || oldServer || !packet->newProto)
-		loginStatus = oldClient || !packet->newProto? LoginStatus::Failed_ClientOld : LoginStatus::Failed_ServerOld;
-
-	std::string nicknameLower = packet->clientName.C_String();
-	std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
-
-	RakNet::SystemAddress sysAddress = rakPeer->GetSystemAddressFromGuid(source);
-    char clientIp[32];
-    sysAddress.ToString(false, clientIp);
-
-	for (int i = 0; i < level->players.size(); i++) {
-		ServerPlayer* player = (ServerPlayer*) level->players.at(i);
-
-		std::string clientLower = player->name;
-		std::transform(clientLower.begin(), clientLower.end(), clientLower.begin(), ::tolower);
-
-		// @todo to lower case
-		if (nicknameLower == clientLower) {
-			loginStatus = packet->newProto ? LoginStatus::Failed_TakenNickname : LoginStatus::Failed_ClientOld;
-			break;
-		}
-	}
-	
-	for (auto& banned : level->bannedPpl) {
-		if (nicknameLower == banned) {
-			loginStatus = packet->newProto ? LoginStatus::Failed_Banned : LoginStatus::Failed_ClientOld;
-			break;
-		}
-	}
-
-	for (auto& banned : level->bannedIps) {
-		if (clientIp == banned) {
-			loginStatus = packet->newProto ? LoginStatus::Failed_Banned : LoginStatus::Failed_ClientOld;
-			break;
-		}
-	}
+	if (oldClient || oldServer)
+		loginStatus = oldClient? LoginStatus::Failed_ClientOld : LoginStatus::Failed_ServerOld;
 
 	RakNet::BitStream bitStream;
 	LoginStatusPacket(loginStatus).write(&bitStream);
@@ -312,16 +199,13 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	//
 	// Valid client version
 	//
-	
-	Player* newPlayer = new ServerPlayer(minecraft, level, packet->newProto);
+	Player* newPlayer = new ServerPlayer(minecraft, level);
 
 	minecraft->gameMode->initAbilities(newPlayer->abilities);
 	newPlayer->owner = source;
 	newPlayer->name = packet->clientName.C_String();
 	_pendingPlayers.push_back(newPlayer);
 
-	LOGI("Adding new player... isCreative: %i\n", minecraft->isCreativeMode());
-
 	// Reset the player so he doesn't spawn inside blocks
 	while (newPlayer->y > 0) {
 		newPlayer->setPos(newPlayer->x, newPlayer->y, newPlayer->z);
@@ -344,8 +228,7 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
             level->getLevelData()->getGeneratorVersion(),
             gameType,
             newPlayer->entityId,
-            newPlayer->x, newPlayer->y - newPlayer->heightOffset, newPlayer->z,
-			LevelConstants::CHUNK_CACHE_WIDTH
+            newPlayer->x, newPlayer->y - newPlayer->heightOffset, newPlayer->z
         ).write(&bitStream);
 
         rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
@@ -405,6 +288,7 @@ void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID
 #else
 	LOGW("%s joined the game\n", newPlayer->name.c_str());
 #endif
+
 	// Send all Entities to the new player
 	for (unsigned int i = 0; i < level->entities.size(); ++i) {
 		Entity* e = level->entities[i];
@@ -417,36 +301,6 @@ void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID
 		}
 	}
 
-	if (!minecraft->level->getLevelStorage()->loadPlayer(*newPlayer)) {
-		LOGW("Failed to load %s data\n", newPlayer->name.c_str());
-	}
-	
-	// Credits to EpikIzCool
-	bitStream.Reset();
-	MovePlayerPacket mv(newPlayer->entityId, newPlayer->x, newPlayer->y - newPlayer->heightOffset,
-		newPlayer->z, newPlayer->xRot, newPlayer->yRot);
-	mv.write(&bitStream);
-
-	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
-	
-	bitStream.Reset();
-	SetHealthPacket hp(newPlayer->health);
-	hp.write(&bitStream);
-	
-	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
-	
-	if (newPlayer->hasRespawnPosition()) {
-		bitStream.Reset();
-		SetSpawnPositionPacket sp(newPlayer->getRespawnPosition());
-		sp.write(&bitStream);
-		rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
-	}
-
-	bitStream.Reset();
-	SendInventoryPacket(newPlayer, false).write(&bitStream);
-	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
-
-
 	// Additional packets
 	// * set spawn
 	/*
@@ -460,8 +314,6 @@ void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID
 	bitStream.Reset();
 	AddPlayerPacket(newPlayer).write(&bitStream);
 	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, true);
-
-	PluginsManager::get().emit("PlayerJoin", LuaPlayer(source));
 }
 
 //
@@ -487,32 +339,9 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
 {
 	if (!level) return;
 
-	// LOGI("MovePlayerPacket\n");
-	if (Entity* entity = level->getEntity(packet->entityId)) {
-		ServerPlayer* player = (ServerPlayer*) getPlayer(source);
-
-		// int timeElapsed = minecraft->getTicks() - player->getLastMoveTicks();
-
-		// if (timeElapsed > 0) {
-		// 	float dist = player->distanceTo(packet->x, player->y, packet->z);
-		// 	float speed = dist / (minecraft->getTicks() - player->getLastMoveTicks());
-		// 	player->setLastMoveTicks(minecraft->getTicks());
-
-		// 	float maxSpeed = (minecraft->isCreativeMode()) ? 1.65f : 1.f;
-
-		// 	if (speed > maxSpeed) {
-		// 		MovePlayerPacket refuse(player->entityId, player->x, player->y, player->z, player->xRot, player->yRot);
-		//     	return raknetInstance->send(refuse);
-		// 	}
-		// }
-		
-		PluginsManager::get().emit(
-			"PlayerMovement", 
-			LuaPlayer(source), 
-			packet->x, packet->y, packet->z, packet->yRot, packet->xRot, // newPos
-			player->x, player->y, player->z, player->yRot, player->xRot // oldPos
-		);
-
+	//LOGI("MovePlayerPacket\n");
+	if (Entity* entity = level->getEntity(packet->entityId))
+	{
 		entity->xd = entity->yd = entity->zd = 0;
 		entity->lerpTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot, 3);
 
@@ -521,7 +350,7 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
 	}
 }
 
-void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBlockPacket* packet) {
+void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBlockPacket* packet){
 	if (!level) return;
 
 	Player* player = getPlayer(source);
@@ -539,31 +368,12 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBl
 	if (oldTile != NULL && changed) {
 		level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, oldTile->soundType->getBreakSound(), (oldTile->soundType->getVolume() + 1) / 2, oldTile->soundType->getPitch() * 0.8f);
 
-		if (minecraft->gameMode->isSurvivalType() && player->canDestroy(oldTile)) {
-			// From SurvivalMode.cpp
-			// Why tf i have to copy this shit from SurvivalMode class
-			// Why SurvivalMode class locked to LOCAL MINECRAFT PLAYER :sob: :sob: :sob: :sob: :sob: :sob: :sob: :sob:
-			// @fix @warn @ahtung @alert
-			ItemInstance* item = player->inventory->getSelected();
-			if (item != NULL) {
-				item->mineBlock(oldTile->id, x, y, z);
-				if (item->count == 0) {
-					//item->snap(minecraft->player);
-					player->inventory->clearSlot(player->inventory->selected);
-				}
-			}
-
-			// oldTile->spawnResources(level, x, y, z, data, 1); //@todo
+		if (minecraft->gameMode->isSurvivalType() && player->canDestroy(oldTile))
+			//oldTile->spawnResources(level, x, y, z, data, 1); //@todo
 			oldTile->playerDestroy(level, player, x, y, z, data);
-		}
-			
 
 		oldTile->destroy(level, x, y, z, data);
-		// 		RemoveEntityPacket packet(e->entityId);
-		// redistributePacket(&packet, rakPeer->GetMyGUID());
 	}
-
-	LOGI("Remove block [%i, %i, %i]\n", packet->x, packet->y, packet->z);
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RequestChunkPacket* packet)
@@ -593,8 +403,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RequestC
             raknetInstance->send(source, p);
         }
     }
-
-	// LOGI("Requested chunk [%i, %i]\n", packet->x, packet->z);
 }
 
 void ServerSideNetworkHandler::levelGenerated( Level* level )
@@ -621,31 +429,23 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, PlayerEq
 	if (!player) return;
 	if (rakPeer->GetMyGUID() == player->owner) return;
 
-	LOGI("Equip item: id %i aux %i\n", packet->itemId, packet->itemAuxValue);
-
 	// override the player's inventory
-	int slot = player->inventory->getSlot(packet->itemId, packet->itemAuxValue);
-
-	if (slot >= 0 && slot != packet->inventorySlot && packet->itemId != 0) {
-		LOGW("PlayerEquipmentPacket: Item in player inventory but slots doesn't match!");
-		packet->inventorySlot = slot;
+	//int slot = player->inventory->getSlot(packet->itemId, packet->itemAuxValue);
+	int slot = Inventory::MAX_SELECTION_SIZE;
+	if (slot >= 0) {
+		if (packet->itemId == 0) {
+			player->inventory->clearSlot(slot);
+		} else {
+			// @note: 128 is an ugly hack for depletable items.
+			// @todo: fix
+			ItemInstance newItem(packet->itemId, 128, packet->itemAuxValue);
+			player->inventory->replaceSlot(slot, &newItem);
+		}
+		player->inventory->moveToSelectedSlot(slot, true);
+		redistributePacket(packet, source);
+	} else {
+		LOGW("Warning: Remote player doesn't have his thing, Odd!\n");
 	}
-
-	if (slot < 0 && packet->itemId != 0) {
-		LOGW("PlayerEquipmentPacket: Remote player doesn't have his thing (or crafted it)!\n");
-
-		SendInventoryPacket newInventory (player, false);
-		raknetInstance->send(newInventory);
-
-		return;
-	}
-
-	player->inventory->selectSlot(packet->selectedSlot);
-	player->inventory->linkSlot(packet->selectedSlot, packet->inventorySlot, true);
-
-	player->inventory->print();
-
-	redistributePacket(packet, source);
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, PlayerArmorEquipmentPacket* packet) {
@@ -655,8 +455,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, PlayerAr
     if (!player) return;
     if (rakPeer->GetMyGUID() == player->owner) return;
 
-	// LOGI("Equip armor: %i %i %i %i\n", packet->head, packet->torso, packet->legs, packet->feet);
-
     packet->fillIn(player);
     redistributePacket(packet, source);
 }
@@ -668,8 +466,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Interact
 	Entity* entity = level->getEntity(packet->targetId);
 	if (src && entity && src->isPlayer())
 	{
-		LOGI("Interact: source %i target %i\n", packet->sourceId, packet->targetId);
-
 		Player* player = (Player*) src;
 		if (InteractPacket::Attack == packet->action) {
 			player->swing();
@@ -710,75 +506,14 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AnimateP
 	}
 	redistributePacket(packet, source);
 }
-void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet) {
-	LOGI("WantCreatePacket\n");
-	Entity* entity = level->getEntity(packet->playerId);
-
-	if (entity && entity->isPlayer()) {
-		Player* p = (Player*)entity;
-		
-		auto playerInv = p->inventory;
-		
-		ItemInstance wantCreate;
-
-		wantCreate.id = packet->itemId;
-		wantCreate.count = packet->count;
-		wantCreate.setAuxValue(packet->auxValue);
-
-		Recipe* recipe = Recipes::getInstance()->getRecipeFor(wantCreate);
-
-		std::vector<ItemInstance> items = recipe->getItemPack().getItemInstances();
-
-		std::vector<int> checkForExists = {};
-
-		for (int i = Inventory::MAX_SELECTION_SIZE; i < p->inventory->getContainerSize(); ++i) {
-			auto itm = p->inventory->getItem(i);
-
-			if (itm != NULL) {
-				for (int y = 0; y < items.size(); y++) {
-					auto itmRecipe = items.at(y);
-
-					if (itmRecipe.id == itm->id && itm->count >= itmRecipe.count) {
-						checkForExists.push_back(itm->id);
-					}
-				}
-			}
-		}
-		
-		if (checkForExists.empty()) {
-			return;
-		}
-		
-		for (int i = 0; i < items.size(); i++) {
-			auto item = items.at(i);
-			
-    		auto it = std::find(checkForExists.begin(), checkForExists.end(), item.id);
-
-			if (it == checkForExists.end() && checkForExists.size() > 1) {
-				return;
-			}
-		}
-
-		for (int i = 0; i < items.size(); i++) {
-			p->inventory->removeResource(ItemInstance(items.at(i).id, items.at(i).count, items.at(i).getAuxValue()));
-		}
-		// TakeItemPacket itemAdd(p->entityId, wantCreate.count, wantCreate.getAuxValue(), wantCreate.id);
-		// raknetInstance->send(source, itemAdd);
-
-		p->inventory->add(new ItemInstance(wantCreate.id, wantCreate.count, wantCreate.getAuxValue()));
-	}
-}
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemPacket* packet)
 {
 	if (!level) return;
 
-	LOGI("UseItemPacket: id %i data %i\n", packet->itemId, packet->itemData);
+	LOGI("UseItemPacket\n");
 	Entity* entity = level->getEntity(packet->entityId);
-
 	if (entity && entity->isPlayer()) {
-		LOGI("%f %f %f \n", entity->x, entity->y, entity->z);
-
 		Player* player = (Player*) entity;
 		int x = packet->x, y = packet->y, z = packet->z;
 		Tile* t = Tile::tiles[level->getTile(x, y, z)];
@@ -787,41 +522,7 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemP
 		if (t && t->use(level, x, y, z, player)) return;
 		if (packet->item.isNull()) return;
 
-		ItemInstance* packetItem = &packet->item;
-
-		int slot = player->inventory->getSlot(packet->itemId, packet->itemData);
-
-		if (slot < 0) {
-			LOGW("UseItemPacket: Player doesn't have this item!\n");
-
-			auto pos = Vec3(packet->x, packet->y, packet->z);
-
-			if (ItemInstance::isBlock(packetItem)) {
-				LOGI("UseItemPacket: This is even block!!!\n");
-
-				pos.x += packet->clickX;
-				pos.y += packet->clickY;
-				pos.z += packet->clickZ;
-			}
-
-			UpdateBlockPacket refuse(pos.x, pos.y, pos.z, level->getTile(pos.x, pos.y, pos.z), level->getData(pos.x, pos.y, pos.z));
-			raknetInstance->send(refuse);
-
-			return;
-		}
-
-		ItemInstance* item = player->inventory->getItem(slot);
-		player->x = packet->playerX;
-		player->y = packet->playerY;
-		player->z = packet->playerZ;
-
-		player->bb.x0 = packet->playerX0;
-		player->bb.y0 = packet->playerY0;
-		player->bb.z0 = packet->playerZ0;
-
-		player->bb.x1 = packet->playerX1;
-		player->bb.y1 = packet->playerY1;
-		player->bb.z1 = packet->playerZ1;
+		ItemInstance* item = &packet->item;
 
 		if(packet->face == 255) {
             // Special case: x,y,z means direction-of-action
@@ -833,10 +534,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemP
 				Vec3(packet->clickX + packet->x, packet->clickY + packet->y, packet->clickZ + packet->z));
 		}
 		
-		if (item && item->count <= 0) {
-			player->inventory->clearSlot(slot);
-		}
-		
 		//LOGW("Use Item not working! Out of synch?\n");
 
 		// Don't have to redistribute (ugg.. this will mess up), cause tileUpdated is sent
@@ -847,8 +544,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemP
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, EntityEventPacket* packet) {
 	if (!level) return;
 
-	LOGI("EntityEventPacket: id %i\n", packet->eventId);
-
 	if (Entity* e = level->getEntity(packet->entityId))
 		e->handleEntityEvent(packet->eventId);
 }
@@ -882,11 +577,6 @@ void ServerSideNetworkHandler::handle( const RakNet::RakNetGUID& source, SendInv
 {
 	if (!level) return;
 
-	LOGI("SendInventoryPacket:\n");
-	for (int i = 0; i < packet->numItems; i++) {
-		LOGI("\t %i: %s (%i)\n", i, packet->items.at(i).getName().c_str(), packet->items.at(i).count);
-	}
-
 	Entity* entity = level->getEntity(packet->entityId);
 	if (entity && entity->isPlayer()) {
 		Player* p = (Player*)entity;
@@ -902,27 +592,15 @@ void ServerSideNetworkHandler::handle( const RakNet::RakNetGUID& source, DropIte
 {
 	if (!level) return;
 
-	LOGI("DropItemPacket\n");
-
 	Entity* entity = level->getEntity(packet->entityId);
 	if (entity && entity->isPlayer()) {
 		Player* p = (Player*)entity;
-		// p->drop(new ItemInstance(packet->item), packet->dropType != 0);
-
-		int slot = p->inventory->getSlot(packet->item.id, packet->item.getAuxValue());
-
-		if (slot < 0) {
-			LOGW("DropItemPacket: player doesn't have these items!\n");
-			return;
-		}
-
-		p->inventory->dropSlot(slot, false, packet->dropType != 0);
+		p->drop(new ItemInstance(packet->item), packet->dropType != 0);
 	}
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ContainerClosePacket* packet) {
 	if (!level) return;
-	LOGI("ContainerClosePacket\n");
 
 	Player* p = findPlayer(level, &source);
 	if (!p) return;
@@ -934,16 +612,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ContainerSetSlotPacket* packet) {
 	if (!level) return;
 
-	const char* type = "unknown";
-
-	switch (packet->setType) {
-		case ContainerSetSlotPacket::SETTYPE_ADD: type = "add"; break;
-		case ContainerSetSlotPacket::SETTYPE_SET: type = "set"; break;
-		case ContainerSetSlotPacket::SETTYPE_TAKE: type = "take"; break;
-	};
-
-	LOGI("ContainerSetSlot: slot %i item %s type %s\n", packet->slot, packet->item.getName().c_str(), type);
-
 	Player* p = findPlayer(level, &source);
 	if (!p) return;
 
@@ -951,80 +619,12 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
 		LOGW("User has no container!\n");
 		return;
 	}
-
-	if (p->containerMenu->containerId != packet->containerId) {
+	if (p->containerMenu->containerId != packet->containerId)
+	{
 		LOGW("Wrong container id: %d vs %d\n", p->containerMenu->containerId, packet->containerId);
 		return;
 	}
 	
-	if (packet->item.count > 64) {
-		LOGW("ContainerSetSlotPacket: player tried to put more than 64");
-		return;
-	}
-
-	auto contItems = p->containerMenu->getItems();
-
-	// find same item in player inventory (used not in all cases)
-	int invSlot = p->inventory->getSlot(packet->item.id, packet->item.getAuxValue());
-	auto invItem = p->inventory->getItem(invSlot);
-
-	if (contItems.at(packet->slot).id == 0 && packet->item.id != 0) {
-		LOGI("ContainerSetSlotPacket: player tried to put items to slot %i\n", packet->slot);
-
-		if (invSlot < 0) {
-			LOGW("ContainerSetSlotPacket: player doesn't have this item\n");
-			return;
-		}
-
-		if (invItem->count < packet->item.count) {
-			LOGW("ContainerSetSlotPacket: player tried to put more than he have\n");
-			packet->item.count = invItem->count;
-		}
-
-		invItem->count -= packet->item.count;
-
-		if (invItem->count <= 0) {
-			p->inventory->removeItem(invItem);
-		}
-	} else if(contItems.at(packet->slot).id == packet->item.id) {
-		int deltaItem = packet->item.count - contItems.at(packet->slot).count;
-
-		if (deltaItem > 0) {
-			LOGI("ContainerSetSlotPacket: player tried to add %i items to slot %i\n", deltaItem, packet->slot);
-
-			auto invItem = p->inventory->getItem(invSlot);
-
-			if (invSlot < 0) {
-				LOGW("ContainerSetSlotPacket: player doesn't have this item\n");
-				return;
-			}
-
-			if (invItem->count < deltaItem) {
-				LOGW("ContainerSetSlotPacket: player tried to put more than he have");
-				packet->item.count -= (deltaItem - invItem->count);
-				deltaItem = invItem->count;
-			}
-
-			invItem->count -= deltaItem;
-
-			if (invItem->count <= 0) {
-				p->inventory->removeItem(invItem);
-			}
-		} else if (deltaItem < 0) {
-			LOGW("ContainerSetSlotPacket: player tried to take %i items from slot %i\n", -deltaItem, packet->slot);
-			p->inventory->add(new ItemInstance(packet->item.getItem(), -deltaItem, contItems.at(packet->slot).getAuxValue()));
-		}
-	} else if(contItems.at(packet->slot).id && !packet->item.id) {
-		LOGI("ContainerSetSlotPacket: player tried to take all items from slot %i\n", packet->slot);
-		packet->item.count = 0;
-		packet->item.setAuxValue(0);
-
-		p->inventory->add(new ItemInstance(contItems.at(packet->slot).getItem(), contItems.at(packet->slot).count, contItems.at(packet->slot).getAuxValue()));
-	} else {
-		LOGW("ContainerSetSlotPacket: illegal container operation in slot %i\n", packet->slot);
-		return;
-	}
-	
 	if (ContainerType::FURNACE == p->containerMenu->containerType) {
 		//LOGI("Server:Setting slot %d: %s\n", packet->slot, packet->item.toString().c_str());
 		p->containerMenu->setSlot(packet->slot, &packet->item);
@@ -1035,8 +635,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
 		p->containerMenu->setSlot(packet->slot, &packet->item);
 		//p->containerMenu->setSlot(packet->slot, packet->item.isNull()? NULL : &packet->item);
 	}
-
-	p->inventory->print();
 }
 
 void ServerSideNetworkHandler::handle( const RakNet::RakNetGUID& source, SetHealthPacket* packet )
@@ -1059,8 +657,6 @@ void ServerSideNetworkHandler::handle( const RakNet::RakNetGUID& source, SignUpd
 	if (!level)
 		return;
 
-		LOGI("SignUpdate: [%i, %i, %i]\n", packet->x, packet->y, packet->z);
-
 	TileEntity* te = level->getTileEntity(packet->x, packet->y, packet->z);
 	if (TileEntity::isType(te, TileEntityType::Sign)) {
 		SignTileEntity* ste = (SignTileEntity*) te;
@@ -1117,9 +713,3 @@ Player* ServerSideNetworkHandler::getPlayer( const RakNet::RakNetGUID& source )
         if (source == level->players[i]->owner) return level->players[i];
     return NULL;
 }
-
-void ServerSideNetworkHandler::sendPrivate(Packet& packet, const RakNet::RakNetGUID& source) {
-	RakNet::BitStream bitStream;
-	packet.write(&bitStream);
-	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
-}

src/network/ServerSideNetworkHandler.h

@@ -58,8 +58,6 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, ContainerClosePacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, ChatPacket* packet);
-	virtual void handle(const RakNet::RakNetGUID& source, MessagePacket* packet);
-	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet);
 
 	bool allowsIncomingConnections() { return _allowIncoming; }
 	void allowIncomingConnections(bool doAllow);
@@ -67,21 +65,13 @@ public:
 	Player* popPendingPlayer(const RakNet::RakNetGUID& source);
 
 	void displayGameMessage(const std::string& message);
-
+private:
 	/**
 	 * @brief Send packet to all players
 	 */
 	void redistributePacket(Packet* packet, const RakNet::RakNetGUID& fromPlayer);
-
-	/**
-	 * @brief Send packer private with GUID
-	 */
-	void sendPrivate(Packet& packet, const RakNet::RakNetGUID& source);
-
 	Player* getPlayer(const RakNet::RakNetGUID& source);
 
-private:
-
 	Minecraft*					minecraft;
 	Level*						level;
 	IRakNetInstance*			raknetInstance;

src/network/command/CommandServer.cpp

@@ -236,9 +236,9 @@ std::string CommandServer::parse(ConnectedClient& client, const std::string& s)
 		if (x0 < 0) x0 = 0;
 		if (y0 < 0) y0 = 0;
 		if (z0 < 0) z0 = 0;
-		if (x1 >= LevelConstants::LEVEL_WIDTH ) x1 = LevelConstants::LEVEL_WIDTH  - 1;
-		if (y1 >= LevelConstants::LEVEL_HEIGHT) y1 = LevelConstants::LEVEL_HEIGHT - 1;
-		if (z1 >= LevelConstants::LEVEL_DEPTH ) z1 = LevelConstants::LEVEL_DEPTH  - 1;
+		if (x1 >= LEVEL_WIDTH ) x1 = LEVEL_WIDTH  - 1;
+		if (y1 >= LEVEL_HEIGHT) y1 = LEVEL_HEIGHT - 1;
+		if (z1 >= LEVEL_DEPTH ) z1 = LEVEL_DEPTH  - 1;
 
 		for (int y = y0; y <= y1; ++y)
 		for (int z = z0; z <= z1; ++z)
@@ -456,7 +456,7 @@ std::string CommandServer::parse(ConnectedClient& client, const std::string& s)
 			sw.start();
 
 			// Save a cuboid around the player
-			const int CSize = LevelConstants::CHUNK_CACHE_WIDTH;
+			const int CSize = CHUNK_CACHE_WIDTH;
 			int cx = (int)e->x / CSize;
 			int cz = (int)e->z / CSize;
 
@@ -504,7 +504,7 @@ bool CommandServer::handleCheckpoint(bool doRestore ) {
 	const int cz = restorePos.z;
 	const int y0 = restorePos.y;
 	const int y1 = y0 + RestoreHeight;
-	const int CSize = LevelConstants::CHUNK_CACHE_WIDTH;
+	const int CSize = CHUNK_CACHE_WIDTH;
 	const int numChunkBytes = RestoreHeight * CSize * CSize * 20 / 8;
 
 	if (!restoreBuffer) {

src/network/packet/ChunkDataPacket.h

@@ -33,18 +33,18 @@ public:
 		unsigned char* blockIds = chunk->getBlockData();
 		DataLayer& blockData = chunk->data;
 
-		const int setSize = LevelConstants::LEVEL_HEIGHT / 8;
-		const int setShift = 4; // power of LevelConstants::LEVEL_HEIGHT / 8
+		const int setSize = LEVEL_HEIGHT / 8;
+		const int setShift = 4; // power of LEVEL_HEIGHT / 8
 
 		chunkData.Reset();
-		for (int i = 0; i < LevelConstants::CHUNK_COLUMNS; i++)
+		for (int i = 0; i < CHUNK_COLUMNS; i++)
 		{
 			unsigned char updateBits = chunk->updateMap[i];
 			chunkData.Write(updateBits);
 
 			if (updateBits > 0)
 			{
-				int colDataPosition = (i % LevelConstants::CHUNK_WIDTH) << 11 | (i / LevelConstants::CHUNK_WIDTH) << 7;
+				int colDataPosition = (i % CHUNK_WIDTH) << 11 | (i / CHUNK_WIDTH) << 7;
 
 				for (int set = 0; set < 8; set++)
 				{

src/network/packet/LoginPacket.h

@@ -9,20 +9,17 @@ public:
 	RakNet::RakString clientName;
 	int clientNetworkVersion;
 	int clientNetworkLowestSupportedVersion;
-	bool newProto;
 
 	LoginPacket()
 	:	clientNetworkVersion(-1),
-		clientNetworkLowestSupportedVersion(-1),
-		newProto(false)
+		clientNetworkLowestSupportedVersion(-1)
 	{
 	}
 
-	LoginPacket(const RakNet::RakString& clientName, int clientVersion, bool newProto)
+	LoginPacket(const RakNet::RakString& clientName, int clientVersion)
 	:	clientName(clientName),
 		clientNetworkVersion(clientVersion),
-		clientNetworkLowestSupportedVersion(clientVersion),
-		newProto(newProto)
+		clientNetworkLowestSupportedVersion(clientVersion)
 	{
 	}
 
@@ -32,7 +29,6 @@ public:
 		bitStream->Write(clientName);
 		bitStream->Write(clientNetworkVersion);
 		bitStream->Write(clientNetworkLowestSupportedVersion);
-		bitStream->Write(newProto);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -43,11 +39,6 @@ public:
 		if (bitStream->GetNumberOfUnreadBits() > 0) {
 			bitStream->Read(clientNetworkVersion);
 			bitStream->Read(clientNetworkLowestSupportedVersion);
-			
-			// Checking for new proto
-			if (bitStream->GetNumberOfUnreadBits() > 0) {
-				bitStream->Read(newProto);
-			}
 		}
 	}
 

src/network/packet/LoginStatusPacket.h

@@ -3,13 +3,10 @@
 
 #include "../Packet.h"
 
-// wtf why not enum
 namespace LoginStatus {
 	const int Success = 0;
 	const int Failed_ClientOld = 1;
 	const int Failed_ServerOld = 2;
-	const int Failed_TakenNickname = 3;
-	const int Failed_Banned = 4;
 }
 
 class LoginStatusPacket : public Packet {

src/network/packet/PacketInclude.h

@@ -50,7 +50,5 @@
 #include "TileEventPacket.h"
 #include "UpdateBlockPacket.h"
 #include "UseItemPacket.h"
-#include "RemoveItemPacket.h"
-#include "WantCreatePacket.h"
-#include "TakeItemPacket.h"
+
 #endif /*NET_MINECRAFT_NETWORK_PACKET__PacketInclude_H__*/

src/network/packet/PlayerEquipmentPacket.h

@@ -9,19 +9,15 @@ public:
 	int entityId;
 	unsigned short itemId;
 	unsigned short itemAuxValue;
-	unsigned char selectedSlot;
-	unsigned char inventorySlot;
 
 	PlayerEquipmentPacket()
 	{
 	}
 
-	PlayerEquipmentPacket(int entityId, int itemId, int data, int selSlot, int invSlot)
+	PlayerEquipmentPacket(int entityId, int itemId, int data)
 	:	entityId(entityId),
 		itemId(itemId),
-		itemAuxValue(data),
-		selectedSlot(selSlot),
-		inventorySlot(invSlot)
+		itemAuxValue(data)
 	{
 	}
 
@@ -32,8 +28,6 @@ public:
 		bitStream->Write(entityId);
 		bitStream->Write(itemId);
 		bitStream->Write(itemAuxValue);
-		bitStream->Write(selectedSlot);
-		bitStream->Write(inventorySlot);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -41,8 +35,6 @@ public:
 		bitStream->Read(entityId);
 		bitStream->Read(itemId);
 		bitStream->Read(itemAuxValue);
-		bitStream->Read(selectedSlot);
-		bitStream->Read(inventorySlot);
 	}
 
 	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)

src/network/packet/RemoveItemPacket.h

@@ -1,54 +0,0 @@
-#ifndef NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__
-#define NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__
-
-//package net.minecraft.network.packet;
-
-#include "../Packet.h"
-
-class RemoveItemPacket: public Packet
-{
-public:
-    RemoveItemPacket() {
-    }
-
-    RemoveItemPacket(int playerId, int count, int auxValue, int itemId)
-	:
-		playerId(playerId),
-        count(count),
-		auxValue(auxValue),
-		itemId(itemId)
-	{
-    }
-
-	void write(RakNet::BitStream* bitStream)
-	{
-		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_REMOVEITEM));
-		bitStream->Write(itemId);
-		bitStream->Write(count);
-		bitStream->Write(auxValue);
-
-		bitStream->Write(playerId);
-	}
-
-	void read(RakNet::BitStream* bitStream)
-	{
-        bitStream->Read(itemId);
-        bitStream->Read(count);
-        bitStream->Read(auxValue);
-
-		bitStream->Read(playerId);
-	}
-
-	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
-	{
-		callback->handle(source, (RemoveItemPacket*)this);
-	}
-    
-    int playerId;
-
-    int itemId;
-	int count;
-	int auxValue;
-};
-
-#endif /*NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__*/

src/network/packet/SendInventoryPacket.h

@@ -2,14 +2,13 @@
 #define NET_MINECRAFT_NETWORK_PACKET__SendInventoryPacket_H__
 
 #include "../Packet.h"
-#include "world/entity/player/Inventory.h"
-#include "world/inventory/FillingContainer.h"
-#include <array>
 
 class SendInventoryPacket: public Packet
 {
 public:
-	SendInventoryPacket() {}
+	SendInventoryPacket()
+	{
+	}
 
 	SendInventoryPacket(Player* player, bool dropItems)
 	:	entityId(player->entityId),
@@ -22,15 +21,10 @@ public:
 			ItemInstance* item = inv->getItem(i);
 			items.push_back(item? *item : ItemInstance());
         }
-
         for (int i = 0; i < NumArmorItems; ++i) {
             ItemInstance* item = player->getArmor(i);
             items.push_back(item? *item : ItemInstance());
         }
-
-		for (int i = 0; i < inv->numLinkedSlots; ++i) {
-            linkedSlot[i] = inv->linkedSlots[i];
-        }
 	}
 
 	void write(RakNet::BitStream* bitStream)
@@ -45,13 +39,6 @@ public:
         // Armor
         for (int i = 0; i < NumArmorItems; ++i)
             PacketUtil::writeItemInstance(items[i + numItems], bitStream);
-
-		int lSlots = Inventory::MAX_SELECTION_SIZE;
-
-		// Linked slots
-		bitStream->Write(lSlots);
-		for (int i = 0; i < lSlots; ++i)
-            bitStream->Write(linkedSlot[i]);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -63,12 +50,6 @@ public:
         // Inventory, Armor
 		for (int i = 0; i < numItems + NumArmorItems; ++i)
 			items.push_back(PacketUtil::readItemInstance(bitStream));
-
-		// Linked slots
-		int lSlots = 0;
-		bitStream->Read(lSlots);
-		for (int i = 0; i < lSlots; ++i)
-            bitStream->Read(linkedSlot[i]);
 	}
 
 	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
@@ -81,8 +62,6 @@ public:
 	short numItems;
 	unsigned char extra;
 
-	std::array<FillingContainer::LinkedSlot, Inventory::MAX_SELECTION_SIZE> linkedSlot;
-
 	static const int ExtraDrop = 1;
     static const int NumArmorItems = 4;
 };

src/network/packet/StartGamePacket.h

@@ -2,7 +2,6 @@
 #define NET_MINECRAFT_NETWORK_PACKET__StartGamePacket_H__
 
 #include "../Packet.h"
-#include "world/level/LevelConstants.h"
 #include <cstdint>
 
 class StartGamePacket : public Packet
@@ -15,20 +14,18 @@ public:
 	int entityId;
 	float x, y, z;
 
-	int chunkCacheWidth = 0;
 	StartGamePacket()
 	{
 	}
 
-	StartGamePacket(long seed, int levelGeneratorVersion, int gameType, int entityId, float x, float y, float z, int chunkCacheWidth)
+	StartGamePacket(long seed, int levelGeneratorVersion, int gameType, int entityId, float x, float y, float z)
 	:	levelSeed((int32_t)seed),
 		levelGeneratorVersion(levelGeneratorVersion),
 		gameType(gameType),
 		entityId(entityId),
 		x(x),
 		y(y),
-		z(z),
-		chunkCacheWidth(chunkCacheWidth)
+		z(z)
 	{
 	}
 
@@ -43,7 +40,6 @@ public:
 		bitStream->Write(x);
 		bitStream->Write(y);
 		bitStream->Write(z);
-		bitStream->Write(LevelConstants::CHUNK_CACHE_WIDTH);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -55,10 +51,6 @@ public:
 		bitStream->Read(x);
 		bitStream->Read(y);
 		bitStream->Read(z);
-
-		if (bitStream->GetNumberOfUnreadBits() > 0) {
-			bitStream->Read(chunkCacheWidth);
-		}
 	}
 
 	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)

src/network/packet/TakeItemPacket.h

@@ -1,54 +0,0 @@
-#ifndef NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__
-#define NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__
-
-//package net.minecraft.network.packet;
-
-#include "../Packet.h"
-
-class TakeItemPacket: public Packet
-{
-public:
-    TakeItemPacket() {
-    }
-
-    TakeItemPacket(int playerId, int count, int auxValue, int itemId)
-	:
-		playerId(playerId),
-        count(count),
-		auxValue(auxValue),
-		itemId(itemId)
-	{
-    }
-
-	void write(RakNet::BitStream* bitStream)
-	{
-		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_TAKEITEM));
-		bitStream->Write(itemId);
-		bitStream->Write(count);
-		bitStream->Write(auxValue);
-
-		bitStream->Write(playerId);
-	}
-
-	void read(RakNet::BitStream* bitStream)
-	{
-        bitStream->Read(itemId);
-        bitStream->Read(count);
-        bitStream->Read(auxValue);
-
-		bitStream->Read(playerId);
-	}
-
-	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
-	{
-		callback->handle(source, (TakeItemPacket*)this);
-	}
-    
-    int playerId;
-
-    int itemId;
-	int count;
-	int auxValue;
-};
-
-#endif /*NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__*/

src/network/packet/UseItemPacket.h

@@ -16,14 +16,10 @@ public:
     short		  itemId;
 	unsigned char itemData;
     ItemInstance item;
-	float playerX, playerY, playerZ;
-	float playerX0, playerY0, playerZ0;
-	float playerX1, playerY1, playerZ1;
 
     UseItemPacket() {}
 
-    UseItemPacket(int x, int y, int z, int face, const ItemInstance* item, int entityId, float clickX, float clickY, float clickZ,
-	float plrX, float plrY, float plrZ, float plrX0, float plrY0, float plrZ0, float plrX1, float plrY1, float plrZ1)
+    UseItemPacket(int x, int y, int z, int face, const ItemInstance* item, int entityId, float clickX, float clickY, float clickZ)
     :	x(x),
         y(y),
         z(z),
@@ -33,36 +29,17 @@ public:
 		entityId(entityId),
 		clickX(clickX),
 		clickY(clickY),
-		clickZ(clickZ),
-		playerX(plrX),
-		playerY(plrY),
-		playerZ(plrZ),
-		playerX0(plrX0),
-		playerY0(plrY0),
-		playerZ0(plrZ0),
-		playerX1(plrX1),
-		playerY1(plrY1),
-		playerZ1(plrZ1)
+		clickZ(clickZ)
 	{}
 
-    UseItemPacket(const ItemInstance* item, int entityId, const Vec3& aim, float plrX, float plrY, float plrZ,
-	float plrX0, float plrY0, float plrZ0, float plrX1, float plrY1, float plrZ1)
+    UseItemPacket(const ItemInstance* item, int entityId, const Vec3& aim)
     :   face(255),
         itemId(item? item->id : 0),
         itemData(item? item->getAuxValue() : 0),
         entityId(entityId),
         x((int)(aim.x * 32768.0f)),
         y((int)(aim.y * 32768.0f)),
-        z((int)(aim.z * 32768.0f)),
-		playerX(plrX),
-		playerY(plrY),
-		playerZ(plrZ),
-		playerX0(plrX0),
-		playerY0(plrY0),
-		playerZ0(plrZ0),
-		playerX1(plrX1),
-		playerY1(plrY1),
-		playerZ1(plrZ1)
+        z((int)(aim.z * 32768.0f))
     {
     }
 
@@ -80,15 +57,6 @@ public:
 		bitStream->Write(clickX);
 		bitStream->Write(clickY);
 		bitStream->Write(clickZ);
-		bitStream->Write(playerX);
-		bitStream->Write(playerY);
-		bitStream->Write(playerZ);
-		bitStream->Write(playerX0);
-		bitStream->Write(playerY0);
-		bitStream->Write(playerZ0);
-		bitStream->Write(playerX1);
-		bitStream->Write(playerY1);
-		bitStream->Write(playerZ1);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -106,15 +74,7 @@ public:
 		item.id = itemId;
 		item.setAuxValue(itemData);
 		item.count = (itemId == 0 && itemData == 0)? 0 : 1;
-		bitStream->Read(playerX);
-		bitStream->Read(playerY);
-		bitStream->Read(playerZ);
-		bitStream->Read(playerX0);
-		bitStream->Read(playerY0);
-		bitStream->Read(playerZ0);
-		bitStream->Read(playerX1);
-		bitStream->Read(playerY1);
-		bitStream->Read(playerZ1);
+
 	}
 
 	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)

src/network/packet/WantCreatePacket.h

@@ -1,54 +0,0 @@
-#ifndef NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__
-#define NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__
-
-//package net.minecraft.network.packet;
-
-#include "../Packet.h"
-
-class WantCreatePacket: public Packet
-{
-public:
-    WantCreatePacket() {
-    }
-
-    WantCreatePacket(int playerId, int count, int auxValue, int itemId)
-	:
-		playerId(playerId),
-        count(count),
-		auxValue(auxValue),
-		itemId(itemId)
-	{
-    }
-
-	void write(RakNet::BitStream* bitStream)
-	{
-		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_WANTCREATEITEM));
-		bitStream->Write(itemId);
-		bitStream->Write(count);
-		bitStream->Write(auxValue);
-
-		bitStream->Write(playerId);
-	}
-
-	void read(RakNet::BitStream* bitStream)
-	{
-        bitStream->Read(itemId);
-        bitStream->Read(count);
-        bitStream->Read(auxValue);
-
-		bitStream->Read(playerId);
-	}
-
-	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
-	{
-		callback->handle(source, (WantCreatePacket*)this);
-	}
-    
-    int playerId;
-
-    int itemId;
-	int count;
-	int auxValue;
-};
-
-#endif /*NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__*/

src/plugins/LuaPlayer.hpp

@@ -1,160 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <raknet/RakNetTypes.h>
-#include <plugins/PluginsManager.hpp>
-#include <network/ServerSideNetworkHandler.h>
-#include <world/entity/player/Player.h>
-#include <client/Minecraft.h>
-#include <network/packet/ChatPacket.h>
-#include <network/packet/MovePlayerPacket.h>
-#include <network/packet/RemoveItemPacket.h>
-#include <network/packet/SetHealthPacket.h>
-#include <network/packet/TakeItemPacket.h>
-#include <world/entity/player/Inventory.h>
-
-// TODO: Optimize includes
-class LuaPlayer {
-public:
-    LuaPlayer(const RakNet::RakNetGUID source) : m_source(source) {}
-
-    Player* getPlayer() {
-        auto mc = PluginsManager::get().getMinecraft();
-        ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
-        auto plr = ss->getPlayer(m_source);
-
-        return plr;
-    }
-
-    std::string getNickname() {
-        auto plr = getPlayer();
-        if (plr != nullptr) return plr->name;
-
-        return "";
-    }
-
-    std::tuple<float, float, float, float, float> getPos() {
-        auto plr = getPlayer();
-        if (plr != nullptr) return {plr->x, plr->y, plr->z, plr->yRot, plr->xRot};
-
-        return {0, 0, 0, 0, 0};
-    }
-
-    void setPos(float x, float y, float z, float yRot, float xRot) {
-        auto plr = getPlayer();
-        if (plr == nullptr) return;
-        
-        auto mc = PluginsManager::get().getMinecraft();
-        ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
-
-
-        // plr->x = x;
-        // plr->y = y;
-        // plr->z = z;
-        // plr->yRot = yRot;
-        // plr->xRot = xRot;
-        plr->xd = plr->yd = plr->zd = 0;	
-		plr->lerpTo(x, y, z, yRot, xRot, 3);
-		
-        MovePlayerPacket move(plr->entityId, x, y, z, yRot, xRot);
-
-        ss->sendPrivate(move, m_source);
-    }
-
-    void sendMessage(std::string msg) {
-        auto mc = PluginsManager::get().getMinecraft();
-        ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
-        ChatPacket packet(msg);
-
-        ss->sendPrivate(packet, m_source);
-    }
-
-    void addItem(int id, int count, int auxValue) {
-        auto plr = getPlayer();
-        if (plr == nullptr) return;
-
-        auto mc = PluginsManager::get().getMinecraft();
-        ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
-        auto item = new ItemInstance(id, count, auxValue);
-
-        if (!plr->inventory->add(item)) {
-            plr->inventory->add(item);
-        }
-
-		TakeItemPacket itemAdd(plr->entityId, count, auxValue, id);
-		ss->sendPrivate(itemAdd, m_source);
-    }
-
-    std::tuple<int, int, int> getItem(int index) {
-        auto plr = getPlayer();
-        if (plr == nullptr) return {0, 0, 0};
-
-        auto item = plr->inventory->getItem(index);
-
-        if (item != nullptr) {
-            return {item->id, item->count, item->getAuxValue()};
-        } else {
-            return {0, 0, 0};
-        }
-    }
-
-    void clearInventory() {
-        auto plr = getPlayer();
-        if (plr == nullptr) return;
-
-        auto mc = PluginsManager::get().getMinecraft();
-        ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
-
-		for (int i = Inventory::MAX_SELECTION_SIZE; i < plr->inventory->getContainerSize(); i++) {
-			auto itm = plr->inventory->getItem(i);
-
-			if (itm != NULL) {
-                printf("remove %d \n", plr->inventory->removeResource(ItemInstance(itm->id, itm->count, itm->getAuxValue())));
-                RemoveItemPacket itemAdd(plr->entityId, itm->count, itm->getAuxValue(), itm->id);
-                ss->sendPrivate(itemAdd, m_source);
-			}
-		}
-
-    }
-
-    sol::table getInventory() {
-        auto plr = getPlayer();
-        if (plr == nullptr) return {};
-
-        sol::table inv = PluginsManager::get().getLua().create_table();
-
-		for (int i = Inventory::MAX_SELECTION_SIZE; i < plr->inventory->getContainerSize(); i++) {
-			auto itm = plr->inventory->getItem(i);
-
-			if (itm != NULL) {
-                inv[i - 8] = {itm->id, itm->count, itm->getAuxValue()};
-			} else {
-                inv[i - 8] = sol::lua_nil;
-            }
-		}
-
-        return inv;
-    }
-
-    int getHp() {
-        auto plr = getPlayer();
-        if (plr == nullptr) return -1;
-
-        return plr->health;
-    }
-
-    void setHp(int hp) {
-        auto plr = getPlayer();
-        if (plr == nullptr) return;
-
-        plr->health = hp;
-
-        auto mc = PluginsManager::get().getMinecraft();
-        ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
-
-        SetHealthPacket hpPacket(plr->health);
-		ss->sendPrivate(hpPacket, m_source);
-    }
-private:
-    const RakNet::RakNetGUID m_source;
-};

src/plugins/LuaServer.cpp

@@ -1,11 +0,0 @@
-#include <plugins/LuaServer.hpp>
-#include <plugins/PluginsManager.hpp>
-#include <network/ServerSideNetworkHandler.h>
-#include <client/Minecraft.h>
-
-void LuaServer::sendServerMessage(std::string msg)  {
-    auto mc = PluginsManager::get().getMinecraft();
-    ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
-
-    ss->displayGameMessage(msg);
-}

src/plugins/LuaServer.hpp

@@ -1,7 +0,0 @@
-#pragma once
-#include <string>
-
-class LuaServer {
-public:
-    void sendServerMessage(std::string msg);
-};

src/plugins/MessageEvent.hpp

@@ -1,9 +0,0 @@
-#pragma once
-
-class MessageEvent {
-public:
-    bool m_decline;
-
-    void setDecline(bool decline) { m_decline = decline; }
-private:
-};

src/plugins/PluginsManager.cpp

@@ -1,103 +0,0 @@
-#include <plugins/PluginsManager.hpp>
-#include <plugins/LuaPlayer.hpp>
-#include <plugins/LuaServer.hpp>
-
-#include <client/Minecraft.h>
-#include <filesystem>
-#include "MessageEvent.hpp"
-
-namespace fs = std::filesystem;
-
-int PluginsManager::emitCommands(std::string command, const RakNet::RakNetGUID& source) {
-    std::vector<std::string> args;
-    std::string cmd;
-
-    int i = 0;
-    std::string word;
-    std::stringstream ss(command);
-
-    while (ss >> word) {
-        if (i == 0) {
-            cmd = word;
-        } else {
-            args.push_back(word);
-        }
-        
-        i++;
-    }
-
-    auto it = m_luaCommands.find(cmd);
-
-    if (it == m_luaCommands.end()) return 1;
-
-    for (auto& callback : it->second) {
-        sol::protected_function_result result = callback(LuaPlayer(source), sol::as_table(args));
-
-        if (!result.valid()) {
-            sol::error err = result;
-            std::cout << err.what() << std::endl;
-        }
-    }
-
-    return 0;
-}
-
-void PluginsManager::init(Minecraft& minecraft) {
-    m_lua.open_libraries(sol::lib::base, sol::lib::package, sol::lib::string, sol::lib::math, sol::lib::table, sol::lib::io);
-    registerTypes();
-
-    m_minecraft = &minecraft;    
-}
-
-void PluginsManager::registerTypes() {
-    // @note you cant just do that, because lua doesnt have access to the class in this case
-    // m_lua.set_function("subscribe", &PluginsManager::subscribe);
-
-    m_lua.set_function("subscribe", [this](std::string event, sol::protected_function func) {
-        m_callbacks[event].push_back(func);
-    });
-
-    m_lua.set_function("addCommand", [this](std::string commandName, sol::function func) {
-        m_luaCommands[commandName].push_back(func);
-    });
-
-    m_lua.new_usertype<LuaServer>(
-        "Server",
-        "sendMessage", &LuaServer::sendServerMessage
-    );
-
-    m_lua.new_usertype<LuaPlayer>(
-        "Player",
-        "getNickname", &LuaPlayer::getNickname,
-        "getPos", &LuaPlayer::getPos,
-        "setPos", &LuaPlayer::setPos,
-        "sendMessage", &LuaPlayer::sendMessage,
-        "getInventory", &LuaPlayer::getInventory,
-        "addItem", &LuaPlayer::addItem,
-        "getItem", &LuaPlayer::getItem,
-        "clearInventory", &LuaPlayer::clearInventory,
-        "getHp", &LuaPlayer::getHp,
-        "setHp", &LuaPlayer::setHp
-    );
-
-    m_lua.new_usertype<MessageEvent>(
-        "MessageEvent",
-        "setDecline", &MessageEvent::setDecline
-    );
-
-    m_lua["Server"] = &m_srv;
-}
-
-void PluginsManager::loadPlugins() {
-    std::string path = "plugins/";
-
-    if (fs::exists(path)) {
-        for (const auto& entry : fs::directory_iterator(path)) {
-            if (!fs::is_directory(entry.path().string())) {
-                m_lua.script_file(entry.path().string());        
-            }
-        }
-    } else {
-        std::filesystem::create_directory(path);
-    }
-}

src/plugins/PluginsManager.hpp

@@ -1,56 +0,0 @@
-#pragma once
-#include <unordered_map>
-#include <sol/sol.hpp>
-#include <vector>
-#include <iostream>
-#include <plugins/LuaServer.hpp>
-#include <raknet/RakNetTypes.h>
-
-class Minecraft;
-
-class PluginsManager {
-public:
-    static inline PluginsManager& get() {
-        static PluginsManager inst;
-        return inst;
-    }
-
-    void init(Minecraft& minecraft);
-
-    void registerTypes();
-
-    void loadPlugins();
-
-    sol::state& getLua() { return m_lua; }
-
-    // @ai @note maybe we should rewrite it...
-    // problem that i dont know how to pass args in sol::function dynamically
-    // so i used ai
-    // sry :(
-    template<typename... Args>
-    void emit(std::string event, Args&&... args) {
-        auto it = m_callbacks.find(event);
-
-        if (it == m_callbacks.end()) return;
-
-        for (auto& callback : it->second) {
-            sol::protected_function_result result = callback(std::forward<Args>(args)...);
-
-            if (!result.valid()) {
-                sol::error err = result;
-                std::cout << err.what() << std::endl;
-            }
-        }
-    }  
-
-    int emitCommands(std::string command, const RakNet::RakNetGUID& source);
-    
-    Minecraft* getMinecraft() { return m_minecraft; }
-private:
-    std::unordered_map<std::string, std::vector<sol::function>> m_callbacks;
-    std::unordered_map<std::string, std::vector<sol::function>> m_luaCommands;
-
-    LuaServer  m_srv;
-    sol::state m_lua;
-    Minecraft* m_minecraft;
-};

src/raknet/Rand.cpp

@@ -142,8 +142,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 	// so-- that's why the only change I made is to restrict to odd seeds.
 	//
 
-	unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
-	int j;
+	register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
+	register int j;
 
 	for ( left = 0, *s++ = x, j = N; --j;
 		*s++ = ( x *= 69069U ) & 0xFFFFFFFFU )
@@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 
 unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left )
 {
-	unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
-	int j;
+	register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
+	register int j;
 
 	if ( left < -1 )
 		seedMT( 4357U );

src/server/ArgumentsSettings.cpp

@@ -17,11 +17,6 @@ ArgumentsSettings::ArgumentsSettings(int numArguments, char** arguments)
 				levelName = std::string(arguments[a+1]);
 				a++; // Skip the next argument since it's part of this one.
 			}
-		} else if(strcmp(arguments[a], "--gamemode") == 0) {
-			if(a + 1 < numArguments) {
-				gamemode = std::string(arguments[a+1]);
-				a++; // Skip the next argument since it's part of this one.
-			}
 		} else if(strcmp(arguments[a], "--leveldir") == 0) {
 			if(a + 1 < numArguments) {
 				levelDir = std::string(arguments[a+1]);
@@ -56,9 +51,6 @@ std::string ArgumentsSettings::getServerKey() {
 std::string ArgumentsSettings::getCachePath() {
 	return cachePath;
 }
-std::string ArgumentsSettings::getGamemode() {
-	return gamemode;
-}
 std::string ArgumentsSettings::getLevelDir() {
 	return levelDir;
 }