Port in Progress

Author: shartte

build.gradle

@@ -82,7 +82,8 @@ dependencies {
         throw new GradleException("Invalid runtime_itemlist_mod value: " + project.runtime_itemlist_mod)
     }
 
-    implementation("curse.maven:jade-324717:${project.jade_file_id}")
+    compileOnly("curse.maven:jade-324717:${project.jade_file_id}")
+    implementation("net.neoforged:testframework:${project.neoforge_version}")
 }
 
 processResources {
@@ -103,7 +104,13 @@ sourceSets {
 }
 
 neoForge {
-    version = project.neoforge_version
+    enable {
+        version = project.neoforge_version
+        // Disable recompilation if the "CI" environment variable is set to true. It is automatically set by GitHub Actions.
+        disableRecompilation = System.getenv("CI") == "true"
+    }
+
+    validateAccessTransformers = true
 
     mods {
         moderndynamics {
@@ -123,7 +130,7 @@ neoForge {
             server()
         }
         data {
-            data()
+            clientData()
             programArguments = [
                     '--mod', 'moderndynamics',
                     '--all',
@@ -143,7 +150,7 @@ test.dependsOn runGametest
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(25)
     }
     // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
     // if it is present.
@@ -157,11 +164,26 @@ tasks.withType(JavaCompile).configureEach {
     options.compilerArgs << "-Xmaxerrs" << "9999"
 }
 
-jar {
-    from("LICENSE") {
-        rename { "${it}_${archivesBaseName}"}
+final generateModMetadata = tasks.register('generateModMetadata', ProcessResources) {
+    group = 'build'
+    from('src/main/neoforge.mods.toml') {
+        rename '(.*)', 'META-INF/$1'
     }
+    into 'build/generated/modMetadata'
+
+    // Exposed project properties
+    Map<String, String> projectProperties = [
+            'version',
+            'neoforge_version',
+            'minecraft_version'
+    ].collectEntries { [it, project[it]] }
+
+    // Ensure the resources get re-evaluate when the version changes
+    inputs.properties projectProperties
+    expand projectProperties
 }
+sourceSets.main.resources.srcDir generateModMetadata
+neoForge.ideSyncTask generateModMetadata
 
 // configure the maven publication
 publishing {
@@ -258,9 +280,9 @@ if (System.getenv("CURSEFORGE_API_KEY") && !version.endsWith("-SNAPSHOT")) {
             changelogType = "markdown"
             delegate.changelog = changelog
 
-            addGameVersion "1.21.1"
+            addGameVersion "26.1-snapshot"
             addGameVersion "NeoForge"
-            addGameVersion "Java 21"
+            addGameVersion "Java 25"
 
             mainArtifact(jar.archiveFile) {
                 displayName = "Modern Dynamics v${version}"
@@ -284,7 +306,7 @@ if (System.getenv("MODRINTH_API_KEY") && !version.endsWith("-SNAPSHOT")) {
         delegate.changelog = changelog
         versionType = releaseChannel.toUpperCase()
         uploadFile = jar.archiveFile
-        gameVersions = ["1.21.1"]
+        gameVersions = ["26.1-snapshot-1"]
         loaders = ["neoforge"]
     }
 }

gradle.properties

@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G \
 org.gradle.caching=true
 org.gradle.parallel=true
 
-minecraft_version=1.21.1
+minecraft_version=26.1-snapshot-1
 
 # Mod Properties
 maven_group = dev.technici4n
@@ -19,25 +19,20 @@ curseforge_project = 552758
 modrinth_project = fMpvLrnF
 
 # Dependencies
-neoforge_version=21.1.169
-
-#########################################################
-# Parchment                                             #
-#########################################################
-neoForge.parchment.minecraftVersion=1.21
-neoForge.parchment.mappingsVersion=2024.07.07
+neoforge_version=26.1.0.0-alpha.2+snapshot-1
 
 # In-dev runtime mods
 rei_version=16.0.729
 
-jei_minecraft_version=1.21.1
-jei_version=19.18.3.204
+# latest jei versions: https://maven.blamejared.com/mezz/jei/jei-1.21.1-neoforge/maven-metadata.xml
+jei_version=28.0.0.6
+jei_minecraft_version=26.1-snapshot-1
 
 emi_minecraft_version=1.21.1
 emi_version=1.1.13
 
 # Set to emi, jei, or rei to pick which tooltip mod gets picked at runtime
 # for the dev environment.
-runtime_itemlist_mod=emi
+runtime_itemlist_mod=jei
 
-jade_file_id=5727431
+jade_file_id=7313008

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -4,7 +4,7 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        id 'net.neoforged.moddev' version '2.0.30-beta'
+        id 'net.neoforged.moddev' version '2.0.134'
         id 'com.diffplug.spotless' version '6.25.0'
         id 'com.matthewprenger.cursegradle' version '1.4.0'
         id "com.modrinth.minotaur" version "2.+"

…namics/client/model/PipeModelLoader.java src/disabled/PipeModelLoader.javasrc/main/java/dev/technici4n/moderndynamics/client/model/PipeModelLoader.java renamed to src/disabled/PipeModelLoader.java src/main/java/dev/technici4n/moderndynamics/client/model/PipeModelLoader.java renamed to src/disabled/PipeModelLoader.java

@@ -23,15 +23,15 @@
 import com.google.gson.JsonParseException;
 import dev.technici4n.moderndynamics.util.MdId;
 import java.util.Map;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.util.GsonHelper;
 import net.neoforged.neoforge.client.model.geometry.IGeometryLoader;
 
 public class PipeModelLoader implements IGeometryLoader<PipeUnbakedModel> {
-    public static final ResourceLocation ID = MdId.of("pipe");
-    private final Map<String, ResourceLocation> attachmentModels;
+    public static final Identifier ID = MdId.of("pipe");
+    private final Map<String, Identifier> attachmentModels;
 
-    public PipeModelLoader(Map<String, ResourceLocation> attachmentModels) {
+    public PipeModelLoader(Map<String, Identifier> attachmentModels) {
         this.attachmentModels = attachmentModels;
     }
 

…ynamics/data/PipeModelLoaderBuilder.java src/disabled/PipeModelLoaderBuilder.javasrc/main/java/dev/technici4n/moderndynamics/data/PipeModelLoaderBuilder.java renamed to src/disabled/PipeModelLoaderBuilder.java src/main/java/dev/technici4n/moderndynamics/data/PipeModelLoaderBuilder.java renamed to src/disabled/PipeModelLoaderBuilder.java

@@ -29,20 +29,20 @@
 import net.minecraft.client.resources.model.ModelBaker;
 import net.minecraft.client.resources.model.ModelState;
 import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.inventory.InventoryMenu;
 import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext;
 import net.neoforged.neoforge.client.model.geometry.IUnbakedGeometry;
 
 public class PipeUnbakedModel implements IUnbakedGeometry<PipeUnbakedModel> {
     private final Material baseTexture;
-    private final ResourceLocation connector;
-    private final ResourceLocation straightLine;
+    private final Identifier connector;
+    private final Identifier straightLine;
     private final String pipeType;
     private final boolean transparent;
-    private final Map<String, ResourceLocation> attachmentModels;
+    private final Map<String, Identifier> attachmentModels;
 
-    public PipeUnbakedModel(String pipeType, boolean transparent, Map<String, ResourceLocation> attachmentModels) {
+    public PipeUnbakedModel(String pipeType, boolean transparent, Map<String, Identifier> attachmentModels) {
         this.attachmentModels = attachmentModels;
         this.baseTexture = new Material(InventoryMenu.BLOCK_ATLAS, MdId.of("pipe/" + pipeType + "/base"));
         this.connector = MdId.of("pipe/" + pipeType + "/connector");
@@ -59,7 +59,7 @@ public boolean isTransparent() {
         return transparent;
     }
 
-    public static BakedModel[] loadRotatedModels(ResourceLocation modelId, ModelBaker baker) {
+    public static BakedModel[] loadRotatedModels(Identifier modelId, ModelBaker baker) {
         // Load side models
         BakedModel[] models = new BakedModel[6];
 
@@ -71,7 +71,7 @@ public static BakedModel[] loadRotatedModels(ResourceLocation modelId, ModelBake
     }
 
     @Override
-    public void resolveParents(Function<ResourceLocation, UnbakedModel> resolver, IGeometryBakingContext context) {
+    public void resolveParents(Function<Identifier, UnbakedModel> resolver, IGeometryBakingContext context) {
         resolver.apply(connector).resolveParents(resolver);
         resolver.apply(straightLine).resolveParents(resolver);
 

…amics/client/model/PipeUnbakedModel.java src/disabled/PipeUnbakedModel.javasrc/main/java/dev/technici4n/moderndynamics/client/model/PipeUnbakedModel.java renamed to src/disabled/PipeUnbakedModel.java src/main/java/dev/technici4n/moderndynamics/client/model/PipeUnbakedModel.java renamed to src/disabled/PipeUnbakedModel.java

@@ -31,11 +31,9 @@
 import net.minecraft.world.level.block.LayeredCauldronBlock;
 import net.minecraft.world.level.material.Fluids;
 import net.neoforged.neoforge.fluids.FluidType;
-import net.neoforged.neoforge.gametest.GameTestHolder;
-import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
+import net.neoforged.testframework.annotation.TestHolder;
 
-@GameTestHolder(MdId.MOD_ID)
-@PrefixGameTestTemplate(false)
+@TestHolder(MdId.MOD_ID)
 public class FluidTransferTest {
     @MdGameTest
     public void cauldronToCauldronExtractor(MdGameTestHelper helper) {