FIX: Completely remove duplicate renderSky() codeblock

.github/workflows/build.yml

@@ -60,16 +60,13 @@ jobs:
 
       - name: Build
         working-directory: ${{github.workspace}}/build
-        run: |
+        run: cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
-          cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
-          cmake --build . --config $BUILD_TYPE --target MinecraftPE-server --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
@@ -302,12 +299,6 @@ jobs:
         with:
           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
@@ -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

@@ -111,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"
@@ -149,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"
@@ -214,7 +216,6 @@ file(GLOB SERVER_SOURCES
     "src/world/level/tile/entity/*.cpp"
 
     "src/world/phys/HitResult.cpp"
-    "src/commands/*.cpp"
 ) 
 
 file(GLOB CLIENT_SOURCES 
@@ -298,8 +299,6 @@ file(GLOB CLIENT_SOURCES
 
     "src/AppPlatform_glfw.cpp"
     "src/main.cpp"
-
-    "src/commands/*.cpp"
 )
 
 if (${PLATFORM} STREQUAL "Desktop")
@@ -307,23 +306,21 @@ if (${PLATFORM} STREQUAL "Desktop")
 endif()
 
 # Server
-add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
+if(UNIX)
+    add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
 
-target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
+    target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
 
-target_include_directories("${PROJECT_NAME}-server" PUBLIC 
+    target_include_directories("${PROJECT_NAME}-server" PUBLIC 
-    "${CMAKE_SOURCE_DIR}/src/"
+        "${CMAKE_SOURCE_DIR}/src/"
-    "project/lib_projects/raknet/jni/RaknetSources"
+        "project/lib_projects/raknet/jni/RaknetSources"
-)
+    )
 
-target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS})
+    target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT})
+endif()
 
 add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
 
-if(WIN32) 
-    target_sources(${PROJECT_NAME} PRIVATE data/images/pe.rc)
-endif()
-
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP})
 
 target_include_directories(${PROJECT_NAME} PUBLIC 

README.md

@@ -1,6 +1,6 @@
 # MinecraftPE
 > [!Warning]
-> [Github repository](https://github.com/Minecraft-PE-0-6-1/minecraft-pe-0.6.1-on-all) **isnt main**. All issues and pull requests should be send in [Gitea Repository](https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1).
+> Github repository **isnt main**. All issues and pull requests should be send in [Gitea Repository](https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1).
 
 > [!Important]
 > We have a discord server, where you can report bugs or send feedback https://discord.gg/c58YesBxve
@@ -9,20 +9,23 @@ Source code for **Minecraft Pocket Edition 0.6.1 alpha** with various fixes and
 
 This project aims to preserve and improve this early version of Minecraft PE.
 
-# Features
+# TODO / Roadmap
-- Support for modern IOS and Android, Linux, Web
+- [x] Add platform GLFW
-- Improved Dedicated Server (Windows build, anticheat, commands, etc)
+- [x] Compile for Linux
-- Features from Beta version of Minecraft (Grass tint, Beta sky, Smooth lighting, etc) and other tweaks
+- [x] Compile for android aarch64
-
+    - [x] Touch control improvements
-# Screenshots
+    - [ ] Screen fixes
-<p align="center">
+- [ ] Rewrite platform logic
-
+- [x] Fix sound
-<img width="49%" alt="menu" src="https://sffempire.ru/mcpe-screenshots/menu.png" />
+- [x] Do a server connection GUI
-<img width="49%" alt="settings" src="https://sffempire.ru/mcpe-screenshots/settings.png" />
+- [ ] Controller support
-<img width="49%" alt="worlds" src="https://sffempire.ru/mcpe-screenshots/worlds.png" />
+- [x] Minecraft server hosting
-<img width="49%" alt="gameplay" src="https://sffempire.ru/mcpe-screenshots/gameplay.png" />
+- [x] Screen fixess
-
+- [x] Fix fog
-</p>
+- [x] Add sprinting
+- [x] Chat (semi working) and commands
+- [x] Implementing options
+- [x] Better F3
 
 # Build
 
@@ -76,14 +79,8 @@ cmake --build .
    ```
    C:\android-ndk-r14b
    ```
-3. Install **Build tools 35** with [SDKManager](https://dl.google.com/android/repository/commandlinetools-win-15859902_latest.zip) (build-tools should be in AppData):
 
-```powershell
+3. Run the build script:
-sdkmanager "build-tools;35.0.0" --sdk_root="%LocalAppData%\Android\Sdk"
-sdkmanager "build-tools;android-36" --sdk_root="%LocalAppData%\Android\Sdk"
-```
-
-4. Run the build script:
 
 ```powershell
 # Full build (NDK + Java + APK + install)
@@ -157,6 +154,7 @@ sdkmanager "build-tools;android-36" --sdk_root="%LocalAppData%\Android\Sdk"
 
    ```bash
    35.0.0
+   33.0.2
    ```
 
 6. Download **Android NDK r14b**:  
@@ -202,7 +200,7 @@ sdkmanager "build-tools;android-36" --sdk_root="%LocalAppData%\Android\Sdk"
    ```
 ## iOS
 ### Xcode
-> [!Note]
+> [Note!]
 > There's a precompiled IPA artifact in the GitHub mirror under Actions for those who either don't have Macs or don't want to build themself. But if you want to build youself, you'll need a Mac with Xcode. Download Xcode from the Mac App Store.
 
 ### 1. Clone

data/images/pe.rc

@@ -1 +0,0 @@
-IDI_ICON1 ICON "pe.ico"

data/lang/en_US.lang

@@ -161,18 +161,6 @@ options.fogType.vanilla=Vanilla
 options.fogType.java=Beta Java
 options.fogType.unused=Unused
 
-options.debugStyle=Debug Menu Style
-options.debugStyle.javaBeta=Java Beta
-options.debugStyle.custom=Custom
-
-options.beautifulSky=Beautiful Skies
-
-options.useVignette=Vignette Overlay
-
-options.tintedSide=Tint Grass Sides
-
-options.betaSky=Java Beta Sky
-
 options.restoredAnims=Restored Animations
 
 options.normalLighting=Java Beta/Normals Shading
@@ -229,12 +217,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/iosproj/minecraftpe.xcodeproj/project.pbxproj

@@ -47,8 +47,6 @@
 		9D293CE816071C08000305C8 /* CreateNewWorld_iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D293CE616071C08000305C8 /* CreateNewWorld_iphone.xib */; };
 		9D293CEB160720D6000305C8 /* worldname_iphone5_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D293CEA160720D6000305C8 /* worldname_iphone5_3.png */; };
 		9D293CEC160720D6000305C8 /* worldname_iphone5_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D293CEA160720D6000305C8 /* worldname_iphone5_3.png */; };
-		BEEF202614CFF670005F0002 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
-		BEEF202614CFF670005F0003 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
 		D506D3E2161288BD0099FA65 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D959AFF16036BEE00E23A6F /* Default-568h@2x.png */; };
 		D51DC73614581D4E00E3D761 /* itemframe.png in Resources */ = {isa = PBXBuildFile; fileRef = D51DC73514581D4E00E3D761 /* itemframe.png */; };
 		D51DC74314592B8B00E3D761 /* PVRTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = D51DC74214592B8A00E3D761 /* PVRTexture.m */; };
@@ -1181,19 +1179,8 @@
 		F99F0FAD2F8436CE00F2B29A /* FoliageColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */; };
 		F99F0FAF2F8436EB00F2B29A /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAE2F8436EB00F2B29A /* Color.cpp */; };
 		F99F0FB02F8436EB00F2B29A /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAE2F8436EB00F2B29A /* Color.cpp */; };
-		F9E5A772300E7A8700164066 /* LevelConstants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A771300E7A8700164066 /* LevelConstants.cpp */; };
+		BEEF202614CFF670005F0002 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
-		F9E5A775300E7AB700164066 /* CommandManager.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A773300E7AB700164066 /* CommandManager.hpp */; };
+		BEEF202614CFF670005F0003 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
-		F9E5A776300E7AB700164066 /* CommandManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A774300E7AB700164066 /* CommandManager.cpp */; };
-		F9E5A779300E7AD500164066 /* CommandBan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A777300E7AD500164066 /* CommandBan.cpp */; };
-		F9E5A77A300E7AD500164066 /* CommandBan.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A778300E7AD500164066 /* CommandBan.hpp */; };
-		F9E5A77D300E7AF400164066 /* CommandHelp.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A77B300E7AF400164066 /* CommandHelp.hpp */; };
-		F9E5A77E300E7AF400164066 /* CommandHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A77C300E7AF400164066 /* CommandHelp.cpp */; };
-		F9E5A783300E7B0B00164066 /* CommandKick.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A77F300E7B0A00164066 /* CommandKick.hpp */; };
-		F9E5A784300E7B0B00164066 /* CommandOp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A780300E7B0A00164066 /* CommandOp.cpp */; };
-		F9E5A785300E7B0B00164066 /* CommandKick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A781300E7B0B00164066 /* CommandKick.cpp */; };
-		F9E5A786300E7B0B00164066 /* CommandOp.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A782300E7B0B00164066 /* CommandOp.hpp */; };
-		F9E5A789300E7B3400164066 /* Command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A787300E7B3400164066 /* Command.cpp */; };
-		F9E5A78A300E7B3400164066 /* Command.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A788300E7B3400164066 /* Command.hpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -1261,7 +1248,6 @@
 		9D293CE616071C08000305C8 /* CreateNewWorld_iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CreateNewWorld_iphone.xib; path = minecraftpe/dialogs/CreateNewWorld_iphone.xib; sourceTree = "<group>"; };
 		9D293CEA160720D6000305C8 /* worldname_iphone5_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = worldname_iphone5_3.png; sourceTree = "<group>"; };
 		9D959AFF16036BEE00E23A6F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
-		BEEF202614CFF670005F0001 /* Lighting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lighting.cpp; sourceTree = "<group>"; };
 		D51A8B01146A200000E5D720 /* minecraftpedemo-info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "minecraftpedemo-info.plist"; sourceTree = "<group>"; };
 		D51DC73514581D4E00E3D761 /* itemframe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = itemframe.png; sourceTree = "<group>"; };
 		D51DC74114592B8A00E3D761 /* PVRTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRTexture.h; sourceTree = "<group>"; };
@@ -2482,19 +2468,7 @@
 		F99F0FA82F84369F00F2B29A /* GrassColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GrassColor.cpp; sourceTree = "<group>"; };
 		F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FoliageColor.cpp; sourceTree = "<group>"; };
 		F99F0FAE2F8436EB00F2B29A /* Color.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
-		F9E5A771300E7A8700164066 /* LevelConstants.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LevelConstants.cpp; path = ../../src/world/level/LevelConstants.cpp; sourceTree = "<group>"; };
+		BEEF202614CFF670005F0001 /* Lighting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Lighting.cpp; path = Lighting.cpp; sourceTree = "<group>"; };
-		F9E5A773300E7AB700164066 /* CommandManager.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandManager.hpp; path = ../../src/commands/CommandManager.hpp; sourceTree = "<group>"; };
-		F9E5A774300E7AB700164066 /* CommandManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandManager.cpp; path = ../../src/commands/CommandManager.cpp; sourceTree = "<group>"; };
-		F9E5A777300E7AD500164066 /* CommandBan.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandBan.cpp; path = ../../src/commands/CommandBan.cpp; sourceTree = "<group>"; };
-		F9E5A778300E7AD500164066 /* CommandBan.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandBan.hpp; path = ../../src/commands/CommandBan.hpp; sourceTree = "<group>"; };
-		F9E5A77B300E7AF400164066 /* CommandHelp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandHelp.hpp; path = ../../src/commands/CommandHelp.hpp; sourceTree = "<group>"; };
-		F9E5A77C300E7AF400164066 /* CommandHelp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandHelp.cpp; path = ../../src/commands/CommandHelp.cpp; sourceTree = "<group>"; };
-		F9E5A77F300E7B0A00164066 /* CommandKick.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandKick.hpp; path = ../../src/commands/CommandKick.hpp; sourceTree = "<group>"; };
-		F9E5A780300E7B0A00164066 /* CommandOp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandOp.cpp; path = ../../src/commands/CommandOp.cpp; sourceTree = "<group>"; };
-		F9E5A781300E7B0B00164066 /* CommandKick.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandKick.cpp; path = ../../src/commands/CommandKick.cpp; sourceTree = "<group>"; };
-		F9E5A782300E7B0B00164066 /* CommandOp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandOp.hpp; path = ../../src/commands/CommandOp.hpp; sourceTree = "<group>"; };
-		F9E5A787300E7B3400164066 /* Command.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Command.cpp; path = ../../src/commands/Command.cpp; sourceTree = "<group>"; };
-		F9E5A788300E7B3400164066 /* Command.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = Command.hpp; path = ../../src/commands/Command.hpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -4345,19 +4319,6 @@
 		D5CF9C37144C225000E4244F = {
 			isa = PBXGroup;
 			children = (
-				F9E5A788300E7B3400164066 /* Command.hpp */,
-				F9E5A787300E7B3400164066 /* Command.cpp */,
-				F9E5A77F300E7B0A00164066 /* CommandKick.hpp */,
-				F9E5A781300E7B0B00164066 /* CommandKick.cpp */,
-				F9E5A782300E7B0B00164066 /* CommandOp.hpp */,
-				F9E5A780300E7B0A00164066 /* CommandOp.cpp */,
-				F9E5A77B300E7AF400164066 /* CommandHelp.hpp */,
-				F9E5A77C300E7AF400164066 /* CommandHelp.cpp */,
-				F9E5A778300E7AD500164066 /* CommandBan.hpp */,
-				F9E5A777300E7AD500164066 /* CommandBan.cpp */,
-				F9E5A773300E7AB700164066 /* CommandManager.hpp */,
-				F9E5A774300E7AB700164066 /* CommandManager.cpp */,
-				F9E5A771300E7A8700164066 /* LevelConstants.cpp */,
 				F99D344D2F7372A100DC153E /* Launch Screen.storyboard */,
 				D5E1BA9A1451C8A0007DCC4F /* Default@2x.png */,
 				9D959AFF16036BEE00E23A6F /* Default-568h@2x.png */,
@@ -5490,19 +5451,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F9E5A789300E7B3400164066 /* Command.cpp in Sources */,
-				F9E5A78A300E7B3400164066 /* Command.hpp in Sources */,
-				F9E5A783300E7B0B00164066 /* CommandKick.hpp in Sources */,
-				F9E5A784300E7B0B00164066 /* CommandOp.cpp in Sources */,
-				F9E5A785300E7B0B00164066 /* CommandKick.cpp in Sources */,
-				F9E5A786300E7B0B00164066 /* CommandOp.hpp in Sources */,
-				F9E5A77D300E7AF400164066 /* CommandHelp.hpp in Sources */,
-				F9E5A77E300E7AF400164066 /* CommandHelp.cpp in Sources */,
-				F9E5A779300E7AD500164066 /* CommandBan.cpp in Sources */,
-				F9E5A77A300E7AD500164066 /* CommandBan.hpp in Sources */,
-				F9E5A775300E7AB700164066 /* CommandManager.hpp in Sources */,
-				F9E5A776300E7AB700164066 /* CommandManager.cpp in Sources */,
-				F9E5A772300E7A8700164066 /* LevelConstants.cpp in Sources */,
 				F912B8CF2F6C3D5200BC60DF /* TextBox.h in Sources */,
 				D5CF9C57144C225000E4244F /* main.mm in Sources */,
 				D5CF9C5B144C225000E4244F /* minecraftpeAppDelegate.mm in Sources */,

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();
 

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/SharedConstants.cpp

@@ -4,11 +4,12 @@ namespace Common {
 
 std::string getGameVersionString(const std::string& versionSuffix /* = "" */)
 {
-	std::string result = std::string("v0.1.0 (forked from v0.6.1 alpha)") + versionSuffix;
+	std::string result = std::string("v0.6.1") + versionSuffix;
 	// append 64-bit port marker only on Android 64‑bit targets
 	#if defined(ANDROID) && (defined(__aarch64__) || defined(__x86_64__))
-		result += " (64-bit)";
+		result += " (64-bit port)";
 	#endif
+	result += " alpha";
 	return result;
 }
 

src/client/Minecraft.h

@@ -2,7 +2,6 @@
 #define NET_MINECRAFT_CLIENT__Minecraft_H__
 
 #include "Options.h"
-#include "commands/CommandManager.hpp"
 #ifndef STANDALONE_SERVER
 #include "MouseHandler.h"
 #include "gui/Gui.h"
@@ -88,14 +87,6 @@ public:
 
 	void update();
 
-	 std::string  gatherStats1();
-
-	 std::string  gatherStats2();
-
-     std::string  gatherStats4();
-
-     std::string  gatherStats3();
-
 	void tick(int nTick, int maxTick);
 	void tickInput();
 
@@ -129,17 +120,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();
 
@@ -212,8 +197,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;
 
@@ -241,8 +225,6 @@ private:
 
 	PerfRenderer* _perfRenderer;
 	CommandServer* _commandServer;
-
-	CommandManager m_commandManager;
 };
 
 #endif /*NET_MINECRAFT_CLIENT__Minecraft_H__*/

src/client/Options.cpp

@@ -58,30 +58,20 @@ OptionBool ambientOcclusion("ao", true);
 
 OptionBool useNormalLighting("normalLighting", true);
 
-OptionBool beautifulSky("beautifulSky", true);
-
-OptionBool useVignette("useVignette", true);
-
 OptionBool useTouchscreen("useTouchscreen", true);
 
 OptionBool serverVisible("servervisible", true);
-OptionBool foliageTint("foliagetint", false);
+
+OptionBool foliageTint("foliagetint", true);
+
 OptionInt fogType("fogType", 0, 0, 2);
 
 OptionBool javaHud("javaHud", false);
 
-OptionBool betaSky("betaSky", false);
-OptionBool tintedSide("tintedSide", false);
 OptionBool blockOutline("blockOutline", false);
 
 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);
