From fb52a2e8d79cdf8a24305a98c5338045c372cc6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Wed, 9 Dec 2020 13:09:54 +0100 Subject: [PATCH] Moved messages to package. --- src/main/java/li/cil/oc2/client/gui/TerminalScreen.java | 2 +- src/main/java/li/cil/oc2/common/network/Network.java | 8 ++++++-- .../{ => message}/AbstractTerminalBlockMessage.java | 2 +- .../network/{ => message}/TerminalBlockInputMessage.java | 5 +++-- .../network/{ => message}/TerminalBlockOutputMessage.java | 5 +++-- .../java/li/cil/oc2/common/tile/ComputerTileEntity.java | 4 +++- 6 files changed, 17 insertions(+), 9 deletions(-) rename src/main/java/li/cil/oc2/common/network/{ => message}/AbstractTerminalBlockMessage.java (95%) rename src/main/java/li/cil/oc2/common/network/{ => message}/TerminalBlockInputMessage.java (77%) rename src/main/java/li/cil/oc2/common/network/{ => message}/TerminalBlockOutputMessage.java (77%) diff --git a/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java b/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java index d0b5df64..570355b5 100644 --- a/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java +++ b/src/main/java/li/cil/oc2/client/gui/TerminalScreen.java @@ -6,7 +6,7 @@ import li.cil.oc2.api.API; import li.cil.oc2.client.gui.terminal.Terminal; import li.cil.oc2.client.gui.terminal.TerminalInput; import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.TerminalBlockInputMessage; +import li.cil.oc2.common.network.message.TerminalBlockInputMessage; import li.cil.oc2.common.tile.ComputerTileEntity; import net.minecraft.client.gui.screen.Screen; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/li/cil/oc2/common/network/Network.java b/src/main/java/li/cil/oc2/common/network/Network.java index 2391f0ad..9dbc57bc 100644 --- a/src/main/java/li/cil/oc2/common/network/Network.java +++ b/src/main/java/li/cil/oc2/common/network/Network.java @@ -1,6 +1,10 @@ package li.cil.oc2.common.network; import li.cil.oc2.api.API; +import li.cil.oc2.common.network.message.ComputerBusStateMessage; +import li.cil.oc2.common.network.message.ComputerRunStateMessage; +import li.cil.oc2.common.network.message.TerminalBlockInputMessage; +import li.cil.oc2.common.network.message.TerminalBlockOutputMessage; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.network.NetworkDirection; import net.minecraftforge.fml.network.NetworkRegistry; @@ -21,13 +25,13 @@ public final class Network { INSTANCE.messageBuilder(TerminalBlockOutputMessage.class, getNextPacketId(), NetworkDirection.PLAY_TO_CLIENT) .encoder(TerminalBlockOutputMessage::toBytes) .decoder(TerminalBlockOutputMessage::new) - .consumer(TerminalBlockOutputMessage::handleOutput) + .consumer(TerminalBlockOutputMessage::handleMessage) .add(); INSTANCE.messageBuilder(TerminalBlockInputMessage.class, getNextPacketId(), NetworkDirection.PLAY_TO_SERVER) .encoder(TerminalBlockInputMessage::toBytes) .decoder(TerminalBlockInputMessage::new) - .consumer(TerminalBlockInputMessage::handleInput) + .consumer(TerminalBlockInputMessage::handleMessage) .add(); } diff --git a/src/main/java/li/cil/oc2/common/network/AbstractTerminalBlockMessage.java b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java similarity index 95% rename from src/main/java/li/cil/oc2/common/network/AbstractTerminalBlockMessage.java rename to src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java index b43718f7..e704f3cf 100644 --- a/src/main/java/li/cil/oc2/common/network/AbstractTerminalBlockMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java @@ -1,4 +1,4 @@ -package li.cil.oc2.common.network; +package li.cil.oc2.common.network.message; import li.cil.oc2.common.tile.ComputerTileEntity; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/li/cil/oc2/common/network/TerminalBlockInputMessage.java b/src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java similarity index 77% rename from src/main/java/li/cil/oc2/common/network/TerminalBlockInputMessage.java rename to src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java index 61e6f050..6af2c016 100644 --- a/src/main/java/li/cil/oc2/common/network/TerminalBlockInputMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java @@ -1,5 +1,6 @@ -package li.cil.oc2.common.network; +package li.cil.oc2.common.network.message; +import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.tile.ComputerTileEntity; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; @@ -16,7 +17,7 @@ public final class TerminalBlockInputMessage extends AbstractTerminalBlockMessag super(buffer); } - public static boolean handleInput(final AbstractTerminalBlockMessage message, final Supplier context) { + public static boolean handleMessage(final AbstractTerminalBlockMessage message, final Supplier context) { context.get().enqueueWork(() -> MessageUtils.withServerTileEntityAt(context, message.pos, ComputerTileEntity.class, (tileEntity) -> tileEntity.getTerminal().putInput(ByteBuffer.wrap(message.data)))); return true; diff --git a/src/main/java/li/cil/oc2/common/network/TerminalBlockOutputMessage.java b/src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java similarity index 77% rename from src/main/java/li/cil/oc2/common/network/TerminalBlockOutputMessage.java rename to src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java index 751a95db..398052f4 100644 --- a/src/main/java/li/cil/oc2/common/network/TerminalBlockOutputMessage.java +++ b/src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java @@ -1,5 +1,6 @@ -package li.cil.oc2.common.network; +package li.cil.oc2.common.network.message; +import li.cil.oc2.common.network.MessageUtils; import li.cil.oc2.common.tile.ComputerTileEntity; import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.network.NetworkEvent; @@ -16,7 +17,7 @@ public final class TerminalBlockOutputMessage extends AbstractTerminalBlockMessa super(buffer); } - public static boolean handleOutput(final AbstractTerminalBlockMessage message, final Supplier context) { + public static boolean handleMessage(final AbstractTerminalBlockMessage message, final Supplier context) { context.get().enqueueWork(() -> MessageUtils.withClientTileEntityAt(message.pos, ComputerTileEntity.class, tileEntity -> tileEntity.getTerminal().putOutput(ByteBuffer.wrap(message.data)))); return true; diff --git a/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java index 063ca8c1..9cac2db0 100644 --- a/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java +++ b/src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java @@ -9,7 +9,9 @@ import li.cil.oc2.common.bus.TileEntityDeviceBusController; import li.cil.oc2.common.bus.TileEntityDeviceBusElement; import li.cil.oc2.common.capabilities.Capabilities; import li.cil.oc2.common.network.Network; -import li.cil.oc2.common.network.TerminalBlockOutputMessage; +import li.cil.oc2.common.network.message.ComputerBusStateMessage; +import li.cil.oc2.common.network.message.ComputerRunStateMessage; +import li.cil.oc2.common.network.message.TerminalBlockOutputMessage; import li.cil.oc2.common.tile.computer.VirtualMachine; import li.cil.oc2.common.util.NBTTagIds; import li.cil.oc2.common.util.NBTUtils;