Rename the ME Bridge amount to count and use the lua converter for item stacks instead

Author: SirEndii

CHANGELOG.md

@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Breaking Changes
+- Renamed `nbt` to `components` in every item lua object
+- Renamed `amount` to `count` in every ME Bridge lua item object
+
 ## [1.21.1-0.7.45a] - 2025-01-15
 
 ### First official Advanced Peripherals 1.21.1 alpha release to the whole public. Please report any bug to github!

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

@@ -173,26 +173,20 @@ public static <T extends AEKey> Map<String, Object> getObjectFromStack(Pair<Long
     }
 
     private static Map<String, Object> getObjectFromItemStack(Pair<Long, AEItemKey> stack, @Nullable ICraftingService craftingService) {
-        Map<String, Object> map = new HashMap<>();
-        String displayName = stack.getRight().getDisplayName().getString();
-        Tag nbt = DataComponentUtil.toNbt(stack.getRight().getReadOnlyStack().getComponentsPatch());
-        long amount = stack.getLeft();
-        map.put("fingerprint", ItemUtil.getFingerprint(stack.getRight().toStack()));
-        map.put("name", ItemUtil.getRegistryKey(stack.getRight().getItem()).toString());
-        map.put("amount", amount);
-        map.put("displayName", displayName);
-        map.put("components", NBTUtil.toLua(nbt));
-        map.put("tags", LuaConverter.tagsToList(() -> stack.getRight().getItem().builtInRegistryHolder().tags()));
+        Map<String, Object> map = LuaConverter.stackToObject(stack.getRight().toStack());
+        long count = stack.getLeft();
+        // We re-set the amount since item stacks can only hold up to 2^31 for the count while ae2 stacks can hold up to 2^63
+        map.put("count", count);
         map.put("isCraftable", craftingService != null && craftingService.isCraftable(stack.getRight()));
 
         return map;
     }
 
     private static Map<String, Object> getObjectFromFluidStack(Pair<Long, AEFluidKey> stack, @Nullable ICraftingService craftingService) {
         Map<String, Object> map = new HashMap<>();
-        long amount = stack.getLeft();
+        long count = stack.getLeft();
         map.put("name", stack.getRight().getFluid().builtInRegistryHolder().key().registry().toString());
-        map.put("amount", amount);
+        map.put("count", count);
         map.put("displayName", stack.getRight().getDisplayName().getString());
         map.put("tags", LuaConverter.tagsToList(() -> stack.getRight().getFluid().builtInRegistryHolder().tags()));
         map.put("isCraftable", craftingService != null && craftingService.isCraftable(stack.getRight()));
@@ -202,9 +196,9 @@ private static Map<String, Object> getObjectFromFluidStack(Pair<Long, AEFluidKey
 
     private static Map<String, Object> getObjectFromGasStack(Pair<Long, MekanismKey> stack, @Nullable ICraftingService craftingService) {
         Map<String, Object> map = new HashMap<>();
-        long amount = stack.getLeft();
+        long count = stack.getLeft();
         map.put("name", stack.getRight().getStack().getTypeRegistryName().toString());
-        map.put("amount", amount);
+        map.put("count", count);
         map.put("displayName", stack.getRight().getDisplayName().getString());
         map.put("tags", LuaConverter.tagsToList(() -> stack.getRight().getStack().getTags()));
 

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

@@ -107,7 +107,7 @@ public static Map<String, Object> stackToObject(@NotNull ItemStack stack) {
         map.put("count", stack.getCount());
         map.put("displayName", stack.getDisplayName().getString());
         map.put("maxStackSize", stack.getMaxStackSize());
-        map.put("nbt", NBTUtil.toLua(DataComponentUtil.toNbt(components)));
+        map.put("components", NBTUtil.toLua(DataComponentUtil.toNbt(components)));
         map.put("fingerprint", ItemUtil.getFingerprint(stack));
         return map;
     }