Landscape mode on Android PWA

Merge remote-tracking branch 'origin/main' into web-changes-android
Merged main repo changes
2026-05-13 13:52:00 +02:00 · 2026-05-13 13:22:21 +02:00 · 2026-05-12 17:40:10 +02:00 · 2026-05-12 17:09:27 +02:00 · 2026-05-12 14:59:04 +02:00 · 2026-05-12 14:32:05 +02:00
43 changed files with 558 additions and 333 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -339,7 +339,11 @@ 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(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}")

    target_compile_options(${PROJECT_NAME} PUBLIC
        "-Os"
@@ -355,7 +359,7 @@ if(${PLATFORM} MATCHES "Web")
        "-sFORCE_FILESYSTEM=1"
        "-sLEGACY_GL_EMULATION=1"
        "-sGL_UNSAFE_OPTS=0"
-        "-sEMULATE_FUNCTION_POINTER_CASTS=1"
+        "-sEMULATE_FUNCTION_POINTER_CASTS=0"
        "-sALLOW_TABLE_GROWTH=1"
        "-sEXPORTED_RUNTIME_METHODS=['FS','stringToUTF8','UTF8ToString','cwrap','ccall','HEAP8','HEAPU8','HEAP32','HEAPU32']"
        "-sEXPORTED_FUNCTIONS=['_main']"
@@ -404,6 +408,10 @@ 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 .. -B . -G Ninja "-DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+   cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="$env:EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
   cmake --build . --target MinecraftPE
   ```
   > [!Note]
--- a/data/lang/en_US.lang
+++ b/data/lang/en_US.lang
@@ -207,6 +207,7 @@ 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
@@ -225,6 +226,7 @@ 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
--- a/misc/web/coi-serviceworker.js
+++ b/misc/web/coi-serviceworker.js
@@ -0,0 +1,26 @@
+/* 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,6 +2,12 @@
 <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 {
@@ -16,6 +22,10 @@
      width: 100vw;
      height: 100vh;
      display: block;
+      touch-action: none;
+      user-select: none;
+      -webkit-user-select: none;
+      -webkit-tap-highlight-color: transparent;
    }
  </style>
 </head>
@@ -23,6 +33,40 @@

 <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'),
@@ -43,4 +87,4 @@

 <script src="MinecraftPE.js"></script>
 </body>
-</html>
+</html>
--- a/misc/web/manifest.json
+++ b/misc/web/manifest.json
@@ -0,0 +1,25 @@
+{
+  "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,6 +167,7 @@ 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,6 +167,7 @@ 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/res/raw/burp1.ogg
+++ b/project/android_java/res/raw/burp1.ogg
--- a/src/NinecraftApp.cpp
+++ b/src/NinecraftApp.cpp
@@ -115,10 +115,11 @@ void NinecraftApp::init()
 	LOGI("This: %p\n", this);
 	screenChooser.setScreen(SCREEN_STARTMENU);

-	if (options.getBooleanValue(OPTIONS_FIRST_LAUNCH)) {
-		options.toggle(OPTIONS_FIRST_LAUNCH);
-		setScreen(new UsernameScreen());
-	}
+	// Disabled: Show username screen on first launch
+	// 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
@@ -857,7 +857,6 @@ void Minecraft::tickInput() {
 			for (int i = 0; i < 5 * SharedConstants::TicksPerSecond; ++i)
 				level->tick();
 		}
-
 #endif
 	}

@@ -883,9 +882,6 @@ void Minecraft::tickInput() {
 			handleBuildAction(&bai);
 		} else {
 			gameMode->stopDestroyBlock();
-			if (player && player->isUsingItem()) {
-                gameMode->releaseUsingItem(player);
-            }
 		}
 	} else {
 		// Desktop: left mouse = destroy/attack
@@ -1129,6 +1125,9 @@ 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() {
@@ -1221,13 +1220,14 @@ void Minecraft::setSize(int w, int h) {

 		// determine gui scale, optionally overriding auto
 		if (guiScale != 0) {
-			// manual selection: 1->small, 2->medium, 3->large, 4->larger, 5->largest
+			// manual selection: 1->tiny, 2->small, 3->medium, 4->large, 5->larger, 6->largest
 			switch (guiScale) {
-			case 1: Gui::GuiScale = 2.0f; break;
-			case 2: Gui::GuiScale = 3.0f; break;
-			case 3: Gui::GuiScale = 4.0f; break;
-			case 4: Gui::GuiScale = 5.0f; break;
-			case 5: Gui::GuiScale = 6.0f; break;
+			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;
 			default: Gui::GuiScale = 1.0f; break; // auto
 			}
 		} else {
@@ -1287,16 +1287,15 @@ 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();

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

 	// user->name = options.username;

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

 	// @todo @fix Android and iOS behaves a bit differently when leaving
 	//            an options screen (Android recreates OpenGL surface)
--- a/src/client/OptionStrings.cpp
+++ b/src/client/OptionStrings.cpp
@@ -22,3 +22,5 @@ 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,6 +30,7 @@ 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, 5);
+OptionInt guiScale("guiScale", 0, 0, 6);

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

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

 OptionBool destroyVibration("destroyVibration", true);
@@ -64,6 +64,8 @@ OptionBool useVignette("useVignette", true);

 OptionBool useTouchscreen("useTouchscreen", true);

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

 OptionBool foliageTint("foliagetint", true);
@@ -173,6 +175,8 @@ void Options::initTable() {

 	m_options[OPTIONS_RESTORED_ANIMS] = &restoredAnims;

+	m_options[OPTIONS_TOUCH_OVERRIDE] = &touchOverride;
+
    m_options[OPTIONS_SERVER_VISIBLE] = &serverVisible;

 	m_options[OPTIONS_MENU_STYLE] = &menuStyle;
--- a/src/client/Options.h
+++ b/src/client/Options.h
@@ -92,6 +92,7 @@ enum OptionId {
 	OPTIONS_FOG_TYPE,
 	OPTIONS_JAVA_HUD,
 	OPTIONS_RESTORED_ANIMS,
+	OPTIONS_TOUCH_OVERRIDE,
 	OPTIONS_TINTED_SIDE,
 	OPTIONS_BETA_SKY,
 	OPTIONS_BEAUTIFUL_SKY,
--- a/src/client/gui/Gui.cpp
+++ b/src/client/gui/Gui.cpp
@@ -224,59 +224,59 @@ void Gui::handleClick(int button, int x, int y) {
 	}
 }

-	void Gui::handleKeyPressed(int key)
-	{
-		bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
-		if (isChatting) {
-			// Allow scrolling the chat history with the mouse/keyboard when chat is open
-			if (key == 38) { // VK_UP
-				scrollChat(1);
-				return;
-			} else if (key == 40) { // VK_DOWN
-				scrollChat(-1);
-				return;
-			} else if (key == 33) { // VK_PRIOR (Page Up)
-				// Scroll by a page
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(maxVisible);
-				return;
-			} else if (key == 34) { // VK_NEXT (Page Down)
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(-maxVisible);
-				return;
-			}
-		}
-
-		if (key == Keyboard::KEY_F1) {
-			minecraft->options.toggle(OPTIONS_HIDEGUI);
-		}
-
-		if (key == 99)
-		{
-			if (minecraft->player->inventory->selected > 0)
-			{
-				minecraft->player->inventory->selected--;
-			}
-		}
-		else if (key == 4)
-		{
-			if (minecraft->player->inventory->selected < (getNumSlots() - 2))
-			{
-				minecraft->player->inventory->selected++;
-			}
-		}
-		else if (key == 100)
-		{
-			minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-		}
-		else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
-		{
-			minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
+void Gui::handleKeyPressed(int key)
+{
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
+	if (isChatting) {
+		// Allow scrolling the chat history with the mouse/keyboard when chat is open
+		if (key == 38) { // VK_UP
+			scrollChat(1);
+			return;
+		} else if (key == 40) { // VK_DOWN
+			scrollChat(-1);
+			return;
+		} else if (key == 33) { // VK_PRIOR (Page Up)
+			// Scroll by a page
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(maxVisible);
+			return;
+		} else if (key == 34) { // VK_NEXT (Page Down)
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(-maxVisible);
+			return;
 		}
 	}

+	if (key == Keyboard::KEY_F1) {
+		minecraft->options.toggle(OPTIONS_HIDEGUI);
+	}
+
+	if (key == 99)
+	{
+		if (minecraft->player->inventory->selected > 0)
+		{
+			minecraft->player->inventory->selected--;
+		}
+	}
+	else if (key == 4)
+	{
+		if (minecraft->player->inventory->selected < (getNumSlots() - 2))
+		{
+			minecraft->player->inventory->selected++;
+		}
+	}
+	else if (key == 100)
+	{
+		minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
+	}
+	else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
+	{
+		minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
+	}
+}
+
 void Gui::scrollChat(int delta) {
 	if (delta == 0)
 		return;
@@ -423,6 +423,10 @@ void Gui::inventoryUpdated() {
 	_inventoryNeedsUpdate = true;
 }

+void Gui::refreshTouchState() {
+	_openInventorySlot = minecraft->useTouchscreen();
+}
+
 void Gui::onGraphicsReset() {
 	inventoryUpdated();
 }
@@ -782,25 +786,6 @@ void Gui::renderDebugInfo() {
 	long day       = worldTime / Level::TICKS_PER_DAY;
 	long seed      = lvl ? lvl->getSeed() : 0;

-	// Block looking at
-	std::string CurrentTile = "Air";
-	if (minecraft->hitResult.type == TILE) {
-		int LookingX = minecraft->hitResult.x;
-		int LookingY = minecraft->hitResult.y;
-		int LookingZ = minecraft->hitResult.z;
-
-		int tileID = minecraft->level->getTile(LookingX, LookingY, LookingZ);
-		if (tileID > 0 && tileID < 256){
-			Tile* LookingTile = Tile::tiles[tileID];
-			if (LookingTile != NULL) {
-				CurrentTile = LookingTile->getDescriptionId();
-			} else {
-				CurrentTile = "Unknown Tile";
-			}
-		} else {
-			CurrentTile = "Air";
-		}
-	}
 	// Build lines (NULL entry = blank gap)
 	Font* font = minecraft->font;

@@ -839,9 +824,6 @@ void Gui::renderDebugInfo() {

 	sprintf(buf, "Biome: %s", biomeName);
 	drawString(font, buf, 2, 124, 0xE0E0E0);
-
-	sprintf(buf, "Looking at: %s", CurrentTile.c_str());
-		drawString(font, buf, 2, 134, 0xE0E0E0);
 	}
 	else if (minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE) == 1){
 	
--- a/src/client/gui/Gui.h
+++ b/src/client/gui/Gui.h
@@ -71,6 +71,7 @@ public:

    void onGraphicsReset();
 	void inventoryUpdated();
+	void refreshTouchState();

 	void setNowPlaying(const std::string& string);
 	void displayClientMessage(const std::string& messageId);
--- a/src/client/gui/components/GuiElementContainer.cpp
+++ b/src/client/gui/components/GuiElementContainer.cpp
@@ -35,6 +35,17 @@ void GuiElementContainer::removeChild( GuiElement* element ) {
 		children.erase(it);
 }

+bool GuiElementContainer::containsPointInChildren(int x, int y) const {
+	for (std::vector<GuiElement*>::const_iterator it = children.begin(); it != children.end(); ++it) {
+		GuiElement* child = *it;
+		if (child == NULL || !child->visible) continue;
+		if (child->pointInside(x, y)) return true;
+		const GuiElementContainer* container = dynamic_cast<const GuiElementContainer*>(child);
+		if (container != NULL && container->containsPointInChildren(x, y)) return true;
+	}
+	return false;
+}
+
 void GuiElementContainer::tick( Minecraft* minecraft ) {
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->tick(minecraft);
--- a/src/client/gui/components/GuiElementContainer.h
+++ b/src/client/gui/components/GuiElementContainer.h
@@ -13,6 +13,7 @@ public:
 	virtual void setupPositions();
 	virtual void addChild(GuiElement* element);
 	virtual void removeChild(GuiElement* element);
+	bool containsPointInChildren(int x, int y) const;

 	virtual void tick( Minecraft* minecraft );

--- a/src/client/gui/components/OptionsGroup.cpp
+++ b/src/client/gui/components/OptionsGroup.cpp
@@ -6,14 +6,36 @@
 #include "../../../locale/I18n.h"
 #include "TextOption.h"
 #include "KeyOption.h"
+#include <algorithm>
+#include "../Gui.h"
+#include "../Screen.h"
+#include "../../../platform/input/Mouse.h"
+#include "../../../util/Mth.h"

-OptionsGroup::OptionsGroup( std::string labelID )  {
+OptionsGroup::OptionsGroup( std::string labelID )
+: contentHeight(0),
+	scrollOffsetY(0.0f),
+	maxScrollOffsetY(0.0f),
+	trackingScrollGesture(false),
+	scrollingGesture(false),
+	touchDispatched(false),
+	dragStartX(0),
+	dragStartY(0),
+	lastDragY(0),
+	touchStartX(0),
+	touchStartY(0) {
 	label = I18n::get(labelID);
 }

 void OptionsGroup::setupPositions() {
+	const int labelHeight = 18;
+	const int bottomPadding = 36;
+	const float requestedScroll = scrollOffsetY;
+	const int scrollOffset = (int)requestedScroll;
+	int curY = y + labelHeight - scrollOffset;
+	const int contentStartY = y + labelHeight;
+
 	// First we write the header and then we add the items
-	int curY = y + 18;
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->width = width - 5;
 		
@@ -22,16 +44,109 @@ void OptionsGroup::setupPositions() {
 		(*it)->setupPositions();
 		curY += (*it)->height + 3;
 	}
-	height = curY;
+	curY += bottomPadding;
+	contentHeight = std::max(0, curY - contentStartY + scrollOffset);
+	maxScrollOffsetY = std::max(0, contentHeight - (height - labelHeight));
+	const float clampedScroll = Mth::clamp(requestedScroll, 0.0f, maxScrollOffsetY);
+	if (clampedScroll != requestedScroll) {
+		scrollOffsetY = clampedScroll;
+		setupPositions();
+	}
 }

 void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
 	float padX = 10.0f;
 	float padY = 5.0f;
+	const int labelHeight = 18;
 	
 	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);

+	glEnable2(GL_SCISSOR_TEST);
+	glScissor(
+		Gui::GuiScale * x,
+		minecraft->height - Gui::GuiScale * (y + height),
+		Gui::GuiScale * width,
+		Gui::GuiScale * (height - labelHeight)
+	);
+
 	super::render(minecraft, xm, ym);
+	glDisable2(GL_SCISSOR_TEST);
+}
+
+void OptionsGroup::tick(Minecraft* minecraft) {
+	int xm = Mouse::getX();
+	int ym = Mouse::getY();
+	if (minecraft->screen != NULL) {
+		minecraft->screen->toGUICoordinate(xm, ym);
+	}
+
+	bool leftDown = Mouse::isButtonDown(MouseAction::ACTION_LEFT);
+
+	if (trackingScrollGesture && leftDown) {
+		int dy = ym - lastDragY;
+		int dx = xm - dragStartX;
+		if (!scrollingGesture) {
+			int totalDx = xm - dragStartX;
+			int totalDy = ym - dragStartY;
+			if (std::abs(totalDx) >= ScrollStartThreshold || std::abs(totalDy) >= ScrollStartThreshold) {
+				if (std::abs(totalDy) >= std::abs(totalDx)) {
+					scrollingGesture = true;
+				} else if (!touchDispatched) {
+					super::mouseClicked(minecraft, touchStartX, touchStartY, MouseAction::ACTION_LEFT);
+					touchDispatched = true;
+				}
+			}
+		}
+		if (scrollingGesture && dy != 0) {
+			scrollByPixels((float)dy);
+		}
+		lastDragY = ym;
+	}
+	super::tick(minecraft);
+}
+
+void OptionsGroup::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	touchDispatched = false;
+
+	if (buttonNum == MouseAction::ACTION_LEFT && pointInside(x, y)) {
+		trackingScrollGesture = true;
+		dragStartX = x;
+		dragStartY = y;
+		lastDragY = y;
+		touchStartX = x;
+		touchStartY = y;
+		return;
+	}
+
+	super::mouseClicked(minecraft, x, y, buttonNum);
+}
+
+void OptionsGroup::mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum) {
+	bool wasScrolling = scrollingGesture;
+	bool wasTracking = trackingScrollGesture;
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	if (buttonNum == MouseAction::ACTION_LEFT && wasTracking && !touchDispatched && pointInside(touchStartX, touchStartY)) {
+		super::mouseClicked(minecraft, touchStartX, touchStartY, buttonNum);
+		touchDispatched = true;
+	}
+
+	if (!wasScrolling) {
+		super::mouseReleased(minecraft, x, y, buttonNum);
+	}
+}
+
+void OptionsGroup::scrollByPixels(float deltaY) {
+	if (deltaY == 0.0f || maxScrollOffsetY <= 0.0f) return;
+
+	scrollOffsetY = Mth::clamp(scrollOffsetY - deltaY, 0.0f, maxScrollOffsetY);
+	setupPositions();
+}
+
+bool OptionsGroup::isScrollingGestureActive() const {
+	return trackingScrollGesture || scrollingGesture;
 }

 OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {
--- a/src/client/gui/components/OptionsGroup.h
+++ b/src/client/gui/components/OptionsGroup.h
@@ -17,7 +17,12 @@ public:
 	OptionsGroup(std::string labelID);
 	virtual void setupPositions();
 	virtual void render(Minecraft* minecraft, int xm, int ym);
+	virtual void tick(Minecraft* minecraft);
+	virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum);
+	virtual void mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum);
 	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
+	void scrollByPixels(float deltaY);
+	bool isScrollingGestureActive() const;
 protected:

 	void createToggle(OptionId optId, Minecraft* minecraft);
@@ -27,6 +32,18 @@ protected:
 	void createKey(OptionId optId, Minecraft* minecraft);

 	std::string label;
+	int contentHeight;
+	float scrollOffsetY;
+	float maxScrollOffsetY;
+	bool trackingScrollGesture;
+	bool scrollingGesture;
+	bool touchDispatched;
+	int dragStartX;
+	int dragStartY;
+	int lastDragY;
+	int touchStartX;
+	int touchStartY;
+	static const int ScrollStartThreshold = 5;
 };

 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/
--- a/src/client/gui/components/OptionsItem.cpp
+++ b/src/client/gui/components/OptionsItem.cpp
@@ -27,11 +27,12 @@ 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.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;
+		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;
 		default: scaleText = I18n::get("options.guiScale.auto"); break;
 		}
 		text += ": " + scaleText;
--- a/src/client/gui/screens/OptionsScreen.cpp
+++ b/src/client/gui/screens/OptionsScreen.cpp
@@ -121,6 +121,7 @@ void OptionsScreen::setupPositions() {
 			(*it)->x = categoryButtons[0]->width;
 			(*it)->y = bHeader->height;
 			(*it)->width = width - categoryButtons[0]->width;
+			(*it)->height = height - bHeader->height;

 			(*it)->setupPositions();
 		}
@@ -147,7 +148,7 @@ void OptionsScreen::removed() {

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

 	// Game Pane
-	optionPanes[1]->addOptionItem(OPTIONS_DIFFICULTY, minecraft)
+	optionPanes[1]->addOptionItem(OPTIONS_GUI_SCALE, minecraft)
+		.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)
@@ -233,7 +234,8 @@ void OptionsScreen::generateOptionScreens() {
 		.addOptionItem(OPTIONS_BEAUTIFUL_SKY, minecraft)
 		.addOptionItem(OPTIONS_VIGNETTE, minecraft);

-	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
+	optionPanes[4]->addOptionItem(OPTIONS_TOUCH_OVERRIDE, minecraft)
+		.addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
 		.addOptionItem(OPTIONS_MENU_STYLE, minecraft)
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
@@ -261,11 +263,17 @@ void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
 	super::mouseReleased(x, y, buttonNum);
 }

+void OptionsScreen::mouseWheel(int dx, int dy, int xm, int ym) {
+	if (currentOptionsGroup != NULL && currentOptionsGroup->pointInside(xm, ym) && dy != 0) {
+		currentOptionsGroup->scrollByPixels((float)dy * 18.0f);
+	}
+}
+
 void OptionsScreen::keyPressed(int eventKey) {
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->keyPressed(minecraft, eventKey);
-	if (eventKey == Keyboard::KEY_ESCAPE) 
-		minecraft->options.save();
+	if (eventKey == Keyboard::KEY_ESCAPE)
+		minecraft->reloadOptions();

 	super::keyPressed(eventKey);
 }
--- a/src/client/gui/screens/OptionsScreen.h
+++ b/src/client/gui/screens/OptionsScreen.h
@@ -27,6 +27,7 @@ public:

 	virtual void mouseClicked(int x, int y, int buttonNum);
 	virtual void mouseReleased(int x, int y, int buttonNum);
+	virtual void mouseWheel(int dx, int dy, int xm, int ym);
 	virtual void keyPressed(int eventKey);
 	virtual void charPressed(char inputChar);
 	
--- a/src/client/gui/screens/SimpleChooseLevelScreen.cpp
+++ b/src/client/gui/screens/SimpleChooseLevelScreen.cpp
@@ -118,22 +118,15 @@ void SimpleChooseLevelScreen::setupPositions()
    bGamemode->x = centerX - totalButtonWidth / 2;
    bCheats->x = bGamemode->x + buttonWidth + buttonSpacing;

-    // 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 Survival/Cheats buttons below the seed field
+    int buttonY = tSeed.y + tSeed.height + 20;
+    bGamemode->y = buttonY;
+    bCheats->y = buttonY;

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

 void SimpleChooseLevelScreen::tick()
--- a/src/client/model/HumanoidModel.cpp
+++ b/src/client/model/HumanoidModel.cpp
@@ -40,9 +40,10 @@ HumanoidModel::HumanoidModel( float g /*= 0*/, float yOffset /*= 0*/, int texW /
 	head.addBox(-4, -8, -4, 8, 8, 8, g); // Head
 	head.setPos(0, 0 + yOffset, 0);

-	hair.addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Outer head layer (hat)
-	hair.setPos(0, 0 + yOffset, 0);
-
+	if (modernSkin) {
+		hair.addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Outer head layer (hat)
+		hair.setPos(0, 0 + yOffset, 0);
+	}

 	body.addBox(-4, 0, -2, 8, 12, 4, g); // Body
 	body.setPos(0, 0 + yOffset, 0);
@@ -98,17 +99,17 @@ void HumanoidModel::render(Entity* e, float time, float r, float bob, float yRot
 	setupAnim(time, r, bob, yRot, xRot, scale);
 	
 	// Sync overlay with head rotation/position
-	
-	hair.xRot = head.xRot;
-	hair.yRot = head.yRot;
-	hair.zRot = head.zRot;
-	hair.y = head.y;
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.xRot = head.xRot;
+		hair.yRot = head.yRot;
+		hair.zRot = head.zRot;
+		hair.y = head.y;
+	}

 	head.render(scale);
-	
-	hair.render(scale);
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.render(scale);
+	}
 	body.render(scale);
 	arm0.render(scale);
 	arm1.render(scale);
@@ -122,12 +123,12 @@ void HumanoidModel::render( HumanoidModel* model, float scale )
 	head.yRot = model->head.yRot;
 	head.y = model->head.y;
 	head.xRot = model->head.xRot;
-	
-	hair.yRot = head.yRot;
-	hair.xRot = head.xRot;
-	hair.zRot = head.zRot;
-	hair.y = head.y;
-	
+	if (texWidth == 64 && texHeight == 64) {
+		hair.yRot = head.yRot;
+		hair.xRot = head.xRot;
+		hair.zRot = head.zRot;
+		hair.y = head.y;
+	}

 	arm0.xRot = model->arm0.xRot;
 	arm0.zRot = model->arm0.zRot;
@@ -272,7 +273,7 @@ void HumanoidModel::onGraphicsReset()
 	arm1.onGraphicsReset();
 	leg0.onGraphicsReset();
 	leg1.onGraphicsReset();
-	hair.onGraphicsReset();
+	//hair.onGraphicsReset();
 }

 //void renderHair(float scale) {
--- a/src/client/player/LocalPlayer.cpp
+++ b/src/client/player/LocalPlayer.cpp
@@ -355,11 +355,7 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, const std::string&
 	armorTypeHash(0),
 	sprinting(false),
 	sprintDoubleTapTimer(0),
-	prevForwardHeld(false),
-	xBob(0.0f),
-	yBob(0.0f),
-	xBobO(0.0f),
-	yBobO(0.0f)
+	prevForwardHeld(false)
 {
 	this->dimension = dimension;
 	_init();
@@ -554,10 +550,6 @@ void LocalPlayer::aiStep() {

 	//if (onGround && abilities.flying)
 	//	abilities.flying = false;
-	yBobO = yBob;
-	xBobO = xBob;
-	xBob += (xRot - xBob) * 0.5;
-	yBob += (yRot - yBob) * 0.5;

 	if (interpolateOnly())
 		updateAi();
--- a/src/client/player/LocalPlayer.h
+++ b/src/client/player/LocalPlayer.h
@@ -22,10 +22,6 @@ public:
 	virtual void reset();

 	void tick();
-
-	float yBob, xBob;	// shredder added from b1.8/4j for the hand swaying animation
-	float yBobO, xBobO; // shredder added from b1.8/4j for the hand swaying animation
-
    void move(float xa, float ya, float za);

    void aiStep();
--- a/src/client/player/input/touchscreen/TouchscreenInput.cpp
+++ b/src/client/player/input/touchscreen/TouchscreenInput.cpp
@@ -4,6 +4,7 @@
 #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"
@@ -125,48 +126,80 @@ void TouchscreenInput_TestFps::onConfigChanged(const Config& c) {
 	*/

 	// Code for "D-pad with jump in center"
-	float Bw = w * 0.11f;//0.08f;
-	float Bh = Bw;//0.15f;
-    
-    // If too large (like playing on Tablet)
+	// 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);
+	
+	// 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
    PixelCalc& pc = _minecraft->pixelCalc;
-    if (pc.pixelsToMillimeters(Bw) > 200) { //14
-        Bw = Bh = pc.millimetersToPixels(200); //14
-    }
+    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;
+
 	// temp data
 	float xx;
 	float yy;

-	const float BaseY = -8 + h - 3.0f * Bh;
-	const float BaseX = _options->getBooleanValue(OPTIONS_IS_LEFT_HANDED)? -8 + w - 3 * Bw
-											:	8 + 0;
+	// 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;
+
 	// Setup the bounding rectangle
-	_boundingRectangle = RectangleArea(BaseX, BaseY, BaseX + 3 * Bw, BaseY + 3 * Bh);
+	_boundingRectangle = RectangleArea(BaseX, BaseY, BaseX + dpadTotalW, BaseY + dpadTotalH);

-	xx = BaseX + Bw; yy = BaseY;
-	_model.addArea(AREA_DPAD_N, aUp = new RectangleArea(xx, yy, xx+Bw, yy+Bh));
+	xx = BaseX + Bw2; yy = BaseY;
+	_model.addArea(AREA_DPAD_N, aUp = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2));
 	xx = BaseX;
-	aUpLeft = new RectangleArea(xx, yy, xx+Bw, yy+Bh);
-	xx = BaseX + 2 * Bw;
-	aUpRight = new RectangleArea(xx, yy, xx+Bw, yy+Bh);
+	aUpLeft = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2);
+	xx = BaseX + 2 * Bw2;
+	aUpRight = 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 + Bh2;
+	_model.addArea(AREA_DPAD_C, aJump = 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 + Bw2; yy = BaseY + 2 * Bh2;
+	_model.addArea(AREA_DPAD_S, aDown = 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; yy = BaseY + Bh2;
+	_model.addArea(AREA_DPAD_W, aLeft = 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));
+	xx = BaseX + 2 * Bw2; yy = BaseY + Bh2;
+	_model.addArea(AREA_DPAD_E, aRight = new RectangleArea(xx, yy, xx+Bw2, yy+Bh2));

-    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));
+    // 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));

 	//rebuild();
 }
--- a/src/client/renderer/GameRenderer.cpp
+++ b/src/client/renderer/GameRenderer.cpp
@@ -347,7 +347,6 @@ void GameRenderer::renderLevel(float a) {
 		Lighting::turnOff();
 		glDisable2(GL_BLEND);
 		glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-		Lighting::turnOff();
 		setupFog(0);
 		glEnable2(GL_BLEND);
 		glDisable2(GL_CULL_FACE);
--- a/src/client/renderer/ItemInHandRenderer.cpp
+++ b/src/client/renderer/ItemInHandRenderer.cpp
@@ -280,9 +280,6 @@ void ItemInHandRenderer::render( float a )
 	float h = oHeight + (height - oHeight) * a;
 	Player* player = mc->player;
 	// if (selectedTile==NULL) return;
-	LocalPlayer* localPlayer = (LocalPlayer*)(player);
-
-	float xr = player->xRotO + (player->xRot - player->xRotO) * a; // shredder added for hand swaying

 	glPushMatrix2();
 	glRotatef2(player->xRotO + (player->xRot - player->xRotO) * a, 1, 0, 0);
@@ -291,16 +288,6 @@ void ItemInHandRenderer::render( float a )
 	Lighting::turnOn(mc);
 	glPopMatrix2();

-	 if (localPlayer) // shredder added, basically does the hand swaying animation from b1.8
-	{
-        float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
-        float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
-		// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
-		float yr = player->yRotO + (player->yRot - player->yRotO) * a;
-        glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
-        glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
-    }
-
 	float br = mc->level->getBrightness(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));

 	ItemInstance* item;// = selectedItem;
--- a/src/client/renderer/entity/EntityRenderer.cpp
+++ b/src/client/renderer/entity/EntityRenderer.cpp
@@ -133,8 +133,6 @@ void EntityRenderer::postRender(Entity* entity, float x, float y, float z, float
 	}
 		if (entity->isOnFire()) renderFlame(entity, x, y, z, a);
 }
-// duplicate renderflame below is the pre b1.6.6 way flame rendered on player and mobs, probs gonna make it an option. - shredder
-/*
 void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
 	glDisable(GL_LIGHTING);
 	int tex = ((Tile*)Tile::fire)->tex;
@@ -180,75 +178,6 @@ void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a)
 	glPopMatrix2();
 	glEnable2(GL_LIGHTING);
 }
-*/
-// new renderflame ported from b1.6.6, fixes player height offset and also uses the newer style - shredder
-void EntityRenderer::renderFlame(Entity* e, float x, float y, float z, float a) {
-    glDisable(GL_LIGHTING);
-    int tex = ((Tile*)Tile::fire)->tex;
-
-    int xt = (tex & 0xf) << 4;
-    int yt = tex & 0xf0;
-
-    float u0 = (xt) / 256.0f;
-    float u1 = (xt + 15.99f) / 256.0f;
-    float v0 = (yt) / 256.0f;
-    float v1 = (yt + 15.99f) / 256.0f;
-
-    glPushMatrix2();
-    glTranslatef2((float) x, (float) y, (float) z);
-
-    float s = e->bbWidth * 1.4f;
-    glScalef2(s, s, s);
-    bindTexture("terrain.png");
-    Tesselator& t = Tesselator::instance;
-
-    float r = 0.5f; 
-    float xo = 0.0f;
-
-    float h = e->bbHeight / s;
-	float yo = (float)(e->y - e->bb.y0) / s; 
-
-    glRotatef2(-entityRenderDispatcher->playerRotY, 0, 1, 0);
-    glTranslatef2(0, 0, -0.3f + ((int) h) * 0.02f);
-    glColor4f2(1, 1, 1, 1);
-    
-    float zo = 0.0f; 
-    int cycle_counter = 0;
-
-    t.begin();
-    while (h > 0.0f) {
-        float current_u0 = u0;
-        float current_u1 = u1;
-        float current_v0 = v0;
-        float current_v1 = v1;
-
-        if (cycle_counter % 2 != 0) {
-            current_v0 = (yt + 16) / 256.0f;
-            current_v1 = (yt + 16 + 15.99f) / 256.0f;
-        }
-
-        if ((cycle_counter / 2) % 2 == 0) {
-            float tmp = current_u1;
-            current_u1 = current_u0;
-            current_u0 = tmp;
-        }
-
-        t.vertexUV(r - xo, 0.0f - yo, zo, current_u1, current_v1);
-        t.vertexUV(-r - xo, 0.0f - yo, zo, current_u0, current_v1);
-        t.vertexUV(-r - xo, 1.4f - yo, zo, current_u0, current_v0);
-        t.vertexUV(r - xo, 1.4f - yo, zo, current_u1, current_v0);
-        
-        h -= 0.45f;
-        yo -= 0.45f;
-        r *= 0.9f;   
-        zo += 0.03f;
-        cycle_counter++;
-    }
-    t.draw();
-    
-    glPopMatrix2();
-    glEnable2(GL_LIGHTING);
-}

 void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float pow, float a) { //
 	glEnable2(GL_BLEND);
@@ -300,8 +229,6 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 			glColor4f2(1, 1, 1, 1);
 			glDisable2(GL_BLEND);
 			glDepthMask(true);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 }

 Level* EntityRenderer::getLevel() {
--- a/src/client/renderer/entity/MobRenderer.cpp
+++ b/src/client/renderer/entity/MobRenderer.cpp
@@ -218,8 +218,6 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, floa

 	glScalef2(-s, -s, s);

-	glDisable(GL_LIGHTING);
-
 	glDepthMask(false);
 	glDisable2(GL_DEPTH_TEST);
 	glEnable2(GL_BLEND);
@@ -243,7 +241,6 @@ void MobRenderer::renderNameTag(Mob* mob, const std::string& name, float x, floa

 	glDepthMask(true);
 	font->draw(name, (float) fnameWidth, 0, 0xffffffff);
-	glEnable(GL_LIGHTING);
 	glDisable2(GL_BLEND);
 	glColor4f2(1, 1, 1, 1);
 	glPopMatrix2();
--- a/src/main_glfw.h
+++ b/src/main_glfw.h
@@ -16,7 +16,88 @@
 #ifdef __EMSCRIPTEN__
 #include <emscripten/emscripten.h>
 #endif
-static App* g_app = 0;
+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) {
@@ -176,12 +257,19 @@ int main(void) {

 	glfwSetKeyCallback(platform->window, key_callback);
 	glfwSetCharCallback(platform->window, character_callback);
-	glfwSetCursorPosCallback(platform->window, cursor_position_callback);
-	glfwSetMouseButtonCallback(platform->window, mouse_button_callback);
-	glfwSetScrollCallback(platform->window, scroll_callback);
-	glfwSetWindowSizeCallback(platform->window, window_size_callback);
-
-	glfwMakeContextCurrent(platform->window);
+	glfwSetCursorPosCallback(platform->window, cursor_position_callback);
+	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__
 	gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
 	glfwSwapInterval(0);
--- a/src/world/entity/Entity.cpp
+++ b/src/world/entity/Entity.cpp
@@ -465,15 +465,6 @@ void Entity::tick()
 	baseTick();
 }

-void Entity::setOnFire(int numberOfSeconds)
-{
-    int newValue = numberOfSeconds * 20;
-    if (onFire < newValue)
-    {
-        onFire = newValue;
-    }
-}
-
 void Entity::baseTick()
 {
 	TIMER_PUSH("entityBaseTick");
--- a/src/world/entity/Entity.h
+++ b/src/world/entity/Entity.h
@@ -89,8 +89,6 @@ public:
 	virtual bool isAlive();
 	virtual bool isOnFire();

-	virtual void setOnFire(int numberOfSeconds);
-
 	virtual bool isPlayer();
 	virtual bool isCreativeModeAllowed();

--- a/src/world/entity/Mob.cpp
+++ b/src/world/entity/Mob.cpp
@@ -169,9 +169,7 @@ void Mob::playAmbientSound()
 		level->playSound(this, ambient, getSoundVolume(), getVoicePitch());
 	}
 }
-bool Mob::isOnFire() {
-    return onFire > 0 || getSharedFlag(SharedFlagsInformation::FLAG_ONFIRE);
-}
+
 void Mob::baseTick()
 {
 	oAttackAnim = attackAnim;
@@ -179,18 +177,6 @@ void Mob::baseTick()

 	TIMER_PUSH("mobBaseTick");

-// @TODO - check if this section i added to make fire render in mp doesnt break crap - shredder
-	if (!level->isClientSide) {
-        // Server side: Tell the client if this mob/player is still burning
-        setSharedFlag(SharedFlagsInformation::FLAG_ONFIRE, onFire > 0);
-    } else {
-        // Client side: If the server flag says we aren't on fire, extinguish local visual timer
-        if (!getSharedFlag(SharedFlagsInformation::FLAG_ONFIRE)) {
-            onFire = 0;
-        }
-    }
-// todo ends here
-
 	if (((ambientSoundTime++ & 15) == 0) && random.nextInt(2000) < ambientSoundTime) {
 	    ambientSoundTime = -getAmbientSoundInterval();
 	    playAmbientSound();
--- a/src/world/entity/Mob.h
+++ b/src/world/entity/Mob.h
@@ -52,7 +52,6 @@ public:
    virtual bool isPickable();
    virtual bool isPushable();

-	virtual bool isOnFire();
 	virtual bool isShootable();

 	MoveControl* getMoveControl();
--- a/src/world/entity/monster/Skeleton.cpp
+++ b/src/world/entity/monster/Skeleton.cpp
@@ -19,7 +19,7 @@ void Skeleton::aiStep() {
 		float br = getBrightness(1);
 		if (br > 0.5f) {
 			if (level->canSeeSky(Mth::floor(x), Mth::floor(y), Mth::floor(z)) && random.nextFloat() * 3.5f < (br - 0.4f)) {
-			//	hurt(NULL, 1); // no use anymore since i restored setOnFire - shredder
+				hurt(NULL, 1);

 				for (int i = 0; i < 5; ++i) {
 					float xa = (2.0f * random.nextFloat() - 1.0f) * (2.0f * random.nextFloat() - 1.0f) * 0.02f;
@@ -27,7 +27,7 @@ void Skeleton::aiStep() {
 					float za = (2.0f * random.nextFloat() - 1.0f) * (2.0f * random.nextFloat() - 1.0f) * 0.02f;
 					level->addParticle(PARTICLETYPE(explode), x + random.nextFloat() * bbWidth * 2 - bbWidth, y + random.nextFloat() * bbHeight, z + random.nextFloat() * bbWidth * 2 - bbWidth, xa, ya, za);
 				}
-				setOnFire(8); //@todo
+				//setOnFire(8); //@todo
 			}
 		}
 	}
--- a/src/world/entity/monster/Zombie.cpp
+++ b/src/world/entity/monster/Zombie.cpp
@@ -55,7 +55,7 @@ void Zombie::aiStep() {
 		float br = getBrightness(1);
 		if (br > 0.5f) {
 			if (level->canSeeSky(Mth::floor(x), Mth::floor(y), Mth::floor(z)) && random.nextFloat() * 3.5f < (br - 0.4f)) {
-			//	hurt(NULL, 1); // no use anymore since i restored setOnFire - shredder
+				hurt(NULL, 1);

 				for (int i = 0; i < 5; ++i) {
 					float xa = (2.0f * random.nextFloat() - 1.0f) * (2.0f * random.nextFloat() - 1.0f) * 0.02f;
@@ -63,7 +63,7 @@ void Zombie::aiStep() {
 					float za = (2.0f * random.nextFloat() - 1.0f) * (2.0f * random.nextFloat() - 1.0f) * 0.02f;
 					level->addParticle(PARTICLETYPE(explode), x + random.nextFloat() * bbWidth * 2 - bbWidth, y + random.nextFloat() * bbHeight, z + random.nextFloat() * bbWidth * 2 - bbWidth, xa, ya, za);
 				}
-				setOnFire(8); //@todo
+				//setOnFire(8); //@todo
 			}
 		}
 	}
--- a/src/world/entity/player/Player.cpp
+++ b/src/world/entity/player/Player.cpp
@@ -216,7 +216,6 @@ bool Player::checkBed() {
 	return (level->getTile(bedPosition.x, bedPosition.y, bedPosition.z) == Tile::bed->id);
 }

-
 void Player::tick() {
 	bool shouldSleep = entityData.getFlag<SharedFlagsInformation::SharedFlagsInformationType>(DATA_PLAYER_FLAGS_ID, PLAYER_SLEEP_FLAG);
 	if(shouldSleep != isSleeping()) {
@@ -247,24 +246,11 @@ void Player::tick() {
 	}
    super::tick();

-
 	if (!level->isClientSide) {
-		// @TODO - Awful Hack Start, MCPE 0.6 doesn't deal damage with fire to players for some reason on mp, so we force it here to do it, need a better way honestly - shredder
-		if (level->containsFireTile(this->bb)) {
-            hurt(NULL, 1); 
-            
-            if (!isInWater()) {
-                if (onFire <= 0) {
-                    onFire = 20 * 15; 
-                }
-            }
-        }
-		// Awful hack ends here
-
 		foodData.tick(this);
-		//	if (containerMenu != NULL && !containerMenu->stillValid(this)) {
-		//		closeContainer();
-		//	}
+	//	if (containerMenu != NULL && !containerMenu->stillValid(this)) {
+	//		closeContainer();
+	//	}
 	}
 }
Author	SHA1	Message	Date
Dram27	676fd54982	Landscape mode on Android PWA	2026-05-13 13:52:00 +02:00
Dram27	084607cc86	Merge remote-tracking branch 'origin/main' into web-changes-android Merged main repo changes	2026-05-13 13:22:21 +02:00
Dram27	bbd81665a6	Fix multitouch on web	2026-05-12 17:40:10 +02:00
Dram27	06398e98e2	Made progressive web app installable	2026-05-12 17:09:27 +02:00
Dram27	7d9328b865	Adaptation to be able to play on android	2026-05-12 14:59:04 +02:00
Dram27	f1111d06c2	Scroll on settings	2026-05-12 14:32:05 +02:00
Dram27	ba9f1da758	Simple http server web	2026-05-12 14:23:26 +02:00