From 9434a48ae75a71804a6a8a52ff202c2af1b572d1 Mon Sep 17 00:00:00 2001 From: Kolyah35 Date: Mon, 20 Jul 2026 23:10:21 +0300 Subject: [PATCH 1/7] Revert "help me" This reverts commit 79be815827f1b0ae31e0961e5f74d677fcb80e97. --- src/client/Minecraft.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/client/Minecraft.cpp b/src/client/Minecraft.cpp index 009c4cf..8c90b6f 100755 --- a/src/client/Minecraft.cpp +++ b/src/client/Minecraft.cpp @@ -1197,15 +1197,12 @@ void Minecraft::init() TextureId grassId = (textures->loadTexture("misc/grasscolor.png")); // loading the uh png for foliage color int* grassPixels = textures->loadTexturePixels(grassId, "misc/grasscolor.png"); GrassColor::init(grassPixels); -#ifndef __APPLE__ + bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color - bool sideTint = options.getBooleanValue(OPTIONS_TINTED_SIDE); -#else - bool tint = false, sideTint = false; -#endif FoliageColor::setUseTint(tint); GrassColor::setUseTint(tint); + bool sideTint = options.getBooleanValue(OPTIONS_TINTED_SIDE); TileRenderer::setUseTint(sideTint); From 325ab94a6412396971aefa943cc998a0f17efdba Mon Sep 17 00:00:00 2001 From: Kolyah35 Date: Mon, 20 Jul 2026 23:10:25 +0300 Subject: [PATCH 2/7] Revert "fuck i forgot ro remove tinted side option too" This reverts commit c616546e1ee2ee1e2f6a919eed133cfbd6a55200. --- src/client/gui/screens/OptionsScreen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/gui/screens/OptionsScreen.cpp b/src/client/gui/screens/OptionsScreen.cpp index bdccde0..899750c 100755 --- a/src/client/gui/screens/OptionsScreen.cpp +++ b/src/client/gui/screens/OptionsScreen.cpp @@ -240,8 +240,8 @@ void OptionsScreen::generateOptionScreens() { .addOptionItem(OPTIONS_RPI_CURSOR, minecraft) #ifndef __APPLE__ .addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft) - .addOptionItem(OPTIONS_TINTED_SIDE, minecraft) #endif + .addOptionItem(OPTIONS_TINTED_SIDE, minecraft) .addOptionItem(OPTIONS_JAVA_HUD, minecraft) .addOptionItem(OPTIONS_FOG_TYPE, minecraft) .addOptionItem(OPTIONS_BETA_SKY, minecraft) From 3ab30eefa41331ab4231a699cf444895d1113044 Mon Sep 17 00:00:00 2001 From: Kolyah35 Date: Mon, 20 Jul 2026 23:10:28 +0300 Subject: [PATCH 3/7] Revert "hopefully fixed ios build" This reverts commit 92f972d32041eb1a8d2ac5c79ccbe85b7f50ca99. --- src/client/gui/screens/OptionsScreen.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/gui/screens/OptionsScreen.cpp b/src/client/gui/screens/OptionsScreen.cpp index 899750c..5bed753 100755 --- a/src/client/gui/screens/OptionsScreen.cpp +++ b/src/client/gui/screens/OptionsScreen.cpp @@ -238,9 +238,7 @@ void OptionsScreen::generateOptionScreens() { .addOptionItem(OPTIONS_BAR_ON_TOP, minecraft) .addOptionItem(OPTIONS_MENU_STYLE, minecraft) .addOptionItem(OPTIONS_RPI_CURSOR, minecraft) -#ifndef __APPLE__ .addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft) -#endif .addOptionItem(OPTIONS_TINTED_SIDE, minecraft) .addOptionItem(OPTIONS_JAVA_HUD, minecraft) .addOptionItem(OPTIONS_FOG_TYPE, minecraft) From 8be6e381d8ca69cf96a954afbaf2e44fc073726e Mon Sep 17 00:00:00 2001 From: Kolyah35 Date: Mon, 20 Jul 2026 23:12:34 +0300 Subject: [PATCH 4/7] ok i was wrong --- src/client/Options.cpp | 2 +- src/client/gui/screens/OptionsScreen.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/Options.cpp b/src/client/Options.cpp index 04479c5..deda2a8 100755 --- a/src/client/Options.cpp +++ b/src/client/Options.cpp @@ -66,7 +66,7 @@ OptionBool useTouchscreen("useTouchscreen", true); OptionBool serverVisible("servervisible", true); #ifndef __APPLE__ -OptionBool foliageTint("foliagetint", true); +OptionBool foliageTint("foliagetint", false); #endif OptionInt fogType("fogType", 0, 0, 2); diff --git a/src/client/gui/screens/OptionsScreen.cpp b/src/client/gui/screens/OptionsScreen.cpp index 5bed753..9515e9a 100755 --- a/src/client/gui/screens/OptionsScreen.cpp +++ b/src/client/gui/screens/OptionsScreen.cpp @@ -238,8 +238,10 @@ void OptionsScreen::generateOptionScreens() { .addOptionItem(OPTIONS_BAR_ON_TOP, minecraft) .addOptionItem(OPTIONS_MENU_STYLE, minecraft) .addOptionItem(OPTIONS_RPI_CURSOR, minecraft) +#ifdef __APPLE__ .addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft) .addOptionItem(OPTIONS_TINTED_SIDE, minecraft) +#endif .addOptionItem(OPTIONS_JAVA_HUD, minecraft) .addOptionItem(OPTIONS_FOG_TYPE, minecraft) .addOptionItem(OPTIONS_BETA_SKY, minecraft) From 381ef354c64ccac538665ee0403538839b1c4265 Mon Sep 17 00:00:00 2001 From: Kolyah35 Date: Mon, 20 Jul 2026 23:14:21 +0300 Subject: [PATCH 5/7] wtfffffff with git --- src/client/Options.cpp | 4 ---- src/client/Options.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/client/Options.cpp b/src/client/Options.cpp index deda2a8..2a84253 100755 --- a/src/client/Options.cpp +++ b/src/client/Options.cpp @@ -65,17 +65,13 @@ OptionBool useVignette("useVignette", true); OptionBool useTouchscreen("useTouchscreen", true); OptionBool serverVisible("servervisible", true); -#ifndef __APPLE__ OptionBool foliageTint("foliagetint", false); -#endif OptionInt fogType("fogType", 0, 0, 2); OptionBool javaHud("javaHud", false); OptionBool betaSky("betaSky", false); -#ifndef __APPLE__ OptionBool tintedSide("tintedSide", false); -#endif OptionBool blockOutline("blockOutline", false); OptionBool restoredAnims("restoredAnims", true); diff --git a/src/client/Options.h b/src/client/Options.h index 2faddfa..c33c93b 100755 --- a/src/client/Options.h +++ b/src/client/Options.h @@ -88,15 +88,11 @@ enum OptionId { OPTIONS_LAST_IP, OPTIONS_RPI_CURSOR, -#ifndef __APPLE__ OPTIONS_FOLIAGE_TINT, -#endif OPTIONS_FOG_TYPE, OPTIONS_JAVA_HUD, OPTIONS_RESTORED_ANIMS, -#ifndef __APPLE__ OPTIONS_TINTED_SIDE, -#endif OPTIONS_BETA_SKY, OPTIONS_BEAUTIFUL_SKY, OPTIONS_VIGNETTE, From 7620d49489b8a375dcb1a860609a9ef4dedf6d45 Mon Sep 17 00:00:00 2001 From: Kolyah35 Date: Mon, 20 Jul 2026 23:14:59 +0300 Subject: [PATCH 6/7] I should go sleep ig --- src/client/Options.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/client/Options.cpp b/src/client/Options.cpp index 2a84253..c67f68d 100755 --- a/src/client/Options.cpp +++ b/src/client/Options.cpp @@ -195,18 +195,14 @@ void Options::initTable() { m_options[OPTIONS_BAR_ON_TOP] = &barOnTop; m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint; m_options[OPTIONS_RPI_CURSOR] = &rpiCursor; -#ifndef __APPLE__ m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint; -#endif // more options yay m_options[OPTIONS_FOG_TYPE] = &fogType; m_options[OPTIONS_DEBUG_STYLE] = &debugStyle; m_options[OPTIONS_BETA_SKY] = &betaSky; -#ifndef __APPLE__ m_options[OPTIONS_TINTED_SIDE] = &tintedSide; -#endif m_options[OPTIONS_JAVA_HUD] = &javaHud; m_options[OPTIONS_AUTOJUMP] = &autoJump; From 09cc2ceee4576fa639e18f074ed27a3551e2d0e1 Mon Sep 17 00:00:00 2001 From: Kolyah35 Date: Mon, 20 Jul 2026 23:35:32 +0300 Subject: [PATCH 7/7] hopefully fixed web world creation --- src/SharedConstants.cpp | 5 ++--- src/client/Minecraft.cpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SharedConstants.cpp b/src/SharedConstants.cpp index 4a31175..ee64aa9 100755 --- a/src/SharedConstants.cpp +++ b/src/SharedConstants.cpp @@ -4,12 +4,11 @@ namespace Common { std::string getGameVersionString(const std::string& versionSuffix /* = "" */) { - std::string result = std::string("v0.6.1") + versionSuffix; + std::string result = std::string("v0.1.0 (forked from v0.6.1 alpha)") + versionSuffix; // append 64-bit port marker only on Android 64‑bit targets #if defined(ANDROID) && (defined(__aarch64__) || defined(__x86_64__)) - result += " (64-bit port)"; + result += " (64-bit)"; #endif - result += " alpha"; return result; } diff --git a/src/client/Minecraft.cpp b/src/client/Minecraft.cpp index 8c90b6f..be01595 100755 --- a/src/client/Minecraft.cpp +++ b/src/client/Minecraft.cpp @@ -293,7 +293,7 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc level->ops.emplace(op); _hasSignaledGeneratingLevelFinished = false; -#ifdef STANDALONE_SERVER +#if defined(STANDALONE_SERVER) || defined(PLATFORM_WEB) const bool threadedLevelCreation = false; #else const bool threadedLevelCreation = true;