refactor: move events and service locator into core project

L2BotCore/Domain/DTO/ChatMessageData.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace L2Bot::Domain::DTO
+{
+	struct ChatMessageData
+	{
+		const uint32_t objectId = 0;
+		const uint8_t channel = 0;
+		const std::wstring name = L"";
+		const std::wstring text = L"";
+	};
+}

L2BotCore/Domain/DTO/ItemData.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <cstdint>
+
+namespace L2Bot::Domain::DTO
+{
+	struct ItemData
+	{
+		const uint32_t objectId = 0;
+		const uint32_t itemId = 0;
+		const uint32_t amount = 0;
+		const uint16_t isEquipped = 0;
+		const uint16_t enchantLevel = 0;
+		const int32_t mana = -1;
+		const bool isQuest = false;
+		const bool isTwoHanded = false;
+	};
+}

L2BotCore/Domain/Events/AbnormalEffectChangedEvent.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class AbnormalEffectChangedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "abnormalEffectChanged";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const std::vector<int32_t>& GetSkillInfo() const
+		{
+			return m_SkillInfo;
+		}
+
+		AbnormalEffectChangedEvent(const std::vector<int32_t> skillInfo) :
+			m_SkillInfo(skillInfo)
+		{
+
+		}
+
+		AbnormalEffectChangedEvent() = delete;
+		virtual ~AbnormalEffectChangedEvent() = default;
+
+	private:
+		const std::vector<int32_t> m_SkillInfo;
+	};
+}

L2BotCore/Domain/Events/ChatMessageCreatedEvent.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+#include "../DTO/ChatMessageData.h"
+
+namespace L2Bot::Domain::Events
+{
+	class ChatMessageCreatedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "chatMessageCreated";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const DTO::ChatMessageData& GetChatMessage() const
+		{
+			return m_ChatMessage;
+		}
+
+		ChatMessageCreatedEvent(const DTO::ChatMessageData chatMessage) :
+			m_ChatMessage(chatMessage)
+		{
+
+		}
+
+		ChatMessageCreatedEvent() = delete;
+		virtual ~ChatMessageCreatedEvent() = default;
+
+	private:
+		const DTO::ChatMessageData m_ChatMessage;
+	};
+}

L2BotCore/Domain/Events/CreatureDiedEvent.h

@@ -0,0 +1,43 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class CreatureDiedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "creatureDied";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const uint32_t GetCreatureId() const
+		{
+			return m_CreatureId;
+		}
+
+		const std::vector<int32_t>& GetCreatureInfo() const
+		{
+			return m_CreatureInfo;
+		}
+
+		CreatureDiedEvent(uint32_t creatureId, const std::vector<int32_t>& creatureInfo) :
+			m_CreatureId(creatureId),
+			m_CreatureInfo(creatureInfo)
+		{
+
+		}
+
+		CreatureDiedEvent() = delete;
+		virtual ~CreatureDiedEvent() = default;
+
+	private:
+		const uint32_t m_CreatureId;
+		const std::vector<int32_t> m_CreatureInfo;
+	};
+}

L2BotCore/Domain/Events/Event.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <string>
+
+namespace L2Bot::Domain::Events
+{
+	class Event
+	{
+	public:
+		virtual const std::string GetName() const = 0;
+
+		Event() = default;
+		virtual ~Event() = default;
+	};
+}

L2BotCore/Domain/Events/EventDispatcher.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <string>
+#include <functional>
+#include <unordered_map>
+#include <vector>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class EventDispatcher
+	{
+	public:
+		using Delegate = std::function<void(const Event&)>;
+
+		EventDispatcher() = default;
+		virtual ~EventDispatcher() = default;
+
+		void Dispatch(const Event& evt)
+		{
+			const auto& name = evt.GetName();
+
+			if (m_Handlers.find(name) == m_Handlers.end())
+			{
+				return;
+			}
+
+			for (const auto& handler : m_Handlers[name])
+			{
+				handler(evt);
+			}
+		}
+
+		void Subscribe(const std::string& eventName, const Delegate handler)
+		{
+			m_Handlers[eventName].push_back(handler);
+		}
+
+	private:
+		std::unordered_map<std::string, std::vector<Delegate>> m_Handlers;
+	};
+}

L2BotCore/Domain/Events/GameEngineTickedEvent.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstdint>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class GameEngineTickedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "gameEngineTicked";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		GameEngineTickedEvent() = default;
+		virtual ~GameEngineTickedEvent() = default;
+	};
+}

L2BotCore/Domain/Events/HeroCreatedEvent.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class HeroCreatedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "heroCreated";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		HeroCreatedEvent() = default;
+		virtual ~HeroCreatedEvent() = default;
+	};
+}

L2BotCore/Domain/Events/HeroDeletedEvent.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class HeroDeletedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "heroDeleted";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		HeroDeletedEvent() = default;
+		virtual ~HeroDeletedEvent() = default;
+	};
+}

