Prepare *everything*

Author: BluSpring

fabric/src/main/kotlin/xyz/bluspring/unitytranslate/fabric/client/UnityTranslateFabricClient.kt

@@ -36,7 +36,13 @@ class UnityTranslateFabricClient : ClientModInitializer {
         }
 
         HudRenderCallback.EVENT.register { guiGraphics, delta ->
-            instance.clientRenderHud(guiGraphics, delta)
+            instance.clientRenderHud(guiGraphics,
+                //? if >= 1.21.1 {
+                /*delta.getGameTimeDeltaPartialTick(true)
+                *///?} else {
+                delta
+                //?}
+            )
         }
 
         ClientCommandRegistrationCallback.EVENT.register { dispatcher, registryAccess ->

forge/src/main/kotlin/xyz/bluspring/unitytranslate/forge/UnityTranslateForge.kt

@@ -23,12 +23,12 @@ class UnityTranslateForge(val container: KotlinModContainer, val eventBus: Event
         ForgeEvents.init()
 
         this.eventBus.register(this)
-        MinecraftForge.EVENT_BUS.register(UnityTranslateForgeClient)
     }
 
     @OnlyIn(Dist.CLIENT)
     @SubscribeEvent
     fun onClientLoading(ev: FMLClientSetupEvent) {
+        MinecraftForge.EVENT_BUS.register(UnityTranslateForgeClient)
         ConfigScreenHelper.createConfigScreen(this.container)
     }
 

gradle.properties

@@ -5,8 +5,6 @@ systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal
 
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx8192m -Xms8192m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-org.gradle.parallel.threads=8
-org.gradle.parallel=true
 
 # Loom Setup
 

neoforge/src/main/kotlin/xyz/bluspring/unitytranslate/neoforge/ConfigScreenHelper.kt

@@ -2,6 +2,7 @@ package xyz.bluspring.unitytranslate.neoforge
 
 import net.neoforged.fml.ModLoadingContext
 
+import xyz.bluspring.unitytranslate.client.gui.UTConfigScreen
 //? if >= 1.20.6 {
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory
 //?} else {

neoforge/src/main/kotlin/xyz/bluspring/unitytranslate/neoforge/NeoForgeEvents.kt

@@ -1,18 +1,46 @@
 package xyz.bluspring.unitytranslate.neoforge
 
+import net.minecraft.commands.CommandSourceStack
+import net.minecraft.server.level.ServerPlayer
 import net.neoforged.bus.api.SubscribeEvent
 import net.neoforged.neoforge.common.NeoForge
+import net.neoforged.neoforge.event.RegisterCommandsEvent
+import net.neoforged.neoforge.event.entity.player.PlayerEvent
 import net.neoforged.neoforge.server.permission.events.PermissionGatherEvent
 
-import xyz.bluspring.unitytranslate.UnityTranslate
+import xyz.bluspring.unitytranslate.commands.UnityTranslateCommands
+import xyz.bluspring.unitytranslate.network.UTServerNetworking
+import xyz.bluspring.unitytranslate.translator.TranslatorManager
 
 object NeoForgeEvents {
      fun init() {
          NeoForge.EVENT_BUS.register(this)
      }
 
-     @SubscribeEvent
-     fun onPermissionsGather(event: PermissionGatherEvent.Nodes) {
-         UnityTranslate.instance.proxy.registerPermissions(event)
-     }
+    @SubscribeEvent
+    fun onPermissionsGather(event: PermissionGatherEvent.Nodes) {
+        event.addNodes(UnityTranslateNeoForge.REQUEST_TRANSLATIONS_NODE)
+    }
+
+    @SubscribeEvent
+    fun onCommandRegister(ev: RegisterCommandsEvent) {
+        UnityTranslateCommands.register(ev.dispatcher, "unitytranslate", false, CommandSourceStack::sendSystemMessage)
+    }
+
+    @SubscribeEvent
+    fun onPlayerJoin(ev: PlayerEvent.PlayerLoggedInEvent) {
+        if (ev.entity !is ServerPlayer)
+            return
+
+        UTServerNetworking.onPlayerJoin(ev.entity as ServerPlayer)
+    }
+
+    @SubscribeEvent
+    fun onPlayerLeave(ev: PlayerEvent.PlayerLoggedOutEvent) {
+        if (ev.entity !is ServerPlayer)
+            return
+
+        TranslatorManager.playerQuit(ev.entity)
+        UTServerNetworking.onPlayerLeave(ev.entity as ServerPlayer)
+    }
 }

neoforge/src/main/kotlin/xyz/bluspring/unitytranslate/neoforge/NeoForgePlatformProxy.kt

@@ -0,0 +1,49 @@
+package xyz.bluspring.unitytranslate.neoforge
+
+import net.minecraft.world.entity.player.Player
+import net.neoforged.api.distmarker.Dist
+import net.neoforged.fml.ModContainer
+import net.neoforged.fml.ModList
+import net.neoforged.fml.loading.FMLEnvironment
+import net.neoforged.fml.loading.FMLPaths
+import net.neoforged.neoforge.server.permission.PermissionAPI
+import xyz.bluspring.unitytranslate.PlatformProxy
+import java.nio.file.Path
+
+class NeoForgePlatformProxy : PlatformProxy {
+    lateinit var container: ModContainer
+
+    override fun isModLoaded(id: String): Boolean {
+        return ModList.get().isLoaded(id)
+    }
+
+    override fun isClient(): Boolean {
+        //? if > 1.21.8 {
+        return FMLEnvironment.getDist() == Dist.CLIENT
+        //? } else {
+        /*return FMLEnvironment.dist == Dist.CLIENT
+        *///? }
+    }
+
+    override val modVersion: String
+        get() = container.modInfo.version.toString()
+
+    override val configDir: Path
+        get() = FMLPaths.CONFIGDIR.get()
+
+    override val gameDir: Path
+        get() = FMLPaths.GAMEDIR.get()
+
+    override val isDev: Boolean
+        get() {
+            //? if > 1.21.8 {
+            return !FMLEnvironment.isProduction()
+            //? } else {
+            /*return !FMLEnvironment.production
+            *///? }
+        }
+
+    override fun hasTranscriptPermission(player: Player): Boolean {
+        return PermissionAPI.getOfflinePermission(player.uuid, UnityTranslateNeoForge.REQUEST_TRANSLATIONS_NODE)
+    }
+}

neoforge/src/main/kotlin/xyz/bluspring/unitytranslate/neoforge/UnityTranslateNeoForge.kt

@@ -1,43 +1,49 @@
 package xyz.bluspring.unitytranslate.neoforge
 
+import dev.nyon.klf.KotlinModContainer
 import net.neoforged.api.distmarker.Dist
 import net.neoforged.api.distmarker.OnlyIn
+import net.neoforged.bus.EventBus
 import net.neoforged.bus.api.SubscribeEvent
 import net.neoforged.fml.ModLoadingContext
 import net.neoforged.fml.common.Mod
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent
-
-//? if >= 1.20.4 {
-import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS
-//?}
+import net.neoforged.neoforge.common.NeoForge
+import net.neoforged.neoforge.server.permission.nodes.PermissionNode
+import net.neoforged.neoforge.server.permission.nodes.PermissionTypes
 
 import xyz.bluspring.unitytranslate.UnityTranslate
 import xyz.bluspring.unitytranslate.client.UnityTranslateClient
 
 @Mod(UnityTranslate.MOD_ID)
-class UnityTranslateNeoForge {
+class UnityTranslateNeoForge(val container: KotlinModContainer, val eventBus: EventBus) {
+    val instance = UnityTranslate()
+
     init {
-        UnityTranslate()
-//? if >= 1.20.4 {
-        MOD_BUS.register(this)
-//?} else {
-        /*FMLJavaModLoadingContext.get().modEventBus.register(this)
-*///?}
+        (this.instance.proxy as NeoForgePlatformProxy).container = this.container
         NeoForgeEvents.init()
+
+        this.eventBus.register(this)
     }
 
     @OnlyIn(Dist.CLIENT)
     @SubscribeEvent
     fun onClientLoading(ev: FMLClientSetupEvent) {
-        UnityTranslateClient()
-
+        NeoForge.EVENT_BUS.register(UnityTranslateNeoForgeClient)
         ConfigScreenHelper.createConfigScreen()
     }
 
     @OnlyIn(Dist.CLIENT)
     @SubscribeEvent
     fun onClientKeybinds(ev: RegisterKeyMappingsEvent) {
-        UnityTranslateClient.registerKeys()
+        for (key in UnityTranslateClient.keys) {
+            ev.register(key)
+        }
+    }
+
+    companion object {
+        // how did Forge manage to overcomplicate permissions of all things
+        val REQUEST_TRANSLATIONS_NODE = PermissionNode(UnityTranslate.MOD_ID, "request_translations", PermissionTypes.BOOLEAN, { _, _, _ -> true })
     }
 }

neoforge/src/main/kotlin/xyz/bluspring/unitytranslate/neoforge/UnityTranslateNeoForgeClient.kt

@@ -0,0 +1,40 @@
+package xyz.bluspring.unitytranslate.neoforge
+
+import net.minecraft.client.Minecraft
+import net.minecraft.commands.CommandSourceStack
+import net.neoforged.bus.api.SubscribeEvent
+import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent
+import net.neoforged.neoforge.client.event.ClientTickEvent
+import net.neoforged.neoforge.client.event.RegisterClientCommandsEvent
+import net.neoforged.neoforge.client.event.RenderGuiEvent
+import xyz.bluspring.unitytranslate.client.UnityTranslateClient
+import xyz.bluspring.unitytranslate.commands.UnityTranslateCommands
+
+object UnityTranslateNeoForgeClient {
+    val instance = UnityTranslateClient()
+
+    @SubscribeEvent
+    fun onClientTick(ev: ClientTickEvent.Post) {
+        this.instance.clientTick(Minecraft.getInstance())
+    }
+
+    @SubscribeEvent
+    fun onClientCommands(ev: RegisterClientCommandsEvent) {
+        UnityTranslateCommands.register(ev.dispatcher, "unitytranslateclient", true, CommandSourceStack::sendSystemMessage)
+    }
+
+    @SubscribeEvent
+    fun onHudRender(ev: RenderGuiEvent.Post) {
+        this.instance.clientRenderHud(ev.guiGraphics, ev.partialTick.getGameTimeDeltaPartialTick(true))
+    }
+
+    @SubscribeEvent
+    fun onClientJoin(ev: ClientPlayerNetworkEvent.LoggingIn) {
+        this.instance.clientJoinWorld()
+    }
+
+    @SubscribeEvent
+    fun onClientLeave(ev: ClientPlayerNetworkEvent.LoggingOut) {
+        this.instance.clientLeaveWorld()
+    }
+}

neoforge/src/main/resources/META-INF/services/xyz.bluspring.unitytranslate.PlatformProxy

@@ -0,0 +1 @@
+xyz.bluspring.unitytranslate.neoforge.NeoForgePlatformProxy

src/main/kotlin/xyz/bluspring/unitytranslate/client/UnityTranslateClient.kt

@@ -200,13 +200,19 @@ class UnityTranslateClient {
                 return UnityTranslate.config.client.transcriptBoxes
             }
 
-        val CONFIGURE_BOXES = (KeyMapping("unitytranslate.configure_boxes", -1, "UnityTranslate"))
-        val TOGGLE_TRANSCRIPTION = (KeyMapping("unitytranslate.toggle_transcription", -1, "UnityTranslate"))
-        val TOGGLE_BOXES = (KeyMapping("unitytranslate.toggle_boxes", -1, "UnityTranslate"))
-        val SET_SPOKEN_LANGUAGE = (KeyMapping("unitytranslate.set_spoken_language", -1, "UnityTranslate"))
-        val CLEAR_TRANSCRIPTS = (KeyMapping("unitytranslate.clear_transcripts", -1, "UnityTranslate"))
-        //val TRANSLATE_SIGN = (KeyMapping("unitytranslate.translate_sign", InputConstants.KEY_F8, "UnityTranslate"))
-        val OPEN_CONFIG_GUI = (KeyMapping("unitytranslate.open_config", InputConstants.KEY_F7, "UnityTranslate"))
+        //? if >= 1.21.9 {
+        /*private val category = KeyMapping.Category(UnityTranslate.id("main"))
+        *///?} else {
+        private val category = "UnityTranslate"
+        //?}
+
+        val CONFIGURE_BOXES = (KeyMapping("unitytranslate.configure_boxes", -1, category))
+        val TOGGLE_TRANSCRIPTION = (KeyMapping("unitytranslate.toggle_transcription", -1, category))
+        val TOGGLE_BOXES = (KeyMapping("unitytranslate.toggle_boxes", -1, category))
+        val SET_SPOKEN_LANGUAGE = (KeyMapping("unitytranslate.set_spoken_language", -1, category))
+        val CLEAR_TRANSCRIPTS = (KeyMapping("unitytranslate.clear_transcripts", -1, category))
+        //val TRANSLATE_SIGN = (KeyMapping("unitytranslate.translate_sign", InputConstants.KEY_F8, category))
+        val OPEN_CONFIG_GUI = (KeyMapping("unitytranslate.open_config", InputConstants.KEY_F7, category))
 
         @JvmStatic
         val keys: List<KeyMapping> = listOf(CONFIGURE_BOXES, TOGGLE_TRANSCRIPTION, TOGGLE_BOXES, SET_SPOKEN_LANGUAGE, CLEAR_TRANSCRIPTS, OPEN_CONFIG_GUI)