some clarity for lua converter

zyxkad · zyxkad · commit d8f030abc1ac · 2026-03-30T20:53:51.000-06:00
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ mod_id=advancedperipherals
 # do not include mod_version/minecraft_version with equals sign anywhere else in the file (even in comments)
 # also do not add space around the equal sign
 # since we are using poor grep command to do automation :p
-mod_version=0.7.58b
+mod_version=0.8.0
 minecraft_version=1.21.1
 mod_artifact_suffix=
 neo_version=21.1.220
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/APAddon.java b/src/main/java/de/srendi/advancedperipherals/common/addons/APAddon.java
@@ -7,7 +7,7 @@
 public enum APAddon {
 
     AE2("ae2"),
-    AE2_THINGS("ae2things"),
+    AE2THINGS("ae2things"),
     APP_MEKANISTICS("appmek"),
     CURIOS("curios"),
     MEKANISM("mekanism"),
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AEApi.java b/src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AEApi.java
@@ -517,7 +517,7 @@ public static Map<String, Object> parseCraftingCPU(ICraftingCPU cpu, boolean rec
     public static Object parseCraftingJob(CraftingJobStatus status, @Nullable AECraftJob craftJob, @Nullable ICraftingCPU cpu) {
         Map<String, Object> properties = new HashMap<>();
 
-        properties.put("bridge_id", craftJob == null ? -1 : craftJob.getId());
+        properties.put("bridgeId", craftJob == null ? -1 : craftJob.getId());
         properties.put("quantity", status.crafting().amount());
         properties.put("resource", parseGenericStack(status.crafting()));
 
@@ -710,7 +710,7 @@ public static long getTotalItemStorage(IGridNode node) {
                     if (cell.getKeyType().getClass().isAssignableFrom(AEKeyType.items().getClass())) {
                         total += cell.getBytes(null);
                     }
-                } else if (APAddon.AE2_THINGS.isLoaded() && stack.getItem() instanceof DISKDrive disk) {
+                } else if (APAddon.AE2THINGS.isLoaded() && stack.getItem() instanceof DISKDrive disk) {
                     if (disk.getKeyType().toString().equals("ae2:i")) {
                         total += disk.getBytes(null);
                     }
@@ -798,7 +798,7 @@ public static long getUsedItemStorage(IGridNode node) {
 
                         used += cellInventory.getUsedBytes();
                     }
-                } else if (APAddon.AE2_THINGS.isLoaded() && stack.getItem() instanceof DISKDrive) {
+                } else if (APAddon.AE2THINGS.isLoaded() && stack.getItem() instanceof DISKDrive) {
                     DISKCellInventory diskCellInventory = DISKCellHandler.INSTANCE.getCellInventory(stack, null);
                     if (diskCellInventory != null) {
                         used += diskCellInventory.getNbtItemCount();
@@ -959,7 +959,7 @@ public static List<Object> listCells(IGridNode node) {
 
                 if (stack.getItem() instanceof IBasicCellItem cell) {
                     items.add(parseCell(cell, stack));
-                } else if (APAddon.AE2_THINGS.isLoaded() && stack.getItem() instanceof DISKDrive disk) {
+                } else if (APAddon.AE2THINGS.isLoaded() && stack.getItem() instanceof DISKDrive disk) {
                     items.add(parseDISKDrive(disk, stack));
                 }
             }
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/operations/SimpleFreeOperation.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/operations/SimpleFreeOperation.java
@@ -1,15 +1,14 @@
 package de.srendi.advancedperipherals.common.addons.computercraft.operations;
 
+import dan200.computercraft.api.lua.IArguments;
+import dan200.computercraft.api.lua.LuaException;
+import dan200.computercraft.api.lua.MethodResult;
 import de.srendi.advancedperipherals.lib.peripherals.IPeripheralOperation;
 import net.neoforged.neoforge.common.ModConfigSpec;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import dan200.computercraft.api.lua.IArguments;
-import dan200.computercraft.api.lua.LuaException;
-import dan200.computercraft.api.lua.MethodResult;
-
 public enum SimpleFreeOperation implements IPeripheralOperation<Void> {
     CHAT_MESSAGE(1000),
     SADDLE_CAPTURE(5000);
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/OperationAbility.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/owner/OperationAbility.java
@@ -134,7 +134,7 @@ public boolean isOnCooldown(IPeripheralOperation<?> operation) {
     public void collectConfiguration(Map<String, Object> data) {
         for (IPeripheralOperation<?> operation : allowedOperations.values()) {
             Map<String, Object> operData = operation.computerDescription();
-            data.put("getCost", (ILuaFunction) operation::getCostLua);
+            operData.put("getCost", (ILuaFunction) operation::getCostLua);
             data.put(operation.settingsName(), operData);
         }
     }
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/EnvironmentDetectorPeripheral.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/EnvironmentDetectorPeripheral.java
@@ -180,11 +180,13 @@ public final MethodResult scanEntities(@NotNull IArguments arguments) throws Lua
         return withOperation(SCAN_ENTITIES, new SphereOperationContext(radius), context -> {
             return context.getRadius() > SCAN_ENTITIES.getMaxCostRadius() ? MethodResult.of(null, "Radius exceeds max value") : null;
         }, context -> {
-            Vec3 pos = this.getPhysicsPos();
+            IPeripheralOwner owner = this.getPeripheralOwner();
+            Vec3 pos = owner.getPhysicsPos();
             AABB box = new AABB(pos, pos).inflate(context.getRadius() + 0.5);
             LuaConverter.EntityConverter.Context convContext = LuaConverter.entityContextBuilder()
                 .detailed(detailed)
                 .position(pos)
+                .orientation(owner.getOrientation())
                 .build();
             List<Map<String, Object>> entities = getLevel()
                 .getEntities((Entity) null, box, entity -> entity instanceof LivingEntity && entity.isAlive())
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataEntityHandPlugin.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataEntityHandPlugin.java
@@ -21,7 +21,6 @@
 import net.minecraft.world.phys.Vec3;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.Map;
@@ -39,7 +38,7 @@ public AutomataEntityHandPlugin(AutomataCorePeripheral automataCore, Predicate<E
     }
 
     @Override
-    public @Nullable IPeripheralOperation<?>[] getOperations() {
+    public IPeripheralOperation<?> @NotNull [] getOperations() {
         return new IPeripheralOperation[]{USE_ON_ANIMAL};
     }
 
@@ -96,6 +95,7 @@ public final MethodResult searchAnimals(IArguments args) throws LuaException {
             .detailed(detailed)
             .itemInHand(owner.getToolInMainHand())
             .position(currentPos)
+            .orientation(owner.getOrientation())
             .build();
         List<Map<String, Object>> entities = owner
             .getLevel()
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataLookPlugin.java b/src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/plugins/AutomataLookPlugin.java
@@ -71,14 +71,23 @@ public final MethodResult lookAtEntity(@NotNull IArguments arguments) throws Lua
         float pitch = options.optDouble("pitch").orElse(0d).floatValue();
 
         automataCore.addRotationCycle();
-        HitResult result = automataCore.getPeripheralOwner().withPlayer(APFakePlayer.wrapActionWithRot(yaw, pitch, p -> p.findHit(false, true)));
+        TurtlePeripheralOwner owner = automataCore.getPeripheralOwner();
+        HitResult result = owner.withPlayer(APFakePlayer.wrapActionWithRot(yaw, pitch, p -> p.findHit(false, true)));
         if (result.getType() == HitResult.Type.MISS) {
             return MethodResult.of(null, "No entity find");
         }
 
         EntityHitResult entityHit = (EntityHitResult) result;
-        Vec3 origin = automataCore.getPhysicsPos();
-        return MethodResult.of(LuaConverter.entityToLua(entityHit.getEntity(), LuaConverter.entityContextBuilder().detailed().position(origin).build()));
+        return MethodResult.of(
+            LuaConverter.entityToLua(
+                entityHit.getEntity(),
+                LuaConverter.entityContextBuilder()
+                    .detailed()
+                    .position(owner.getPhysicsPos())
+                    .orientation(owner.getOrientation())
+                    .build()
+            )
+        );
     }
 
 }
diff --git a/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java b/src/main/java/de/srendi/advancedperipherals/common/addons/refinedstorage/RSApi.java
@@ -657,7 +657,7 @@ public static Object parseDiskDrive(StorageNetworkNode diskDrive, InWorldNetwork
         properties.put("total", diskDrive.getCapacity());
         properties.put("disks", disks);
         properties.put("mode", storageConfiguration.getFilterMode().toString());
-        properties.put("access_type", storageConfiguration.getAccessMode().toString());
+        properties.put("accessType", storageConfiguration.getAccessMode().toString());
         properties.put("position", LuaConverter.posToLua(nodeContainer.getLocalPosition()));
         properties.put("priority", nodeContainer.getPriority());
 
@@ -690,7 +690,7 @@ public static Object parseStorageDisk(StateTrackedStorage disk) {
     public static Object parseCraftingTask(@Nullable RSCraftJob task, TaskStatus status, @Nullable AutocraftingNetworkComponent autocraftingComponent) {
         Map<String, Object> properties = new HashMap<>();
 
-        properties.put("bridge_id", task == null ? -1 : task.getId());
+        properties.put("bridgeId", task == null ? -1 : task.getId());
         properties.put("id", status.info().id().toString());
         properties.put("quantity", status.info().amount());
         // The "stored" attribute of the Item does not always work. I guess this is a bug, I at least reported it.
diff --git a/src/main/java/de/srendi/advancedperipherals/common/util/CoordUtil.java b/src/main/java/de/srendi/advancedperipherals/common/util/CoordUtil.java
@@ -186,17 +186,19 @@ public static ComputerSide getComputerSide(FrontAndTop orientation, Direction di
      * put "x", "y", "z", and/or "f", "r", "u" coords based on configuration
      * @see putFRUCoords
      */
-    public static void putRelativeCoords(Map<? super String, ? super Double> data, double x, double y, double z, Matrix3dc orientation) {
+    public static void putRelativeCoords(Map<? super String, ? super Double> data, double x, double y, double z, @Nullable Matrix3dc orientation) {
         data.put("x", x);
         data.put("y", y);
         data.put("z", z);
-        putFRUCoords(data, x, y, z, orientation);
+        if (orientation != null) {
+            putFRUCoords(data, x, y, z, orientation);
+        }
     }
 
     /**
      * put "f", "r", "u" coords into the map
      */
-    public static void putFRUCoords(Map<? super String, ? super Double> data, double x, double y, double z, Matrix3dc orientation) {
+    public static void putFRUCoords(Map<? super String, ? super Double> data, double x, double y, double z, @NotNull Matrix3dc orientation) {
         Vector3d rpos = orientation.transformTranspose(new Vector3d(x, y, z));
         data.put("r", rpos.x);
         data.put("u", rpos.y);
diff --git a/src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java b/src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java
@@ -39,7 +39,8 @@
 import net.neoforged.neoforge.fluids.FluidStack;
 import net.neoforged.neoforge.fluids.FluidType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.Unmodifiable;
+import org.joml.Matrix3dc;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -70,10 +71,10 @@ public static <T extends Entity> void registerEntityConverter(Class<T> clazz, En
     public interface EntityConverter<T extends Entity> {
         void entityToMap(T entity, Map<String, Object> data, Context ctx);
 
-        record Context(boolean detailed, ItemStack itemInHand, Vec3 position) {}
+        record Context(boolean detailed, ItemStack itemInHand, Vec3 position, Matrix3dc orientation) {}
     }
 
-    private static final EntityConverter.Context EMPTY_ENTITY_CONVERTER_CONTEXT = new EntityConverter.Context(false, null, null);
+    private static final EntityConverter.Context EMPTY_ENTITY_CONVERTER_CONTEXT = new EntityConverter.Context(false, null, null, null);
 
     public static EntityContextBuilder entityContextBuilder() {
         return new EntityContextBuilder();
@@ -83,6 +84,7 @@ public static final class EntityContextBuilder {
         private boolean detailed = false;
         private ItemStack itemInHand = null;
         private Vec3 position = null;
+        private Matrix3dc orientation = null;
 
         public EntityContextBuilder detailed(boolean detailed) {
             this.detailed = detailed;
@@ -107,8 +109,13 @@ public EntityContextBuilder position(BlockPos pos) {
             return this.position(pos.getCenter());
         }
 
+        public EntityContextBuilder orientation(Matrix3dc orientation) {
+            this.orientation = orientation;
+            return this;
+        }
+
         public EntityConverter.Context build() {
-            return new EntityConverter.Context(this.detailed, this.itemInHand, this.position);
+            return new EntityConverter.Context(this.detailed, this.itemInHand, this.position, this.orientation);
         }
     }
 
@@ -132,9 +139,7 @@ public static Map<String, Object> entityToLua(Entity entity, EntityConverter.Con
         }
         Vec3 pos = ctx.position();
         if (pos != null) {
-            data.put("x", entity.getX() - pos.x);
-            data.put("y", entity.getY() - pos.y);
-            data.put("z", entity.getZ() - pos.z);
+            CoordUtil.putRelativeCoords(data, entity.getX() - pos.x, entity.getY() - pos.y, entity.getZ() - pos.z, ctx.orientation());
         }
         return data;
     }
@@ -223,6 +228,7 @@ public static Object stateToLua(Comparable<?> stateValue) {
         return null;
     }
 
+    @Unmodifiable
     public static Map<String, Object> blockStateValuesToLua(BlockState state) {
         return Map.ofEntries(
             state.getValues()
@@ -235,8 +241,9 @@ public static Map<String, Object> blockStateValuesToLua(BlockState state) {
 
     private static final LRUCache<BlockState, Map<String, Object>> BLOCKSTATES_CACHE = new LRUCache<>(256);
 
+    @Unmodifiable
     public static Map<String, Object> blockStateToLua(BlockState state0) {
-        Map<String, Object> data = BLOCKSTATES_CACHE.computeIfAbsent(state0, (state) -> {
+        return BLOCKSTATES_CACHE.computeIfAbsent(state0, (state) -> {
             Block block = state.getBlock();
             ResourceLocation name = BuiltInRegistries.BLOCK.getKey(block);
             return Map.of(
@@ -245,21 +252,18 @@ public static Map<String, Object> blockStateToLua(BlockState state0) {
                 "state", blockStateValuesToLua(state)
             );
         });
-
-        return data;
     }
 
-    @Nullable
-    public static Object posToLua(BlockPos pos) {
+    @Unmodifiable
+    public static Map<String, Object> posToLua(BlockPos pos) {
         if (pos == null) {
             return null;
         }
-
-        Map<String, Object> properties = new HashMap<>(3);
-        properties.put("x", pos.getX());
-        properties.put("y", pos.getY());
-        properties.put("z", pos.getZ());
-        return properties;
+        return Map.of(
+            "x", pos.getX(),
+            "y", pos.getY(),
+            "z", pos.getZ()
+        );
     }
 
     public static Map<String, Object> itemToLua(@NotNull Item item) {
@@ -284,7 +288,6 @@ public static Map<String, Object> chemicalToLua(@NotNull Chemical chemical) {
         return properties;
     }
 
-    @Nullable
     public static Map<String, Object> itemStackToLua(@NotNull ItemStack stack) {
         if (stack.isEmpty()) {
             return null;
@@ -375,7 +378,6 @@ public static Map<String, Object> chemicalStackToLua(@NotNull ChemicalStack chem
      * @return a Map containing proper item stack details
      * @see InventoryManagerPeripheral#getItems()
      */
-    @Nullable
     public static Map<String, Object> itemStackToLuaWithSlot(@NotNull ItemStack stack, int slot) {
         if (stack.isEmpty()) {
             return null;
@@ -385,20 +387,22 @@ public static Map<String, Object> itemStackToLuaWithSlot(@NotNull ItemStack stac
         return properties;
     }
 
-    private static final LRUCache<ResourceKey<?>, List<String>> HOLDER2TAGS_CACHE = new LRUCache<>(512);
+    private static final LRUCache<ResourceKey<?>, Map<String, Boolean>> HOLDER2TAGS_CACHE = new LRUCache<>(512);
 
-    public static <T> List<String> getHolderTags(final Holder<T> holder) {
+    @Unmodifiable
+    public static <T> Map<String, Boolean> getHolderTags(final Holder<T> holder) {
         final ResourceKey<T> holderKey = holder.unwrapKey().orElse(null);
         if (holderKey == null) {
-            return tagsToList(holder.tags());
+            return tagsToMap(holder.tags());
         }
         synchronized (HOLDER2TAGS_CACHE) {
-            return HOLDER2TAGS_CACHE.computeIfAbsent(holderKey, (k) -> tagsToList(holder.tags()));
+            return HOLDER2TAGS_CACHE.computeIfAbsent(holderKey, (k) -> tagsToMap(holder.tags()));
         }
     }
 
-    public static <T> List<String> tagsToList(Stream<TagKey<T>> tags) {
-        return tags.map(LuaConverter::tagToString).toList();
+    @Unmodifiable
+    public static <T> Map<String, Boolean> tagsToMap(Stream<TagKey<T>> tags) {
+        return Map.ofEntries(tags.map(LuaConverter::tagToString).map((tag) -> Map.entry(tag, Boolean.TRUE)).toArray(Map.Entry[]::new));
     }
 
     private static final LRUCache<TagKey<?>, String> TAG2STRING_CACHE = new LRUCache<>(1024);
@@ -434,22 +438,24 @@ public static BlockPos convertToBlockPos(BlockPos center, Map<?, ?> table) throw
         return new BlockPos(center.getX() + relative.getX(), center.getY() + relative.getY(), center.getZ() + relative.getZ());
     }
 
+    @Unmodifiable
     public static Map<String, Object> effectToLua(MobEffectInstance effect) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("name", effect.getDescriptionId());
-        map.put("duration", effect.getDuration());
-        map.put("amplifier", effect.getAmplifier());
-        return map;
+        return Map.of(
+            "name", effect.getDescriptionId(),
+            "duration", effect.getDuration(),
+            "amplifier", effect.getAmplifier()
+        );
     }
 
+    @Unmodifiable
     public static Map<String, Object> teamToLua(Team team) {
         if (team == null) {
             return null;
         }
-        Map<String, Object> map = new HashMap<>();
-        map.put("name", team.getName());
-        map.put("color", team.getColor());
-        return map;
+        return Map.of(
+            "name", team.getName(),
+            "color", team.getColor()
+        );
     }
 
     // public static Map<String, Object> shipToObject(ServerShip ship) {
diff --git a/src/main/java/de/srendi/advancedperipherals/common/util/NBTUtil.java b/src/main/java/de/srendi/advancedperipherals/common/util/NBTUtil.java
@@ -88,7 +88,7 @@ public static BlockPos blockPosFromNBT(CompoundTag nbt) {
 
     public static Pair<Level, BlockPos> levelAndBlockPosFromNBT(MinecraftServer server, CompoundTag nbt) {
         ServerLevel level = server.getLevel(ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(nbt.getString("dim"))));
-        return new Pair(level, blockPosFromNBT(nbt));
+        return new Pair<>(level, blockPosFromNBT(nbt));
     }
 
     public static CompoundTag toNBT(Level level, BlockPos pos) {

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ public static Map<String, Object> parseCraftingCPU(ICraftingCPU cpu, boolean rec`
`517`	`517`	`public static Object parseCraftingJob(CraftingJobStatus status, @Nullable AECraftJob craftJob, @Nullable ICraftingCPU cpu) {`
`518`	`518`	`Map<String, Object> properties = new HashMap<>();`
`519`	`519`
`520`		`- properties.put("bridge_id", craftJob == null ? -1 : craftJob.getId());`
	`520`	`+ properties.put("bridgeId", craftJob == null ? -1 : craftJob.getId());`
`521`	`521`	`properties.put("quantity", status.crafting().amount());`
`522`	`522`	`properties.put("resource", parseGenericStack(status.crafting()));`
`523`	`523`
`@@ -710,7 +710,7 @@ public static long getTotalItemStorage(IGridNode node) {`
`710`	`710`	`if (cell.getKeyType().getClass().isAssignableFrom(AEKeyType.items().getClass())) {`
`711`	`711`	`total += cell.getBytes(null);`
`712`	`712`	`}`
`713`		`- } else if (APAddon.AE2_THINGS.isLoaded() && stack.getItem() instanceof DISKDrive disk) {`
	`713`	`+ } else if (APAddon.AE2THINGS.isLoaded() && stack.getItem() instanceof DISKDrive disk) {`
`714`	`714`	`if (disk.getKeyType().toString().equals("ae2:i")) {`
`715`	`715`	`total += disk.getBytes(null);`
`716`	`716`	`}`
`@@ -798,7 +798,7 @@ public static long getUsedItemStorage(IGridNode node) {`
`798`	`798`
`799`	`799`	`used += cellInventory.getUsedBytes();`
`800`	`800`	`}`
`801`		`- } else if (APAddon.AE2_THINGS.isLoaded() && stack.getItem() instanceof DISKDrive) {`
	`801`	`+ } else if (APAddon.AE2THINGS.isLoaded() && stack.getItem() instanceof DISKDrive) {`
`802`	`802`	`DISKCellInventory diskCellInventory = DISKCellHandler.INSTANCE.getCellInventory(stack, null);`
`803`	`803`	`if (diskCellInventory != null) {`
`804`	`804`	`used += diskCellInventory.getNbtItemCount();`
`@@ -959,7 +959,7 @@ public static List<Object> listCells(IGridNode node) {`
`959`	`959`
`960`	`960`	`if (stack.getItem() instanceof IBasicCellItem cell) {`
`961`	`961`	`items.add(parseCell(cell, stack));`
`962`		`- } else if (APAddon.AE2_THINGS.isLoaded() && stack.getItem() instanceof DISKDrive disk) {`
	`962`	`+ } else if (APAddon.AE2THINGS.isLoaded() && stack.getItem() instanceof DISKDrive disk) {`
`963`	`963`	`items.add(parseDISKDrive(disk, stack));`
`964`	`964`	`}`
`965`	`965`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public boolean isOnCooldown(IPeripheralOperation<?> operation) {`
`134`	`134`	`public void collectConfiguration(Map<String, Object> data) {`
`135`	`135`	`for (IPeripheralOperation<?> operation : allowedOperations.values()) {`
`136`	`136`	`Map<String, Object> operData = operation.computerDescription();`
`137`		`- data.put("getCost", (ILuaFunction) operation::getCostLua);`
	`137`	`+ operData.put("getCost", (ILuaFunction) operation::getCostLua);`
`138`	`138`	`data.put(operation.settingsName(), operData);`
`139`	`139`	`}`
`140`	`140`	`}`