From 175501cb0ecd83254cb880cf479c5ef0550a2cee Mon Sep 17 00:00:00 2001 From: MasterYodA Date: Mon, 10 Oct 2022 19:48:18 -0500 Subject: [PATCH] Fix crash with the latest version of megacells --- build.gradle.kts | 6 +++--- gradle.properties | 2 +- .../aeadditions/data/provider/AEAdditionsRecipeProvider.kt | 2 +- .../kotlin/com/the9grounds/aeadditions/registries/Items.kt | 2 +- src/main/resources/META-INF/mods.toml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fb3c5bce..42982567 100644 --- 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().deobf(jeiApi)) runtimeOnly(project.the().deobf(jei)) @@ -151,8 +151,8 @@ dependencies { implementation(project.the().deobf("curse.maven:the-one-probe-245211:3965688")) compileOnly(project.the().deobf("curse.maven:ftb-teams-404468:3725501")) compileOnly(project.the().deobf("curse.maven:applied-botanics-610632:3770580")) - compileOnly(project.the().deobf("curse.maven:mega-cells-622112:3859532")) - runtimeOnly(project.the().deobf("curse.maven:mega-cells-622112:3859532")) + compileOnly(project.the().deobf("curse.maven:mega-cells-622112:4024490")) + runtimeOnly(project.the().deobf("curse.maven:mega-cells-622112:4024490")) compileOnly(project.the().deobf("curse.maven:applied-botanics-610632:3770580")) } diff --git a/gradle.properties b/gradle.properties index 630b9129..efc4e70b 100644 --- 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 index a7a14f07..f73a2eb3 100644 --- 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 index 0efa67b4..5336a6c9 100644 --- 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 index e3241a2f..3414b6bb 100644 --- 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"