Fix to prevent text overlap in options list during scroll

Fix bottom settings overlapping with Credits button
Added scroll with wheel on PC and touch scroll on Android/IOS
2026-04-26 16:12:56 +02:00 · 2026-04-26 16:00:44 +02:00 · 2026-04-26 15:47:52 +02:00
71 changed files with 1148 additions and 4704 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,7 +312,6 @@ if(UNIX)
    target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")

    target_include_directories("${PROJECT_NAME}-server" PUBLIC 
-        "${CMAKE_SOURCE_DIR}/glad/include/"
        "${CMAKE_SOURCE_DIR}/src/"
        "project/lib_projects/raknet/jni/RaknetSources"
    )
@@ -339,11 +338,7 @@ if(${PLATFORM} MATCHES "Web")
    
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EM_FLAGS}")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EM_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file \"${CMAKE_SOURCE_DIR}/data@/data\"")
-    set_target_properties(${PROJECT_NAME} PROPERTIES RULE_LAUNCH_LINK "set EMCC_WASM_OPT=0 &&")
-    # Remove -g (DWARF) to prevent wasm-opt post-link optimizations from running
-    string(REPLACE "-g" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-    string(REPLACE "-g" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data")

    target_compile_options(${PROJECT_NAME} PUBLIC
        "-Os"
@@ -359,7 +354,7 @@ if(${PLATFORM} MATCHES "Web")
        "-sFORCE_FILESYSTEM=1"
        "-sLEGACY_GL_EMULATION=1"
        "-sGL_UNSAFE_OPTS=0"
-        "-sEMULATE_FUNCTION_POINTER_CASTS=0"
+        "-sEMULATE_FUNCTION_POINTER_CASTS=1"
        "-sALLOW_TABLE_GROWTH=1"
        "-sEXPORTED_RUNTIME_METHODS=['FS','stringToUTF8','UTF8ToString','cwrap','ccall','HEAP8','HEAPU8','HEAP32','HEAPU32']"
        "-sEXPORTED_FUNCTIONS=['_main']"
@@ -408,10 +403,6 @@ else()
        TARGET ${PROJECT_NAME} 
        POST_BUILD
            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/misc/web/index.html" $<TARGET_FILE_DIR:${PROJECT_NAME}>
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/misc/web/coi-serviceworker.js" $<TARGET_FILE_DIR:${PROJECT_NAME}>
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/misc/web/manifest.json" $<TARGET_FILE_DIR:${PROJECT_NAME}>
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/misc/web/icon-192.png" $<TARGET_FILE_DIR:${PROJECT_NAME}>
-            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/misc/web/icon-512.png" $<TARGET_FILE_DIR:${PROJECT_NAME}>
    )
 endif()

--- a/README.md
+++ b/README.md
@@ -176,7 +176,7 @@ cmake --build .
 2. Configure and build project:
   ```
   mkdir build && cd build
-   cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$env:EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+   cmake .. -B . -G Ninja "-DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
   cmake --build . --target MinecraftPE
   ```
   > [!Note]
--- a/data/images/misc/water.png
+++ b/data/images/misc/water.png
--- a/data/images/terrain/moon.png
+++ b/data/images/terrain/moon.png
--- a/data/images/terrain/sun.png
+++ b/data/images/terrain/sun.png
--- a/data/lang/en_US.lang
+++ b/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
@@ -207,7 +195,6 @@ options.graphics.fancy=Fancy
 options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
-options.guiScale.tiny=Tiny
 options.guiScale.small=Small
 options.guiScale.medium=Medium
 options.guiScale.large=Large
@@ -226,17 +213,10 @@ options.smoothCamera=Smooth camera
 options.destroyVibration=Destroy vibration
 options.isLeftHanded=Left handed
 options.useTouchscreen=Use touchscreen
-options.touchOverride=Touch Mode Override
 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
--- a/misc/web/coi-serviceworker.js
+++ b/misc/web/coi-serviceworker.js
@@ -1,26 +0,0 @@
-/* coi-serviceworker.js - Cross-Origin Isolation + PWA support */
-
-// Service Worker context
-self.addEventListener("install", () => self.skipWaiting());
-
-self.addEventListener("activate", (event) =>
-  event.waitUntil(self.clients.claim())
-);
-
-self.addEventListener("fetch", (event) => {
-  if (event.request.method !== "GET") return;
-  event.respondWith(
-    fetch(event.request).then((response) => {
-      if (response.status === 0 || response.type === "opaque") return response;
-      const headers = new Headers(response.headers);
-      headers.set("Cross-Origin-Embedder-Policy", "require-corp");
-      headers.set("Cross-Origin-Opener-Policy", "same-origin");
-      headers.set("Cross-Origin-Resource-Policy", "cross-origin");
-      return new Response(response.body, {
-        status: response.status,
-        statusText: response.statusText,
-        headers,
-      });
-    }).catch(() => fetch(event.request))
-  );
-});
--- a/misc/web/icon-192.png
+++ b/misc/web/icon-192.png
--- a/misc/web/icon-512.png
+++ b/misc/web/icon-512.png
--- a/misc/web/index.html
+++ b/misc/web/index.html
@@ -2,12 +2,6 @@
 <html lang="en">
 <head>
  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="manifest" href="manifest.json">
-  <meta name="theme-color" content="#000000">
-  <meta name="mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <link rel="apple-touch-icon" href="icon-192.png">
  <title>MCPE 0.6.1</title>
  <style>
    html, body {
@@ -22,10 +16,6 @@
      width: 100vw;
      height: 100vh;
      display: block;
-      touch-action: none;
-      user-select: none;
-      -webkit-user-select: none;
-      -webkit-tap-highlight-color: transparent;
    }
  </style>
 </head>
@@ -33,40 +23,6 @@

 <canvas id="canvas"></canvas>

-<script>
-  if ('serviceWorker' in navigator) {
-    var reloadedForSw = false;
-    navigator.serviceWorker.register('./coi-serviceworker.js', { scope: './' }).then(function () {
-      navigator.serviceWorker.addEventListener('controllerchange', function () {
-        if (reloadedForSw) return;
-        reloadedForSw = true;
-        window.location.reload();
-      });
-    }).catch(function (error) {
-      console.warn('Service worker registration failed:', error);
-    });
-  }
-</script>
-
-<script>
-  function isAndroid() {
-    return /Android/i.test(navigator.userAgent || '');
-  }
-
-  function lockLandscapeOnAndroid() {
-    if (!isAndroid()) return;
-
-    var orientation = screen.orientation;
-    if (!orientation || typeof orientation.lock !== 'function') return;
-
-    orientation.lock('landscape').catch(function () {});
-  }
-
-  lockLandscapeOnAndroid();
-  window.addEventListener('pointerdown', lockLandscapeOnAndroid, { once: true });
-  window.addEventListener('touchstart', lockLandscapeOnAndroid, { once: true, passive: true });
-</script>
-
 <script>
  var Module = {
    canvas: document.getElementById('canvas'),
--- a/misc/web/manifest.json
+++ b/misc/web/manifest.json
@@ -1,25 +0,0 @@
-{
-  "name": "MCPE 0.6.1",
-  "short_name": "MCPE 0.6.1",
-  "description": "Minecraft Pocket Edition 0.6.1 Alpha - Web Build",
-  "id": "./",
-  "start_url": "./",
-  "scope": "./",
-  "display_override": ["standalone"],
-  "display": "standalone",
-  "orientation": "landscape",
-  "background_color": "#000000",
-  "theme_color": "#000000",
-  "icons": [
-    {
-      "src": "icon-192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "icon-512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ]
-}
--- a/project/android/assets/lang/en_US.lang
+++ b/project/android/assets/lang/en_US.lang
@@ -167,7 +167,6 @@ options.graphics.fancy=Fancy
 options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
-options.guiScale.tiny=Tiny
 options.guiScale.small=Small
 options.guiScale.medium=Medium
 options.guiScale.large=Large
--- a/project/android_java/assets/lang/en_US.lang
+++ b/project/android_java/assets/lang/en_US.lang
@@ -167,7 +167,6 @@ options.graphics.fancy=Fancy
 options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
-options.guiScale.tiny=Tiny
 options.guiScale.small=Small
 options.guiScale.medium=Medium
 options.guiScale.large=Large
--- a/project/android_java/src/com/mojang/minecraftpe/sound/SoundPlayer.java
+++ b/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"),
--- a/src/NinecraftApp.cpp
+++ b/src/NinecraftApp.cpp
@@ -115,11 +115,10 @@ void NinecraftApp::init()
 	LOGI("This: %p\n", this);
 	screenChooser.setScreen(SCREEN_STARTMENU);

-	// Disabled: Show username screen on first launch
-	// if (options.getBooleanValue(OPTIONS_FIRST_LAUNCH)) {
-	// 	options.toggle(OPTIONS_FIRST_LAUNCH);
-	// 	setScreen(new UsernameScreen());
-	// }
+	if (options.getBooleanValue(OPTIONS_FIRST_LAUNCH)) {
+		options.toggle(OPTIONS_FIRST_LAUNCH);
+		setScreen(new UsernameScreen());
+	}
 #else
 	hostMultiplayer();
 #endif
--- a/src/client/Minecraft.cpp
+++ b/src/client/Minecraft.cpp
@@ -8,7 +8,6 @@
 #include <string>
 #include <cstdlib>

-
 #if defined(APPLE_DEMO_PROMOTION)
    #define NO_NETWORK
 #endif
@@ -92,9 +91,6 @@
 #include "gamemode/CreatorMode.h"

 #include "../world/level/GrassColor.h"
-#include "renderer/LevelRenderer.h"
-#include "particle/ParticleEngine.h"
-#include "../world/level/Level.h"
 static void checkGlError(const char* tag) {
 #ifdef GLDEBUG
 	while (1) {
@@ -479,20 +475,19 @@ void Minecraft::update() {
 #ifndef STANDALONE_SERVER
 	Multitouch::resetThisUpdate();
 #endif
-
-#ifndef STANDALONE_SERVER
 	TIMER_POP();
+#ifndef STANDALONE_SERVER
 	checkGlError("Update finished");

 	if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-		//#ifndef PLATFORM_DESKTOP
+#ifndef PLATFORM_DESKTOP
 		if (!PerfTimer::enabled) {
 			PerfTimer::reset();
 			PerfTimer::enabled = true;
 		}
 		_perfRenderer->renderFpsMeter(1);
 		checkGlError("render debug");
-		//#endif
+#endif
 	} else {
 		PerfTimer::enabled = false;
 	}
@@ -834,16 +829,10 @@ void Minecraft::tickInput() {
 				}
 			#endif

-			if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-				if (key >= '0' && key <= '9') {
-					_perfRenderer->debugFpsMeterKeyPress(key - '0');
-				}
-			}
-
 			if (key == Keyboard::KEY_ESCAPE)
 				pauseGame(false);

-#ifdef PLATFORM_DESKTOP
+			#ifndef OPENGL_ES
 				if (key == Keyboard::KEY_P) {
 					static bool isWireFrame = false;
 					isWireFrame = !isWireFrame;
@@ -864,7 +853,6 @@ void Minecraft::tickInput() {
 	
 	static bool prevMouseDownLeft = false;

-	if (!useTouchscreen()) {
 	if (Mouse::getButtonState(MouseAction::ACTION_LEFT) == 0) {
 		gameMode->stopDestroyBlock();
 	}
@@ -872,7 +860,6 @@ void Minecraft::tickInput() {
 	if (!Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
 		gameMode->releaseUsingItem(player);
 	}
-	}

 	if (useTouchscreen()) {
 		// Touch: gesture recognizer classifies the action type (turn/destroy/build)
@@ -1125,9 +1112,6 @@ bool Minecraft::useTouchscreen() {
 #elif defined(RPI)
 	return false;
 #endif
-	if (options.getBooleanValue(OPTIONS_TOUCH_OVERRIDE)) {
-		return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN);
-	}
 	return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN) && !_supportsNonTouchscreen;
 }
 bool Minecraft::supportNonTouchScreen() {
@@ -1147,8 +1131,7 @@ void Minecraft::init()
 	textures->addDynamicTexture(new WaterSideTexture());
 	textures->addDynamicTexture(new LavaTexture());
 	textures->addDynamicTexture(new LavaSideTexture());
-	textures->addDynamicTexture(new FireTexture(0));
-	textures->addDynamicTexture(new FireTexture(1));
+	textures->addDynamicTexture(new FireTexture());
 	gui.texturesLoaded(textures);

 	levelRenderer = new LevelRenderer(this);
@@ -1165,18 +1148,14 @@ void Minecraft::init()
 	// now i can finally initialize foliage color, probably not the best way to handle this but i cant be arsed rn
 	FoliageColor::init(foliagePixels);

-	TextureId grassId = (textures->loadTexture("misc/grasscolor.png")); // loading the uh png for foliage color
-	int* grassPixels = textures->loadTexturePixels(grassId, "misc/grasscolor.png");
+	TextureId grassId = (textures->loadTexture("misc/foliagecolor.png")); // loading the uh png for foliage color
+	int* grassPixels = textures->loadTexturePixels(grassId, "misc/foliagecolor.png");
 	GrassColor::init(grassPixels);
 	
 	bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);

-	bool sideTint = options.getBooleanValue(OPTIONS_TINTED_SIDE);
-	TileRenderer::setUseTint(sideTint);
-
-
 	// Platform specific initialization here
 	font = new Font(&options, "font/default8.png", textures);

@@ -1197,37 +1176,18 @@ void Minecraft::setSize(int w, int h) {

 	width  = w;
 	height = h;
-	int screenWidth;
-	int screenHeight;
-	//#ifdef PLATFORM_DESKTOP
-	if (options.getBooleanValue(OPTIONS_WINDOW_SCALE)){ // scales with resolution using a formula instead of having hardcoded if checks
-		int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);
-		if (guiScale == 0) {
-			guiScale = 1000;
-		}
-
-		// determine gui scale, optionally overriding auto
-
-
-		Gui::GuiScale = (float)Mth::Min(guiScale, Mth::Max(1, Mth::Min(width / 320, height / 240)));
-
-
-
-	} else {
-

 	int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);

 	// determine gui scale, optionally overriding auto
 	if (guiScale != 0) {
-			// manual selection: 1->tiny, 2->small, 3->medium, 4->large, 5->larger, 6->largest
+		// manual selection: 1->small, 2->medium, 3->large, 4->larger, 5->largest
 		switch (guiScale) {
-			case 1: Gui::GuiScale = 1.0f; break;
-			case 2: Gui::GuiScale = 2.0f; break;
-			case 3: Gui::GuiScale = 3.0f; break;
-			case 4: Gui::GuiScale = 4.0f; break;
-			case 5: Gui::GuiScale = 5.0f; break;
-			case 6: Gui::GuiScale = 6.0f; break;
+		case 1: Gui::GuiScale = 2.0f; break;
+		case 2: Gui::GuiScale = 3.0f; break;
+		case 3: Gui::GuiScale = 4.0f; break;
+		case 4: Gui::GuiScale = 5.0f; break;
+		case 5: Gui::GuiScale = 6.0f; break;
 		default: Gui::GuiScale = 1.0f; break; // auto
 		}
 	} else {
@@ -1252,7 +1212,9 @@ void Minecraft::setSize(int w, int h) {
 			Gui::GuiScale = 1.0f;
 	}

-
+	Gui::InvGuiScale = 1.0f / Gui::GuiScale;
+	int screenWidth  = (int)(width  * Gui::InvGuiScale);
+	int screenHeight = (int)(height * Gui::InvGuiScale);

 	// if (platform()) {
 	// 	float pixelsPerMillimeter = options.getProgressValue(&Option::PIXELS_PER_MILLIMETER);
@@ -1260,13 +1222,6 @@ void Minecraft::setSize(int w, int h) {
 	// 	pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
 	// }

-	}
-
-
-	Gui::InvGuiScale = 1.0f / Gui::GuiScale;
-	screenWidth  = (int)(width  * Gui::InvGuiScale);
-	screenHeight = (int)(height * Gui::InvGuiScale);
-
 	Config config = createConfig(this);
 	gui.onConfigChanged(config);
    
@@ -1287,15 +1242,16 @@ void Minecraft::setSize(int w, int h) {

 void Minecraft::reloadOptions() {
 	options.save();
+	bool wasTouchscreen = options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN);
+	options.set(OPTIONS_USE_TOUCHSCREEN, useTouchscreen());
+	options.save();

-	bool useTouch = useTouchscreen();
+	if ((wasTouchscreen != useTouchscreen()) || (inputHolder == 0))
 		_reloadInput();

-	gui.refreshTouchState();
-
 	// user->name = options.username;

-	LOGI("Reloading-options (touch=%d)\n", useTouch);
+	LOGI("Reloading-options\n");

    // @todo @fix Android and iOS behaves a bit differently when leaving
    //            an options screen (Android recreates OpenGL surface)
@@ -1451,8 +1407,8 @@ void Minecraft::_levelGenerated()
 	}

 	    if (level && level->dimension) {
-
-		level->dimension->FogType = options.getIntValue(OPTIONS_FOG_TYPE);
+        // For example, if you want FogType or any other option
+        level->dimension->FogType = options.getBooleanValue(OPTIONS_FOG_TYPE);
 		}


@@ -1481,34 +1437,6 @@ void Minecraft::_levelGenerated()
 	_hasSignaledGeneratingLevelFinished = true;
 }

-std::string Minecraft::gatherStats1() {
-#ifndef STANDALONE_SERVER
-	return levelRenderer->gatherStats1();
-#endif
-	return "Blank";
-}
-
-std::string Minecraft::gatherStats2() {
-#ifndef STANDALONE_SERVER
-	return levelRenderer->gatherStats2();
-#endif
-	return "Blank";
-}
-
-std::string Minecraft::gatherStats3() {
-#ifndef STANDALONE_SERVER
-	return ("P: " + particleEngine->countParticles() + ". T: " + (level->gatherStats()));
-#endif
-	return "Blank";
-}
-
-std::string Minecraft::gatherStats4() {
-	return level->gatherChunkSourceStats();
-}
-
-
-
-
 Player* Minecraft::respawnPlayer(int playerId) {
 	for (unsigned int i = 0; i < level->players.size(); ++i) {
 		if (level->players[i]->entityId == playerId) {
--- a/src/client/Minecraft.h
+++ b/src/client/Minecraft.h
@@ -87,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();

--- a/src/client/OptionStrings.cpp
+++ b/src/client/OptionStrings.cpp
@@ -22,5 +22,3 @@ const char* OptionStrings::Controls_AutoJump  = "ctrl_autojump";

 const char* OptionStrings::Game_DifficultyLevel = "game_difficulty";

-const char* OptionStrings::Tweaks_TouchOverride = "options.touchOverride";
-
--- a/src/client/OptionStrings.h
+++ b/src/client/OptionStrings.h
@@ -30,7 +30,6 @@ public:

    static const char* Tweaks_Sprint;
    static const char* Tweaks_BarOnTop;
-    static const char* Tweaks_TouchOverride;

 };

--- a/src/client/Options.cpp
+++ b/src/client/Options.cpp
@@ -27,14 +27,14 @@ OptionBool autoJump("autoJump", true);
 OptionFloat flySpeed("flySpeed", 1.f);
 OptionFloat cameraSpeed("cameraSpeed", 1.f);

-OptionInt guiScale("guiScale", 0, 0, 6);
+OptionInt guiScale("guiScale", 0, 0, 5);

 OptionString skin("skin", "Default");

 #ifdef RPI
-OptionString username("username", "test");
+OptionString username("username", "StevePi");
 #else 
-OptionString username("username", "test");
+OptionString username("username", "Steve");
 #endif

 OptionBool destroyVibration("destroyVibration", true);
@@ -58,14 +58,8 @@ OptionBool ambientOcclusion("ao", true);

 OptionBool useNormalLighting("normalLighting", true);

-OptionBool beautifulSky("beautifulSky", true);
-
-OptionBool useVignette("useVignette", true);
-
 OptionBool useTouchscreen("useTouchscreen", true);

-OptionBool touchOverride("touchOverride", false);
-
 OptionBool serverVisible("servervisible", true);

 OptionBool foliageTint("foliagetint", true);
@@ -74,20 +68,10 @@ 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);
@@ -140,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;
@@ -167,20 +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_TOUCH_OVERRIDE] = &touchOverride;
-
    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;
@@ -208,12 +183,6 @@ void Options::initTable() {
 	// 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;
--- a/src/client/Options.h
+++ b/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,
@@ -92,14 +90,6 @@ enum OptionId {
 	OPTIONS_FOG_TYPE,
 	OPTIONS_JAVA_HUD,
 	OPTIONS_RESTORED_ANIMS,
-	OPTIONS_TOUCH_OVERRIDE,
-	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
 };
--- a/src/client/gui/Gui.cpp
+++ b/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
-	if (minecraft->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && minecraft->options.getBooleanValue(OPTIONS_VIGNETTE)){
-			renderVignette(this->minecraft->player->getBrightness(a), screenWidth, screenHeight);
-		}
+	// @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)){
+	//		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;
@@ -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);
 }
@@ -423,10 +417,6 @@ void Gui::inventoryUpdated() {
 	_inventoryNeedsUpdate = true;
 }

-void Gui::refreshTouchState() {
-	_openInventorySlot = minecraft->useTouchscreen();
-}
-
 void Gui::onGraphicsReset() {
 	inventoryUpdated();
 }
@@ -736,20 +726,13 @@ void Gui::onLevelGenerated() {

 void Gui::renderDebugInfo() {
 	// FPS counter (updates once per second)
-	static int fps = 0;
-	static int fpsLastTime = 0;
+	static float fps = 0.0f;
+	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;
 	}
@@ -787,47 +770,6 @@ void Gui::renderDebugInfo() {
 	long seed      = lvl ? lvl->getSeed() : 0;

 	// 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);
-	}
-	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);
@@ -842,7 +784,7 @@ 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++) {
@@ -866,7 +808,6 @@ void Gui::renderDebugInfo() {
 	}
 	t.endOverrideAndDraw();
 }
-}

 void Gui::renderPlayerList(Font* font, int screenWidth, int screenHeight) {
 	// only show when in game, no other screen
--- a/src/client/gui/Gui.h
+++ b/src/client/gui/Gui.h
@@ -71,7 +71,6 @@ public:

    void onGraphicsReset();
 	void inventoryUpdated();
-	void refreshTouchState();

 	void setNowPlaying(const std::string& string);
 	void displayClientMessage(const std::string& messageId);
--- a/src/client/gui/components/OptionsItem.cpp
+++ b/src/client/gui/components/OptionsItem.cpp
@@ -27,12 +27,11 @@ void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 		std::string scaleText;
 		switch (value) {
 		case 0: scaleText = I18n::get("options.guiScale.auto"); break;
-		case 1: scaleText = I18n::get("options.guiScale.tiny"); break;
-		case 2: scaleText = I18n::get("options.guiScale.small"); break;
-		case 3: scaleText = I18n::get("options.guiScale.medium"); break;
-		case 4: scaleText = I18n::get("options.guiScale.large"); break;
-		case 5: scaleText = I18n::get("options.guiScale.larger"); break;
-		case 6: scaleText = I18n::get("options.guiScale.largest"); break;
+		case 1: scaleText = I18n::get("options.guiScale.small"); break;
+		case 2: scaleText = I18n::get("options.guiScale.medium"); break;
+		case 3: scaleText = I18n::get("options.guiScale.large"); break;
+		case 4: scaleText = I18n::get("options.guiScale.larger"); break;
+		case 5: scaleText = I18n::get("options.guiScale.largest"); break;
 		default: scaleText = I18n::get("options.guiScale.auto"); break;
 		}
 		text += ": " + scaleText;
@@ -47,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);
--- a/src/client/gui/screens/DeathScreen.cpp
+++ b/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);
--- a/src/client/gui/screens/IngameBlockSelectionScreen.cpp
+++ b/src/client/gui/screens/IngameBlockSelectionScreen.cpp
@@ -12,7 +12,6 @@
 #include "../../renderer/Textures.h"
 #include "../../gamemode/GameMode.h"
 #include "ArmorScreen.h"
-#include "crafting/WorkbenchScreen.h"
 #include "../components/Button.h"

 #if defined(__APPLE__)
@@ -28,8 +27,7 @@ IngameBlockSelectionScreen::IngameBlockSelectionScreen()
 	InventoryRows(1),
 	InventoryCols(1),
 	InventorySize(1),
-	bArmor(1, "Armor"),
-	bCrafting(1, "Crafting")
+	bArmor(1, "Armor")
 {
 }

@@ -45,19 +43,6 @@ void IngameBlockSelectionScreen::init()
 							(float)getSlotPosX(InventoryCols) + 4, 
 							(float)getSlotPosY(InventoryRows) + 4);

-	if (!minecraft->isCreativeMode()) {
-		bArmor.width = 42;
-		bCrafting.width = 42;
-
-		bArmor.x = 0;
-		bArmor.y = height - bArmor.height;
-
-		bCrafting.x = 0;
-		bCrafting.y = height - bCrafting.height - 30;
-		buttons.push_back(&bArmor);
-		buttons.push_back(&bCrafting);
-	}
-
 	ItemInstance* selected = inventory->getSelected();
 	if (!selected || selected->isNull()) {
 		selectedItem = 0;
@@ -73,6 +58,13 @@ void IngameBlockSelectionScreen::init()
 	}
 	if (!isAllowed(selectedItem))
 		selectedItem = 0;
+
+	if (!minecraft->isCreativeMode()) {
+		bArmor.width = 42;
+		bArmor.x = 0;
+		bArmor.y = height - bArmor.height;
+		buttons.push_back(&bArmor);
+	}
 }

 void IngameBlockSelectionScreen::removed()
@@ -132,7 +124,7 @@ void IngameBlockSelectionScreen::renderSlots()
 	//w.printEvery(1000, "render-blocksel");

 	glDisable2(GL_RESCALE_NORMAL);
-	Lighting::turnOff();
+	Lighting::turnOn(minecraft);
 }

 int IngameBlockSelectionScreen::getSlotPosX(int slotX) {
@@ -257,7 +249,7 @@ void IngameBlockSelectionScreen::mouseClicked(int x, int y, int buttonNum)
 			//minecraft->soundEngine->playUI("random.click", 1, 1);
 		} else {
 			_pendingQuit = !_area.isInside((float)x, (float)y)
-			            && !bArmor.isInside(x, y) && !bCrafting.isInside(x, y);
+			            && !bArmor.isInside(x, y);
 		}
 	}
 	if (!_pendingQuit)
