Migrate forge -> neoforge

build.gradle

@@ -49,7 +49,7 @@ subprojects {
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         mappings loom.officialMojangMappings()
-        modLocalRuntime "com.ptsmods:devlogin:${rootProject.devlogin_version}"
+//        modLocalRuntime "com.ptsmods:devlogin:${rootProject.devlogin_version}"
     }
 }
 
@@ -75,6 +75,7 @@ allprojects {
         // See https://docs.gradle.org/current/userguide/declaring_repositories.html
         // for more information about repositories.
         mavenCentral()
+        maven { url "https://maven.neoforged.net/releases/" }
         maven { url "https://maven.shedaniel.me/" }
         maven { url "https://maven.terraformersmc.com/" }
     }

fabric/src/main/java/net/xolt/freecam/fabric/mixins/LevelRendererMixin.java → common/src/main/java/net/xolt/freecam/mixins/LevelRendererMixin.java

@@ -1,4 +1,4 @@
-package net.xolt.freecam.fabric.mixins;
+package net.xolt.freecam.mixins;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Camera;

common/src/main/resources/freecam-common.mixins.json

@@ -7,20 +7,21 @@
     "BlockStateBaseMixin",
     "BubbleColumnAmbientSoundHandlerMixin",
     "CameraMixin",
-    "ConnectionMixin",
-    "LocalPlayerMixin",
-    "MultiPlayerGameModeMixin",
     "ClientPacketListenerMixin",
+    "ConnectionMixin",
     "EntityMixin",
     "EntityRenderDispatcherMixin",
     "EntityRendererMixin",
-    "OptionsMixin",
     "GameRendererMixin",
-    "ItemInHandRendererMixin",
     "GuiMixin",
+    "ItemInHandRendererMixin",
+    "LevelRendererMixin",
     "LightTextureMixin",
     "LivingEntityMixin",
