changed to 1.21.1 neoforge

Author: RealAntEngineer

build.gradle

@@ -1,18 +1,15 @@
-buildscript {
-    repositories {
-        maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
-    }
-    dependencies {
-        classpath "org.spongepowered:mixingradle:${mixingradle_version}"
-    }
-}
 plugins {
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '6.+'
-    id 'org.spongepowered.mixin' version '0.7.+'
+    id 'java-library'
+    id 'org.jreleaser' version '1.17.0'
+    id 'net.neoforged.moddev' version '2.0.78'
+
 }
 
+
+import org.slf4j.event.Level
+
 import java.nio.file.Files
 import java.nio.file.Paths
 
@@ -38,66 +35,95 @@ base {
 }
 
 // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
-minecraft {
+// Specify the version of NeoForge to use.
+neoForge {
 
-    mappings channel: mapping_channel, version: minecraft_version
+    version = project.neo_version
 
-    copyIdeResources = true
+    parchment {
+        mappingsVersion = project.parchment_mappings_version
+        minecraftVersion = project.parchment_minecraft_version
+    }
+    configurations {
+        runtimeClasspath.extendsFrom localRuntime
+    }
 
-    accessTransformer = file('src/main/resources/META-INF/accesstransformers.cfg')
+// This line is optional. Access Transformers are automatically detected
+// accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
 
+// Default run configurations.
+// These can be tweaked, removed, or duplicated as needed.
     runs {
-        // applies to all the run configs below
-        configureEach {
-            workingDirectory project.file('run')
-            arg '-mixin.config=formicapi.mixins.json'
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            //property 'forge.logging.console.level', 'debug'
-
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                }
-            }
-        }
-
         client {
+            client()
+
             // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            property 'forge.enabledGameTestNamespaces', mod_id
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
         }
 
         server {
-            property 'forge.enabledGameTestNamespaces', mod_id
-            args '--nogui'
+            server()
+            programArgument '--nogui'
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
         }
 
-
+        // This run config launches GameTestServer and runs all registered gametests, then exits.
+        // By default, the server will crash when no gametests are provided.
+        // The gametest system is also enabled by default for other run configs under the /test command.
         gameTestServer {
-            property 'forge.enabledGameTestNamespaces', mod_id
+            type = "gameTestServer"
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
         }
+
         data {
-            // example of overriding the workingDirectory set in configureEach above
-            workingDirectory project.file('run-data')
+            data()
+
+            // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
+            // gameDirectory = project.file('run-data')
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+        }
+
+        // applies to all the run configs above
+        configureEach {
+            // Recommended logging data for a userdev environment
+            // The markers can be added/remove as needed separated by commas.
+            // "SCAN": For mods scan.
+            // "REGISTRIES": For firing of registry events.
+            // "REGISTRYDUMP": For getting the contents of all registries.
+            systemProperty 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            // You can set various levels here.
+            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
+            logLevel = Level.WARN
+
+
+        }
+    }
+    mods {
+        // define mod <-> source bindings
+        // these are used to tell the game which sources are for which mod
+        // mostly optional in a single mod project
+        // but multi mod projects should define one per mod
+        "${mod_id}" {
+            sourceSet(sourceSets.main)
         }
     }
 }
 
+
+
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
     maven { url = "https://maven.createmod.net" } // Create, Ponder, Flywheel
-    maven { url = "https://maven.tterrag.com" } // Registrate
+    maven { url = "https://mvn.devos.one/snapshots" } // Registrate
 
     //JEI
 
@@ -129,29 +155,17 @@ repositories {
 }
 
 dependencies {
-    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    //TODO make sure we only depend on catnip
-    implementation(fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false })
-    implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}"))
-    compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${minecraft_version}:${flywheel_version}"))
-    runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}"))
-    implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}"))
-    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:0.4.1"))
-    implementation("io.github.llamalad7:mixinextras-forge:0.4.1")
-
-    //JEI
-    // compile against the JEI API but do not include it at runtime
-    compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"))
-    compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}"))
-    // at runtime, use the full JEI jar for Forge
-    runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}"))
-
-    //curios
+    implementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim"){ transitive = false }
+    implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
+    compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_version}")
+    runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}")
+    implementation("com.tterrag.registrate:Registrate:${registrate_version}")
 
-    runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}")
-    compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api")
+    // JEI
+    compileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
+    compileOnly("mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}")
+    runtimeOnly("mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}")
 
-    annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
 
     //unit test tool
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.0'
@@ -160,13 +174,7 @@ dependencies {
     implementation("org.knowm.xchart:xchart:3.2.2")
 
 }