@@ -134,7 +124,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;
@@ -161,18 +150,12 @@ void Options::initTable() {
 
 	m_options[OPTIONS_BLOCK_OUTLINE] = &blockOutline;
 
-	m_options[OPTIONS_VIGNETTE] = &useVignette;
-
-	m_options[OPTIONS_BEAUTIFUL_SKY] = &beautifulSky;
-
 	m_options[OPTIONS_NORMAL_LIGHTING] = &useNormalLighting;
 
 	m_options[OPTIONS_RESTORED_ANIMS] = &restoredAnims;
 
     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;
@@ -196,13 +179,10 @@ void Options::initTable() {
 	m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint;
 	m_options[OPTIONS_RPI_CURSOR] = &rpiCursor;
 	m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint;
+
 	// more options yay
 	m_options[OPTIONS_FOG_TYPE] = &fogType;
 
-	m_options[OPTIONS_DEBUG_STYLE] = &debugStyle;
-
-	m_options[OPTIONS_BETA_SKY] = &betaSky;
-	m_options[OPTIONS_TINTED_SIDE] = &tintedSide;
 	m_options[OPTIONS_JAVA_HUD] = &javaHud;
 
 	m_options[OPTIONS_AUTOJUMP] = &autoJump;

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,
@@ -89,16 +87,9 @@ enum OptionId {
 
     OPTIONS_RPI_CURSOR,
 	OPTIONS_FOLIAGE_TINT,
-    OPTIONS_FOG_TYPE,
+	OPTIONS_FOG_TYPE,
 	OPTIONS_JAVA_HUD,
 	OPTIONS_RESTORED_ANIMS,
-	OPTIONS_TINTED_SIDE,
-	OPTIONS_BETA_SKY,
-	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,
+		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ);
-		player->bb.x0, player->bb.y0, player->bb.z0, player->bb.x1, player->bb.y1, player->bb.z1);
-
 		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,
+		UseItemPacket packet(item, player->entityId, player->aimDirection);
-		player->bb.x0, player->bb.y0, player->bb.z0, player->bb.x1, player->bb.y1, player->bb.z1);
 		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

@@ -7,7 +7,6 @@
 #include "screens/ConsoleScreen.h"
 #include "../Minecraft.h"
 #include "../player/LocalPlayer.h"
-#include "../renderer/Chunk.h"
 #include "../renderer/Tesselator.h"
 #include "../renderer/TileRenderer.h"
 #include "../renderer/LevelRenderer.h"
@@ -104,10 +103,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 		}
 	}
 
-	// viginette has been fixed, was due to gl_blend not being enabled, my bad
+	// @todo - Shredder: I added this here but currently viginette is broken so i cant do much about it.
-	if (minecraft->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && minecraft->options.getBooleanValue(OPTIONS_VIGNETTE)){
+	//	if (minecraft->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)){
-			renderVignette(this->minecraft->player->getBrightness(a), screenWidth, screenHeight);
+	//		this->renderVignette(this->minecraft->player->getBrightness(a), screenWidth, screenHeight);
-		}
+	//	}
 	// shredder end
 
 	if(minecraft->player->getSleepTimer() > 0) {
@@ -122,9 +121,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
 		renderToolBar(a, ySlot, screenWidth);
 
-	//	font->drawShadow("Minecraft - Pocket Edition ", 2, 2, 0xffffffff);
-//	font->drawShadow("This is a demo, not the finished product", 2, 10 + 2, 0xffffffff);
-
 		glEnable(GL_BLEND);
 		bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
 		unsigned int max = 10;
@@ -224,59 +220,59 @@ void Gui::handleClick(int button, int x, int y) {
 	}
 }
 
-	void Gui::handleKeyPressed(int key)
+void Gui::handleKeyPressed(int key)
-	{
+{
-		bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
-		if (isChatting) {
+	if (isChatting) {
-			// Allow scrolling the chat history with the mouse/keyboard when chat is open
+		// Allow scrolling the chat history with the mouse/keyboard when chat is open
-			if (key == 38) { // VK_UP
+		if (key == 38) { // VK_UP
-				scrollChat(1);
+			scrollChat(1);
-				return;
+			return;
-			} else if (key == 40) { // VK_DOWN
+		} else if (key == 40) { // VK_DOWN
-				scrollChat(-1);
+			scrollChat(-1);
-				return;
+			return;
-			} else if (key == 33) { // VK_PRIOR (Page Up)
+		} else if (key == 33) { // VK_PRIOR (Page Up)
-				// Scroll by a page
+			// Scroll by a page
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
+			int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(maxVisible);
+			scrollChat(maxVisible);
-				return;
+			return;
-			} else if (key == 34) { // VK_NEXT (Page Down)
+		} else if (key == 34) { // VK_NEXT (Page Down)
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
+			int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(-maxVisible);
+			scrollChat(-maxVisible);
-				return;
+			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);
 		}
 	}
 
+	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;
@@ -364,7 +360,6 @@ void Gui::renderVignette(float br, int w, int h) {
 
 	glDisable(GL_DEPTH_TEST);
 	glDepthMask(false);
-	glEnable(GL_BLEND);
 	glBlendFunc2(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
 	glColor4f2(tbr, tbr, tbr, 1);
 
@@ -381,7 +376,6 @@ void Gui::renderVignette(float br, int w, int h) {
 	t.draw();
 	glDepthMask(true);
 	glEnable(GL_DEPTH_TEST);
-	glDisable(GL_BLEND);
 	glColor4f2(1, 1, 1, 1);
 	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
@@ -732,20 +726,13 @@ void Gui::onLevelGenerated() {
 
 void Gui::renderDebugInfo() {
 	// FPS counter (updates once per second)
-	static int fps = 0;
+	static float fps = 0.0f;
-	static int fpsLastTime = 0;
+	static float fpsLastTime = 0.0f;
 	static int   fpsFrames = 0;
-	static int   displayChunkUpdates = 0;
 	float now = getTimeS();
 	fpsFrames++;
-	if (now - fpsLastTime >= 1) {
+	if (now - fpsLastTime >= 1.0f) {
 		fps = fpsFrames / (now - fpsLastTime);
-
-		displayChunkUpdates = Chunk::updates;
-    
-    // 3. RESET the actual game counter to 0 for the next second
-		Chunk::updates = 0;
-
 		fpsFrames = 0;
 		fpsLastTime = now;
 	}
@@ -755,6 +742,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,70 +769,7 @@ 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;
-
-	// @todo - add our own debug screen as an option alongside the restored java one, why does renderdebug have to be so jank - shredder
-
-	// if java beta's restored debug menu is enabled
-	if (minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE) == 0){
-
-	char buf[128];
-
-	sprintf(buf, "Minecraft - Pocket Edition (%d fps, %d chunk updates)", (int)fps, displayChunkUpdates);
-	font->drawShadow(buf, 2, 2, 0xffffff);
-
-	font->drawShadow(minecraft->gatherStats1(), 2, 12, 0xFFFFFF);
-	font->drawShadow(minecraft->gatherStats2(), 2, 22, 0xFFFFFF);
-    font->drawShadow(minecraft->gatherStats3(), 2, 32, 0xFFFFFF);
-    font->drawShadow(minecraft->gatherStats4(), 2, 42, 0xFFFFFF);
-
-	sprintf(buf, "x: %.8f", minecraft->player->x);
-	drawString(font, buf, 2, 64, 0xE0E0E0);
-
-	sprintf(buf, "y: %.8f", minecraft->player->y);
-	drawString(font, buf, 2, 72, 0xE0E0E0);
-
-	sprintf(buf, "z: %.8f", minecraft->player->z);
-	drawString(font, buf, 2, 80, 0xE0E0E0);
-
-	sprintf(buf, "f: %d",Mth::floor(minecraft->player->yRot * 4.0f / 360.0f + 0.5) & 0x3);
-	drawString(font, buf, 2, 88, 0xE0E0E0);
-
-	sprintf(buf, "Seed: %.ld", lvl->getSeed());
-	drawString(font, buf, 2, 104, 0xE0E0E0);
-
-	sprintf(buf, "Dimension: %d (%s)", lvl->dimension->id, lvl->dimension->getDimension().c_str());
-	drawString(font, buf, 2, 114, 0xE0E0E0);
-
-	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){
-	
-
 	static char ln[8][96];
 	sprintf(ln[0], "Minecraft PE 0.6.1 alpha (mcpe64)");
 	sprintf(ln[1], "%.1f fps", fps);
@@ -859,8 +784,8 @@ void Gui::renderDebugInfo() {
 	const float LH  = (float)Font::DefaultLineHeight; // 10 font-pixels
 	const float MGN = 2.0f;  // left/top margin in font-pixels
 	const float PAD = 2.0f;  // horizontal padding for background
-//	Font* font = minecraft->font;
+	Font* font = minecraft->font;
-	
+
 	// 1) Draw semi-transparent background boxes behind each line
 	for (int i = 0; i < N; i++) {
 		if (ln[i][0] == '\0') continue;
@@ -882,7 +807,6 @@ void Gui::renderDebugInfo() {
 		font->draw(ln[i], MGN, y, col);
 	}
 	t.endOverrideAndDraw();
-	}
 }
 
 void Gui::renderPlayerList(Font* font, int screenWidth, int screenHeight) {

src/client/gui/components/GuiElementContainer.cpp

@@ -35,17 +35,6 @@ void GuiElementContainer::removeChild( GuiElement* element ) {
 		children.erase(it);
 }
 
-bool GuiElementContainer::containsPointInChildren(int x, int y) const {
-	for (auto 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

@@ -5,17 +5,16 @@
 class Tesselator;
 class Minecraft;
 
-class GuiElementContainer : public GuiElement {
+class GuiElementContainer : public GuiElement {
-public:
+public:
-	GuiElementContainer(bool active=false, bool visible=true, int x = 0, int y = 0, int width=24, int height=24);
+	GuiElementContainer(bool active=false, bool visible=true, int x = 0, int y = 0, int width=24, int height=24);
-    virtual ~GuiElementContainer();
+    virtual ~GuiElementContainer();
-    virtual void render(Minecraft* minecraft, int xm, int ym);
+    virtual void render(Minecraft* minecraft, int xm, int ym);
-	virtual void setupPositions();
+	virtual void setupPositions();
-	virtual void addChild(GuiElement* element);
+	virtual void addChild(GuiElement* element);
-	virtual void removeChild(GuiElement* element);
+	virtual void removeChild(GuiElement* element);
-	bool containsPointInChildren(int x, int y) const;
+
-
+	virtual void tick( Minecraft* minecraft );
-	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 );

src/client/gui/components/OptionsGroup.cpp

@@ -1,219 +1,115 @@
-#include "OptionsGroup.h"
+#include "OptionsGroup.h"
-#include "../../Minecraft.h"
+#include "../../Minecraft.h"
-#include "ImageButton.h"
+#include "ImageButton.h"
-#include "OptionsItem.h"
+#include "OptionsItem.h"
-#include "Slider.h"
+#include "Slider.h"
-#include "../../../locale/I18n.h"
+#include "../../../locale/I18n.h"
-#include "TextOption.h"
+#include "TextOption.h"
-#include "KeyOption.h"
+#include "KeyOption.h"
-#include <algorithm>
+
-#include "../Gui.h"
+OptionsGroup::OptionsGroup( std::string labelID )  {
-#include "../Screen.h"
+	label = I18n::get(labelID);
-#include "../../../platform/input/Mouse.h"
+}
-#include "../../../util/Mth.h"
+
-
+void OptionsGroup::setupPositions() {
-OptionsGroup::OptionsGroup( std::string labelID ) {
+	// First we write the header and then we add the items
-	label = I18n::get(labelID);
+	int curY = y + 18;
-}
+	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
-
+		(*it)->width = width - 5;
-void OptionsGroup::setupPositions() {
+		
-	const int labelHeight = 18;
+		(*it)->y = curY;
-	const int bottomPadding = 36;
+		(*it)->x = x + 10;
-	const float requestedScroll = scrollOffsetY;
+		(*it)->setupPositions();
-	const int scrollOffset = (int)requestedScroll;
+		curY += (*it)->height + 3;
-	int curY = y + labelHeight - scrollOffset;
+	}
-	const int contentStartY = y + labelHeight;
+	height = curY;
-
+}
-	// First we write the header and then we add the items
+
-	for(auto it = children.begin(); it != children.end(); ++it) {
+void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
-		(*it)->width = width - 5;
+	float padX = 10.0f;
-		
+	float padY = 5.0f;
-		(*it)->y = curY;
+	
-		(*it)->x = x + 10;
+	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
-		(*it)->setupPositions();
+
-		curY += (*it)->height + 3;
+	super::render(minecraft, xm, ym);
-	}
+}
-	curY += bottomPadding;
+
-	contentHeight = std::max(0, curY - contentStartY + scrollOffset);
+OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {
-	maxScrollOffsetY = std::max(0, contentHeight - (height - labelHeight));
+	auto option = minecraft->options.getOpt(optId);
-	const float clampedScroll = Mth::clamp(requestedScroll, 0.0f, maxScrollOffsetY);
+
-	if (clampedScroll != requestedScroll) {
+	if (option == nullptr) return *this;
-		scrollOffsetY = clampedScroll;
+
-		setupPositions();
+	// TODO: do a options key class to check it faster via dynamic_cast
-	}
+	if (option->getStringId().find("options.key") != std::string::npos) createKey(optId, minecraft);
-}
+	else if (dynamic_cast<OptionBool*>(option)) createToggle(optId, minecraft);
-
+	else if (dynamic_cast<OptionFloat*>(option)) createProgressSlider(optId, minecraft);
-void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
+	else if (dynamic_cast<OptionInt*>(option)) createStepSlider(optId, minecraft);
-	float padX = 10.0f;
+	else if (dynamic_cast<OptionString*>(option)) createTextbox(optId, minecraft);
-	float padY = 5.0f;
+
-	const int labelHeight = 18;
+	return *this;
-	
+}
-	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
+
-
+// TODO: wrap this copypaste shit into templates
-	glEnable2(GL_SCISSOR_TEST);
+
-	glScissor(
+void OptionsGroup::createToggle(OptionId optId, Minecraft* minecraft ) {
-		Gui::GuiScale * x,
+	ImageDef def;
-		minecraft->height - Gui::GuiScale * (y + height),
+
-		Gui::GuiScale * width,
+	def.setSrc(IntRectangle(160, 206, 39, 20));
-		Gui::GuiScale * (height - labelHeight)
+	def.name = "gui/touchgui.png";
-	);
+	def.width = 39 * 0.7f;
-
+	def.height = 20 * 0.7f;
-	super::render(minecraft, xm, ym);
+	
-	glDisable2(GL_SCISSOR_TEST);
+	OptionButton* element = new OptionButton(optId);
-}
+	element->setImageDef(def, true);
-
+	element->updateImage(&minecraft->options);
-void OptionsGroup::tick(Minecraft* minecraft) {
+	
-	int xm = Mouse::getX();
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	int ym = Mouse::getY();
+	
-	if (minecraft->screen != NULL) {
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-		minecraft->screen->toGUICoordinate(xm, ym);
+	
-	}
+	addChild(item);
-
+	setupPositions();
-	bool leftDown = Mouse::isButtonDown(MouseAction::ACTION_LEFT);
+}
-
+
-	if (trackingScrollGesture && leftDown) {
+void OptionsGroup::createProgressSlider(OptionId optId, Minecraft* minecraft ) {
-		int dy = ym - lastDragY;
+	Slider* element = new SliderFloat(minecraft, optId);
-		int dx = xm - dragStartX;
+	element->width = 100;
-		if (!scrollingGesture) {
+	element->height = 20;
-			int totalDx = xm - dragStartX;
+
-			int totalDy = ym - dragStartY;
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-			if (std::abs(totalDx) >= ScrollStartThreshold || std::abs(totalDy) >= ScrollStartThreshold) {
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-				if (std::abs(totalDy) >= std::abs(totalDx)) {
+	addChild(item);
-					scrollingGesture = true;
+	setupPositions();
-				} else if (!touchDispatched) {
+}
-					super::mouseClicked(minecraft, touchStartX, touchStartY, MouseAction::ACTION_LEFT);
+
-					touchDispatched = true;
+void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
-				}
+	Slider* element = new SliderInt(minecraft, optId);
-			}
+	element->width = 100;
-		}
+	element->height = 20;
-		if (scrollingGesture && dy != 0) {
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-			scrollByPixels((float)dy);
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-		}
+	addChild(item);
-		lastDragY = ym;
+	setupPositions();
-	}
+}
-	super::tick(minecraft);
+
-}
+void OptionsGroup::createTextbox(OptionId optId, Minecraft* minecraft) {
-
+	TextBox* element = new TextOption(minecraft, optId);
-void OptionsGroup::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
+	element->width = 100;
-	trackingScrollGesture = false;
+	element->height = 20;
-	scrollingGesture = false;
+
-	touchDispatched = false;
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	if (buttonNum == MouseAction::ACTION_LEFT && pointInside(x, y)) {
+	addChild(item);
-		trackingScrollGesture = true;
+	setupPositions();
-		dragStartX = x;
+}
-		dragStartY = y;
+
-		lastDragY = y;
+void OptionsGroup::createKey(OptionId optId, Minecraft* minecraft) {
-		touchStartX = x;
+	KeyOption* element = new KeyOption(minecraft, optId);
-		touchStartY = y;
+	element->width = 50;
-		return;
+	element->height = 20;
-	}
+
-
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	super::mouseClicked(minecraft, x, y, buttonNum);
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-}
+	addChild(item);
-
+	setupPositions();
-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 ) {
-	auto option = minecraft->options.getOpt(optId);
-
-	if (option == nullptr) return *this;
-
-	// TODO: do a options key class to check it faster via dynamic_cast
-	if (option->getStringId().find("options.key") != std::string::npos) createKey(optId, minecraft);
-	else if (dynamic_cast<OptionBool*>(option)) createToggle(optId, minecraft);
-	else if (dynamic_cast<OptionFloat*>(option)) createProgressSlider(optId, minecraft);
-	else if (dynamic_cast<OptionInt*>(option)) createStepSlider(optId, minecraft);
-	else if (dynamic_cast<OptionString*>(option)) createTextbox(optId, minecraft);
-
-	return *this;
-}
-
-// TODO: wrap this copypaste shit into templates
-
-void OptionsGroup::createToggle(OptionId optId, Minecraft* minecraft ) {
-	ImageDef def;
-
-	def.setSrc(IntRectangle(160, 206, 39, 20));
-	def.name = "gui/touchgui.png";
-	def.width = 39 * 0.7f;
-	def.height = 20 * 0.7f;
-	
-	OptionButton* element = new OptionButton(optId);
-	element->setImageDef(def, true);
-	element->updateImage(&minecraft->options);
-	
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	
-	addChild(item);
-	setupPositions();
-}
-
-void OptionsGroup::createProgressSlider(OptionId optId, Minecraft* minecraft ) {
-	Slider* element = new SliderFloat(minecraft, optId);
-	element->width = 100;
-	element->height = 20;
-
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	addChild(item);
-	setupPositions();
-}
-
-void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
-	Slider* element = new SliderInt(minecraft, optId);
-	element->width = 100;
-	element->height = 20;
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	addChild(item);
-	setupPositions();
-}
-
-void OptionsGroup::createTextbox(OptionId optId, Minecraft* minecraft) {
-	TextBox* element = new TextOption(minecraft, optId);
-	element->width = 100;
-	element->height = 20;
-
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	addChild(item);
-	setupPositions();
-}
-
-void OptionsGroup::createKey(OptionId optId, Minecraft* minecraft) {
-	KeyOption* element = new KeyOption(minecraft, optId);
-	element->width = 50;
-	element->height = 20;
-
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	addChild(item);
-	setupPositions();
-}

src/client/gui/components/OptionsGroup.h

@@ -1,49 +1,32 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
+#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
+#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
-
+
-//package net.minecraft.client.gui;
+//package net.minecraft.client.gui;
-
+
-#include <string>
+#include <string>
-#include "GuiElementContainer.h"
+#include "GuiElementContainer.h"
-#include "ScrollingPane.h"
+#include "ScrollingPane.h"
-#include "../../Options.h"
+#include "../../Options.h"
-
+
-class Font;
+class Font;
-class Minecraft;
+class Minecraft;
-
+
-class OptionsGroup: public GuiElementContainer {
+class OptionsGroup: public GuiElementContainer {
-	typedef GuiElementContainer super;
+	typedef GuiElementContainer super;
-public:
+public:
-	OptionsGroup(std::string labelID);
+	OptionsGroup(std::string labelID);
-	virtual void setupPositions();
+	virtual void setupPositions();
-	virtual void render(Minecraft* minecraft, int xm, int ym);
+	virtual void render(Minecraft* minecraft, int xm, int ym);
-	virtual void tick(Minecraft* minecraft);
+	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
-	virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum);
+protected:
-	virtual void mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum);
+
-	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
+	void createToggle(OptionId optId, Minecraft* minecraft);
-	void scrollByPixels(float deltaY);
+	void createProgressSlider(OptionId optId, Minecraft* minecraft);
-	bool isScrollingGestureActive() const;
+	void createStepSlider(OptionId optId, Minecraft* minecraft);
-protected:
+	void createTextbox(OptionId optId, Minecraft* minecraft);
-
+	void createKey(OptionId optId, Minecraft* minecraft);
-	void createToggle(OptionId optId, Minecraft* minecraft);
+
-	void createProgressSlider(OptionId optId, Minecraft* minecraft);
+	std::string label;
-	void createStepSlider(OptionId optId, Minecraft* minecraft);
+};
-	void createTextbox(OptionId optId, Minecraft* minecraft);
+
-	void createKey(OptionId optId, Minecraft* minecraft);
+#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/
-
-	std::string label;
-	int contentHeight = 0;
-	float scrollOffsetY = 0.f;
-	float maxScrollOffsetY = 0.f;
-	bool trackingScrollGesture = false;
-	bool scrollingGesture = false;
-	bool touchDispatched = false;
-	int dragStartX = 0;
-	int dragStartY = 0;
-	int lastDragY = 0;
-	int touchStartX = 0;
-	int touchStartY = 0;
-	static const int ScrollStartThreshold = 5;
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/

src/client/gui/components/OptionsItem.cpp

@@ -36,7 +36,7 @@ void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 		}
 		text += ": " + scaleText;
 	}
-	if (m_optionId == OPTIONS_FOG_TYPE) {
+		if (m_optionId == OPTIONS_FOG_TYPE) {
 		int value = minecraft->options.getIntValue(OPTIONS_FOG_TYPE);
 		std::string scaleText;
 		switch (value) {
@@ -46,38 +46,6 @@ void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 		}
 		text += ": " + scaleText;
 	}
-	if (m_optionId == OPTIONS_DEBUG_STYLE) {
-		int value = minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE);
-		std::string scaleText;
-		switch (value) {
-		case 0: scaleText = I18n::get("options.debugStyle.javaBeta"); break;
-		case 1: scaleText = I18n::get("options.debugStyle.custom"); break;
-		case 2: scaleText = I18n::get("options.fogType.unused"); break;
-		}
-		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::string result = processCommand(_input);
-        
+        if (!result.empty())
-        std::istringstream iss(minecraft->commandManager().execute(*minecraft, *minecraft->player, _input));
+            minecraft->gui.addMessage(result);
-        for (std::string line; std::getline(iss, line); ) {
-            minecraft->gui.addMessage(line);
-        }
     } else {
-        // @ai @rewrite
+        // 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"),
+	bArmor(1, "Armor")
-	bCrafting(1, "Crafting")
 {
 }
 
@@ -44,19 +42,6 @@ void IngameBlockSelectionScreen::init()
 							(float)getSlotPosY(0) - 4,
 							(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()) {
@@ -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,7 +121,6 @@ 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();
 		}
@@ -198,7 +197,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)
@@ -225,28 +223,19 @@ 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)
 		.addOptionItem(OPTIONS_AMBIENT_OCCLUSION, minecraft)
-		.addOptionItem(OPTIONS_NORMAL_LIGHTING, minecraft)
+		.addOptionItem(OPTIONS_NORMAL_LIGHTING, minecraft);
-		.addOptionItem(OPTIONS_BEAUTIFUL_SKY, minecraft)
-		.addOptionItem(OPTIONS_VIGNETTE, minecraft);
 
 	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
-		.addOptionItem(OPTIONS_MENU_STYLE, minecraft)
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
-#ifdef __APPLE__
 		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
-		.addOptionItem(OPTIONS_TINTED_SIDE, minecraft)
-#endif
 		.addOptionItem(OPTIONS_JAVA_HUD, minecraft)
 		.addOptionItem(OPTIONS_FOG_TYPE, minecraft)
-		.addOptionItem(OPTIONS_BETA_SKY, minecraft)
+		.addOptionItem(OPTIONS_RESTORED_ANIMS, minecraft);
-		.addOptionItem(OPTIONS_RESTORED_ANIMS, minecraft)
-		.addOptionItem(OPTIONS_DEBUG_STYLE, minecraft);
 		
 }
 
@@ -264,12 +253,6 @@ 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,7 +27,6 @@ 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");
+//		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
-	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
+	} 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");
+//		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");
 	}
 
 	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)