@@ -346,8 +338,5 @@ void IngameBlockSelectionScreen::buttonClicked( Button* button )
 	if (button == &bArmor) {
 		minecraft->setScreen(new ArmorScreen());
 	}
-	if (button == &bCrafting) {
-		minecraft->setScreen(new WorkbenchScreen(Recipe::SIZE_2X2));
-	}
 	super::buttonClicked(button);
 }
--- a/src/client/gui/screens/IngameBlockSelectionScreen.h
+++ b/src/client/gui/screens/IngameBlockSelectionScreen.h
@@ -52,7 +52,6 @@ private:
 	bool _pendingQuit;

 	Button bArmor;
-	Button bCrafting;

 	RectangleArea _area;
 };
--- a/src/client/gui/screens/OptionsScreen.cpp
+++ b/src/client/gui/screens/OptionsScreen.cpp
@@ -148,7 +148,7 @@ void OptionsScreen::removed() {

 void OptionsScreen::buttonClicked(Button* button) {
 	if (button == btnClose) {
-		minecraft->reloadOptions();
+		minecraft->options.save();
 		if (minecraft->screen != NULL) {
 			minecraft->setScreen(NULL);
 		} else {
@@ -195,11 +195,10 @@ void OptionsScreen::generateOptionScreens() {
 		.addOptionItem(OPTIONS_SENSITIVITY, minecraft);

 	// Game Pane
-	optionPanes[1]->addOptionItem(OPTIONS_GUI_SCALE, minecraft)
-		.addOptionItem(OPTIONS_DIFFICULTY, minecraft)
+	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)
 		.addOptionItem(OPTIONS_SOUND_VOLUME, minecraft)
@@ -225,27 +224,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_BEAUTIFUL_SKY, minecraft)
-		.addOptionItem(OPTIONS_VIGNETTE, minecraft);
+		.addOptionItem(OPTIONS_NORMAL_LIGHTING, minecraft);

-	optionPanes[4]->addOptionItem(OPTIONS_TOUCH_OVERRIDE, minecraft)
-		.addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
+	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
-		.addOptionItem(OPTIONS_MENU_STYLE, minecraft)
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
 		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
-		.addOptionItem(OPTIONS_TINTED_SIDE, minecraft)
 		.addOptionItem(OPTIONS_JAVA_HUD, minecraft)
 		.addOptionItem(OPTIONS_FOG_TYPE, minecraft)
-		.addOptionItem(OPTIONS_BETA_SKY, minecraft)
-		.addOptionItem(OPTIONS_RESTORED_ANIMS, minecraft)
-		.addOptionItem(OPTIONS_DEBUG_STYLE, minecraft);
+		.addOptionItem(OPTIONS_RESTORED_ANIMS, minecraft);
 		
 }

@@ -273,7 +264,7 @@ void OptionsScreen::keyPressed(int eventKey) {
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->keyPressed(minecraft, eventKey);
 	if (eventKey == Keyboard::KEY_ESCAPE) 
-		minecraft->reloadOptions();
+		minecraft->options.save();

 	super::keyPressed(eventKey);
 }
--- a/src/client/gui/screens/PauseScreen.cpp
+++ b/src/client/gui/screens/PauseScreen.cpp
@@ -48,27 +48,20 @@ PauseScreen::~PauseScreen() {
 }

 void PauseScreen::init() {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bContinue = new Touch::TButton(1, "Back to game");
 		bOptions = new Touch::TButton(5, "Options");
 		bQuit = new Touch::TButton(2, "Quit to title");
 		bQuitAndSaveLocally = new Touch::TButton(3, "Quit and copy map");
 		bServerVisibility = new Touch::TButton(4, "");
 //		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
-	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
+	} else {
 		bContinue = new Button(1, "Back to game");
 		bOptions = new Button(5, "Options");
 		bQuit = new Button(2, "Quit to title");
 		bQuitAndSaveLocally = new Button(3, "Quit and copy map");
 		bServerVisibility = new Button(4, "");
 //		bThirdPerson = new Button(5, "Toggle 3:rd person view");
-	} else {
-		bContinue = new Button(1, 0, 0, 200, 20, "Back to game");
-		bServerVisibility = new Button(4, 0, 0, 200, 20, "");
-		bOptions = new Button(5, 0, 0, 200, 20, "Options...");
-		bQuit = new Button(2, 0, 0, 200, 20, "Save and quit to title");
-		bQuitAndSaveLocally = new Button(3, 0, 0, 200, 20, "Copy and quit map");
-		//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
 	}

 	buttons.push_back(bContinue);
@@ -112,25 +105,7 @@ void PauseScreen::init() {
 void PauseScreen::setupPositions() {
    saveStep = 0;
 	int yBase = 16;
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
-		yBase = 50;

-		bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 200;
-		bQuitAndSaveLocally->width = bServerVisibility->width = 200;
-
-		bContinue->x = (width - bContinue->width) / 2;
-		bContinue->y = yBase + 24 * 1;
-
-		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 24 * 2;
-
-		bOptions->x = (width - bOptions->width) / 2;
-		bOptions->y = yBase + 24 * 3 + 24;
-
-		bQuit->x = (width - bQuit->width) / 2;
-		bQuit->y = yBase + 24 * 4 + 24;
-
-	} else {
 	bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 160;
 	bQuitAndSaveLocally->width = bServerVisibility->width = 160;

@@ -149,9 +124,6 @@ void PauseScreen::setupPositions() {
    
 	bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
 	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;
-	}
-
-

 	// bSound.y = bThirdPerson.y = 8;
 	// bSound.x = 4;
--- a/src/client/gui/screens/ScreenChooser.cpp
+++ b/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;
--- a/src/client/gui/screens/SimpleChooseLevelScreen.cpp
+++ b/src/client/gui/screens/SimpleChooseLevelScreen.cpp
@@ -118,15 +118,22 @@ void SimpleChooseLevelScreen::setupPositions()
    bGamemode->x = centerX - totalButtonWidth / 2;
    bCheats->x = bGamemode->x + buttonWidth + buttonSpacing;

-    // position Survival/Cheats buttons below the seed field
-    int buttonY = tSeed.y + tSeed.height + 20;
-    bGamemode->y = buttonY;
-    bCheats->y = buttonY;
+    // compute vertical centre for buttons in remaining space
+    {
+        int bottomPad = 20;
+        int availTop = buttonHeight + 20 + 30 + 10; // just below seed
+        int availBottom = height - bottomPad - bCreate->height - 10; // leave some gap before create
+        int availHeight = availBottom - availTop;
+        if (availHeight < 0) availHeight = 0;
+        int y = availTop + (availHeight - bGamemode->height) / 2;
+        bGamemode->y = y;
+        bCheats->y = y;
+    }

-    // position Create button just below with a small gap
    bCreate->width = 100;
    bCreate->x = centerX - bCreate->width / 2;
-    bCreate->y = buttonY + bGamemode->height + 40;
+    int bottomPadding = 20;
+    bCreate->y = height - bottomPadding - bCreate->height;
 }

 void SimpleChooseLevelScreen::tick()
--- a/src/client/gui/screens/StartMenuScreen.cpp
+++ b/src/client/gui/screens/StartMenuScreen.cpp
@@ -23,62 +23,49 @@

 // Some kind of default settings, might be overridden in ::init
 StartMenuScreen::StartMenuScreen()
+:	bHost(    2, 0, 0, 160, 24, "Start Game"),
+	bJoin(    3, 0, 0, 160, 24, "Join Game"),
+	bOptions( 4, 0, 0, 160, 24, "Options"),
+	bQuit(    5, "")
 {
 }

 StartMenuScreen::~StartMenuScreen()
 {
-	delete bHost;
-	delete bJoin;
-	delete bOptions;
-	delete bQuit;
 }

 void StartMenuScreen::init()
 {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
-		bHost = new Button(    2, 0, 0, 200, 20, "Singleplayer");
-		bJoin = new Button(    3, 0, 0, 200, 20, "Multiplayer");
-		bOptions = new Button( 4, 0, 0, 200, 20, "Options...");
-		bQuit = new Button( 5, 0, 0, 200, 20, "Ouit Game");
-	} else {
-		bHost = new Button(    2, 0, 0, 160, 24, "Start Game");
-		bJoin = new Button(    3, 0, 0, 160, 24, "Join Game");
-		bOptions = new Button( 4, 0, 0, 160, 24, "Options");
-		bQuit = new Button( 5, 0, 0, 160, 24, "Ouit Game");
-	}
-	bJoin->active = bHost->active = bOptions->active = true;
+	bJoin.active = bHost.active = bOptions.active = true;

 	if (minecraft->options.getStringValue(OPTIONS_USERNAME).empty()) {
 		return; // tick() will redirect to UsernameScreen
 	}

-	buttons.push_back(bHost);
-	buttons.push_back(bJoin);
+	buttons.push_back(&bHost);
+	buttons.push_back(&bJoin);
 	//buttons.push_back(&bTest);
-	buttons.push_back(bQuit);

-	tabButtons.push_back(bHost);
-	tabButtons.push_back(bJoin);
-	tabButtons.push_back(bQuit);
+	tabButtons.push_back(&bHost);
+	tabButtons.push_back(&bJoin);

 	#ifndef RPI
-		buttons.push_back(bOptions);
-		tabButtons.push_back(bOptions);
+		buttons.push_back(&bOptions);
+		tabButtons.push_back(&bOptions);
 	#endif

-    //// add quit button (top right X icon) – match OptionsScreen style
-    //{
-    //    ImageDef def;
-    //    def.name = "gui/touchgui.png";
-    //    def.width = 34;
-    //    def.height = 26;
-    //    def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
-    //    bQuit.setImageDef(def, true);
-    //    bQuit.scaleWhenPressed = false;
-    //    buttons.push_back(&bQuit);
-    //    // don't include in tab navigation
-    //}
+    // add quit button (top right X icon) – match OptionsScreen style
+    {
+        ImageDef def;
+        def.name = "gui/touchgui.png";
+        def.width = 34;
+        def.height = 26;
+        def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
+        bQuit.setImageDef(def, true);
+        bQuit.scaleWhenPressed = false;
+        buttons.push_back(&bQuit);
+        // don't include in tab navigation
+    }

 	copyright = "\xffMojang AB";//. Do not distribute!";

@@ -106,30 +93,20 @@ void StartMenuScreen::init()
 }

 void StartMenuScreen::setupPositions() {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
-		int yBase = (height / 2) - 20;
-
-		bHost->y =	 yBase;
-		bJoin->y =	 bHost->y + 24;
-		bOptions->y = bJoin->y + 24;
-		bQuit->y = bOptions->y + 24;
-	} else {
 	int yBase = height / 2;
-		bHost->y =	 yBase;
-		bJoin->y =	 bHost->y + 24 + 4;
-		bOptions->y = bJoin->y + 24 + 4;
-		bQuit->y = bOptions->y + 24 + 4;
-	}
+
+	bHost.y =	 yBase;
+	bJoin.y =	 bHost.y + 24 + 4;
+	bOptions.y = bJoin.y + 24 + 4;

 	// Center buttons
-	bHost->x = (width - bHost->width) / 2;
-	bJoin->x = (width - bJoin->width) / 2;
-	bOptions->x = (width - bOptions->width) / 2;
-	bQuit->x = (width - bQuit->width) / 2;
+	bHost.x = (width - bHost.width) / 2;
+	bJoin.x = (width - bJoin.width) / 2;
+	bOptions.x = (width - bOptions.width) / 2;

-    //// position quit icon at top-right (use image-defined size)
-    //bQuit.x = width - bQuit.width;
-    //bQuit.y = 0;
+    // position quit icon at top-right (use image-defined size)
+    bQuit.x = width - bQuit.width;
+    bQuit.y = 0;
 }

 void StartMenuScreen::tick() {
@@ -137,7 +114,7 @@ void StartMenuScreen::tick() {

 void StartMenuScreen::buttonClicked(Button* button) {

-	if (button->id == bHost->id)
+	if (button->id == bHost.id)
 	{
        #if defined(DEMO_MODE) || defined(APPLE_DEMO_PROMOTION)
 			minecraft->setScreen( new SimpleChooseLevelScreen("_DemoLevel") );
@@ -145,16 +122,16 @@ void StartMenuScreen::buttonClicked(Button* button) {
 			minecraft->screenChooser.setScreen(SCREEN_SELECTWORLD);
 		#endif
 	}
-	if (button->id == bJoin->id)
+	if (button->id == bJoin.id)
 	{
 		minecraft->locateMultiplayer();
 		minecraft->screenChooser.setScreen(SCREEN_JOINGAME);
 	}
-	if (button->id == bOptions->id)
+	if (button->id == bOptions.id)
 	{
 		minecraft->setScreen(new OptionsScreen());
 	}
-	if (button->id == bQuit->id)
+	if (button == &bQuit)
 	{
 		minecraft->quit();
 	}
--- a/src/client/gui/screens/StartMenuScreen.h
+++ b/src/client/gui/screens/StartMenuScreen.h
@@ -23,10 +23,10 @@ public:
 	bool isInGameScreen();
 private:

-	Button* bHost;
-	Button* bJoin;
-	Button* bOptions;
-	Button* bQuit; 
+	Button bHost;
+	Button bJoin;
+	Button bOptions;
+	ImageButton bQuit; // X button in top-right corner

 	std::string copyright;
 	int copyrightPosX;
--- a/src/client/player/input/touchscreen/TouchscreenInput.cpp
+++ b/src/client/player/input/touchscreen/TouchscreenInput.cpp
@@ -4,7 +4,6 @@
 #include "../../../gui/Gui.h"
 #include "../../../renderer/Tesselator.h"
 #include "../../../../world/entity/player/Player.h"
-#include "../../../../util/Mth.h"

 #include "../../../Minecraft.h"
 #include "../../../../platform/log.h"
@@ -126,80 +125,48 @@ void TouchscreenInput_TestFps::onConfigChanged(const Config& c) {
 	*/

 	// Code for "D-pad with jump in center"
-	// Calculate button size so the full 3x3 grid fits on screen with margins
-	const float margin = 12.0f;
-	float availW = w - margin * 2; // horizontal space available
-	float availH = h - margin * 2; // vertical space available
-	// Each button: 3 wide, 3 tall
-	float Bw = availW / 3.0f;
-	float Bh = availH / 3.0f;
-	// Use the smaller of the two to maintain square buttons
-	float btnSize = Mth::Min(Bw, Bh);
+	float Bw = w * 0.11f;//0.08f;
+	float Bh = Bw;//0.15f;
    
-	// Scale down to 65% of max available for a more comfortable, non-obtrusive size
-	btnSize *= 0.65f;
-	
-	// Clamp to physical millimeters for consistency across DPIs
+    // If too large (like playing on Tablet)
    PixelCalc& pc = _minecraft->pixelCalc;
-    float minBtnPx = pc.millimetersToPixels(35); // minimum touch target
-    float maxBtnPx = pc.millimetersToPixels(90); // maximum
-    if (btnSize < minBtnPx) btnSize = minBtnPx;
-    if (btnSize > maxBtnPx) btnSize = maxBtnPx;
-
-	float Bw2 = btnSize;
-	float Bh2 = btnSize;
-
+    if (pc.pixelsToMillimeters(Bw) > 200) { //14
+        Bw = Bh = pc.millimetersToPixels(200); //14
+    }
 	// temp data
 	float xx;
 	float yy;

-	// Position from top-left (or top-right for left-handed)
-	float dpadTotalW = 3.0f * Bw2;
-	float dpadTotalH = 3.0f * Bh2;
-	
-	// Place at top of screen instead of bottom
-	float BaseY = margin;
-	if (BaseY + dpadTotalH > h - margin) BaseY = h - dpadTotalH - margin;
-	
-	float BaseX = _options->getBooleanValue(OPTIONS_IS_LEFT_HANDED) ? w - dpadTotalW - margin : margin;
-	if (BaseX < margin) BaseX = margin;
-	if (BaseX + dpadTotalW > w - margin) BaseX = w - dpadTotalW - margin;
-
+	const float BaseY = -8 + h - 3.0f * Bh;
+	const float BaseX = _options->getBooleanValue(OPTIONS_IS_LEFT_HANDED)? -8 + w - 3 * Bw
+											:	8 + 0;
 	// Setup the bounding rectangle
-	_boundingRectangle = RectangleArea(BaseX, BaseY, BaseX + dpadTotalW, BaseY + dpadTotalH);
+	_boundingRectangle = RectangleArea(BaseX, BaseY, BaseX + 3 * Bw, BaseY + 3 * Bh);

-	xx = BaseX + Bw2; yy = BaseY;
-	_model.addArea(AREA_DPAD_N, aUp = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2));
+	xx = BaseX + Bw; yy = BaseY;
+	_model.addArea(AREA_DPAD_N, aUp = new RectangleArea(xx, yy, xx+Bw, yy+Bh));
 	xx = BaseX;
-	aUpLeft = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2);
-	xx = BaseX + 2 * Bw2;
-	aUpRight = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2);
+	aUpLeft = new RectangleArea(xx, yy, xx+Bw, yy+Bh);
+	xx = BaseX + 2 * Bw;
+	aUpRight = new RectangleArea(xx, yy, xx+Bw, yy+Bh);

-	xx = BaseX + Bw2; yy = BaseY + Bh2;
-	_model.addArea(AREA_DPAD_C, aJump = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2));
+	xx = BaseX + Bw; yy = BaseY + Bh;
+	_model.addArea(AREA_DPAD_C, aJump = new RectangleArea(xx, yy, xx+Bw, yy+Bh));

-	xx = BaseX + Bw2; yy = BaseY + 2 * Bh2;
-	_model.addArea(AREA_DPAD_S, aDown = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2));
+	xx = BaseX + Bw; yy = BaseY + 2 * Bh;
+	_model.addArea(AREA_DPAD_S, aDown = new RectangleArea(xx, yy, xx+Bw, yy+Bh));

-	xx = BaseX; yy = BaseY + Bh2;
-	_model.addArea(AREA_DPAD_W, aLeft = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2));
+	xx = BaseX; yy = BaseY + Bh;
+	_model.addArea(AREA_DPAD_W, aLeft = new RectangleArea(xx, yy, xx+Bw, yy+Bh));