L2BotCore/Domain/Events/ItemAutousedEvent.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class ItemAutousedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "itemAutoused";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const std::vector<uint32_t>& GetAutouseInfo() const
+		{
+			return m_AutouseInfo;
+		}
+
+		ItemAutousedEvent(const std::vector<uint32_t> autouseInfo) :
+			m_AutouseInfo(autouseInfo)
+		{
+
+		}
+
+		ItemAutousedEvent() = delete;
+		virtual ~ItemAutousedEvent() = default;
+
+	private:
+		const std::vector<uint32_t> m_AutouseInfo;
+	};
+}

L2BotCore/Domain/Events/ItemCreatedEvent.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+#include "../DTO/ItemData.h"
+
+namespace L2Bot::Domain::Events
+{
+	class ItemCreatedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "itemCreated";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const DTO::ItemData& GetItemData() const
+		{
+			return m_ItemData;
+		}
+
+		ItemCreatedEvent(const DTO::ItemData itemData) :
+			m_ItemData(itemData)
+		{
+
+		}
+
+		ItemCreatedEvent() = delete;
+		virtual ~ItemCreatedEvent() = default;
+
+	private:
+		const DTO::ItemData m_ItemData;
+	};
+}

L2BotCore/Domain/Events/ItemDeletedEvent.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class ItemDeletedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "itemDeleted";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const uint32_t GetObjectId() const
+		{
+			return m_ObjectId;
+		}
+
+		ItemDeletedEvent(const uint32_t objectId) :
+			m_ObjectId(objectId)
+		{
+
+		}
+
+		ItemDeletedEvent() = delete;
+		virtual ~ItemDeletedEvent() = default;
+
+	private:
+		const uint32_t m_ObjectId;
+	};
+}

L2BotCore/Domain/Events/ItemUpdatedEvent.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+#include "../DTO/ItemData.h"
+
+namespace L2Bot::Domain::Events
+{
+	class ItemUpdatedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "itemUpdated";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const DTO::ItemData& GetItemData() const
+		{
+			return m_ItemData;
+		}
+
+		ItemUpdatedEvent(const DTO::ItemData itemData) :
+			m_ItemData(itemData)
+		{
+
+		}
+
+		ItemUpdatedEvent() = delete;
+		virtual ~ItemUpdatedEvent() = default;
+
+	private:
+		const DTO::ItemData m_ItemData;
+	};
+}

L2BotCore/Domain/Events/OnEndItemListEvent.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class OnEndItemListEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "onEndItemList";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		OnEndItemListEvent() = default;
+		virtual ~OnEndItemListEvent() = default;
+	};
+}

L2BotCore/Domain/Events/SkillCancelledEvent.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <cstdint>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class SkillCancelledEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "skillCancelled";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const uint32_t GetInitiatorId() const
+		{
+			return m_InitiatorId;
+		}
+
+		SkillCancelledEvent(const uint32_t initiatorId) :
+			m_InitiatorId(initiatorId)
+		{
+
+		}
+
+		SkillCancelledEvent() = delete;
+		virtual ~SkillCancelledEvent() = default;
+
+	private:
+		const uint32_t m_InitiatorId;
+	};
+}

L2BotCore/Domain/Events/SkillCreatedEvent.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class SkillCreatedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "skillCreated";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const std::vector<int32_t>& GetSkillInfo() const
+		{
+			return m_SkillInfo;
+		}
+
+		SkillCreatedEvent(const std::vector<int32_t> skillInfo) :
+			m_SkillInfo(skillInfo)
+		{
+
+		}
+
+		SkillCreatedEvent() = delete;
+		virtual ~SkillCreatedEvent() = default;
+
+	private:
+		const std::vector<int32_t> m_SkillInfo;
+	};
+}

L2BotCore/Domain/Events/SkillUsedEvent.h

@@ -0,0 +1,36 @@
+#pragma once
+
+#include <cstdint>
+#include <vector>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class SkillUsedEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "skillUsed";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		const std::vector<int32_t>& GetSkillInfo() const
+		{
+			return m_SkillInfo;
+		}
+
+		SkillUsedEvent(const std::vector<int32_t> skillInfo) :
+			m_SkillInfo(skillInfo)
+		{
+
+		}
+
+		SkillUsedEvent() = delete;
+		virtual ~SkillUsedEvent() = default;
+
+	private:
+		const std::vector<int32_t> m_SkillInfo;
+	};
+}

L2BotCore/Domain/Events/SpoiledEvent.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstdint>
+#include "Event.h"
+
+namespace L2Bot::Domain::Events
+{
+	class SpoiledEvent : public Event
+	{
+	public:
+		static constexpr const char* name = "spoiled";
+
+		const std::string GetName() const
+		{
+			return std::string(name);
+		}
+
+		SpoiledEvent() = default;
+		virtual ~SpoiledEvent() = default;
+	};
+}

