Fix error when running in dedicated servers

hea3ven · Feb 10, 2019 · 988a5f6 · 988a5f6
1 parent 73000f2
commit 988a5f6
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/src/main/kotlin/com/hea3ven/dulcedeleche/ModClientDulceDeLeche.kt b/src/main/kotlin/com/hea3ven/dulcedeleche/ModClientDulceDeLeche.kt
@@ -0,0 +1,13 @@
+package com.hea3ven.dulcedeleche
+
+import com.hea3ven.dulcedeleche.modules.redstone.RedstoneClientModule
+import net.fabricmc.api.ClientModInitializer
+
+@Suppress("unused")
+object ModClientDulceDeLeche : ClientModInitializer {
+
+    override fun onInitializeClient() {
+        RedstoneClientModule.onInitialize()
+    }
+}
+
diff --git a/src/main/kotlin/com/hea3ven/dulcedeleche/modules/redstone/RedstoneClientModule.kt b/src/main/kotlin/com/hea3ven/dulcedeleche/modules/redstone/RedstoneClientModule.kt
@@ -0,0 +1,18 @@
+package com.hea3ven.dulcedeleche.modules.redstone
+
+import com.hea3ven.dulcedeleche.modules.redstone.RedstoneModule.assemblerId
+import com.hea3ven.dulcedeleche.modules.redstone.RedstoneModule.workbenchId
+import com.hea3ven.dulcedeleche.modules.redstone.client.gui.AssemblerScreen
+import com.hea3ven.dulcedeleche.modules.redstone.client.gui.WorkbenchScreen
+import net.fabricmc.fabric.api.client.screen.ContainerScreenFactory
+import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry
+
+object RedstoneClientModule {
+
+    fun onInitialize() {
+        ScreenProviderRegistry.INSTANCE.registerFactory(workbenchId, ContainerScreenFactory(::WorkbenchScreen))
+        ScreenProviderRegistry.INSTANCE.registerFactory(assemblerId, ContainerScreenFactory(::AssemblerScreen))
+    }
+
+}
+
diff --git a/src/main/kotlin/com/hea3ven/dulcedeleche/modules/redstone/RedstoneModule.kt b/src/main/kotlin/com/hea3ven/dulcedeleche/modules/redstone/RedstoneModule.kt
@@ -5,12 +5,8 @@ import com.hea3ven.dulcedeleche.modules.redstone.block.AssemblerBlock
 import com.hea3ven.dulcedeleche.modules.redstone.block.WorkbenchBlock
 import com.hea3ven.dulcedeleche.modules.redstone.block.entity.AssemblerBlockEntity
 import com.hea3ven.dulcedeleche.modules.redstone.block.entity.WorkbenchBlockEntity
-import com.hea3ven.dulcedeleche.modules.redstone.client.gui.AssemblerScreen
-import com.hea3ven.dulcedeleche.modules.redstone.client.gui.WorkbenchScreen
 import com.hea3ven.dulcedeleche.modules.redstone.dispenser.DispenserBreedBehavior
 import com.hea3ven.dulcedeleche.modules.redstone.dispenser.DispenserPlantBehavior
-import net.fabricmc.fabric.api.client.screen.ContainerScreenFactory
-import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry
 import net.fabricmc.fabric.api.container.ContainerFactory
 import net.fabricmc.fabric.api.container.ContainerProviderRegistry
 import net.minecraft.block.Block
@@ -57,7 +53,6 @@ object RedstoneModule : Module<RedstoneModuleConfig>() {
         workbenchItem.registerBlockItemMap(Item.BLOCK_ITEM_MAP, workbenchItem)
         ContainerProviderRegistry.INSTANCE.registerFactory(workbenchId, ContainerFactory<Container>(
                 WorkbenchBlockEntity.Companion::createContainer))
-        ScreenProviderRegistry.INSTANCE.registerFactory(workbenchId, ContainerScreenFactory(::WorkbenchScreen))
         workbenchBlockEntityType = Registry.register(Registry.BLOCK_ENTITY, workbenchId, BlockEntityType(
                 { WorkbenchBlockEntity(RedstoneModule.workbenchBlockEntityType) }, null))
 
@@ -68,7 +63,6 @@ object RedstoneModule : Module<RedstoneModuleConfig>() {
         assemblerItem.registerBlockItemMap(Item.BLOCK_ITEM_MAP, assemblerItem)
         ContainerProviderRegistry.INSTANCE.registerFactory(assemblerId, ContainerFactory<Container>(
                 AssemblerBlockEntity.Companion::createContainer))
-        ScreenProviderRegistry.INSTANCE.registerFactory(assemblerId, ContainerScreenFactory(::AssemblerScreen))
         assemblerBlockEntityType = Registry.register(Registry.BLOCK_ENTITY, assemblerId, BlockEntityType(
                 { AssemblerBlockEntity(RedstoneModule.assemblerBlockEntityType) }, null))
     }

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -5,9 +5,11 @@
     "version": "@version@",
     "side": "universal",
     "languageAdapter": "net.fabricmc.language.kotlin.KotlinLanguageAdapter",
-    "initializer": "com.hea3ven.dulcedeleche.ModDulceDeLeche",
+    "initializers": [
+        "com.hea3ven.dulcedeleche.ModDulceDeLeche",
+        "com.hea3ven.dulcedeleche.ModClientDulceDeLeche"
+    ],
     "mixins": {
-        "client": "dulcedeleche.client.json",
         "common": ["dulcedeleche.common.json", "dulcedeleche.mobs.common.json", "dulcedeleche.world.common.json"]
     },
     "requires": {