From bb4eb160f0340d882d7feb534e785fa17f25a66a Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Sun, 7 Jan 2024 17:44:50 +0100
Subject: [PATCH] update to plugin 7

---
 external/solanaceae_bridge              | 2 +-
 external/solanaceae_crdtnotes           | 2 +-
 external/solanaceae_ircclient           | 2 +-
 external/solanaceae_ngc_ft1             | 2 +-
 external/solanaceae_plugin              | 2 +-
 external/solanaceae_toxic_games         | 2 +-
 plugins/plugin_ngcft1.cpp               | 7 +++----
 plugins/plugin_transfer_auto_accept.cpp | 5 ++++-
 plugins/plugin_zox_ngc.cpp              | 4 +++-
 plugins/plugin_zox_ngc_hs.cpp           | 4 +++-
 10 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/external/solanaceae_bridge b/external/solanaceae_bridge
index 55df71d..0b5ef1f 160000
--- a/external/solanaceae_bridge
+++ b/external/solanaceae_bridge
@@ -1 +1 @@
-Subproject commit 55df71d96e9abcc0c87791df0fc0847987641c25
+Subproject commit 0b5ef1f1012d024e9107b04ac8937d408e3507e3
diff --git a/external/solanaceae_crdtnotes b/external/solanaceae_crdtnotes
index c3082e0..5802e7d 160000
--- a/external/solanaceae_crdtnotes
+++ b/external/solanaceae_crdtnotes
@@ -1 +1 @@
-Subproject commit c3082e0140b14a8d64faab42a65fbb418facc5f7
+Subproject commit 5802e7ddab314454062ea55bad2ab3db22b072b8
diff --git a/external/solanaceae_ircclient b/external/solanaceae_ircclient
index 15d057e..3044b0d 160000
--- a/external/solanaceae_ircclient
+++ b/external/solanaceae_ircclient
@@ -1 +1 @@
-Subproject commit 15d057e92be9b2356fe6392dbb6586b319cb6914
+Subproject commit 3044b0db605f671a5c2c42be02b8a586efddffcc
diff --git a/external/solanaceae_ngc_ft1 b/external/solanaceae_ngc_ft1
index 103f36f..f02b03d 160000
--- a/external/solanaceae_ngc_ft1
+++ b/external/solanaceae_ngc_ft1
@@ -1 +1 @@
-Subproject commit 103f36f2d222c32be4403daeb04cf123b3a31337
+Subproject commit f02b03da7cfcfc1d6889dfe085ef61c53d436343
diff --git a/external/solanaceae_plugin b/external/solanaceae_plugin
index 96bab02..75e7c5e 160000
--- a/external/solanaceae_plugin
+++ b/external/solanaceae_plugin
@@ -1 +1 @@
-Subproject commit 96bab0200f5b13671756abe7e3132ed78aaa2a40
+Subproject commit 75e7c5e3c77ecd5e03ad0a1429e3a5fc6d067408
diff --git a/external/solanaceae_toxic_games b/external/solanaceae_toxic_games
index 80d1cff..3356861 160000
--- a/external/solanaceae_toxic_games
+++ b/external/solanaceae_toxic_games
@@ -1 +1 @@
-Subproject commit 80d1cffdcdacb832c9fd4415e3da5b4a453ebd04
+Subproject commit 3356861028eab8af14ff12b3d0edfa4078d9a935
diff --git a/plugins/plugin_ngcft1.cpp b/plugins/plugin_ngcft1.cpp
index d8d4997..beee87d 100644
--- a/plugins/plugin_ngcft1.cpp
+++ b/plugins/plugin_ngcft1.cpp
@@ -96,11 +96,10 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
 	g_ngcextep.reset();
 }
 
-SOLANA_PLUGIN_EXPORT void solana_plugin_tick(float delta) {
-	//std::cout << "PLUGIN NGCEXT TICK()\n";
-
-	g_ngcft1->iterate(delta);
+SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
+	const float ft_interval = g_ngcft1->iterate(delta);
 	g_sha1_ngcft1->iterate(delta);
+	return ft_interval;
 }
 
 } // extern C
diff --git a/plugins/plugin_transfer_auto_accept.cpp b/plugins/plugin_transfer_auto_accept.cpp
index baa929c..0a073ab 100644
--- a/plugins/plugin_transfer_auto_accept.cpp
+++ b/plugins/plugin_transfer_auto_accept.cpp
@@ -4,6 +4,7 @@
 #include <solanaceae/util/config_model.hpp>
 
 #include <memory>
+#include <limits>
 #include <iostream>
 
 #define RESOLVE_INSTANCE(x) static_cast<x*>(solana_api->resolveInstance(#x))
@@ -62,10 +63,12 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
 	g_taa.reset();
 }
 
-SOLANA_PLUGIN_EXPORT void solana_plugin_tick(float delta) {
+SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
 	(void)delta;
 	//std::cout << "PLUGIN TAA TICK()\n";
 	g_taa->iterate();
+
+	return std::numeric_limits<float>::max();
 }
 
 } // extern C
diff --git a/plugins/plugin_zox_ngc.cpp b/plugins/plugin_zox_ngc.cpp
index 013a1e6..cda21a5 100644
--- a/plugins/plugin_zox_ngc.cpp
+++ b/plugins/plugin_zox_ngc.cpp
@@ -3,6 +3,7 @@
 #include <solanaceae/zox/ngc.hpp>
 
 #include <memory>
+#include <limits>
 #include <iostream>
 
 // fwd
@@ -57,9 +58,10 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
 	g_zngc.reset();
 }
 
-SOLANA_PLUGIN_EXPORT void solana_plugin_tick(float delta) {
+SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
 	(void)delta;
 	//std::cout << "PLUGIN ZNGC TICK()\n";
+	return std::numeric_limits<float>::max();
 }
 
 } // extern C
diff --git a/plugins/plugin_zox_ngc_hs.cpp b/plugins/plugin_zox_ngc_hs.cpp
index a021143..a5e9b08 100644
--- a/plugins/plugin_zox_ngc_hs.cpp
+++ b/plugins/plugin_zox_ngc_hs.cpp
@@ -94,9 +94,11 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
 	g_zngchs.reset();
 }
 
-SOLANA_PLUGIN_EXPORT void solana_plugin_tick(float delta) {
+SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
 	//std::cout << "PLUGIN ZNGCHS TICK()\n";
 	g_zngchs->tick(delta);
+
+	return 0.1f; // TODO: use the actual timers
 }
 
 } // extern C