-	xx = BaseX + 2 * Bw2; yy = BaseY + Bh2;
-	_model.addArea(AREA_DPAD_E, aRight = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2));
+	xx = BaseX + 2 * Bw; yy = BaseY + Bh;
+	_model.addArea(AREA_DPAD_E, aRight = new RectangleArea(xx, yy, xx+Bw, yy+Bh));

-    // Pause and chat buttons - sized relative to D-pad buttons, with bounds checking
-	float actionBtnSize = Bw2 * 0.7f;
-	float actionBtnMargin = 8.0f;
-	// Clamp action button size
-	if (actionBtnSize < pc.millimetersToPixels(30)) actionBtnSize = pc.millimetersToPixels(30);
-	if (actionBtnSize > pc.millimetersToPixels(120)) actionBtnSize = pc.millimetersToPixels(120);
-
-	_model.addArea(AREA_PAUSE, aPause = new RectangleArea(
-		w - actionBtnMargin - actionBtnSize, actionBtnMargin,
-		w - actionBtnMargin, actionBtnMargin + actionBtnSize));
-	_model.addArea(AREA_CHAT,  aChat  = new RectangleArea(
-		w - actionBtnMargin * 2 - actionBtnSize * 2, actionBtnMargin,
-		w - actionBtnMargin * 2 - actionBtnSize, actionBtnMargin + actionBtnSize));
+    float maxPixels = _minecraft->pixelCalc.millimetersToPixels(10);
+    // float btnSize = Mth::Min(18 * Gui::GuiScale, maxPixels);
+	float btnSize = pc.millimetersToPixels(18 * Gui::GuiScale);
+	_model.addArea(AREA_PAUSE, aPause = new RectangleArea(w - 4 - btnSize, 4, w - 4, 4 + btnSize));
+	_model.addArea(AREA_CHAT,  aChat  = new RectangleArea(w - 8 - btnSize * 2, 4, w - 8 - btnSize, 4 + btnSize));

 	//rebuild();
 }
