Move JEI plugin

AppliedEnergistics · Oct 7, 2023 · 03be790 · 03be790
1 parent cf584a5
commit 03be790
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 15 deletions.
diff --git a/src/main/java/me/ramidzkh/mekae2/integration/jade/package-info.java b/src/main/java/me/ramidzkh/mekae2/integration/jade/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package me.ramidzkh.mekae2.integration.jade;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
diff --git a/.../java/me/ramidzkh/mekae2/AMJEIPlugin.java → ...h/mekae2/integration/jei/AMJEIPlugin.java b/.../java/me/ramidzkh/mekae2/AMJEIPlugin.java → ...h/mekae2/integration/jei/AMJEIPlugin.java
@@ -1,7 +1,8 @@
-package me.ramidzkh.mekae2;
+package me.ramidzkh.mekae2.integration.jei;
 
 import net.minecraft.resources.ResourceLocation;
 
+import me.ramidzkh.mekae2.AppliedMekanistics;
 import me.ramidzkh.mekae2.ae2.ChemicalIngredientConverter;
 import mekanism.api.IMekanismAccess;
 import mezz.jei.api.IModPlugin;

diff --git a/src/main/java/me/ramidzkh/mekae2/integration/jei/package-info.java b/src/main/java/me/ramidzkh/mekae2/integration/jei/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package me.ramidzkh.mekae2.integration.jei;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
diff --git a/src/main/java/me/ramidzkh/mekae2/qio/QioSupport.java b/src/main/java/me/ramidzkh/mekae2/qio/QioSupport.java
@@ -18,7 +18,6 @@
 import me.ramidzkh.mekae2.AppliedMekanistics;
 import mekanism.api.inventory.qio.IQIOComponent;
 
-import appeng.api.features.IPlayerRegistry;
 import appeng.api.networking.GridHelper;
 import appeng.api.storage.MEStorage;
 
@@ -62,9 +61,8 @@ public <T> LazyOptional<T> getCapability(@NotNull Capability<T> capability,
                                 break out;
                             }
 
-                            var owner = IPlayerRegistry.getMapping(object.getLevel())
-                                    .getProfileId(source.getOwningPlayerId());
-                            var adapter = new QioStorageAdapter<>((BlockEntity & IQIOComponent) object, arg, owner);
+                            var adapter = new QioStorageAdapter<>((BlockEntity & IQIOComponent) object, arg,
+                                    source.getOwningPlayerProfileId());
 
                             if (adapter.getFrequency() != null) {
                                 return LazyOptional.of(() -> adapter).cast();

diff --git a/src/main/java/me/ramidzkh/mekae2/qio/package-info.java b/src/main/java/me/ramidzkh/mekae2/qio/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package me.ramidzkh.mekae2.qio;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
diff --git a/src/main/resources/appmek.mixins.json b/src/main/resources/appmek.mixins.json