[#777] Fixed IArguments has been closed being thrown with some functions that still use the wrong table functions

Author: SirEndii

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+### Added
+- [#755] Added disabled peripherals, a better way to check if a peripheral is disabled in the config. See [docs](https://docs.advanced-peripherals.de/latest/guides/disabled_peripherals)
+
+### Fixed
+- [#784] Fixed that the energy detector transfer rate limit is not enforced
+- [#772] Fixed that the inventory manager does not save it's content
 ## [1.20.1-0.7.45r] - 2025-08-02
 
 ### Fixed

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

@@ -41,7 +41,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import static de.srendi.advancedperipherals.common.addons.computercraft.operations.SingleOperation.DIG;
@@ -61,10 +60,7 @@ public AutomataBlockHandPlugin(AutomataCorePeripheral automataCore) {
 
     @LuaFunction(mainThread = true)
     public final MethodResult digBlock(@NotNull IArguments arguments) throws LuaException {
-        Optional<LuaTable<?, ?>> optOptions = arguments.optTableUnsafe(0);
-        LuaTable<?, ?> options = EmptyLuaTable.INSTANCE;
-        if (optOptions.isPresent())
-            options = optOptions.get();
+        LuaTable<?, ?> options = EmptyLuaTable.orEmpty(arguments.optTable(0).orElse(null));
 
         boolean sneak = options.optBoolean("sneak").orElse(false);
         float yaw = options.optDouble("yaw").orElse(0d).floatValue();
@@ -87,10 +83,7 @@ public final MethodResult digBlock(@NotNull IArguments arguments) throws LuaExce
 
     @LuaFunction(mainThread = true)
     public final MethodResult useOnBlock(@NotNull IArguments arguments) throws LuaException {
-        Optional<LuaTable<?, ?>> optOptions = arguments.optTableUnsafe(0);
-        LuaTable<?, ?> options = EmptyLuaTable.INSTANCE;
-        if (optOptions.isPresent())
-            options = optOptions.get();
+        LuaTable<?, ?> options = EmptyLuaTable.orEmpty(arguments.optTable(0).orElse(null));
 
         boolean sneak = options.optBoolean("sneak").orElse(false);
         float yaw = options.optDouble("yaw").orElse(0d).floatValue();
@@ -124,8 +117,7 @@ public final MethodResult useOnBlock(@NotNull IArguments arguments) throws LuaEx
      */
     @LuaFunction(mainThread = true)
     public MethodResult placeBlock(@NotNull IArguments arguments) throws LuaException {
-        Optional<LuaTable<?, ?>> optOptions = arguments.optTableUnsafe(0);
-        final LuaTable<?, ?> options = optOptions.orElse(EmptyLuaTable.INSTANCE);
+        LuaTable<?, ?> options = EmptyLuaTable.orEmpty(arguments.optTable(0).orElse(null));
 
         ITurtleAccess turtle = automataCore.getPeripheralOwner().getTurtle();
         CompassPeripheral compassPeripheral = Stream.of(TurtleSide.values()).map(side -> turtle.getPeripheral(side) instanceof CompassPeripheral compass ? compass : null).filter(peripheral -> peripheral != null).findFirst().orElse(null);

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

@@ -24,7 +24,6 @@
 import org.jetbrains.annotations.Nullable;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.Predicate;
 
 import static de.srendi.advancedperipherals.common.addons.computercraft.operations.SingleOperation.USE_ON_ANIMAL;
@@ -45,10 +44,7 @@ public AutomataEntityHandPlugin(AutomataCorePeripheral automataCore, Predicate<E
 
     @LuaFunction(mainThread = true)
     public final MethodResult useOnAnimal(@NotNull IArguments arguments) throws LuaException {
-        Optional<LuaTable<?, ?>> optOptions = arguments.optTableUnsafe(0);
-        LuaTable<?, ?> options = EmptyLuaTable.INSTANCE;
-        if (optOptions.isPresent())
-            options = optOptions.get();
+        LuaTable<?, ?> options = EmptyLuaTable.orEmpty(arguments.optTable(0).orElse(null));
 
         boolean sneak = options.optBoolean("sneak").orElse(false);
         float yaw = options.optDouble("yaw").orElse(0d).floatValue();
@@ -68,10 +64,7 @@ public final MethodResult useOnAnimal(@NotNull IArguments arguments) throws LuaE
 
     @LuaFunction(mainThread = true)
     public final MethodResult inspectAnimal(@NotNull IArguments arguments) throws LuaException {
-        Optional<LuaTable<?, ?>> optOptions = arguments.optTableUnsafe(0);
-        LuaTable<?, ?> options = EmptyLuaTable.INSTANCE;
-        if (optOptions.isPresent())
-            options = optOptions.get();
+        LuaTable<?, ?> options = EmptyLuaTable.orEmpty(arguments.optTable(0).orElse(null));
 
         float yaw = options.optDouble("yaw").orElse(0d).floatValue();
         float pitch = options.optDouble( "pitch").orElse(0d).floatValue();

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

@@ -22,7 +22,6 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import java.util.Optional;
 import java.util.function.Predicate;
 
 import static de.srendi.advancedperipherals.common.addons.computercraft.operations.SingleOperation.CAPTURE_ANIMAL;
@@ -76,10 +75,7 @@ protected Entity extractEntity() {
 
     @LuaFunction(mainThread = true)
     public final MethodResult captureAnimal(@NotNull IArguments arguments) throws LuaException {
-        Optional<LuaTable<?, ?>> optOptions = arguments.optTableUnsafe(0);
-        LuaTable<?, ?> options = EmptyLuaTable.INSTANCE;
-        if (optOptions.isPresent())
-            options = optOptions.get();
+        LuaTable<?, ?> options = EmptyLuaTable.orEmpty(arguments.optTable(0).orElse(null));
 
         float yaw = options.optDouble("yaw").orElse(0d).floatValue();
         float pitch = options.optDouble( "pitch").orElse(0d).floatValue();

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

@@ -20,7 +20,6 @@
 import org.jetbrains.annotations.NotNull;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 
 public class AutomataLookPlugin extends AutomataCorePlugin {
 
@@ -30,10 +29,7 @@ public AutomataLookPlugin(AutomataCorePeripheral automataCore) {
 
     @LuaFunction(mainThread = true)
     public final MethodResult lookAtBlock(@NotNull IArguments arguments) throws LuaException {
-        Optional<LuaTable<?, ?>> optOptions = arguments.optTableUnsafe(0);
-        LuaTable<?, ?> options = EmptyLuaTable.INSTANCE;
-        if (optOptions.isPresent())
-            options = optOptions.get();
+        LuaTable<?, ?> options = EmptyLuaTable.orEmpty(arguments.optTable(0).orElse(null));
 
         float yaw = options.optDouble("yaw").orElse(0d).floatValue();
         float pitch = options.optDouble( "pitch").orElse(0d).floatValue();
@@ -56,10 +52,7 @@ public final MethodResult lookAtBlock(@NotNull IArguments arguments) throws LuaE
 
     @LuaFunction(mainThread = true)
     public final MethodResult lookAtEntity(@NotNull IArguments arguments) throws LuaException {
-        Optional<LuaTable<?, ?>> optOptions = arguments.optTableUnsafe(0);
-        LuaTable<?, ?> options = EmptyLuaTable.INSTANCE;
-        if (optOptions.isPresent())
-            options = optOptions.get();
+        LuaTable<?, ?> options = EmptyLuaTable.orEmpty(arguments.optTable(0).orElse(null));
 
         float yaw = options.optDouble("yaw").orElse(0d).floatValue();
         float pitch = options.optDouble( "pitch").orElse(0d).floatValue();

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

@@ -1,11 +1,13 @@
 package de.srendi.advancedperipherals.common.util;
 
 import dan200.computercraft.api.lua.LuaTable;
+import dan200.computercraft.api.lua.ObjectLuaTable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 public class EmptyLuaTable implements LuaTable<Object, Object> {
@@ -55,4 +57,11 @@ public Collection<Object> values() {
     public Set<Entry<Object, Object>> entrySet() {
         return Set.of();
     }
+
+    public static LuaTable<Object, Object> orEmpty(@Nullable Map<?, ?> table) {
+        if (table == null)
+            return INSTANCE;
+        return new ObjectLuaTable(table);
+    }
+
 }