diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java index 30faf6c35..4b1efd2a7 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -224,7 +224,11 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { return world; } - public boolean canConduct(@Nullable Direction direction) { + /** + * @param direction the direction + * @return whether a network signal can be conducted in the given direction. + */ + protected boolean canConduct(Direction direction) { return true; } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java index b5436dd7b..9e4cec24f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java @@ -7,8 +7,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import javax.annotation.Nullable; - public class RelayNetworkNode extends NetworkNode { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "relay"); @@ -39,7 +37,7 @@ public class RelayNetworkNode extends NetworkNode { } @Override - public boolean canConduct(@Nullable Direction direction) { + protected boolean canConduct(Direction direction) { return canUpdate(); } diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java index aa4c8c855..70cdcb72d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java +++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java @@ -15,8 +15,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandler; -import javax.annotation.Nullable; - public class WirelessTransmitterNetworkNode extends NetworkNode implements IWirelessTransmitter { public static final ResourceLocation ID = new ResourceLocation(RS.ID, "wireless_transmitter"); @@ -77,7 +75,7 @@ public class WirelessTransmitterNetworkNode extends NetworkNode implements IWire } @Override - public boolean canConduct(@Nullable Direction direction) { + protected boolean canConduct(Direction direction) { return Direction.DOWN.equals(direction); } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java index 60b86f737..5aa3ad32e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java @@ -94,7 +94,7 @@ public class ConstructorBlock extends CableBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (!world.isRemote && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getHitVec())) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.constructor"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java index 7f90d34fd..88fd73e94 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java @@ -141,7 +141,7 @@ public class ControllerBlock extends BaseBlock { } if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new INamedContainerProvider() { @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java index 181ced569..51c77564f 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java @@ -62,7 +62,7 @@ public class CrafterBlock extends ColoredNetworkBlock { } if (!world.isRemote) { - return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( ((CrafterTile) world.getTileEntity(pos)).getNode().getName(), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java index e12fb9d7b..7df96a15b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java @@ -45,7 +45,7 @@ public class CrafterManagerBlock extends ColoredNetworkBlock { } if (!world.isRemote) { - return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new CrafterManagerContainerProvider((CrafterManagerTile) world.getTileEntity(pos)), buf -> CrafterManagerContainerProvider.writeToBuffer(buf, world, pos) diff --git a/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java index 0dd1cdff2..a3c5073e5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java @@ -48,7 +48,7 @@ public class CraftingMonitorBlock extends ColoredNetworkBlock { if (!world.isRemote) { CraftingMonitorTile tile = (CraftingMonitorTile) world.getTileEntity(pos); - return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new CraftingMonitorContainerProvider(RSContainers.CRAFTING_MONITOR, tile.getNode(), tile), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java index 7ce53a36a..c587de070 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java @@ -94,7 +94,7 @@ public class DestructorBlock extends CableBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getHitVec())) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.destructor"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java index d853643aa..62c78217a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java @@ -74,7 +74,7 @@ public class DetectorBlock extends ColoredNetworkBlock { } if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.detector"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java index 820cff2e0..28be0d7d6 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java @@ -40,7 +40,7 @@ public class DiskDriveBlock extends NetworkNodeBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult rayTraceResult) { if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, rayTraceResult.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.disk_drive"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java index 6be3cf7af..71c78bcbf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java @@ -41,7 +41,7 @@ public class DiskManipulatorBlock extends ColoredNetworkBlock { } if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, rayTraceResult.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.disk_manipulator"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java index 76b83a2e8..c8788e9a9 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java @@ -117,7 +117,7 @@ public class ExporterBlock extends CableBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (!world.isRemote && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getHitVec())) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.exporter"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java index e5c73ff8d..0a96357e1 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java @@ -98,7 +98,7 @@ public class ExternalStorageBlock extends CableBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (!world.isRemote && CollisionUtils.isInBounds(getHeadShape(state), pos, hit.getHitVec())) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.external_storage"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java index dfd2fa56a..8be626ac4 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java @@ -36,7 +36,7 @@ public class FluidInterfaceBlock extends NetworkNodeBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { - return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.fluid_interface"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java index 8c7fb9a2b..46883b32e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java @@ -62,7 +62,7 @@ public class FluidStorageBlock extends NetworkNodeBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( ((FluidStorageTile) world.getTileEntity(pos)).getNode().getTitle(), (tile, windowId, inventory, p) -> new FluidStorageContainer(tile, player, windowId), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java index 4921584d9..9d55a0bcc 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java @@ -73,7 +73,7 @@ public class GridBlock extends ColoredNetworkBlock { } if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> API.instance().getGridManager().openGrid(GridBlockGridFactory.ID, (ServerPlayerEntity) player, pos)); + return NetworkUtils.attemptModify(world, pos, player, () -> API.instance().getGridManager().openGrid(GridBlockGridFactory.ID, (ServerPlayerEntity) player, pos)); } return ActionResultType.SUCCESS; diff --git a/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java index 24f2b7cd9..b34077769 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java @@ -117,7 +117,7 @@ public class ImporterBlock extends CableBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (!world.isRemote && CollisionUtils.isInBounds(getLineShape(state), pos, hit.getHitVec())) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.importer"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java index 0cc4b0b64..4e5a305bf 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java @@ -36,7 +36,7 @@ public class InterfaceBlock extends NetworkNodeBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { - return NetworkUtils.attempt(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attempt(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.interface"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java index 5a9c9a5a7..a86d5032b 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java @@ -41,7 +41,7 @@ public class NetworkTransmitterBlock extends ColoredNetworkBlock { } if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.network_transmitter"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java index d8f0f1352..8d7f0455e 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java @@ -41,7 +41,7 @@ public class RelayBlock extends ColoredNetworkBlock { } if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.relay"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java index adb936407..a3137ed6a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java @@ -54,7 +54,7 @@ public class SecurityManagerBlock extends ColoredNetworkBlock { if (player.getGameProfile().getId().equals(((SecurityManagerTile) world.getTileEntity(pos)).getNode().getOwner())) { action.run(); } else { - return NetworkUtils.attempt(world, pos, hit.getFace(), player, action, Permission.MODIFY, Permission.SECURITY); + return NetworkUtils.attempt(world, pos, player, action, Permission.MODIFY, Permission.SECURITY); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java index 81022779a..968cbb4d5 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java @@ -62,7 +62,7 @@ public class StorageBlock extends NetworkNodeBlock { @SuppressWarnings("deprecation") public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider( ((StorageTile) world.getTileEntity(pos)).getNode().getTitle(), (tile, windowId, inventory, p) -> new StorageContainer(tile, player, windowId), pos diff --git a/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java index 13d2416f4..7869aed4d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java @@ -47,7 +47,7 @@ public class StorageMonitorBlock extends NetworkNodeBlock { ItemStack held = player.inventory.getCurrentItem(); if (player.isCrouching()) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.storage_monitor"), diff --git a/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java index fa592820c..64e4c4577 100644 --- a/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java +++ b/src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java @@ -82,7 +82,7 @@ public class WirelessTransmitterBlock extends ColoredNetworkBlock { } if (!world.isRemote) { - return NetworkUtils.attemptModify(world, pos, hit.getFace(), player, () -> NetworkHooks.openGui( + return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui( (ServerPlayerEntity) player, new PositionalTileContainerProvider( new TranslationTextComponent("gui.refinedstorage.wireless_transmitter"), @@ -95,4 +95,4 @@ public class WirelessTransmitterBlock extends ColoredNetworkBlock { return ActionResultType.SUCCESS; } -} \ No newline at end of file +} diff --git a/src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java b/src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java index 8b3803849..e9061cada 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java @@ -32,7 +32,7 @@ public class NetworkHandler { handler.registerMessage(id++, StorageDiskSizeResponseMessage.class, StorageDiskSizeResponseMessage::encode, StorageDiskSizeResponseMessage::decode, StorageDiskSizeResponseMessage::handle); handler.registerMessage(id++, FilterUpdateMessage.class, FilterUpdateMessage::encode, FilterUpdateMessage::decode, FilterUpdateMessage::handle); handler.registerMessage(id++, FluidFilterSlotUpdateMessage.class, FluidFilterSlotUpdateMessage::encode, FluidFilterSlotUpdateMessage::decode, FluidFilterSlotUpdateMessage::handle); - handler.registerMessage(id++, TileDataParameterMessage.class, TileDataParameterMessage::encode, TileDataParameterMessage::decode, TileDataParameterMessage::handle); + handler.registerMessage(id++, TileDataParameterMessage.class, TileDataParameterMessage::encode, TileDataParameterMessage::decode, (msg, ctx) -> TileDataParameterMessage.handle(ctx)); handler.registerMessage(id++, TileDataParameterUpdateMessage.class, TileDataParameterUpdateMessage::encode, TileDataParameterUpdateMessage::decode, TileDataParameterUpdateMessage::handle); handler.registerMessage(id++, GridItemUpdateMessage.class, GridItemUpdateMessage::encode, GridItemUpdateMessage::decode, GridItemUpdateMessage::handle); handler.registerMessage(id++, GridItemDeltaMessage.class, GridItemDeltaMessage::encode, GridItemDeltaMessage::decode, GridItemDeltaMessage::handle); @@ -40,13 +40,15 @@ public class NetworkHandler { handler.registerMessage(id++, GridItemGridScrollMessage.class, GridItemGridScrollMessage::encode, GridItemGridScrollMessage::decode, GridItemGridScrollMessage::handle); handler.registerMessage(id++, GridItemInventoryScrollMessage.class, GridItemInventoryScrollMessage::encode, GridItemInventoryScrollMessage::decode, GridItemInventoryScrollMessage::handle); handler.registerMessage(id++, GridItemInsertHeldMessage.class, GridItemInsertHeldMessage::encode, GridItemInsertHeldMessage::decode, GridItemInsertHeldMessage::handle); - handler.registerMessage(id++, GridClearMessage.class, GridClearMessage::encode, GridClearMessage::decode, GridClearMessage::handle); + handler.registerMessage(id++, GridClearMessage.class, (msg, buf) -> { + }, buf -> new GridClearMessage(), (msg, ctx) -> GridClearMessage.handle(ctx)); handler.registerMessage(id++, GridPatternCreateMessage.class, GridPatternCreateMessage::encode, GridPatternCreateMessage::decode, GridPatternCreateMessage::handle); handler.registerMessage(id++, SetFilterSlotMessage.class, SetFilterSlotMessage::encode, SetFilterSlotMessage::decode, SetFilterSlotMessage::handle); handler.registerMessage(id++, SetFluidFilterSlotMessage.class, SetFluidFilterSlotMessage::encode, SetFluidFilterSlotMessage::decode, SetFluidFilterSlotMessage::handle); handler.registerMessage(id++, GridFluidUpdateMessage.class, GridFluidUpdateMessage::encode, GridFluidUpdateMessage::decode, GridFluidUpdateMessage::handle); handler.registerMessage(id++, GridFluidDeltaMessage.class, GridFluidDeltaMessage::encode, GridFluidDeltaMessage::decode, GridFluidDeltaMessage::handle); - handler.registerMessage(id++, GridFluidInsertHeldMessage.class, GridFluidInsertHeldMessage::encode, GridFluidInsertHeldMessage::decode, GridFluidInsertHeldMessage::handle); + handler.registerMessage(id++, GridFluidInsertHeldMessage.class, (msg, buf) -> { + }, buf -> new GridFluidInsertHeldMessage(), (msg, ctx) -> GridFluidInsertHeldMessage.handle(ctx)); handler.registerMessage(id++, GridFluidPullMessage.class, GridFluidPullMessage::encode, GridFluidPullMessage::decode, GridFluidPullMessage::handle); handler.registerMessage(id++, GridTransferMessage.class, GridTransferMessage::encode, GridTransferMessage::decode, GridTransferMessage::handle); handler.registerMessage(id++, GridProcessingTransferMessage.class, GridProcessingTransferMessage::encode, GridProcessingTransferMessage::decode, GridProcessingTransferMessage::handle); @@ -62,7 +64,8 @@ public class NetworkHandler { handler.registerMessage(id++, GridCraftingPreviewRequestMessage.class, GridCraftingPreviewRequestMessage::encode, GridCraftingPreviewRequestMessage::decode, GridCraftingPreviewRequestMessage::handle); handler.registerMessage(id++, GridCraftingPreviewResponseMessage.class, GridCraftingPreviewResponseMessage::encode, GridCraftingPreviewResponseMessage::decode, GridCraftingPreviewResponseMessage::handle); handler.registerMessage(id++, GridCraftingStartRequestMessage.class, GridCraftingStartRequestMessage::encode, GridCraftingStartRequestMessage::decode, GridCraftingStartRequestMessage::handle); - handler.registerMessage(id++, GridCraftingStartResponseMessage.class, GridCraftingStartResponseMessage::encode, GridCraftingStartResponseMessage::decode, GridCraftingStartResponseMessage::handle); + handler.registerMessage(id++, GridCraftingStartResponseMessage.class, (msg, buf) -> { + }, buf -> new GridCraftingStartResponseMessage(), (msg, ctx) -> GridCraftingStartResponseMessage.handle(ctx)); handler.registerMessage(id++, CraftingMonitorUpdateMessage.class, CraftingMonitorUpdateMessage::encode, CraftingMonitorUpdateMessage::decode, CraftingMonitorUpdateMessage::handle); handler.registerMessage(id++, CraftingMonitorCancelMessage.class, CraftingMonitorCancelMessage::encode, CraftingMonitorCancelMessage::decode, CraftingMonitorCancelMessage::handle); handler.registerMessage(id++, WirelessCraftingMonitorSettingsUpdateMessage.class, WirelessCraftingMonitorSettingsUpdateMessage::encode, WirelessCraftingMonitorSettingsUpdateMessage::decode, WirelessCraftingMonitorSettingsUpdateMessage::handle); diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java index 23565cf96..077660a42 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java @@ -3,21 +3,12 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; -import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class GridClearMessage { - public static GridClearMessage decode(PacketBuffer buf) { - return new GridClearMessage(); - } - - public static void encode(GridClearMessage message, PacketBuffer buf) { - // NO OP - } - - public static void handle(GridClearMessage message, Supplier ctx) { + public static void handle(Supplier ctx) { PlayerEntity player = ctx.get().getSender(); if (player != null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java index 85c24f862..62025821a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java @@ -1,21 +1,13 @@ package com.refinedmods.refinedstorage.network.grid; import com.refinedmods.refinedstorage.network.ClientProxy; -import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class GridCraftingStartResponseMessage { - public static GridCraftingStartResponseMessage decode(PacketBuffer buf) { - return new GridCraftingStartResponseMessage(); - } - - public static void encode(GridCraftingStartResponseMessage message, PacketBuffer buf) { - } - - public static void handle(GridCraftingStartResponseMessage message, Supplier ctx) { + public static void handle(Supplier ctx) { ctx.get().enqueueWork(() -> ClientProxy.onReceivedCraftingStartResponseMessage()); ctx.get().setPacketHandled(true); } -} \ No newline at end of file +} diff --git a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java index 873b477db..f15bd13be 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java @@ -4,20 +4,12 @@ import com.refinedmods.refinedstorage.api.network.grid.IGrid; import com.refinedmods.refinedstorage.container.GridContainer; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.container.Container; -import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; import java.util.function.Supplier; public class GridFluidInsertHeldMessage { - public static GridFluidInsertHeldMessage decode(PacketBuffer buf) { - return new GridFluidInsertHeldMessage(); - } - - public static void encode(GridFluidInsertHeldMessage message, PacketBuffer buf) { - } - - public static void handle(GridFluidInsertHeldMessage message, Supplier ctx) { + public static void handle(Supplier ctx) { ServerPlayerEntity player = ctx.get().getSender(); if (player != null) { diff --git a/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java index 6841f7ca6..44498988a 100644 --- a/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java +++ b/src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java @@ -43,7 +43,7 @@ public class TileDataParameterMessage { message.parameter.getSerializer().write(buf, message.parameter.getValueProducer().apply(message.tile)); } - public static void handle(TileDataParameterMessage message, Supplier ctx) { + public static void handle(Supplier ctx) { ctx.get().setPacketHandled(true); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java index 8af9426b3..811944c24 100644 --- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java +++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java @@ -15,12 +15,12 @@ public class DestructorPickupSideButton extends SideButton { @Override protected void renderButtonIcon(MatrixStack matrixStack, int x, int y) { - screen.blit(matrixStack, x, y, 64 + (!DestructorTile.PICKUP.getValue() ? 16 : 0), 0, 16, 16); + screen.blit(matrixStack, x, y, 64 + (Boolean.TRUE.equals(DestructorTile.PICKUP.getValue()) ? 0 : 16), 0, 16, 16); } @Override public String getTooltip() { - return I18n.format("sidebutton.refinedstorage.destructor.pickup") + "\n" + TextFormatting.GRAY + I18n.format(DestructorTile.PICKUP.getValue() ? "gui.yes" : "gui.no"); + return I18n.format("sidebutton.refinedstorage.destructor.pickup") + "\n" + TextFormatting.GRAY + I18n.format(Boolean.TRUE.equals(DestructorTile.PICKUP.getValue()) ? "gui.yes" : "gui.no"); } @Override diff --git a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java index aab939a01..bdd06896c 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java @@ -11,7 +11,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -44,11 +43,11 @@ public class NetworkUtils { return null; } - public static ActionResultType attemptModify(World world, BlockPos pos, Direction facing, PlayerEntity player, Runnable action) { - return attempt(world, pos, facing, player, action, Permission.MODIFY); + public static ActionResultType attemptModify(World world, BlockPos pos, PlayerEntity player, Runnable action) { + return attempt(world, pos, player, action, Permission.MODIFY); } - public static ActionResultType attempt(World world, BlockPos pos, Direction facing, PlayerEntity player, Runnable action, Permission... permissionsRequired) { + public static ActionResultType attempt(World world, BlockPos pos, PlayerEntity player, Runnable action, Permission... permissionsRequired) { if (world.isRemote) { return ActionResultType.SUCCESS; } diff --git a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java index 0182b7434..a3238868d 100644 --- a/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java +++ b/src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java @@ -264,7 +264,7 @@ public final class RenderUtils { smallTextStack.translate(0.0D, 0.0D, zLevel); smallTextStack.scale(textScale, textScale, 1); - IRenderTypeBuffer.Impl lvt_7_1_ = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); + IRenderTypeBuffer.Impl renderTypeBuffer = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); font.renderString( TextFormatting.GRAY + smallTextLines.get(i), RenderUtils.getOffsetOnScale(tooltipX, textScale), @@ -272,13 +272,13 @@ public final class RenderUtils { -1, true, smallTextStack.getLast().getMatrix(), - lvt_7_1_, + renderTypeBuffer, false, 0, 15728880 ); - lvt_7_1_.finish(); + renderTypeBuffer.finish(); y -= 9; }