+                #if !defined(DEMO_MODE)
-				buttons.push_back(bQuitAndSaveLocally);
+                buttons.push_back(bQuitAndSaveLocally);
-#endif
+				#endif
 			}
 		}
 	}
-#endif
+    #endif
-	//	buttons.push_back(bThirdPerson);
+//	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;
+	bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 160;
-		bQuitAndSaveLocally->width = bServerVisibility->width = 200;
+	bQuitAndSaveLocally->width = bServerVisibility->width = 160;
 
-		bContinue->x = (width - bContinue->width) / 2;
+	bContinue->x = (width - bContinue->width) / 2;
-		bContinue->y = yBase + 24 * 1;
+	bContinue->y = yBase + 32 * 1;
 
-		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
+	bOptions->x = (width - bOptions->width) / 2;
-		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 24 * 2;
+	bOptions->y = yBase + 32 * 2;
 
-		bOptions->x = (width - bOptions->width) / 2;
+	bQuit->x = (width - bQuit->width) / 2;
-		bOptions->y = yBase + 24 * 3 + 24;
+	bQuit->y = yBase + 32 * 3;
-
-		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;
 
 #if APPLE_DEMO_PROMOTION
-		bQuit->y += 16;
+    bQuit->y += 16;
 #endif
-
+    
-		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
+	bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;
+	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){
+	bJoin.active = bHost.active = bOptions.active = true;
-		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;
 
 	if (minecraft->options.getStringValue(OPTIONS_USERNAME).empty()) {
 		return; // tick() will redirect to UsernameScreen
 	}
 
-	buttons.push_back(bHost);
+	buttons.push_back(&bHost);
-	buttons.push_back(bJoin);
+	buttons.push_back(&bJoin);
 	//buttons.push_back(&bTest);
-	buttons.push_back(bQuit);
 
-	tabButtons.push_back(bHost);
+	tabButtons.push_back(&bHost);
-	tabButtons.push_back(bJoin);
+	tabButtons.push_back(&bJoin);
-	tabButtons.push_back(bQuit);
 
 	#ifndef RPI
-		buttons.push_back(bOptions);
+		buttons.push_back(&bOptions);
-		tabButtons.push_back(bOptions);
+		tabButtons.push_back(&bOptions);
 	#endif
 
-    //// add quit button (top right X icon) – match OptionsScreen style
+    // add quit button (top right X icon) – match OptionsScreen style
-    //{
+    {
-    //    ImageDef def;
+        ImageDef def;
-    //    def.name = "gui/touchgui.png";
+        def.name = "gui/touchgui.png";
-    //    def.width = 34;
+        def.width = 34;
-    //    def.height = 26;
+        def.height = 26;
-    //    def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
+        def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
-    //    bQuit.setImageDef(def, true);
+        bQuit.setImageDef(def, true);
-    //    bQuit.scaleWhenPressed = false;
+        bQuit.scaleWhenPressed = false;
-    //    buttons.push_back(&bQuit);
+        buttons.push_back(&bQuit);
-    //    // don't include in tab navigation
+        // 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;
-		int yBase = (height / 2) - 20;
 
-		bHost->y =	 yBase;
+	bHost.y =	 yBase;
-		bJoin->y =	 bHost->y + 24;
+	bJoin.y =	 bHost.y + 24 + 4;
-		bOptions->y = bJoin->y + 24;
+	bOptions.y = bJoin.y + 24 + 4;
-		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;
-	}
 
 	// Center buttons
-	bHost->x = (width - bHost->width) / 2;
+	bHost.x = (width - bHost.width) / 2;
-	bJoin->x = (width - bJoin->width) / 2;
+	bJoin.x = (width - bJoin.width) / 2;
-	bOptions->x = (width - bOptions->width) / 2;
+	bOptions.x = (width - bOptions.width) / 2;
-	bQuit->x = (width - bQuit->width) / 2;
 
-    //// position quit icon at top-right (use image-defined size)
+    // position quit icon at top-right (use image-defined size)
-    //bQuit.x = width - bQuit.width;
+    bQuit.x = width - bQuit.width;
-    //bQuit.y = 0;
+    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 bHost;
-	Button* bJoin;
+	Button bJoin;
-	Button* bOptions;
+	Button bOptions;
-	Button* bQuit; 
+	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
+            // If the recipe allows any aux-value as ingredients, first deplete
-			// aux == 0 from inventory. Since I'm not sure if this always is
+            // aux == 0 from inventory. Since I'm not sure if this always is
-			// correct, let's only do it for ingredient sandstone for now.
+            // correct, let's only do it for ingredient sandstone for now.
-			ItemInstance toRemove = req.item;
+            ItemInstance toRemove = req.item;
 
-			if (Tile::sandStone->id == req.item.id
+            if (Tile::sandStone->id == req.item.id
-			&& Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
+             && Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
-				toRemove.setAuxValue(0);
+                 toRemove.setAuxValue(0);
-				toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
+                 toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
-				toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
+                 toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
-			}
+            }
 
-			if (toRemove.count > 0) {
+            if (toRemove.count > 0) {
-				minecraft->player->inventory->removeResource(toRemove);
+                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)
+	if (modernSkin) {
-	hair.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);
+	}
 
 	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
-	
+	if (texWidth == 64 && texHeight == 64) {
-	hair.xRot = head.xRot;
+		hair.xRot = head.xRot;
-	hair.yRot = head.yRot;
+		hair.yRot = head.yRot;
-	hair.zRot = head.zRot;
+		hair.zRot = head.zRot;
-	hair.y = head.y;
+		hair.y = head.y;
-	
+	}
 
 	head.render(scale);
-	
+	if (texWidth == 64 && texHeight == 64) {
-	hair.render(scale);
+		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;
-	
+	if (texWidth == 64 && texHeight == 64) {
-	hair.yRot = head.yRot;
+		hair.yRot = head.yRot;
-	hair.xRot = head.xRot;
+		hair.xRot = head.xRot;
-	hair.zRot = head.zRot;
+		hair.zRot = head.zRot;
-	hair.y = head.y;
+		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),
+	prevForwardHeld(false)
-	xBob(0.0f),
-	yBob(0.0f),
-	xBobO(0.0f),
-	yBobO(0.0f)
 {
 	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) {
-		if (zoom != 1) {
+		glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
-			glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
+		glScalef2(zoom, zoom, 1);
-			glScalef2(zoom, zoom, 1);
+		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 * 2.0f);
-		} else {
-			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance * 2.0f);
-		}
 	} else {
-		if (zoom != 1) {
+		gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
-			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);
-		}
 	}
 
 	glMatrixMode(GL_MODELVIEW);
@@ -282,7 +272,8 @@ void GameRenderer::renderLevel(float a) {
 				screenScissorArea.w, screenScissorArea.h);
 		}
 
-
+		glEnable2(GL_FOG);
+		setupFog(1);
 
 		if (mc->options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION)) {
 			glShadeModel2(GL_SMOOTH);
@@ -295,29 +286,10 @@ void GameRenderer::renderLevel(float a) {
 		TIMER_POP_PUSH("culling");
 		mc->levelRenderer->cull(&frustum, a);
 		mc->levelRenderer->updateDirtyChunks(cameraEntity, false);
-		// this sky rendering code below was originally before the frustrum and culling stuff but sunset color breaks for some reason in that place, so i moved i after those two - shredder
-//		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) {
-			setupFog(-1);
-			TIMER_POP_PUSH("sky");
-			// @TODO - EXTREME JANK BELOW, it works but i have to do heavy cleanup here, also to test if the glfogf commands even affect fog in anyway.
-			if(mc->options.getBooleanValue(OPTIONS_BETA_SKY) && (mc->options.getIntValue(OPTIONS_VIEW_DISTANCE) < 2)){
-			levelRenderer->renderSky(a); // how java renders the sky instead of how pe doing prepareandrenderclouds.
-			} else if (!mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-			glFogf(GL_FOG_START, renderDistance  * 0.2f);
-			glFogf(GL_FOG_END, renderDistance *0.75);
 
-			glFogf(GL_FOG_START, renderDistance  * 0.6f);
+		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) {
-			glFogf(GL_FOG_END, renderDistance);
-			}
-//		}
-		glEnable2(GL_FOG);
-		setupFog(1);
-		// MCPE renders clouds using this, but this method breaks 3d clouds and also breaks 2d clouds transparency viewed from above, add as a Legacy Sky or Fast Sky option. - shredder
-		if(!mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		if(mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS)) { 
 			prepareAndRenderClouds(levelRenderer, a);
 		}
-		}
 
 		setupFog(0);
 		glEnable2(GL_FOG);
@@ -325,9 +297,7 @@ void GameRenderer::renderLevel(float a) {
 		mc->textures->loadAndBindTexture("terrain.png");
 		Lighting::turnOff();
 
-//		glDisable2(GL_ALPHA_TEST); // vanilla pe disables alpha test here, i renable it so grass side textures dont become opaque - shredder
+		glDisable2(GL_ALPHA_TEST);
-		glEnable2(GL_ALPHA_TEST); // 
-
 		glDisable2(GL_BLEND);
 		glEnable2(GL_CULL_FACE);
 		TIMER_POP_PUSH("terrain-0");
@@ -347,16 +317,13 @@ 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) {
-
-		//if (mc->options.fancyGraphics) { 
 		//    glColorMask(false, false, false, false);
 		//    int visibleWaterChunks = levelRenderer->render(cameraEntity, 1, a);
 		//    glColorMask(true, true, true, true);
@@ -398,14 +365,11 @@ void GameRenderer::renderLevel(float a) {
 		}
 
 		glDisable2(GL_FOG);
-		// Normally this is commented out, but this is how java does it and should fix both 2d/3d clouds, a
+		//
-		if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
+		//        setupFog(0);
-		       setupFog(0);
+		//        glEnable2(GL_FOG);
-		       glEnable2(GL_FOG);
+		////        levelRenderer->renderClouds(a);
-		        levelRenderer->renderClouds(a);
+		//        glDisable2(GL_FOG);
-		        glDisable2(GL_FOG);
-		}
-		// SHREDDER END
 		setupFog(1);
 
 		if (zoom == 1 && !mc->options.getBooleanValue(OPTIONS_HIDEGUI)) {
@@ -690,7 +654,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;
@@ -456,10 +443,10 @@ void ItemInHandRenderer::renderScreenEffect( float a )
 		}
 	}
 
-	     if (mc->player->isUnderLiquid(Material::water)) {
+	//     if (mc->player->isUnderLiquid(Material::water)) {
-			 mc->textures->loadAndBindTexture("misc/water.png");
+	//mc->textures->loadAndBindTexture("misc/water.png");
-	         renderWater(a);
+	//         renderWater(a);
-	     }
+	//     }
 	glEnable2(GL_ALPHA_TEST);
 }
 

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);
@@ -77,9 +76,6 @@ LevelRenderer::LevelRenderer( Minecraft* mc)
 	//for (int i = 0; i < numListsOrBuffers; ++i) printf("bufId %d: %d\t", i, chunkBuffers[i]);
 
 	glGenBuffers2(1, &skyBuffer);
-	glGenBuffers2(1, &voidBuffer);
-	glGenBuffers2(1, &starBuffer);
-	generateStars();
 	generateSky();
 #else
 	int maxChunksWidth = 1024 / CHUNK_SIZE;
@@ -98,8 +94,6 @@ LevelRenderer::~LevelRenderer()
 #ifdef OPENGL_ES
 	glDeleteBuffers(numListsOrBuffers, chunkBuffers);
 	glDeleteBuffers(1, &skyBuffer);
-	glDeleteBuffers(1, &voidBuffer);
-	glDeleteBuffers(1, &starBuffer);
 	delete[] chunkBuffers;
 #else
 	glDeleteLists(numListsOrBuffers, chunkLists);
@@ -127,25 +121,6 @@ void LevelRenderer::generateSky() {
 	}
 
 	t.end(true, skyBuffer);
-
-	yy = (float) (-16);
-	t.begin();
-
-	// pretty much the same thing as the sky one above except uses inverted values to generate the void plane. 
-
-	voidVertexCount = 0;
-	for (int xx = -s * d; xx <= s * d; xx += s) {
-		for (int zz = -s * d; zz <= s * d; zz += s) {
-			t.vertex((float) xx + 0,  yy, (float) zz + s);
-			t.vertex((float)(xx + s), yy, (float) zz + s);
-			t.vertex((float)(xx + s), yy, (float)(zz + 0));
-			t.vertex((float) xx + 0,  yy, (float)(zz + 0));
-			//LOGI("x, z: %d, %d\n", xx, zz);
-			voidVertexCount += 4;
-		}
-	}
-
-	t.end(true, voidBuffer);
 	//LOGI("skyvertexcount: %d\n", skyVertexCount);
 	//glEndList();
 }
