Add mekanistics support

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    alias libs.plugins.neogradle
+    alias libs.plugins.modDevGradle
     alias libs.plugins.machete
     alias libs.plugins.spotless
 }
@@ -19,7 +19,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 apply from: "$rootDir/gradle/scripts/dependencies.gradle"
 apply from: "$rootDir/gradle/scripts/jars.gradle"
-apply from: "$rootDir/gradle/scripts/neogradle.gradle"
+apply from: "$rootDir/gradle/scripts/moddevgradle.gradle"
 apply from: "$rootDir/gradle/scripts/publishing.gradle"
 apply from: "$rootDir/gradle/scripts/repositories.gradle"
 apply from: "$rootDir/gradle/scripts/resources.gradle"

gradle/scripts/dependencies.gradle

@@ -17,8 +17,6 @@ java {
 }
 
 dependencies {
-    implementation(forge.neoForge)
-
     // Registrate
     api("com.tterrag.registrate:Registrate:${forge.versions.registrate.get()}")
     jarJar("com.tterrag.registrate:Registrate:${forge.versions.registrate.get()}")
@@ -48,6 +46,11 @@ dependencies {
     implementation("curse.maven:glodium-957920:5821676")
     implementation("curse.maven:applied-flux-965012:5946853")
 
+    // applied mekanistics
+    implementation("curse.maven:mekanism-268560:6018306")
+    implementation("curse.maven:applied-mekanistics-574300:5978711")
+
+
     // lombok
     compileOnly 'org.projectlombok:lombok:1.18.30'
     annotationProcessor 'org.projectlombok:lombok:1.18.30'

gradle/scripts/jars.gradle

@@ -2,15 +2,4 @@ java {
     withSourcesJar()
 }
 
-// Enable the Jar-in-Jar system for your mod
-jarJar.enable()
-
-tasks.jar {
-    archiveClassifier = "slim"
-}
-
-tasks.jarJar {
-    archiveClassifier.convention(null)
-}
-
 archivesBaseName = "${project.name}-${libs.versions.minecraft.get()}"

gradle/scripts/moddevgradle.gradle

@@ -0,0 +1,77 @@
+neoForge {
+    version = forge.versions.neoForge.get()
+
+    parchment {
+        minecraftVersion = "1.21.1"
+        mappingsVersion = libs.versions.parchment.get()
+    }
+
+    // This line is optional. Access Transformers are automatically detected
+    accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
+
+    runs {
+        // applies to all the run configs below
+        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 = org.slf4j.event.Level.DEBUG
+        }
+
+        client {
+            client()
+
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        }
+
+        server {
+            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 {
+            type = "gameTestServer"
+            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        }
+
+        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.
+            programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
+        }
+    }
+
+    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)
+        }
+    }
+}
+
+// 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/scripts/publishing.gradle

@@ -1,6 +1,5 @@
 artifacts {
     archives tasks.jar
-    archives tasks.jarJar
     archives tasks.sourcesJar
 }
 

settings.gradle

