Split client and server abstractions

Author: object-Object

Common/src/main/kotlin/gay/object/hexdebug/HexDebugAbstractions.kt

@@ -5,8 +5,6 @@ package gay.`object`.hexdebug
 
 import dev.architectury.injectables.annotations.ExpectPlatform
 import gay.`object`.hexdebug.registry.HexDebugRegistrar
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.packs.resources.PreparableReloadListener
 
 fun initRegistries(vararg registries: HexDebugRegistrar<*>) {
     for (registry in registries) {
@@ -18,8 +16,3 @@ fun initRegistries(vararg registries: HexDebugRegistrar<*>) {
 fun <T : Any> initRegistry(registrar: HexDebugRegistrar<T>) {
     throw AssertionError()
 }
-
-@ExpectPlatform
-fun registerClientResourceReloadListener(id: ResourceLocation, listener: PreparableReloadListener) {
-    throw AssertionError()
-}

Common/src/main/kotlin/gay/object/hexdebug/HexDebugClientAbstractions.kt

@@ -0,0 +1,13 @@
+@file:JvmName("HexDebugClientAbstractions")
+@file:Suppress("UNUSED_PARAMETER")
+
+package gay.`object`.hexdebug
+
+import dev.architectury.injectables.annotations.ExpectPlatform
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.packs.resources.PreparableReloadListener
+
+@ExpectPlatform
+fun registerClientResourceReloadListener(id: ResourceLocation, listener: PreparableReloadListener) {
+    throw AssertionError()
+}

Fabric/src/main/kotlin/gay/object/hexdebug/fabric/HexDebugAbstractionsImpl.kt

@@ -3,37 +3,9 @@
 package gay.`object`.hexdebug.fabric
 
 import gay.`object`.hexdebug.registry.HexDebugRegistrar
-import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper
 import net.minecraft.core.Registry
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.packs.PackType
-import net.minecraft.server.packs.resources.PreparableReloadListener
-import net.minecraft.server.packs.resources.ResourceManager
-import net.minecraft.util.profiling.ProfilerFiller
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.Executor
 
 fun <T : Any> initRegistry(registrar: HexDebugRegistrar<T>) {
     val registry = registrar.registry
     registrar.init { id, value -> Registry.register(registry, id, value) }
 }
-
-fun registerClientResourceReloadListener(id: ResourceLocation, listener: PreparableReloadListener) {
-    ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener(
-        object : IdentifiableResourceReloadListener {
-            override fun reload(
-                preparationBarrier: PreparableReloadListener.PreparationBarrier,
-                resourceManager: ResourceManager,
-                preparationsProfiler: ProfilerFiller,
-                reloadProfiler: ProfilerFiller,
-                backgroundExecutor: Executor,
-                gameExecutor: Executor
-            ): CompletableFuture<Void> {
-                return listener.reload(preparationBarrier, resourceManager, preparationsProfiler, reloadProfiler, backgroundExecutor, gameExecutor)
-            }
-
-            override fun getFabricId() = id
-        }
-    )
-}

Fabric/src/main/kotlin/gay/object/hexdebug/fabric/HexDebugClientAbstractionsImpl.kt

@@ -0,0 +1,32 @@
+@file:JvmName("HexDebugClientAbstractionsImpl")
+
+package gay.`object`.hexdebug.fabric
+
+import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.packs.PackType
+import net.minecraft.server.packs.resources.PreparableReloadListener
+import net.minecraft.server.packs.resources.ResourceManager
+import net.minecraft.util.profiling.ProfilerFiller
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Executor
+
+fun registerClientResourceReloadListener(id: ResourceLocation, listener: PreparableReloadListener) {
+    ResourceManagerHelper.get(PackType.CLIENT_RESOURCES).registerReloadListener(
+        object : IdentifiableResourceReloadListener {
+            override fun reload(
+                preparationBarrier: PreparableReloadListener.PreparationBarrier,
+                resourceManager: ResourceManager,
+                preparationsProfiler: ProfilerFiller,
+                reloadProfiler: ProfilerFiller,
+                backgroundExecutor: Executor,
+                gameExecutor: Executor
+            ): CompletableFuture<Void> {
+                return listener.reload(preparationBarrier, resourceManager, preparationsProfiler, reloadProfiler, backgroundExecutor, gameExecutor)
+            }
+
+            override fun getFabricId() = id
+        }
+    )
+}

Forge/src/main/kotlin/gay/object/hexdebug/forge/HexDebugAbstractionsImpl.kt

@@ -3,9 +3,6 @@
 package gay.`object`.hexdebug.forge
 
 import gay.`object`.hexdebug.registry.HexDebugRegistrar
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.packs.resources.PreparableReloadListener
-import net.minecraftforge.client.event.RegisterClientReloadListenersEvent
 import net.minecraftforge.registries.RegisterEvent
 import thedarkcolour.kotlinforforge.forge.MOD_BUS
 
@@ -17,8 +14,3 @@ fun <T : Any> initRegistry(registrar: HexDebugRegistrar<T>) {
     }
 }
 
-fun registerClientResourceReloadListener(id: ResourceLocation, listener: PreparableReloadListener) {
-    MOD_BUS.addListener { event: RegisterClientReloadListenersEvent ->
-        event.registerReloadListener(listener)
-    }
-}

Forge/src/main/kotlin/gay/object/hexdebug/forge/HexDebugClientAbstractionsImpl.kt

@@ -0,0 +1,14 @@
+@file:JvmName("HexDebugClientAbstractionsImpl")
+
+package gay.`object`.hexdebug.forge
+
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.packs.resources.PreparableReloadListener
+import net.minecraftforge.client.event.RegisterClientReloadListenersEvent
+import thedarkcolour.kotlinforforge.forge.MOD_BUS
+
+fun registerClientResourceReloadListener(id: ResourceLocation, listener: PreparableReloadListener) {
+    MOD_BUS.addListener { event: RegisterClientReloadListenersEvent ->
+        event.registerReloadListener(listener)
+    }
+}