-    "MinecraftMixin"
+    "LocalPlayerMixin",
+    "MinecraftMixin",
+    "MultiPlayerGameModeMixin",
+    "OptionsMixin"
   ],
   "injectors": {
     "defaultRequire": 1

fabric/src/main/resources/freecam-fabric.mixins.json

@@ -4,7 +4,6 @@
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "client": [
-    "LevelRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1

gradle.properties

@@ -10,13 +10,13 @@ licence=MIT
 homepage_url=https://www.curseforge.com/minecraft/mc-mods/free-cam
 source_code_url=https://github.com/hashalite/Freecam
 issue_tracker_url=https://github.com/hashalite/Freecam/issues
-enabled_platforms=fabric,forge
+enabled_platforms=fabric,neoforge
 build_variants=normal,modrinth
 
 # Check versions on:
 # https://discord.architectury.dev
 # https://modmuss50.me/fabric.html
-# https://files.minecraftforge.net
+# https://projects.neoforged.net/neoforged/neoforge
 # Forge dependencies use maven's version range spec:
 # https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
 minecraft_version=1.20.4
@@ -26,10 +26,10 @@ fabric_api_version=0.91.2+1.20.4
 fabric_loader_req=>=0.12.11
 fabric_mc_req=~1.20.4
 
-forge_version=1.20.4-49.0.9
-forge_mc_req=[1.20.4,)
-forge_loader_req=[49,)
-forge_req=[49,)
+neoforge_version=20.4.60-beta
+neoforge_mc_req=[1.20.4,)
+neoforge_loader_req=[1,)
+neoforge_req=[20,)
 
 # Other dependencies
 # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu

metadata/build.gradle

@@ -44,9 +44,9 @@ platforms.each { platform -> variants.each { variant ->
                 issue_tracker_url: project.issue_tracker_url,
                 fabric_loader_req: project.fabric_loader_req,
                 fabric_mc_req: project.fabric_mc_req,
-                forge_mc_req: project.forge_mc_req,
-                forge_loader_req: project.forge_loader_req,
-                forge_req: project.forge_req,
+                neoforge_mc_req: project.neoforge_mc_req,
+                neoforge_loader_req: project.neoforge_loader_req,
+                neoforge_req: project.neoforge_req,
         )
 
         def overrides = new TreeMap()

metadata/src/forge/META-INF/mods.toml → metadata/src/neoforge/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "${forge_loader_req}"
+loaderVersion = "${neoforge_loader_req}"
 issueTrackerURL = "${issue_tracker_url}"
 license = "${licence}"
 
@@ -15,16 +15,22 @@ description = '''
 ${description}
 '''
 
+[[mixins]]
+config = "freecam-common.mixins.json"
+
+[[mixins]]
+config = "freecam-neoforge.mixins.json"
+
 [[dependencies.${mod_id}]]
-modId = "forge"
-mandatory = true
-versionRange = "${forge_req}"
+modId = "neoforge"
+versionRange = "${neoforge_req}"
+type = "required"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
-mandatory = true
-versionRange = "${forge_mc_req}"
+versionRange = "${neoforge_mc_req}"
+type = "required"
 ordering = "NONE"
-side = "CLIENT"
+side = "CLIENT"

forge/build.gradle → neoforge/build.gradle

@@ -1,6 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.fabricmc.loom.task.RemapJarTask
-import net.fabricmc.loom.util.aw2at.Aw2At
 
 plugins {
     id "com.github.johnrengelman.shadow"
@@ -10,43 +9,25 @@ def variants = rootProject.build_variants.split(',')
 
 architectury {
     platformSetupLoomIde()
-    forge()
-}
-
-loom {
-    forge {
-        convertAccessWideners = true
-        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
-
-        mixinConfig "freecam-common.mixins.json"
-        mixinConfig "freecam-forge.mixins.json"
-    }
-}
-
-afterEvaluate {
-    // FIXME: arch-loom only does this for tasks.remapJarTask,
-    //      meaning our variant tasks don't get AccessTransformers.
-    tasks.withType(RemapJarTask).each {
-        Aw2At.setup(project, it)
-    }
+    neoForge()
 }
 
 configurations {
     common
     shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
+    developmentNeoForge.extendsFrom common
 }
 
 dependencies {
-    forge "net.minecraftforge:forge:${rootProject.forge_version}"
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
 
-    modApi "me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_version}"
-    include "me.shedaniel.cloth:cloth-config-forge:${rootProject.cloth_version}"
+    modApi "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_version}"
+    include "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_version}"
 
     common project(path: ":common", configuration: "namedElements")
-    shadowCommon project(path: ":common", configuration: "transformProductionForge")
+    shadowCommon project(path: ":common", configuration: "transformProductionNeoForge")
 
     shadowCommon project(":variant:api")
 }
@@ -62,14 +43,14 @@ variants.each { variant ->
     def shadowConfig = configurations.create("${variant}Shadow")
 
     // Add a dependency on metadata
-    def metadata = dependencies.project(path: ":metadata", configuration: "forge${variant == "normal" ? "" : variant.capitalize()}")
+    def metadata = dependencies.project(path: ":metadata", configuration: "neoforge${variant == "normal" ? "" : variant.capitalize()}")
     dependencies.add(set.implementationConfigurationName, metadata)
     dependencies.add(shadowConfig.name, metadata)
 
     // Add a dependency on variant's service provider
     def spi = dependencies.project(path: ":variant:${variant}", configuration: "namedElements")
     dependencies.add(set.implementationConfigurationName, spi)
-    dependencies.add(shadowConfig.name, dependencies.project(path: ":variant:${variant}", configuration: "transformProductionForge"))
+    dependencies.add(shadowConfig.name, dependencies.project(path: ":variant:${variant}", configuration: "transformProductionNeoForge"))
 
     // Configure/create a run config
     def run
@@ -131,6 +112,10 @@ variants.each { variant ->
         inputFile = shadowJarTask.archiveFile
         dependsOn shadowJarTask
         archiveAppendix = appendix
+
+        // Transform the AccessWidener into an AccessTransformer
+        atAccessWideners.add loom.accessWidenerPath.get().asFile.name
+
         // Output in root `build/libs`
         destinationDirectory = rootProject.layout.buildDirectory.dir "libs"
     }

neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

forge/src/main/java/net/xolt/freecam/forge/FreecamForge.java → neoforge/src/main/java/net/xolt/freecam/forge/FreecamForge.java

@@ -2,22 +2,23 @@
 
 import me.shedaniel.autoconfig.AutoConfig;
 import net.minecraft.client.Minecraft;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ConfigScreenHandler;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.EventPriority;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.EventPriority;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.common.Mod.EventBusSubscriber.Bus;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.neoforge.client.ConfigScreenHandler;
+import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
+import net.neoforged.neoforge.event.TickEvent;
 import net.xolt.freecam.Freecam;
 import net.xolt.freecam.config.ModBindings;
 import net.xolt.freecam.config.ModConfig;
 
 @Mod(Freecam.MOD_ID)
 @Mod.EventBusSubscriber(bus = Bus.MOD, value = Dist.CLIENT)
+@SuppressWarnings("unused")
 public class FreecamForge {
 
     @SubscribeEvent

forge/src/main/resources/freecam-forge.mixins.json → neoforge/src/main/resources/freecam-neoforge.mixins.json

@@ -4,7 +4,6 @@
   "compatibilityLevel": "JAVA_17",
   "minVersion": "0.8",
   "client": [
-    "LevelRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1

settings.gradle

@@ -9,7 +9,7 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
+include("neoforge")
 include("metadata")
 include("variant", "variant:api", "variant:normal", "variant:modrinth")