Merge branch 'mc/neoforge/1.21'

Author: MichaelHillcox

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
           distribution: 'temurin'
       - name: Build with Gradle

.github/workflows/release.yml

@@ -13,13 +13,14 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
           distribution: 'temurin'
       - name: Publish & Release to Curse
         env:
           SAPS_TOKEN: ${{ secrets.SAPS_TOKEN }}
           CURSE_DEPLOY_TOKEN: ${{ secrets.CURSE_DEPLOY_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           chmod +x ./gradlew
           ./gradlew build publish publishMods --stacktrace --no-daemon

.gitignore

@@ -27,3 +27,4 @@ CREDITS-fml.txt
 classes/
 .DS_Store
 /logs/
+runs/

CHANGELOG.md

@@ -1,5 +1,5 @@
-## [84.0.0]
+## [86.0.0]
 
 ### Changed
 
-- Updated to 1.20.4
+- Updated to 1.20.6 for NeoForge

build.gradle

@@ -1,64 +1,46 @@
 plugins {
     id 'idea'
+    id 'java-library'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
-    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
-    id 'org.spongepowered.mixin' version '0.7.+'
+    id 'net.neoforged.gradle.userdev' version '7.0.142'
+    id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 version = mod_version
 group = 'pro.mikey'
 
 base {
-    archivesName = "advanced-xray-forge"
+    archivesName = "advanced-xray-neoforge"
 }
 
-mixin {
-    add sourceSets.main, 'xray.mixins.refmap.json'
-    config 'xray.mixins.json'
-}
-
-minecraft {
-    mappings channel: "official", version: minecraft_version
-
-    copyIdeResources = true
-    // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information.
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg')
 
-    runs {
-        // applies to all the run configs below
-        configureEach {
-            workingDirectory project.file('run')
+runs {
+    // applies to all the run configs below
+    configureEach {
+        systemProperty 'forge.logging.markers', 'REGISTRIES'
+        systemProperty 'forge.logging.console.level', 'debug'
 
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-            }
-        }
+        modSource project.sourceSets.main
+    }
 
-        client {
-            property 'forge.enabledGameTestNamespaces', mod_id
-        }
+    client {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
 
-        server {
-            property 'forge.enabledGameTestNamespaces', mod_id
-            args '--nogui'
-        }
+    server {
+        systemProperty 'forge.enabledGameTestNamespaces', mod_id
+        programArgument '--nogui'
+    }
 
-        gameTestServer {
-            property 'forge.enabledGameTestNamespaces', mod_id
-        }
+    gameTestServer {
+        systemProperty 'forge.enabledGameTestNamespaces', mod_id
+    }
 
-        data {
-            workingDirectory project.file('run-data')
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-        }
+    data {
+        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
@@ -67,27 +49,27 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 def replaceProperties = [
     minecraft_version: minecraft_version,
     minecraft_version_range: minecraft_version_range.replace("[%base]", minecraft_version),
-    forge_version_range: forge_version.split("\\.").first(),
+    forge_version_range: forge_version_range,
     version: version,
 ]
 
 processResources {
     inputs.properties replaceProperties
     replaceProperties.put 'project', project
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("META-INF/neoforge.mods.toml") {
         expand replaceProperties
     }
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+    implementation "net.neoforged:neoforge:${forge_version}"
+
 }
 
 repositories {
     maven {
-        url "https://maven.saps.dev/mirror"
+        url "https://maven.neoforged.net/releases"
     }
 }
 
@@ -99,27 +81,11 @@ java {
     withSourcesJar()
 }
 
-tasks.named('jar', Jar).configure {
-    manifest {
-        attributes([
-                'Specification-Title'     : "Advanced XRay",
-                'Specification-Vendor'    : "Advanced XRay Team",
-                'Specification-Version'   : '1', // We are version 1 of ourselves
-                'Implementation-Title'    : project.name,
-                'Implementation-Version'  : project.jar.archiveVersion,
-                'Implementation-Vendor'   : "Advanced XRay Team",
-                'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
-
-    finalizedBy 'reobfJar'
-}
-
 publishing {
     publications {
         mavenJava(MavenPublication) {
             artifactId = rootProject.archivesBaseName
-            artifact jar
+            from components.java
         }
     }
 
@@ -147,8 +113,8 @@ publishMods {
         accessToken = providers.environmentVariable("CURSE_DEPLOY_TOKEN")
         projectId = "${curse_id}"
         minecraftVersions.add("${minecraft_version}")
-        modLoaders.add("forge")
-        displayName = "[FORGE] [${minecraft_version}] ${project.name} ${mod_version}"
+        modLoaders.add("neoforge")
+        displayName = "[NEOFORGE] [${minecraft_version}] ${project.name} ${mod_version}"
         file = project.tasks.jar.archiveFile
     }
 

gradle.properties

@@ -2,13 +2,17 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
 
+# https://parchmentmc.org/docs/getting-started
+neogradle.subsystems.parchment.minecraftVersion=1.20.6
+neogradle.subsystems.parchment.mappingsVersion=2024.06.02
+
+
 mod_id=xray
-mod_version=84.0.0
-minecraft_version=1.20.4
-minecraft_version_range=[%base],1.20.5
+mod_version=21.0.0
+minecraft_version=1.21
+minecraft_version_range=[%base],1.21.1
 
 # Forge
-forge_version=49.0.3
+forge_version=21.0.8-beta
+forge_version_range=21.0.8-beta
 curse_id=256256
-
-loom.platform=forge

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -2,9 +2,9 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven {
-            url "https://maven.saps.dev/mirror"
+            url "https://maven.neoforged.net/releases"
         }
     }
 }
 
-rootProject.name = 'advanced-xray-forge'
+rootProject.name = 'advanced-xray-neoforge'

settings.gradle

@@ -5,14 +5,13 @@
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.EntityJoinLevelEvent;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.config.ModConfig;
+import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
 import pro.mikey.xray.keybinding.KeyBindings;
 import pro.mikey.xray.store.BlockStore;
 import pro.mikey.xray.store.DiscoveryStorage;
@@ -30,20 +29,21 @@ public class ClientController {
     public static GameBlockStore gameBlockStore = new GameBlockStore();
     public static DiscoveryStorage blockStore = new DiscoveryStorage();
 
-    public static void setup() {
-        IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
+    public static void setup(IEventBus eventBus) {
 
         eventBus.addListener(ClientController::onSetup);
         eventBus.addListener(ClientController::onLoadComplete);
         eventBus.addListener(KeyBindings::registerKeyBinding);
-        ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, Configuration.SPEC);
+
+        ModLoadingContext.get().getActiveContainer()
+                .registerConfig(ModConfig.Type.CLIENT, Configuration.SPEC);
 
         // Keybindings
-        MinecraftForge.EVENT_BUS.register(KeyBindings.class);
-        MinecraftForge.EVENT_BUS.addListener(ClientController::onGameJoin);
+        NeoForge.EVENT_BUS.addListener(KeyBindings::eventInput);
+        NeoForge.EVENT_BUS.addListener(ClientController::onGameJoin);
 
-        MinecraftForge.EVENT_BUS.addListener(Events::tickEnd);
-        MinecraftForge.EVENT_BUS.addListener(Events::onWorldRenderLast);
+        NeoForge.EVENT_BUS.addListener(Events::tickEnd);
+        NeoForge.EVENT_BUS.addListener(Events::onWorldRenderLast);
 
     }