update fabric api impl

Author: dvitski

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v4
       - name: setup jdk ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:
@@ -34,4 +34,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts
-          path: build/libs/
+          path: build/libs/
+        continue-on-error: true

src/main/kotlin/net/mcbrawls/packin/PackinMod.kt

@@ -2,7 +2,7 @@ package net.mcbrawls.packin
 
 import com.google.gson.JsonObject
 import net.fabricmc.api.ModInitializer
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper
+import net.fabricmc.fabric.api.resource.v1.ResourceLoader
 import net.mcbrawls.packin.listener.PackinResourceLoader
 import net.minecraft.resource.ResourceType
 import net.minecraft.util.Identifier
@@ -14,8 +14,10 @@ object PackinMod : ModInitializer {
     val LOGGER: Logger = LoggerFactory.getLogger(MOD_ID)
 
 	override fun onInitialize() {
-		val dataHelper = ResourceManagerHelper.get(ResourceType.SERVER_DATA)
-		dataHelper.registerReloadListener(PackinResourceLoader)
+        LOGGER.info("Initializing Packin")
+
+		val dataHelper = ResourceLoader.get(ResourceType.SERVER_DATA)
+		dataHelper.registerReloader(Identifier.of(MOD_ID, "reloader"), PackinResourceLoader)
 	}
 
 	fun JsonObject.addProperty(property: String, value: Identifier) {

src/main/kotlin/net/mcbrawls/packin/listener/PackinResourceLoader.kt

@@ -1,19 +1,17 @@
 package net.mcbrawls.packin.listener
 
-import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener
+import net.fabricmc.fabric.api.resource.v1.reloader.SimpleResourceReloader
 import net.mcbrawls.packin.PackinMod
 import net.mcbrawls.packin.resource.PackResource
-import net.minecraft.resource.ResourceManager
+import net.minecraft.resource.ResourceReloader
 import net.minecraft.util.Identifier
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.Executor
 
 /**
  * Loads Packin source files from Minecraft resources.
  */
-object PackinResourceLoader : SimpleResourceReloadListener<List<SourcePackResource>> {
+object PackinResourceLoader : SimpleResourceReloader<List<SourcePackResource>>() {
     val LOGGER: Logger = LoggerFactory.getLogger("PackinResourceLoader")
 
     /**
@@ -27,32 +25,24 @@ object PackinResourceLoader : SimpleResourceReloadListener<List<SourcePackResour
     private val resources: MutableList<PackResource> = mutableListOf()
     private val resourcesByPack: MutableMap<String, List<PackResource>> = mutableMapOf()
 
-    override fun load(
-        manager: ResourceManager,
-        executor: Executor,
-    ): CompletableFuture<List<SourcePackResource>> {
-        return CompletableFuture.supplyAsync {
-            val resources = manager.findAllResources(ROOT_PATH) { true }
-            resources.flatMap { (rawId, resources) ->
-                resources.map { resource ->
-                    val bytes = resource.inputStream.readBytes()
-                    val id = rawId.withPath { it.removePrefix("$ROOT_PATH/") }
-                    SourcePackResource(resource.packId, PackResource(id, bytes))
-                }
+    override fun prepare(store: ResourceReloader.Store): List<SourcePackResource> {
+        val manager = store.resourceManager
+        val resources = manager.findAllResources(ROOT_PATH) { true }
+        return resources.flatMap { (rawId, resources) ->
+            resources.map { resource ->
+                val bytes = resource.inputStream.readBytes()
+                val id = rawId.withPath { it.removePrefix("$ROOT_PATH/") }
+                SourcePackResource(resource.packId, PackResource(id, bytes))
             }
         }
     }
 
-    override fun apply(
-        loadedResources: List<SourcePackResource>,
-        manager: ResourceManager,
-        executor: Executor,
-    ): CompletableFuture<Void> {
+    override fun apply(prepared: List<SourcePackResource>, store: ResourceReloader.Store) {
         sourceResources.clear()
-        sourceResources.addAll(loadedResources)
+        sourceResources.addAll(prepared)
 
         resources.clear()
-        resources.addAll(loadedResources.map(SourcePackResource::resource))
+        resources.addAll(prepared.map(SourcePackResource::resource))
 
         resourcesByPack.clear()
         resourcesByPack.putAll(
@@ -61,10 +51,8 @@ object PackinResourceLoader : SimpleResourceReloadListener<List<SourcePackResour
                 .mapValues { (_, resources) -> resources.map(SourcePackResource::resource) }
         )
 
-        val resourceCount = loadedResources.size
+        val resourceCount = prepared.size
         LOGGER.info("Loaded $resourceCount Packin resources")
-
-        return CompletableFuture.completedFuture(null)
     }
 
     /**
@@ -94,8 +82,4 @@ object PackinResourceLoader : SimpleResourceReloadListener<List<SourcePackResour
 
         return resources.filter { filter(it.path) }.toSet()
     }
-
-    override fun getFabricId(): Identifier {
-        return LISTENER_ID
-    }
 }