--- a/src/client/renderer/GameRenderer.cpp
+++ b/src/client/renderer/GameRenderer.cpp
@@ -101,15 +101,6 @@ void GameRenderer::setupCamera(float a, int eye) {

 	float stereoScale = 0.07f;
 	if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) glTranslatef2(-(eye * 2 - 1) * stereoScale, 0, 0);
-	if (mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
-		if (zoom != 1) {
-			glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
-			glScalef2(zoom, zoom, 1);
-			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance * 2.0f);
-		} else {
-			gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance * 2.0f);
-		}
-	} else {
 	if (zoom != 1) {
 		glTranslatef2((float) zoom_x, (float) -zoom_y, 0);
 		glScalef2(zoom, zoom, 1);
@@ -117,7 +108,6 @@ void GameRenderer::setupCamera(float a, int eye) {
 	} else {
 		gluPerspective(_setupCameraFov = getFov(a, true), mc->width / (float) mc->height, 0.05f, renderDistance);
 	}
-	}

 	glMatrixMode(GL_MODELVIEW);
 	glLoadIdentity2();
@@ -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);
-			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
-		glEnable2(GL_ALPHA_TEST); // 
-
+		glDisable2(GL_ALPHA_TEST);
 		glDisable2(GL_BLEND);
 		glEnable2(GL_CULL_FACE);
 		TIMER_POP_PUSH("terrain-0");
