diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 683b60f..fcb6886 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -42,6 +42,6 @@ jobs: uses: actions/upload-artifact@v3 with: name: RageCoop.Client - path: bin/Release/Client/RageCoop + path: bin/Release/Client - uses: actions/checkout@v2 \ No newline at end of file diff --git a/RageCoop.Client/Properties/AssemblyInfo.cs b/RageCoop.Client/Properties/AssemblyInfo.cs index 726356d..6a66801 100644 --- a/RageCoop.Client/Properties/AssemblyInfo.cs +++ b/RageCoop.Client/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ using System.Resources; // Version informationr( -[assembly: AssemblyVersion("1.5.4.1")] -[assembly: AssemblyFileVersion("1.5.4.1")] +[assembly: AssemblyVersion("1.5.4.3")] +[assembly: AssemblyFileVersion("1.5.4.3")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.Members.cs b/RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.Members.cs index 580a838..7a3c3b7 100644 --- a/RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.Members.cs +++ b/RageCoop.Client/Sync/Entities/Vehicle/SyncedVehicle.Members.cs @@ -70,7 +70,6 @@ namespace RageCoop.Client private readonly List _predictedTrace = new List(); private readonly List _orgTrace = new List(); private Vector3 _predictedPosition; - private readonly float _elapsed; #endregion #region OUTGOING diff --git a/RageCoop.Core/CoreUtils.cs b/RageCoop.Core/CoreUtils.cs index 27a64c4..d2d97ad 100644 --- a/RageCoop.Core/CoreUtils.cs +++ b/RageCoop.Core/CoreUtils.cs @@ -240,14 +240,6 @@ namespace RageCoop.Core { return Encoding.UTF8.GetBytes(s); } - public static byte[] GetBytesWithLength(this string s) - { - var data = new List(100); - var sb = Encoding.UTF8.GetBytes(s); - data.AddInt(sb.Length); - data.AddRange(sb); - return data.ToArray(); - } public static string GetString(this byte[] data) { return Encoding.UTF8.GetString(data); diff --git a/RageCoop.Core/PacketExtensions.cs b/RageCoop.Core/PacketExtensions.cs index 22cf413..50c5cc2 100644 --- a/RageCoop.Core/PacketExtensions.cs +++ b/RageCoop.Core/PacketExtensions.cs @@ -63,65 +63,6 @@ namespace RageCoop.Core } #endregion - #region BYTE-LIST - public static void AddVector3(this List bytes, Vector3 vec3) - { - bytes.AddRange(BitConverter.GetBytes(vec3.X)); - bytes.AddRange(BitConverter.GetBytes(vec3.Y)); - bytes.AddRange(BitConverter.GetBytes(vec3.Z)); - } - public static void AddQuaternion(this List bytes, Quaternion quat) - { - bytes.AddRange(BitConverter.GetBytes(quat.X)); - bytes.AddRange(BitConverter.GetBytes(quat.Y)); - bytes.AddRange(BitConverter.GetBytes(quat.Z)); - bytes.AddRange(BitConverter.GetBytes(quat.W)); - } - public static void AddInt(this List bytes, int i) - { - bytes.AddRange(BitConverter.GetBytes(i)); - } - public static void AddUint(this List bytes, uint i) - { - bytes.AddRange(BitConverter.GetBytes(i)); - } - public static void AddShort(this List bytes, short i) - { - bytes.AddRange(BitConverter.GetBytes(i)); - } - public static void AddUshort(this List bytes, ushort i) - { - bytes.AddRange(BitConverter.GetBytes(i)); - } - public static void AddLong(this List bytes, long i) - { - bytes.AddRange(BitConverter.GetBytes(i)); - } - public static void AddUlong(this List bytes, ulong i) - { - bytes.AddRange(BitConverter.GetBytes(i)); - } - public static void AddFloat(this List bytes, float i) - { - bytes.AddRange(BitConverter.GetBytes(i)); - } - public static void AddBool(this List bytes, bool b) - { - bytes.Add(b ? (byte)1 : (byte)0); - } - public static void AddString(this List bytes, string s) - { - var sb = Encoding.UTF8.GetBytes(s); - bytes.AddInt(sb.Length); - bytes.AddRange(sb); - } - public static void AddArray(this List bytes, byte[] toadd) - { - bytes.AddInt(toadd.Length); - bytes.AddRange(toadd); - } - #endregion - internal static bool IsSyncEvent(this PacketType p) { return (30 <= (byte)p) && ((byte)p <= 40); diff --git a/RageCoop.Server/Properties/AssemblyInfo.cs b/RageCoop.Server/Properties/AssemblyInfo.cs index bea3fe6..6a28ef3 100644 --- a/RageCoop.Server/Properties/AssemblyInfo.cs +++ b/RageCoop.Server/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Resources; [assembly: AssemblyCulture("")] // Version information -[assembly: AssemblyVersion("1.5.4.0")] -[assembly: AssemblyFileVersion("1.5.4.0")] +[assembly: AssemblyVersion("1.5.4.2")] +[assembly: AssemblyFileVersion("1.5.4.2")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )]