4 files changed, 208 insertions, 98 deletions
diff --git a/src/main/kotlin/util/FirmFormatters.kt b/src/main/kotlin/util/FirmFormatters.kt
index acb7102..a660f51 100644
--- a/src/main/kotlin/util/FirmFormatters.kt
+++ b/src/main/kotlin/util/FirmFormatters.kt
@@ -13,6 +13,7 @@ import kotlin.math.roundToInt
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import net.minecraft.text.Text
+import net.minecraft.util.math.BlockPos
 
 object FirmFormatters {
 
@@ -131,4 +132,7 @@ object FirmFormatters {
 		return if (boolean == trueIsGood) text.lime() else text.red()
 	}
 
+	fun formatPosition(position: BlockPos): Text {
+		return Text.literal("x: ${position.x}, y: ${position.y}, z: ${position.z}")
+	}
 }
diff --git a/src/main/kotlin/util/collections/WeakCache.kt b/src/main/kotlin/util/collections/WeakCache.kt
index 38f9886..4a48c63 100644
--- a/src/main/kotlin/util/collections/WeakCache.kt
+++ b/src/main/kotlin/util/collections/WeakCache.kt
@@ -9,102 +9,108 @@ import moe.nea.firmament.features.debug.DebugLogger
  * the key. Each key can have additional extra data that is used to look up values. That extra data is not required to
  * be a life reference. The main Key is compared using strict reference equality. This map is not synchronized.
  */
