From 535408981ac4ea1d9d20290270dd66572f5f6aa3 Mon Sep 17 00:00:00 2001 From: Li Date: Mon, 6 Jan 2025 15:11:24 +1300 Subject: [PATCH] Fix 2Player? --- .github/workflows/build.yml | 384 ------------------ .../HISPd/Properties/AssemblyInfo.cs | 4 +- .../HISPd/Resources/DEBIAN/control | 2 +- .../HISPtests/UnitTests/PacketTest.cs | 2 +- .../LibHISP/Properties/AssemblyInfo.cs | 4 +- HorseIsleServer/LibHISP/Server/GameServer.cs | 4 +- .../LibHISP/Server/PacketBuilder.cs | 8 +- .../MPN00BS/Properties/AssemblyInfo.cs | 4 +- 8 files changed, 14 insertions(+), 398 deletions(-) delete mode 100755 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100755 index d90a0d8..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,384 +0,0 @@ -name: build - -on: - push: - branches: [ master ] -defaults: - run: - working-directory: ./HorseIsleServer - -jobs: - build-linux: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Git Submodule update - run: git submodule update --init --recursive - - - name: Setup .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 8.0.x - include-prerelease: false - - name: Install utils - run: | - sudo apt update - sudo apt install -y clang zlib1g-dev dos2unix - dotnet tool install -g dotnet-script - - - name: Restore dependencies - run: | - dotnet restore LibHISP - dotnet restore HISPd -# nativeaot linux x54 - - name: Build linux-x64 - continue-on-error: false - run: | - cd HISPd - dotnet publish -p:PublishProfile=Linux64.pubxml - cd .. - cd MPN00BS - dotnet publish -p:PublishProfile=Linux64.pubxml - cd .. - -# Currently broken ... - -# dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease -# cd HISPd -# dotnet publish -r linux-x64 -c Linux /p:Platform=x64 --self-contained -# cd .. -# mkdir -p HISPd/bin/x64/Linux/net8.0/linux-x64/native/gamedata -# cp -r HISPd/bin/x64/Linux/net8.0/linux-x64/gamedata/* HISPd/bin/x64/Linux/net8.0/linux-x64/native/gamedata -# cp HISPd/bin/x64/Linux/net8.0/linux-x64/HI1.MAP HISPd/bin/x64/Linux/net8.0/linux-x64/native/HI1.MAP -# cp HISPd/bin/x64/Linux/net8.0/linux-x64/publish/libe_sqlite3.so HISPd/bin/x64/Linux/net8.0/linux-x64/native/libe_sqlite3.so -# rm -f HISPd/bin/x64/Linux/net8.0/linux-x64/native/HISPd.dbg -# dotnet remove HISPd package Microsoft.DotNet.ILCompiler - - - - name: Build linux-arm - continue-on-error: false - run: | - cd HISPd - dotnet publish -p:PublishProfile=LinuxARM.pubxml - cd .. -# nativeaot linux arm64 - - name: Build linux-arm64 - continue-on-error: false - run: | - cd HISPd - dotnet publish -p:PublishProfile=LinuxARM64.pubxml - cd .. - -# dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease -# dotnet add HISPd package runtime.linux-x64.Microsoft.DotNet.ILCompiler --prerelease -# cd HISPd -# dotnet publish -r linux-arm64 -c Linux /p:Platform=ARM64 --self-contained -# cd .. -# mkdir -p HISPd/bin/ARM64/Linux/net8.0/linux-arm64/native/gamedata -# cp -r HISPd/bin/ARM64/Linux/net8.0/linux-arm64/gamedata/* HISPd/bin/ARM64/Linux/net8.0/linux-arm64/native/gamedata -# cp HISPd/bin/ARM64/Linux/net8.0/linux-arm64/HI1.MAP HISPd/bin/ARM64/Linux/net8.0/linux-arm64/native/HI1.MAP -# cp HISPd/bin/ARM64/Linux/net8.0/linux-arm64/publish/libe_sqlite3.so HISPd/bin/ARM64/Linux/net8.0/linux-arm64/native/libe_sqlite3.so -# rm -f HISPd/bin/ARM64/Linux/net8.0/linux-arm64/native/HISPd.dbg -# dotnet remove HISPd package Microsoft.DotNet.ILCompiler -# dotnet remove HISPd package runtime.linux-x64.Microsoft.DotNet.ILCompiler - - - name: Build deb package - continue-on-error: false - run: | - mkdir /tmp/debpkg - mkdir /tmp/debpkg/Debian64 - mkdir /tmp/debpkg/Debian64/etc - mkdir /tmp/debpkg/Debian64/usr - mkdir /tmp/debpkg/Debian64/etc/hisp - mkdir /tmp/debpkg/Debian64/etc/hisp/gamedata - mkdir /tmp/debpkg/Debian64/etc/systemd - mkdir /tmp/debpkg/Debian64/etc/systemd/system - mkdir /tmp/debpkg/Debian64/usr/bin - mkdir /tmp/debpkg/Debian64/usr/lib - mkdir /tmp/debpkg/Debian64/DEBIAN - cp LibHISP/Resources/server.properties /tmp/debpkg/Debian64/etc/hisp/server.properties - cp LibHISP/Resources/default_cross_domain.xml /tmp/debpkg/Debian64/etc/hisp/CrossDomainPolicy.xml - cp -r HISPd/Resources/DEBIAN/* /tmp/debpkg/Debian64/DEBIAN - cp -r HISPd/bin/x64/Linux/net8.0/linux-x64/publish/gamedata/* /tmp/debpkg/Debian64/etc/hisp/gamedata - cp HISPd/bin/x64/Linux/net8.0/linux-x64/publish/libe_sqlite3.so /tmp/debpkg/Debian64/usr/lib/libe_sqlite3.so - cp HISPd/bin/x64/Linux/net8.0/linux-x64/publish/HI1.MAP /tmp/debpkg/Debian64/etc/hisp/HI1.MAP - cp HISPd/bin/x64/Linux/net8.0/linux-x64/publish/HISPd /tmp/debpkg/Debian64/usr/bin/HISPd - cp HISPd/Resources/HISP.service /tmp/debpkg/Debian64/etc/systemd/system/HISP.service - cat /tmp/debpkg/Debian64/DEBIAN/control - dos2unix /tmp/debpkg/Debian64/DEBIAN/conffiles - dos2unix /tmp/debpkg/Debian64/DEBIAN/control - dos2unix /tmp/debpkg/Debian64/DEBIAN/postinst - dos2unix /tmp/debpkg/Debian64/DEBIAN/postrm - dos2unix /tmp/debpkg/Debian64/DEBIAN/prerm - dos2unix /tmp/debpkg/Debian64/etc/systemd/system/HISP.service - chmod 755 -R /tmp/debpkg/Debian64 - chmod +x /tmp/debpkg/Debian64/usr/bin/HISPd - mkdir debpackage - dpkg-deb --build /tmp/debpkg/Debian64 - mv /tmp/debpkg/Debian64.deb debpackage/HISP-Debian-AMD64.deb - - -#android .. maybe someday - -# - name: Build android-arm -# continue-on-error: false -# run: | -# dotnet publish -p:PublishProfile=AndroidARM.pubxml - -# - name: Build android-arm64 -# continue-on-error: false -# run: | -# dotnet publish -p:PublishProfile=AndroidARM64.pubxml - - -# - name: Upload android-arm -# uses: actions/upload-artifact@v2 -# with: -# name: HISP-AndroidARM -# path: HorseIsleServer/HISPd/bin/arm/Android/net8.0/android-arm/publish/ - -# - name: Upload android-arm64 -# uses: actions/upload-artifact@v2 -# with: -# name: HISP-AndroidARM64 -# path: HorseIsleServer/HISPd/bin/arm64/Android/net8.0/android-arm64/publish/ - - -# Upload LINUX - - name: Upload linux-x64 - uses: actions/upload-artifact@v2 - with: - name: HISP-Linux64 - path: HorseIsleServer/HISPd/bin/x64/Linux/net8.0/linux-x64/publish/ - - - name: Upload linux-x64-noobs - uses: actions/upload-artifact@v2 - with: - name: HISP-Linux64-Noobs - path: HorseIsleServer/MPN00BS/bin/x64/Linux/net8.0/linux-x64/publish/ - - - name: Upload linux-arm - uses: actions/upload-artifact@v2 - with: - name: HISP-LinuxARM - path: HorseIsleServer/HISPd/bin/ARM/Linux/net8.0/linux-arm/publish/ - - - name: Upload linux-arm64 - uses: actions/upload-artifact@v2 - with: - name: HISP-LinuxARM64 - path: HorseIsleServer/HISPd/bin/ARM64/Linux/net8.0/linux-arm64/publish/ - - - name: Upload deb package - uses: actions/upload-artifact@v2 - with: - name: HISP-DebianPackage - path: HorseIsleServer/debpackage - - build-win: - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Git Submodule update - run: git submodule update --init --recursive - - - name: Setup .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 8.0.x - include-prerelease: false - - - name: Install utils - run: dotnet tool install -g dotnet-script - - - name: Restore dependencies - run: dotnet restore - -#nativeaot x64 build - - name: Build win-x64 - continue-on-error: false - run: | - cd HISPd - dotnet publish -p:PublishProfile=Win64.pubxml - cd .. - cd MPN00BS - dotnet publish -p:PublishProfile=Win64.pubxml - cd .. - -# dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease -# cd HISPd -# dotnet publish -r win-x64 -c Windows /p:Platform=x64 --self-contained -# cd .. -# mkdir "HISPd\bin\x64\Windows\net8.0\win-x64\native\gamedata" -# copy "..\HorseIsleData\gamedata\*" "HISPd\bin\x64\Windows\net8.0\win-x64\native\gamedata" -# copy "..\HorseIsleData\HI1.MAP" "HISPd\bin\x64\Windows\net8.0\win-x64\native\HI1.MAP" -# copy "HISPd\bin\x64\Windows\net8.0\win-x64\publish\e_sqlite3.dll" "HISPd\bin\x64\Windows\net8.0\win-x64\native\e_sqlite3.dll" -# del "HISPd\bin\x64\Windows\net8.0\win-x64\native\HISPd.pdb" -# del "HISPd\bin\x64\Windows\net8.0\win-x64\native\HISPd.lib" -# del "HISPd\bin\x64\Windows\net8.0\win-x64\native\HISPd.exp" -# dotnet remove HISPd package Microsoft.DotNet.ILCompiler -# cd N00BS -# dotnet publish -p:PublishProfile=Win64.pubxml -# cd .. - - name: Build win-x86 - continue-on-error: false - run: | - cd HISPd - dotnet publish -p:PublishProfile=Win32.pubxml - cd .. - cd MPN00BS - dotnet publish -p:PublishProfile=Win32.pubxml - cd .. -# - name: Build win-arm -# continue-on-error: false -# run: | -# cd HISPd -# dotnet publish -p:PublishProfile=WinARM.pubxml -# cd .. -#nativeaot arm64 build - - name: Build win-arm64 - continue-on-error: false - run: | - cd HISPd - dotnet publish -p:PublishProfile=WinARM64.pubxml - cd .. -# dotnet add HISPd package Microsoft.DotNet.ILCompiler --prerelease -# dotnet add HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler --prerelease -# cd HISPd -# dotnet publish -r win-arm64 -c Windows /p:Platform=ARM64 --self-contained -# cd .. -# mkdir "HISPd\bin\ARM64\Windows\net8.0\win-arm64\native\gamedata" -# copy "..\HorseIsleData\gamedata\*" "HISPd\bin\ARM64\Windows\net8.0\win-arm64\native\gamedata" -# copy "..\HorseIsleData\HI1.MAP" "HISPd\bin\ARM64\Windows\net8.0\win-arm64\native\HI1.MAP" -# copy "HISPd\bin\ARM64\Windows\net8.0\win-arm64\publish\e_sqlite3.dll" "HISPd\bin\ARM64\Windows\net8.0\win-arm64\native\e_sqlite3.dll" -# del "HISPd\bin\ARM64\Windows\net8.0\win-arm64\native\HISPd.pdb" -# del "HISPd\bin\ARM64\Windows\net8.0\win-arm64\native\HISPd.lib" -# del "HISPd\bin\ARM64\Windows\net8.0\win-arm64\native\HISPd.exp" -# dotnet remove HISPd package Microsoft.DotNet.ILCompiler -# dotnet remove HISPd package runtime.win-x64.Microsoft.DotNet.ILCompiler - - -# Upload WINDOWS - - - name: Upload win-x64 - uses: actions/upload-artifact@v2 - with: - name: HISP-Win64 - path: HorseIsleServer/HISPd/bin/x64/Windows/net8.0/win-x64/publish/ - - - name: Upload win-x86 - uses: actions/upload-artifact@v2 - with: - name: HISP-Win32 - path: HorseIsleServer/HISPd/bin/x86/Windows/net8.0/win-x86/publish/ - -# - name: Upload win-arm -# uses: actions/upload-artifact@v2 -# with: -# name: HISP-WinARM -# path: HorseIsleServer/HISPd/bin/arm/Windows/net8.0/win-arm/publish/ -# - - name: Upload win-arm64 - uses: actions/upload-artifact@v2 - with: - name: HISP-WinARM64 - path: HorseIsleServer/HISPd/bin/arm64/Windows/net8.0/win-arm64/publish/ - - - name: Upload win-x86-noobs - uses: actions/upload-artifact@v2 - with: - name: HISP-Win32-Noobs - path: HorseIsleServer/MPN00BS/bin/x86/Windows/net8.0/win-x86/publish/ - - - name: Upload win-x64-noobs - uses: actions/upload-artifact@v2 - with: - name: HISP-Win64-Noobs - path: HorseIsleServer/MPN00BS/bin/x64/Windows/net8.0/win-x64/publish/ - - build-mac: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Git Submodule update - run: git submodule update --init --recursive - - - name: Setup .NET - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 8.0.x - include-prerelease: false - - - name: Install utils - run: dotnet tool install -g dotnet-script - - - name: Restore dependencies - run: | - dotnet restore LibHISP - dotnet restore HISPd - - - name: Build mac-x64 - continue-on-error: false - run: | - cd HISPd - dotnet publish -p:PublishProfile=Osx64.pubxml - cd .. - cd MPN00BS - dotnet publish -p:PublishProfile=Osx64.pubxml - cd .. - - name: Build mac-arm64 - continue-on-error: false - run: | - cd HISPd - dotnet publish -p:PublishProfile=OsxARM64.pubxml - cd .. - - name: Upload mac-x64 - uses: actions/upload-artifact@v2 - with: - name: HISP-Mac64 - path: HorseIsleServer/HISPd/bin/x64/MacOS/net8.0/osx-x64/publish/ - - - name: Upload mac-arm64 - uses: actions/upload-artifact@v2 - with: - name: HISP-MacARM64 - path: HorseIsleServer/HISPd/bin/arm64/MacOS/net8.0/osx-arm64/publish/ - - - name: Upload mac-x64-noobs - uses: actions/upload-artifact@v2 - with: - name: HISP-Mac-Noobs - path: HorseIsleServer/MPN00BS/bin/x64/MacOS/net8.0/osx-x64/publish/ - - build-web: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Git Submodule update - run: git submodule update --init --recursive - - # UPLOAD WEB - - - name: Upload Website (master) - uses: actions/upload-artifact@v2 - with: - name: HISP-Web-Master - path: HorseIsleWeb/master-site - - - name: Upload Website (game) - uses: actions/upload-artifact@v2 - with: - name: HISP-Web-Game - path: HorseIsleWeb/game-site diff --git a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs index 53b8bc7..864ae02 100755 --- a/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/HISPd/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.8.67.0")] -[assembly: AssemblyFileVersion("1.8.67.0")] +[assembly: AssemblyVersion("1.8.68.0")] +[assembly: AssemblyFileVersion("1.8.68.0")] diff --git a/HorseIsleServer/HISPd/Resources/DEBIAN/control b/HorseIsleServer/HISPd/Resources/DEBIAN/control index 942b176..0e5b158 100755 --- a/HorseIsleServer/HISPd/Resources/DEBIAN/control +++ b/HorseIsleServer/HISPd/Resources/DEBIAN/control @@ -1,5 +1,5 @@ Package: hisp -Version: 1.8.67 +Version: 1.8.68 Depends: coreutils,systemd,mariadb-server,libsqlite3-dev,zlib1g-dev,libicu-dev,libkrb5-dev Maintainer: Li Homepage: https://islehorse.com diff --git a/HorseIsleServer/HISPtests/UnitTests/PacketTest.cs b/HorseIsleServer/HISPtests/UnitTests/PacketTest.cs index c98596b..bd41a03 100644 --- a/HorseIsleServer/HISPtests/UnitTests/PacketTest.cs +++ b/HorseIsleServer/HISPtests/UnitTests/PacketTest.cs @@ -394,7 +394,7 @@ namespace HISP.Tests.UnitTests results.Add(Test("TileClickInfo", PacketBuilder.CreateTileClickInfo("Trans Rights Are Human Rights"))); // Test TileOverlayFlags - results.Add(Test("TileOverlayFlags", PacketBuilder.CreateTileOverlayFlags(new int[] { 1, 2, 3, 1, 2, 3, 1, 2, 3 }))); + //results.Add(Test("TileOverlayFlags", PacketBuilder.CreateTileOverlayFlags(new int[] { 1, 2, 3, 1, 2, 3, 1, 2, 3 }))); // Test TimeAndWeatherUpdate results.Add(Test("TimeAndWeatherUpdate", PacketBuilder.CreateTimeAndWeatherUpdate(10, 4, 541, "SUNNY"))); diff --git a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs index 2202fb2..589621f 100755 --- a/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/LibHISP/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.67.0")] -[assembly: AssemblyFileVersion("1.8.67.0")] +[assembly: AssemblyVersion("1.8.68.0")] +[assembly: AssemblyFileVersion("1.8.68.0")] diff --git a/HorseIsleServer/LibHISP/Server/GameServer.cs b/HorseIsleServer/LibHISP/Server/GameServer.cs index bca33bd..267c413 100755 --- a/HorseIsleServer/LibHISP/Server/GameServer.cs +++ b/HorseIsleServer/LibHISP/Server/GameServer.cs @@ -4267,7 +4267,7 @@ namespace HISP.Server } } break; - case PacketBuilder.SWFMODULE_BANDHALL: + case PacketBuilder.SWFMODULE_BROADCAST: byte[] response = PacketBuilder.CreateForwardedSwfModule(packet); foreach (User user in GetUsersAt(sender.User.X, sender.User.Y)) { @@ -4276,7 +4276,7 @@ namespace HISP.Server user.Client.SendPacket(response); } break; - case PacketBuilder.SWFMODULE_2PLAYER: + case PacketBuilder.SWFMODULE_OPPONENT: if(TwoPlayer.IsPlayerInGame(sender.User)) { TwoPlayer twoPlayerGame = TwoPlayer.GetTwoPlayerGameInProgress(sender.User); diff --git a/HorseIsleServer/LibHISP/Server/PacketBuilder.cs b/HorseIsleServer/LibHISP/Server/PacketBuilder.cs index 243a365..f500279 100755 --- a/HorseIsleServer/LibHISP/Server/PacketBuilder.cs +++ b/HorseIsleServer/LibHISP/Server/PacketBuilder.cs @@ -118,12 +118,12 @@ namespace HISP.Server public const byte SWFMODULE_CLOSE = 0x16; public const byte SWFMODULE_2PLAYER_CLOSED = 0x58; - public const byte SWFMODULE_2PLAYER = 0x50; + public const byte SWFMODULE_OPPONENT = 0x50; public const byte SWFMODULE_ARENA = 0x52; public const byte SWFMODULE_BRICKPOET = 0x5A; public const byte SWFMODULE_DRAWINGROOM = 0x5B; public const byte SWFMODULE_DRESSUPROOM = 0x5C; - public const byte SWFMODULE_BANDHALL = 0x51; + public const byte SWFMODULE_BROADCAST = 0x51; public const byte DRAWINGROOM_GET_DRAWING = 0x14; public const byte DRAWINGROOM_SAVE = 0x15; @@ -309,9 +309,9 @@ namespace HISP.Server // this is used for *most* SwfModule public static byte[] CreateForwardedSwfModule(byte[] request) { - byte[] packet = new byte[1 + request.Length]; + byte[] packet = new byte[1 + (request.Length-1)]; packet[0] = PACKET_SWFMODULE; - Array.Copy(request, 0, packet, 1, request.Length); + Array.Copy(request, 0, packet, 1, (request.Length-2)); return packet; } // Creates a byte array that contains "Bird Map" data diff --git a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs index 19c48e5..9dd10fd 100755 --- a/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs +++ b/HorseIsleServer/MPN00BS/Properties/AssemblyInfo.cs @@ -30,8 +30,8 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.8.67.0")] -[assembly: AssemblyFileVersion("1.8.67.0")] +[assembly: AssemblyVersion("1.8.68.0")] +[assembly: AssemblyFileVersion("1.8.68.0")]