L2BotCore/Domain/Services/ServiceLocator.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <memory>
+#include "../Events/EventDispatcher.h"
+
+namespace L2Bot::Domain::Services
+{
+	class ServiceLocator
+	{
+	public:
+		static ServiceLocator& GetInstance() {
+			static ServiceLocator instance;
+			return instance;
+		}
+
+		const std::unique_ptr<Events::EventDispatcher>& GetEventDispatcher()
+		{
+			return m_EventDispatcher;
+		}
+		void SetEventDispatcher(std::unique_ptr<Events::EventDispatcher> dispatcher)
+		{
+			m_EventDispatcher = std::move(dispatcher);
+		}
+	private:
+		ServiceLocator() = default;
+		virtual ~ServiceLocator() = default;
+
+		ServiceLocator(const ServiceLocator&) = delete;
+		ServiceLocator& operator=(const ServiceLocator&) = delete;
+	private:
+		std::unique_ptr<Events::EventDispatcher> m_EventDispatcher;
+	};
+}

L2BotCore/L2BotCore.vcxproj

@@ -159,7 +159,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="Domain\DTO\ChatMessageData.h" />
     <ClInclude Include="Domain\DTO\EntityState.h" />
+    <ClInclude Include="Domain\DTO\ItemData.h" />
     <ClInclude Include="Domain\DTO\Message.h" />
     <ClInclude Include="Domain\Entities\AbnormalEffect.h" />
     <ClInclude Include="Domain\Entities\ArmorItem.h" />
@@ -175,12 +177,30 @@
     <ClInclude Include="Domain\Enums\ChatChannelEnum.h" />
     <ClInclude Include="Domain\Enums\ItemTypeEnum.h" />
     <ClInclude Include="Domain\Enums\WeaponTypeEnum.h" />
+    <ClInclude Include="Domain\Events\AbnormalEffectChangedEvent.h" />
+    <ClInclude Include="Domain\Events\ChatMessageCreatedEvent.h" />
+    <ClInclude Include="Domain\Events\CreatureDiedEvent.h" />
+    <ClInclude Include="Domain\Events\Event.h" />
+    <ClInclude Include="Domain\Events\EventDispatcher.h" />
+    <ClInclude Include="Domain\Events\GameEngineTickedEvent.h" />
+    <ClInclude Include="Domain\Events\HeroCreatedEvent.h" />
+    <ClInclude Include="Domain\Events\HeroDeletedEvent.h" />
+    <ClInclude Include="Domain\Events\ItemAutousedEvent.h" />
+    <ClInclude Include="Domain\Events\ItemCreatedEvent.h" />
+    <ClInclude Include="Domain\Events\ItemDeletedEvent.h" />
+    <ClInclude Include="Domain\Events\ItemUpdatedEvent.h" />
+    <ClInclude Include="Domain\Events\OnEndItemListEvent.h" />
+    <ClInclude Include="Domain\Events\SkillCancelledEvent.h" />
+    <ClInclude Include="Domain\Events\SkillCreatedEvent.h" />
+    <ClInclude Include="Domain\Events\SkillUsedEvent.h" />
+    <ClInclude Include="Domain\Events\SpoiledEvent.h" />
     <ClInclude Include="Domain\Serializers\IncomingMessageFactoryInterface.h" />
     <ClInclude Include="Domain\Serializers\IncomingMessage.h" />
     <ClInclude Include="Domain\Services\HeroServiceInterface.h" />
     <ClInclude Include="Domain\Entities\ChatMessage.h" />
     <ClInclude Include="Domain\Services\IncomingMessageProcessor.h" />
     <ClInclude Include="Domain\Services\OutgoingMessageBuilder.h" />
+    <ClInclude Include="Domain\Services\ServiceLocator.h" />
     <ClInclude Include="Domain\Services\WorldHandler.h" />
     <ClInclude Include="Domain\ValueObjects\Vector3.h" />
     <ClInclude Include="Domain\Enums\SpoilStateEnum.h" />

L2BotCore/L2BotCore.vcxproj.filters

@@ -165,6 +165,66 @@
     <ClInclude Include="Domain\Services\OutgoingMessageBuilder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Domain\Events\EventDispatcher.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\Event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\AbnormalEffectChangedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\ChatMessageCreatedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\CreatureDiedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\GameEngineTickedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\HeroCreatedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\HeroDeletedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\ItemAutousedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\ItemCreatedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\ItemDeletedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\ItemUpdatedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\OnEndItemListEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\SkillCancelledEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\SkillCreatedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\SkillUsedEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Events\SpoiledEvent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\DTO\ChatMessageData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\DTO\ItemData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Domain\Services\ServiceLocator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp">