From e6d3316ae12d4690cac33acbd06b1496df0d6d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Tue, 15 Dec 2020 04:21:39 +0100 Subject: [PATCH] Fixed method name. --- .../bus/device/provider/EnergyStorageDeviceProvider.java | 2 +- .../bus/device/provider/FluidHandlerDeviceProvider.java | 2 +- .../bus/device/provider/ItemHandlerDeviceProvider.java | 2 +- .../util/AbstractCapabilityTileEntityDeviceProvider.java | 6 +++--- .../provider/util/AbstractTileEntityDeviceProvider.java | 4 ++-- .../bus/device/provider/util/TileEntityDeviceProvider.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageDeviceProvider.java index ab643146..c03db2ba 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageDeviceProvider.java @@ -22,7 +22,7 @@ public class EnergyStorageDeviceProvider extends AbstractCapabilityAnyTileEntity /////////////////////////////////////////////////////////////////// @Override - protected LazyOptional getDeviceInterface(final BlockDeviceQuery query, final IEnergyStorage value) { + protected LazyOptional getDevice(final BlockDeviceQuery query, final IEnergyStorage value) { return LazyOptional.of(() -> new ObjectDevice(new EnergyStorageDevice(value), ENERGY_STORAGE_TYPE_NAME)); } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerDeviceProvider.java index d0dca663..a9782913 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerDeviceProvider.java @@ -23,7 +23,7 @@ public class FluidHandlerDeviceProvider extends AbstractCapabilityAnyTileEntityD /////////////////////////////////////////////////////////////////// @Override - protected LazyOptional getDeviceInterface(final BlockDeviceQuery query, final IFluidHandler value) { + protected LazyOptional getDevice(final BlockDeviceQuery query, final IFluidHandler value) { return LazyOptional.of(() -> new ObjectDevice(new FluidHandlerDevice(value), FLUID_HANDLER_TYPE_NAME)); } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerDeviceProvider.java index 802511eb..5921118a 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerDeviceProvider.java @@ -23,7 +23,7 @@ public class ItemHandlerDeviceProvider extends AbstractCapabilityAnyTileEntityDe /////////////////////////////////////////////////////////////////// @Override - protected LazyOptional getDeviceInterface(final BlockDeviceQuery query, final IItemHandler value) { + protected LazyOptional getDevice(final BlockDeviceQuery query, final IItemHandler value) { return LazyOptional.of(() -> new ObjectDevice(new ItemHandlerDevice(value), ITEM_HANDLER_TYPE_NAME)); } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityTileEntityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityTileEntityDeviceProvider.java index 0c042ccb..77cb185c 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityTileEntityDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractCapabilityTileEntityDeviceProvider.java @@ -19,7 +19,7 @@ public abstract class AbstractCapabilityTileEntityDeviceProvider getDeviceInterface(final BlockDeviceQuery blockQuery, final TileEntity tileEntity) { + protected final LazyOptional getDevice(final BlockDeviceQuery blockQuery, final TileEntity tileEntity) { final Capability capability = capabilitySupplier.get(); if (capability == null) throw new IllegalStateException(); final LazyOptional optional = tileEntity.getCapability(capability, blockQuery.getQuerySide()); @@ -28,10 +28,10 @@ public abstract class AbstractCapabilityTileEntityDeviceProvider device = getDeviceInterface(blockQuery, value); + final LazyOptional device = getDevice(blockQuery, value); optional.addListener(ignored -> device.invalidate()); return device; } - protected abstract LazyOptional getDeviceInterface(final BlockDeviceQuery query, final TCapability value); + protected abstract LazyOptional getDevice(final BlockDeviceQuery query, final TCapability value); } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractTileEntityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractTileEntityDeviceProvider.java index 12f666f1..0076c927 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractTileEntityDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/AbstractTileEntityDeviceProvider.java @@ -30,10 +30,10 @@ public abstract class AbstractTileEntityDeviceProvider imp return LazyOptional.empty(); } - return getDeviceInterface(blockQuery, (T) tileEntity); + return getDevice(blockQuery, (T) tileEntity); } /////////////////////////////////////////////////////////////////// - protected abstract LazyOptional getDeviceInterface(final BlockDeviceQuery query, final T tileEntity); + protected abstract LazyOptional getDevice(final BlockDeviceQuery query, final T tileEntity); } diff --git a/src/main/java/li/cil/oc2/common/bus/device/provider/util/TileEntityDeviceProvider.java b/src/main/java/li/cil/oc2/common/bus/device/provider/util/TileEntityDeviceProvider.java index 198364b9..4bf683b7 100644 --- a/src/main/java/li/cil/oc2/common/bus/device/provider/util/TileEntityDeviceProvider.java +++ b/src/main/java/li/cil/oc2/common/bus/device/provider/util/TileEntityDeviceProvider.java @@ -14,7 +14,7 @@ public final class TileEntityDeviceProvider extends AbstractTileEntityDeviceProv } @Override - public LazyOptional getDeviceInterface(final BlockDeviceQuery query, final TileEntity tileEntity) { + public LazyOptional getDevice(final BlockDeviceQuery query, final TileEntity tileEntity) { if (Callbacks.hasMethods(tileEntity)) { return LazyOptional.of(() -> { final String typeName = WorldUtils.getBlockName(query.getWorld(), query.getQueryPosition());