Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring of BNetServer

Browse Source
This commit is contained in:
hondacrx
2020-07-12 00:06:43 -04:00
parent 4164384b72
commit 581d077acd
318 changed files with 2046 additions and 4694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Text/ChatTextBuilder.cs
+7 -7
View File
@@ -18,16 +18,16 @@
using Framework.Constants;
using Game.DataStorage;
using Game.Entities;
using Game.Network;
using Game.Network.Packets;
using Game.Networking;
using Game.Networking.Packets;
using System.Collections.Generic;
namespace Game.Chat
{
public class MessageBuilder
{
public virtual ServerPacket Invoke(LocaleConstant locale = LocaleConstant.enUS) { return null; }
public virtual void Invoke(List<ServerPacket> data, LocaleConstant locale = LocaleConstant.enUS) { }
public virtual ServerPacket Invoke(Locale locale = Locale.enUS) { return null; }
public virtual void Invoke(List<ServerPacket> data, Locale locale = Locale.enUS) { }
}
public class BroadcastTextBuilder : MessageBuilder
@@ -42,7 +42,7 @@ namespace Game.Chat
_achievementId = achievementId;
}
public override ServerPacket Invoke(LocaleConstant locale)
public override ServerPacket Invoke(Locale locale)
{
BroadcastTextRecord bct = CliDB.BroadcastTextStorage.LookupByKey(_textId);
var packet = new ChatPkt();
@@ -69,7 +69,7 @@ namespace Game.Chat
_target = target;
}
public override ServerPacket Invoke(LocaleConstant locale)
public override ServerPacket Invoke(Locale locale)
{
var packet = new ChatPkt();
packet.Initialize(_msgType, _language, _source, _target, _text, 0, "", locale);
@@ -94,7 +94,7 @@ namespace Game.Chat
_args = args;
}
public override ServerPacket Invoke(LocaleConstant locale)
public override ServerPacket Invoke(Locale locale)
{
ChatPkt packet = new ChatPkt();
Source/Game/Text/CreatureTextManager.cs
+13 -13
View File
@@ -23,8 +23,8 @@ using Game.DataStorage;
using Game.Entities;
using Game.Groups;
using Game.Maps;
using Game.Network;
using Game.Network.Packets;
using Game.Networking;
using Game.Networking.Packets;
using System;
using System.Collections.Generic;
@@ -142,8 +142,8 @@ namespace Game
uint groupId = result.Read<byte>(1);
uint id = result.Read<byte>(2);
string localeName = result.Read<string>(3);
LocaleConstant locale = localeName.ToEnum<LocaleConstant>();
if (locale == LocaleConstant.enUS)
Locale locale = localeName.ToEnum<Locale>();
if (locale == Locale.enUS)
continue;
var key = new CreatureTextId(creatureId, groupId, id);
@@ -377,7 +377,7 @@ namespace Game
return true;
}
public string GetLocalizedChatString(uint entry, Gender gender, byte textGroup, uint id, LocaleConstant locale = LocaleConstant.enUS)
public string GetLocalizedChatString(uint entry, Gender gender, byte textGroup, uint id, Locale locale = Locale.enUS)
{
var multiMap = mTextMap.LookupByKey(entry);
if (multiMap == null)
@@ -398,8 +398,8 @@ namespace Game
if (creatureTextEntry == null)
return "";
if (locale >= LocaleConstant.Total)
locale = LocaleConstant.enUS;
if (locale >= Locale.Total)
locale = Locale.enUS;
string baseText = "";
BroadcastTextRecord bct = CliDB.BroadcastTextStorage.LookupByKey(creatureTextEntry.BroadcastTextId);
@@ -409,7 +409,7 @@ namespace Game
else
baseText = creatureTextEntry.text;
if (locale != LocaleConstant.enUS && bct == null)
if (locale != Locale.enUS && bct == null)
{
var creatureTextLocale = mLocaleTextMap.LookupByKey(new CreatureTextId(entry, textGroup, id));
if (creatureTextLocale != null)
@@ -560,7 +560,7 @@ namespace Game
}
public class CreatureTextLocale
{
public StringArray Text = new StringArray((int)LocaleConstant.Total);
public StringArray Text = new StringArray((int)Locale.Total);
}
public class CreatureTextId
{
@@ -595,7 +595,7 @@ namespace Game
public void Invoke(Player player)
{
LocaleConstant loc_idx = player.GetSession().GetSessionDbLocaleIndex();
Locale loc_idx = player.GetSession().GetSessionDbLocaleIndex();
ServerPacket messageTemplate;
// create if not cached yet
@@ -621,7 +621,7 @@ namespace Game
player.SendPacket(message);
}
Dictionary<LocaleConstant, ServerPacket> _packetCache = new Dictionary<LocaleConstant, ServerPacket>();
Dictionary<Locale, ServerPacket> _packetCache = new Dictionary<Locale, ServerPacket>();
MessageBuilder _builder;
ChatMsg _msgType;
}
@@ -639,7 +639,7 @@ namespace Game
_target = target;
}
public override ServerPacket Invoke(LocaleConstant locale = LocaleConstant.enUS)
public override ServerPacket Invoke(Locale locale = Locale.enUS)
{
string text = Global.CreatureTextMgr.GetLocalizedChatString(_source.GetEntry(), _gender, _textGroup, _textId, locale);
var packet = new ChatPkt();
@@ -670,7 +670,7 @@ namespace Game
_target = target;
}
public override ServerPacket Invoke(LocaleConstant loc_idx = LocaleConstant.enUS)
public override ServerPacket Invoke(Locale loc_idx = Locale.enUS)
{
string text = Global.CreatureTextMgr.GetLocalizedChatString(_source.GetEntry(), _gender, _textGroup, _textId, loc_idx);
var packet = new ChatPkt();