Fixed events... again. why, Forge, why.

Author: BluSpring

CHANGELOG.md

@@ -1,2 +1 @@
-- Improve Simple Voice Chat group handling
-- Add permission for disabling player transcripts (`unitytranslate.request_translations`, default `true`). 
+- Fixed permissions on Forge

gradle.properties

@@ -14,7 +14,7 @@ dgt.loom.mappings=mojmap
 dgt.loom.mappings.flavor=parchment
 
 # Mod Properties
-	mod.version = 0.1.6-beta
+	mod.version = 0.1.7-beta
 	mod.group = xyz.bluspring
 	mod.name = UnityTranslate
 	mod.id = unitytranslate

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

@@ -0,0 +1,30 @@
+package xyz.bluspring.unitytranslate.neoforge
+
+//#if NEOFORGE
+//$$ import net.neoforged.bus.api.SubscribeEvent
+//$$ import net.neoforged.neoforge.common.NeoForge
+//$$ import net.neoforged.neoforge.server.permission.events.PermissionGatherEvent
+//#elseif FORGE
+//$$ import net.minecraftforge.common.MinecraftForge
+//$$ import net.minecraftforge.eventbus.api.SubscribeEvent
+//$$ import net.minecraftforge.server.permission.events.PermissionGatherEvent
+//#endif
+
+//#if FORGE-LIKE
+//$$ import xyz.bluspring.unitytranslate.UnityTranslate
+
+//$$ object NeoForgeEvents {
+//$$     fun init() {
+            //#if FORGE
+            //$$ MinecraftForge.EVENT_BUS.register(this)
+            //#elseif NEOFORGE
+            //$$ NeoForge.EVENT_BUS.register(this)
+            //#endif
+//$$     }
+//$$
+//$$     @SubscribeEvent
+//$$     fun onPermissionsGather(event: PermissionGatherEvent.Nodes) {
+//$$         UnityTranslate.instance.proxy.registerPermissions(event)
+//$$     }
+//$$ }
+//#endif

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

@@ -20,9 +20,6 @@ package xyz.bluspring.unitytranslate.neoforge
 //$$ import net.neoforged.fml.ModLoadingContext
 //$$ import net.neoforged.fml.common.Mod
 //$$ import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent
-
-//$$ import net.neoforged.neoforge.common.NeoForge
-//$$ import net.neoforged.neoforge.server.permission.events.PermissionGatherEvent
 //$$ import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent
 //#endif
 
@@ -39,11 +36,10 @@ package xyz.bluspring.unitytranslate.neoforge
 //$$         UnityTranslate()
 //#if MC >= 1.20.4
 //$$         MOD_BUS.register(this)
-//$$         NeoForge.EVENT_BUS.register(this::onPermissionsGather)
 //#else
 //$$         FMLJavaModLoadingContext.get().modEventBus.register(this)
-//$$         MinecraftForge.EVENT_BUS.register(this::onPermissionsGather)
 //#endif
+//$$         NeoForgeEvents.init()
 //$$     }
 //$$
 //$$     @OnlyIn(Dist.CLIENT)
@@ -54,10 +50,6 @@ package xyz.bluspring.unitytranslate.neoforge
 //$$         ConfigScreenHelper.createConfigScreen()
 //$$     }
 //$$
-//$$     fun onPermissionsGather(event: PermissionGatherEvent.Nodes) {
-//$$         UnityTranslate.instance.proxy.registerPermissions(event)
-//$$     }
-//$$
 //$$     @OnlyIn(Dist.CLIENT)
 //$$     @SubscribeEvent
 //$$     fun onClientKeybinds(ev: RegisterKeyMappingsEvent) {