contact4

plugins/dice_tool.cpp

@@ -1,15 +1,18 @@
 #include "./dice_tool.hpp"
 
+#include <solanaceae/contact/contact_store_i.hpp>
 #include <solanaceae/contact/components.hpp>
 
 #include <imgui.h>
 
 #include <entt/container/dense_set.hpp>
+#include <entt/entity/registry.hpp>
+#include <entt/entity/handle.hpp>
 
 #include <cstdint>
 #include <iostream>
 
-DiceTool::DiceTool(P2PRNGI& p2prng, Contact3Registry& cr) : _p2prng(p2prng), _cr(cr) {
+DiceTool::DiceTool(P2PRNGI& p2prng, ContactStore4I& cs) : _p2prng(p2prng), _cs(cs) {
 	p2prng.subscribe(this, P2PRNG_Event::init);
 	p2prng.subscribe(this, P2PRNG_Event::hmac);
 	p2prng.subscribe(this, P2PRNG_Event::secret);
@@ -29,7 +32,7 @@ float DiceTool::render(float) {
 		static uint16_t g_sides {6};
 		ImGui::InputScalar("##sides", ImGuiDataType_U16, &g_sides);
 
-		static entt::dense_set<Contact3> peers;
+		static entt::dense_set<Contact4> peers;
 
 		if (ImGui::CollapsingHeader("peers")) {
 			ImGui::Indent();
@@ -43,7 +46,7 @@ float DiceTool::render(float) {
 					continue;
 				}
 
-				Contact3Handle c {_cr, *it};
+				ContactHandle4 c = _cs.contactHandle(*it);
 
 				const char* str_ptr = "<unk>";
 				if (const auto* name_ptr = c.try_get<Contact::Components::Name>(); name_ptr != nullptr && !name_ptr->name.empty()) {
@@ -61,8 +64,8 @@ float DiceTool::render(float) {
 				ImGui::OpenPopup("peer selector");
 			}
 			if (ImGui::BeginPopup("peer selector")) {
-				for (const auto& [cv] : _cr.view<Contact::Components::TagBig>().each()) {
-					Contact3Handle c {_cr, cv};
+				for (const auto& [cv] : _cs.registry().view<Contact::Components::TagBig>().each()) {
+					ContactHandle4 c = _cs.contactHandle(cv);
 
 					if (peers.contains(c)) {
 						continue;
@@ -75,8 +78,8 @@ float DiceTool::render(float) {
 
 					if (c.all_of<Contact::Components::TagGroup, Contact::Components::ParentOf>()) {
 						if (ImGui::BeginMenu(str_ptr)) {
-							for (const Contact3 child_cv : c.get<Contact::Components::ParentOf>().subs) {
-								Contact3Handle child_c {_cr, child_cv};
+							for (const Contact4 child_cv : c.get<Contact::Components::ParentOf>().subs) {
+								ContactHandle4 child_c = _cs.contactHandle(child_cv);
 
 								if (peers.contains(child_c)) {
 									continue;
@@ -113,10 +116,10 @@ float DiceTool::render(float) {
 		}
 
 		if (ImGui::Button("roll")) {
-			//std::vector<Contact3Handle> c_vec{peers.cbegin(), peers.cend()};
-			std::vector<Contact3Handle> c_vec;
+			//std::vector<ContactHandle4> c_vec{peers.cbegin(), peers.cend()};
+			std::vector<ContactHandle4> c_vec;
 			for (const auto cv : peers) {
-				c_vec.emplace_back(_cr, cv);
+				c_vec.emplace_back(_cs.contactHandle(cv));
 			}
 
 			std::vector<uint8_t> is {'D', 'I', 'C', 'E'};

plugins/dice_tool.hpp

@@ -1,13 +1,13 @@
 #pragma once
 
 #include <solanaceae/tox_p2prng/p2prng.hpp>
-#include <solanaceae/contact/contact_model3.hpp>
+#include <solanaceae/contact/fwd.hpp>
 
 #include <vector>
 
 class DiceTool : public P2PRNGEventI {
 	P2PRNGI& _p2prng;
-	Contact3Registry& _cr;
+	ContactStore4I& _cs;
 
 	struct Rolls {
 		std::vector<uint8_t> id;
@@ -23,7 +23,7 @@ class DiceTool : public P2PRNGEventI {
 	std::vector<Rolls> _rolls;
 
 	public:
-		DiceTool(P2PRNGI& p2prng, Contact3Registry& cr);
+		DiceTool(P2PRNGI& p2prng, ContactStore4I& cs);
 		~DiceTool(void);
 
 		float render(float time_delta);

plugins/plugin_dice_tool.cpp

@@ -1,6 +1,9 @@
 #include <solanaceae/plugin/solana_plugin_v1.h>
 
+#include <solanaceae/contact/contact_store_i.hpp>
+
 #include "./dice_tool.hpp"
+
 #include <imgui.h>
 
 #include <entt/entt.hpp>
@@ -33,11 +36,11 @@ SOLANA_PLUGIN_EXPORT uint32_t solana_plugin_start(struct SolanaAPI* solana_api)
 
 	try {
 		auto* p2prng_i = PLUG_RESOLVE_INSTANCE(P2PRNGI);
-		auto* cr = PLUG_RESOLVE_INSTANCE_VERSIONED(Contact3Registry, "1");
+		auto* cs = PLUG_RESOLVE_INSTANCE(ContactStore4I);
 
 		// static store, could be anywhere tho
 		// construct with fetched dependencies
-		g_dt = std::make_unique<DiceTool>(*p2prng_i, *cr);
+		g_dt = std::make_unique<DiceTool>(*p2prng_i, *cs);
 
 		auto* imguic = PLUG_RESOLVE_INSTANCE_VERSIONED(ImGuiContext, ImGui::GetVersion());
 		auto* imguimemaf = PLUG_RESOLVE_INSTANCE_VERSIONED(ImGuiMemAllocFunc, ImGui::GetVersion());

plugins/plugin_transfer_auto_accept.cpp

@@ -1,8 +1,9 @@
 #include <solanaceae/plugin/solana_plugin_v1.h>
 
-#include "./transfer_auto_accept.hpp"
 #include <solanaceae/util/config_model.hpp>
 
+#include "./transfer_auto_accept.hpp"
+
 #include <entt/entt.hpp>
 #include <entt/fwd.hpp>