dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SonarQube changes

Browse Source
This commit is contained in:
raoulvdberge
2020-10-18 14:43:43 +02:00
parent f87c1ffec4
commit eaf6c7c66f
33 changed files with 50 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java
View File

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

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/RelayNetworkNode.java
View File

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

4
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java
View File

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

2
src/main/java/com/refinedmods/refinedstorage/block/ConstructorBlock.java
View File

@@ -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<ConstructorTile>(
new TranslationTextComponent("gui.refinedstorage.constructor"),

2
src/main/java/com/refinedmods/refinedstorage/block/ControllerBlock.java
View File

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

2
src/main/java/com/refinedmods/refinedstorage/block/CrafterBlock.java
View File

@@ -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>(
((CrafterTile) world.getTileEntity(pos)).getNode().getName(),

2
src/main/java/com/refinedmods/refinedstorage/block/CrafterManagerBlock.java
View File

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

2
src/main/java/com/refinedmods/refinedstorage/block/CraftingMonitorBlock.java
View File

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

2
src/main/java/com/refinedmods/refinedstorage/block/DestructorBlock.java
View File

@@ -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<DestructorTile>(
new TranslationTextComponent("gui.refinedstorage.destructor"),

2
src/main/java/com/refinedmods/refinedstorage/block/DetectorBlock.java
View File

@@ -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<DetectorTile>(
new TranslationTextComponent("gui.refinedstorage.detector"),

2
src/main/java/com/refinedmods/refinedstorage/block/DiskDriveBlock.java
View File

@@ -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<DiskDriveTile>(
new TranslationTextComponent("gui.refinedstorage.disk_drive"),

2
src/main/java/com/refinedmods/refinedstorage/block/DiskManipulatorBlock.java
View File

@@ -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<DiskManipulatorTile>(
new TranslationTextComponent("gui.refinedstorage.disk_manipulator"),

2
src/main/java/com/refinedmods/refinedstorage/block/ExporterBlock.java
View File

@@ -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<ExporterTile>(
new TranslationTextComponent("gui.refinedstorage.exporter"),

2
src/main/java/com/refinedmods/refinedstorage/block/ExternalStorageBlock.java
View File

@@ -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<ExternalStorageTile>(
new TranslationTextComponent("gui.refinedstorage.external_storage"),

2
src/main/java/com/refinedmods/refinedstorage/block/FluidInterfaceBlock.java
View File

@@ -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<FluidInterfaceTile>(
new TranslationTextComponent("gui.refinedstorage.fluid_interface"),

2
src/main/java/com/refinedmods/refinedstorage/block/FluidStorageBlock.java
View File

@@ -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<FluidStorageTile>(
return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider<FluidStorageTile>(
((FluidStorageTile) world.getTileEntity(pos)).getNode().getTitle(),
(tile, windowId, inventory, p) -> new FluidStorageContainer(tile, player, windowId),
pos

2
src/main/java/com/refinedmods/refinedstorage/block/GridBlock.java
View File

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

2
src/main/java/com/refinedmods/refinedstorage/block/ImporterBlock.java
View File

@@ -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<ImporterTile>(
new TranslationTextComponent("gui.refinedstorage.importer"),

2
src/main/java/com/refinedmods/refinedstorage/block/InterfaceBlock.java
View File

@@ -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<InterfaceTile>(
new TranslationTextComponent("gui.refinedstorage.interface"),

2
src/main/java/com/refinedmods/refinedstorage/block/NetworkTransmitterBlock.java
View File

@@ -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<NetworkTransmitterTile>(
new TranslationTextComponent("gui.refinedstorage.network_transmitter"),

2
src/main/java/com/refinedmods/refinedstorage/block/RelayBlock.java
View File

@@ -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<RelayTile>(
new TranslationTextComponent("gui.refinedstorage.relay"),

2
src/main/java/com/refinedmods/refinedstorage/block/SecurityManagerBlock.java
View File

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

2
src/main/java/com/refinedmods/refinedstorage/block/StorageBlock.java
View File

@@ -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<StorageTile>(
return NetworkUtils.attemptModify(world, pos, player, () -> NetworkHooks.openGui((ServerPlayerEntity) player, new PositionalTileContainerProvider<StorageTile>(
((StorageTile) world.getTileEntity(pos)).getNode().getTitle(),
(tile, windowId, inventory, p) -> new StorageContainer(tile, player, windowId),
pos

2
src/main/java/com/refinedmods/refinedstorage/block/StorageMonitorBlock.java
View File

@@ -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<StorageMonitorTile>(
new TranslationTextComponent("gui.refinedstorage.storage_monitor"),

2
src/main/java/com/refinedmods/refinedstorage/block/WirelessTransmitterBlock.java
View File

@@ -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<WirelessTransmitterTile>(
new TranslationTextComponent("gui.refinedstorage.wireless_transmitter"),

11
src/main/java/com/refinedmods/refinedstorage/network/NetworkHandler.java
View File

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

11
src/main/java/com/refinedmods/refinedstorage/network/grid/GridClearMessage.java
View File

@@ -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<NetworkEvent.Context> ctx) {
public static void handle(Supplier<NetworkEvent.Context> ctx) {
PlayerEntity player = ctx.get().getSender();
if (player != null) {

10
src/main/java/com/refinedmods/refinedstorage/network/grid/GridCraftingStartResponseMessage.java
View File

@@ -1,20 +1,12 @@
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<NetworkEvent.Context> ctx) {
public static void handle(Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> ClientProxy.onReceivedCraftingStartResponseMessage());
ctx.get().setPacketHandled(true);
}

10
src/main/java/com/refinedmods/refinedstorage/network/grid/GridFluidInsertHeldMessage.java
View File

@@ -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<NetworkEvent.Context> ctx) {
public static void handle(Supplier<NetworkEvent.Context> ctx) {
ServerPlayerEntity player = ctx.get().getSender();
if (player != null) {

2
src/main/java/com/refinedmods/refinedstorage/network/tiledata/TileDataParameterMessage.java
View File

@@ -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<NetworkEvent.Context> ctx) {
public static void handle(Supplier<NetworkEvent.Context> ctx) {
ctx.get().setPacketHandled(true);
}
}

4
src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/DestructorPickupSideButton.java
View File

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

7
src/main/java/com/refinedmods/refinedstorage/util/NetworkUtils.java
View File

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

6
src/main/java/com/refinedmods/refinedstorage/util/RenderUtils.java
View File

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