Update mosaic to architectury

Author: thecodewarrior

modules/mosaic/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    `module-conventions`
+    `liblib-module-root`
 }
 
 module {
@@ -8,18 +8,5 @@ module {
     moduleDependencies("core", "albedo")
 }
 
-configureFabricModJson {
-    entrypoint("main", adapter = "kotlin", value = "com.teamwizardry.librarianlib.mosaic.LibLibMosaic\$CommonInitializer")
-    entrypoint("client", adapter = "kotlin", value = "com.teamwizardry.librarianlib.mosaic.LibLibMosaic\$ClientInitializer")
-    entrypoint("server", adapter = "kotlin", value = "com.teamwizardry.librarianlib.mosaic.LibLibMosaic\$ServerInitializer")
-//    mixin("ll/mosaic/mosaic.mixins.json")
-}
-
-configureFabricTestModJson {
-    entrypoint("main", adapter = "kotlin", value = "com.teamwizardry.librarianlib.mosaic.test.LibLibMosaicTest\$CommonInitializer")
-    entrypoint("client", adapter = "kotlin", value = "com.teamwizardry.librarianlib.mosaic.test.LibLibMosaicTest\$ClientInitializer")
-    entrypoint("server", adapter = "kotlin", value = "com.teamwizardry.librarianlib.mosaic.test.LibLibMosaicTest\$ServerInitializer")
-}
-
 dependencies {
 }

modules/mosaic/common/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    `liblib-module-common`
+}

modules/mosaic/common/src/main/kotlin/com/teamwizardry/librarianlib/mosaic/LibLibMosaic.kt

@@ -0,0 +1,6 @@
+package com.teamwizardry.librarianlib.mosaic
+
+import com.teamwizardry.librarianlib.LibLibModule
+
+internal object LibLibMosaic : LibLibModule("liblib-mosaic", "Mosaic") {
+}

…rarianlib/mosaic/MinecraftAtlasSprite.kt …rarianlib/mosaic/MinecraftAtlasSprite.ktmodules/mosaic/src/main/kotlin/com/teamwizardry/librarianlib/mosaic/MinecraftAtlasSprite.kt renamed to modules/mosaic/common/src/main/kotlin/com/teamwizardry/librarianlib/mosaic/MinecraftAtlasSprite.kt modules/mosaic/src/main/kotlin/com/teamwizardry/librarianlib/mosaic/MinecraftAtlasSprite.kt renamed to modules/mosaic/common/src/main/kotlin/com/teamwizardry/librarianlib/mosaic/MinecraftAtlasSprite.kt

@@ -9,10 +9,12 @@ import com.teamwizardry.librarianlib.math.ceilInt
 import com.teamwizardry.librarianlib.math.floorInt
 import com.teamwizardry.librarianlib.core.util.ivec
 import com.teamwizardry.librarianlib.core.util.vec
-import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener
+import com.teamwizardry.librarianlib.platform.LibLibPlatformCommon
 import net.minecraft.client.resource.metadata.AnimationResourceMetadata
 import net.minecraft.resource.Resource
 import net.minecraft.resource.ResourceManager
+import net.minecraft.resource.ResourceReloader
+import net.minecraft.resource.ResourceType
 import net.minecraft.util.Identifier
 import net.minecraft.util.profiler.Profiler
 import java.awt.Color
@@ -23,14 +25,22 @@ import java.util.concurrent.Executor
 import javax.imageio.ImageIO
 import kotlin.jvm.optionals.getOrNull
 
-internal object MosaicLoader : SimpleResourceReloadListener<Map<Identifier, MosaicDefinition?>> {
+internal object MosaicLoader : ResourceReloader {
     private var definitions: MutableMap<Identifier, MosaicDefinition?> = mutableMapOf()
     private var missingno = Identifier.of("liblib-mosaic:textures/missingno.png")
 
     val missingnoSheet: MosaicDefinition get() = getDefinition(missingno)
     val missingnoSprite: SpriteDefinition get() = getDefinition(missingno).sprites[0]
     val missingnoColor: ColorDefinition get() = getDefinition(missingno).colors[0]
 
+    init {
+        LibLibPlatformCommon.instance.registerResourceReloadListener(
+            ResourceType.CLIENT_RESOURCES,
+            this,
+            Identifier.of("liblib-mosaic:loader")
+        )
+    }
+
     fun getDefinition(location: Identifier): MosaicDefinition {
         val def = definitions.getOrPut(location) {
             load(Client.minecraft.resourceManager, location)
@@ -40,9 +50,20 @@ internal object MosaicLoader : SimpleResourceReloadListener<Map<Identifier, Mosa
         return def ?: getDefinition(missingno)
     }
 
-    override fun getFabricId(): Identifier = Identifier.of("liblib-mosaic:loader")
+    override fun reload(
+        synchronizer: ResourceReloader.Synchronizer,
+        manager: ResourceManager,
+        prepareProfiler: Profiler,
+        applyProfiler: Profiler,
+        prepareExecutor: Executor,
+        applyExecutor: Executor
+    ): CompletableFuture<Void> {
+        return load(manager, prepareProfiler, prepareExecutor)
+            .thenCompose(synchronizer::whenPrepared)
+            .thenCompose { apply(it, manager, applyProfiler, applyExecutor) }
+    }
 
-    override fun load(
+    fun load(
         manager: ResourceManager,
         profiler: Profiler,
         executor: Executor
@@ -52,7 +73,7 @@ internal object MosaicLoader : SimpleResourceReloadListener<Map<Identifier, Mosa
         }, executor)
     }
 
-    override fun apply(
+    fun apply(
         data: Map<Identifier, MosaicDefinition?>,
         manager: ResourceManager,
         profiler: Profiler,