From d98ded187a88f2dc0129ee304fd667b7dbcea0fe Mon Sep 17 00:00:00 2001 From: Mari023 <38946771+Mari023@users.noreply.github.com> Date: Mon, 29 Jul 2024 00:01:53 +0200 Subject: [PATCH] Update to new AE2WTLib API (#135) --- build.gradle.kts | 3 ++- settings.gradle.kts | 5 ++++- src/main/java/gripe/_90/megacells/MEGACells.java | 2 +- src/main/java/gripe/_90/megacells/integration/Addons.java | 2 +- .../_90/megacells/integration/ae2wt/AE2WTIntegration.java | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c9bdc765..71b11375 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,8 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(21) dependencies { implementation(libs.ae2) - implementation(libs.ae2wtlib) + implementation(libs.ae2wtlibapi) + runtimeOnly(libs.ae2wtlib) implementation(libs.appmek) compileOnly(libs.mekanism) diff --git a/settings.gradle.kts b/settings.gradle.kts index 4172305c..b827721a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,6 +26,7 @@ run { content { includeGroup("appeng") includeGroup("mekanism") + includeGroup("de.mari_023") } } @@ -50,7 +51,9 @@ run { version("ae2", "19.0.12-alpha") library("ae2", "appeng", "appliedenergistics2").versionRef("ae2") - library("ae2wtlib", "maven.modrinth", "applied-energistics-2-wireless-terminals").version("WyPbb8sE") + version("ae2wtlib", "19.1.0-alpha.1") + 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") diff --git a/src/main/java/gripe/_90/megacells/MEGACells.java b/src/main/java/gripe/_90/megacells/MEGACells.java index dfbffeb6..f48eca41 100644 --- a/src/main/java/gripe/_90/megacells/MEGACells.java +++ b/src/main/java/gripe/_90/megacells/MEGACells.java @@ -142,7 +142,7 @@ private static void initUpgrades(FMLCommonSetupEvent event) { Upgrades.add(MEGAItems.GREATER_ENERGY_CARD, portableCell, 2, portableCellGroup); } - if (Addons.AE2WTLIB.isLoaded()) { + if (Addons.AE2WTLIB_API.isLoaded()) { AE2WTIntegration.initUpgrades(); } diff --git a/src/main/java/gripe/_90/megacells/integration/Addons.java b/src/main/java/gripe/_90/megacells/integration/Addons.java index 2f064ca9..cf91e7d7 100644 --- a/src/main/java/gripe/_90/megacells/integration/Addons.java +++ b/src/main/java/gripe/_90/megacells/integration/Addons.java @@ -11,7 +11,7 @@ public enum Addons { APPBOT("Applied Botanics"), ARSENG("Ars Énergistique"), APPLIEDE("AppliedE"), - AE2WTLIB("AE2WTLib"); + AE2WTLIB_API("AE2WTLib API"); private final String modName; diff --git a/src/main/java/gripe/_90/megacells/integration/ae2wt/AE2WTIntegration.java b/src/main/java/gripe/_90/megacells/integration/ae2wt/AE2WTIntegration.java index 1ae99a36..c5d2e144 100644 --- a/src/main/java/gripe/_90/megacells/integration/ae2wt/AE2WTIntegration.java +++ b/src/main/java/gripe/_90/megacells/integration/ae2wt/AE2WTIntegration.java @@ -2,7 +2,7 @@ import static gripe._90.megacells.definition.MEGAItems.GREATER_ENERGY_CARD; -import de.mari_023.ae2wtlib.UpgradeHelper; +import de.mari_023.ae2wtlib.api.registration.UpgradeHelper; public final class AE2WTIntegration { public static void initUpgrades() {