@@ -171,6 +146,10 @@ void LevelRenderer::setLevel( Level* level )
 		level->addListener(this);
 		allChanged();
 	}
+	if (mc->options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION)) {
+		mc->useAmbientOcclusion = !mc->useAmbientOcclusion;
+		allChanged();
+	}
 }
 
 void LevelRenderer::allChanged()
@@ -185,15 +164,9 @@ void LevelRenderer::allChanged()
 
 	lastFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE);
 
-#ifndef __APPLE__
 	bool tint = mc->options.getBooleanValue(OPTIONS_FOLIAGE_TINT);
-	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
-#else 
-	bool tint = false, sideTint = false;
-#endif
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);
-	TileRenderer::setUseTint(sideTint);
 
 
 	int dist = (512 >> 3) << (3 - lastViewDistance);
@@ -342,47 +315,16 @@ int LevelRenderer::render( Mob* player, int layer, float alpha )
 		allChanged();
 	}
 
-	int currentFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE);
+	int currentFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE);
-	if (currentFogType != lastFogType) {
+	if (currentFogType != lastFogType) {
-		lastFogType = currentFogType;
+		lastFogType = currentFogType;
-
+
-		if (level && level->dimension) {
+		if (level && level->dimension) {
-			level->dimension->FogType = currentFogType; // use new fog stuff
+			level->dimension->FogType = currentFogType; // use new fog stuff
-		}
+		}
-
+
-		allChanged(); 
+		allChanged(); 
 	}
-	bool SmoothLightState = mc->options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION);
-	if (SmoothLightState != mc->useAmbientOcclusion){
-		mc->useAmbientOcclusion = SmoothLightState;
-		allChanged();
-	}
-
-
-	bool tint = mc->options.getBooleanValue(OPTIONS_FOLIAGE_TINT);
-	if (tint != LastTint) {
-		LastTint = tint;
-
-
-		FoliageColor::setUseTint(tint);
-		GrassColor::setUseTint(tint);
-
-		allChanged(); 
-	}
-
-
-	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
-
-	if (sideTint != LastSideTint) {
-		LastSideTint = sideTint;
-
-
-		TileRenderer::setUseTint(sideTint);
-
-		allChanged(); 
-	}
-
-
 
 	TIMER_PUSH("sortchunks");
 	for (int i = 0; i < 10; i++) {
@@ -571,15 +513,15 @@ void LevelRenderer::render(const AABB& b) const
 {
 	Tesselator& t = Tesselator::instance;
 
-	//	glColor4f2(1, 1, 1, 1);
+//	glColor4f2(1, 1, 1, 1);
 
-	//	textures->loadAndBindTexture("terrain.png"); // uh need to check java - shredder
+//	textures->loadAndBindTexture("terrain.png"); // uh need to check java - shredder
 
 	//t.begin();
-	//	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.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
 
-	//	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);
@@ -1067,66 +1009,13 @@ std::string LevelRenderer::gatherStats1() {
 }
 
 //
-    std::string LevelRenderer::gatherStats2() {
+//    /*public*/ std::string gatherStats2() {
-		std::stringstream ss;
+//        return "E: " + renderedEntities + "/" + totalEntities + ". B: " + culledEntities + ", I: " + ((totalEntities - culledEntities) - renderedEntities);
-		ss << "E: "<< renderedEntities << "/" << totalEntities << ". B: " << culledEntities << ", I: " << (totalEntities - culledEntities) - renderedEntities <<"\n";
+//    }
-        return ss.str();
-    }
 //
 //    int[] toRender = new int[50000];
 //    IntBuffer resultBuffer = MemoryTracker.createIntBuffer(64);
 
-   void LevelRenderer::generateStars() {
-	   // ported from java beta again,
-	   // converted the doubles into floats to be consistent, shouldnt affect much - shredder
-
-      Random random = Random(10842L);
-      Tesselator& t = Tesselator::instance;
-      t.begin();
-	  starVertexCount = 0;
-
-      for (int i = 0; i < 1500; i++) {
-         float d = random.nextFloat() * 2.0F - 1.0F;
-         float e = random.nextFloat() * 2.0F - 1.0F;
-         float f = random.nextFloat() * 2.0F - 1.0F;
-         float g = 0.25F + random.nextFloat() * 0.25F;
-         float h = d * d + e * e + f * f;
-         if (h < 1.0 && h > 0.01) {
-            h = 1.0 / Mth::sqrt(h);
-            d *= h;
-            e *= h;
-            f *= h;
-            float j = d * 100.0;
-            float k = e * 100.0;
-            float l = f * 100.0;
-            float m = Mth::atan2(d, f);
-            float n = Mth::sin(m);
-            float o = Mth::cos(m);
-            float p = Mth::atan2(Mth::sqrt(d * d + f * f), e);
-            float q = Mth::sin(p);
-            float r = Mth::cos(p);
-            float s = random.nextDouble() * Mth::PI * 2.0;
-            float t2 = Mth::sin(s);
-            float u = Mth::cos(s);
-
-            for (int v = 0; v < 4; v++) {
-               float w = 0.0;
-               float x = ((v & 2) - 1) * g;
-               float y = ((v + 1 & 2) - 1) * g;
-               float aa = x * u - y * t2;
-               float ab = y * u + x * t2;
-               float ad = aa * q + w * r;
-               float ae = w * q - aa * r;
-               float af = ae * n - ab * o;
-               float ah = ab * n + ae * o;
-               t.vertex(j + af, k + ad, l + ah);
-            }
-			starVertexCount += 4;
-         }
-      }
-
-      t.end(true, starBuffer);
-   }
 void LevelRenderer::renderSky(float alpha) {
 	if (mc->level->dimension->foggy) return;
 
@@ -1147,125 +1036,19 @@ void LevelRenderer::renderSky(float alpha) {
 	}
 	glColor4f2(sr, sg, Mth::Min(1.0f, sb), 1);
 
-	Tesselator& t = Tesselator::instance;
+	//Tesselator& t = Tesselator::instance;
-	// @TODO shredder - should not enable or disable depth mask if using legacy sky because mcpe sky rendering is awful and will render clouds above terrain
+
-	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		glDepthMask(false);
-	}
 	glEnable2(GL_FOG);
 	glColor4f2(sr, sg, sb, 1.0f);
 
 #ifdef OPENGL_ES
 	drawArrayVT(skyBuffer, skyVertexCount);
 #endif
-		glDisable(GL_FOG);
+	glEnable2(GL_TEXTURE_2D);
-	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 
-
-	// 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);
-		t.color(c[0], c[1], c[2], 0.0f);
-
-		int steps = 16;
-		for (int i = 0; i <= steps; i++)
-		{
-			float a = i * 3.1415927f * 2.0f / steps;
-			float sin = Mth::sin(a);
-			float cos = Mth::cos(a);
-			t.vertex((sin * 120.0f), (cos * 120.0f), (-cos * 40.0f * c[3]));
-		}
-
-		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);
-	glPushMatrix();
-
-	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-	glTranslatef(sc.x, sc.y, sc.z);
-	glRotatef(0.0f, 0.0f, 0.0f, 1.0f);
-	glRotatef(level->getTimeOfDay(alpha) * 360.0f, 1.0f, 0.0f, 0.0f);
-
-	float ss = 30.0f;
-
-
-		textures->loadAndBindTexture("terrain/sun.png");
-		t.begin();
-		t.vertexUV(-ss, 100.0f, -ss, 0.0f, 0.0f);
-		t.vertexUV(ss, 100.0f, -ss, 1.0f, 0.0f);
-		t.vertexUV(ss, 100.0f, ss, 1.0f, 1.0f);
-		t.vertexUV(-ss, 100.0f, ss, 0.0f, 1.0f);
-		t.draw();
-
-		ss = 20.0f;
-		textures->loadAndBindTexture("terrain/moon.png");
-		t.begin();
-		t.vertexUV(-ss, -100.0f, ss, 1.0f, 1.0f);
-		t.vertexUV(ss, -100.0f, ss, 0.0f, 1.0f);
-		t.vertexUV(ss, -100.0f, -ss, 0.0f, 0.0f);
-		t.vertexUV(-ss, -100.0f, -ss, 1.0f, 0.0f);
-		t.draw();
-	
-
-	glDisable(GL_TEXTURE_2D);
-
-	float a = level->getStarBrightness(alpha);
-	if (a > 0.0f)
-	{
-		glColor4f(a, a, a, a);
-		drawArrayVT(starBuffer, starVertexCount);
-	}
-	}
-
-	
-	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-	glDisable(GL_BLEND);
-	glEnable(GL_ALPHA_TEST);
-	glEnable(GL_FOG);
-	glPopMatrix();
-
-	// ported over void plane (the blue bottom plane seen in java) because pocket edition lacks it @TODO test if it's buggy - shredder
-
-//	glColor3f(sc.x * 0.2f + 0.04f, sc.y * 0.2f + 0.04f, sc.z * 0.6f + 0.1f);
-	glColor4f(sc.x * 0.2f + 0.04f, sc.y * 0.2f + 0.04f, sc.z * 0.6f + 0.1f, 1.0f);
-	glDisable(GL_TEXTURE_2D);
-	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		drawArrayVT(voidBuffer, voidVertexCount);
-	}
-	glEnable(GL_TEXTURE_2D);
-
-	// @TODO shredder - should not enable or disable depth mask if using legacy sky because mcpe sky rendering is awful and will render clouds above terrain
-	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		glDepthMask(true);
-	}
 }
 
 void LevelRenderer::renderClouds( float alpha ) {
 	//if (!mc->level->dimension->isNaturalDimension()) return;
-	if (mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		renderAdvancedClouds(alpha);
-		return;
-	}
 	glEnable2(GL_TEXTURE_2D);
 	glDisable(GL_CULL_FACE);
 	float yOffs = (float) (mc->player->yOld + (mc->player->y - mc->player->yOld) * alpha);
@@ -1314,195 +1097,58 @@ void LevelRenderer::renderClouds( float alpha ) {
 	glEnable(GL_CULL_FACE);
 }
 
-void LevelRenderer::renderAdvancedClouds(float alpha) {
-
-	// ported from java beta, tesselation code for the 3d clouds, renders broken if mcpe sky rendering option is used - shredder
-
-	glDisable(GL_CULL_FACE);
-
-	float px = mc->player->xOld + (mc->player->x - mc->player->xOld) * alpha;
-	float py = mc->player->yOld + (mc->player->y - mc->player->yOld) * alpha;
-	float pz = mc->player->zOld + (mc->player->z - mc->player->zOld) * alpha;
-
-	Tesselator& t = Tesselator::instance;
-	float ss = 12.0f; 
-	float h = 4.0f;  
-
-	float cloudTime = (float)ticks + alpha;
-
-	float xo = (px + cloudTime * 0.03f) / ss;
-	float zo = pz / ss + 0.33f;
-
-	float yy = 108.0f - py + 0.33f;
-
-	int xWraps = Mth::floor(xo / 2048.0);
-	int zWraps = Mth::floor(zo / 2048.0);
-	xo -= xWraps * 2048;
-	zo -= zWraps * 2048;
-
-	textures->loadAndBindTexture("environment/clouds.png");
-	glEnable(GL_BLEND);
-	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-	Vec3 cc = level->getCloudColor(alpha);
-	float cr = cc.x;
-	float cg = cc.y;
-	float cb = cc.z;
-
-	float uvScale = 1.0f / 256.0f;
-	float uo = (float)Mth::floor(xo) * uvScale;
-	float vo = (float)Mth::floor(zo) * uvScale;
-
-	float xOffs = (float)(xo - Mth::floor(xo));
-	float zOffs = (float)(zo - Mth::floor(zo));
-
-	int D = 8;      
-	int radius = 3;  
-	float e = 1.0f / 1024.0f; 
-
-	glPushMatrix();
-	glScalef(ss, 1.0f, ss);
-
-	for (int pass = 0; pass < 2; pass++) {
-
-		if (pass == 0) glColorMask(false, false, false, false);
-		else glColorMask(true, true, true, true);
-
-		for (int xPos = -radius + 1; xPos <= radius; xPos++) {
-			for (int zPos = -radius + 1; zPos <= radius; zPos++) {
-				t.begin();
-				float xx = (float)(xPos * D);
-				float zz = (float)(zPos * D);
-				float xp = xx - xOffs;
-				float zp = zz - zOffs;
-
-
-				if (yy > -h - 1.0f) {
-					t.color(cr * 0.7f, cg * 0.7f, cb * 0.7f, 0.8f);
-					t.normal(0.0f, -1.0f, 0.0f);
-					t.vertexUV(xp + 0, yy + 0, zp + D, (xx + 0) * uvScale + uo, (zz + D) * uvScale + vo);
-					t.vertexUV(xp + D, yy + 0, zp + D, (xx + D) * uvScale + uo, (zz + D) * uvScale + vo);
-					t.vertexUV(xp + D, yy + 0, zp + 0, (xx + D) * uvScale + uo, (zz + 0) * uvScale + vo);
-					t.vertexUV(xp + 0, yy + 0, zp + 0, (xx + 0) * uvScale + uo, (zz + 0) * uvScale + vo);
-				}
-
-
-				if (yy <= h + 1.0f) {
-					t.color(cr, cg, cb, 0.8f);
-					t.normal(0.0f, 1.0f, 0.0f);
-					t.vertexUV(xp + 0, yy + h - e, zp + D, (xx + 0) * uvScale + uo, (zz + D) * uvScale + vo);
-					t.vertexUV(xp + D, yy + h - e, zp + D, (xx + D) * uvScale + uo, (zz + D) * uvScale + vo);
-					t.vertexUV(xp + D, yy + h - e, zp + 0, (xx + D) * uvScale + uo, (zz + 0) * uvScale + vo);
-					t.vertexUV(xp + 0, yy + h - e, zp + 0, (xx + 0) * uvScale + uo, (zz + 0) * uvScale + vo);
-				}
-
-				t.color(cr * 0.9f, cg * 0.9f, cb * 0.9f, 0.8f);
-
-
-				if (xPos > -1) {
-					t.normal(-1.0f, 0.0f, 0.0f);
-					for (int i = 0; i < D; i++) {
-						t.vertexUV(xp + i + 0, yy + 0, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
-						t.vertexUV(xp + i + 0, yy + h, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
-						t.vertexUV(xp + i + 0, yy + h, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
-						t.vertexUV(xp + i + 0, yy + 0, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
-					}
-				}
-				if (xPos <= 1) {
-					t.normal(1.0f, 0.0f, 0.0f);
-					for (int i = 0; i < D; i++) {
-						t.vertexUV(xp + i + 1 - e, yy + 0, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
-						t.vertexUV(xp + i + 1 - e, yy + h, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
-						t.vertexUV(xp + i + 1 - e, yy + h, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
-						t.vertexUV(xp + i + 1 - e, yy + 0, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
-					}
-				}
-
-				t.color(cr * 0.8f, cg * 0.8f, cb * 0.8f, 0.8f);
-
-
-				if (zPos > -1) {
-					t.normal(0.0f, 0.0f, -1.0f);
-					for (int i = 0; i < D; i++) {
-						t.vertexUV(xp + 0, yy + h, zp + i + 0, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
-						t.vertexUV(xp + D, yy + h, zp + i + 0, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
-						t.vertexUV(xp + D, yy + 0, zp + i + 0, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
-						t.vertexUV(xp + 0, yy + 0, zp + i + 0, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
-					}
-				}
-				if (zPos <= 1) {
-					t.normal(0.0f, 0.0f, 1.0f);
-					for (int i = 0; i < D; i++) {
-						t.vertexUV(xp + 0, yy + h, zp + i + 1 - e, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
-						t.vertexUV(xp + D, yy + h, zp + i + 1 - e, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
-						t.vertexUV(xp + D, yy + 0, zp + i + 1 - e, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
-						t.vertexUV(xp + 0, yy + 0, zp + i + 1 - e, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
-					}
-				}
-				t.endOverrideAndDraw();
-			}
-		}
-	}
-
-	glPopMatrix();
-	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
-	glDisable(GL_BLEND);
-	glEnable(GL_CULL_FACE);
-}
-
 void LevelRenderer::playSound(const std::string& name, float x, float y, float z, float volume, float pitch) {
 	// @todo: deny sounds here if sound is off (rather than waiting 'til SoundEngine)
 	float dd = 16;
 
-    if (volume > 1) dd *= volume;
+	if (volume > 1) dd *= volume;
-    if (mc->cameraTargetPlayer != NULL && mc->cameraTargetPlayer->distanceToSqr(x, y, z) < dd * dd) {
+	if (mc->cameraTargetPlayer->distanceToSqr(x, y, z) < dd * dd) {
-        mc->soundEngine->play(name, x, y, z, volume, pitch);
+		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;
+	float xd = mc->cameraTargetPlayer->x - x;
-		//if (name == "hugeexplosion") p = new HugeExplosionSeedParticle(level, x, y, z, xa, ya, za);
+	float yd = mc->cameraTargetPlayer->y - y;
-		//else if (name == "largeexplode") p = new HugeExplosionParticle(textures, level, x, y, z, xa, ya, za);
+	float zd = mc->cameraTargetPlayer->z - z;
+	float distanceSquared = xd * xd + yd * yd + zd * zd;
 
-		//if (p) {
+	//Particle* p = NULL;
-		//	if (distanceSquared < 32 * 32) {
+	//if (name == "hugeexplosion") p = new HugeExplosionSeedParticle(level, x, y, z, xa, ya, za);
-		//		mc->particleEngine->add(p);
+	//else if (name == "largeexplode") p = new HugeExplosionParticle(textures, level, x, y, z, xa, ya, za);
-		//	} else { delete p; }
-		//	return;
-		//}
 
-		const float particleDistance = 16;
+	//if (p) {
-		if (distanceSquared > particleDistance * particleDistance) return;
+	//	if (distanceSquared < 32 * 32) {
+	//		mc->particleEngine->add(p);
+	//	} else { delete p; }
+	//	return;
+	//}
 
-		//static Stopwatch sw;
+	const float particleDistance = 16;
-		//sw.start();
+	if (distanceSquared > particleDistance * particleDistance) return;
 
-		if (name == "bubble") mc->particleEngine->add(new BubbleParticle(level, x, y, z, xa, ya, za));
+	//static Stopwatch sw;
-		else if (name == "crit") mc->particleEngine->add(new CritParticle2(level, x, y, z, xa, ya, za));
+	//sw.start();
-		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();
+	if (name == "bubble") mc->particleEngine->add(new BubbleParticle(level, x, y, z, xa, ya, za));
-		//sw.printEvery(50, "add-particle-string");
+	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");
 }
 
 /*
@@ -1613,7 +1259,6 @@ void LevelRenderer::renderHitSelect( Player* player, const HitResult& h, int mod
 
 void LevelRenderer::onGraphicsReset()
 {
-	generateStars();
 	generateSky();
 
 	// Get new buffers

src/client/renderer/LevelRenderer.h

@@ -43,9 +43,7 @@ public:
 	void renderDebug(const AABB& b, float a) const;
 
 	void renderSky(float alpha);
-	void generateStars();
 	void renderClouds(float alpha);
-	void renderAdvancedClouds(float alpha);
 	void renderEntities(Vec3 cam, Culler* culler, float a);
     void renderSameAsLast(int layer, float alpha);
 	void renderHit(Player* player, const HitResult& h, int mode, /*ItemInstance*/void* inventoryItem, float a);
@@ -69,7 +67,6 @@ public:
 	void levelEvent(Player* source, int type, int x, int y, int z, int data);
 
 	std::string gatherStats1();
-	std::string gatherStats2();
 
 	void render(const AABB& b) const;
 	void onGraphicsReset();
@@ -119,9 +116,6 @@ private:
 	// shredder added again...
 	int lastFogType;
 
-	bool LastTint;
-	bool LastSideTint;
-
 	int ticks;
     int starList, skyList, darkList;
 
@@ -130,12 +124,6 @@ private:
 	GLuint skyBuffer;
 	int skyVertexCount;
 
-	GLuint voidBuffer;
-	int voidVertexCount;
-
-	GLuint starBuffer;
-	int starVertexCount;
-
 //    /*public*/ std::vector<TileEntity*> renderableTileEntities;
     Textures* textures;
 //    /*private*/ TileRenderer tileRenderer;

src/client/renderer/TileRenderer.cpp

@@ -19,10 +19,8 @@
 #include "tileentity/TileEntityRenderer.h"
 #include "EntityTileRenderer.h"
 
-bool TileRenderer::sideTinting = false;
+TileRenderer::TileRenderer( LevelSource* level /* = NULL */ )
-
+:	level(level),
-TileRenderer::TileRenderer(LevelSource* level /* = NULL */ )
-	:	level(level),
 	fixedTexture(-1),
 	xFlipTexture(false),
 	noCulling(false),
@@ -60,11 +58,6 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 	float c2 = 0.8f;
 	float c3 = 0.6f;
 
-	// added these to get biome color and save it before its overriden - shredder
-	float biomeR = r;
-	float biomeG = g;
-	float biomeB = b;
-
 
 	float r11 = c11 * r;
 	float g11 = c11 * g;
@@ -108,10 +101,6 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 		if (tt->zz0 > 0) br = centerBrightness;
 		t.color(r2 * br, g2 * br, b2 * br);
 		renderNorth(tt, xf, yf, zf, tt->getTexture(level, x, y, z, 2));
-		if ((tt->getTexture(level, x, y, z, 2) == 3) && sideTinting) { // checking if the texture from terrain.png is the normal grass side texture
-			t.color(c2 * br * biomeR, c2 * br * biomeG, c2 * br * biomeB);
-			renderNorth(tt, xf, yf, zf, 38); // rendering an extra face over the side of the cube that is a grayscale grass fringe tinted by t.color using biome colors, kinda inefficient
-		}
 		changed = true;
 	}
 
@@ -120,10 +109,6 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 		if (tt->zz1 < 1) br = centerBrightness;
 		t.color(r2 * br, g2 * br, b2 * br);
 		renderSouth(tt, xf, yf, zf, tt->getTexture(level, x, y, z, 3));
-		if ((tt->getTexture(level, x, y, z, 3) == 3) && sideTinting){ // checking if the texture from terrain.png is the normal grass side texture
-			t.color(c2 * br * biomeR, c2 * br * biomeG, c2 * br * biomeB);
-			renderSouth(tt, xf, yf, zf, 38); // rendering an extra face over the side of the cube that is a grayscale grass fringe tinted by t.color using biome colors, kinda inefficient
-		}
 		changed = true;
 	}
 
@@ -132,10 +117,6 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 		if (tt->xx0 > 0) br = centerBrightness;
 		t.color(r3 * br, g3 * br, b3 * br);
 		renderWest(tt, xf, yf, zf, tt->getTexture(level, x, y, z, 4));
-		if ((tt->getTexture(level, x, y, z, 4) == 3) && sideTinting) { // checking if the texture from terrain.png is the normal grass side texture
-			t.color(c2 * br * biomeR, c2 * br * biomeG, c2 * br * biomeB);
-			renderWest(tt, xf, yf, zf, 38); // rendering an extra face over the side of the cube that is a grayscale grass fringe tinted by t.color using biome colors, kinda inefficient
-		}
 		changed = true;
 	}
 
@@ -144,10 +125,6 @@ bool TileRenderer::tesselateBlockInWorld( Tile* tt, int x, int y, int z, float r
 		if (tt->xx1 < 1) br = centerBrightness;
 		t.color(r3 * br, g3 * br, b3 * br);
 		renderEast(tt, xf, yf, zf, tt->getTexture(level, x, y, z, 5));
-		if ((tt->getTexture(level, x, y, z, 5) == 3) && sideTinting) { // checking if the texture from terrain.png is the normal grass side texture
-			t.color(c2 * br * biomeR, c2 * br * biomeG, c2 * br * biomeB);
-			renderEast(tt, xf, yf, zf, 38); // rendering an extra face over the side of the cube that is a grayscale grass fringe tinted by t.color using biome colors, kinda inefficient
-		}
 		changed = true;
 	}
 
@@ -171,38 +148,38 @@ bool TileRenderer::tesselateInWorld( Tile* tt, int x, int y, int z )
 		return tesselateBlockInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_WATER) {
 		return tesselateWaterInWorld(tt, x, y, z);
-	} else if (shape == Tile::SHAPE_CACTUS) {
+    } else if (shape == Tile::SHAPE_CACTUS) {
-		return tesselateCactusInWorld(tt, x, y, z);
+        return tesselateCactusInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_CROSS_TEXTURE) {
 		return tesselateCrossInWorld(tt, x, y, z);
 	} else if(shape == Tile::SHAPE_STEM) {
 		return tesselateStemInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_ROWS) {
-		return tesselateRowInWorld(tt, x, y, z);
+        return tesselateRowInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_TORCH) {
 		return tesselateTorchInWorld(tt, x, y, z);
-	} else if (shape == Tile::SHAPE_FIRE) {
+    } else if (shape == Tile::SHAPE_FIRE) {
-		return tesselateFireInWorld(tt, x, y, z);
+        return tesselateFireInWorld(tt, x, y, z);
-		//} else if (shape == Tile::SHAPE_RED_DUST) {
+    //} else if (shape == Tile::SHAPE_RED_DUST) {
-		//    return tesselateDustInWorld(tt, x, y, z);
+    //    return tesselateDustInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_LADDER) {
 		return tesselateLadderInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_DOOR) {
 		return tesselateDoorInWorld(tt, x, y, z);
-		//} else if (shape == Tile::SHAPE_RAIL) {
+    //} else if (shape == Tile::SHAPE_RAIL) {
-		//    return tesselateRailInWorld(tt, x, y, z);
+    //    return tesselateRailInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_STAIRS) {
 		return tesselateStairsInWorld((StairTile*)tt, x, y, z);
-	} else if (shape == Tile::SHAPE_FENCE) {
+    } else if (shape == Tile::SHAPE_FENCE) {
-		return tesselateFenceInWorld((FenceTile*)tt, x, y, z);
+        return tesselateFenceInWorld((FenceTile*)tt, x, y, z);
 	} else if (shape == Tile::SHAPE_FENCE_GATE) {
 		return tesselateFenceGateInWorld((FenceGateTile*) tt, x, y, z);
-		//} else if (shape == Tile::SHAPE_LEVER) {
+    //} else if (shape == Tile::SHAPE_LEVER) {
-		//    return tesselateLeverInWorld(tt, x, y, z);
+    //    return tesselateLeverInWorld(tt, x, y, z);
-		//} else if (shape == Tile::SHAPE_BED) {
+    //} else if (shape == Tile::SHAPE_BED) {
-		//    return tesselateBedInWorld(tt, x, y, z);
+    //    return tesselateBedInWorld(tt, x, y, z);
-		//} else if (shape == Tile::SHAPE_DIODE) {
+    //} else if (shape == Tile::SHAPE_DIODE) {
-		//    return tesselateDiodeInWorld(tt, x, y, z);
+    //    return tesselateDiodeInWorld(tt, x, y, z);
 	} else if (shape == Tile::SHAPE_IRON_FENCE) {
 		return tesselateThinFenceInWorld((ThinFenceTile*) tt, x, y, z);
 	} else if(shape == Tile::SHAPE_BED) {
@@ -255,10 +232,10 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 	int tex = tt->getTexture(0);
 
 	if (fixedTexture >= 0) tex = fixedTexture;
-
+	
 	float br = tt->getBrightness( level, x, y, z );
 	t.color( br, br, br );
-
+	
 	int xt = ((tex & 0xf) << 4);
 	int yt = tex & 0xf0;
 
@@ -363,82 +340,82 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 		if ( Tile::fire->canBurn( level, x - 1, y, z ) )
 		{
 			t.vertexUV( ( float )( x + r ), ( float )( y + h + yo ), ( float )( z +
-				1.0f ), ( float )( u1 ), ( float )( v0 ) );
+						 1.0f ), ( float )( u1 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				1.0f ), ( float )( u1 ), ( float )( v1 ) );
+						 1.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + r ), ( float )( y + h + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v0 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v0 ) );
 
 			t.vertexUV( ( float )( x + r ), ( float )( y + h + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v0 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				1.0f ), ( float )( u1 ), ( float )( v1 ) );
+						 1.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + r ), ( float )( y + h + yo ), ( float )( z +
-				1.0f ), ( float )( u1 ), ( float )( v0 ) );
+						 1.0f ), ( float )( u1 ), ( float )( v0 ) );
 		}
 		if ( Tile::fire->canBurn( level, x + 1, y, z ) )
 		{
 			t.vertexUV( ( float )( x + 1 - r ), ( float )( y + h + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v0 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 1 - 0 ), ( float )( y + 0 + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1 - 0 ), ( float )( y + 0 + yo ), ( float )( z +
-				1.0f ), ( float )( u1 ), ( float )( v1 ) );
+						 1.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1 - r ), ( float )( y + h + yo ), ( float )( z +
-				1.0f ), ( float )( u1 ), ( float )( v0 ) );
+						 1.0f ), ( float )( u1 ), ( float )( v0 ) );
 
 			t.vertexUV( ( float )( x + 1.0f - r ), ( float )( y + h + yo ), ( float )( z +
-				1.0f ), ( float )( u1 ), ( float )( v0 ) );
+						 1.0f ), ( float )( u1 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 1.0f - 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				1.0f ), ( float )( u1 ), ( float )( v1 ) );
+						 1.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f - 0 ), ( float )( y + 0.0f + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f - r ), ( float )( y + h + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v0 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v0 ) );
 		}
 		if ( Tile::fire->canBurn( level, x, y, z - 1 ) )
 		{
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + h + yo ), ( float )( z +
-				r ), ( float )( u1 ), ( float )( v0 ) );
+						 r ), ( float )( u1 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				0.0f ), ( float )( u1 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + h + yo ), ( float )( z +
-				r ), ( float )( u0 ), ( float )( v0 ) );
+						 r ), ( float )( u0 ), ( float )( v0 ) );
 
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + h + yo ), ( float )( z +
-				r ), ( float )( u0 ), ( float )( v0 ) );
+						 r ), ( float )( u0 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				0.0f ), ( float )( u0 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z +
-				0.0f ), ( float )( u1 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + h + yo ), ( float )( z +
-				r ), ( float )( u1 ), ( float )( v0 ) );
+						 r ), ( float )( u1 ), ( float )( v0 ) );
 		}
 		if ( Tile::fire->canBurn( level, x, y, z + 1 ) )
 		{
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + h + yo ), ( float )( z + 1.0f -
-				r ), ( float )( u0 ), ( float )( v0 ) );
+						 r ), ( float )( u0 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + 0.0f + yo ), ( float )( z + 1.0f -
-				0.0f ), ( float )( u0 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z + 1.0f -
-				0.0f ), ( float )( u1 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + h + yo ), ( float )( z + 1.0f -
-				r ), ( float )( u1 ), ( float )( v0 ) );
+						 r ), ( float )( u1 ), ( float )( v0 ) );
 
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + h + yo ), ( float )( z + 1.0f -
-				r ), ( float )( u1 ), ( float )( v0 ) );
+						 r ), ( float )( u1 ), ( float )( v0 ) );
 			t.vertexUV( ( float )( x + 0.0f ), ( float )( y + 0.0f + yo ), ( float )( z + 1.0f -
-				0.0f ), ( float )( u1 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u1 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + 0.0f + yo ), ( float )( z + 1.0f -
-				0.0f ), ( float )( u0 ), ( float )( v1 ) );
+						 0.0f ), ( float )( u0 ), ( float )( v1 ) );
 			t.vertexUV( ( float )( x + 1.0f ), ( float )( y + h + yo ), ( float )( z + 1.0f -
-				r ), ( float )( u0 ), ( float )( v0 ) );
+						 r ), ( float )( u0 ), ( float )( v0 ) );
 		}
 		if ( Tile::fire->canBurn( level, x, y + 1.0f, z ) )
 		{
@@ -463,13 +440,13 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 			if ( ( ( x + y + z ) & 1 ) == 0 )
 			{
 				t.vertexUV( ( float )( x0_ ), ( float )( y + h ), ( float )( z +
-					0 ), ( float )( u1 ), ( float )( v0 ) );
+							 0 ), ( float )( u1 ), ( float )( v0 ) );
 				t.vertexUV( ( float )( x0 ), ( float )( y + 0 ), ( float )( z +
-					0 ), ( float )( u1 ), ( float )( v1 ) );
+							 0 ), ( float )( u1 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x0 ), ( float )( y + 0 ), ( float )( z +
-					1 ), ( float )( u0 ), ( float )( v1 ) );
+							 1 ), ( float )( u0 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x0_ ), ( float )( y + h ), ( float )( z +
-					1 ), ( float )( u0 ), ( float )( v0 ) );
+							 1 ), ( float )( u0 ), ( float )( v0 ) );
 
 				u0 = (xt) / 256.0f;
 				u1 = (xt + 15.99f) / 256.0f;
