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

Reviewed-on: https://192.168.0.2:3000/Kolyah35/minecraft-pe-0.6.1/pulls/10

.github/workflows/build.yml

@@ -19,7 +19,7 @@ permissions:
 jobs:
   build-windows:
     name: Windows Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
       - name: Setup caches
         uses: ./.github/actions/setup-cache
         with:
-          host: win
+          host: linux
           target: win
       
       - name: Setup Ninja
@@ -35,74 +35,28 @@ jobs:
         with:
           host: linux
 
-      - name: Download xwin
-        uses: robinraju/release-downloader@v1.10
-        with:
-          repository: Jake-Shadle/xwin
-          latest: true
-          fileName: 'xwin-*-x86_64-unknown-linux-musl.tar.gz'
-          tarBall: false
-          zipBall: false
-          out-file-path: "epic-xwin"
-        
-      - name: Prepare xwin
+      - name: Download llvm-mingw
         run: |
-          tar -xzf epic-xwin/xwin-*-x86_64-unknown-linux-musl.tar.gz -C epic-xwin
-          mv epic-xwin/xwin-*-x86_64-unknown-linux-musl/xwin ./xwin
-          ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license list
-      
-      # this caches '.xwin-cache/**/*' but that's actually only gonna
-      # contain the manifest cuz we only ran `xwin list` so far
-      - name: Setup xwin Cache
-        id: xwin-cache
-        uses: actions/cache@v4
-        with:
-          path: .xwin-cache
-          key: xwin-win-v1-${{ hashFiles('.xwin-cache/**/*') }}
-
-      - name: Download Windows headers
-        run: ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license splat --include-debug-libs
-        if: steps.xwin-cache.outputs.cache-hit != 'true'
-
-
-      - name: Download clang-msvc-sdk toolchain
-        uses: actions/checkout@v4
-        with:
-          repository: 'geode-sdk/clang-msvc-sdk'
-          path: toolchain
-          submodules: recursive
-
-      - name: Install Clang
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y wget lsb-release software-properties-common gnupg
-
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 21 all
-
-      - name: Add LLVM 21 to path
-        run: echo "/usr/lib/llvm-21/bin" >> $GITHUB_PATH
-
-      - name: Verify LLVM
-        run: |
-          which clang-cl
-          which lld-link
-          clang-cl --version
-          lld-link --version
-
+          curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/20260311/llvm-mingw-20260311-msvcrt-ubuntu-22.04-x86_64.tar.xz -o llvm-mingw.tar.xz
+          tar -xf llvm-mingw.tar.xz
+          mv llvm-mingw-* llvm-mingw
+    
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
         # We'll use this as our working directory for all subsequent commands
         run: cmake -E make_directory ${{github.workspace}}/build
-      
+
       - name: Configure CMake
         working-directory: ${{github.workspace}}/build
-        run: cmake ${{github.workspace}} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN -DCMAKE_CXX_SCAN_FOR_MODULES=OFF -G Ninja
-        env:
-          SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat
-          TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-cl-msvc.cmake
-          HOST_ARCH: x86_64
+        run: |
+          cmake $GITHUB_WORKSPACE \
+            -G Ninja \
+            -DCMAKE_SYSTEM_NAME=Windows \
+            -DCMAKE_C_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-clang \
+            -DCMAKE_CXX_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-clang++ \
+            -DCMAKE_RC_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-windres \
+            -DALSOFT_BACKEND_PIPEWIRE=OFF \
+            -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
       - name: Build
         working-directory: ${{github.workspace}}/build
@@ -113,11 +67,11 @@ jobs:
         with:
           name: mcpe-windows
           path: |
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/MinecraftPE.exe
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/glfw3.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/libpng16.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/OpenAL32.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/z.dll
+            ${{github.workspace}}/build/MinecraftPE.exe
+            ${{github.workspace}}/build/glfw3.dll
+            ${{github.workspace}}/build/libpng16.dll
+            ${{github.workspace}}/build/OpenAL32.dll
+            ${{github.workspace}}/build/z.dll
 
   build-linux:
     name: Linux Build