@@ -350,11 +320,9 @@ void GameRenderer::renderLevel(float a) {
 		setupFog(0);
 		glEnable2(GL_BLEND);
 		glDisable2(GL_CULL_FACE);
-		glDepthMask(GL_FALSE); // @TODO commenting this out fixes Ice transparency and clouds are no longer visilbe underwater like normal beta - shredder
+		glDepthMask(GL_FALSE);
 		glDisable2(GL_ALPHA_TEST);
 		mc->textures->loadAndBindTexture("terrain.png");
-		// @TODO - below is a commented out double render system that fixes ice transparency, but probs harm performance, add it as an option - shredder
-
 		//if (mc->options.fancyGraphics) {
 		//    glColorMask(false, false, false, false);
 		//    int visibleWaterChunks = levelRenderer->render(cameraEntity, 1, a);
@@ -397,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);
-		       glEnable2(GL_FOG);
-		        levelRenderer->renderClouds(a);
-		        glDisable2(GL_FOG);
-		}
-		// SHREDDER END
+		//
+		//        setupFog(0);
+		//        glEnable2(GL_FOG);
+		////        levelRenderer->renderClouds(a);
+		//        glDisable2(GL_FOG);
 		setupFog(1);

 		if (zoom == 1 && !mc->options.getBooleanValue(OPTIONS_HIDEGUI)) {
@@ -689,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);
--- a/src/client/renderer/ItemInHandRenderer.cpp
+++ b/src/client/renderer/ItemInHandRenderer.cpp
@@ -443,10 +443,10 @@ void ItemInHandRenderer::renderScreenEffect( float a )
 		}
 	}

-	     if (mc->player->isUnderLiquid(Material::water)) {
-			 mc->textures->loadAndBindTexture("misc/water.png");
-	         renderWater(a);
-	     }
+	//     if (mc->player->isUnderLiquid(Material::water)) {
+	//mc->textures->loadAndBindTexture("misc/water.png");
+	//         renderWater(a);
+	//     }
 	glEnable2(GL_ALPHA_TEST);
 }

--- a/src/client/renderer/LevelRenderer.cpp
+++ b/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;
@@ -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()
@@ -189,9 +168,6 @@ void LevelRenderer::allChanged()
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);

-	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
-	TileRenderer::setUseTint(sideTint);
-

 	int dist = (512 >> 3) << (3 - lastViewDistance);
 	if (lastViewDistance <= 2 && mc->isPowerVR())