@@ -477,24 +454,24 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 				v1 = (yt + 15.99f) / 256.0f;
 
 				t.vertexUV( ( float )( x1_ ), ( float )( y + h ), ( float )( z +
-					1.0f ), ( float )( u1 ), ( float )( v0 ) );
+							 1.0f ), ( float )( u1 ), ( float )( v0 ) );
 				t.vertexUV( ( float )( x1 ), ( float )( y + 0.0f ), ( float )( z +
-					1.0f ), ( float )( u1 ), ( float )( v1 ) );
+							 1.0f ), ( float )( u1 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x1 ), ( float )( y + 0.0f ), ( float )( z +
-					0 ), ( float )( u0 ), ( float )( v1 ) );
+							 0 ), ( float )( u0 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x1_ ), ( float )( y + h ), ( float )( z +
-					0 ), ( float )( u0 ), ( float )( v0 ) );
+							 0 ), ( float )( u0 ), ( float )( v0 ) );
 			}
 			else
 			{
 				t.vertexUV( ( float )( x + 0.0f ), ( float )( y +
-					h ), ( float )( z1_ ), ( float )( u1 ), ( float )( v0 ) );
+							 h ), ( float )( z1_ ), ( float )( u1 ), ( float )( v0 ) );
 				t.vertexUV( ( float )( x + 0.0f ), ( float )( y +
-					0.0f ), ( float )( z1 ), ( float )( u1 ), ( float )( v1 ) );
+							 0.0f ), ( float )( z1 ), ( float )( u1 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x + 1.0f ), ( float )( y +
-					0.0f ), ( float )( z1 ), ( float )( u0 ), ( float )( v1 ) );
+							 0.0f ), ( float )( z1 ), ( float )( u0 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x + 1.0f ), ( float )( y +
-					h ), ( float )( z1_ ), ( float )( u0 ), ( float )( v0 ) );
+							 h ), ( float )( z1_ ), ( float )( u0 ), ( float )( v0 ) );
 
 				u0 = (xt) / 256.0f;
 				u1 = (xt + 15.99f) / 256.0f;
@@ -502,13 +479,13 @@ bool TileRenderer::tesselateFireInWorld( Tile* tt, int x, int y, int z )
 				v1 = (yt + 15.99f) / 256.0f;
 
 				t.vertexUV( ( float )( x + 1.0f ), ( float )( y +
-					h ), ( float )( z0_ ), ( float )( u1 ), ( float )( v0 ) );
+							 h ), ( float )( z0_ ), ( float )( u1 ), ( float )( v0 ) );
 				t.vertexUV( ( float )( x + 1.0f ), ( float )( y +
-					0.0f ), ( float )( z0 ), ( float )( u1 ), ( float )( v1 ) );
+							 0.0f ), ( float )( z0 ), ( float )( u1 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x + 0.0f ), ( float )( y +
-					0.0f ), ( float )( z0 ), ( float )( u0 ), ( float )( v1 ) );
+							 0.0f ), ( float )( z0 ), ( float )( u0 ), ( float )( v1 ) );
 				t.vertexUV( ( float )( x + 0.0f ), ( float )( y +
-					h ), ( float )( z0_ ), ( float )( u0 ), ( float )( v0 ) );
+							 h ), ( float )( z0_ ), ( float )( u0 ), ( float )( v0 ) );
 			}
 		}
 	}
