warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Splits Server in Core and Application (#1806)

Browse source 
> [!Note]
> **Developer Note**
> Now developers will only need to build/run the Application project instead of everything.
> When adding new projects, make sure to: 
> 1. Add a reference to that project in the Application project.
> 2. Add the dll file to the Distribution/Data/assemblies.json file

### Summary
- Adds an application project
- Consolidates process restarts to use `Core.Kill(true)`
- Removes some old messaging, for example processor optimization
- Fixes missing build cleanup
This commit is contained in:
Kamron Batman 2024-05-30 23:34:03 -07:00 • committed by GitHub
parent e85c56ec2d
commit 60a3a6f501
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
43 changed files with 572 additions and 585 deletions
Download patch file Download diff file Expand all files Collapse all files

49
Projects/UOContent.Tests/Tests/Network/Packets/ArrowPacketTests.cs
View file

@ -1,13 +1,13 @@
using Server.Network;
using Xunit;
namespace Server.Tests.Network
namespace Server.Tests.Network;
public class ArrowPacketTests
{
public class ArrowPacketTests
[Fact]
public void TestCancelArrow()
{
[Fact]
public void TestCancelArrow()
{
var expected = new CancelArrow().Compile();
var ns = PacketTestUtilities.CreateTestNetState();
@ -17,12 +17,12 @@ namespace Server.Tests.Network
AssertThat.Equal(result, expected);
}
[Theory]
[InlineData(0, 0)]
[InlineData(100, 10)]
[InlineData(100000, 100000)]
public void TestSetArrow(int x, int y)
{
[Theory]
[InlineData(0, 0)]
[InlineData(100, 10)]
[InlineData(100000, 100000)]
public void TestSetArrow(int x, int y)
{
var expected = new SetArrow(x, y).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
@ -32,12 +32,12 @@ namespace Server.Tests.Network
AssertThat.Equal(result, expected);
}
[Theory]
[InlineData(0, 0)]
[InlineData(100, 10)]
[InlineData(100000, 100000)]
public void TestCancelArrowHS(int x, int y)
{
[Theory]
[InlineData(0, 0)]
[InlineData(100, 10)]
[InlineData(100000, 100000)]
public void TestCancelArrowHS(int x, int y)
{
Serial serial = (Serial)0x1024;
var expected = new CancelArrowHS(x, y, serial).Compile();
@ -50,12 +50,12 @@ namespace Server.Tests.Network
AssertThat.Equal(result, expected);
}
[Theory]
[InlineData(0, 0)]
[InlineData(100, 10)]
[InlineData(100000, 100000)]
public void TestSetArrowHS(int x, int y)
{
[Theory]
[InlineData(0, 0)]
[InlineData(100, 10)]
[InlineData(100000, 100000)]
public void TestSetArrowHS(int x, int y)
{
Serial serial = (Serial)0x1024;
var expected = new SetArrowHS(x, y, serial).Compile();
@ -67,5 +67,4 @@ namespace Server.Tests.Network
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

73
Projects/UOContent.Tests/Tests/Network/Packets/ArrowPackets.cs
View file

@ -1,44 +1,43 @@
namespace Server.Network
namespace Server.Network;
public sealed class CancelArrow : Packet
{
public sealed class CancelArrow : Packet
public CancelArrow() : base(0xBA, 6)
{
public CancelArrow() : base(0xBA, 6)
{
Stream.Write((byte)0);
Stream.Write((short)-1);
Stream.Write((short)-1);
}
}
public sealed class SetArrow : Packet
{
public SetArrow(int x, int y) : base(0xBA, 6)
{
Stream.Write((byte)1);
Stream.Write((short)x);
Stream.Write((short)y);
}
}
public sealed class CancelArrowHS : Packet
{
public CancelArrowHS(int x, int y, Serial s) : base(0xBA, 10)
{
Stream.Write((byte)0);
Stream.Write((short)x);
Stream.Write((short)y);
Stream.Write(s);
}
}
public sealed class SetArrowHS : Packet
{
public SetArrowHS(int x, int y, Serial s) : base(0xBA, 10)
{
Stream.Write((byte)1);
Stream.Write((short)x);
Stream.Write((short)y);
Stream.Write(s);
}
}
}
public sealed class SetArrow : Packet
{
public SetArrow(int x, int y) : base(0xBA, 6)
{
Stream.Write((byte)1);
Stream.Write((short)x);
Stream.Write((short)y);
}
}
public sealed class CancelArrowHS : Packet
{
public CancelArrowHS(int x, int y, Serial s) : base(0xBA, 10)
{
Stream.Write((byte)0);
Stream.Write((short)x);
Stream.Write((short)y);
Stream.Write(s);
}
}
public sealed class SetArrowHS : Packet
{
public SetArrowHS(int x, int y, Serial s) : base(0xBA, 10)
{
Stream.Write((byte)1);
Stream.Write((short)x);
Stream.Write((short)y);
Stream.Write(s);
}
}

23
Projects/UOContent.Tests/Tests/Network/Packets/BuffIconPacketTests.cs
View file

@ -5,15 +5,15 @@ using Server.Tests;
using Server.Tests.Network;
using Xunit;
namespace UOContent.Tests
namespace UOContent.Tests;
public class BuffIconPacketTests
{
public class BuffIconPacketTests
[Theory]
[InlineData(0x1024u, BuffIcon.Clumsy, 500100, 300200, "123456", 8000)]
[InlineData(0x2048u, BuffIcon.Disguised, 500102, 300203, null, 9000)]
public void TestAddBuffIcon(uint mob, BuffIcon iconID, int titleCliloc, int secondaryCliloc, string args, int ts)
{
[Theory]
[InlineData(0x1024u, BuffIcon.Clumsy, 500100, 300200, "123456", 8000)]
[InlineData(0x2048u, BuffIcon.Disguised, 500102, 300203, null, 9000)]
public void TestAddBuffIcon(uint mob, BuffIcon iconID, int titleCliloc, int secondaryCliloc, string args, int ts)
{
var timeSpan = new TimeSpan(ts);
var expected = new AddBuffPacket(
(Serial)mob, iconID, titleCliloc, secondaryCliloc, args, timeSpan
@ -26,9 +26,9 @@ namespace UOContent.Tests
AssertThat.Equal(result, expected);
}
[Fact]
public void TestRemoveBuffIcon()
{
[Fact]
public void TestRemoveBuffIcon()
{
Serial m = (Serial)0x1024;
var buffIcon = BuffIcon.Disguised;
var expected = new RemoveBuffPacket(m, buffIcon).Compile();
@ -39,5 +39,4 @@ namespace UOContent.Tests
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}