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

17
Projects/UOContent.Tests/Tests/Engines/Chat/ChatPacketTests.cs
View file

@ -3,15 +3,15 @@ using Server.Tests;
using Server.Tests.Network;
using Xunit;
namespace UOContent.Tests
namespace UOContent.Tests;
public class ChatPacketTests
{
public class ChatPacketTests
[Theory]
[InlineData(null, 100, "some param", "some other param")]
[InlineData("ENU", 200, "a third param", "another param")]
public void TestSendChatMessage(string lang, int number, string param1, string param2)
{
[Theory]
[InlineData(null, 100, "some param", "some other param")]
[InlineData("ENU", 200, "a third param", "another param")]
public void TestSendChatMessage(string lang, int number, string param1, string param2)
{
var expected = new ChatMessagePacket(lang, number, param1, param2).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
@ -20,5 +20,4 @@ namespace UOContent.Tests
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

11
Projects/UOContent.Tests/Tests/Engines/Chat/Packets.cs
View file

@ -1,11 +1,11 @@
using Server.Network;
namespace Server.Engines.Chat
namespace Server.Engines.Chat;
public sealed class ChatMessagePacket : Packet
{
public sealed class ChatMessagePacket : Packet
public ChatMessagePacket(string lang, int number, string param1, string param2) : base(0xB2)
{
public ChatMessagePacket(string lang, int number, string param1, string param2) : base(0xB2)
{
param1 ??= string.Empty;
param2 ??= string.Empty;
@ -25,5 +25,4 @@ namespace Server.Engines.Chat
Stream.WriteBigUniNull(param1);
Stream.WriteBigUniNull(param2);
}
}
}
}

11
Projects/UOContent.Tests/Tests/Engines/Help/HelpTopic.cs
View file

@ -1,9 +1,9 @@
namespace Server.Network
namespace Server.Network;
public class DisplayHelpTopic : Packet
{
public class DisplayHelpTopic : Packet
public DisplayHelpTopic(int topicID, bool display) : base(0xBF)
{
public DisplayHelpTopic(int topicID, bool display) : base(0xBF)
{
EnsureCapacity(11);
Stream.Write((short)0x17);
@ -11,5 +11,4 @@ namespace Server.Network
Stream.Write(topicID);
Stream.Write(display);
}
}
}
}

17
Projects/UOContent.Tests/Tests/Engines/Help/TestHelpTopicPacket.cs
View file

@ -4,15 +4,15 @@ using Server.Tests;
using Server.Tests.Network;
using Xunit;
namespace UOContent.Tests
namespace UOContent.Tests;
public class TestHelpTopicPacket
{
public class TestHelpTopicPacket
[Theory]
[InlineData(HelpTopic.Healing, false)]
[InlineData(HelpTopic.EmptyingBowl, true)]
public void TestDisplayHelpTopic(int topic, bool display)
{
[Theory]
[InlineData(HelpTopic.Healing, false)]
[InlineData(HelpTopic.EmptyingBowl, true)]
public void TestDisplayHelpTopic(int topic, bool display)
{
var expected = new DisplayHelpTopic(topic, display).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
@ -21,5 +21,4 @@ namespace UOContent.Tests
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

19
Projects/UOContent.Tests/Tests/Engines/ML Quests/Packets.cs
View file

@ -1,28 +1,27 @@
using Server.Network;
namespace Server.Engines.MLQuests
namespace Server.Engines.MLQuests;
public sealed class RaceChanger : Packet
{
public sealed class RaceChanger : Packet
public RaceChanger(bool female, Race targetRace) : base(0xBF)
{
public RaceChanger(bool female, Race targetRace) : base(0xBF)
{
EnsureCapacity(7);
Stream.Write((short)0x2A);
Stream.Write((byte)(female ? 1 : 0));
Stream.Write((byte)(targetRace.RaceID + 1));
}
}
}
public sealed class CloseRaceChanger : Packet
public sealed class CloseRaceChanger : Packet
{
public CloseRaceChanger() : base(0xBF)
{
public CloseRaceChanger() : base(0xBF)
{
EnsureCapacity(7);
Stream.Write((short)0x2A);
Stream.Write((byte)0);
Stream.Write((byte)0xFF);
}
}
}
}

43
Projects/UOContent.Tests/Tests/Engines/Party/Packets.cs
View file

@ -1,11 +1,11 @@
using Server.Network;
namespace Server.Engines.PartySystem
namespace Server.Engines.PartySystem;
public sealed class PartyEmptyList : Packet
{
public sealed class PartyEmptyList : Packet
public PartyEmptyList(Serial m) : base(0xBF)
{
public PartyEmptyList(Serial m) : base(0xBF)
{
EnsureCapacity(7);
Stream.Write((short)0x0006);
@ -13,12 +13,12 @@ namespace Server.Engines.PartySystem
Stream.Write((byte)0);
Stream.Write(m);
}
}
}
public sealed class PartyMemberList : Packet
public sealed class PartyMemberList : Packet
{
public PartyMemberList(Party p) : base(0xBF)
{
public PartyMemberList(Party p) : base(0xBF)
{
EnsureCapacity(7 + p.Count * 4);
Stream.Write((short)0x0006);
@ -30,12 +30,12 @@ namespace Server.Engines.PartySystem
Stream.Write(p[i].Mobile.Serial);
}
}
}
}
public sealed class PartyRemoveMember : Packet
public sealed class PartyRemoveMember : Packet
{
public PartyRemoveMember(Serial removed, Party p) : base(0xBF)
{
public PartyRemoveMember(Serial removed, Party p) : base(0xBF)
{
EnsureCapacity(11 + p.Count * 4);
Stream.Write((short)0x0006);
@ -49,12 +49,12 @@ namespace Server.Engines.PartySystem
Stream.Write(p[i].Mobile.Serial);
}
}
}
}
public sealed class PartyTextMessage : Packet
public sealed class PartyTextMessage : Packet
{
public PartyTextMessage(bool toAll, Serial from, string text) : base(0xBF)
{
public PartyTextMessage(bool toAll, Serial from, string text) : base(0xBF)
{
text ??= "";
EnsureCapacity(12 + text.Length * 2);
@ -64,17 +64,16 @@ namespace Server.Engines.PartySystem
Stream.Write(from);
Stream.WriteBigUniNull(text);
}
}
}
public sealed class PartyInvitation : Packet
public sealed class PartyInvitation : Packet
{
public PartyInvitation(Serial leader) : base(0xBF)
{
public PartyInvitation(Serial leader) : base(0xBF)
{
EnsureCapacity(10);
Stream.Write((short)0x0006);
Stream.Write((byte)0x07);
Stream.Write(leader);
}
}
}
}