@@ -981,46 +958,46 @@ float TileRenderer::getWaterHeight( int x, int y, int z, const Material* m )
 }
 
 void TileRenderer::renderBlock(Tile* tt, LevelSource* level, int x, int y, int z) {
-	float c10 = 0.5f;
+    float c10 = 0.5f;
-	float c11 = 1;
+    float c11 = 1;
-	float c2 = 0.8f;
+    float c2 = 0.8f;
-	float c3 = 0.6f;
+    float c3 = 0.6f;
 
-	Tesselator& t = Tesselator::instance;
+    Tesselator& t = Tesselator::instance;
-	t.begin();
+    t.begin();
 
-	float center = tt->getBrightness(level, x, y, z);
+    float center = tt->getBrightness(level, x, y, z);
-	float br = tt->getBrightness(level, x, y - 1, z);
+    float br = tt->getBrightness(level, x, y - 1, z);
-	if (br < center) br = center;
+    if (br < center) br = center;
 
-	t.color(c10 * br, c10 * br, c10 * br);
+    t.color(c10 * br, c10 * br, c10 * br);
-	renderFaceDown(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(0));
+    renderFaceDown(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(0));
 
-	br = tt->getBrightness(level, x, y + 1, z);
+    br = tt->getBrightness(level, x, y + 1, z);
-	if (br < center) br = center;
+    if (br < center) br = center;
-	t.color(c11 * br, c11 * br, c11 * br);
+    t.color(c11 * br, c11 * br, c11 * br);
-	renderFaceUp(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(1));
+    renderFaceUp(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(1));
 
-	br = tt->getBrightness(level, x, y, z - 1);
+    br = tt->getBrightness(level, x, y, z - 1);
-	if (br < center) br = center;
+    if (br < center) br = center;
-	t.color(c2 * br, c2 * br, c2 * br);
+    t.color(c2 * br, c2 * br, c2 * br);
-	renderNorth(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(2));
+    renderNorth(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(2));
 
-	br = tt->getBrightness(level, x, y, z + 1);
+    br = tt->getBrightness(level, x, y, z + 1);
-	if (br < center) br = center;
+    if (br < center) br = center;
-	t.color(c2 * br, c2 * br, c2 * br);
+    t.color(c2 * br, c2 * br, c2 * br);
-	renderSouth(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(3));
+    renderSouth(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(3));
 
-	br = tt->getBrightness(level, x - 1, y, z);
+    br = tt->getBrightness(level, x - 1, y, z);
-	if (br < center) br = center;
+    if (br < center) br = center;
-	t.color(c3 * br, c3 * br, c3 * br);
+    t.color(c3 * br, c3 * br, c3 * br);
-	renderWest(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(4));
+    renderWest(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(4));
 
-	br = tt->getBrightness(level, x + 1, y, z);
+    br = tt->getBrightness(level, x + 1, y, z);
-	if (br < center) br = center;
+    if (br < center) br = center;
-	t.color(c3 * br, c3 * br, c3 * br);
+    t.color(c3 * br, c3 * br, c3 * br);
-	renderEast(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(5));
+    renderEast(tt, -0.5f, -0.5f, -0.5f, tt->getTexture(5));
-	t.draw();
+    t.draw();
 }
 
 bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX, int pY, int pZ, float pBaseRed, float pBaseGreen, float pBaseBlue )
@@ -1220,15 +1197,6 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 		c4g *= ll4;
 		c4b *= ll4;
 		renderNorth(tt, (float) pX, (float) pY, (float) pZ, tt->getTexture(level, pX, pY, pZ, 2));
-		if (tt->getTexture(level, pX, pY, pZ, 2) == 3 && sideTinting) 
-		{
-			c1r *= pBaseRed; c1g *= pBaseGreen; c1b *= pBaseBlue;
-			c2r *= pBaseRed; c2g *= pBaseGreen; c2b *= pBaseBlue;
-			c3r *= pBaseRed; c3g *= pBaseGreen; c3b *= pBaseBlue;
-			c4r *= pBaseRed; c4g *= pBaseGreen; c4b *= pBaseBlue;
-
-			renderNorth(tt, (float) pX, (float) pY, (float) pZ, 38);
-		}
 		i = true;
 	}
 	if ((noCulling) || (tt->shouldRenderFace(level, pX, pY, pZ + 1, 3))) {
@@ -1282,15 +1250,6 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 		c4g *= ll4;
 		c4b *= ll4;
 		renderSouth(tt, (float) pX, (float) pY, (float) pZ, tt->getTexture(level, pX, pY, pZ, 3));
-		if (tt->getTexture(level, pX, pY, pZ, 3) == 3 && sideTinting) 
-		{
-			c1r *= pBaseRed; c1g *= pBaseGreen; c1b *= pBaseBlue;
-			c2r *= pBaseRed; c2g *= pBaseGreen; c2b *= pBaseBlue;
-			c3r *= pBaseRed; c3g *= pBaseGreen; c3b *= pBaseBlue;
-			c4r *= pBaseRed; c4g *= pBaseGreen; c4b *= pBaseBlue;
-
-			renderSouth(tt, (float) pX, (float) pY, (float) pZ, 38);
-		}
 		i = true;
 	}
 	if ((noCulling) || (tt->shouldRenderFace(level, pX - 1, pY, pZ, 4))) {
@@ -1343,15 +1302,6 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 		c4g *= ll4;
 		c4b *= ll4;
 		renderWest(tt, (float) pX, (float) pY, (float) pZ, tt->getTexture(level, pX, pY, pZ, 4));
-		if (tt->getTexture(level, pX, pY, pZ, 4) == 3 && sideTinting) 
-		{
-			c1r *= pBaseRed; c1g *= pBaseGreen; c1b *= pBaseBlue;
-			c2r *= pBaseRed; c2g *= pBaseGreen; c2b *= pBaseBlue;
-			c3r *= pBaseRed; c3g *= pBaseGreen; c3b *= pBaseBlue;
-			c4r *= pBaseRed; c4g *= pBaseGreen; c4b *= pBaseBlue;
-
-			renderWest(tt, (float) pX, (float) pY, (float) pZ, 38);
-		}
 		i = true;
 	}
 	if ((noCulling) || (tt->shouldRenderFace(level, pX + 1, pY, pZ, 5))) {
@@ -1405,15 +1355,6 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 		c4b *= ll4;
 
 		renderEast(tt, (float) pX, (float) pY, (float) pZ, tt->getTexture(level, pX, pY, pZ, 5));
-		if (tt->getTexture(level, pX, pY, pZ, 5) == 3 && sideTinting) 
-		{
-			c1r *= pBaseRed; c1g *= pBaseGreen; c1b *= pBaseBlue;
-			c2r *= pBaseRed; c2g *= pBaseGreen; c2b *= pBaseBlue;
-			c3r *= pBaseRed; c3g *= pBaseGreen; c3b *= pBaseBlue;
-			c4r *= pBaseRed; c4g *= pBaseGreen; c4b *= pBaseBlue;
-
-			renderEast(tt, (float) pX, (float) pY, (float) pZ, 38);
-		}
 		i = true;
 	}
 	applyAmbienceOcclusion = false;