@@ -349,37 +325,6 @@ int LevelRenderer::render( Mob* player, int layer, float alpha )

 		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++) {
@@ -576,7 +521,7 @@ void LevelRenderer::render(const AABB& b) const
 //	t.color(255, 255, 255, 255); // again not needed, for some reason the vanilla source code tints it... white? maybe this was used for something else in MCPE's dev at one point? - shredder

 //	t.offset(((Mob*)mc->player)->getPos(0).negated()); // why does this even exist normally, it just makes the thing... not render
-	glLineWidth(2.0f); // make it more thick - shredder
+
 	t.begin(GL_LINE_STRIP);
 	t.vertex(b.x0, b.y0, b.z0);
 	t.vertex(b.x1, b.y0, b.z0);
@@ -1064,66 +1009,13 @@ std::string LevelRenderer::gatherStats1() {
 }

 //
-    std::string LevelRenderer::gatherStats2() {
-		std::stringstream ss;
-		ss << "E: "<< renderedEntities << "/" << totalEntities << ". B: " << culledEntities << ", I: " << (totalEntities - culledEntities) - renderedEntities <<"\n";
-        return ss.str();
-    }
+//    /*public*/ std::string gatherStats2() {
+//        return "E: " + renderedEntities + "/" + totalEntities + ". B: " + culledEntities + ", I: " + ((totalEntities - culledEntities) - renderedEntities);
+//    }
 //
 //    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;

@@ -1144,125 +1036,19 @@ void LevelRenderer::renderSky(float alpha) {
 	}
 	glColor4f2(sr, sg, Mth::Min(1.0f, sb), 1);

-	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);
-	}
+	//Tesselator& t = Tesselator::instance;
+
 	glEnable2(GL_FOG);
 	glColor4f2(sr, sg, sb, 1.0f);

 #ifdef OPENGL_ES
 	drawArrayVT(skyBuffer, skyVertexCount);
 #endif
-		glDisable(GL_FOG);
-	glDisable(GL_ALPHA_TEST);
-
-	// re ported this again from beta 1.6.6, thanks to the mcpe 0.1 decomp team's code for some bit of help about the void layer - shredder 
-
-	// 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);
-	}
+	glEnable2(GL_TEXTURE_2D);
 }

 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);
@@ -1311,142 +1097,6 @@ 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;
@@ -1609,7 +1259,6 @@ void LevelRenderer::renderHitSelect( Player* player, const HitResult& h, int mod

 void LevelRenderer::onGraphicsReset()
 {
-	generateStars();
 	generateSky();

 	// Get new buffers
--- a/src/client/renderer/LevelRenderer.h
+++ b/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;
--- a/src/client/renderer/TileRenderer.cpp
+++ b/src/client/renderer/TileRenderer.cpp
@@ -19,8 +19,6 @@
 #include "tileentity/TileEntityRenderer.h"
 #include "EntityTileRenderer.h"

-bool TileRenderer::sideTinting = false;
-
 TileRenderer::TileRenderer( LevelSource* level /* = NULL */ )
 :	level(level),
 	fixedTexture(-1),
@@ -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;
 	}

@@ -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;
--- a/src/client/renderer/TileRenderer.h
+++ b/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;
--- a/src/client/renderer/entity/EntityRenderer.cpp
+++ b/src/client/renderer/entity/EntityRenderer.cpp
@@ -130,9 +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);
 	}
+}
 void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
 	glDisable(GL_LIGHTING);
 	int tex = ((Tile*)Tile::fire)->tex;
@@ -186,12 +187,8 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 	//Textures* textures = entityRenderDispatcher->textures;
 	//textures->bind(textures->loadTexture("%clamp%/environment/shadow.png"));
 	Textures* textures = entityRenderDispatcher->textures;
-	textures->loadAndBindTexture("/misc/shadow.png"); 


-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-


 	Level* level = getLevel();
@@ -224,6 +221,9 @@ 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);
--- a/src/client/renderer/entity/MobRenderer.cpp
+++ b/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,11 +205,7 @@ 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, (float) z);
-	} else {
-		glTranslatef2((float) x + 0, (float) y + 2.3f, (float) z);
-	}
+	glTranslatef2((float) x + 0, (float) y + 1.0f /*2.3f*/, (float) z);

 	glRotatef2(-entityRenderDispatcher->playerRotY, 0, 1, 0);
 	glRotatef2(entityRenderDispatcher->playerRotX, 1, 0, 0);
--- a/src/client/renderer/ptexture/DynamicTexture.cpp
+++ b/src/client/renderer/ptexture/DynamicTexture.cpp
@@ -393,8 +393,8 @@ void LavaSideTexture::tick() {
 		}
 }

