1.20.5 (#7793)

.github/actions/gradle-setup/action.yml

@@ -14,7 +14,7 @@ runs:
       uses: actions/setup-java@v3
       with:
         distribution: 'microsoft'
-        java-version: '17'
+        java-version: '21'
 
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2

.github/workflows/localization.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'microsoft'
-          java-version: '17'
+          java-version: '21'
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:

build.gradle

@@ -16,6 +16,14 @@
  * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
  */
 
+buildscript {
+    dependencies {
+        // Fix for the shadow plugin using outdated ASM
+        classpath 'org.ow2.asm:asm:9.5'
+        classpath 'org.ow2.asm:asm-commons:9.5'
+    }
+}
+
 plugins {
     id "net.neoforged.gradle.userdev"
     id "maven-publish"
@@ -48,6 +56,7 @@ configurations {
 }
 
 repositories {
+    mavenLocal()
     maven {
         url "https://maven.shedaniel.me/"
         content {
@@ -155,7 +164,7 @@ dependencies {
         compileOnly("mcjty.theoneprobe:theoneprobe:${project.top_version}")
     }
 
-    if (project.runtime_curio) {
+    if (project.runtime_curio == "true") {
         runtimeOnly("top.theillusivec4.curios:curios-neoforge:${project.curios_version}")
     }
 
@@ -182,7 +191,7 @@ allprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(17)
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }
 
@@ -245,7 +254,7 @@ test {
             }.collect(java.util.stream.Collectors.joining(File.pathSeparator))
     )
 
-    def fmlVersion = "2.0.7"
+    def fmlVersion = "3.0.18"
 
     environment("fmljunit.assetsDir", new File(gradle.gradleUserHomeDir, "caches/minecraft/assets/${minecraft_version}/").absolutePath)
     environment("fmljunit.neoForgeVersion", neoforge_version)
@@ -403,6 +412,7 @@ processResources {
     inputs.property("version", project.version)
     inputs.property("minecraft_version", project.minecraft_version_range)
     inputs.property("neoforge_version", project.neoforge_version)
+    inputs.property("neoforge_version_range", project.neoforge_version_range)
     inputs.property("top_version", project.top_version)
     inputs.property("jade_version", project.jade_version_range)
 

gradle.properties

@@ -13,10 +13,10 @@ artifact_basename=appliedenergistics2-neoforge
 # Minecraft Versions                                    #
 #########################################################
 minecraft_release=1.20
-minecraft_version=1.20.4
-minecraft_version_range=[1.20.4,1.20.5)
-neoforge_version=20.4.214
-neoforge_version_range=[20.4.214,)
+minecraft_version=1.20.5
+minecraft_version_range=1.20.5
+neoforge_version=20.5.0-beta
+neoforge_version_range=[20.5.0,)
 
 #########################################################
 # Parchment                                             #
@@ -40,11 +40,11 @@ curios_version=7.1.0+1.20.4
 
 # Pick which item list mod gets picked at runtime in dev
 # Available options: emi, rei, none
-runtime_itemlist_mod=emi
+runtime_itemlist_mod=none
 
 # Set to wthit, jade, top or none to pick which tooltip mod gets picked at runtime
 # for the dev environment.
-runtime_tooltip_mod=jade
+runtime_tooltip_mod=none
 
 # Set to true to use Curio at runtime
 runtime_curio=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

libs/junit/build.gradle

@@ -10,10 +10,9 @@ dependencies {
     implementation("org.junit.jupiter:junit-jupiter-api")
     compileOnly("org.junit.platform:junit-platform-launcher")
 
-    compileOnly "net.neoforged.fancymodloader:core:2.0.7"
-    compileOnly "net.neoforged.fancymodloader:loader:2.0.7"
+    compileOnly "net.neoforged.fancymodloader:loader:3.0.18"
     compileOnly "org.mockito:mockito-junit-jupiter:5.3.1"
-    compileOnly "cpw.mods:bootstraplauncher:1.1.2"
+    compileOnly "cpw.mods:bootstraplauncher:1.1.8"
 }
 
 repositories {

libs/junit/src/main/java/net/neoforged/fmljunit/JunitLaunchHandlerService.java

@@ -30,22 +30,10 @@ protected void runService(String[] arguments, ModuleLayer gameLayer) {
                     .getMethod("bootStrap")
                     .invoke(null);
 
-            var fmlCoreLoader = gameLayer.findLoader("fml_loader");
+            var neoforge = gameLayer.findLoader("neoforge");
 
-            var modLoaderClass = fmlCoreLoader.loadClass("net.neoforged.fml.ModLoader");
-            var syncExecutor = fmlCoreLoader.loadClass("net.neoforged.fml.ModWorkManager")
-                    .getMethod("syncExecutor").invoke(null);
-            var parallelExecutor = fmlCoreLoader.loadClass("net.neoforged.fml.ModWorkManager")
-                    .getMethod("parallelExecutor").invoke(null);
-
-
-            var modLoader = modLoaderClass.getMethod("get").invoke(null);
-
-            Runnable periodicTasks = () -> {
-            };
-            callMethod(modLoaderClass, "gatherAndInitializeMods", modLoader, syncExecutor, parallelExecutor, periodicTasks);
-            callMethod(modLoaderClass, "loadMods", modLoader, syncExecutor, parallelExecutor, periodicTasks);
-            callMethod(modLoaderClass, "finishMods", modLoader, syncExecutor, parallelExecutor, periodicTasks);
+            var modLoaderClass = neoforge.loadClass("net.neoforged.neoforge.server.loading.ServerModLoader");
+            callMethod(modLoaderClass, "load", null);
 
             Consumer<Dist> extension = Launcher.INSTANCE.environment().findLaunchPlugin("runtimedistcleaner")
                     .get()
@@ -58,7 +46,7 @@ protected void runService(String[] arguments, ModuleLayer gameLayer) {
     }
 
     private void callMethod(Class<?> clazz, String name, Object instance, Object... args) {
-        for (Method method : clazz.getMethods()) {
+        for (Method method : clazz.getDeclaredMethods()) {
             if (!method.getName().equals(name)) {
                 continue;
             }
@@ -78,6 +66,7 @@ private void callMethod(Class<?> clazz, String name, Object instance, Object...
 
             if (compatible) {
                 try {
+                    method.setAccessible(true);
                     method.invoke(instance, args);
                 } catch (Exception e) {
                     throw new RuntimeException(e);

libs/markdown/src/main/java/appeng/libs/mdast/MdastCompiler.java

@@ -666,7 +666,7 @@ private void onexitlineending(MdastContext ignored, Token token) {
 
         // If we’re at a hard break, include the line ending in there.
         if (atHardBreak) {
-            if (!(context instanceof MdAstParent<?>parent)) {
+            if (!(context instanceof MdAstParent<?> parent)) {
                 throw new IllegalStateException("expected `parent`");
             }
             var tail = (MdAstNode) parent.children().get(parent.children().size() - 1);
@@ -809,7 +809,7 @@ private void onexitlabel() {
         // Assume a reference.
         inReference = true;
 
-        if (node instanceof MdAstLink link && fragment instanceof MdAstParent<?>container) {
+        if (node instanceof MdAstLink link && fragment instanceof MdAstParent<?> container) {
             for (var child : container.children()) {
                 link.addChild((MdAstNode) child);
             }

libs/markdown/src/test/java/appeng/libs/mdast/AbstractMdAstTest.java

@@ -116,7 +116,7 @@ protected static JsonElement normalizeTree(JsonElement element) {
 
     protected static MdAstNode removePosition(MdAstNode node) {
         node.position = null;
-        if (node instanceof MdAstParent<?>parent) {
+        if (node instanceof MdAstParent<?> parent) {
             for (var child : parent.children()) {
                 if (child instanceof MdAstNode childNode) {
                     removePosition(childNode);

settings.gradle

@@ -9,10 +9,9 @@ pluginManagement {
         mavenCentral()
     }
     plugins {
-        id 'net.neoforged.gradle.userdev' version '7.0.97'
-        id 'com.diffplug.spotless' version '5.12.4'
-        id 'io.github.juuxel.loom-quiltflower' version '1.10.0'
-        id 'com.github.johnrengelman.shadow' version '7.0.0'
+        id 'net.neoforged.gradle.userdev' version '7.0.105'
+        id 'com.diffplug.spotless' version '6.25.0'
+        id 'com.github.johnrengelman.shadow' version '8.1.1'
         id 'de.undercouch.download' version '5.4.0'
     }
 }

src/generated/resources/assets/ae2/lang/en_us.json

@@ -859,6 +859,7 @@
   "item.ae2.me_p2p_tunnel": "ME P2P Tunnel",
   "item.ae2.memory_card": "Memory Card",
   "item.ae2.meteorite_compass": "Meteorite Compass",
+  "item.ae2.missing_content": "Missing Content",
   "item.ae2.monitor": "Bright Illuminated Panel",
   "item.ae2.name_press": "Inscriber Name Press",
   "item.ae2.nether_quartz_axe": "Nether Quartz Axe",

src/generated/resources/assets/ae2/models/item/missing_content.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "minecraft:item/barrier"
+  }
+}

src/generated/resources/data/ae2/advancements/main/charged_quartz.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:charged_certus_quartz_crystal"
-            ]
+            "items": "ae2:charged_certus_quartz_crystal"
           }
         ]
       },
@@ -19,7 +17,8 @@
       "translate": "achievement.ae2.ChargedQuartz.desc"
     },
     "icon": {
-      "item": "ae2:charged_certus_quartz_crystal"
+      "count": 1,
+      "id": "ae2:charged_certus_quartz_crystal"
     },
     "title": {
       "translate": "achievement.ae2.ChargedQuartz"

src/generated/resources/data/ae2/advancements/main/charger.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:charger"
-            ]
+            "items": "ae2:charger"
           }
         ]
       },
@@ -19,7 +17,8 @@
       "translate": "achievement.ae2.Charger.desc"
     },
     "icon": {
-      "item": "ae2:charger"
+      "count": 1,
+      "id": "ae2:charger"
     },
     "title": {
       "translate": "achievement.ae2.Charger"

src/generated/resources/data/ae2/advancements/main/compass.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:meteorite_compass"
-            ]
+            "items": "ae2:meteorite_compass"
           }
         ]
       },
@@ -19,7 +17,8 @@
       "translate": "achievement.ae2.Compass.desc"
     },
     "icon": {
-      "item": "ae2:meteorite_compass"
+      "count": 1,
+      "id": "ae2:meteorite_compass"
     },
     "title": {
       "translate": "achievement.ae2.Compass"

src/generated/resources/data/ae2/advancements/main/controller.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:controller"
-            ]
+            "items": "ae2:controller"
           }
         ]
       },
@@ -19,7 +17,8 @@
       "translate": "achievement.ae2.Controller.desc"
     },
     "icon": {
-      "item": "ae2:controller"
+      "count": 1,
+      "id": "ae2:controller"
     },
     "title": {
       "translate": "achievement.ae2.Controller"

src/generated/resources/data/ae2/advancements/main/crafting_cpu.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:crafting_unit"
-            ]
+            "items": "ae2:crafting_unit"
           }
         ]
       },
@@ -20,7 +18,8 @@
       "translate": "achievement.ae2.CraftingCPU.desc"
     },
     "icon": {
-      "item": "ae2:64k_crafting_storage"
+      "count": 1,
+      "id": "ae2:64k_crafting_storage"
     },
     "show_toast": false,
     "title": {

src/generated/resources/data/ae2/advancements/main/crafting_terminal.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:crafting_terminal"
-            ]
+            "items": "ae2:crafting_terminal"
           }
         ]
       },
