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

Updates Packets & Randomizer (#43)

Browse source 
* Fixes a bug with the main loop. Removes unnecessary optimizations for RDRand.

* WIP - Rewriting packets.

* Cleanup and updates README

* Converts more packets

* Fixes header

* Converts Effects packets.

* Forgot the send command

* Adds the start of containers packets.

* Adds message packets with caching

* Extends the send methods

* Starts to add Acquire methods

* Converted the packets

* Cleanup

* Cleanup

* Adds more packets

* Adds more packets

* Fixes clearing arrays from pool. Adds Mobile Incoming

* Converts more packets.

* Moves more packets

* Moves more packets

* Test compression

* Merges

* Migrating to an idiomatic syntax that also supports compression, and proxying.

* Optimize the stack alloc. Changes attributes

* Converted container packets

* Visual Studio doesn't auto save files. I am still getting used to subpar IDEs.

* Adds static packet caching. Will profile later. Converts more packets

* Fixes packets and changes how compression is configured

* WIP - Adds basics for Gumps. Not finished though.

* Fix file

* Fixes formatting

* Changed SpanWriter to be more idiomatic.

* Fixes Span vs RawSpan and missing stackallocs

* Converts over some more gumps

* WIP - Deletes 32bit support.

* Drops RDRand32 support.

* Fixes gump compilation

* Converting gump components

* Removes old huffman compression function

* Revert signature for backwards compatibility

* WIP - Converting more gump components

* Creates ArraySet for the strings. Updates AppendTo to reference that.

* Converts the maining gump components

* Cleans up gump components

* Cleans up directives

* Cleans up ArraySet and moves it. Adds null-coalescing-assignment

* Cleanup, Target Packets, and C# 8 changes.

* Removed OPL Packet

* World packets

* Fixing packet uses

* Cleans up code. Fixes packet uses in various places.

* More cleanup for packets

* Code cleanup

* Converts more packet uses and cleans up more code

* More code cleanup

* Finishes fixing the packets in Item

* Updates secure trade packets

* Updates core and gets it to compile.

* Moved packets to scripts. Fixed account handler use of packets

* Code cleanup

* Updates chat packets

* Code cleanuo

* Adds party packets, but need to implement them.

* Party packets WIP

* Finishes party packets

* Rearrange movement namespaces and classes

* Finishes plant packets

* Code Formatting

* Fixes moving effects

* Code cleanup, eliminates equipinfo

* Adds more packets. Fixes bugs with various packets.

* Finishes mahjon packets

* Fixes mahjong packet

* Code cleanup

* Finishes mahjong packets

* Adds Map packets

* Add multifacet maps and charts

* Cleans up some packets with UTF8

* Optimizes packets

* Cleans up more packets. Moves the MessageHelper

* Removes assistant support. Removes extended protocol. Incorporates MapUO packets as normal packets.

* Updates protocol extensions packet receiver

* Fixes a few bugs. Fixes a few more packets.

* Code cleanup and fixing more packets

* Fixes packet effects

* Cleaned up more code

* Buff Icon cleanup

* Removed unused constructors

* Code Cleanup. Adds BoatHS Packets

* Moves house files. Updates house foundation packets.

* Deployment cleanup

* Fixes:

* Code cleanup

* More code cleanup

* More code cleanup

* Cleaned up BaseHouse

* Enforces styling

* Converts foreach to linq where possible.

* Dont need that

* Goals/Readme updates

* Removes 32bit support at the highest level. Turns on HRT by default.

* Code cleanup. Fixes extended features packet.

* Fixes various bugs

* Code cleanup

* Code cleanup

* Code cleanup. Fixes gump X/Y assignment.

* Code cleanup using |= operator

* More code cleanup

* Cleanup

* Fixes spacing issues. Thanks Visual Studio. You suck.

* Compiler error

* Fixes NPE from RunUO 2.7

* Renames ScriptCompiler to AssemblyHandler. Fixes packets. Updates README

* Fixes more packets. Stupid trailing nulls.

* Fixes various bugs.

* Fixes for gumps

* Fixes more gump stuff. Going to split it out later since it is getting insane

* Recoded the gump writing

* WIP

* *Added output path of scripts project to dev branch
*Activated debugging in code
This commit is contained in:
Kamron Batman 2019-11-11 03:40:16 -08:00 • committed by 3HMonkey
parent 7aa8fd3df1
commit 179cb50557
588 changed files with 10843 additions and 16177 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Projects/Scripts/Engines/Chat/Channel.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
namespace Server.Engines.Chat
{
@ -401,18 +402,7 @@ namespace Server.Engines.Chat
}
}
public static Channel FindChannelByName(string name)
{
for (int i = 0; i < Channels.Count; ++i)
{
Channel channel = Channels[i];
if (channel.m_Name == name)
return channel;
}
return null;
}
public static Channel FindChannelByName(string name) => Channels.FirstOrDefault(channel => channel.m_Name == name);
public static void Initialize()
{

31
Projects/Scripts/Engines/Chat/Chat.cs
View file

@ -1,12 +1,13 @@
using System;
using System.IO;
using System.Linq;
using Server.Accounting;
using Server.Misc;
using Server.Network;
namespace Server.Engines.Chat
{
public class ChatSystem
public static class ChatSystem
{
public static bool Enabled{ get; set; } = true;
@ -18,7 +19,7 @@ namespace Server.Engines.Chat
public static void SendCommandTo(Mobile to, ChatCommand type, string param1 = null, string param2 = null)
{
to?.Send(new ChatMessagePacket(null, (int)type + 20, param1, param2));
ChatPackets.SendChatMessage(to?.NetState, null, (int)type + 20, param1, param2);
}
public static void OpenChatWindowRequest(NetState state, PacketReader pvSrc)
@ -61,21 +62,11 @@ namespace Server.Engines.Chat
{
// TODO: Optimize this search
foreach (Account checkAccount in Accounts.GetAccounts())
if (Accounts.GetAccounts().Cast<Account>().Any(checkAccount => Insensitive.Equals(checkAccount.GetTag("ChatName")?.Trim(), chatName)))
{
string existingName = checkAccount.GetTag("ChatName");
if (existingName != null)
{
existingName = existingName.Trim();
if (Insensitive.Equals(existingName, chatName))
{
from.SendMessage("Nickname already in use.");
SendCommandTo(from, ChatCommand.AskNewNickname);
return;
}
}
from.SendMessage("Nickname already in use.");
SendCommandTo(from, ChatCommand.AskNewNickname);
return;
}
accountChatName = chatName;
@ -129,17 +120,15 @@ namespace Server.Engines.Chat
if (handler.RequireConference && channel == null)
user.SendMessage(31); /* You must be in a conference to do this.
* To join a conference, select one from the Conference menu.
*/
* To join a conference, select one from the Conference menu.
*/
else if (handler.RequireModerator && !user.IsModerator)
user.SendMessage(29); // You must have operator status to do this.
else
handler.Callback(user, channel, param);
}
else
{
Console.WriteLine("Client: {0}: Unknown chat action 0x{1:X}: {2}", state, actionID, param);
}
}
catch (Exception e)
{
@ -147,4 +136,4 @@ namespace Server.Engines.Chat
}
}
}
}
}

