Begin working on upgrading packets to the new 1.13/1.14 way of creating them.

This commit is contained in:
alexbegt committed 2019-05-22 14:21:10 -04:00
1 parent a821fe0f52
commit e0d244b5f6
3 files changed
+51 -73

No files matched your search

@@ -53,7 +53,7 @@ public class BookLoader implements IResourceManagerReloadListener {
private static final NetworkWrapper wrapper = new NetworkWrapper("mantle:books");
public BookLoader() {
wrapper.registerPacketServer(PacketUpdateSavedPage.class);
wrapper.registerPacket(PacketUpdateSavedPage.class, PacketUpdateSavedPage::encode, PacketUpdateSavedPage::decode, PacketUpdateSavedPage.Handler::handle);
// Register page types
registerPageType("blank", ContentBlank.class);
@@ -1,11 +1,17 @@
package slimeknights.mantle.network;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.fml.network.NetworkDirection;
import net.minecraftforge.fml.network.NetworkEvent;
import net.minecraftforge.fml.network.NetworkRegistry;
import net.minecraftforge.fml.network.simple.SimpleChannel;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.Supplier;
/**
* A small network implementation/wrapper using AbstractPackets instead of IMessages.
@@ -13,51 +19,29 @@ import net.minecraftforge.fml.relauncher.Side;
*/
public class NetworkWrapper {
public final SimpleNetworkWrapper network;
protected final AbstactPacketHandler handler;
public final SimpleChannel network;
private int id = 0;
private static final String PROTOCOL_VERSION = Integer.toString(1);
public NetworkWrapper(String channelName) {
network = NetworkRegistry.INSTANCE.newSimpleChannel(channelName);
handler = new AbstactPacketHandler();
network = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(channelName))
.clientAcceptedVersions(PROTOCOL_VERSION::equals)
.serverAcceptedVersions(PROTOCOL_VERSION::equals)
.networkProtocolVersion(() -> PROTOCOL_VERSION)
.simpleChannel();
}
/**
* Packet will be received on both client and server side.
*/
public void registerPacket(Class<? extends AbstractPacket> packetClazz) {
registerPacketClient(packetClazz);
registerPacketServer(packetClazz);
public <MSG> void registerPacket(Class<MSG> packetClazz, BiConsumer<MSG, PacketBuffer> encoder, Function<PacketBuffer, MSG> decoder, BiConsumer<MSG, Supplier<NetworkEvent.Context>> messageConsumer) {
network.registerMessage(id++, packetClazz, encoder, decoder, messageConsumer);
}
/**
* Packet will only be received on the client side
*/
public void registerPacketClient(Class<? extends AbstractPacket> packetClazz) {
registerPacketImpl(packetClazz, Side.CLIENT);
public void sendToServer(Object msg) {
network.sendToServer(msg);
}
/**
* Packet will only be received on the server side
*/
public void registerPacketServer(Class<? extends AbstractPacket> packetClazz) {
registerPacketImpl(packetClazz, Side.SERVER);
}
private void registerPacketImpl(Class<? extends AbstractPacket> packetClazz, Side side) {
network.registerMessage(handler, packetClazz, id++, side);
}
public static class AbstactPacketHandler implements IMessageHandler<AbstractPacket, IMessage> {
@Override
public IMessage onMessage(AbstractPacket packet, MessageContext ctx) {
if(ctx.side == Side.SERVER) {
return packet.handleServer(ctx.getServerHandler());
}
else {
return packet.handleClient(ctx.getClientHandler());
}
public void sendTo(Object msg, EntityPlayerMP player) {
if(!(player instanceof FakePlayer)) {
network.sendTo(msg, player.connection.netManager, NetworkDirection.PLAY_TO_CLIENT);
}
}
}
@@ -1,18 +1,16 @@
package slimeknights.mantle.network.book;
import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.EnumHand;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.network.NetworkEvent;
import slimeknights.mantle.client.book.BookHelper;
import slimeknights.mantle.network.AbstractPacket;
public class PacketUpdateSavedPage extends AbstractPacket {
import java.util.function.Supplier;
public class PacketUpdateSavedPage {
private String pageName;
@@ -24,33 +22,29 @@ public class PacketUpdateSavedPage extends AbstractPacket {
this.pageName = pageName;
}
@Override
public IMessage handleClient(NetHandlerPlayClient netHandler) {
return null;
public static void encode(PacketUpdateSavedPage msg, PacketBuffer buf) {
buf.writeString(msg.pageName);
}
@Override
public IMessage handleServer(NetHandlerPlayServer netHandler) {
if (netHandler.player != null && pageName != null) {
EntityPlayer player = netHandler.player;
public static PacketUpdateSavedPage decode(PacketBuffer buf) {
return new PacketUpdateSavedPage(buf.readString(32767));
}
ItemStack is = player.getHeldItem(EnumHand.MAIN_HAND);
public static class Handler {
public static void handle(final PacketUpdateSavedPage pkt, final Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
if(ctx.get().getSender() != null && pkt.pageName != null) {
EntityPlayer player = ctx.get().getSender();
if(!is.isEmpty()) {
BookHelper.writeSavedPage(is, pageName);
}
ItemStack is = player.getHeldItem(EnumHand.MAIN_HAND);
if(!is.isEmpty()) {
BookHelper.writeSavedPage(is, pkt.pageName);
}
}
});
ctx.get().setPacketHandled(true);
}
return null;
}
@Override
public void fromBytes(ByteBuf buf) {
pageName = ByteBufUtils.readUTF8String(buf);
}
@Override
public void toBytes(ByteBuf buf) {
ByteBufUtils.writeUTF8String(buf, pageName);
}
}