Update to support EventBus7

build.gradle.kts

@@ -108,13 +108,14 @@ repositories {
     mavenCentral()
     maven("https://maven.neoforged.net/releases")
     maven("https://maven.minecraftforge.net/")
+    maven("https://libraries.minecraft.net")
 }
 
 dependencies {
+
     // fakecraft (fake class/field/method signatures used in place of the full Minecraft/Forge dependencies)
     "fakecraftCompileOnly"(libs.joml)
     "fakecraftCompileOnly"(libs.forge.core)
-    "fakecraftCompileOnly"(libs.forge.bus)
     "fakecraftCompileOnly"(libs.night.config)
 
     // kfflib/common
@@ -131,6 +132,8 @@ dependencies {
 
     // kffmod/forge
     "modForgeCompileOnly"(libs.log4j.core)
+    "modForgeCompileOnly"(sourceSets["langForge"].output)
+
 
     sourceSets.forEach { sourceSet ->
         val name = sourceSet.name
@@ -153,6 +156,8 @@ dependencies {
         if (name.contains("lang")) {
             dependencies.add(compileOnly, libs.asm)
             dependencies.add(compileOnly, libs.log4j.core)
+            dependencies.add(compileOnly, libs.secure.jar)
+            dependencies.add(compileOnly, libs.forge.bus)
         }
     }
 }

gradle.properties

@@ -12,5 +12,5 @@ min_mc_version = 1.20.6
 unsupported_mc_version = 1.22
 
 # KOTLIN FOR FORGE VERSION
-kff_version=5.9.0
-kff_max_version=6.0.0
+kff_version=6.0.0
+kff_max_version=7.0.0

gradle/libs.versions.toml

@@ -3,19 +3,21 @@
 # https://github.com/JetBrains/kotlin
 # https://github.com/Kotlin/kotlinx.coroutines
 # https://github.com/Kotlin/kotlinx.serialization
-kotlin = "2.1.21"
+kotlin = "2.2.0"
 coroutines = "1.10.2"
 serialization = "1.8.1"
 
 # Misc
-neoforge = "21.6.11-beta"
+neoforge = "21.7.20-beta"
 neoforge-fml = "[3,5)"
 neoforge-bus = "8.0.5"
 neoforge-mergetool = "2.0.7"
-forge = "1.21-51.0.8"
+forge = "1.21.7-57.0.2"
 forge-mergetool = "1.0"
-forge-spi = "7.1.4"
-forge-bus = "6.2.6"
+unsafe = "0.9.2"
+forge-spi = "7.1.5"
+secureJar = "3.0.9"
+forge-bus = "7.0-beta.10"
 joml = "1.10.5"
 log4j = "2.22.1"
 asm = "9.5"
@@ -44,9 +46,11 @@ neoforge-mergetool = { module = "net.neoforged:mergetool", version.ref = "neofor
 forge-fml = { module = "net.minecraftforge:javafmllanguage", version.ref = "forge" }
 forge-bus = { module = "net.minecraftforge:eventbus", version.ref = "forge-bus" }
 forge-loader = { module = "net.minecraftforge:fmlloader", version.ref = "forge" }
+forge-unsafe = { module = "net.minecraftforge:unsafe", version.ref = "unsafe" }
 forge-core = { module = "net.minecraftforge:fmlcore", version.ref = "forge" }
 forge-mergetool = { module = "net.minecraftforge:mergetool-api", version.ref = "forge-mergetool" }
 forge-spi = { module = "net.minecraftforge:forgespi", version.ref = "forge-spi" }
+secure-jar = { module = "cpw.mods:securejarhandler", version.ref = "secureJar"}
 joml = { module = "org.joml:joml", version.ref = "joml" }
 asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
 log4j-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
@@ -56,7 +60,7 @@ night-config = { module = "com.electronwill.night-config:core", version.ref = "n
 # Kotlin Reflect, Stdlib, Coroutines, Serialization JSON
 kotlin = ["kotlin-reflect", "kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8", "kotlinx-coroutines-core", "kotlinx-coroutines-core-jvm", "kotlinx-coroutines-jdk8", "kotlinx-serialization-core", "kotlinx-serialization-json"]
 neoforge = ["neoforge", "neoforge-bus", "neoforge-fml", "neoforge-mergetool"]
-forge = ["forge-core", "forge-fml", "forge-loader", "forge-mergetool", "forge-spi", "forge-bus"]
+forge = ["forge-core", "forge-fml", "forge-loader", "forge-mergetool", "forge-spi", "forge-bus", "forge-unsafe"]
 
 [plugins]
 ideaext = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "ideaext" }

src/fakecraft/java/net/minecraftforge/common/MinecraftForge.java

@@ -1,7 +1,7 @@
 package net.minecraftforge.common;
 
-import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.eventbus.api.bus.BusGroup;
 
 public class MinecraftForge {
-    public static final IEventBus EVENT_BUS = null;
+    public static final BusGroup EVENT_BUS = null;
 }

src/kfflang/forge/kotlin/thedarkcolour/common/KotlinMod.kt

@@ -0,0 +1,51 @@
+package thedarkcolour.common
+
+import net.minecraftforge.api.distmarker.Dist
+import net.minecraftforge.eventbus.api.bus.BusGroup
+import net.minecraftforge.fml.Bindings
+import net.minecraftforge.fml.common.Mod
+import thedarkcolour.kotlinforforge.KotlinModLoadingContext
+import java.util.function.Supplier
+
+/**
+ *  This defines a Kotlin Mod Class
+ *  Any class found with this annotation applied will be loaded as a Mod. The instance that is loaded will
+ *  represent the mod to other Mods in the system. It will be sent various subclasses of [ModLifecycleEvent]
+ *  at pre-defined times during the loading of the game.
+ *  @author Chidoziealways
+ *  @since 6.0.0
+ */
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS)
+public annotation class KotlinMod(val value: String) {
+
+    public annotation class KotlinEventBusSubscriber(
+        val value: Array<Dist> = [Dist.CLIENT, Dist.DEDICATED_SERVER],
+        val modId: String = "",
+        val bus: KotlinBus = KotlinBus.BOTH
+    ) {
+    }
+}
+
+public enum class KotlinBus(public val eventBusSupplier: Supplier<BusGroup?>) {
+    /**
+     * The main BusGroup that most game events are fired on.
+     */
+    FORGE(Bindings.getForgeBus()),
+
+    /**
+     * The Mod-Specific event BusGroup, usually for mod lifecycle events.
+     * @see KotlinModLoadingContext.getKBusGroup()
+     */
+    MOD({ KotlinModLoadingContext.get().getKBusGroup() }),
+
+    /**
+     * Both the [FORGE] and [MOD] buses. This is slower to register events in your class but
+     * allows you to listen to events from different BusGroup types without needing separate classes annotated
+     * with [thedarkcolour.common.KotlinMod.KotlinEventBusSubscriber].
+     */
+    BOTH({null});
+
+    public fun bus(): Supplier<BusGroup?> = eventBusSupplier
+}