From e3875a459cc24be195434aa850003ccb53e6ed1d Mon Sep 17 00:00:00 2001 From: MasterYodA Date: Fri, 7 Oct 2022 16:47:21 -0500 Subject: [PATCH] Fix crash with TheOneProbe fixes #103 --- build.gradle.kts | 2 +- gradle.properties | 4 ++-- .../aeadditions/integration/theoneprobe/TheOneProbeModule.kt | 3 +-- src/main/resources/META-INF/mods.toml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8b18c919..fb3c5bce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -148,7 +148,7 @@ dependencies { implementation(project.the().deobf("mekanism:Mekanism:${mekanismVersion}")) implementation(project.the().deobf("curse.maven:applied-mekanistics-574300:3797910")) implementation(project.the().deobf("curse.maven:ae2-things-forge-609977:3795991")) - implementation(project.the().deobf("curse.maven:the-one-probe-245211:3671753")) + 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")) diff --git a/gradle.properties b/gradle.properties index 71491e1f..630b9129 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ kotlinVersion=1.6.21 minecraftVersion=1.18.2 mcpChannel=official mcpMappings=1.18.2 -forgeVersion=40.1.30 -aeVersion=11.1.3 +forgeVersion=40.1.60 +aeVersion=11.5.0 wthitVersion=4.10.3 diff --git a/src/main/kotlin/com/the9grounds/aeadditions/integration/theoneprobe/TheOneProbeModule.kt b/src/main/kotlin/com/the9grounds/aeadditions/integration/theoneprobe/TheOneProbeModule.kt index 27d06fe1..cff14004 100644 --- a/src/main/kotlin/com/the9grounds/aeadditions/integration/theoneprobe/TheOneProbeModule.kt +++ b/src/main/kotlin/com/the9grounds/aeadditions/integration/theoneprobe/TheOneProbeModule.kt @@ -1,10 +1,9 @@ package com.the9grounds.aeadditions.integration.theoneprobe -import appeng.integration.IIntegrationModule import mcjty.theoneprobe.api.ITheOneProbe import java.util.function.Function -object TheOneProbeModule : IIntegrationModule, Function { +object TheOneProbeModule : Function { override fun apply(t: ITheOneProbe): Void? { t.registerProvider(BlockEntityProvider) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index f1b937f5..e3241a2f 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.1.0,)" +versionRange="[11.5.0,)" ordering="AFTER" side="BOTH" [[dependencies.ae2additions]]