hopefully fixed web world creation

This reverts commit 92f972d320.

CMakeLists.txt

@@ -320,6 +320,10 @@ target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA
 
 add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
 
+if(WIN32) 
+    target_sources(${PROJECT_NAME} PRIVATE data/images/pe.rc)
+endif()
+
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP})
 
 target_include_directories(${PROJECT_NAME} PUBLIC 

data/images/pe.rc

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

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

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;

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", true);
-#endif
+OptionBool foliageTint("foliagetint", false);
 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);
@@ -199,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;

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,

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)