diff --git a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp index b8c59263..dc6fc491 100644 --- a/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp +++ b/Minecraft.Client/Windows64/Network/WinsockNetLayer.cpp @@ -19,7 +19,7 @@ #include "../../../Minecraft.World/DisconnectPacket.h" #include "../../Minecraft.h" #include -#pragma comment(lib, "Dnsapi.lib") +#pragma comment(lib, "dnsapi.lib") #include "../4JLibs/inc/4J_Profile.h" #include diff --git a/build-linux.sh b/build-linux.sh index f3191757..ec12b433 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -125,9 +125,11 @@ do_build() { do_install() { info "Installing to $INSTALL_DIR..." - mkdir -p "$INSTALL_DIR"/{client,server} + mkdir -p "$INSTALL_DIR"/{client,server,fourkit} cp "$BUILD_DIR/Minecraft.Client/Minecraft.Client.exe" "$INSTALL_DIR/client/" - cp "$BUILD_DIR/Minecraft.Server/Minecraft.Server.exe" "$INSTALL_DIR/server/" + cp "$BUILD_DIR/Minecraft.Server/$BUILD_TYPE/Minecraft.Server.exe" "$INSTALL_DIR/server/" + cp "$BUILD_DIR/Minecraft.Server.FourKit/$BUILD_TYPE/Minecraft.Server.exe" "$INSTALL_DIR/fourkit/" + cp "$BUILD_DIR/Minecraft.Server.FourKit/bin/$BUILD_TYPE/Minecraft.Server.*" "$INSTALL_DIR/fourkit/" for asset in iggy_w64.dll Common music Windows64 Windows64Media; do [[ -e "$BUILD_DIR/Minecraft.Client/$asset" ]] && \ cp -r "$BUILD_DIR/Minecraft.Client/$asset" "$INSTALL_DIR/client/" || true @@ -136,11 +138,17 @@ do_install() { [[ -e "$BUILD_DIR/Minecraft.Server/$asset" ]] && \ cp -r "$BUILD_DIR/Minecraft.Server/$asset" "$INSTALL_DIR/server/" || true done + for asset in iggy_w64.dll Common Windows64 runtime plugins; do + [[ -e "$BUILD_DIR/Minecraft.Server.Fourkit/$BUILD_TYPE/$asset" ]] && \ + cp -r "$BUILD_DIR/Minecraft.Server.FourKit/$BUILD_TYPE/$asset" "$INSTALL_DIR/fourkit/" || true + done write_client_launcher write_server_launcher + write_fourkit_launcher success "Installed to $INSTALL_DIR" info "Run the client: $INSTALL_DIR/minecraft-lce-client" info "Run the server: $INSTALL_DIR/minecraft-lce-server" + info "Run the FourKit server: $INSTALL_DIR/minecraft-lce-fourkit" } write_client_launcher() { @@ -209,6 +217,47 @@ LAUNCHER chmod +x "$INSTALL_DIR/minecraft-lce-server" } + +write_fourkit_launcher() { + cat > "$INSTALL_DIR/minecraft-lce-fourkit" < "\$PERSIST_DIR/\$file" + fi + ln -sf "\$PERSIST_DIR/\$file" "\$WORK_DIR/\$file" +done +rm -rf "\$WORK_DIR/Windows64/GameHDD" 2>/dev/null || true +ln -sf "\$PERSIST_DIR/GameHDD" "\$WORK_DIR/Windows64/GameHDD" +cd "\$WORK_DIR" +if [[ -z "\${DISPLAY:-}" ]]; then + export DISPLAY=":99" + Xvfb "\$DISPLAY" -nolisten tcp -screen 0 64x64x16 & + XVFB_PID=\$! + trap 'kill \$XVFB_PID 2>/dev/null || true; rm -rf "\$WORK_DIR"' EXIT + sleep 1 +fi +exec wine "\$WORK_DIR/Minecraft.Server.exe" -port "\$SERVER_PORT" -bind "\$SERVER_BIND_IP" "\$@" +LAUNCHER + chmod +x "$INSTALL_DIR/minecraft-lce-fourkit" +} + BUILD_DIR="$SOURCE_DIR/build/windows64-clang" mkdir -p "$BUILD_DIR" info "Revelations LCE v$VERSION build script"