From 671c50dfacfe025917468d6f44611799ebb8b43a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sun, 17 Jan 2021 13:16:20 +0100
Subject: [PATCH] Make some methods callable from worker thread.

---
 .../InventoryAutomationRobotModuleDevice.java | 20 +++++++++++--------
 .../li/cil/oc2/common/entity/RobotEntity.java |  6 +++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/li/cil/oc2/common/bus/device/item/InventoryAutomationRobotModuleDevice.java b/src/main/java/li/cil/oc2/common/bus/device/item/InventoryAutomationRobotModuleDevice.java
index 1f253618..c414f0cd 100644
--- a/src/main/java/li/cil/oc2/common/bus/device/item/InventoryAutomationRobotModuleDevice.java
+++ b/src/main/java/li/cil/oc2/common/bus/device/item/InventoryAutomationRobotModuleDevice.java
@@ -86,7 +86,9 @@ public final class InventoryAutomationRobotModuleDevice<T extends Entity & Robot
             return;
         }
 
-        ItemStack stack = robot.getInventory().extractItem(robot.getSelectedSlot(), count, false);
+        final int selectedSlot = robot.getSelectedSlot(); // Get once to avoid intermittent change due to threading.
+
+        ItemStack stack = robot.getInventory().extractItem(selectedSlot, count, false);
         if (stack.isEmpty()) {
             return;
         }
@@ -98,7 +100,7 @@ public final class InventoryAutomationRobotModuleDevice<T extends Entity & Robot
 
         final boolean droppedSome = stack.getCount() != originalStackSize;
         if (!stack.isEmpty() && droppedSome) {
-            stack = robot.getInventory().insertItem(robot.getSelectedSlot(), stack, false);
+            stack = robot.getInventory().insertItem(selectedSlot, stack, false);
         }
 
         if (!stack.isEmpty()) {
@@ -108,13 +110,15 @@ public final class InventoryAutomationRobotModuleDevice<T extends Entity & Robot
 
     @Callback
     public void dropInto(@Parameter("intoSlot") final int intoSlot,
-                  @Parameter("count") final int count,
-                  @Parameter("direction") @Nullable final Direction direction) {
+                         @Parameter("count") final int count,
+                         @Parameter("direction") @Nullable final Direction direction) {
         if (count <= 0) {
             return;
         }
 
-        ItemStack stack = robot.getInventory().extractItem(robot.getSelectedSlot(), count, false);
+        final int selectedSlot = robot.getSelectedSlot(); // Get once to avoid intermittent change due to threading.
+
+        ItemStack stack = robot.getInventory().extractItem(selectedSlot, count, false);
         if (stack.isEmpty()) {
             return;
         }
@@ -129,7 +133,7 @@ public final class InventoryAutomationRobotModuleDevice<T extends Entity & Robot
 
         final boolean droppedSome = stack.getCount() != originalStackSize;
         if (!stack.isEmpty() && droppedSome) {
-            stack = robot.getInventory().insertItem(robot.getSelectedSlot(), stack, false);
+            stack = robot.getInventory().insertItem(selectedSlot, stack, false);
         }
 
         if (!stack.isEmpty()) {
@@ -145,7 +149,7 @@ public final class InventoryAutomationRobotModuleDevice<T extends Entity & Robot
         }
 
         final ItemStackHandler inventory = robot.getInventory();
-        final int selectedSlot = robot.getSelectedSlot();
+        final int selectedSlot = robot.getSelectedSlot(); // Get once to avoid intermittent change due to threading.
 
         final List<IItemHandler> handlers = getItemStackHandlersInDirection(getAdjustedDirection(direction)).collect(Collectors.toList());
         for (final IItemHandler handler : handlers) {
@@ -184,7 +188,7 @@ public final class InventoryAutomationRobotModuleDevice<T extends Entity & Robot
         }
 
         final ItemStackHandler inventory = robot.getInventory();
-        final int selectedSlot = robot.getSelectedSlot();
+        final int selectedSlot = robot.getSelectedSlot(); // Get once to avoid intermittent change due to threading.
 
         final Optional<IItemHandler> optional = getItemStackHandlersInDirection(getAdjustedDirection(direction)).findFirst();
         if (optional.isPresent()) {
diff --git a/src/main/java/li/cil/oc2/common/entity/RobotEntity.java b/src/main/java/li/cil/oc2/common/entity/RobotEntity.java
index b50be0b8..de55891e 100644
--- a/src/main/java/li/cil/oc2/common/entity/RobotEntity.java
+++ b/src/main/java/li/cil/oc2/common/entity/RobotEntity.java
@@ -879,17 +879,17 @@ public final class RobotEntity extends Entity implements Robot {
             return null;
         }
 
-        @Callback
+        @Callback(synchronize = false)
         public int getSelectedSlot() {
             return RobotEntity.this.getSelectedSlot();
         }
 
-        @Callback
+        @Callback(synchronize = false)
         public void setSelectedSlot(@Parameter("slot") final int slot) {
             RobotEntity.this.setSelectedSlot(slot);
         }
 
-        @Callback
+        @Callback(synchronize = false)
         public ItemStack getStackInSlot(@Parameter("slot") final int slot) {
             return inventory.getStackInSlot(slot);
         }