-mixin {
-    add sourceSets.main, 'formicapi.refmap.json'
-    config 'formicapi.mixins.json'
 
-    //debug.verbose = true
-    //debug.export = true
-}
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 // When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments.
@@ -214,29 +222,76 @@ tasks.test {
 //     dependsOn 'reobfJar'
 // }
 
-// Example configuration to allow publishing using the maven-publish plugin
 publishing {
     publications {
-        register('mavenJava', MavenPublication) {
-            artifactId = 'formic-api-'+ minecraft_version // <-- valid Maven ID (no spaces)
-            groupId = 'com.rae.formicapi' // <-- choose your group
-            version = mod_version // <-- version of your mod/library
-
-            artifact jar
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }
+}
 
+//the jreleaser doesn't work
+//todo find why and fix it
+jreleaser {
+    project {
+        name = 'FormicAPI'
+        version = mod_version
+        description = 'A Minecraft modding API for the Engineer Colony'
+        authors = ['RealAntEngineer']
+        license = 'MIT'
+        // Project homepage
+        java {
+            version = '17'
         }
+        website = 'https://github.com/RealAntEngineer/FormicAPI'
     }
-    repositories {//TODO use a more practical
+
+    deploy {
         maven {
-            url = uri("https://maven.pkg.github.com/RealAntEngineer/Formic_API")
-            credentials {
-                username = System.getProperty("USERNAME")
-                password = System.getProperty("TOKEN")
+            mavenCentral {
+                main {
+                    active = 'ALWAYS'
+                    url = 'https://s01.oss.sonatype.org/services/staging/deploy/maven2/' // new token-based endpoint
+
+                    username = System.getProperty('SONATYPE_USERNAME')
+                    password = System.getProperty('SONATYPE_TOKEN')
+                }
             }
         }
     }
-}
+    signing {
+        //active = 'ALWAYS'
+        //armored = true
+        //mode = 'MEMORY'
+        secretKey = System.getProperty('SONATYPE_USERNAME')
+        passphrase = System.getProperty('SONATYPE_TOKEN')
+    }
 
+    distributions {
+        main {
+            artifact {
+                path = "$buildDir/libs/formic-api-${minecraft_version}.jar"
+            }
+            extraProperties.put('groupId', 'io.github.realantengineer.formicapi')
+            extraProperties.put('artifactId', "formic-api-${minecraft_version}")
+            extraProperties.put('version', mod_version)
+        }
+    }
+    /*release {
+        github {
+            active = 'NEVER'
+        }
+    }*/
+}
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-}
+}
+
+
+// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior.
+idea {
+    module {
+        downloadSources = true
+        downloadJavadoc = true
+    }
+}

gradle.properties

@@ -2,16 +2,24 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
-minecraft_version=1.20.1
-
-minecraft_version_range=[1.20.1,1.21)
-# The Forge version must agree with the Minecraft version to get a valid artifact
-forge_version=47.3.0
-forge_version_range=[47,)
-
-loader_version_range=[47,)
-
-mapping_channel=official
+#read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment
+# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
+parchment_minecraft_version=1.21.1
+parchment_mappings_version=2024.11.17
+# Environment Properties
+# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
+# The Minecraft version must agree with the Neo version to get a valid artifact
+minecraft_version=1.21.1
+# The Minecraft version range can use any release version of Minecraft as bounds.
+# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
+# as they do not follow standard versioning conventions.
+minecraft_version_range=[1.21.1, 1.22)
+# The Neo version must agree with the Minecraft version to get a valid artifact
+neo_version=21.1.138
+# The Neo version range can use any version of Neo as bounds
+neo_version_range=[21.1.0,)
+# The loader version range can only use the major version of FML as bounds
+loader_version_range=[4,)
 
 mixingradle_version=0.7-SNAPSHOT
 mixin_version=0.8.5
@@ -22,11 +30,12 @@ mod_license=MIT
 
 mod_version=1.2
 
-create_version = 6.0.2-50
-flywheel_version = 1.0.1
-ponder_version = 1.0.51
-registrate_version = MC1.20-1.3.3
-jei_version=15.19.5.99
+create_version = 6.0.4-55
+flywheel_version = 1.0.2
+ponder_version = 1.0.46
+registrate_version = MC1.21-1.3.0+62
+jei_version=19.10.0.126
+
 
 curios_version = 5.2.0-beta.3+1.20.1
 

settings.gradle

@@ -1,19 +1,11 @@
 pluginManagement {
     repositories {
+        mavenLocal()
         gradlePluginPortal()
-        maven {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
-        }
-        maven {
-            name = "ParchmentMC"
-            url = "https://maven.parchmentmc.org"
-        }
-        gradlePluginPortal()
-
+        maven { url = 'https://maven.neoforged.net/releases' }
     }
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }

src/main/java/com/rae/formicapi/FormicApiLang.java

@@ -12,7 +12,8 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.FluidStack;
+
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/rae/formicapi/config/FormicAPICfgClient.java

@@ -8,7 +8,7 @@
 public class FormicAPICfgClient extends ConfigBase {
 
 
-    public final CROWNSUnits units = nested(0, CROWNSUnits::new, Comments.units);
+    public final FormicAPIUnits units = nested(0, FormicAPIUnits::new, Comments.units);
     @Override
     public @NotNull String getName() {
         return FormicAPI.MODID +".client";