Version 1.3.6

Author: EssentialGGBot

api/api/api.api

@@ -416,13 +416,13 @@ public abstract interface class gg/essential/api/utils/GuiUtil {
 	public static final field Companion Lgg/essential/api/utils/GuiUtil$Companion;
 	public abstract fun getGuiScale ()I
 	public abstract fun getGuiScale (I)I
-	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
+	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public static fun getOpenedScreen ()Lnet/minecraft/client/gui/screens/Screen;
-	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
+	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public static fun open (Lnet/minecraft/client/gui/screens/Screen;)V
-	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
+	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public abstract fun openScreen (Lnet/minecraft/client/gui/screens/Screen;)V
-	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
+	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public abstract fun openedScreen ()Lnet/minecraft/client/gui/screens/Screen;
 	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
 	public static fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
@@ -443,9 +443,9 @@ public abstract interface class gg/essential/api/utils/GuiUtil {
 }
 
 public final class gg/essential/api/utils/GuiUtil$Companion {
-	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
+	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screens/Screen;
-	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
+	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public final fun open (Lnet/minecraft/client/gui/screens/Screen;)V
 	@1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
 	public final fun getOpenedScreen ()Lnet/minecraft/client/gui/screen/Screen;
@@ -511,7 +511,7 @@ public final class gg/essential/api/utils/KotlinAdapter : net/minecraftforge/fml
 }
 
 public abstract interface class gg/essential/api/utils/MinecraftUtils {
-	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge
+	@1.17.1-forge,1.18.2-forge,1.19.2-forge,1.19.3-forge,1.19.4-forge,1.20.1-forge,1.20.2-forge,1.20.4-forge,1.20.4-neoforge,1.20.6-forge,1.20.6-neoforge,1.21.1-forge,1.21.1-neoforge,1.21.3-forge,1.21.3-neoforge,1.21.4-forge,1.21.4-neoforge,1.21.5-forge,1.21.5-neoforge
 	public abstract fun getResourceImage (Lnet/minecraft/resources/ResourceLocation;)Ljava/awt/image/BufferedImage;
 	@1.16.2-fabric,1.17.1-fabric,1.18.1-fabric,1.18.2-fabric,1.19-fabric,1.19.2-fabric,1.19.3-fabric,1.19.4-fabric,1.20-fabric,1.20.1-fabric,1.20.2-fabric,1.20.4-fabric,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.21.5-fabric
 	public abstract fun getResourceImage (Lnet/minecraft/util/Identifier;)Ljava/awt/image/BufferedImage;
@@ -521,7 +521,7 @@ public abstract interface class gg/essential/api/utils/MinecraftUtils {
 	public abstract fun isHypixel ()Z
 	public abstract fun sendChatMessageAndFormat (Ljava/lang/String;)V
 	public abstract fun sendChatMessageAndFormat (Ljava/lang/String;[Ljava/lang/Object;)V
-	@1.12.2-forge,1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.17.1-forge,1.18.1-fabric,1.18.2-fabric,1.18.2-forge,1.19-fabric,1.19.2-fabric,1.19.2-forge,1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.6-fabric,1.21.1-fabric,1.21.3-fabric,1.21.4-fabric,1.8.9-forge
+	@1.12.2-forge,1.16.2-fabric,1.16.2-forge,1.17.1-fabric,1.17.1-forge,1.18.1-fabric,1.18.2-fabric,1.18.2-forge,1.19-fabric,1.19.2-fabric,1.19.2-forge,1.19.3-fabric,1.19.3-forge,1.19.4-fabric,1.19.4-forge,1.20-fabric,1.20.1-fabric,1.20.1-forge,1.20.2-fabric,1.20.2-forge,1.20.4-fabric,1.20.4-forge,1.20.4-neoforge,1.20.6-fabric,1.20.6-forge,1.20.6-neoforge,1.21.1-fabric,1.21.1-forge,1.21.1-neoforge,1.21.3-fabric,1.21.3-forge,1.21.3-neoforge,1.21.4-fabric,1.21.4-forge,1.21.4-neoforge,1.8.9-forge
 	public abstract fun sendMessage (Lgg/essential/universal/wrappers/message/UTextComponent;)V
 	public abstract fun sendMessage (Ljava/lang/String;)V
 	public abstract fun sendMessage (Ljava/lang/String;Ljava/lang/String;)V

build-logic/build.gradle.kts

@@ -37,7 +37,7 @@ dependencies {
     implementation ("com.google.guava:guava:30.1.1-jre")
 
     implementation("gg.essential:essential-gradle-toolkit:0.6.7")
-    implementation("gg.essential.loom:gg.essential.loom.gradle.plugin:1.7.27") // TODO remove once EGT has updated
+    implementation("gg.essential.loom:gg.essential.loom.gradle.plugin:1.7.30") // TODO remove once EGT has updated
 }
 
 gradlePlugin {

build-logic/src/main/kotlin/essential/preprocessor.kt

@@ -20,11 +20,22 @@ fun Project.configurePreprocessTree(versions: File) {
     configure<RootPreprocessExtension> {
         strictExtraMappings.set(true)
 
+        val neoForge12105 = createNode("1.21.5-neoforge", 12105, "srg")
+        val forge12105 = createNode("1.21.5-forge", 12105, "srg")
         val fabric12105 = createNode("1.21.5-fabric", 12105, "yarn")
+        val neoForge12104 = createNode("1.21.4-neoforge", 12104, "srg")
+        val forge12104 = createNode("1.21.4-forge", 12104, "srg")
         val fabric12104 = createNode("1.21.4-fabric", 12104, "yarn")
+        val neoForge12103 = createNode("1.21.3-neoforge", 12103, "srg")
+        val forge12103 = createNode("1.21.3-forge", 12103, "srg")
         val fabric12103 = createNode("1.21.3-fabric", 12103, "yarn")
+        val neoForge12101 = createNode("1.21.1-neoforge", 12101, "srg")
+        val forge12101 = createNode("1.21.1-forge", 12101, "srg")
         val fabric12101 = createNode("1.21.1-fabric", 12101, "yarn")
+        val neoForge12006 = createNode("1.20.6-neoforge", 12006, "srg")
+        val forge12006 = createNode("1.20.6-forge", 12006, "srg")
         val fabric12006 = createNode("1.20.6-fabric", 12006, "yarn")
+        val neoForge12004 = createNode("1.20.4-neoforge", 12004, "srg")
         val forge12004 = createNode("1.20.4-forge", 12004, "srg")
         val fabric12004 = createNode("1.20.4-fabric", 12004, "yarn")
         val forge12002 = createNode("1.20.2-forge", 12002, "srg")
@@ -49,11 +60,22 @@ fun Project.configurePreprocessTree(versions: File) {
         val forge11202 = createNode("1.12.2-forge", 11202, "srg")
         val forge10809 = createNode("1.8.9-forge", 10809, "srg")
 
+        neoForge12105.link(fabric12105)
+        forge12105.link(fabric12105)
         fabric12105.link(fabric12104)
+        neoForge12104.link(fabric12104)
+        forge12104.link(fabric12104)
         fabric12104.link(fabric12103, versions.resolve("1.21.4-1.21.3.txt"))
+        neoForge12103.link(fabric12103)
+        forge12103.link(fabric12103)
         fabric12103.link(fabric12101)
+        neoForge12101.link(fabric12101)
+        forge12101.link(fabric12101)
         fabric12101.link(fabric12006)
+        neoForge12006.link(fabric12006)
+        forge12006.link(fabric12006)
         fabric12006.link(fabric12004)
+        neoForge12004.link(fabric12004)
         forge12004.link(fabric12004)
         fabric12004.link(fabric12002, versions.resolve("1.20.4-1.20.2.txt"))
         forge12002.link(fabric12002)

build-logic/src/main/kotlin/gg/essential/gradle/MixinPlugin.kt

@@ -17,6 +17,7 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.*
+import org.gradle.language.jvm.tasks.ProcessResources
 
 open class MixinPlugin : Plugin<Project> {
     override fun apply(project: Project) {
@@ -27,6 +28,17 @@ open class MixinPlugin : Plugin<Project> {
 }
 
 private fun Project.configureMixin(platform: Platform) {
+    // For versions which use mojmap at runtime, there is no need for refmap files and therefore the mixin AP
+    val usesMojmapAtRuntime = platform.isNeoForge || (platform.isForge && platform.mcVersion >= 12006)
+    if (usesMojmapAtRuntime) {
+        tasks.named<ProcessResources>("processResources") {
+            filesMatching("mixins.*.json") {
+                filter { line -> if ("\"refmap\":" in line) "" else line }
+            }
+        }
+        return
+    }
+
     configureLoomMixin()
 
     if (!platform.isFabric) {

build-logic/src/main/kotlin/gg/essential/gradle/util/KotlinVersion.kt

@@ -38,7 +38,7 @@ val Platform.kotlinVersion
         when {
             isModLauncher ->
                 when (mcVersion) {
-                    12004, 12002, 12001, 11904, 11903 -> KotlinVersion.kotlinForForge4
+                    12105, 12104, 12103, 12101, 12006, 12004, 12002, 12001, 11904, 11903 -> KotlinVersion.kotlinForForge4
                     11902, 11802 -> KotlinVersion.kotlinForForge3
                     11701 -> KotlinVersion.kotlinForForge2
                     11602 -> KotlinVersion.kotlinForForge1

build.gradle.kts

@@ -225,6 +225,13 @@ tasks.processResources {
     filesMatching("assets/essential/version.txt") {
         expand(mapOf("version" to project.version))
     }
+    if (platform.isNeoForge && platform.mcVersion < 12005) {
+        // NeoForge still uses the old mods.toml name until 1.20.5
+        filesMatching("META-INF/neoforge.mods.toml") {
+            name = "mods.toml"
+        }
+        exclude("META-INF/mods.toml")
+    }
 }
 
 tasks.test {

changelog/release-1.3.6.md

@@ -0,0 +1,6 @@
+Title: NeoForge Support
+Summary: Essential now supports NeoForge and latest versions of Forge
+
+## New Versions
+- Added support for NeoForge 1.21.5, 1.21.4, 1.21.3, 1.21.1, 1.20.6 and 1.20.4
+- Added support for Forge 1.21.5, 1.21.4, 1.21.3, 1.21.1 and 1.20.6

elementa/statev2/build.gradle.kts

@@ -24,6 +24,13 @@ universalLibs()
 dependencies {
     implementation(kotlin("stdlib-jdk8", KotlinVersion.minimal.stdlib))
     implementation(project(":feature-flags"))
+
+    testImplementation(kotlin("test"))
+    testImplementation(libs.elementa)
+}
+
+tasks.test {
+    useJUnitPlatform()
 }
 
 // We need to use the compatibility mode on old versions because we used to use the old Kotlin defaults for those