Merge remote-tracking branch 'smartcmd/main' into feature/plugin-api

.github/workflows/clang-format.yml

@@ -1,48 +0,0 @@
-name: Check formatting
-
-on:
-  pull_request:
-    paths:
-      - '**'
-      - '!.gitignore'
-      - '!*.md'
-      - '!.github/**'
-      - '.github/workflows/clang-format.yml'
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  format-check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
- 
-      - name: Fetch base commit
-        run: git fetch origin ${{ github.event.pull_request.base.sha }}
- 
-      - name: Install clang-format-20
-        run: |
-          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-          sudo add-apt-repository -y "deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main"
-          sudo apt-get install -y -qq clang-format-20
- 
-      - uses: reviewdog/action-setup@v1
- 
-      - name: Check formatting on changed lines
-        env:
-          REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          git clang-format-20 --binary clang-format-20 \
-            --diff ${{ github.event.pull_request.base.sha }} -- \
-            '*.c' '*.cpp' '*.cc' '*.h' '*.hpp' \
-            | reviewdog \
-                -name="clang-format" \
-                -f=diff \
-                -reporter=github-pr-check \
-                -fail-level=error \
-                -filter-mode=added

.github/workflows/nightly-server.yml

@@ -6,12 +6,11 @@ on:
     branches:
     - 'main'
     - 'feature/plugin-api'
-    paths:
+    paths-ignore:
-      - '**'
+      - '.gitignore'
-      - '!.gitignore'
+      - '*.md'
-      - '!*.md'
+      - '.github/**'
-      - '!.github/**'
+      - '!.github/workflows/nightly-server.yml'
-      - '.github/workflows/nightly-server.yml'
 
 permissions:
   contents: write

.github/workflows/nightly.yml

@@ -5,12 +5,11 @@ on:
   push:
     branches:
     - 'main'
-    paths:
+    paths-ignore:
-      - '**'
+      - '.gitignore'
-      - '!.gitignore'
+      - '*.md'
-      - '!*.md'
+      - '.github/**'
-      - '!.github/**'
+      - '!.github/workflows/nightly.yml'
-      - '.github/workflows/nightly.yml'
 
 permissions:
   contents: write

.github/workflows/pull-request.yml

@@ -4,12 +4,10 @@ on:
   workflow_dispatch: 
   pull_request:
     types: [opened, reopened, synchronize]
-    paths:
+    paths-ignore:
-      - '**'
+      - '.gitignore'
-      - '!.gitignore'
+      - '*.md'
-      - '!*.md'
+      - '.github/*.md'
-      - '!.github/**'
-      - '.github/workflows/pull-request.yml'
 
 jobs:
   build:

Minecraft.Client/Common/UI/UIScene_LaunchMoreOptionsMenu.cpp

@@ -557,8 +557,8 @@ int UIScene_LaunchMoreOptionsMenu::KeyboardCompleteSeedCallback(LPVOID lpParam,b
 		uint16_t pchText[128];
 		ZeroMemory(pchText, 128 * sizeof(uint16_t));
 		Win64_GetKeyboardText(pchText, 128);
-		pClass->m_editSeed.setLabel((wchar_t *)pchText);
+		pClass->m_editSeed.setLabel(reinterpret_cast<wchar_t*>(pchText));
-		pClass->m_params->seed = (wchar_t *)pchText;
+		pClass->m_params->seed = static_cast<wstring>(reinterpret_cast<wchar_t*>(pchText));
 #else
 #ifdef __PSVITA__
 		uint16_t pchText[2048];
@@ -584,7 +584,7 @@ void UIScene_LaunchMoreOptionsMenu::getDirectEditInputs(vector<UIControl_TextInp
 void UIScene_LaunchMoreOptionsMenu::onDirectEditFinished(UIControl_TextInput *input, UIControl_TextInput::EDirectEditResult result)
 {
 	if (result == UIControl_TextInput::eDirectEdit_Confirmed)
-		m_params->seed = input->getEditBuffer();
+		m_params->seed = static_cast<wstring>(input->getEditBuffer());
 }
 #endif
 

docker-compose.dedicated-server.ghcr.yml

@@ -1,12 +1,12 @@
 services:
   minecraft-lce-dedicated-server:
-    image: ghcr.io/kuwacom/minecraft-lce-dedicated-server:nightly
+    image: ghcr.io/smartcmd/minecraft-lce-dedicated-server:nightly
     container_name: minecraft-lce-dedicated-server
     restart: unless-stopped
     tty: true
     stdin_open: true
     environment:
-      TZ: ${TZ:-Asia/Tokyo}
+      TZ: ${TZ:-Etc/UTC}
       WINEARCH: win64
       WINEPREFIX: /var/opt/wineprefix64
       WINEDEBUG: -all
@@ -15,12 +15,15 @@ services:
       # minimum required virtual screen
       XVFB_DISPLAY: ${XVFB_DISPLAY:-:99}
       XVFB_SCREEN: ${XVFB_SCREEN:-720x1280x16}
+      # ip & port the server will run on
+      SERVER_BIND_IP: ${SERVER_BIND_IP:-0.0.0.0}
+      SERVER_PORT: ${SERVER_PORT:-25565}
     volumes:
       # - wineprefix64:/var/opt/wineprefix64
       - ./server-data:/srv/persist
     ports:
-      - "25565:25565/tcp"
+      - "$SERVER_PORT:$SERVER_PORT/tcp"
-      - "25565:25565/udp"
+      - "$SERVER_PORT:$SERVER_PORT/udp"
     stop_grace_period: 30s
 
 # volumes:

docker-compose.dedicated-server.yml

@@ -10,7 +10,7 @@ services:
     tty: true
     stdin_open: true
     environment:
-      TZ: ${TZ:-Asia/Tokyo}
+      TZ: ${TZ:-Etc/UTC}
       WINEARCH: win64
       WINEPREFIX: /var/opt/wineprefix64
       WINEDEBUG: -all
@@ -18,13 +18,16 @@ services:
       SERVER_CLI_INPUT_MODE: ${SERVER_CLI_INPUT_MODE:-stream}
       # minimum required virtual screen
       XVFB_DISPLAY: ${XVFB_DISPLAY:-:99}
-      XVFB_SCREEN: ${XVFB_SCREEN:-64x64x16}
+      XVFB_SCREEN: ${XVFB_SCREEN:-720x1280x16}
+      # ip & port the server will run on
+      SERVER_BIND_IP: ${SERVER_BIND_IP:-0.0.0.0}
+      SERVER_PORT: ${SERVER_PORT:-25565}
     volumes:
       # - wineprefix64:/var/opt/wineprefix64
       - ./server-data:/srv/persist
     ports:
-      - "25565:25565/tcp"
+      - "$SERVER_PORT:$SERVER_PORT/tcp"
-      - "25565:25565/udp"
+      - "$SERVER_PORT:$SERVER_PORT/udp"
     stop_grace_period: 30s
 
 # volumes:

docker/dedicated-server/entrypoint.sh

@@ -3,9 +3,8 @@ set -euo pipefail
 
 SERVER_DIR="/srv/mc"
 SERVER_EXE="Minecraft.Server.exe"
-# ip & port are fixed since they run inside the container
+SERVER_PORT="${SERVER_PORT:-25565}"
-SERVER_PORT="25565"
+SERVER_BIND_IP="${SERVER_BIND_IP:-0.0.0.0}"
-SERVER_BIND_IP="0.0.0.0"
 
 PERSIST_DIR="/srv/persist"
 WINE_CMD=""