Add NeoForge support

Author: DJtheRedstoner

build.gradle.kts

@@ -61,6 +61,7 @@ dependencies {
         platform.isFabric -> "fabric"
         platform.isLegacyForge -> "forge-legacy"
         platform.isForge -> "forge-latest"
+        platform.isNeoForge -> "neoforge"
         else -> error("Unable to determine DevAuth platform")
     }
 
@@ -69,15 +70,7 @@ dependencies {
 
 val downloadContainer by tasks.registering(DownloadContainerTask::class) {
     containerFile = layout.buildDirectory.file("essential-container.jar")
-    version = when (project.platform.mcVersion) {
-        12105 -> "1.4.2+fabric-1.21.5"
-        12104 -> "1.4.2+fabric-1.21.4"
-        12103 -> "1.4.2+fabric-1.21.3"
-        12102 -> "1.4.2+fabric-1.21.2"
-        12101 -> "1.4.2+fabric-1.21.1"
-        12100 -> "1.4.2+fabric-1.21"
-        else -> "1.4.2"
-    }
+    version = "1.4.3"
     platform = "${project.platform.loaderStr}_${project.platform.mcVersionStr}"
 }
 
@@ -90,6 +83,16 @@ tasks.processResources {
     filesMatching("gg/essential/partnermod/loader/version.txt") {
         filter { _ -> project.version.toString() }
     }
+
+    if (platform.isNeoForge) {
+        if (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.jar {

buildSrc/build.gradle.kts

@@ -12,9 +12,9 @@ repositories {
 
 dependencies {
     implementation("com.google.code.gson:gson:2.11.0")
-    implementation("gg.essential:essential-gradle-toolkit:0.6.5")
+    implementation("gg.essential:essential-gradle-toolkit:0.6.7")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
-    implementation("gg.essential:architectury-loom:1.7.27")
+    implementation("gg.essential:architectury-loom:1.7.30")
 }
 
 kotlin {

root.gradle.kts

@@ -5,11 +5,22 @@ plugins {
 preprocess {
     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")
@@ -34,11 +45,22 @@ preprocess {
     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)
+    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)
     forge12002.link(fabric12002)

settings.gradle.kts

@@ -40,11 +40,22 @@ listOf(
     "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.21.5-fabric",
+    "1.21.5-forge",
+    "1.21.5-neoforge",
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {

src/main/java/gg/essential/partnermod/EssentialPartner.java

@@ -41,6 +41,12 @@
 //$$ import net.minecraft.util.SharedConstants;
 //#endif
 
+//#if NEOFORGE
+//$$ import net.neoforged.neoforge.common.NeoForge;
+//$$ import net.neoforged.bus.api.SubscribeEvent;
+//$$ import net.neoforged.neoforge.client.event.ScreenEvent;
+//#endif
+
 //#if FORGE
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -77,14 +83,20 @@ public class EssentialPartner {
         "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5"
     ));
 
+    private static final Set<String> NEOFORGE_SUPPORTED_VERSIONS = new HashSet<>(Arrays.asList(
+        "1.20.4", "1.20.6",
+        "1.21.1", "1.21.3", "1.21.4", "1.21.5"
+    ));
+
     private static final Set<String> FORGE_SUPPORTED_VERSIONS = new HashSet<>(Arrays.asList(
         "1.8.9",
         "1.12.2",
         "1.16.5",
         "1.17.1",
         "1.18.2",
         "1.19.2", "1.19.3", "1.19.4",
-        "1.20.1", "1.20.2", "1.20.4"
+        "1.20.1", "1.20.2", "1.20.4", "1.20.6",
+        "1.21.1", "1.21.3", "1.21.4", "1.21.5"
     ));
 
     private static final Set<String> MAIN_MENU_BUTTONS = new HashSet<>(Collections.singletonList("menu.multiplayer"));
@@ -121,14 +133,19 @@ public EssentialPartner() {
 
         //#if FABRIC
         //$$ if (!FABRIC_SUPPORTED_VERSIONS.contains(version)) {
+        //#elseif NEOFORGE
+        //$$ if (!NEOFORGE_SUPPORTED_VERSIONS.contains(version)) {
         //#else
         if (!FORGE_SUPPORTED_VERSIONS.contains(version)) {
         //#endif
             LOGGER.info("Minecraft version {} is not supported by Essential, disabling Partner Mod", version);
             return;
         }
 
-        //#if FORGE
+        //#if NEOFORGE
+        //$$ NeoForge.EVENT_BUS.register(this);
+        //$$ NeoForge.EVENT_BUS.register(ModalManager.INSTANCE);
+        //#elseif FORGE
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(ModalManager.INSTANCE);
         //#else
@@ -268,7 +285,7 @@ private boolean overlaps(int x1, int y1, int w1, int h1, GuiButton button) {
         return x1 < x2 + w2 && x2 < x1 + w1 && y1 < y2 + h2 && y2 < y1 + h1;
     }
 
-    //#if FORGE
+    //#if FORGELIKE
     @SubscribeEvent
     public void screenInitEvent(
         //#if MC>=11900

src/main/java/gg/essential/partnermod/ModLoaderUtil.java

@@ -13,6 +13,8 @@
 
 //#if FABRIC
 //$$ import net.fabricmc.loader.api.FabricLoader;
+//#elseif NEOFORGE
+//$$ import net.neoforged.fml.loading.LoadingModList;
 //#else
 //#if MC>=11400
 //$$ import net.minecraftforge.fml.loading.LoadingModList;

src/main/java/gg/essential/partnermod/modal/ModalManager.java

@@ -20,6 +20,9 @@
 //$$ import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 //$$ import net.fabricmc.fabric.api.client.screen.v1.ScreenKeyboardEvents;
 //$$ import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
+//#elseif NEOFORGE
+//$$ import net.neoforged.bus.api.SubscribeEvent;
+//$$ import net.neoforged.neoforge.client.event.ScreenEvent;
 //#else
 //#if MC>=11800
 //$$ import net.minecraftforge.client.event.ScreenEvent;

src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,10 @@
+modLoader="javafml"
+loaderVersion="[1,)"
+license="All rights reserved"
+
+[[mods]]
+modId="essential_partner_mod"
+version="${file.jarVersion}"
+displayName="Essential Partner Mod Integrations"
+displayURL="https://essential.gg/"
+description="Enhance your Minecraft with one simple mod. Host worlds for free, chat with friends, and so much more!"