From d3116edf36cb991927e54111797bf678d86d7f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Mon, 30 Nov 2020 19:30:07 +0100
Subject: [PATCH] Flip default for callback synchronization. Synced is likely
 to be more common and the safer default.

---
 src/main/java/li/cil/oc2/api/device/object/Callback.java  | 2 +-
 .../device/provider/EnergyStorageDeviceProvider.java      | 8 ++++----
 .../device/provider/FluidHandlerDeviceProvider.java       | 6 +++---
 .../common/device/provider/ItemHandlerDeviceProvider.java | 6 +++---
 .../java/li/cil/oc2/vm/ObjectDeviceProtocolTests.java     | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/li/cil/oc2/api/device/object/Callback.java b/src/main/java/li/cil/oc2/api/device/object/Callback.java
index b5a17ad4..06152dca 100644
--- a/src/main/java/li/cil/oc2/api/device/object/Callback.java
+++ b/src/main/java/li/cil/oc2/api/device/object/Callback.java
@@ -31,7 +31,7 @@ public @interface Callback {
      * safe, for example the world or any objects inside the world, such as
      * tile entities and entities.
      */
-    boolean synchronize() default false;
+    boolean synchronize() default true;
 
     /**
      * Option VM visible documentation of this method.
diff --git a/src/main/java/li/cil/oc2/common/device/provider/EnergyStorageDeviceProvider.java b/src/main/java/li/cil/oc2/common/device/provider/EnergyStorageDeviceProvider.java
index d7d899df..a799c9cf 100644
--- a/src/main/java/li/cil/oc2/common/device/provider/EnergyStorageDeviceProvider.java
+++ b/src/main/java/li/cil/oc2/common/device/provider/EnergyStorageDeviceProvider.java
@@ -24,22 +24,22 @@ public class EnergyStorageDeviceProvider extends AbstractCapabilityBlockDevicePr
             this.energyStorage = energyStorage;
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public int getEnergyStored() {
             return energyStorage.getEnergyStored();
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public int getMaxEnergyStored() {
             return energyStorage.getMaxEnergyStored();
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public boolean canExtract() {
             return energyStorage.canExtract();
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public boolean canReceive() {
             return energyStorage.canReceive();
         }
diff --git a/src/main/java/li/cil/oc2/common/device/provider/FluidHandlerDeviceProvider.java b/src/main/java/li/cil/oc2/common/device/provider/FluidHandlerDeviceProvider.java
index 863023d8..6e1374b8 100644
--- a/src/main/java/li/cil/oc2/common/device/provider/FluidHandlerDeviceProvider.java
+++ b/src/main/java/li/cil/oc2/common/device/provider/FluidHandlerDeviceProvider.java
@@ -25,17 +25,17 @@ public class FluidHandlerDeviceProvider extends AbstractCapabilityBlockDevicePro
             this.fluidHandler = fluidHandler;
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public int getTanks() {
             return fluidHandler.getTanks();
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public FluidStack getFluidInTank(final int tank) {
             return fluidHandler.getFluidInTank(tank);
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public int getTankCapacity(final int tank) {
             return fluidHandler.getTankCapacity(tank);
         }
diff --git a/src/main/java/li/cil/oc2/common/device/provider/ItemHandlerDeviceProvider.java b/src/main/java/li/cil/oc2/common/device/provider/ItemHandlerDeviceProvider.java
index 16391df2..2a5c1d3b 100644
--- a/src/main/java/li/cil/oc2/common/device/provider/ItemHandlerDeviceProvider.java
+++ b/src/main/java/li/cil/oc2/common/device/provider/ItemHandlerDeviceProvider.java
@@ -25,17 +25,17 @@ public class ItemHandlerDeviceProvider extends AbstractCapabilityBlockDeviceProv
             this.itemHandler = itemHandler;
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public int getSlots() {
             return itemHandler.getSlots();
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public ItemStack getStackInSlot(final int slot) {
             return itemHandler.getStackInSlot(slot);
         }
 
-        @Callback(synchronize = true)
+        @Callback
         public int getSlotLimit(final int slot) {
             return itemHandler.getSlotLimit(slot);
         }
diff --git a/src/test/java/li/cil/oc2/vm/ObjectDeviceProtocolTests.java b/src/test/java/li/cil/oc2/vm/ObjectDeviceProtocolTests.java
index 6c2efe6f..963c65ff 100644
--- a/src/test/java/li/cil/oc2/vm/ObjectDeviceProtocolTests.java
+++ b/src/test/java/li/cil/oc2/vm/ObjectDeviceProtocolTests.java
@@ -178,13 +178,13 @@ public class ObjectDeviceProtocolTests {
     }
 
     public static final class SimpleObject {
-        @Callback
+        @Callback(synchronize = false)
         public int add(@Parameter("a") final int a,
                        @Parameter("b") final int b) {
             return a + b;
         }
 
-        @Callback
+        @Callback(synchronize = false)
         public int div(@Parameter("a") final long a,
                        @Parameter("b") final long b) {
             return (int) (a / b);