@@ -21,22 +21,22 @@ dependencyResolutionManagement {
 
         // Mod Dependencies Versions
         // Common
-        def jeiVersion = "19.8.5.118"
+        def jeiVersion = "19.17.0.193"
         def reiVersion = "16.0.744"
         def ae2Version = "19.0.8-alpha"
 
         // NeoForge
-        def neoForgeVersion = "21.1.15"
-        def registrateForgeVersion = "MC1.21-1.3.0+50"
+        def neoForgeVersion = "21.1.79"
+        def registrateForgeVersion = "MC1.21-1.3.0+55"
         def jadeForgeVersion = "15.3.4+neoforge"
         def topForgeVersion = "1.20.4_neo-11.0.0-1"
 
         // Libs
-        def parchmentVersion = "2024.07.28" // https://parchmentmc.org/docs/getting-started
+        def parchmentVersion = "2024.11.17" // https://parchmentmc.org/docs/getting-started
         def shadowVersion = "7.1.2"
         def macheteVersion = "1.+"
         def spotlessVersion = "7.0.0.BETA1"
-        def neogradleVersion = "7.0.158"
+        def modDevGradleVersion = "2.0.34-beta"
 
         forge {
             version("forgeShortVersion", neoForgeVersion)
@@ -70,8 +70,8 @@ dependencyResolutionManagement {
             version("parchment", parchmentVersion)
             version("minecraft", minecraftVersion)
 
-            def neogradle = version("neogradle", neogradleVersion)
-            plugin("neogradle", "net.neoforged.gradle.userdev").versionRef(neogradle)
+            def modDevGradle = version("modDevGradle", modDevGradleVersion)
+            plugin("modDevGradle", "net.neoforged.moddev").versionRef(modDevGradle)
 
             def shadow = version("shadow", shadowVersion)
             plugin("shadow", "com.github.johnrengelman.shadow").versionRef(shadow)

src/generated/resources/assets/bigger_ae2/lang/en_ud.json

@@ -5,17 +5,20 @@
   "block.bigger_ae2.256_core_crafting_accelerator": "ɹoʇɐɹǝןǝɔɔⱯ buıʇɟɐɹƆ ǝɹoƆ 9ϛᄅ",
   "block.bigger_ae2.4_core_crafting_accelerator": "ɹoʇɐɹǝןǝɔɔⱯ buıʇɟɐɹƆ ǝɹoƆ ㄣ",
   "block.bigger_ae2.64_core_crafting_accelerator": "ɹoʇɐɹǝןǝɔɔⱯ buıʇɟɐɹƆ ǝɹoƆ ㄣ9",
+  "item.bigger_ae2.advanced_chemical_cell_housing": "buısnoH ןןǝƆ ןɐɔıɯǝɥƆ pǝɔuɐʌpⱯ",
   "item.bigger_ae2.advanced_fluid_cell_housing": "buısnoH ןןǝƆ pınןℲ pǝɔuɐʌpⱯ",
   "item.bigger_ae2.advanced_flux_cell_housing": "buısnoH ןןǝƆ xnןℲ pǝɔuɐʌpⱯ",
   "item.bigger_ae2.advanced_item_cell_housing": "buısnoH ןןǝƆ ɯǝʇI pǝɔuɐʌpⱯ",
   "item.bigger_ae2.digital_singularity_cell_component": "ʇuǝuodɯoƆ ןןǝƆ ʎʇıɹɐןnbuıS ןɐʇıbıᗡ",
+  "item.bigger_ae2.digital_singularity_chemical_storage_cell": "ןןǝƆ ǝbɐɹoʇS ןɐɔıɯǝɥƆ ʎʇıɹɐןnbuıS ןɐʇıbıᗡ",
   "item.bigger_ae2.digital_singularity_fluid_storage_cell": "ןןǝƆ ǝbɐɹoʇS pınןℲ ʎʇıɹɐןnbuıS ןɐʇıbıᗡ",
   "item.bigger_ae2.digital_singularity_flux_storage_cell": "ןןǝƆ ǝbɐɹoʇS xnןℲ ʎʇıɹɐןnbuıS ןɐʇıbıᗡ",
   "item.bigger_ae2.digital_singularity_item_storage_cell": "ןןǝƆ ǝbɐɹoʇS ɯǝʇI ʎʇıɹɐןnbuıS ןɐʇıbıᗡ",
   "item.bigger_ae2.quantum_cell_component": "ʇuǝuodɯoƆ ןןǝƆ ɯnʇuɐnὉ",
   "item.bigger_ae2.quantum_fluid_storage_cell": "ןןǝƆ ǝbɐɹoʇS pınןℲ ɯnʇuɐnὉ",
   "item.bigger_ae2.quantum_flux_storage_cell": "ןןǝƆ ǝbɐɹoʇS xnןℲ ɯnʇuɐnὉ",
   "item.bigger_ae2.quantum_item_storage_cell": "ןןǝƆ ǝbɐɹoʇS ɯǝʇI ɯnʇuɐnὉ",
+  "item.bigger_ae2.quatum_chemical_storage_cell": "ןןǝƆ ǝbɐɹoʇS ןɐɔıɯǝɥƆ ɯnʇɐnὉ",
   "itemGroup.bigger_ae2.bigger_ae2": "ᄅǝⱯ ɹǝbbıᗺ",
   "tooltip.bigger_ae2.contains": "%s :suıɐʇuoƆ",
   "tooltip.bigger_ae2.empty": "ʎʇdɯƎ",

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

@@ -5,17 +5,20 @@
   "block.bigger_ae2.256_core_crafting_accelerator": "256 Core Crafting Accelerator",
   "block.bigger_ae2.4_core_crafting_accelerator": "4 Core Crafting Accelerator",
   "block.bigger_ae2.64_core_crafting_accelerator": "64 Core Crafting Accelerator",
+  "item.bigger_ae2.advanced_chemical_cell_housing": "Advanced Chemical Cell Housing",
   "item.bigger_ae2.advanced_fluid_cell_housing": "Advanced Fluid Cell Housing",
   "item.bigger_ae2.advanced_flux_cell_housing": "Advanced Flux Cell Housing",
   "item.bigger_ae2.advanced_item_cell_housing": "Advanced Item Cell Housing",
   "item.bigger_ae2.digital_singularity_cell_component": "Digital Singularity Cell Component",
+  "item.bigger_ae2.digital_singularity_chemical_storage_cell": "Digital Singularity Chemical Storage Cell",
   "item.bigger_ae2.digital_singularity_fluid_storage_cell": "Digital Singularity Fluid Storage Cell",
   "item.bigger_ae2.digital_singularity_flux_storage_cell": "Digital Singularity Flux Storage Cell",
   "item.bigger_ae2.digital_singularity_item_storage_cell": "Digital Singularity Item Storage Cell",
   "item.bigger_ae2.quantum_cell_component": "Quantum Cell Component",
   "item.bigger_ae2.quantum_fluid_storage_cell": "Quantum Fluid Storage Cell",
   "item.bigger_ae2.quantum_flux_storage_cell": "Quantum Flux Storage Cell",
   "item.bigger_ae2.quantum_item_storage_cell": "Quantum Item Storage Cell",
+  "item.bigger_ae2.quatum_chemical_storage_cell": "Quatum Chemical Storage Cell",
   "itemGroup.bigger_ae2.bigger_ae2": "Bigger Ae2",
   "tooltip.bigger_ae2.contains": "Contains: %s",
   "tooltip.bigger_ae2.empty": "Empty",

src/generated/resources/assets/bigger_ae2/models/item/advanced_chemical_cell_housing.json

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

src/generated/resources/assets/bigger_ae2/models/item/digital_singularity_chemical_storage_cell.json

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

src/generated/resources/assets/bigger_ae2/models/item/quatum_chemical_storage_cell.json

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

src/generated/resources/data/bigger_ae2/advancement/recipes/misc/advanced_chemical_cell_housing.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bigger_ae2:advanced_chemical_cell_housing"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "hasitem": {
+      "conditions": {
+        "items": [
+          {
+            "items": "#c:ingots/refined_obsidian"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "hasitem"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bigger_ae2:advanced_chemical_cell_housing"
+    ]
+  }
+}

src/generated/resources/data/bigger_ae2/advancement/recipes/misc/digital_singularity_chemical_storage_cell.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "bigger_ae2:digital_singularity_chemical_storage_cell"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "hasitem": {
+      "conditions": {
+        "items": [
+          {
+            "items": "bigger_ae2:advanced_chemical_cell_housing"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "hasitem"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "bigger_ae2:digital_singularity_chemical_storage_cell"
+    ]
+  }
+}