Kolyah35/minecraft-pe-0.6.1
4
10
Fork 8
Code Issues 4 Pull Requests 1 Packages Projects Releases 6 Wiki Activity

Merge branch 'main' of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1

Browse Source
This commit is contained in:
InviseDivine
2026-07-21 12:35:35 +02:00
parent 47cab7d66b 09cc2ceee4
commit 6452eacb34
5 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/SharedConstants.cpp
View File

@@ -4,12 +4,11 @@ namespace Common {
std::string getGameVersionString(const std::string& versionSuffix /* = "" */) 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 // append 64-bit port marker only on Android 64‑bit targets
#if defined(ANDROID) && (defined(__aarch64__) || defined(__x86_64__)) #if defined(ANDROID) && (defined(__aarch64__) || defined(__x86_64__))
result += " (64-bit port)"; result += " (64-bit)";
#endif #endif
result += " alpha";
return result; return result;
} }

9
src/client/Minecraft.cpp
View File

@@ -293,7 +293,7 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc
level->ops.emplace(op); level->ops.emplace(op);
_hasSignaledGeneratingLevelFinished = false; _hasSignaledGeneratingLevelFinished = false;
#ifdef STANDALONE_SERVER #if defined(STANDALONE_SERVER) || defined(PLATFORM_WEB)
const bool threadedLevelCreation = false; const bool threadedLevelCreation = false;
#else #else
const bool threadedLevelCreation = true; const bool threadedLevelCreation = true;
@@ -1197,15 +1197,12 @@ void Minecraft::init()
TextureId grassId = (textures->loadTexture("misc/grasscolor.png")); // loading the uh png for foliage color TextureId grassId = (textures->loadTexture("misc/grasscolor.png")); // loading the uh png for foliage color
int* grassPixels = textures->loadTexturePixels(grassId, "misc/grasscolor.png"); int* grassPixels = textures->loadTexturePixels(grassId, "misc/grasscolor.png");
GrassColor::init(grassPixels); GrassColor::init(grassPixels);
#ifndef __APPLE__
bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color 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); FoliageColor::setUseTint(tint);
GrassColor::setUseTint(tint); GrassColor::setUseTint(tint);
bool sideTint = options.getBooleanValue(OPTIONS_TINTED_SIDE);
TileRenderer::setUseTint(sideTint); TileRenderer::setUseTint(sideTint);

10
src/client/Options.cpp
View File

@@ -65,17 +65,13 @@ OptionBool useVignette("useVignette", true);
OptionBool useTouchscreen("useTouchscreen", true); OptionBool useTouchscreen("useTouchscreen", true);
OptionBool serverVisible("servervisible", true); OptionBool serverVisible("servervisible", true);
#ifndef __APPLE__ OptionBool foliageTint("foliagetint", false);
OptionBool foliageTint("foliagetint", true);
#endif
OptionInt fogType("fogType", 0, 0, 2); OptionInt fogType("fogType", 0, 0, 2);
OptionBool javaHud("javaHud", false); OptionBool javaHud("javaHud", false);
OptionBool betaSky("betaSky", false); OptionBool betaSky("betaSky", false);
#ifndef __APPLE__
OptionBool tintedSide("tintedSide", false); OptionBool tintedSide("tintedSide", false);
#endif
OptionBool blockOutline("blockOutline", false); OptionBool blockOutline("blockOutline", false);
OptionBool restoredAnims("restoredAnims", true); OptionBool restoredAnims("restoredAnims", true);
@@ -199,18 +195,14 @@ void Options::initTable() {
m_options[OPTIONS_BAR_ON_TOP] = &barOnTop; m_options[OPTIONS_BAR_ON_TOP] = &barOnTop;
m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint; m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint;
m_options[OPTIONS_RPI_CURSOR] = &rpiCursor; m_options[OPTIONS_RPI_CURSOR] = &rpiCursor;
#ifndef __APPLE__
m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint; m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint;
#endif
// more options yay // more options yay
m_options[OPTIONS_FOG_TYPE] = &fogType; m_options[OPTIONS_FOG_TYPE] = &fogType;
m_options[OPTIONS_DEBUG_STYLE] = &debugStyle; m_options[OPTIONS_DEBUG_STYLE] = &debugStyle;
m_options[OPTIONS_BETA_SKY] = &betaSky; m_options[OPTIONS_BETA_SKY] = &betaSky;
#ifndef __APPLE__
m_options[OPTIONS_TINTED_SIDE] = &tintedSide; m_options[OPTIONS_TINTED_SIDE] = &tintedSide;
#endif
m_options[OPTIONS_JAVA_HUD] = &javaHud; m_options[OPTIONS_JAVA_HUD] = &javaHud;
m_options[OPTIONS_AUTOJUMP] = &autoJump; m_options[OPTIONS_AUTOJUMP] = &autoJump;

4
src/client/Options.h
View File

@@ -88,15 +88,11 @@ enum OptionId {
OPTIONS_LAST_IP, OPTIONS_LAST_IP,
OPTIONS_RPI_CURSOR, OPTIONS_RPI_CURSOR,
#ifndef __APPLE__
OPTIONS_FOLIAGE_TINT, OPTIONS_FOLIAGE_TINT,
#endif
OPTIONS_FOG_TYPE, OPTIONS_FOG_TYPE,
OPTIONS_JAVA_HUD, OPTIONS_JAVA_HUD,
OPTIONS_RESTORED_ANIMS, OPTIONS_RESTORED_ANIMS,
#ifndef __APPLE__
OPTIONS_TINTED_SIDE, OPTIONS_TINTED_SIDE,
#endif
OPTIONS_BETA_SKY, OPTIONS_BETA_SKY,
OPTIONS_BEAUTIFUL_SKY, OPTIONS_BEAUTIFUL_SKY,
OPTIONS_VIGNETTE, OPTIONS_VIGNETTE,

2
src/client/gui/screens/OptionsScreen.cpp
View File

@@ -238,7 +238,7 @@ void OptionsScreen::generateOptionScreens() {
.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft) .addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
.addOptionItem(OPTIONS_MENU_STYLE, minecraft) .addOptionItem(OPTIONS_MENU_STYLE, minecraft)
.addOptionItem(OPTIONS_RPI_CURSOR, minecraft) .addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
#ifndef __APPLE__ #ifdef __APPLE__
.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft) .addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
.addOptionItem(OPTIONS_TINTED_SIDE, minecraft) .addOptionItem(OPTIONS_TINTED_SIDE, minecraft)
#endif #endif