41
Projects/UOContent.Tests/Tests/Engines/Party/PartyPacketTests.cs
View file

@ -4,13 +4,13 @@ using Server.Tests;
using Server.Tests.Network;
using Xunit;
namespace UOContent.Tests
namespace UOContent.Tests;
public class PartyPacketTests : IClassFixture<ServerFixture>
{
public class PartyPacketTests : IClassFixture<ServerFixture>
[Fact]
public void TestPartyEmptyList()
{
[Fact]
public void TestPartyEmptyList()
{
Serial m = (Serial)0x1024u;
var expected = new PartyEmptyList(m).Compile();
@ -22,9 +22,9 @@ namespace UOContent.Tests
AssertThat.Equal(result, expected);
}
[Fact]
public void TestPartyRemoveMember()
{
[Fact]
public void TestPartyRemoveMember()
{
var leader = new Mobile((Serial)0x1024u);
leader.DefaultMobileInit();
@ -43,9 +43,9 @@ namespace UOContent.Tests
AssertThat.Equal(result, expected);
}
[Fact]
public void TestPartyMemberList()
{
[Fact]
public void TestPartyMemberList()
{
var leader = new Mobile((Serial)0x1024u);
leader.DefaultMobileInit();
@ -64,11 +64,11 @@ namespace UOContent.Tests
AssertThat.Equal(result, expected);
}
[Theory]
[InlineData(true)]
[InlineData(false)]
public void TestPartyTextMessage(bool toAll)
{
[Theory]
[InlineData(true)]
[InlineData(false)]
public void TestPartyTextMessage(bool toAll)
{
Serial serial = (Serial)0x1024u;
var text = "[Party] Stuff Happens";
@ -81,9 +81,9 @@ namespace UOContent.Tests
AssertThat.Equal(result, expected);
}
[Fact]
public void TestPartyInvitation()
{
[Fact]
public void TestPartyInvitation()
{
Serial m = (Serial)0x1024u;
var expected = new PartyInvitation(m).Compile();
@ -94,5 +94,4 @@ namespace UOContent.Tests
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

15
Projects/UOContent.Tests/Tests/Engines/Veteran Rewards/Character Statue Maker/CharacterStatuePacketTests.cs
View file

@ -5,14 +5,14 @@ using Server.Tests;
using Server.Tests.Network;
using Xunit;
namespace UOContent.Tests
namespace UOContent.Tests;
public class CharacterStatuePacketTests
{
public class CharacterStatuePacketTests
[Theory]
[InlineData(0x1024u, 1, 100, 200)]
public void TestSendStatueAnimation(uint s, int status, int anim, int frame)
{
[Theory]
[InlineData(0x1024u, 1, 100, 200)]
public void TestSendStatueAnimation(uint s, int status, int anim, int frame)
{
var expected = new UpdateStatueAnimation((Serial)s, status, anim, frame).Compile();
var ns = PacketTestUtilities.CreateTestNetState();
@ -21,5 +21,4 @@ namespace UOContent.Tests
var result = ns.SendPipe.Reader.AvailableToRead();
AssertThat.Equal(result, expected);
}
}
}
}

11
Projects/UOContent.Tests/Tests/Engines/Veteran Rewards/Character Statue Maker/Packets.cs
View file

@ -1,9 +1,9 @@
namespace Server.Network
namespace Server.Network;
public class UpdateStatueAnimation : Packet
{
public class UpdateStatueAnimation : Packet
public UpdateStatueAnimation(Serial serial, int status, int animation, int frame) : base(0xBF, 17)
{
public UpdateStatueAnimation(Serial serial, int status, int animation, int frame) : base(0xBF, 17)
{
Stream.Write((short)0x11);
Stream.Write((short)0x19);
Stream.Write((byte)0x5);
@ -16,5 +16,4 @@ namespace Server.Network
Stream.Write((byte)0);
Stream.Write((byte)frame);
}
}
}
}