From 311a25e90d45cae5e3b91f88bdf0296d4cba98db Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Thu, 17 Apr 2025 20:20:08 -0500
Subject: [PATCH] [jasper] Fixes for Olympic update

---
 .../modules/core/src/keel/keelmodule.cpp      |  2 +-
 .../modules/world/src/keel/keelmodule.cpp     | 51 +++++++++----------
 .../modules/world/src/keel/typeconv.cpp       |  4 +-
 .../modules/world/src/keel/typeconv.hpp       |  4 +-
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/src/jasper/modules/core/src/keel/keelmodule.cpp b/src/jasper/modules/core/src/keel/keelmodule.cpp
index 1f47a85..0836429 100644
--- a/src/jasper/modules/core/src/keel/keelmodule.cpp
+++ b/src/jasper/modules/core/src/keel/keelmodule.cpp
@@ -25,7 +25,7 @@ class CoreModule: public keel::Module {
 		}
 
 		[[nodiscard]]
-		ox::Vector<const keel::BaseConverter*> converters() const noexcept override {
+		ox::Vector<keel::Converter> converters() const noexcept override {
 			return {
 			};
 		}
diff --git a/src/jasper/modules/world/src/keel/keelmodule.cpp b/src/jasper/modules/world/src/keel/keelmodule.cpp
index 2119179..11e77e3 100644
--- a/src/jasper/modules/world/src/keel/keelmodule.cpp
+++ b/src/jasper/modules/world/src/keel/keelmodule.cpp
@@ -12,37 +12,34 @@
 namespace jasper::world {
 
 static class: public keel::Module {
-	private:
-		WorldDocToWorldStaticConverter m_worldDocToWorldStaticConverter;
 
-	public:
-		[[nodiscard]]
-		ox::String id() const noexcept override {
-			return ox::String("net.drinkingtea.jasper.world");
-		}
+	[[nodiscard]]
+	ox::String id() const noexcept override {
+		return ox::String("net.drinkingtea.jasper.world");
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::TypeDescGenerator> types() const noexcept override {
-			return {
-				keel::generateTypeDesc<WorldObjectSet>,
-				keel::generateTypeDesc<WorldDoc>,
-				keel::generateTypeDesc<WorldStatic>,
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::TypeDescGenerator> types() const noexcept override {
+		return {
+			keel::generateTypeDesc<WorldObjectSet>,
+			keel::generateTypeDesc<WorldDoc>,
+			keel::generateTypeDesc<WorldStatic>,
+		};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::BaseConverter const*> converters() const noexcept override {
-			return {
-				&m_worldDocToWorldStaticConverter,
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::Converter> converters() const noexcept final {
+		return {
+			keel::Converter::make<convertWorldDocToWorldStatic>(),
+		};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::PackTransform> packTransforms() const noexcept override {
-			return {
-				keel::transformRule<WorldDoc, WorldStatic>,
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::PackTransform> packTransforms() const noexcept override {
+		return {
+			keel::transformRule<WorldDoc, WorldStatic>,
+		};
+	}
 
 } mod;
 
diff --git a/src/jasper/modules/world/src/keel/typeconv.cpp b/src/jasper/modules/world/src/keel/typeconv.cpp
index 00fb7b0..1322bf6 100644
--- a/src/jasper/modules/world/src/keel/typeconv.cpp
+++ b/src/jasper/modules/world/src/keel/typeconv.cpp
@@ -6,10 +6,10 @@
 
 namespace jasper::world {
 
-ox::Error WorldDocToWorldStaticConverter::convert(
+ox::Error convertWorldDocToWorldStatic(
 		keel::Context &kctx,
 		WorldDoc &src,
-		WorldStatic &dst) const noexcept {
+		WorldStatic &dst) noexcept {
 	return WorldStaticLoader{kctx, dst, src}.loadWorldStatic();
 }
 
diff --git a/src/jasper/modules/world/src/keel/typeconv.hpp b/src/jasper/modules/world/src/keel/typeconv.hpp
index 2db83a5..f6c359a 100644
--- a/src/jasper/modules/world/src/keel/typeconv.hpp
+++ b/src/jasper/modules/world/src/keel/typeconv.hpp
@@ -10,8 +10,6 @@
 
 namespace jasper::world {
 
-class WorldDocToWorldStaticConverter: public keel::Converter<WorldDoc, WorldStatic> {
-	ox::Error convert(keel::Context&, WorldDoc &src, WorldStatic &dst) const noexcept final;
-};
+ox::Error convertWorldDocToWorldStatic(keel::Context &kctx, WorldDoc &src, WorldStatic &dst) noexcept;
 
 }