@@ -19,7 +17,8 @@
       "translate": "achievement.ae2.CraftingTerminal.desc"
     },
     "icon": {
-      "item": "ae2:crafting_terminal"
+      "count": 1,
+      "id": "ae2:crafting_terminal"
     },
     "title": {
       "translate": "achievement.ae2.CraftingTerminal"

src/generated/resources/data/ae2/advancements/main/facade.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:facade"
-            ]
+            "items": "ae2:facade"
           }
         ]
       },
@@ -19,8 +17,11 @@
       "translate": "achievement.ae2.Facade.desc"
     },
     "icon": {
-      "item": "ae2:facade",
-      "nbt": "{item:\"minecraft:stone\"}"
+      "components": {
+        "ae2:facade_item": "minecraft:stone"
+      },
+      "count": 1,
+      "id": "ae2:facade"
     },
     "title": {
       "translate": "achievement.ae2.Facade"

src/generated/resources/data/ae2/advancements/main/fluix.json

@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "ae2:fluix_crystal"
-            ]
+            "items": "ae2:fluix_crystal"
           }
         ]
       },
@@ -19,7 +17,8 @@
       "translate": "achievement.ae2.Fluix.desc"
     },
     "icon": {
-      "item": "ae2:fluix_crystal"
+      "count": 1,
+      "id": "ae2:fluix_crystal"
     },
     "title": {
       "translate": "achievement.ae2.Fluix"