Flip default for callback synchronization.

Synced is likely to be more common and the safer default.
This commit is contained in:
Florian Nücke
2020-11-30 19:30:07 +01:00
parent 68def32f52
commit d3116edf36
5 changed files with 13 additions and 13 deletions

View File

@@ -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.

View File

@@ -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();
}

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -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);