6
Projects/Scripts/Engines/Chat/ChatActionHandlers.cs
View file

@ -1,6 +1,6 @@
namespace Server.Engines.Chat
{
public class ChatActionHandlers
public static class ChatActionHandlers
{
private static ChatActionHandler[] m_Handlers;
@ -112,8 +112,8 @@ namespace Server.Engines.Chat
{
from.IgnorePrivateMessage = true;
from.SendMessage(38); /* You will no longer receive private messages.
* Those who send you a message will be notified that you are blocking incoming messages.
*/
* Those who send you a message will be notified that you are blocking incoming messages.
*/
}
public static void TogglePrivateMessages(ChatUser from, Channel channel, string param)

28
Projects/Scripts/Engines/Chat/ChatUser.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using Server.Accounting;
namespace Server.Engines.Chat
@ -64,16 +65,14 @@ namespace Server.Engines.Chat
return false;
}
public void SendMessage(int number, string param1 = null, string param2 = null)
public void SendMessage(int number, string param1 = "", string param2 = "")
{
if (Mobile.NetState != null)
Mobile.Send(new ChatMessagePacket(Mobile, number, param1, param2));
ChatPackets.SendChatMessage(Mobile.NetState, Mobile, number, param1, param2);
}
public void SendMessage(int number, Mobile from, string param1, string param2)
public void SendMessage(int number, Mobile from, string param1 = "", string param2 = "")
{
if (Mobile.NetState != null)
Mobile.Send(new ChatMessagePacket(from, number, param1, param2));
ChatPackets.SendChatMessage(Mobile.NetState, from, number, param1, param2);
}
public bool IsIgnored(ChatUser check) => Ignored.Contains(check);
@ -81,9 +80,7 @@ namespace Server.Engines.Chat
public void AddIgnored(ChatUser user)
{
if (IsIgnored(user))
{
SendMessage(22, user.Username); // You are already ignoring %1.
}
else
{
Ignored.Add(user);
@ -106,9 +103,7 @@ namespace Server.Engines.Chat
SendMessage(26); // You are no longer ignoring anyone.
}
else
{
SendMessage(25, user.Username); // You are not ignoring %1.
}
}
public static ChatUser AddChatUser(Mobile from)
@ -172,18 +167,7 @@ namespace Server.Engines.Chat
return c;
}
public static ChatUser GetChatUser(string username)
{
for (int i = 0; i < m_Users.Count; ++i)
{
ChatUser user = m_Users[i];
if (user.Username == username)
return user;
}
return null;
}
public static ChatUser GetChatUser(string username) => m_Users.FirstOrDefault(user => user.Username == username);
public static void GlobalSendCommand(ChatCommand command, string param1, string param2 = null)
{

4
Projects/Scripts/Engines/Chat/Chatold.cs
View file

@ -1,6 +1,6 @@
namespace Server.Chat
{
public class ChatSystem
public static class ChatSystem
{
public static void Initialize()
{
@ -12,4 +12,4 @@ namespace Server.Chat
e.Mobile.SendMessage("Chat is not currently supported.");
}
}
}
}

