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

Moved messages to package.

Browse Source
This commit is contained in:
Florian Nücke
2020-12-09 13:09:54 +01:00
parent 423d8cd037
commit fb52a2e8d7
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/client/gui/TerminalScreen.java
View File

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

8
src/main/java/li/cil/oc2/common/network/Network.java
View File

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

2
src/main/java/li/cil/oc2/common/network/AbstractTerminalBlockMessage.java → src/main/java/li/cil/oc2/common/network/message/AbstractTerminalBlockMessage.java
View File

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

5
src/main/java/li/cil/oc2/common/network/TerminalBlockInputMessage.java → src/main/java/li/cil/oc2/common/network/message/TerminalBlockInputMessage.java
View File

@@ -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<NetworkEvent.Context> context) {
public static boolean handleMessage(final AbstractTerminalBlockMessage message, final Supplier<NetworkEvent.Context> context) {
context.get().enqueueWork(() -> MessageUtils.withServerTileEntityAt(context, message.pos, ComputerTileEntity.class,
(tileEntity) -> tileEntity.getTerminal().putInput(ByteBuffer.wrap(message.data))));
return true;

5
src/main/java/li/cil/oc2/common/network/TerminalBlockOutputMessage.java → src/main/java/li/cil/oc2/common/network/message/TerminalBlockOutputMessage.java
View File

@@ -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<NetworkEvent.Context> context) {
public static boolean handleMessage(final AbstractTerminalBlockMessage message, final Supplier<NetworkEvent.Context> context) {
context.get().enqueueWork(() -> MessageUtils.withClientTileEntityAt(message.pos, ComputerTileEntity.class,
tileEntity -> tileEntity.getTerminal().putOutput(ByteBuffer.wrap(message.data))));
return true;

4
src/main/java/li/cil/oc2/common/tile/ComputerTileEntity.java
View File

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