@@ -1421,124 +1362,124 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusion( Tile* tt, int pX,
 }
 
 bool TileRenderer::tesselateCactusInWorld(Tile* tt, int x, int y, int z) {
-	int col = tt->getColor(level, x, y, z);
+    int col = tt->getColor(level, x, y, z);
-	float r = ((col >> 16) & 0xff) / 255.0f;
+    float r = ((col >> 16) & 0xff) / 255.0f;
-	float g = ((col >> 8) & 0xff) / 255.0f;
+    float g = ((col >> 8) & 0xff) / 255.0f;
-	float b = ((col) & 0xff) / 255.0f;
+    float b = ((col) & 0xff) / 255.0f;
-	return tesselateCactusInWorld(tt, x, y, z, r, g, b);
+    return tesselateCactusInWorld(tt, x, y, z, r, g, b);
 }
 
 bool TileRenderer::tesselateCactusInWorld(Tile* tt, int x, int y, int z, float r, float g, float b) {
-	Tesselator& t = Tesselator::instance;
+    Tesselator& t = Tesselator::instance;
 
-	bool changed = false;
+    bool changed = false;
-	float c10 = 0.5f;
+    float c10 = 0.5f;
-	float c11 = 1;
+    float c11 = 1;
-	float c2 = 0.8f;
+    float c2 = 0.8f;
-	float c3 = 0.6f;
+    float c3 = 0.6f;
 
-	float r10 = c10 * r;
+    float r10 = c10 * r;
-	float r11 = c11 * r;
+    float r11 = c11 * r;
-	float r2 = c2 * r;
+    float r2 = c2 * r;
-	float r3 = c3 * r;
+    float r3 = c3 * r;
 
-	float g10 = c10 * g;
+    float g10 = c10 * g;
-	float g11 = c11 * g;
+    float g11 = c11 * g;
-	float g2 = c2 * g;
+    float g2 = c2 * g;
-	float g3 = c3 * g;
+    float g3 = c3 * g;
 
-	float b10 = c10 * b;
+    float b10 = c10 * b;
-	float b11 = c11 * b;
+    float b11 = c11 * b;
-	float b2 = c2 * b;
+    float b2 = c2 * b;
-	float b3 = c3 * b;
+    float b3 = c3 * b;
 
-	float s = 1 / 16.0f;
+    float s = 1 / 16.0f;
 	const float X = (float)x;
 	const float Y = (float)y;
 	const float Z = (float)z;
 
-	float centerBrightness = tt->getBrightness(level, x, y, z);
+    float centerBrightness = tt->getBrightness(level, x, y, z);
 
-	if (noCulling || tt->shouldRenderFace(level, x, y - 1, z, 0)) {
+    if (noCulling || tt->shouldRenderFace(level, x, y - 1, z, 0)) {
-		float br = tt->getBrightness(level, x, y - 1, z);
+        float br = tt->getBrightness(level, x, y - 1, z);
-		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-		t.color(r10 * br, g10 * br, b10 * br);
+        t.color(r10 * br, g10 * br, b10 * br);
-		renderFaceDown(tt, X, Y, Z, tt->getTexture(level, x, y, z, 0));
+        renderFaceDown(tt, X, Y, Z, tt->getTexture(level, x, y, z, 0));
-		changed = true;
+        changed = true;
-	}
+    }
 
-	if (noCulling || tt->shouldRenderFace(level, x, y + 1, z, 1)) {
+    if (noCulling || tt->shouldRenderFace(level, x, y + 1, z, 1)) {
-		float br = tt->getBrightness(level, x, y + 1, z);
+        float br = tt->getBrightness(level, x, y + 1, z);
-		if (tt->yy1 != 1 && !tt->material->isLiquid()) br = centerBrightness;
+        if (tt->yy1 != 1 && !tt->material->isLiquid()) br = centerBrightness;
-		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-		t.color(r11 * br, g11 * br, b11 * br);
+        t.color(r11 * br, g11 * br, b11 * br);
-		renderFaceUp(tt, X, Y, Z, tt->getTexture(level, x, y, z, 1));
+        renderFaceUp(tt, X, Y, Z, tt->getTexture(level, x, y, z, 1));
-		changed = true;
+        changed = true;
-	}
+    }
 
-	if (noCulling || tt->shouldRenderFace(level, x, y, z - 1, 2)) {
+    if (noCulling || tt->shouldRenderFace(level, x, y, z - 1, 2)) {
-		float br = tt->getBrightness(level, x, y, z - 1);
+        float br = tt->getBrightness(level, x, y, z - 1);
-		if (tt->zz0 > 0) br = centerBrightness;
+        if (tt->zz0 > 0) br = centerBrightness;
-		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-		t.color(r2 * br, g2 * br, b2 * br);
+        t.color(r2 * br, g2 * br, b2 * br);
-		t.addOffset(0, 0, s);
+        t.addOffset(0, 0, s);
-		renderNorth(tt, X, Y, Z, tt->getTexture(level, x, y, z, 2));
+        renderNorth(tt, X, Y, Z, tt->getTexture(level, x, y, z, 2));
-		t.addOffset(0, 0, -s);
+        t.addOffset(0, 0, -s);
-		changed = true;
+        changed = true;
-	}
+    }
 
-	if (noCulling || tt->shouldRenderFace(level, x, y, z + 1, 3)) {
+    if (noCulling || tt->shouldRenderFace(level, x, y, z + 1, 3)) {
-		float br = tt->getBrightness(level, x, y, z + 1);
+        float br = tt->getBrightness(level, x, y, z + 1);
-		if (tt->zz1 < 1) br = centerBrightness;
+        if (tt->zz1 < 1) br = centerBrightness;
-		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-		t.color(r2 * br, g2 * br, b2 * br);
+        t.color(r2 * br, g2 * br, b2 * br);
-		t.addOffset(0, 0, -s);
+        t.addOffset(0, 0, -s);
-		renderSouth(tt, X, Y, Z, tt->getTexture(level, x, y, z, 3));
+        renderSouth(tt, X, Y, Z, tt->getTexture(level, x, y, z, 3));
-		t.addOffset(0, 0, s);
+        t.addOffset(0, 0, s);
-		changed = true;
+        changed = true;
-	}
+    }
 
-	if (noCulling || tt->shouldRenderFace(level, x - 1, y, z, 4)) {
+    if (noCulling || tt->shouldRenderFace(level, x - 1, y, z, 4)) {
-		float br = tt->getBrightness(level, x - 1, y, z);
+        float br = tt->getBrightness(level, x - 1, y, z);
-		if (tt->xx0 > 0) br = centerBrightness;
+        if (tt->xx0 > 0) br = centerBrightness;
-		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-		t.color(r3 * br, g3 * br, b3 * br);
+        t.color(r3 * br, g3 * br, b3 * br);
-		t.addOffset(s, 0, 0);
+        t.addOffset(s, 0, 0);
-		renderWest(tt, X, Y, Z, tt->getTexture(level, x, y, z, 4));
+        renderWest(tt, X, Y, Z, tt->getTexture(level, x, y, z, 4));
-		t.addOffset(-s, 0, 0);
+        t.addOffset(-s, 0, 0);
-		changed = true;
+        changed = true;
-	}
+    }
 
-	if (noCulling || tt->shouldRenderFace(level, x + 1, y, z, 5)) {
+    if (noCulling || tt->shouldRenderFace(level, x + 1, y, z, 5)) {
-		float br = tt->getBrightness(level, x + 1, y, z);
+        float br = tt->getBrightness(level, x + 1, y, z);
-		if (tt->xx1 < 1) br = centerBrightness;
+        if (tt->xx1 < 1) br = centerBrightness;
-		// if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
+        // if (Tile::lightEmission[tt->id] > br*Level.MAX_BRIGHTNESS) br =
-		// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
+// Tile::lightEmission[tt->id]/Level.MAX_BRIGHTNESS;
-		t.color(r3 * br, g3 * br, b3 * br);
+        t.color(r3 * br, g3 * br, b3 * br);
-		t.addOffset(-s, 0, 0);
+        t.addOffset(-s, 0, 0);
-		renderEast(tt, X, Y, Z, tt->getTexture(level, x, y, z, 5));
+        renderEast(tt, X, Y, Z, tt->getTexture(level, x, y, z, 5));
-		t.addOffset(s, 0, 0);
+        t.addOffset(s, 0, 0);
-		changed = true;
+        changed = true;
-	}
+    }
 
-	return changed;
+    return changed;
 }
 
 bool TileRenderer::tesselateFenceInWorld(FenceTile* tt, int x, int y, int z) {
-	bool changed = true;
+    bool changed = true;
 
-	float a = 6 / 16.0f;
+    float a = 6 / 16.0f;
-	float b = 10 / 16.0f;
+    float b = 10 / 16.0f;
-	tt->setShape(a, 0, a, b, 1, b);
+    tt->setShape(a, 0, a, b, 1, b);
-	tesselateBlockInWorld(tt, x, y, z);
+    tesselateBlockInWorld(tt, x, y, z);
 
-	bool vertical = false;
+    bool vertical = false;
-	bool horizontal = false;
+    bool horizontal = false;
 
 	bool l = tt->connectsTo(level, x - 1, y, z);
 	bool r = tt->connectsTo(level, x + 1, y, z);
@@ -1546,42 +1487,42 @@ bool TileRenderer::tesselateFenceInWorld(FenceTile* tt, int x, int y, int z) {
 	bool d = tt->connectsTo(level, x, y, z + 1);
 
 	if (l || r) vertical = true;
-	if (u || d) horizontal = true;
+    if (u || d) horizontal = true;
 
-	if (!vertical && !horizontal) vertical = true;
+    if (!vertical && !horizontal) vertical = true;
 
-	a = 7 / 16.0f;
+    a = 7 / 16.0f;
-	b = 9 / 16.0f;
+    b = 9 / 16.0f;
-	float h0 = 12 / 16.0f;
+    float h0 = 12 / 16.0f;
-	float h1 = 15 / 16.0f;
+    float h1 = 15 / 16.0f;
 
-	float x0 = l ? 0 : a;
+    float x0 = l ? 0 : a;
-	float x1 = r ? 1 : b;
+    float x1 = r ? 1 : b;
-	float z0 = u ? 0 : a;
+    float z0 = u ? 0 : a;
-	float z1 = d ? 1 : b;
+    float z1 = d ? 1 : b;
 
-	if (vertical) {
+    if (vertical) {
-		tt->setShape(x0, h0, a, x1, h1, b);
+        tt->setShape(x0, h0, a, x1, h1, b);
-		tesselateBlockInWorld(tt, x, y, z);
+        tesselateBlockInWorld(tt, x, y, z);
-	}
+    }
-	if (horizontal) {
+    if (horizontal) {
-		tt->setShape(a, h0, z0, b, h1, z1);
+        tt->setShape(a, h0, z0, b, h1, z1);
-		tesselateBlockInWorld(tt, x, y, z);
+        tesselateBlockInWorld(tt, x, y, z);
-	}
+    }
 
-	h0 = 6 / 16.0f;
+    h0 = 6 / 16.0f;
-	h1 = 9 / 16.0f;
+    h1 = 9 / 16.0f;
-	if (vertical) {
+    if (vertical) {
-		tt->setShape(x0, h0, a, x1, h1, b);
+        tt->setShape(x0, h0, a, x1, h1, b);
-		tesselateBlockInWorld(tt, x, y, z);
+        tesselateBlockInWorld(tt, x, y, z);
-	}
+    }
-	if (horizontal) {
+    if (horizontal) {
-		tt->setShape(a, h0, z0, b, h1, z1);
+        tt->setShape(a, h0, z0, b, h1, z1);
-		tesselateBlockInWorld(tt, x, y, z);
+        tesselateBlockInWorld(tt, x, y, z);
-	}
+    }
 
-	tt->setShape(0, 0, 0, 1, 1, 1);
+    tt->setShape(0, 0, 0, 1, 1, 1);
-	return changed;
+    return changed;
 }
 
 bool TileRenderer::tesselateFenceGateInWorld(FenceGateTile* tt, int x, int y, int z) {
@@ -2367,7 +2308,7 @@ void TileRenderer::renderEast( Tile* tt, float x, float y, float z, int tex )
 void TileRenderer::renderTile( Tile* tile, int data )
 {
 	Tesselator& t = Tesselator::instance;
-
+		
 	t.color(0xff, 0xff, 0xff); // i disabled this, this is normally enabled in normal mcpe see if this fits OPTION_NORMAL_LIGHTING - shredder
 	int shape = tile->getRenderShape();
 
@@ -2383,7 +2324,7 @@ void TileRenderer::renderTile( Tile* tile, int data )
 		t.normal(0.0f, 1.0f, 0.0f); 
 
 		renderFaceUp(tile, 0, 0, 0, tile->getTexture(1, data));
-
+		
 		t.normal(0.0f, 0.0f, -1.0f);
 
 		renderNorth(tile, 0, 0, 0, tile->getTexture(2, data));
@@ -2462,110 +2403,110 @@ void TileRenderer::renderTile( Tile* tile, int data )
 		t.addOffset(s, 0, 0);
 		t.draw();
 		t.offset(0, 0, 0);//0.5f, 0.5f, 0.5f);
-	} else if (shape == Tile::SHAPE_ROWS) {
+		} else if (shape == Tile::SHAPE_ROWS) {
-		t.begin();
+			t.begin();
-		t.normal(0, -1, 0);
+			t.normal(0, -1, 0);
-		tesselateRowTexture(tile, data, -0.5f, -0.5f, -0.5f);
+			tesselateRowTexture(tile, data, -0.5f, -0.5f, -0.5f);
 		//}  else if (shape == Tile::SHAPE_TORCH) {
 		////    t.begin();
 		////    t.normal(0, -1, 0);
 		///    tesselateTorch(tile, -0.5f, -0.5f, -0.5f, 0, 0);
 		////    t.end();
-	} else if (shape == Tile::SHAPE_ENTITYTILE_ANIMATED) {
+        } else if (shape == Tile::SHAPE_ENTITYTILE_ANIMATED) {
-		EntityTileRenderer::instance->render(tile, data, 1.0f);
+            EntityTileRenderer::instance->render(tile, data, 1.0f);
-		//glEnable(GL_RESCALE_NORMAL);
+            //glEnable(GL_RESCALE_NORMAL);
-	} else if (shape == Tile::SHAPE_STAIRS) {
+		} else if (shape == Tile::SHAPE_STAIRS) {
-		t.addOffset(-0.5f, -0.5f, -0.5f);
+		    t.addOffset(-0.5f, -0.5f, -0.5f);
-		t.begin();
+			t.begin();
-		for (int i = 0; i < 2; i++) {
+			for (int i = 0; i < 2; i++) {
-			if (i == 0) tile->setShape(0, 0, 0, 1, 1, 0.5f);
+		        if (i == 0) tile->setShape(0, 0, 0, 1, 1, 0.5f);
-			if (i == 1) tile->setShape(0, 0, 0.5f, 1, 0.5f, 1);
+		        if (i == 1) tile->setShape(0, 0, 0.5f, 1, 0.5f, 1);
 
 
-			t.normal(0.0f, -1.0f, 0.0f);
+				t.normal(0.0f, -1.0f, 0.0f);
-			renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
+		        renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
 
-			t.normal(0.0f, 1.0f, 0.0f);
+				t.normal(0.0f, 1.0f, 0.0f);
-			renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
+		        renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
 
-			t.normal(0.0f, 0.0f, -1.0f);
+				t.normal(0.0f, 0.0f, -1.0f);
-			renderNorth(tile, 0, 0, 0, tile->getTexture(2));
+		        renderNorth(tile, 0, 0, 0, tile->getTexture(2));
 
-			t.normal(0.0f, 0.0f, 1.0f);
+				t.normal(0.0f, 0.0f, 1.0f);
-			renderSouth(tile, 0, 0, 0, tile->getTexture(3));
+		        renderSouth(tile, 0, 0, 0, tile->getTexture(3));
 
-			t.normal(-1.0f, 0.0f, 0.0f);
+				t.normal(-1.0f, 0.0f, 0.0f);
-			renderWest(tile, 0, 0, 0, tile->getTexture(4));
+		        renderWest(tile, 0, 0, 0, tile->getTexture(4));
 
-			t.normal(1.0f, 0.0f, 0.0f);
+				t.normal(1.0f, 0.0f, 0.0f);
-			renderEast(tile, 0, 0, 0, tile->getTexture(5));
+		        renderEast(tile, 0, 0, 0, tile->getTexture(5));
+		    }
+			t.draw();
+			t.addOffset(0.5f, 0.5f, 0.5f);
 		}
-		t.draw();
+		else if (shape == Tile::SHAPE_FENCE) {
-		t.addOffset(0.5f, 0.5f, 0.5f);
+			t.addOffset(-0.5f, -0.5f, -0.5f);
-	}
+			t.begin();
-	else if (shape == Tile::SHAPE_FENCE) {
+			for (int i = 0; i < 4; i++) {
-		t.addOffset(-0.5f, -0.5f, -0.5f);
+				float w = 2 / 16.0f;
-		t.begin();
+				if (i == 0) tile->setShape(0.5f - w, 0, 0, 0.5f + w, 1, w * 2);
-		for (int i = 0; i < 4; i++) {
+				if (i == 1) tile->setShape(0.5f - w, 0, 1 - w * 2, 0.5f + w, 1, 1);
-			float w = 2 / 16.0f;
+				w = 1 / 16.0f;
-			if (i == 0) tile->setShape(0.5f - w, 0, 0, 0.5f + w, 1, w * 2);
+				if (i == 2) tile->setShape(0.5f - w, 1 - w * 3, -w * 2, 0.5f + w, 1 - w, 1 + w * 2);
-			if (i == 1) tile->setShape(0.5f - w, 0, 1 - w * 2, 0.5f + w, 1, 1);
+				if (i == 3) tile->setShape(0.5f - w, 0.5f - w * 3, -w * 2, 0.5f + w, 0.5f - w, 1 + w * 2);
-			w = 1 / 16.0f;
-			if (i == 2) tile->setShape(0.5f - w, 1 - w * 3, -w * 2, 0.5f + w, 1 - w, 1 + w * 2);
-			if (i == 3) tile->setShape(0.5f - w, 0.5f - w * 3, -w * 2, 0.5f + w, 0.5f - w, 1 + w * 2);
 
-			t.normal(0.0f, -1.0f, 0.0f);
+				t.normal(0.0f, -1.0f, 0.0f);
-			renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
+		        renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
 
-			t.normal(0.0f, 1.0f, 0.0f);
+				t.normal(0.0f, 1.0f, 0.0f);
-			renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
+		        renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
 
-			t.normal(0.0f, 0.0f, -1.0f);
+				t.normal(0.0f, 0.0f, -1.0f);
-			renderNorth(tile, 0, 0, 0, tile->getTexture(2));
+		        renderNorth(tile, 0, 0, 0, tile->getTexture(2));
 
-			t.normal(0.0f, 0.0f, 1.0f);
+				t.normal(0.0f, 0.0f, 1.0f);
-			renderSouth(tile, 0, 0, 0, tile->getTexture(3));
+		        renderSouth(tile, 0, 0, 0, tile->getTexture(3));
 
-			t.normal(-1.0f, 0.0f, 0.0f);
+				t.normal(-1.0f, 0.0f, 0.0f);
-			renderWest(tile, 0, 0, 0, tile->getTexture(4));
+		        renderWest(tile, 0, 0, 0, tile->getTexture(4));
 
-			t.normal(1.0f, 0.0f, 0.0f);
+				t.normal(1.0f, 0.0f, 0.0f);
-			renderEast(tile, 0, 0, 0, tile->getTexture(5));
+		        renderEast(tile, 0, 0, 0, tile->getTexture(5));
+			}
+			t.draw();
+			t.addOffset(0.5f, 0.5f, 0.5f);
+			tile->setShape(0, 0, 0, 1, 1, 1);
+		} else if (shape == Tile::SHAPE_FENCE_GATE) {
+			t.addOffset(-0.5f, -0.5f, -0.5f);
+			t.begin();
+			for (int i = 0; i < 3; i++) {
+				float w = 1 / 16.0f;
+				if (i == 0) tile->setShape(0.5f - w, .3f, 0, 0.5f + w, 1, w * 2);
+				if (i == 1) tile->setShape(0.5f - w, .3f, 1 - w * 2, 0.5f + w, 1, 1);
+				if (i == 2) tile->setShape(0.5f - w, .5f, w * 2, 0.5f + w, 1 - w, 1 - w * 2);
+
+								t.normal(0.0f, -1.0f, 0.0f);
+		        renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
+
+				t.normal(0.0f, 1.0f, 0.0f);
+		        renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
+
+				t.normal(0.0f, 0.0f, -1.0f);
+		        renderNorth(tile, 0, 0, 0, tile->getTexture(2));
+
+				t.normal(0.0f, 0.0f, 1.0f);
+		        renderSouth(tile, 0, 0, 0, tile->getTexture(3));
+
+				t.normal(-1.0f, 0.0f, 0.0f);
+		        renderWest(tile, 0, 0, 0, tile->getTexture(4));
+
+				t.normal(1.0f, 0.0f, 0.0f);
+		        renderEast(tile, 0, 0, 0, tile->getTexture(5));
+			}
+			t.draw();
+			t.addOffset(0.5f, 0.5f, 0.5f);
+			tile->setShape(0, 0, 0, 1, 1, 1);
 		}
-		t.draw();
-		t.addOffset(0.5f, 0.5f, 0.5f);
-		tile->setShape(0, 0, 0, 1, 1, 1);
-	} else if (shape == Tile::SHAPE_FENCE_GATE) {
-		t.addOffset(-0.5f, -0.5f, -0.5f);
-		t.begin();
-		for (int i = 0; i < 3; i++) {
-			float w = 1 / 16.0f;
-			if (i == 0) tile->setShape(0.5f - w, .3f, 0, 0.5f + w, 1, w * 2);
-			if (i == 1) tile->setShape(0.5f - w, .3f, 1 - w * 2, 0.5f + w, 1, 1);
-			if (i == 2) tile->setShape(0.5f - w, .5f, w * 2, 0.5f + w, 1 - w, 1 - w * 2);
-
-			t.normal(0.0f, -1.0f, 0.0f);
-			renderFaceDown(tile, 0, 0, 0, tile->getTexture(0));
-
-			t.normal(0.0f, 1.0f, 0.0f);
-			renderFaceUp(tile, 0, 0, 0, tile->getTexture(1));
-
-			t.normal(0.0f, 0.0f, -1.0f);
-			renderNorth(tile, 0, 0, 0, tile->getTexture(2));
-
-			t.normal(0.0f, 0.0f, 1.0f);
-			renderSouth(tile, 0, 0, 0, tile->getTexture(3));
-
-			t.normal(-1.0f, 0.0f, 0.0f);
-			renderWest(tile, 0, 0, 0, tile->getTexture(4));
-
-			t.normal(1.0f, 0.0f, 0.0f);
-			renderEast(tile, 0, 0, 0, tile->getTexture(5));
-		}
-		t.draw();
-		t.addOffset(0.5f, 0.5f, 0.5f);
-		tile->setShape(0, 0, 0, 1, 1, 1);
-	}
 
 }
 

src/client/renderer/TileRenderer.h

@@ -10,7 +10,6 @@ class ThinFenceTile;
 class StairTile;
 class LevelSource;
 class Material;
-class Minecraft;
 
 class TileRenderer
 {
@@ -61,10 +60,6 @@ public:
     void renderTile(Tile* tile, int data);
 	void renderGuiTile(Tile* tile, int data);
 
-	static void setUseTint(bool value) {
-       sideTinting = value;
-    }
-
     static bool canRender(int renderShape);
 private:
     float getWaterHeight(int x, int y, int z, const Material* m);
@@ -73,7 +68,6 @@ private:
 	int fixedTexture;
 	bool xFlipTexture;
 	bool noCulling;
-	static bool sideTinting;
 
 	bool applyAmbienceOcclusion;
 	float ll000, llx00, ll0y0, ll00z, llX00, ll0Y0, ll00Z;

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,11 +187,7 @@ 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);
 
 
 
@@ -295,14 +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);
-			// tt.color(1.f, 1.f, 1.f, 1.f);
 			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() {
@@ -316,7 +242,7 @@ void EntityRenderer::renderTileShadow(Tile* tt, float x, float y, float z, int x
 	float a = ((pow - (y - (yt + yo)) / 2) * 0.5f) * getLevel()->getBrightness(xt, yt, zt);
 	if (a < 0) return;
 	if (a > 1) a = 1;
-	// t.color(1.f, 1.f, 1.f, (float) a);
+	//	t.color(1, 1, 1, (float) a);
 	glColor4f2(1, 1, 1, (float) a);
 
 	float x0 = xt + tt->xx0 + xo;

src/client/renderer/entity/MobRenderer.cpp

@@ -187,12 +187,10 @@ void MobRenderer::scale(Mob* mob, float a) {
 }
 
 void MobRenderer::renderName(Mob* mob, float x, float y, float z) {
-	
+	/*
 	std::stringstream ss; ss << mob->entityId;
-	if (entityRenderDispatcher->minecraft->options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
 	renderNameTag(mob, ss.str(), x, y, z, 64);
-	}
+	*/
-	
 }
 
 void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, float y, float z, int maxDist) {
@@ -207,19 +205,13 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, floa
 	float s = 1 / 60.0f * size;
 
 	glPushMatrix2();
-	if (mob->isPlayer()){
+	glTranslatef2((float) x + 0, (float) y + 1.0f /*2.3f*/, (float) z);
-		glTranslatef2((float) x + 0, (float) y + 1.0f, (float) z);
-	} else {
-		glTranslatef2((float) x + 0, (float) y + 2.3f, (float) z);
-	}
 
 	glRotatef2(-entityRenderDispatcher->playerRotY, 0, 1, 0);
 	glRotatef2(entityRenderDispatcher->playerRotX, 1, 0, 0);
 
 	glScalef2(-s, -s, s);
 
-	glDisable(GL_LIGHTING);
-
 	glDepthMask(false);
 	glDisable2(GL_DEPTH_TEST);
 	glEnable2(GL_BLEND);
@@ -243,7 +235,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", 
+//	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(), 
+//		((Player*)mob)->name.c_str(), mob->getTexture().c_str(), 
-		humanoidModel->texWidth, humanoidModel->texHeight,
+//		humanoidModel->texWidth, humanoidModel->texHeight,
-		(desired == playerModel64 ? "64" : "32")); */
+//		(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)
+FireTexture::FireTexture()
-	:   super(((Tile*)Tile::fire)->tex + id * 16),
+	:   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,52 +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>
-
-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(), [args, nicknameLower] (auto& it) -> bool {
-        std::string lower = it->name;
-        std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-
-        return lower == nicknameLower;
-    });
-
-    if (*it == (Player*)mc.player) {
-        return "ban: you can't ban urself lol";
-    }
-    
-    if (it != mc.level->players.end()) {
-        mc.level->removePlayer(*it);
-        (*it)->remove();
-        mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, true);
-    } 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/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,46 +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";
-    }
-
-    mc.level->removePlayer(*it);
-    (*it)->remove();
-    mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, 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,75 +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 "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());
-}
-
-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/main_dedicated.cpp

@@ -1,20 +1,16 @@
-#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"
 
 #define MAIN_CLASS NinecraftApp
 static App* g_app = 0;
@@ -31,175 +27,36 @@ void signal_callback_handler(int signum) {
 	}
 }
 
-std::string findStringInConfig(std::string line, std::string config) {
+int main(int numArguments, char* pszArgs[]) {
-    auto valuePos = config.find(line);
+	ArgumentsSettings aSettings(numArguments, pszArgs);
-
+	if(aSettings.getShowHelp()) {
-    if (line.empty()) {
+		ArgumentsSettings defaultSettings(0, NULL);
-        throw std::runtime_error("Key cannot be empty");
+		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());
-    if (valuePos == std::string::npos) {
+		printf("--externalpath - The path to the place where the server should store the levels. [default: \"%s\"]\n", defaultSettings.getExternalPath().c_str());
-        throw std::runtime_error("Cannot find value");
+		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");
-    std::string valueStr = "";
+		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());
-    valuePos += 1 + line.size();
+		printf("-------------------------------------------------------\n");
-
+		return 0;
-    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.");
-		}
 	}
-
+	printf("Level Name: %s\n", aSettings.getLevelName().c_str());
-	printf("Level Name: %s\n", levelName.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)->externalStoragePath = aSettings.getExternalPath();
-	((MAIN_CLASS*)g_app)->externalCacheStoragePath = cachePath;
+	((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)->selectLevel(aSettings.getLevelDir(), aSettings.getLevelName(),  settings);
-	((MAIN_CLASS*)g_app)->hostMultiplayer(port);
+	((MAIN_CLASS*)g_app)->hostMultiplayer(aSettings.getPort());
-
-	// 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::cout << "Level has been generated in " << getTimeS() - startTime << std::endl;
 	((MAIN_CLASS*)g_app)->level->saveLevelData();
@@ -210,31 +67,7 @@ int main(int numArguments, char* pszArgs[]) {
 		//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.");
-	}
-	
 	((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();	
+#ifndef STANDALONE_SERVER
-// 	minecraft->setLevel(NULL);
+	minecraft->gui.addMessage("Disconnected from server");
-// #ifndef STANDALONE_SERVER
+#endif
-// 	minecraft->gui.addMessage("Disconnected from server");
-// 	// TODO: screen with error
-//     minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
-// #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;
-
-	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 setSize = LEVEL_HEIGHT / 8;
-	const int setShift = 4; // power of LevelConstants::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 readBlockBuffer[setSize];
-	unsigned char* readDataBuffer = new unsigned char[setSize / 2];
+	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 colX = (i % CHUNK_WIDTH);
-			int colZ = (i / LevelConstants::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 cx = CHUNK_CACHE_WIDTH / 2;
-    int cz = LevelConstants::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);
+        cx = Mth::floor(p->x / (float)CHUNK_WIDTH);
-        cz = Mth::floor(p->z / (float)LevelConstants::CHUNK_DEPTH);
+        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);
+	minecraft->gui.displayClientMessage(packet->message);
-	std::istringstream iss(packet->message);
-	for (std::string line; std::getline(iss, line); ) {
-		minecraft->gui.addMessage(line);
-	}
 #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].x = i/CHUNK_WIDTH;
-		requestNextChunkIndexList[i].y = i % LevelConstants::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;
+    IntPair requestNextChunkIndexList[NumRequestChunks];
-	std::vector<bool> chunksLoaded;
+	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,16 +41,10 @@ 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;
-	case PACKET_ADDMOB:	
+	case PACKET_ADDMOB:
 		packet = new AddMobPacket();
 		break;
 	case PACKET_ADDPLAYER:
@@ -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,10 +33,7 @@ enum MinecraftPacketIds
 	PACKET_REMOVEENTITY,
 	PACKET_ADDITEMENTITY,
 	PACKET_TAKEITEMENTITY,
-	PACKET_TAKEITEM,
+
-	PACKET_REMOVEITEM,
-	PACKET_WANTCREATEITEM,
-	
 	PACKET_MOVEENTITY,
 	PACKET_MOVEENTITY_POS,
 	PACKET_MOVEENTITY_ROT,

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,17 +13,6 @@
 #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
@@ -74,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,18 +136,7 @@ void ServerSideNetworkHandler::displayGameMessage(const std::string& message)
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChatPacket* packet)
 {
-	auto player = getPlayer(source);
+	displayGameMessage(packet->message);
-
-	if (player == nullptr) return; // @todo maybe kick?
-	
-	if (packet->message[0] == '/') {
-		// This is a command
-
-		ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(packet->message.substr(1))));
-		return sendPrivate(resp, source);
-	}
-
-	displayGameMessage("<" + player->name + "> " + packet->message);
 }
 
 void ServerSideNetworkHandler::onNewClient(const RakNet::RakNetGUID& clientGuid)
