Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused capability.

Browse Source
This commit is contained in:
Florian Nücke
2020-12-29 12:54:30 +01:00
parent ab640cf3b9
commit bb3c59d8a2
10 changed files with 16 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/common/block/BusCableBlock.java
View File

@@ -294,7 +294,7 @@ public final class BusCableBlock extends Block {
return false;
}
return tileEntity.getCapability(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, facing.getOpposite()).isPresent();
return tileEntity.getCapability(Capabilities.DEVICE_BUS_ELEMENT, facing.getOpposite()).isPresent();
}
private void onConnectionTypeChanged(final IWorld world, final BlockPos pos, final Direction face) {

4
src/main/java/li/cil/oc2/common/block/entity/BusCableTileEntity.java
View File

@@ -34,7 +34,7 @@ public final class BusCableTileEntity extends AbstractTileEntity {
}
public void handleConnectionTypeChanged(final Direction side) {
invalidateCapability(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, side);
invalidateCapability(Capabilities.DEVICE_BUS_ELEMENT, side);
handleNeighborChanged(getPos().offset(side));
}
@@ -56,7 +56,7 @@ public final class BusCableTileEntity extends AbstractTileEntity {
@Override
protected void collectCapabilities(final CapabilityCollector collector, @Nullable final Direction direction) {
if (BusCableBlock.getConnectionType(getBlockState(), direction) != BusCableBlock.ConnectionType.NONE) {
collector.offer(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, busElement);
collector.offer(Capabilities.DEVICE_BUS_ELEMENT, busElement);
}
}

2
src/main/java/li/cil/oc2/common/block/entity/ComputerTileEntity.java
View File

@@ -275,7 +275,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic
@Override
protected void collectCapabilities(final CapabilityCollector collector, @Nullable final Direction direction) {
collector.offer(Capabilities.ITEM_HANDLER_CAPABILITY, itemHandlers);
collector.offer(Capabilities.ITEM_HANDLER, itemHandlers);
}
@Override

4
src/main/java/li/cil/oc2/common/bus/TileEntityDeviceBusElement.java
View File

@@ -70,7 +70,7 @@ public class TileEntityDeviceBusElement extends AbstractGroupingBlockDeviceBusEl
continue;
}
final LazyOptional<DeviceBusElement> capability = tileEntity.getCapability(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, neighborDirection.getOpposite());
final LazyOptional<DeviceBusElement> capability = tileEntity.getCapability(Capabilities.DEVICE_BUS_ELEMENT, neighborDirection.getOpposite());
if (capability.isPresent()) {
neighbors.add(capability);
}
@@ -149,7 +149,7 @@ public class TileEntityDeviceBusElement extends AbstractGroupingBlockDeviceBusEl
}
final LazyOptional<DeviceBusElement> capability = tileEntity
.getCapability(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY, direction.getOpposite());
.getCapability(Capabilities.DEVICE_BUS_ELEMENT, direction.getOpposite());
capability.ifPresent(DeviceBus::scheduleScan);
}
}

2
src/main/java/li/cil/oc2/common/bus/device/provider/EnergyStorageBlockDeviceProvider.java
View File

@@ -17,7 +17,7 @@ public final class EnergyStorageBlockDeviceProvider extends AbstractTileEntityCa
///////////////////////////////////////////////////////////////////
public EnergyStorageBlockDeviceProvider() {
super(() -> Capabilities.ENERGY_STORAGE_CAPABILITY);
super(() -> Capabilities.ENERGY_STORAGE);
}
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/bus/device/provider/FluidHandlerBlockDeviceProvider.java
View File

@@ -18,7 +18,7 @@ public final class FluidHandlerBlockDeviceProvider extends AbstractTileEntityCap
///////////////////////////////////////////////////////////////////
public FluidHandlerBlockDeviceProvider() {
super(() -> Capabilities.FLUID_HANDLER_CAPABILITY);
super(() -> Capabilities.FLUID_HANDLER);
}
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/bus/device/provider/ItemHandlerBlockDeviceProvider.java
View File

@@ -18,7 +18,7 @@ public final class ItemHandlerBlockDeviceProvider extends AbstractTileEntityCapa
///////////////////////////////////////////////////////////////////
public ItemHandlerBlockDeviceProvider() {
super(() -> Capabilities.ITEM_HANDLER_CAPABILITY);
super(() -> Capabilities.ITEM_HANDLER);
}
///////////////////////////////////////////////////////////////////

17
src/main/java/li/cil/oc2/common/capabilities/Capabilities.java
View File

@@ -1,6 +1,5 @@
package li.cil.oc2.common.capabilities;
import li.cil.oc2.api.bus.DeviceBusController;
import li.cil.oc2.api.bus.DeviceBusElement;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.CapabilityInject;
@@ -9,25 +8,21 @@ import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandler;
public final class Capabilities {
@CapabilityInject(DeviceBusElement.class)
public static Capability<DeviceBusElement> DEVICE_BUS_ELEMENT_CAPABILITY = null;
@CapabilityInject(DeviceBusController.class)
public static Capability<DeviceBusController> DEVICE_BUS_CONTROLLER_CAPABILITY = null;
@CapabilityInject(IEnergyStorage.class)
public static Capability<IEnergyStorage> ENERGY_STORAGE_CAPABILITY = null;
public static Capability<IEnergyStorage> ENERGY_STORAGE = null;
@CapabilityInject(IFluidHandler.class)
public static Capability<IFluidHandler> FLUID_HANDLER_CAPABILITY = null;
public static Capability<IFluidHandler> FLUID_HANDLER = null;
@CapabilityInject(IItemHandler.class)
public static Capability<IItemHandler> ITEM_HANDLER_CAPABILITY = null;
public static Capability<IItemHandler> ITEM_HANDLER = null;
@CapabilityInject(DeviceBusElement.class)
public static Capability<DeviceBusElement> DEVICE_BUS_ELEMENT = null;
///////////////////////////////////////////////////////////////////
public static void initialize() {
DeviceBusElementCapability.register();
DeviceBusControllerCapability.register();
}
}

21
src/main/java/li/cil/oc2/common/capabilities/DeviceBusControllerCapability.java
View File

@@ -1,21 +0,0 @@
package li.cil.oc2.common.capabilities;
import li.cil.oc2.api.bus.DeviceBusController;
import li.cil.oc2.common.bus.AbstractDeviceBusController;
import net.minecraftforge.common.capabilities.CapabilityManager;
import java.util.Objects;
public final class DeviceBusControllerCapability {
public static void register() {
CapabilityManager.INSTANCE.register(DeviceBusController.class, new NullStorage<>(), Implementation::new);
}
///////////////////////////////////////////////////////////////////
private static class Implementation extends AbstractDeviceBusController {
protected Implementation() {
super(Objects.requireNonNull(Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY.getDefaultInstance()));
}
}
}

2
src/test/java/li/cil/oc2/common/bus/DeviceBusTests.java
View File

@@ -37,7 +37,7 @@ public class DeviceBusTests {
@BeforeEach
public void setupEach() {
MockitoAnnotations.initMocks(this);
Capabilities.DEVICE_BUS_ELEMENT_CAPABILITY = busElementCapability;
Capabilities.DEVICE_BUS_ELEMENT = busElementCapability;
busControllerBusElement = mock(DeviceBusElement.class);
when(busControllerBusElement.getLocalDevices()).thenReturn(emptyList());