Fix crash with the latest version of megacells

the9grounds · Oct 11, 2022 · 175501c · 175501c
1 parent 194e5c0
commit 175501c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -138,7 +138,7 @@ dependencies {
     "minecraft"("net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}")
     val jeiApi = project.dependencies.create(group = "mezz.jei", name = "jei-${minecraftVersion}", version = jeiVersion, classifier = "api")
     val jei = project.dependencies.create(group = "mezz.jei", name = "jei-${minecraftVersion}", version = jeiVersion)
-    val ae2 = project.dependencies.create(group = "appeng", name = "appliedenergistics2", version = aeVersion)
+    val ae2 = project.dependencies.create(group = "appeng", name = "appliedenergistics2-forge", version = aeVersion)
 
     compileOnly(project.the<DependencyManagementExtension>().deobf(jeiApi))
     runtimeOnly(project.the<DependencyManagementExtension>().deobf(jei))
@@ -151,8 +151,8 @@ dependencies {
     implementation(project.the<DependencyManagementExtension>().deobf("curse.maven:the-one-probe-245211:3965688"))
     compileOnly(project.the<DependencyManagementExtension>().deobf("curse.maven:ftb-teams-404468:3725501"))
     compileOnly(project.the<DependencyManagementExtension>().deobf("curse.maven:applied-botanics-610632:3770580"))
-    compileOnly(project.the<DependencyManagementExtension>().deobf("curse.maven:mega-cells-622112:3859532"))
-    runtimeOnly(project.the<DependencyManagementExtension>().deobf("curse.maven:mega-cells-622112:3859532"))
+    compileOnly(project.the<DependencyManagementExtension>().deobf("curse.maven:mega-cells-622112:4024490"))
+    runtimeOnly(project.the<DependencyManagementExtension>().deobf("curse.maven:mega-cells-622112:4024490"))
     compileOnly(project.the<DependencyManagementExtension>().deobf("curse.maven:applied-botanics-610632:3770580"))
 
 }

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraftVersion=1.18.2
 mcpChannel=official
 mcpMappings=1.18.2
 forgeVersion=40.1.60
-aeVersion=11.5.0
+aeVersion=11.6.1-beta
 
 wthitVersion=4.10.3
 

diff --git a/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAdditionsRecipeProvider.kt b/src/main/kotlin/com/the9grounds/aeadditions/data/provider/AEAdditionsRecipeProvider.kt
@@ -8,6 +8,7 @@ import com.the9grounds.aeadditions.item.storage.DiskCellWithoutMod
 import com.the9grounds.aeadditions.item.storage.StorageCell
 import com.the9grounds.aeadditions.registries.Blocks
 import com.the9grounds.aeadditions.registries.Items
+import gripe._90.megacells.item.MEGAItems
 import io.github.projectet.ae2things.item.AETItems
 import me.ramidzkh.mekae2.AMItems
 import net.minecraft.data.DataGenerator
@@ -23,7 +24,6 @@ import net.minecraft.world.level.ItemLike
 import net.minecraftforge.common.Tags
 import net.minecraftforge.common.crafting.ConditionalRecipe
 import net.minecraftforge.common.crafting.conditions.IConditionBuilder
-import ninety.megacells.item.MEGAItems
 import java.util.function.Consumer
 
 class AEAdditionsRecipeProvider(generatorIn: DataGenerator) : RecipeProvider(generatorIn), IConditionBuilder {

diff --git a/src/main/kotlin/com/the9grounds/aeadditions/registries/Items.kt b/src/main/kotlin/com/the9grounds/aeadditions/registries/Items.kt
@@ -10,6 +10,7 @@ import com.the9grounds.aeadditions.item.storage.DiskCell
 import com.the9grounds.aeadditions.item.storage.DiskCellWithoutMod
 import com.the9grounds.aeadditions.item.storage.StorageCell
 import com.the9grounds.aeadditions.item.storage.SuperStorageCell
+import gripe._90.megacells.item.MEGAItems
 import io.github.projectet.ae2things.item.AETItems
 import me.ramidzkh.mekae2.AMItems
 import me.ramidzkh.mekae2.ae2.MekanismKeyType
@@ -18,7 +19,6 @@ import net.minecraft.world.item.Item
 import net.minecraft.world.item.Rarity
 import net.minecraft.world.level.ItemLike
 import net.minecraftforge.registries.ForgeRegistries
-import ninety.megacells.item.MEGAItems
 import thedarkcolour.kotlinforforge.forge.KDeferredRegister
 import thedarkcolour.kotlinforforge.forge.registerObject
 import kotlin.properties.ReadOnlyProperty

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -31,7 +31,7 @@ side="BOTH"
 [[dependencies.ae2additions]]
 modId="ae2"
 mandatory=true
-versionRange="[11.5.0,)"
+versionRange="[11.6.1-beta,)"
 ordering="AFTER"
 side="BOTH"
 [[dependencies.ae2additions]]
@@ -56,7 +56,7 @@ side="BOTH"
 modId="megacells"
 mandatory=false
 ordering="AFTER"
-versionRange="[1.1.1,)"
+versionRange="[1.4.0,)"
 side="BOTH"
 [[dependencies.ae2additions]]
 modId="ftbteams"