From 42a73aa1923272d6d5627e7f86708cacf2622de6 Mon Sep 17 00:00:00 2001 From: Mari023 <38946771+Mari023@users.noreply.github.com> Date: Sat, 13 Jul 2024 03:58:46 +0200 Subject: [PATCH] match changes from main branch --- api/src/main/java/de/mari_023/ae2wtlib/api/AE2wtlibAPI.java | 3 --- src/main/java/de/mari_023/ae2wtlib/recipeviewer/JEIPlugin.java | 2 +- src/main/java/de/mari_023/ae2wtlib/recipeviewer/REIPlugin.java | 2 +- src/main/resources/META-INF/neoforge.mods.toml | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/de/mari_023/ae2wtlib/api/AE2wtlibAPI.java b/api/src/main/java/de/mari_023/ae2wtlib/api/AE2wtlibAPI.java index b99aba94..0f8e9438 100644 --- a/api/src/main/java/de/mari_023/ae2wtlib/api/AE2wtlibAPI.java +++ b/api/src/main/java/de/mari_023/ae2wtlib/api/AE2wtlibAPI.java @@ -13,7 +13,6 @@ import net.minecraft.world.item.ItemStack; import net.neoforged.fml.ModList; -import appeng.api.config.Actionable; import appeng.api.upgrades.IUpgradeInventory; import appeng.menu.locator.ItemMenuHostLocator; @@ -47,8 +46,6 @@ public static ItemStack makeWUT(DataComponentType componentType) { ItemStack wut = new ItemStack(wutItem); wut.set(componentType, Unit.INSTANCE); - wutItem.injectAEPower(wut, - wutItem.getAEMaxPower(wut), Actionable.MODULATE); return wut; } diff --git a/src/main/java/de/mari_023/ae2wtlib/recipeviewer/JEIPlugin.java b/src/main/java/de/mari_023/ae2wtlib/recipeviewer/JEIPlugin.java index 87ccc49f..fde22eba 100644 --- a/src/main/java/de/mari_023/ae2wtlib/recipeviewer/JEIPlugin.java +++ b/src/main/java/de/mari_023/ae2wtlib/recipeviewer/JEIPlugin.java @@ -11,8 +11,8 @@ import appeng.api.config.Actionable; -import de.mari_023.ae2wtlib.api.AE2wtlibAPI; import de.mari_023.ae2wtlib.AE2wtlibItems; +import de.mari_023.ae2wtlib.api.AE2wtlibAPI; import de.mari_023.ae2wtlib.wut.WTDefinitions; @JeiPlugin diff --git a/src/main/java/de/mari_023/ae2wtlib/recipeviewer/REIPlugin.java b/src/main/java/de/mari_023/ae2wtlib/recipeviewer/REIPlugin.java index 4d87b1ca..3c6abf15 100644 --- a/src/main/java/de/mari_023/ae2wtlib/recipeviewer/REIPlugin.java +++ b/src/main/java/de/mari_023/ae2wtlib/recipeviewer/REIPlugin.java @@ -10,8 +10,8 @@ import appeng.api.config.Actionable; -import de.mari_023.ae2wtlib.api.AE2wtlibAPI; import de.mari_023.ae2wtlib.AE2wtlibItems; +import de.mari_023.ae2wtlib.api.AE2wtlibAPI; import de.mari_023.ae2wtlib.wut.WTDefinitions; @REIPluginClient diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 9b6ad5b4..9a0ca52c 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -21,7 +21,7 @@ config="ae2wtlib.mixins.json" modId = "ae2wtlib_api" type="REQUIRED" versionRange = "[${version}]" -ordering = "AFTER" +ordering = "BEFORE" side = "BOTH" [[dependencies.ae2wtlib]]