@@ -188,8 +156,6 @@ void ServerSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
 
 		if (player->owner == guid)
 		{
-			minecraft->level->getLevelStorage()->savePlayer(*player);
-
 			std::string message = player->name;
 			message += " disconnected from the game";
 			displayGameMessage(message);
@@ -213,39 +179,15 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	if (!_allowIncoming) return;
 
 	LOGI("LoginPacket\n");
-	
+
 	int loginStatus = LoginStatus::Success;
 	//
 	// Bad/incompatible client version
 	//
 	bool oldClient = packet->clientNetworkVersion < SharedConstants::NetworkProtocolLowestSupportedVersion;
 	bool oldServer = packet->clientNetworkLowestSupportedVersion > SharedConstants::NetworkProtocolVersion;
-	if (oldClient || oldServer || !packet->newProto)
+	if (oldClient || oldServer)
-		loginStatus = oldClient || !packet->newProto? LoginStatus::Failed_ClientOld : LoginStatus::Failed_ServerOld;
+		loginStatus = oldClient? LoginStatus::Failed_ClientOld : LoginStatus::Failed_ServerOld;
-
-	std::string nicknameLower = packet->clientName.C_String();
-	std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
-
-	printf("%s lower \n", nicknameLower.c_str());
-	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;
-		}
-	}
 
 	RakNet::BitStream bitStream;
 	LoginStatusPacket(loginStatus).write(&bitStream);
@@ -257,16 +199,13 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	//
 	// Valid client version
 	//
-	
+	Player* newPlayer = new ServerPlayer(minecraft, level);
-	Player* newPlayer = new ServerPlayer(minecraft, level, packet->newProto);
+
-	
 	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);
@@ -289,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,
+            newPlayer->x, newPlayer->y - newPlayer->heightOffset, newPlayer->z
-			LevelConstants::CHUNK_CACHE_WIDTH
         ).write(&bitStream);
 
         rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
@@ -306,8 +244,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ReadyPac
 
 	if (packet->type == ReadyPacket::READY_REQUESTEDCHUNKS)
 		onReady_RequestedChunks(source);
-
-	LOGI("Ready player two ready ready player two!!\n ");
 }
 
 void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID& source)
@@ -365,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
 	/*
@@ -432,32 +338,15 @@ void ServerSideNetworkHandler::onReady_RequestedChunks(const RakNet::RakNetGUID&
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlayerPacket* packet)
 {
 	if (!level) return;
-	
-	// LOGI("MovePlayerPacket\n");
-	if (Entity* entity = level->getEntity(packet->entityId)) {
-		ServerPlayer* player = (ServerPlayer*) getPlayer(source);
 
-		// int timeElapsed = minecraft->getTicks() - player->getLastMoveTicks();
+	//LOGI("MovePlayerPacket\n");
-
+	if (Entity* entity = level->getEntity(packet->entityId))
-		// if (timeElapsed > 0) {
+	{
-		// 	float dist = player->distanceTo(packet->x, player->y, packet->z);
+		entity->xd = entity->yd = entity->zd = 0;
-		// 	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);
-		// 	}
-		// }
-
-		entity->xd = entity->yd = entity->zd = 0;	
 		entity->lerpTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot, 3);
-		
+
 		// broadcast this packet to other clients
 		redistributePacket(packet, source);
-	
 	}
 }
 
@@ -479,29 +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)) {
+		if (minecraft->gameMode->isSurvivalType() && player->canDestroy(oldTile))
-			// From SurvivalMode.cpp
+			//oldTile->spawnResources(level, x, y, z, data, 1); //@todo
-			// 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
 			oldTile->playerDestroy(level, player, x, y, z, data);
-		}
-			
 
 		oldTile->destroy(level, x, y, z, data);
 	}
-
-	LOGI("Remove block [%i, %i, %i]\n", packet->x, packet->y, packet->z);
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RequestChunkPacket* packet)
@@ -531,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 )
@@ -559,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);
+	//int slot = player->inventory->getSlot(packet->itemId, packet->itemAuxValue);
-
+	int slot = Inventory::MAX_SELECTION_SIZE;
-	if (slot >= 0 && slot != packet->inventorySlot && packet->itemId != 0) {
+	if (slot >= 0) {
-		LOGW("PlayerEquipmentPacket: Item in player inventory but slots doesn't match!");
+		if (packet->itemId == 0) {
-		packet->inventorySlot = slot;
+			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) {
@@ -593,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);
 }
@@ -606,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();
@@ -648,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)];
@@ -725,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;
+		ItemInstance* item = &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;
 
 		if(packet->face == 255) {
             // Special case: x,y,z means direction-of-action
@@ -770,10 +533,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemP
 			minecraft->gameMode->useItemOn(player, level, item, packet->x, packet->y, packet->z, packet->face,
 				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");
 
@@ -785,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);
 }
@@ -820,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;
@@ -840,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);
+		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);
 	}
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ContainerClosePacket* packet) {
 	if (!level) return;
-	LOGI("ContainerClosePacket\n");
 
 	Player* p = findPlayer(level, &source);
 	if (!p) return;
@@ -872,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;
 
@@ -889,79 +619,11 @@ 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());
@@ -973,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 )
@@ -997,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;
@@ -1055,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,7 @@ 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, WantCreatePacket* packet);
+
-	
 	bool allowsIncomingConnections() { return _allowIncoming; }
 	void allowIncomingConnections(bool doAllow);
 
@@ -71,12 +70,6 @@ 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);
 
 	Minecraft*					minecraft;

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 (x1 >= LEVEL_WIDTH ) x1 = LEVEL_WIDTH  - 1;
-		if (y1 >= LevelConstants::LEVEL_HEIGHT) y1 = LevelConstants::LEVEL_HEIGHT - 1;
+		if (y1 >= LEVEL_HEIGHT) y1 = LEVEL_HEIGHT - 1;
-		if (z1 >= LevelConstants::LEVEL_DEPTH ) z1 = LevelConstants::LEVEL_DEPTH  - 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 setSize = LEVEL_HEIGHT / 8;
-		const int setShift = 4; // power of LevelConstants::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),
+		clientNetworkLowestSupportedVersion(-1)
-		newProto(false)
 	{
 	}
 
-	LoginPacket(const RakNet::RakString& clientName, int clientVersion, bool newProto)
+	LoginPacket(const RakNet::RakString& clientName, int clientVersion)
 	:	clientName(clientName),
 		clientNetworkVersion(clientVersion),
-		clientNetworkLowestSupportedVersion(clientVersion),
+		clientNetworkLowestSupportedVersion(clientVersion)
-		newProto(newProto)
 	{
 	}
 
@@ -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),
+		itemAuxValue(data)
-		selectedSlot(selSlot),
-		inventorySlot(invSlot)
 	{
 	}
 
@@ -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),
+		z(z)
-		chunkCacheWidth(chunkCacheWidth)
 	{
 	}
 
@@ -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,
+    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)
     :	x(x),
         y(y),
         z(z),
@@ -33,36 +29,17 @@ public:
 		entityId(entityId),
 		clickX(clickX),
 		clickY(clickY),
-		clickZ(clickZ),
+		clickZ(clickZ)
-		playerX(plrX),
-		playerY(plrY),
-		playerZ(plrZ),
-		playerX0(plrX0),
-		playerY0(plrY0),
-		playerZ0(plrZ0),
-		playerX1(plrX1),
-		playerY1(plrY1),
-		playerZ1(plrZ1)
 	{}
 
-    UseItemPacket(const ItemInstance* item, int entityId, const Vec3& aim, float plrX, float plrY, float plrZ,
+    UseItemPacket(const ItemInstance* item, int entityId, const Vec3& aim)
-	float plrX0, float plrY0, float plrZ0, float plrX1, float plrY1, float plrZ1)
     :   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)),
+        z((int)(aim.z * 32768.0f))
-		playerX(plrX),
-		playerY(plrY),
-		playerZ(plrZ),
-		playerX0(plrX0),
-		playerY0(plrY0),
-		playerZ0(plrZ0),
-		playerX1(plrX1),
-		playerY1(plrY1),
-		playerZ1(plrZ1)
     {
     }
 
@@ -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/platform/audio/SoundSystemAL.cpp

@@ -10,10 +10,13 @@
 static const char* errIdString = 0;
 
 void checkError() {
-    ALenum err = alGetError();
-    if(err == AL_NO_ERROR) return;
 
-    LOGI("### SoundSystemAL error: %d ####: %s\n", err, errIdString==0?"(none)":errIdString);
+    while (1) {
+        ALenum err = alGetError();
+        if(err == AL_NO_ERROR) return;
+
+        LOGI("### SoundSystemAL error: %d ####: %s\n", err, errIdString==0?"(none)":errIdString);
+    }
 }
 
 //typedef ALvoid	AL_APIENTRY	(*alBufferDataStaticProcPtr) (const ALint bid, ALenum format, ALvoid *data, ALsizei size, ALsizei freq);

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;
 }

src/server/ArgumentsSettings.h

@@ -4,27 +4,20 @@
 class ArgumentsSettings {
 public:
 	ArgumentsSettings(int numArguments, char** arguments);
-
 	std::string getExternalPath();
 	std::string getLevelName();
 	std::string getServerKey();
 	std::string getCachePath();
 	std::string getLevelDir();
-	std::string getGamemode();
-
 	bool getShowHelp();
-
 	int getPort();
 private:
 	std::string cachePath;
 	std::string externalPath;
 	std::string levelName;
-	std::string gamemode;
 	std::string levelDir;
 	std::string serverKey;
-
 	bool showHelp;
-	
 	int port;
 };
 

src/server/ServerLevel.cpp

@@ -12,19 +12,16 @@ ServerLevel::ServerLevel(LevelStorage* levelStorage, const std::string& levelNam
 void ServerLevel::updateSleepingPlayerList() {
 	bool allPlayersWasSleeping = allPlayersAreSleeping;
 	allPlayersAreSleeping = !players.empty();
-	
+	for(PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
-	for (PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
 		Player* player = *it;
-		
+		if(!player->isSleeping()) {
-		if (!player->isSleeping()) {
 			allPlayersAreSleeping = false;
 			break;
 		}
 	}
-	if (!allPlayersWasSleeping && allPlayersAreSleeping) {
+	if(!allPlayersWasSleeping && allPlayersAreSleeping) {
 		levelEvent(NULL, LevelEvent::ALL_PLAYERS_SLEEPING, 0, 0, 0, 0);
-		
+		for(PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
-		for (PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
 			(*it)->setAllPlayersSleeping();
 		}
 	}
@@ -32,26 +29,23 @@ void ServerLevel::updateSleepingPlayerList() {
 
 void ServerLevel::awakenAllPlayers() {
 	allPlayersAreSleeping = false;
-	
+	for(PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
-	for (PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
 		Player* player = *it;
-		
+		if(player->isSleeping()) {
-		if (player->isSleeping()) {
 			player->stopSleepInBed(false, false, true);
 			player->health = Player::MAX_HEALTH;
 			player->lastHealth = Player::MAX_HEALTH; 
 		}
 	}
-	
 	SetHealthPacket packet(Player::MAX_HEALTH);
 	raknetInstance->send(packet);
 }
 
 bool ServerLevel::allPlayersSleeping() {
-	if (allPlayersAreSleeping && !isClientSide) {
+	if(allPlayersAreSleeping && !isClientSide) {
 		// all players are sleeping, but have they slept long enough?
-		for (PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
+		for(PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
-			if (!(*it)->isSleepingLongEnough()) {
+			if(!(*it)->isSleepingLongEnough()) {
 				return false;
 			}
 		}
@@ -61,17 +55,13 @@ bool ServerLevel::allPlayersSleeping() {
 	return false;
 }
 
-void ServerLevel::tick() {
+void ServerLevel::tick(){
 	super::tick();
-
+	if(allPlayersSleeping()) {
-	if (allPlayersSleeping()) {
 		long newTime = levelData.getTime() + TICKS_PER_DAY;
-		
 		levelData.setTime(newTime - (newTime % TICKS_PER_DAY));
-		
 		SetTimePacket packet(levelData.getTime());
 		raknetInstance->send(packet);
-		
 		awakenAllPlayers();
 	}
 }

src/server/ServerPlayer.cpp

@@ -19,17 +19,14 @@
 #include "../network/packet/AnimatePacket.h"
 #include "../world/level/tile/entity/ChestTileEntity.h"
 #include "../network/packet/HurtArmorPacket.h"
-#include "network/packet/SendInventoryPacket.h"
-#include "world/entity/player/Inventory.h"
 
-ServerPlayer::ServerPlayer( Minecraft* minecraft, Level* level, bool proto)
+ServerPlayer::ServerPlayer( Minecraft* minecraft, Level* level )
 :   super(level, minecraft->isCreativeMode()),
 	_mc(minecraft),
 	_prevHealth(-999),
-	_containerCounter(0),
+	_containerCounter(0)
-	isNewProto(proto)
 {
-	// hasFakeInventory = true;
+	hasFakeInventory = true;
 	footSize = 0;
 }
 
@@ -70,16 +67,7 @@ void ServerPlayer::tick() {
 
 void ServerPlayer::take( Entity* e, int orgCount ) {
 	TakeItemEntityPacket packet(e->entityId, entityId);
-	// SendInventoryPacket packet(this, false);
 	_mc->raknetInstance->send(packet);
-	printf("TakeItemEntityPacket \n");
-
-	LOGI("Inventory:\n");
-	for (int i = 0; i < inventory->numLinkedSlots; i++) {
-		auto item = inventory->getItem(i);
-		if (item)
-			LOGI("\t %i: %s (%i)\n", i, item->getName().c_str(), item->count);
-	}
 
 	super::take(e, orgCount);
 }
@@ -130,20 +118,20 @@ bool ServerPlayer::hasResource( int id ) {
 void ServerPlayer::setContainerData( BaseContainerMenu* menu, int id, int value ) {
 	ContainerSetDataPacket p(menu->containerId, id, value);
 	_mc->raknetInstance->send(owner, p);
-	LOGI("Setting container data for id %d: %d\n", id, value);
+	//LOGI("Setting container data for id %d: %d\n", id, value);
 }
 
 void ServerPlayer::slotChanged( BaseContainerMenu* menu, int slot, const ItemInstance& item, bool isResultSlot ) {
 	if (isResultSlot) return;
 	ContainerSetSlotPacket p(menu->containerId, slot, item);
 	_mc->raknetInstance->send(owner, p);
-	LOGI("Slot %d changed\n", slot);
+	//LOGI("Slot %d changed\n", slot);
 }
 
 void ServerPlayer::refreshContainer( BaseContainerMenu* menu, const std::vector<ItemInstance>& items ) {
 	ContainerSetContentPacket p(menu->containerId, menu->getItems());
 	_mc->raknetInstance->send(owner, p);
-	LOGI("Refreshing container with %zu items\n", items.size());
+	//LOGI("Refreshing container with %d items\n", items.size());
 }
 
 void ServerPlayer::nextContainerCounter() {
@@ -175,12 +163,3 @@ void ServerPlayer::displayClientMessage( const std::string& messageId ) {
 	ChatPacket package(messageId);
 	_mc->raknetInstance->send(owner, package);
 }
-
-void ServerPlayer::causeFallDamage(float distance) {
-	int dmg = (int) ceil((distance - 3));
-	if (dmg > 0) {
-		SetHealthPacket packet(SetHealthPacket::HEALTH_MODIFY_OFFSET + dmg);
-		_mc->raknetInstance->send(owner, packet);
-	}
-	super::causeFallDamage(distance);
-}

src/server/ServerPlayer.h

@@ -15,7 +15,7 @@ class ServerPlayer: public Player,
 {
     typedef Player super;
 public:
-    ServerPlayer(Minecraft* minecraft, Level* level, bool proto);
+    ServerPlayer(Minecraft* minecraft, Level* level);
 
 	~ServerPlayer();
 
@@ -43,17 +43,6 @@ public:
 	virtual void stopSleepInBed(bool forcefulWakeUp, bool updateLevelList, bool saveRespawnPoint);
 
 	void completeUsingItem();
-	
-	void setLastMoveTicks(int lastMoveTicks) { this->lastMoveTicks = lastMoveTicks; }
-	int getLastMoveTicks() { return lastMoveTicks; }
-
-	void setTicksInAir(int ticksInAir) { this->ticksInAir = ticksInAir; }
-	int getTicksInAir() { return ticksInAir; }
-
-	void setNewProto(bool proto) { isNewProto = proto; }
-	bool getProto() { return isNewProto; }
-
-	virtual void causeFallDamage(float distance);
 private:
 	void nextContainerCounter();
 	void setContainerMenu( BaseContainerMenu* menu );
@@ -61,11 +50,6 @@ private:
 	Minecraft* _mc;
     int _prevHealth;
 	int _containerCounter;
-
-	int lastMoveTicks = 0;
-	int ticksInAir = 0;
-
-	bool isNewProto = false;
 };
 
 #endif /*ServerPlayer_H__*/