match changes from main branch

Mari023 · Jul 13, 2024 · 42a73aa · 42a73aa
1 parent 60a56eb
commit 42a73aa
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 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
@@ -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<Unit> 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
@@ -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
@@ -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
@@ -21,7 +21,7 @@ config="ae2wtlib.mixins.json"
 modId = "ae2wtlib_api"
 type="REQUIRED"
 versionRange = "[${version}]"
-ordering = "AFTER"
+ordering = "BEFORE"
 side = "BOTH"
 
 [[dependencies.ae2wtlib]]