34
Projects/Scripts/Engines/Chat/Packets.cs
View file

@ -1,28 +1,36 @@
using Server.Buffers;
using Server.Network;
namespace Server.Engines.Chat
{
public sealed class ChatMessagePacket : Packet
public static class ChatPackets
{
public ChatMessagePacket(Mobile who, int number, string param1, string param2) : base(0xB2)
public static void SendChatMessage(NetState ns, Mobile who, int number, string param1, string param2)
{
if (param1 == null)
param1 = string.Empty;
if (ns == null)
return;
if (param2 == null)
param2 = string.Empty;
param1 ??= "";
param2 ??= "";
EnsureCapacity(13 + (param1.Length + param2.Length) * 2);
int length = 13 + (param1.Length + param2.Length) * 2;
//base(0xB2)
m_Stream.Write((ushort)(number - 20));
SpanWriter writer = new SpanWriter(stackalloc byte[length]);
writer.Write((byte)0xB2); // Packet ID
writer.Write((ushort)length); // Dynamic Length
writer.Write((ushort)(number - 20));
if (who != null)
m_Stream.WriteAsciiFixed(who.Language, 4);
writer.WriteAsciiFixed(who.Language, 4);
else
m_Stream.Write(0);
writer.Position += 4;
m_Stream.WriteBigUniNull(param1);
m_Stream.WriteBigUniNull(param2);
writer.WriteBigUniNull(param1);
writer.WriteBigUniNull(param2);
ns.Send(writer.Span);
}
}
}
}