-FireTexture::FireTexture(int id)
-	:   super(((Tile*)Tile::fire)->tex + id * 16),
+FireTexture::FireTexture()
+	:   super(((Tile*)Tile::fire)->tex),
 	_tick(0),
 	_frame(0)
 {
--- a/src/client/renderer/ptexture/DynamicTexture.h
+++ b/src/client/renderer/ptexture/DynamicTexture.h
@@ -106,7 +106,7 @@ class FireTexture: public DynamicTexture
 	float* heata;

 public:
-    FireTexture(int id);
+    FireTexture();
 	~FireTexture();

    void tick();
--- a/src/client/sound/Sound.cpp
+++ b/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__*/
--- a/src/client/sound/Sound.h
+++ b/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__*/
--- a/src/client/sound/SoundEngine.cpp
+++ b/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
--- a/src/client/sound/SoundEngine.mm
+++ b/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"));
--- a/src/client/sound/data/burp1.pcm
+++ b/src/client/sound/data/burp1.pcm
--- a/src/main_glfw.h
+++ b/src/main_glfw.h
@@ -18,87 +18,6 @@
 #endif
 static App* g_app = 0;

-#ifdef __EMSCRIPTEN__
-static int g_touchPointerIds[Multitouch::MAX_POINTERS];
-
-static void resetTouchPointerIds() {
-	for (int i = 0; i < Multitouch::MAX_POINTERS; ++i) {
-		g_touchPointerIds[i] = -1;
-	}
-}
-
-static int getTouchPointerSlot(int touchId) {
-	for (int i = 0; i < Multitouch::MAX_POINTERS; ++i) {
-		if (g_touchPointerIds[i] == touchId) return i;
-	}
-	return -1;
-}
-
-static int allocateTouchPointerSlot(int touchId) {
-	int slot = getTouchPointerSlot(touchId);
-	if (slot >= 0) return slot;
-
-	for (int i = 0; i < Multitouch::MAX_POINTERS; ++i) {
-		if (g_touchPointerIds[i] < 0) {
-			g_touchPointerIds[i] = touchId;
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-static void releaseTouchPointerSlot(int touchId) {
-	for (int i = 0; i < Multitouch::MAX_POINTERS; ++i) {
-		if (g_touchPointerIds[i] == touchId) {
-			g_touchPointerIds[i] = -1;
-			return;
-		}
-	}
-}
-
-static EM_BOOL touch_callback(int eventType, const EmscriptenTouchEvent* touchEvent, void* userData) {
-	if (!touchEvent) return 0;
-
-	const bool isStart = eventType == EMSCRIPTEN_EVENT_TOUCHSTART;
-	const bool isMove = eventType == EMSCRIPTEN_EVENT_TOUCHMOVE;
-	const bool isEnd = eventType == EMSCRIPTEN_EVENT_TOUCHEND;
-	const bool isCancel = eventType == EMSCRIPTEN_EVENT_TOUCHCANCEL;
-
-	if (isCancel) {
-		for (int i = 0; i < Multitouch::MAX_POINTERS; ++i) {
-			if (g_touchPointerIds[i] >= 0) {
-				Multitouch::feed(1, 0, Multitouch::getX(i), Multitouch::getY(i), i);
-				g_touchPointerIds[i] = -1;
-			}
-		}
-		return 1;
-	}
-
-	for (int i = 0; i < touchEvent->numTouches; ++i) {
-		const EmscriptenTouchPoint& touch = touchEvent->touches[i];
-		if (!touch.isChanged) continue;
-
-		const int slot = isEnd ? getTouchPointerSlot(touch.identifier) : allocateTouchPointerSlot(touch.identifier);
-		if (slot < 0) continue;
-
-		const short x = (short)touch.targetX;
-		const short y = (short)touch.targetY;
-
-		if (isStart) {
-			Multitouch::feed(1, 1, x, y, slot);
-		} else if (isMove) {
-			Multitouch::feed(0, 0, x, y, slot);
-		} else if (isEnd) {
-			Multitouch::feed(1, 0, x, y, slot);
-			releaseTouchPointerSlot(touch.identifier);
-		}
-	}
-
-	return 1;
-}
-#endif
-
 int transformKey(int glfwkey) {
 	if (glfwkey >= GLFW_KEY_F1 && glfwkey <= GLFW_KEY_F12) {
 		return glfwkey - 178;
@@ -261,13 +180,6 @@ int main(void) {
 	glfwSetMouseButtonCallback(platform->window, mouse_button_callback);
 	glfwSetScrollCallback(platform->window, scroll_callback);
 	glfwSetWindowSizeCallback(platform->window, window_size_callback);
-	#ifdef __EMSCRIPTEN__
-	resetTouchPointerIds();
-	emscripten_set_touchstart_callback("#canvas", 0, 1, touch_callback);
-	emscripten_set_touchmove_callback("#canvas", 0, 1, touch_callback);
-	emscripten_set_touchend_callback("#canvas", 0, 1, touch_callback);
-	emscripten_set_touchcancel_callback("#canvas", 0, 1, touch_callback);
-	#endif

 	glfwMakeContextCurrent(platform->window);
 	#ifndef __EMSCRIPTEN__
--- a/src/util/PerfRenderer.cpp
+++ b/src/util/PerfRenderer.cpp
@@ -75,7 +75,7 @@ void PerfRenderer::renderFpsMeter( float tickTime )
 	glDisable2(GL_TEXTURE_2D);
 	Tesselator& t = Tesselator::instance;

-	t.begin(GL_QUADS);
+	t.begin(GL_TRIANGLES);
 	int hh1 = (int) (usPer60Fps / 200);
 	float count = (float)frameTimes.size();
 	t.color(0x20000000);
@@ -117,8 +117,7 @@ void PerfRenderer::renderFpsMeter( float tickTime )
 			t.color(0xff000000 + cc * 256);
 		}

-//		float time = 10 * 1000 * frameTimes[i] / 200;
-		float time = frameTimes[i] * 4000.0f;
+		float time = 10 * 1000 * frameTimes[i] / 200;
 		float time2 = 10 * 1000 * tickTimes[i] / 200;

 		t.vertex(i + 0.5f, _mc->height - time + 0.5f, 0);
@@ -211,12 +210,12 @@ void PerfRenderer::renderFpsMeter( float tickTime )
 		msg << result.name;
 		float xx = (float)(x - r);
 		float yy = (float)(y + r/2 + i * 8 + 20);
-		_font->drawShadow(msg.str(), xx + 10 + 10, yy, result.getColor());
+		_font->drawShadow(msg.str(), xx, yy, result.getColor());
 		std::string msg2 = toPercentString(result.percentage);
 		//LOGI("name: %s: perc: %f == %s @ %d, %d\n", msg.str().c_str(), result.percentage, msg2.c_str(), xx, yy);
-		_font->drawShadow(msg2, xx + 10 + 10 - _font->width(msg2), yy, result.getColor());
+		_font->drawShadow(msg2, xx - 50 - _font->width(msg2), yy, result.getColor());
 		msg2 = toPercentString(result.globalPercentage);
-		_font->drawShadow(msg2, xx + 10 + 10 - _font->width(msg2), yy, result.getColor());
+		_font->drawShadow(msg2, xx - _font->width(msg2), yy, result.getColor());
 	}
 }

--- a/src/util/PerfTimer.h
+++ b/src/util/PerfTimer.h
@@ -6,7 +6,7 @@
 #include "StringUtils.h"

 //package util;
-//#ifdef PROFILER
+#ifdef PROFILER
 	#define TIMER_PUSH(x)		PerfTimer::push(x)
 	#define TIMER_POP()			PerfTimer::pop()
 	#define TIMER_POP_PUSH(x)	PerfTimer::popPush(x)
@@ -16,11 +16,11 @@
 //     #define TIMER_PUSH(x)       ServerProfiler::push(x)
 //     #define TIMER_POP()         ServerProfiler::pop()
 //     #define TIMER_POP_PUSH(x)	ServerProfiler::popPush(x)
-//#else
-//	#define TIMER_PUSH(x)		((void*)0)
-//	#define TIMER_POP()			((void*)0)
-//	#define TIMER_POP_PUSH(x)	((void*)0)
-//#endif
+#else
+	#define TIMER_PUSH(x)		((void*)0)
+	#define TIMER_POP()			((void*)0)
+	#define TIMER_POP_PUSH(x)	((void*)0)
+#endif

 class PerfTimer
 {
--- a/src/world/entity/animal/Chicken.cpp
+++ b/src/world/entity/animal/Chicken.cpp
@@ -51,13 +51,13 @@ void Chicken::aiStep()
 	flap += flapping * 2;

 	//@todo
-	if (!isBaby()) {
-		if (!level->isClientSide && --eggTime <= 0) {
-			level->playSound(this, "mob.chickenplop", 1.0f, (random.nextFloat() - random.nextFloat()) * 0.2f + 1.0f);
-			spawnAtLocation(Item::egg->id, 1);
-			eggTime = random.nextInt(SharedConstants::TicksPerSecond * 60 * 5) + SharedConstants::TicksPerSecond * 60 * 5;
-		}
-	}
+	//if (!isBaby()) {
+	//	if (!level->isClientSide && --eggTime <= 0) {
+	//		level->playSound(this, "mob.chickenplop", 1.0f, (random.nextFloat() - random.nextFloat()) * 0.2f + 1.0f);
+	//		spawnAtLocation(Item::egg->id, 1);
+	//		eggTime = random.nextInt(SharedConstants::TicksPerSecond * 60 * 5) + SharedConstants::TicksPerSecond * 60 * 5;
+	//	}
+	//}
 }

 void Chicken::addAdditonalSaveData( CompoundTag* tag )
--- a/src/world/entity/animal/Sheep.cpp
+++ b/src/world/entity/animal/Sheep.cpp
@@ -1,6 +1,5 @@
 #include "Sheep.h"
 #include "../../item/DyePowderItem.h"
-#include "../../level/tile/TallGrass.h"
 #include "../../level/tile/LevelEvent.h"

 const float Sheep::COLOR[][3] = {
@@ -199,7 +198,7 @@ void Sheep::updateAi()
 		int yy = Mth::floor(y);
 		int zz = Mth::floor(z);

-		if ((level->getTile(xx, yy, zz) == Tile::tallgrass->id && level->getData(xx, yy, zz) == TallGrass::TALL_GRASS) ||  level->getTile(xx, yy - 1, zz) == ((Tile*)Tile::grass)->id) {
+		if (/*(level->getTile(xx, yy, zz) == Tile::tallgrass->id && level->getData(xx, yy, zz) == TallGrass::TALL_GRASS) || */ level->getTile(xx, yy - 1, zz) == ((Tile*)Tile::grass)->id) {
 			eatAnimationTick = EAT_ANIMATION_TICKS;
 			level->broadcastEntityEvent(this, EntityEvent::EAT_GRASS);
 		}
@@ -209,11 +208,11 @@ void Sheep::updateAi()
 		int zz = Mth::floor(z);

 		bool ate = false;
-		            if (level->getTile(xx, yy, zz) == Tile::tallgrass->id) {
-		level->levelEvent(NULL, LevelEvent::PARTICLES_DESTROY_BLOCK, xx, yy, zz, Tile::tallgrass->id + TallGrass::TALL_GRASS * 256);
+		/*            if (level->getTile(xx, yy, zz) == Tile::tallgrass->id) {
+		level->levelEvent(LevelEvent::PARTICLES_DESTROY_BLOCK, xx, yy, zz, Tile::tallgrass->id + TallGrass::TALL_GRASS * 256);
 		level->setTile(xx, yy, zz, 0);
 		ate = true;
-		} else if (level->getTile(xx, yy - 1, zz) == ((Tile*)Tile::grass)->id) {
+		} else */if (level->getTile(xx, yy - 1, zz) == ((Tile*)Tile::grass)->id) {
 			level->levelEvent(NULL, LevelEvent::PARTICLES_DESTROY_BLOCK, xx, yy - 1, zz, ((Tile*)Tile::grass)->id);
 			level->setTile(xx, yy - 1, zz, Tile::dirt->id);
 			ate = true;
--- a/src/world/item/DyePowderItem.cpp
+++ b/src/world/item/DyePowderItem.cpp
@@ -10,7 +10,6 @@
 #include "../level/tile/ClothTile.h"
 #include "../level/tile/CropTile.h"
 #include "../level/tile/StemTile.h"
-#include "../level/tile/TallGrass.h"

 const std::string DyePowderItem::COLOR_DESCS[] = {
 	"black", "red", "green", "brown", "blue", "purple", "cyan", "silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"
@@ -92,9 +91,9 @@ bool DyePowderItem::useOn( ItemInstance* itemInstance, Player* player, Level* le
 						  continue;

 					  if (level->getTile(xx, yy, zz) == 0) {
-						  if (random.nextInt(10) != 0) {
-						  level->setTileAndData(xx, yy, zz, Tile::tallgrass->id, TallGrass::TALL_GRASS);
-						  } else if (random.nextInt(3) != 0) {
+						  /*if (random.nextInt(10) != 0) {
+						  level->setTileAndData(xx, yy, zz, Tile::tallgrass.id, TallGrass.TALL_GRASS);
+						  } else*/ if (random.nextInt(3) != 0) {
 							  level->setTile(xx, yy, zz, Tile::flower->id);
 						  } else {
 							  level->setTile(xx, yy, zz, Tile::rose->id);
--- a/src/world/item/ShearsItem.h
+++ b/src/world/item/ShearsItem.h
@@ -22,7 +22,7 @@ public:

    /*@Override*/
    bool mineBlock(ItemInstance* itemInstance, int tile, int x, int y, int z/*, Mob* owner*/) {
-        if (tile == ((Tile*)Tile::leaves)->id || tile == Tile::web->id || tile == Tile::tallgrass->id /*|| tile == Tile::vine->id*/) {
+        if (tile == ((Tile*)Tile::leaves)->id || tile == Tile::web->id /*|| tile == Tile::tallgrass->id || tile == Tile::vine->id*/) {
            itemInstance->hurt(1);//, owner);
            return true;
        }
--- a/src/world/level/FoliageColor.h
+++ b/src/world/level/FoliageColor.h
@@ -43,7 +43,7 @@ public:
 	}

 	static int getDefaultColor() {
-		return 0x48b518;
+		return 0xFFFFFF;
 	}

 private:
--- a/src/world/level/Level.cpp
+++ b/src/world/level/Level.cpp
@@ -1165,13 +1165,7 @@ int Level::getSkyDarken(float a) {

 	float br = 1 - (Mth::cos(td * Mth::PI * 2) * 2 + 0.5f);
 	if (br < 0.0f) br = 0.0f;
-	if (dimension->FogType == 1) // @TODO - probably make this not dependent on dimension type honestly - shredder
-	{
-	if (br > 1.0f) br = 1.0f; //@ uses the normal javasky color ramp when java sky type is choosen,
-	} else 
-	{
-	if (br > 0.8f) br = 0.8f; //@note; was 1.0f
-	}
+	if (br > 0.80f) br = 0.80f; //@note; was 1.0f
 	return ((int) (br * 11));
 }

@@ -1180,14 +1174,7 @@ Vec3 Level::getSkyColor(Entity* source, float a) {

 	float br = Mth::cos(td * Mth::PI * 2) * 2 + 0.5f;
 	if (br < 0.0f) br = 0.0f;
-	if (dimension->FogType == 1) // @TODO - probably make this not dependent on dimension type honestly - shredder
-	{
-	if (br > 1.0f) br = 1.0f; //@ uses the normal javasky color ramp when java sky type is choosen,
-	} else 
-	{
-	if (br > 0.8f) br = 0.8f; //@note; was 1.0f
-	}
-
+	if (br > 0.75f) br = 0.75f; //@note; was 1.0f

 	int xx = Mth::floor(source->x);
 	int zz = Mth::floor(source->z);
@@ -1741,15 +1728,13 @@ void Level::extinguishFire(int x, int y, int z, int face) {
 		setTile(x, y, z, 0);
 	}
 }
-   std::string Level::gatherStats() {
-	   std::stringstream ss;
-	   ss << "All: " << entities.size();
-       return ss.str();
-    }
-
-    std::string Level::gatherChunkSourceStats() {
-        return _chunkSource->gatherStats();
-   }
+//    String gatherStats() {
+//        return "All: " + this.entities.size();
+//    }
+//
+//    String gatherChunkSourceStats() {
+//        return chunkSource.gatherStats();
+//    }
 //
 TileEntity* Level::getTileEntity(int x, int y, int z) {
 	LevelChunk* lc = getChunk(x >> 4, z >> 4);
--- a/src/world/level/Level.h
+++ b/src/world/level/Level.h
@@ -202,9 +202,6 @@ public:
 	bool checkAndHandleWater(const AABB& box, const Material* material, Entity* e);
    void extinguishFire(int x, int y, int z, int face);

-	std::string gatherStats();
-	std::string gatherChunkSourceStats();
-
 	//void addEntities(const EntityList& list);
 	//void removeEntities(const EntityList& list);
 	//void ensureAdded(Entity* entity);
--- a/src/world/level/biome/Biome.cpp
+++ b/src/world/level/biome/Biome.cpp
@@ -9,7 +9,6 @@
 #include "../../level/tile/TallGrass.h"

 #include "../../../util/Color.h"
-#include "../GrassColor.h"

 Biome* Biome::rainForest	 = NULL;
 Biome* Biome::swampland		 = NULL;
@@ -218,26 +217,6 @@ int Biome::getSkyColor( float temp )
 	return Color::getHSBColor(224 / 360.0f - temp * 0.05f, 0.50f + temp * 0.1f, 1.0f).getRGB();
 }

-float Biome::getDownfall()
-{
-	return downfall;
-}
-
-
-float Biome::getTemperature()
-{
-	return temperature;
-}
-
-
-int Biome::getGrassColor()
-{
-    float temp = Mth::clamp(getTemperature(), 0.0f, 1.0f);
-    float rain = Mth::clamp(getDownfall(), 0.0f, 1.0f);
-
-    return GrassColor::get(temp, rain);
-}
-
 Biome::MobList& Biome::getMobs(const MobCategory& category)
 {
    if (&category == &MobCategory::monster)
--- a/src/world/level/biome/Biome.h
+++ b/src/world/level/biome/Biome.h
@@ -78,13 +78,7 @@ public:
    virtual float adjustScale(float scale);
    virtual float adjustDepth(float depth);

-	
-
    virtual int getSkyColor(float temp);
-	virtual int getGrassColor();
-
-	virtual float getDownfall();			
-	virtual float getTemperature();			

 	virtual MobList& getMobs(const MobCategory& category);
 	virtual float getCreatureProbability();
@@ -94,8 +88,6 @@ public:
 	char topMaterial;
 	char material;
 	int leafColor;
-	float temperature;
-    float downfall;
 private:
 	static Biome* map[64*64];
 };
--- a/src/world/level/chunk/ChunkCache.h
+++ b/src/world/level/chunk/ChunkCache.h
@@ -193,10 +193,7 @@ public:
    }

    std::string gatherStats() {
-   //     return "ChunkCache: 1024";
-		std::stringstream ss;
-		ss << "ChunkCache: " << CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
-		return ss.str();
+        return "ChunkCache: 1024";
    }
 	
 	void saveAll(bool onlyUnsaved) {
--- a/src/world/level/dimension/Dimension.cpp
+++ b/src/world/level/dimension/Dimension.cpp
@@ -133,13 +133,6 @@ Dimension* Dimension::getNew( int id )
 	return NULL;
 }

-std::string Dimension::getDimension(){
-	int currentID = this->id;
-	if (currentID == Dimension::NORMAL) return "Overworld";
-	if (currentID == Dimension::NORMAL_DAYCYCLE) return "Overworld";
-	return "Unknown";
-}
-
 //
 // DimensionFactory
 //
--- a/src/world/level/dimension/Dimension.h
+++ b/src/world/level/dimension/Dimension.h
@@ -49,7 +49,7 @@ public:
 	bool hasCeiling;
 	float brightnessRamp[16];//Level::MAX_BRIGHTNESS + 1];
 	int id;
-	std::string getDimension();
+
 	// shredder added
 	int FogType; // lets us choose between what fog we want ig
 protected:
--- a/src/world/level/levelgen/RandomLevelSource.cpp
+++ b/src/world/level/levelgen/RandomLevelSource.cpp
@@ -11,7 +11,6 @@
 #include "../tile/Tile.h"
 #include "../tile/HeavyTile.h"
 #include "../../../util/Random.h"
-#include "../../level/tile/TallGrass.h"

 const float RandomLevelSource::SNOW_CUTOFF = 0.5f;
 const float RandomLevelSource::SNOW_SCALE = 0.3f;
@@ -420,46 +419,17 @@ void RandomLevelSource::postProcess(ChunkSource* parent, int xt, int zt) {
 		FlowerFeature feature(Tile::mushroom2->id);
 		feature.place(level, &random, x, y, z);
 	}
-	// normally unused in mcpe but how its supposed to do it
-	//int grassCount = 1;
-	//for (int i = 0; i < grassCount; i++) {
-	//int x = xo + random.nextInt(16) + 8;
-	//int y = random.nextInt(Level::genDepth);
-	//int z = zo + random.nextInt(16) + 8;
-	//Feature* grassFeature = biome->getGrassFeature(&random);
-	//if (grassFeature) {
-	//grassFeature->place(level, &random, x, y, z);
-	//delete grassFeature;
-	//}
-	//}
-
-	// reworked code from above to generate ferns and shrubs to just like in beta java
-int grassCount = 0;
-
-if (biome == Biome::forest) { grassCount = 2; }
-else if (biome == Biome::rainForest) { grassCount = 10; }
-else if (biome == Biome::seasonalForest) { grassCount = 2; }
-else if (biome == Biome::taiga) { grassCount = 1; }
-else if (biome == Biome::plains) { grassCount = 10; }
-
+	/*int grassCount = 1;
 	for (int i = 0; i < grassCount; i++) {
-    int grassMetadata = TallGrass::TALL_GRASS;
-    
-    
-    if (biome == Biome::rainForest && random.nextInt(3) != 0) {
-        grassMetadata = TallGrass::FERN;
-    }
-
 	int x = xo + random.nextInt(16) + 8;
-     
+	int y = random.nextInt(Level::genDepth);
 	int z = zo + random.nextInt(16) + 8;
-	int y = level->getHeightmap(x, z);
-
-    TallgrassFeature grassFeature(Tile::tallgrass->id, grassMetadata);
-    grassFeature.place(level, &random, x, y, z);
+	Feature* grassFeature = biome->getGrassFeature(&random);
+	if (grassFeature) {
+	grassFeature->place(level, &random, x, y, z);
+	delete grassFeature;
 	}
-
-
+	}*/
 	for (int i = 0; i < 10; i++) {
 		int x = xo + random.nextInt(16) + 8;
 		int y = random.nextInt(128);
--- a/src/world/level/levelgen/feature/FeatureInclude.h
+++ b/src/world/level/levelgen/feature/FeatureInclude.h
@@ -10,6 +10,5 @@
 #include "OreFeature.h"
 #include "ReedsFeature.h"
 #include "SpringFeature.h"
-#include "TallgrassFeature.h"

 #endif /*FEATURE_INCLUDE__H__*/
--- a/src/world/level/tile/LeafTile.h
+++ b/src/world/level/tile/LeafTile.h
@@ -60,7 +60,6 @@ public:
 			return FoliageColor::getDefaultColor();
 		}

-		
 //       return FoliageColor::getDefaultColor(); we need to hook this up with OPTION_FOLIAGE_TINT
 		level->getBiomeSource()->getBiomeBlock(x, z, 1, 1);
 		float temperature = level->getBiomeSource()->temperatures[0];
--- a/src/world/level/tile/TallGrass.cpp
+++ b/src/world/level/tile/TallGrass.cpp
@@ -1,12 +1,8 @@
 #include "TallGrass.h"
 #include "../FoliageColor.h"
-#include "../GrassColor.h"
 #include "../../entity/player/Player.h"
 #include "../../item/Item.h"
 #include "../../item/ShearsItem.h"
-#include "../Level.h"
-#include "../LevelSource.h"
-#include "../biome/BiomeSource.h"

 TallGrass::TallGrass( int id, int tex ) : super(id, tex, Material::replaceable_plant) {
 	float ss = 0.4f;
@@ -21,40 +17,21 @@ int TallGrass::getTexture( int face, int data ) {
 }

 int TallGrass::getColor() {
-	//double temp = 0.5;
-	//double rain = 1.0;
-	// converted to float for consistency - shredder
-	float temp = 0.5;
-	float rain = 1.0;
-	if (GrassColor::useTint){
-		return GrassColor::get(temp, rain);
-	}
+	/*double temp = 0.5;
+	double rain = 1.0;
+	return GrassColor.get(temp, rain);*/
 	return 0x339933;
 }

 int TallGrass::getColor( int auxData ) {
-	if(auxData == DEAD_SHRUB);
-	if (!FoliageColor::useTint && auxData == DEAD_SHRUB){
-		return 0xffffff;
-	}
+	if(auxData == DEAD_SHRUB) return 0xffffffff;
 	return FoliageColor::getDefaultColor();
 }

 int TallGrass::getColor( LevelSource* level, int x, int y, int z ) {
 	int d = level->getData(x, y, z);
-	if (d == DEAD_SHRUB); //return 0xffffff; // i removed this to make it accurate to beta 1.6.6 instead of early java release versions
-	float temp = level->getBiomeSource()->temperatures[0]; // shredder added
-	float rain = level->getBiomeSource()->downfalls[0]; // shredder added
-	if (!GrassColor::useTint && d == DEAD_SHRUB){
-		return 0xffffff;
-	}
-	if (GrassColor::useTint){
-		return GrassColor::get(temp, rain);
-	}
-	// @TODO port this function from beta 1.6.6 probably, for now im using biomesource to tint it directly above - shredder
-	//if (GrassColor::useTint){ 
-	//return level->getBiome(x, z)->getGrassColor();
-	//}
+	if (d == DEAD_SHRUB) return 0xffffff;
+
 	return 0x339933;//level->getBiome(x, z)->getGrassColor();
 }
Author	SHA1	Message	Date
Dram27	b3561e773d	Fix to prevent text overlap in options list during scroll	2026-04-26 16:12:56 +02:00
Dram27	162ec7adfa	Fix bottom settings overlapping with Credits button	2026-04-26 16:00:44 +02:00
Dram27	4cfaa43d77	Added scroll with wheel on PC and touch scroll on Android/IOS	2026-04-26 15:47:52 +02:00