Replaced empty AE keys with null instead since the .of function returns null anyways when an empty stack is passed.

Maybe fixed some issues with minecolonies, needs some testing from a user

Author: SirEndii

build.gradle

@@ -276,11 +276,6 @@ dependencies {
     runtimeOnly "me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}"
     runtimeOnly "curse.maven:powah-633483:${powah_version}"
 
-    testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_version}"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:${junit_version}"
-    testImplementation "org.hamcrest:hamcrest:${hamcrest_version}"
-    testImplementation "org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${kotlinx_coroutines_version}"
     testModImplementation sourceSets.main.output
 
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_version}"

gradle.properties

@@ -10,7 +10,7 @@ mod_id=advancedperipherals
 mod_version=0.7.51b
 minecraft_version=1.21.1
 mod_artifact_suffix=
-neo_version=21.1.140
+neo_version=21.1.174
 parchment_minecraft_version=1.21.1
 parchment_mappings_version=2024.11.17
 loader_version=4

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AEApi.java

@@ -89,14 +89,14 @@ public static Pair<Long, AEItemKey> findAEStackFromFilter(MEStorage monitor, @Nu
         }
 
         if (crafting == null)
-            return Pair.of(0L, AEItemKey.of(ItemStack.EMPTY));
+            return Pair.of(0L, null);
 
         for (var temp : crafting.getCraftables(param -> true)) {
             if (temp instanceof AEItemKey key && filter.test(key.toStack()))
                 return Pair.of(0L, key);
         }
 
-        return Pair.of(0L, AEItemKey.of(ItemStack.EMPTY));
+        return Pair.of(0L, null);
     }
 
     @NotNull
@@ -112,14 +112,14 @@ public static Pair<Long, AEFluidKey> findAEFluidFromFilter(MEStorage monitor, @N
         }
 
         if (crafting == null)
-            return Pair.of(0L, AEFluidKey.of(FluidStack.EMPTY));
+            return Pair.of(0L, null);
 
         for (var temp : crafting.getCraftables(param -> true)) {
             if (temp instanceof AEFluidKey key && filter.test(key.toStack(1)))
                 return Pair.of(0L, key);
         }
 
-        return Pair.of(0L, AEFluidKey.of(FluidStack.EMPTY));
+        return Pair.of(0L, null);
     }
 
     @NotNull
@@ -135,14 +135,14 @@ public static Pair<Long, MekanismKey> findAEChemicalFromFilter(MEStorage monitor
         }
 
         if (crafting == null)
-            return Pair.of(0L, MekanismKey.of(ChemicalStack.EMPTY));
+            return Pair.of(0L, null);
 
         for (var temp : crafting.getCraftables(param -> true)) {
             if (temp instanceof MekanismKey key && filter.test(key.getStack()))
                 return Pair.of(0L, key);
         }
 
