ported to 1.20.6!

Pretty much working
desht · May 2, 2024 · 5a53be1 · 5a53be1
1 parent a4615cf
commit 5a53be1
Show file tree

Hide file tree

Showing 276 changed files with 3,628 additions and 2,936 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.80'
+    id 'net.neoforged.gradle.userdev' version '7.0.118'
     id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
@@ -50,7 +50,7 @@ base {
     archivesName = "${archive_base_name}-${mod_version}+mc${minecraft_version}"
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 runs {
     // applies to all the run configs below
@@ -67,6 +67,8 @@ runs {
         // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
         systemProperty 'forge.logging.console.level', 'debug'
 
+        jvmArguments.addAll '-Xmx4G'
+
         modSource project.sourceSets.main
     }
 
@@ -99,21 +101,22 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
 dependencies {
     implementation "net.neoforged:neoforge:${neo_version}"
 
-    //implementation fg.deobf("mcjty.theoneprobe:theoneprobe:${top_version}") {
-    //    exclude group: "net.minecraftforge", module: "forge"
-    //}
-
-    compileOnly "mcjty.theoneprobe:theoneprobe:${top_version}"
+    implementation("mcjty.theoneprobe:theoneprobe:${top_version}") {
+        transitive = false
+    }
 
-    implementation "curse.maven:jade-324717:${jade_curse_id}"
+    compileOnly "curse.maven:jade-324717:${jade_curse_id}"
 
     compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api"
-    runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
+    //runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
+
 
-    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}-common:${jei_version}"
-    runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
+    compileOnly "mezz.jei:jei-1.20.4-common-api:${jei_version}"
+    compileOnly "mezz.jei:jei-1.20.4-neoforge-api:${jei_version}"
+//    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}-common:${jei_version}"
+    //runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
 
     // Locally sourced extra mods for runtime (i.e. testing) - thanks AE2 for this idea
     for (extraModJar in fileTree(dir: extraModsDir, include: '*.jar')) {
@@ -136,7 +139,7 @@ tasks.withType(ProcessResources).configureEach {
     ]
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/mods.toml']) {
+    filesMatching(['META-INF/neoforge.mods.toml']) {
         expand replaceProperties + [project: project]
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.daemon=false
 # Mod
 mod_id=modularrouters
 archive_base_name=modular-routers
-mod_version=12.3.3
+mod_version=12.4.0
 mod_name="Modular Routers"
 mod_group_id=me.desht.modularrouters
 mod_license=MIT
@@ -16,19 +16,19 @@ modrinth_project_id=EuTS81Z3
 curse_project_id=250294
 
 # Minecraft/Forge
-minecraft_version=1.20.4
-minecraft_version_range=[1.20.4,)
-neo_version=20.4.174
-neo_version_range=[20.4.167,)
+minecraft_version=1.20.6
+minecraft_version_range=[1.20.6,)
+neo_version=20.6.2-beta
+neo_version_range=[20.6.2-beta,)
 loader_version_range=[1,)
 mappings_channel=parchment
-mappings_version=1.20.4-2023.10.22
+mappings_version=1.20.6-2023.10.22
 pack_format_number=18
 neogradle.subsystems.parchment.minecraftVersion=1.20.2
 neogradle.subsystems.parchment.mappingsVersion=2023.12.10
 
 # Dependencies
 jei_version=17.3.0.48
-jade_curse_id=5109393
-top_version=1.20.4_neo-11.0.1-2
+jade_curse_id=5288504
+top_version=1.20.5_neo-11.1.1-2
 patchouli_version=1.20.4-85-NEOFORGE-SNAPSHOT
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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
diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/activator_module.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/activator_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/augment_core.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/augment_core.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/blank_module.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/blank_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:redstone"
-            ]
+            "items": "minecraft:redstone"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/blank_upgrade.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/blank_upgrade.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:lapis_lazuli"
-            ]
+            "items": "minecraft:lapis_lazuli"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/blast_upgrade.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/blast_upgrade.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_upgrade"
-            ]
+            "items": "modularrouters:blank_upgrade"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/bulk_item_filter.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/bulk_item_filter.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/...generated/resources/data/modularrouters/advancements/recipes/misc/camouflage_upgrade.json b/...generated/resources/data/modularrouters/advancements/recipes/misc/camouflage_upgrade.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_upgrade"
-            ]
+            "items": "modularrouters:blank_upgrade"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/detector_module.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/detector_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/...generated/resources/data/modularrouters/advancements/recipes/misc/distributor_module.json b/...generated/resources/data/modularrouters/advancements/recipes/misc/distributor_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/dropper_module.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/dropper_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/...ed/resources/data/modularrouters/advancements/recipes/misc/energy_distributor_module.json b/...ed/resources/data/modularrouters/advancements/recipes/misc/energy_distributor_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/...nerated/resources/data/modularrouters/advancements/recipes/misc/energy_output_module.json b/...nerated/resources/data/modularrouters/advancements/recipes/misc/energy_output_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/energy_upgrade.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/energy_upgrade.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_upgrade"
-            ]
+            "items": "modularrouters:blank_upgrade"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/extruder_module_2.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/extruder_module_2.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/...enerated/resources/data/modularrouters/advancements/recipes/misc/fast_pickup_augment.json b/...enerated/resources/data/modularrouters/advancements/recipes/misc/fast_pickup_augment.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:augment_core"
-            ]
+            "items": "modularrouters:augment_core"
           }
         ]
       },

diff --git a/...d/resources/data/modularrouters/advancements/recipes/misc/filter_round_robin_augment.json b/...d/resources/data/modularrouters/advancements/recipes/misc/filter_round_robin_augment.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:augment_core"
-            ]
+            "items": "modularrouters:augment_core"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/flinger_module.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/flinger_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/fluid_module.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/fluid_module.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_module"
-            ]
+            "items": "modularrouters:blank_module"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/fluid_module_2.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/fluid_module_2.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:fluid_module"
-            ]
+            "items": "modularrouters:fluid_module"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/fluid_module_2_x4.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/fluid_module_2_x4.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:fluid_module"
-            ]
+            "items": "modularrouters:fluid_module"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/fluid_upgrade.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/fluid_upgrade.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_upgrade"
-            ]
+            "items": "modularrouters:blank_upgrade"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/inspection_filter.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/inspection_filter.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:bulk_item_filter"
-            ]
+            "items": "modularrouters:bulk_item_filter"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/mimic_augment.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/mimic_augment.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:augment_core"
-            ]
+            "items": "modularrouters:augment_core"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/mod_filter.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/mod_filter.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:bulk_item_filter"
-            ]
+            "items": "modularrouters:bulk_item_filter"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/modular_router.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/modular_router.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:iron_ingot"
-            ]
+            "items": "minecraft:iron_ingot"
           }
         ]
       },

diff --git a/src/generated/resources/data/modularrouters/advancements/recipes/misc/muffler_upgrade.json b/src/generated/resources/data/modularrouters/advancements/recipes/misc/muffler_upgrade.json
@@ -5,9 +5,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "modularrouters:blank_upgrade"
-            ]
+            "items": "modularrouters:blank_upgrade"
           }
         ]
       },