-class WeakCache<Key : Any, ExtraKey : Any, Value : Any>(val name: String) {
-    private val queue = object : ReferenceQueue<Key>() {}
-    private val map = mutableMapOf<Ref, Value>()
-
-    val size: Int
-        get() {
-            clearOldReferences()
-            return map.size
-        }
-
-    fun clearOldReferences() {
-        var successCount = 0
-        var totalCount = 0
-        while (true) {
-            val reference = queue.poll() ?: break
-            totalCount++
-            if (map.remove(reference) != null)
-                successCount++
-        }
-        if (totalCount > 0)
-            logger.log { "Cleared $successCount/$totalCount references from queue" }
-    }
-
-    fun get(key: Key, extraData: ExtraKey): Value? {
-        clearOldReferences()
-        return map[Ref(key, extraData)]
-    }
-
-    fun put(key: Key, extraData: ExtraKey, value: Value) {
-        clearOldReferences()
-        map[Ref(key, extraData)] = value
-    }
-
-    fun getOrPut(key: Key, extraData: ExtraKey, value: (Key, ExtraKey) -> Value): Value {
-        clearOldReferences()
-        return map.getOrPut(Ref(key, extraData)) { value(key, extraData) }
-    }
-
-    fun clear() {
-        map.clear()
-    }
-
-    init {
-        allInstances.add(this)
-    }
-
-    companion object {
-        val allInstances = InstanceList<WeakCache<*, *, *>>("WeakCaches")
-        private val logger = DebugLogger("WeakCache")
-        fun <Key : Any, Value : Any> memoize(name: String, function: (Key) -> Value):
-            CacheFunction.NoExtraData<Key, Value> {
-            return CacheFunction.NoExtraData(WeakCache(name), function)
-        }
-
-        fun <Key : Any, ExtraKey : Any, Value : Any> memoize(name: String, function: (Key, ExtraKey) -> Value):
-            CacheFunction.WithExtraData<Key, ExtraKey, Value> {
-            return CacheFunction.WithExtraData(WeakCache(name), function)
-        }
-    }
-
-    inner class Ref(
-        weakInstance: Key,
-        val extraData: ExtraKey,
-    ) : WeakReference<Key>(weakInstance, queue) {
-        val hashCode = System.identityHashCode(weakInstance) * 31 + extraData.hashCode()
-        override fun equals(other: Any?): Boolean {
-            if (other !is WeakCache<*, *, *>.Ref) return false
-            return other.hashCode == this.hashCode
-                && other.get() === this.get()
-                && other.extraData == this.extraData
-        }
-
-        override fun hashCode(): Int {
-            return hashCode
-        }
-    }
-
-    interface CacheFunction {
-        val cache: WeakCache<*, *, *>
-
-        data class NoExtraData<Key : Any, Value : Any>(
-            override val cache: WeakCache<Key, Unit, Value>,
-            val wrapped: (Key) -> Value,
-        ) : CacheFunction, (Key) -> Value {
-            override fun invoke(p1: Key): Value {
-                return cache.getOrPut(p1, Unit, { a, _ -> wrapped(a) })
-            }
-        }
-
-        data class WithExtraData<Key : Any, ExtraKey : Any, Value : Any>(
-            override val cache: WeakCache<Key, ExtraKey, Value>,
-            val wrapped: (Key, ExtraKey) -> Value,
-        ) : CacheFunction, (Key, ExtraKey) -> Value {
-            override fun invoke(p1: Key, p2: ExtraKey): Value {
-                return cache.getOrPut(p1, p2, wrapped)
-            }
-        }
-    }
+open class WeakCache<Key : Any, ExtraKey : Any, Value : Any>(val name: String) {
+	private val queue = object : ReferenceQueue<Key>() {}
+	private val map = mutableMapOf<Ref, Value>()
+
+	val size: Int
+		get() {
+			clearOldReferences()
+			return map.size
+		}
+
+	fun clearOldReferences() {
+		var successCount = 0
+		var totalCount = 0
+		while (true) {
+			val reference = queue.poll() as WeakCache<*, *, *>.Ref? ?: break
+			totalCount++
+			if (reference.shouldBeEvicted() && map.remove(reference) != null)
+				successCount++
+		}
+		if (totalCount > 0)
+			logger.log("Cleared $successCount/$totalCount references from queue")
+	}
+
+	open fun mkRef(key: Key, extraData: ExtraKey): Ref {
+		return Ref(key, extraData)
+	}
+
+	fun get(key: Key, extraData: ExtraKey): Value? {
+		clearOldReferences()
+		return map[mkRef(key, extraData)]
+	}
+
+	fun put(key: Key, extraData: ExtraKey, value: Value) {
+		clearOldReferences()
+		map[mkRef(key, extraData)] = value
+	}
+
+	fun getOrPut(key: Key, extraData: ExtraKey, value: (Key, ExtraKey) -> Value): Value {
+		clearOldReferences()
+		return map.getOrPut(mkRef(key, extraData)) { value(key, extraData) }
+	}
+
+	fun clear() {
+		map.clear()
+	}
+
+	init {
+		allInstances.add(this)
+	}
+
+	companion object {
+		val allInstances = InstanceList<WeakCache<*, *, *>>("WeakCaches")
+		private val logger = DebugLogger("WeakCache")
+		fun <Key : Any, Value : Any> memoize(name: String, function: (Key) -> Value):
+			CacheFunction.NoExtraData<Key, Value> {
+			return CacheFunction.NoExtraData(WeakCache(name), function)
+		}
+
+		fun <Key : Any, ExtraKey : Any, Value : Any> dontMemoize(name: String, function: (Key, ExtraKey) -> Value) = function
+		fun <Key : Any, ExtraKey : Any, Value : Any> memoize(name: String, function: (Key, ExtraKey) -> Value):
+			CacheFunction.WithExtraData<Key, ExtraKey, Value> {
+			return CacheFunction.WithExtraData(WeakCache(name), function)
+		}
+	}
+
+	open inner class Ref(
+		weakInstance: Key,
+		val extraData: ExtraKey,
+	) : WeakReference<Key>(weakInstance, queue) {
+		open fun shouldBeEvicted() = true
+		val hashCode = System.identityHashCode(weakInstance) * 31 + extraData.hashCode()
+		override fun equals(other: Any?): Boolean {
+			if (other !is WeakCache<*, *, *>.Ref) return false
+			return other.hashCode == this.hashCode
+				&& other.get() === this.get()
+				&& other.extraData == this.extraData
+		}
+
+		override fun hashCode(): Int {
+			return hashCode
+		}
+	}
+
+	interface CacheFunction {
+		val cache: WeakCache<*, *, *>
+
+		data class NoExtraData<Key : Any, Value : Any>(
+			override val cache: WeakCache<Key, Unit, Value>,
+			val wrapped: (Key) -> Value,
+		) : CacheFunction, (Key) -> Value {
+			override fun invoke(p1: Key): Value {
+				return cache.getOrPut(p1, Unit, { a, _ -> wrapped(a) })
+			}
+		}
+
+		data class WithExtraData<Key : Any, ExtraKey : Any, Value : Any>(
+			override val cache: WeakCache<Key, ExtraKey, Value>,
+			val wrapped: (Key, ExtraKey) -> Value,
+		) : CacheFunction, (Key, ExtraKey) -> Value {
+			override fun invoke(p1: Key, p2: ExtraKey): Value {
+				return cache.getOrPut(p1, p2, wrapped)
+			}
+		}
+	}
 }
diff --git a/src/main/kotlin/util/data/MultiFileDataHolder.kt b/src/main/kotlin/util/data/MultiFileDataHolder.kt
new file mode 100644
index 0000000..94c6f05
--- /dev/null
+++ b/src/main/kotlin/util/data/MultiFileDataHolder.kt
@@ -0,0 +1,63 @@
+package moe.nea.firmament.util.data
+
+import kotlinx.serialization.KSerializer
+import kotlin.io.path.createDirectories
+import kotlin.io.path.deleteExisting
+import kotlin.io.path.exists
+import kotlin.io.path.extension
+import kotlin.io.path.listDirectoryEntries
+import kotlin.io.path.nameWithoutExtension
+import kotlin.io.path.readText
+import kotlin.io.path.writeText
+import moe.nea.firmament.Firmament
+
+abstract class MultiFileDataHolder<T>(
+	val dataSerializer: KSerializer<T>,
+	val configName: String
+) { // TODO: abstract this + ProfileSpecificDataHolder
+	val configDirectory = Firmament.CONFIG_DIR.resolve(configName)
+	private var allData = readValues()
+	protected fun readValues(): MutableMap<String, T> {
+		if (!configDirectory.exists()) {
+			configDirectory.createDirectories()
+		}
+		val profileFiles = configDirectory.listDirectoryEntries()
+		return profileFiles
+			.filter { it.extension == "json" }
+			.mapNotNull {
+				try {
+					it.nameWithoutExtension to Firmament.json.decodeFromString(dataSerializer, it.readText())
+				} catch (e: Exception) { /* Expecting IOException and SerializationException, but Kotlin doesn't allow multi catches*/
+					IDataHolder.badLoads.add(configName)
+					Firmament.logger.error(
+						"Exception during loading of multi file data holder $it ($configName). This will reset that profiles config.",
+						e
+					)
+					null
+				}
+			}.toMap().toMutableMap()
+	}
+
+	fun save() {
+		if (!configDirectory.exists()) {
+			configDirectory.createDirectories()
+		}
+		val c = allData
+		configDirectory.listDirectoryEntries().forEach {
+			if (it.nameWithoutExtension !in c.mapKeys { it.toString() }) {
+				it.deleteExisting()
+			}
+		}
+		c.forEach { (name, value) ->
+			val f = configDirectory.resolve("$name.json")
+			f.writeText(Firmament.json.encodeToString(dataSerializer, value))
+		}
+	}
+
+	fun list(): Map<String, T> = allData
+	val validPathRegex = "[a-zA-Z0-9_][a-zA-Z0-9\\-_.]*".toPattern()
+	fun insert(name: String, value: T) {
+		require(validPathRegex.matcher(name).matches()) { "Not a valid name: $name" }
+		allData[name] = value
+	}
+}
diff --git a/src/main/kotlin/util/mc/asFakeServer.kt b/src/main/kotlin/util/mc/asFakeServer.kt
new file mode 100644
index 0000000..d3811bd
--- /dev/null
+++ b/src/main/kotlin/util/mc/asFakeServer.kt
@@ -0,0 +1,37 @@
+package moe.nea.firmament.util.mc
+
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource
+import net.minecraft.server.command.CommandOutput
+import net.minecraft.server.command.ServerCommandSource
+import net.minecraft.text.Text
+
+fun FabricClientCommandSource.asFakeServer(): ServerCommandSource {
+	val source = this
+	return ServerCommandSource(
+		object : CommandOutput {
+			override fun sendMessage(message: Text?) {
+				source.player.sendMessage(message, false)
+			}
+
+			override fun shouldReceiveFeedback(): Boolean {
+				return true
+			}
+
+			override fun shouldTrackOutput(): Boolean {
+				return true
+			}
+
+			override fun shouldBroadcastConsoleToOps(): Boolean {
+				return true
+			}
+		},
+		source.position,
+		source.rotation,
+		null,
+		0,
+		"FakeServerCommandSource",
+		Text.literal("FakeServerCommandSource"),
+		null,
+		source.player
+	)
+}