Fix resources and EMI plugin on Forge (close #58)

object-Object · object-Object · commit 29e45d129b0d · 2025-10-02T18:48:16.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 ### Fixed
 
 - Fixed a few bugs allowing arbitrary items to be inserted into the Splicing Table and Focal Frame using hoppers or modded item transportation ([#38](https://github.com/object-Object/HexDebug/issues/38), [#53](https://github.com/object-Object/HexDebug/issues/38)).
+- Fixed the EMI integration failing to load on Forge.
+- Fixed Splicing Table iota renderer resources not being loaded when the game launches on Forge. 
 
 ### Removed
 
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/HexDebugClient.kt b/Common/src/main/kotlin/gay/object/hexdebug/HexDebugClient.kt
@@ -14,7 +14,6 @@ import gay.`object`.hexdebug.config.HexDebugServerConfig
 import gay.`object`.hexdebug.gui.splicing.renderers.*
 import gay.`object`.hexdebug.gui.splicing.renderers.conditional.IfPathExistsRendererProvider
 import gay.`object`.hexdebug.registry.HexDebugBlocks
-import gay.`object`.hexdebug.resources.splicing.SplicingTableIotasResourceReloadListener
 import gay.`object`.hexdebug.utils.styledHoverName
 import gay.`object`.hexdebug.utils.toComponent
 import me.shedaniel.autoconfig.AutoConfig
@@ -40,7 +39,6 @@ object HexDebugClient {
         DebugProxyClient.init()
         addScryingLensOverlays()
         registerSplicingTableIotaRenderers()
-        registerClientResourceReloadListener(HexDebug.id("splicing_iotas"), SplicingTableIotasResourceReloadListener)
     }
 
     fun getConfigScreen(parent: Screen): Screen {
diff --git a/Common/src/main/kotlin/gay/object/hexdebug/HexDebugClientAbstractions.kt b/Common/src/main/kotlin/gay/object/hexdebug/HexDebugClientAbstractions.kt
@@ -5,13 +5,6 @@ package gay.`object`.hexdebug
 
 import dev.architectury.injectables.annotations.ExpectPlatform
 import net.minecraft.client.Minecraft
-import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.packs.resources.PreparableReloadListener
-
-@ExpectPlatform
-fun registerClientResourceReloadListener(id: ResourceLocation, listener: PreparableReloadListener) {
-    throw AssertionError()
-}
 
 @ExpectPlatform
 fun sendHexicalKeyEvent(client: Minecraft, keyCode: Int, scanCode: Int, isPressed: Boolean) {
diff --git a/Fabric/src/main/kotlin/gay/object/hexdebug/fabric/FabricHexDebugClient.kt b/Fabric/src/main/kotlin/gay/object/hexdebug/fabric/FabricHexDebugClient.kt
@@ -1,10 +1,45 @@
 package gay.`object`.hexdebug.fabric
 
+import gay.`object`.hexdebug.HexDebug
 import gay.`object`.hexdebug.HexDebugClient
+import gay.`object`.hexdebug.resources.splicing.SplicingTableIotasResourceReloadListener
 import net.fabricmc.api.ClientModInitializer
+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
 
 object FabricHexDebugClient : ClientModInitializer {
     override fun onInitializeClient() {
         HexDebugClient.init()
+
+        registerClientResourceListener(
+            HexDebug.id("hexdebug_splicing_iotas"),
+            SplicingTableIotasResourceReloadListener,
+        )
     }
 }
+
+private fun registerClientResourceListener(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
+        }
+    )
+}
diff --git a/Fabric/src/main/kotlin/gay/object/hexdebug/fabric/HexDebugClientAbstractionsImpl.kt b/Fabric/src/main/kotlin/gay/object/hexdebug/fabric/HexDebugClientAbstractionsImpl.kt
@@ -3,36 +3,8 @@
 package gay.`object`.hexdebug.fabric
 
 import gay.`object`.hexdebug.fabric.interop.FabricHexDebugHexicalInterop
-import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper
 import net.fabricmc.loader.api.FabricLoader
 import net.minecraft.client.Minecraft
-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
-        }
-    )
-}
 
 fun sendHexicalKeyEvent(client: Minecraft, keyCode: Int, scanCode: Int, isPressed: Boolean) {
     if (FabricLoader.getInstance().isModLoaded("hexical")) {
diff --git a/Forge/src/main/kotlin/gay/object/hexdebug/forge/ForgeHexDebug.kt b/Forge/src/main/kotlin/gay/object/hexdebug/forge/ForgeHexDebug.kt
@@ -31,6 +31,7 @@ class HexDebugForge {
         MOD_BUS.apply {
             EventBuses.registerModEventBus(HexDebug.MODID, this)
             addListener(ForgeHexDebugClient::init)
+            addListener(ForgeHexDebugClient::registerClientReloadListeners)
             addListener(::initServer)
             addListener(::gatherData)
         }
diff --git a/Forge/src/main/kotlin/gay/object/hexdebug/forge/ForgeHexDebugClient.kt b/Forge/src/main/kotlin/gay/object/hexdebug/forge/ForgeHexDebugClient.kt
@@ -1,7 +1,9 @@
 package gay.`object`.hexdebug.forge
 
 import gay.`object`.hexdebug.HexDebugClient
+import gay.`object`.hexdebug.resources.splicing.SplicingTableIotasResourceReloadListener
 import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory
+import net.minecraftforge.client.event.RegisterClientReloadListenersEvent
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent
 import thedarkcolour.kotlinforforge.forge.LOADING_CONTEXT
 
@@ -13,4 +15,8 @@ object ForgeHexDebugClient {
             ConfigScreenFactory { _, parent -> HexDebugClient.getConfigScreen(parent) }
         }
     }
+
+    fun registerClientReloadListeners(event: RegisterClientReloadListenersEvent) {
+        event.registerReloadListener(SplicingTableIotasResourceReloadListener)
+    }
 }
diff --git a/Forge/src/main/kotlin/gay/object/hexdebug/forge/interop/ForgeHexDebugEmiPlugin.kt b/Forge/src/main/kotlin/gay/object/hexdebug/forge/interop/ForgeHexDebugEmiPlugin.kt
@@ -6,7 +6,7 @@ import dev.emi.emi.api.EmiRegistry
 import gay.`object`.hexdebug.interop.HexDebugEmiPlugin
 
 @EmiEntrypoint
-object ForgeHexDebugEmiPlugin : EmiPlugin {
+class ForgeHexDebugEmiPlugin : EmiPlugin {
     override fun register(registry: EmiRegistry) {
         HexDebugEmiPlugin.register(registry)
     }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class HexDebugForge {`
`31`	`31`	`MOD_BUS.apply {`
`32`	`32`	`EventBuses.registerModEventBus(HexDebug.MODID, this)`
`33`	`33`	`addListener(ForgeHexDebugClient::init)`
	`34`	`+ addListener(ForgeHexDebugClient::registerClientReloadListeners)`
`34`	`35`	`addListener(::initServer)`
`35`	`36`	`addListener(::gatherData)`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	package gay.`object`.hexdebug.forge
`2`	`2`
`3`	`3`	import gay.`object`.hexdebug.HexDebugClient
	`4`	+import gay.`object`.hexdebug.resources.splicing.SplicingTableIotasResourceReloadListener
`4`	`5`	`import net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory`
	`6`	`+import net.minecraftforge.client.event.RegisterClientReloadListenersEvent`
`5`	`7`	`import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent`
`6`	`8`	`import thedarkcolour.kotlinforforge.forge.LOADING_CONTEXT`
`7`	`9`
`@@ -13,4 +15,8 @@ object ForgeHexDebugClient {`
`13`	`15`	`ConfigScreenFactory { _, parent -> HexDebugClient.getConfigScreen(parent) }`
`14`	`16`	`}`
`15`	`17`	`}`
	`18`	`+`
	`19`	`+ fun registerClientReloadListeners(event: RegisterClientReloadListenersEvent) {`
	`20`	`+ event.registerReloadListener(SplicingTableIotasResourceReloadListener)`
	`21`	`+ }`
`16`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import dev.emi.emi.api.EmiRegistry`
`6`	`6`	import gay.`object`.hexdebug.interop.HexDebugEmiPlugin
`7`	`7`
`8`	`8`	`@EmiEntrypoint`
`9`		`-object ForgeHexDebugEmiPlugin : EmiPlugin {`
	`9`	`+class ForgeHexDebugEmiPlugin : EmiPlugin {`
`10`	`10`	`override fun register(registry: EmiRegistry) {`
`11`	`11`	`HexDebugEmiPlugin.register(registry)`
`12`	`12`	`}`