-        return Pair.of(0L, MekanismKey.of(ChemicalStack.EMPTY));
+        return Pair.of(0L, null);
     }
 
     /**

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEChemicalHandler.java

@@ -46,7 +46,7 @@ public ChemicalStack insertChemical(int tank, ChemicalStack resource, @NotNull A
     @Override
     public ChemicalStack extractChemical(ChemicalFilter filter, long count, Action simulate) {
         Pair<Long, MekanismKey> chemicalKey = AEApi.findAEChemicalFromFilter(storageMonitor, null, filter);
-        if (chemicalKey.getRight().getStack().isEmpty())
+        if (chemicalKey.getRight() == null)
             return ChemicalStack.EMPTY;
 
         ChemicalStack extracted = chemicalKey.getRight().getStack();

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEFluidHandler.java

@@ -42,7 +42,7 @@ public int fill(FluidStack resource, FluidAction action) {
     @Override
     public FluidStack drain(FluidFilter filter, FluidAction simulate) {
         Pair<Long, AEFluidKey> fluidKey = AEApi.findAEFluidFromFilter(storageMonitor, null, filter);
-        if (fluidKey.getRight().toStack(0).isEmpty())
+        if (fluidKey.getRight() == null)
             return FluidStack.EMPTY;
         long extracted = storageMonitor.extract(fluidKey.getRight(), filter.getCount(), simulate == FluidAction.SIMULATE ? Actionable.SIMULATE : Actionable.MODULATE, actionSource);
         return new FluidStack(fluidKey.getRight().getFluid(), (int) Math.min(extracted, Integer.MAX_VALUE));

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/MEItemHandler.java

@@ -42,7 +42,7 @@ public ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate
     @Override
     public ItemStack extractItem(ItemFilter filter, int count, boolean simulate) {
         Pair<Long, AEItemKey> itemKey = AEApi.findAEStackFromFilter(storageMonitor, null, filter);
-        if (itemKey.getRight().toStack().isEmpty())
+        if (itemKey.getRight() == null)
             return ItemStack.EMPTY;
         long extracted = storageMonitor.extract(itemKey.getRight(), count, simulate ? Actionable.SIMULATE : Actionable.MODULATE, actionSource);
         // Safe to cast here, the amount will never be higher than 64

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/ColonyPeripheral.java

@@ -276,7 +276,7 @@ public final Object getRequests() throws LuaException {
             map.put("state", request.getState().toString());
             map.put("count", deliverableRequest.getCount());
             map.put("minCount", deliverableRequest.getMinimumCount());
-            map.put("items", request.getDisplayStacks().stream().map(LuaConverter::itemStackToObject).collect(Collectors.toList()));
+            map.put("items", request.getDisplayStacks().stream().map(item -> LuaConverter.itemStackToObject(item, getLevel())).collect(Collectors.toList()));
             map.put("target", request.getRequester().getRequesterDisplayName(requestManager, request).getString());
             result.add(map);
         });

src/main/java/de/srendi/advancedperipherals/common/util/DataComponentUtil.java

@@ -4,10 +4,15 @@
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
 import net.minecraft.resources.RegistryOps;
+import net.minecraft.world.level.Level;
 import net.neoforged.neoforge.server.ServerLifecycleHooks;
 
 public class DataComponentUtil {
 
+    public static Tag toNbt(DataComponentPatch patch, Level level) {
+        return DataComponentPatch.CODEC.encodeStart(RegistryOps.create(NbtOps.INSTANCE, level.registryAccess()), patch).getOrThrow();
+    }
+
     public static Tag toNbt(DataComponentPatch patch) {
         return DataComponentPatch.CODEC.encodeStart(RegistryOps.create(NbtOps.INSTANCE, ServerLifecycleHooks.getCurrentServer().registryAccess()), patch).getOrThrow();
     }

src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java

@@ -19,6 +19,7 @@
 import net.minecraft.world.entity.animal.Animal;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.properties.Property;
 import net.minecraft.world.level.material.Fluid;
 import net.neoforged.neoforge.common.IShearable;
@@ -125,6 +126,21 @@ public static Map<String, Object> itemStackToObject(@NotNull ItemStack stack) {
         return properties;
     }
 
+    public static Map<String, Object> itemStackToObject(@NotNull ItemStack stack, Level level) {
+        if (stack.isEmpty()) {
+            return null;
+        }
+        Map<String, Object> properties = itemToObject(stack.getItem());
+        DataComponentPatch components = stack.getComponentsPatch();
+        properties.put("count", stack.getCount());
+        properties.put("displayName", stack.getDisplayName().getString());
+        properties.put("maxStackSize", stack.getMaxStackSize());
+        properties.put("components", NBTUtil.toLua(DataComponentUtil.toNbt(components, level)));
+        properties.put("fingerprint", ItemUtil.getFingerprint(stack));
+        return properties;
+    }
+
+
     public static Map<String, Object> fluidStackToObject(@NotNull FluidStack stack) {
         if (stack.isEmpty()) {
             return null;