Port to NeoForge 1.21.1

Author: amyavi

build.gradle.kts

@@ -1,13 +1,15 @@
 plugins {
     kotlin("jvm") version "2.1.20"
-    id("fabric-loom") version "1.10-SNAPSHOT"
+    id("dev.architectury.loom") version "1.10-SNAPSHOT"
 }
 
 version = "1.0.5-SNAPSHOT"
 group = "dev.optimistic"
 
 repositories {
     maven("https://maven.parchmentmc.org")
+    maven("https://maven.neoforged.net/releases")
+    maven("https://thedarkcolour.github.io/KotlinForForge")
 }
 
 dependencies {
@@ -17,8 +19,8 @@ dependencies {
         parchment("org.parchmentmc.data:parchment-1.21.1:2024.11.17@zip")
     })
 
-    modImplementation("net.fabricmc:fabric-loader:0.16.14")
-    modImplementation("net.fabricmc:fabric-language-kotlin:1.13.2+kotlin.2.1.20")
+    neoForge("net.neoforged:neoforge:21.1.148")
+    implementation("thedarkcolour:kotlinforforge:5.7.0")
 }
 
 java {
@@ -43,7 +45,7 @@ tasks {
     }
 
     processResources {
-        filesMatching("fabric.mod.json") {
+        filesMatching("META-INF/neoforge.mods.toml" ) {
             expand("version" to project.version)
         }
     }

gradle.properties

@@ -1,3 +1,4 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx1G
-org.gradle.parallel=true
+org.gradle.parallel=true
+loom.platform=neoforge

settings.gradle.kts

@@ -1,8 +1,9 @@
 pluginManagement {
     repositories {
         maven("https://maven.fabricmc.net/")
-        mavenCentral()
+        maven("https://maven.architectury.dev/")
         gradlePluginPortal()
+        maven("https://files.minecraftforge.net/maven/")
     }
 }
 

src/main/java/dev/optimistic/serverauth/mixin/ConnectionMixin.java

@@ -45,7 +45,7 @@ private void doSendPacket(Packet<?> packet, PacketSendListener sendListener, boo
     }
 
     // initiateServerboundConnection lambda
-    @WrapOperation(method = "method_52900", at = @At(value = "NEW", target = "(ILjava/lang/String;ILnet/minecraft/network/protocol/handshake/ClientIntent;)Lnet/minecraft/network/protocol/handshake/ClientIntentionPacket;"))
+    @WrapOperation(method = "lambda$initiateServerboundConnection$10", at = @At(value = "NEW", target = "(ILjava/lang/String;ILnet/minecraft/network/protocol/handshake/ClientIntent;)Lnet/minecraft/network/protocol/handshake/ClientIntentionPacket;"))
     private ClientIntentionPacket run$newIntentionPacket(int protocolVersion, String hostName, int port, ClientIntent intention, Operation<ClientIntentionPacket> original) {
         ClientIntentionPacket orig = original.call(protocolVersion, hostName, port, intention);
         UUID id = ClientConstants.INSTANCE.getUuid();

src/main/kotlin/dev/optimistic/serverauth/Constants.kt

@@ -1,15 +1,15 @@
 package dev.optimistic.serverauth
 
-import net.fabricmc.loader.api.FabricLoader
 import net.minecraft.network.protocol.handshake.ClientIntentionPacket
+import net.neoforged.fml.loading.FMLPaths
 import org.slf4j.LoggerFactory
 import java.security.KeyFactory
 import java.util.*
 
 object Constants {
     private const val MOD_ID = "server-auth"
     val logger = LoggerFactory.getLogger(MOD_ID)!!
-    val keyDir = FabricLoader.getInstance().configDir.resolve(MOD_ID).resolve("keys")
+    val keyDir = FMLPaths.CONFIGDIR.get().resolve(MOD_ID).resolve("keys")
     val keyFactory = KeyFactory.getInstance("RSA")
 
     private const val UNDASHED_ID_REGEX_TEMPLATE =

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

@@ -0,0 +1,47 @@
+modLoader = "lowcodefml"
+loaderVersion = "[1,)"
+license = "MIT"
+issueTrackerURL = "https://github.com/terrarium-modpack/server-auth/issues"
+
+[[mods]]
+modId = "server_auth"
+namespace = "server-auth"
+version = "${version}"
+displayName = "Server Auth"
+description = "Allows clients to authenticate with an identity they have previously agreed to use with a server."
+authors = "OptimisticDev"
+displayURL = "https://github.com/terrarium-modpack/server-auth/"
+
+[[mixins]]
+config = "server-auth.mixins.json"
+
+[[dependencies.server_auth]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21,1.22)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.server_auth]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21.1.148,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.server_auth]]
+modId = "kotlinforforge"
+type = "required"
+versionRange = "[5.7.0,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.server_auth]]
+modId = "krypton"
+type = "incompatible"
+versionRange = ""
+ordering = "NONE"
+side = "BOTH"
+
+[features.server_auth]
+javaVersion = "[21,)"