CMakeLists.txt

@@ -28,7 +28,8 @@ if (${PLATFORM} STREQUAL "Desktop")
 
     if (WIN32)
         add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-        set(EXTRA_LIBS ws2_32)
+        include_directories(misc/windows)
+        set(EXTRA_LIBS ws2_32 winhttp)
     elseif(UNIX)
         find_library(pthread NAMES pthread)
         set(EXTRA_LIBS pthread m)

project/lib_projects/raknet/jni/RaknetSources/WindowsIncludes.h

@@ -1,8 +1,8 @@
 #if defined(X360__) 
 #elif defined (_WIN32)
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>
-#include <Ws2tcpip.h>
+#include <ws2tcpip.h>
 
 // Must always include Winsock2.h before windows.h
 // or else:

src/AppPlatform_glfw.h

@@ -109,7 +109,7 @@ public:
 
 	virtual bool supportsTouchscreen() override { return true; }
 
-	virtual void hideCursor(bool hide) {
+	virtual void hideCursor(bool hide) override {
 		int isHide = hide ? GLFW_CURSOR_NORMAL : GLFW_CURSOR_HIDDEN;
 		glfwSetInputMode(window, GLFW_CURSOR, isHide);
 	}

src/client/OptionsFile.cpp

@@ -4,10 +4,11 @@
 #include <errno.h>
 #include <platform/log.h>
 
-#if !defined(_WIN32)
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
+#if defined(_WIN32)
+    #include <direct.h>
+#else
+    #include <sys/stat.h>
+    #include <sys/types.h>
 #endif
 
 OptionsFile::OptionsFile() {
@@ -27,39 +28,44 @@ void OptionsFile::setOptionsPath(const std::string& path) {
 std::string OptionsFile::getOptionsPath() const {
 	return settingsPath;
 }
-
 void OptionsFile::save(const StringVector& settings) {
-	FILE* pFile = fopen(settingsPath.c_str(), "w");
-	if(pFile != NULL) {
-		for(StringVector::const_iterator it = settings.begin(); it != settings.end(); ++it) {
-			fprintf(pFile, "%s\n", it->c_str());
-		}
-		fclose(pFile);
-	} else {
-		if (errno != ENOENT)
-			LOGI("OptionsFile::save failed to open '%s' for writing: %s", settingsPath.c_str(), strerror(errno));
+    FILE* pFile = fopen(settingsPath.c_str(), "w");
 
-		// Ensure parent directory exists for safekeeping if path contains directories
-		std::string dir = settingsPath;
-		size_t fpos = dir.find_last_of("/\\");
-		if (fpos != std::string::npos) {
-			dir.resize(fpos);
-			struct stat st;
-			if (stat(dir.c_str(), &st) != 0) {
-				// attempt recursive mkdir
-				std::string toCreate;
-				for (size_t i = 0; i <= dir.size(); ++i) {
-					if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
-						if (!toCreate.empty()) {
-							mkdir(toCreate.c_str(), 0755);
-						}
-					}
-					if (i < dir.size())
-						toCreate.push_back(dir[i]);
-				}
-			}
-		}
-	}
+    if (!pFile && errno == ENOENT) {
+        std::string dir = settingsPath;
+        size_t fpos = dir.find_last_of("/\\");
+        if (fpos != std::string::npos) {
+            dir.resize(fpos);
+
+            std::string toCreate;
+            for (size_t i = 0; i <= dir.size(); ++i) {
+                if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
+                    if (!toCreate.empty()) {
+#if defined(_WIN32)
+                        _mkdir(toCreate.c_str());
+#else
+                        mkdir(toCreate.c_str(), 0755);
+#endif
+                    }
+                }
+                if (i < dir.size())
+                    toCreate.push_back(dir[i]);
+            }
+        }
+
+        pFile = fopen(settingsPath.c_str(), "w");
+    }
+
+    if (!pFile) {
+        LOGI("OptionsFile::save failed: %s", strerror(errno));
+        return;
+    }
+
+    for (const auto& s : settings) {
+        fprintf(pFile, "%s\n", s.c_str());
+    }
+
+    fclose(pFile);
 }
 
 

src/client/gui/Font.cpp

@@ -186,7 +186,7 @@ void Font::draw( const std::string& str, float x, float y, int color, bool darke
 	glPushMatrix2();
 	glTranslatef2((GLfloat)x, (GLfloat)y, 0.0f);
 	for (unsigned int i = 0; i < str.length(); i++) {
-		while (str.length() > i + 1 && str[i] == '§') {
+		while (str.length() > i + 1 && str[i] == '\xa7') {
 			int cc = hex.find((char)tolower(str[i + 1]));
 			if (cc < 0 || cc > 15) cc = 15;
 			lists[index++] = listPos + 256 + cc + (darken ? 16 : 0);
@@ -235,7 +235,7 @@ int Font::width( const std::string& str )
 	int len = 0;
 
 	for (unsigned int i = 0; i < str.length(); i++) {
-		if (str[i] == '§') {
+		if (str[i] == '\xa7') {
 			i++;
 		} else {
 			//int ch = SharedConstants.acceptableLetters.indexOf(str.charAt(i));
@@ -274,7 +274,7 @@ std::string Font::sanitize( const std::string& str )
 	int j = 0;
 
 	for (unsigned int i = 0; i < str.length(); i++) {
-		if (str[i] == '§') {
+		if (str[i] == '\xa7') {
 			i++;
 			//} else if (SharedConstants.acceptableLetters.indexOf(str.charAt(i)) >= 0) {
 		} else {

src/client/player/LocalPlayer.cpp

@@ -28,6 +28,7 @@
 
 #if defined(_WIN32)
 #include <direct.h>
+#include <sys/stat.h>
 #else
 #include <sys/stat.h>
 #include <sys/types.h>

src/client/renderer/gles.h

@@ -31,7 +31,7 @@
 // #else
 //     // Uglyness to fix redeclaration issues
 //     #ifdef WIN32
-// 	   #include <WinSock2.h>
+// 	   #include <winsock2.h>
 // 	   #include <Windows.h>
 // 	#endif
 // 	#include <gl/glew.h>

src/main_glfw.h

@@ -205,16 +205,16 @@ int main(void) {
 
 	delete app;
 
-	appContext.platform->finish();
-	
-	delete appContext.platform;
-	
 #ifndef STANDALONE_SERVER
 	// Exit.
 	glfwDestroyWindow(platform->window);
 	glfwTerminate();
 #endif
 
+	appContext.platform->finish();
+	
+	delete appContext.platform;
+
 	return 0;
 }
 

src/main_win32.h

@@ -14,7 +14,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <process.h>
 #include "SharedConstants.h"
 

src/network/command/CommandServer.h

@@ -5,7 +5,7 @@
 #include <vector>
 
 #ifdef WIN32
-	#include <WinSock2.h>
+	#include <winsock2.h>
 #else
 	#include <sys/socket.h>
 	#include <netinet/in.h>

src/raknet/GetTime.cpp

@@ -140,7 +140,9 @@ RakNet::TimeUS GetTimeUS_Windows( void )
 #if _MSC_VER >= 1400 && defined (_M_X64)
 		GetProcessAffinityMask(mProc, (PDWORD_PTR)&mProcMask, (PDWORD_PTR)&mSysMask);
 #else
+#ifndef __MINGW32__
 		GetProcessAffinityMask(mProc, &mProcMask, &mSysMask);
+#endif
 #endif
 		mThread = GetCurrentThread();
 

src/raknet/WindowsIncludes.h

@@ -1,8 +1,8 @@
 #if defined(X360__) 
 #elif defined (_WIN32)
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>
-#include <Ws2tcpip.h>
+#include <ws2tcpip.h>
 
 // Must always include Winsock2.h before windows.h
 // or else: