lineage2/L2Bot2.0
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: switch world handler parameters to map of repositories

Browse Source
This commit is contained in:
k0t9i 2023-10-16 23:50:29 +04:00
parent ede55a870e
commit 9836ef3a17
3 changed files with 29 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
L2BotCore/Domain/Services/WorldHandler.h
View File

@ -17,26 +17,12 @@ namespace L2Bot::Domain::Services
{ {
public: public:
WorldHandler( WorldHandler(
Repositories::EntityRepositoryInterface& heroRepository, const std::map<std::wstring, Repositories::EntityRepositoryInterface&> repositories,
Repositories::EntityRepositoryInterface& dropRepository,
Repositories::EntityRepositoryInterface& npcRepository,
Repositories::EntityRepositoryInterface& playerRepository,
Repositories::EntityRepositoryInterface& skillRepository,
Repositories::EntityRepositoryInterface& itemRepository,
Repositories::EntityRepositoryInterface& abnormalEffectRepository,
Repositories::EntityRepositoryInterface& chatMessageRepository,
const Serializers::SerializerInterface& serializer, const Serializers::SerializerInterface& serializer,
const Services::IncomingMessageProcessor& incomingMessageProcessor, const Services::IncomingMessageProcessor& incomingMessageProcessor,
Transports::TransportInterface& transport Transports::TransportInterface& transport
) : ) :
m_HeroRepository(heroRepository), m_Repositories(repositories),
m_DropRepository(dropRepository),
m_NPCRepository(npcRepository),
m_PlayerRepository(playerRepository),
m_SkillRepository(skillRepository),
m_ItemRepository(itemRepository),
m_AbnormalEffectRepository(abnormalEffectRepository),
m_ChatMessageRepository(chatMessageRepository),
m_Serializer(serializer), m_Serializer(serializer),
m_IncomingMessageProcessor(incomingMessageProcessor), m_IncomingMessageProcessor(incomingMessageProcessor),
m_Transport(transport) m_Transport(transport)
@ -46,14 +32,10 @@ namespace L2Bot::Domain::Services
void Start() void Start()
{ {
m_DropRepository.Init(); for (const auto& kvp : m_Repositories)
m_HeroRepository.Init(); {
m_NPCRepository.Init(); kvp.second.Init();
m_PlayerRepository.Init(); }
m_SkillRepository.Init();
m_ItemRepository.Init();
m_AbnormalEffectRepository.Init();
m_ChatMessageRepository.Init();
m_ConnectingThread = std::thread(&WorldHandler::Connect, this); m_ConnectingThread = std::thread(&WorldHandler::Connect, this);
m_SendingThread = std::thread(&WorldHandler::Send, this); m_SendingThread = std::thread(&WorldHandler::Send, this);
@ -133,21 +115,9 @@ namespace L2Bot::Domain::Services
const std::vector<std::vector<Serializers::Node>> GetOutgoingMessages() const std::vector<std::vector<Serializers::Node>> GetOutgoingMessages()
{ {
std::map<std::wstring, Repositories::EntityRepositoryInterface&> handlers
{
{L"hero", m_HeroRepository},
{L"drop", m_DropRepository},
{L"npc", m_NPCRepository},
{L"player", m_PlayerRepository},
{L"skill", m_SkillRepository},
{L"item", m_ItemRepository},
{L"abnormalEffect", m_AbnormalEffectRepository},
{L"chat", m_ChatMessageRepository}
};
std::vector<std::vector<Serializers::Node>> result; std::vector<std::vector<Serializers::Node>> result;
for (const auto& kvp : handlers) for (const auto& kvp : m_Repositories)
{ {
auto& entities = kvp.second.GetEntities(); auto& entities = kvp.second.GetEntities();
@ -160,24 +130,14 @@ namespace L2Bot::Domain::Services
void Invalidate() void Invalidate()
{ {
m_DropRepository.Reset(); for (const auto& kvp : m_Repositories)
m_HeroRepository.Reset(); {
m_NPCRepository.Reset(); kvp.second.Reset();
m_PlayerRepository.Reset(); }
m_SkillRepository.Reset();
m_ItemRepository.Reset();
m_AbnormalEffectRepository.Reset();
} }
private: private:
Repositories::EntityRepositoryInterface& m_DropRepository; const std::map<std::wstring, Repositories::EntityRepositoryInterface&> m_Repositories;
Repositories::EntityRepositoryInterface& m_HeroRepository;
Repositories::EntityRepositoryInterface& m_NPCRepository;
Repositories::EntityRepositoryInterface& m_PlayerRepository;
Repositories::EntityRepositoryInterface& m_SkillRepository;
Repositories::EntityRepositoryInterface& m_ItemRepository;
Repositories::EntityRepositoryInterface& m_AbnormalEffectRepository;
Repositories::EntityRepositoryInterface& m_ChatMessageRepository;
const Serializers::SerializerInterface& m_Serializer; const Serializers::SerializerInterface& m_Serializer;
const Services::IncomingMessageProcessor m_IncomingMessageProcessor; const Services::IncomingMessageProcessor m_IncomingMessageProcessor;
Services::OutgoingMessageBuilder m_OutgoingMessageBuilder; Services::OutgoingMessageBuilder m_OutgoingMessageBuilder;

9
L2BotDll/Application.h
View File

@ -22,14 +22,7 @@ public:
m_Transport(Application::PIPE_NAME), m_Transport(Application::PIPE_NAME),
m_WorldHandler m_WorldHandler
( (
m_AbstractFactory.GetHeroRepository(), m_AbstractFactory.GetRepositories(),
m_AbstractFactory.GetDropRepository(),
m_AbstractFactory.GetNPCRepository(),
m_AbstractFactory.GetPlayerRepository(),
m_AbstractFactory.GetSkillRepository(),
m_AbstractFactory.GetItemRepository(),
m_AbstractFactory.GetAbnormalEffectRepository(),
m_AbstractFactory.GetChatMessageRepository(),
m_Serializer, m_Serializer,
Services::IncomingMessageProcessor(m_MessageFactory, m_AbstractFactory.GetHeroService()), Services::IncomingMessageProcessor(m_MessageFactory, m_AbstractFactory.GetHeroService()),
m_Transport m_Transport

16
L2BotDll/Versions/VersionAbstractFactory.h
View File

@ -1,5 +1,7 @@
#pragma once #pragma once
#include<map>
#include <string>
#include "Domain/Repositories/EntityRepositoryInterface.h" #include "Domain/Repositories/EntityRepositoryInterface.h"
#include "Domain/Services/HeroServiceInterface.h" #include "Domain/Services/HeroServiceInterface.h"
#include "GameStructs/NetworkHandlerInterface.h" #include "GameStructs/NetworkHandlerInterface.h"
@ -31,5 +33,19 @@ public:
virtual L2GameDataInterface& GetL2GameData() const = 0; virtual L2GameDataInterface& GetL2GameData() const = 0;
virtual FNameInterface& GetFName() const = 0; virtual FNameInterface& GetFName() const = 0;
virtual const std::map<std::wstring, Repositories::EntityRepositoryInterface&> GetRepositories() const
{
return {
{L"hero", GetHeroRepository()},
{L"drop", GetDropRepository()},
{L"npc", GetNPCRepository()},
{L"player", GetPlayerRepository()},
{L"skill", GetSkillRepository()},
{L"item", GetItemRepository()},
{L"abnormalEffect", GetAbnormalEffectRepository()},
{L"chat", GetChatMessageRepository()}
};
}
static const VersionAbstractFactory& GetFactory(Version version, const uint16_t radius); static const VersionAbstractFactory& GetFactory(Version version, const uint16_t radius);
}; };