Update to MC 1.21.1

62832 · Aug 25, 2024 · ef7549a · ef7549a
1 parent d98ded1
commit ef7549a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,7 +37,9 @@ jobs:
           modrinth-id: jjuIRIVr
           modrinth-token: ${{ secrets.MODRINTH_API_KEY }}
 
-          game-versions: 1.21
+          game-versions: |
+            1.21
+            1.21.1
           loaders: neoforge
           dependencies: |
             ae2(required){curseforge:223794}{modrinth:XxWD5pD3}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,7 +38,8 @@ neoForge {
     version = libs.versions.neoforge.get()
 
     parchment {
-        minecraftVersion = libs.versions.minecraft.get()
+        // minecraftVersion = libs.versions.minecraft.get()
+        minecraftVersion = "1.21"
         mappingsVersion = libs.versions.parchment.get()
     }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
     plugins {
-        id("net.neoforged.moddev") version "0.1.112"
-        id("net.neoforged.moddev.repositories") version "0.1.112"
+        id("net.neoforged.moddev") version "1.0.11"
+        id("net.neoforged.moddev.repositories") version "1.0.11"
         id("com.diffplug.spotless") version "6.25.0"
     }
 }
@@ -41,22 +41,22 @@ run {
 
         versionCatalogs {
             create("libs") {
-                val mc = "1.21"
+                val mc = "1.21.1"
                 version("minecraft", mc)
 
                 val nf = mc.substringAfter('.')
-                version("neoforge", "${nf + (if (!nf.contains('.')) ".0" else "")}.87-beta")
-                version("parchment", "2024.06.23")
+                version("neoforge", "${nf + (if (!nf.contains('.')) ".0" else "")}.26")
+                version("parchment", "2024.07.28")
 
-                version("ae2", "19.0.12-alpha")
+                version("ae2", "19.0.21-beta")
                 library("ae2", "appeng", "appliedenergistics2").versionRef("ae2")
 
-                version("ae2wtlib", "19.1.0-alpha.1")
+                version("ae2wtlib", "19.1.3-beta")
                 library("ae2wtlib", "de.mari_023", "ae2wtlib").versionRef("ae2wtlib")
                 library("ae2wtlibapi", "de.mari_023", "ae2wtlib_api").versionRef("ae2wtlib")
 
-                library("appmek", "maven.modrinth", "applied-mekanistics").version("yh6fz02r")
-                library("mekanism", "mekanism", "Mekanism").version("$mc-10.6.5.52")
+                library("appmek", "maven.modrinth", "applied-mekanistics").version("GCScYwwI")
+                library("mekanism", "mekanism", "Mekanism").version("$mc-10.7.4.60")
             }
         }
     }

diff --git a/src/main/java/gripe/_90/megacells/integration/appmek/RadioactiveCellInventory.java b/src/main/java/gripe/_90/megacells/integration/appmek/RadioactiveCellInventory.java
@@ -16,7 +16,7 @@
 import me.ramidzkh.mekae2.ae2.MekanismKey;
 import me.ramidzkh.mekae2.ae2.MekanismKeyType;
 import mekanism.api.chemical.attribute.ChemicalAttributeValidator;
-import mekanism.common.registries.MekanismGases;
+import mekanism.common.registries.MekanismChemicals;
 
 import gripe._90.megacells.definition.MEGAComponents;
 import gripe._90.megacells.definition.MEGAConfig;
@@ -89,7 +89,7 @@ public double getIdleDrain() {
 
     public boolean isBlackListed(AEKey what) {
         return !(what instanceof MekanismKey key)
-                || (key.getStack().getChemical() == MekanismGases.SPENT_NUCLEAR_WASTE.get()
+                || (key.getStack().getChemical() == MekanismChemicals.SPENT_NUCLEAR_WASTE.get()
                         ? !MEGAConfig.CONFIG.isSpentWasteAllowed()
                         : ChemicalAttributeValidator.DEFAULT.process(key.getStack()));
     }