Merge branch 'feature/networking-messages'

Author: coderbot16

patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java

@@ -43,6 +43,7 @@ public class LivingAttackEvent extends LivingEvent {
 	private final DamageSource source;
 	private final float damage;
 
+	// For EventBus
 	public LivingAttackEvent() {
 		this.source = null;
 		this.damage = 0f;

patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java

@@ -44,6 +44,7 @@ public class LivingSpawnEvent extends LivingEvent {
 	private final double y;
 	private final double z;
 
+	// For EventBus
 	public LivingSpawnEvent() {
 		this.world = null;
 		this.x = 0;

patchwork-extensions/src/main/java/com/patchworkmc/impl/extension/PatchworkEntityTypeBuilderExtensions.java

@@ -31,6 +31,4 @@ public interface PatchworkEntityTypeBuilderExtensions<T extends Entity> {
 	EntityType.Builder<T> setTrackingRange(int range);
 
 	EntityType.Builder<T> setShouldReceiveVelocityUpdates(boolean value);
-
-	// TODO: setCustomClientFactory (waiting on patchwork-networking features)
 }

patchwork-extensions/src/main/java/com/patchworkmc/impl/extension/PatchworkEntityTypeExtensions.java

@@ -25,11 +25,9 @@
  * Forge does this through patching the constructor instead, we just add methods with mixins instead.
  */
 public interface PatchworkEntityTypeExtensions<T extends Entity> {
-	void setUpdateInterval(int interval);
+	void patchwork$setUpdateInterval(int interval);
 
-	void setTrackingRange(int range);
+	void patchwork$setTrackingRange(int range);
 
-	void setShouldReceiveVelocityUpdates(boolean value);
-
-	// TODO: setCustomClientFactory (waiting on patchwork-networking features)
+	void patchwork$setShouldReceiveVelocityUpdates(boolean value);
 }

patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEntityType.java

@@ -60,17 +60,17 @@ private void hookAlwaysUpdateVelocity(CallbackInfoReturnable<Boolean> cir) {
 	}
 
 	@Override
-	public void setUpdateInterval(int interval) {
+	public void patchwork$setUpdateInterval(int interval) {
 		this.updateInterval = interval;
 	}
 
 	@Override
-	public void setTrackingRange(int range) {
+	public void patchwork$setTrackingRange(int range) {
 		this.trackingRange = range;
 	}
 
 	@Override
-	public void setShouldReceiveVelocityUpdates(boolean value) {
+	public void patchwork$setShouldReceiveVelocityUpdates(boolean value) {
 		this.shouldRecieveVelocityUpdates = value;
 	}
 }

patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEntityTypeBuilder.java

@@ -44,15 +44,15 @@ private void onBuildReturn(String id, CallbackInfoReturnable<EntityType> cir) {
 		PatchworkEntityTypeExtensions type = (PatchworkEntityTypeExtensions) cir.getReturnValue();
 
 		if (updateInterval != null) {
-			type.setUpdateInterval(updateInterval);
+			type.patchwork$setUpdateInterval(updateInterval);
 		}
 
 		if (trackingRange != null) {
-			type.setTrackingRange(trackingRange);
+			type.patchwork$setTrackingRange(trackingRange);
 		}
 
 		if (shouldRecieveVelocityUpdates != null) {
-			type.setShouldReceiveVelocityUpdates(shouldRecieveVelocityUpdates);
+			type.patchwork$setShouldReceiveVelocityUpdates(shouldRecieveVelocityUpdates);
 		}
 	}
 

patchwork-networking-messages/build.gradle

@@ -0,0 +1,7 @@
+archivesBaseName = "patchwork-networking-messages"
+version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':patchwork-fml', configuration: 'dev')
+	compile project(path: ':patchwork-networking', configuration: 'dev')
+}

…mc/impl/networking/VersionedChannel.java …impl/networking/ClientEntitySpawner.javapatchwork-networking/src/main/java/com/patchworkmc/impl/networking/VersionedChannel.java renamed to patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ClientEntitySpawner.java patchwork-networking/src/main/java/com/patchworkmc/impl/networking/VersionedChannel.java renamed to patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ClientEntitySpawner.java

@@ -19,8 +19,14 @@
 
 package com.patchworkmc.impl.networking;
 
-public interface VersionedChannel extends NamedChannel {
-	String getNetworkProtocolVersion();
-	boolean tryServerVersionOnClient(String serverVersion);
-	boolean tryClientVersionOnServer(String clientVersion);
+import java.util.function.BiFunction;
+
+import net.minecraftforge.fml.network.FMLPlayMessages;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.world.World;
+
+public interface ClientEntitySpawner<T extends Entity> {
+	T customClientSpawn(FMLPlayMessages.SpawnEntity packet, World world);
+	void patchwork$setCustomClientFactory(BiFunction<FMLPlayMessages.SpawnEntity, World, T> customClientFactory);
 }

…workmc/impl/networking/NamedChannel.java …impl/networking/ContainerSyncAccess.javapatchwork-networking/src/main/java/com/patchworkmc/impl/networking/NamedChannel.java renamed to patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ContainerSyncAccess.java patchwork-networking/src/main/java/com/patchworkmc/impl/networking/NamedChannel.java renamed to patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ContainerSyncAccess.java

@@ -19,8 +19,6 @@
 
 package com.patchworkmc.impl.networking;
 
-import net.minecraft.util.Identifier;
-
-public interface NamedChannel {
-	Identifier getChannelName();
+public interface ContainerSyncAccess {
+	int patchwork$getNewContainerSyncId();
 }

patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/PatchworkPlayNetworkingMessages.java

@@ -0,0 +1,136 @@
+/*
+ * Minecraft Forge, Patchwork Project
+ * Copyright (c) 2016-2020, 2019-2020
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation version 2.1
+ * of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+package com.patchworkmc.impl.networking;
+
+import java.util.function.Consumer;
+
+import io.netty.buffer.Unpooled;
+import net.minecraftforge.fml.network.FMLPlayMessages;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import net.minecraft.container.Container;
+import net.minecraft.container.ContainerType;
+import net.minecraft.container.NameableContainerProvider;
+import net.minecraft.entity.Entity;
+import net.minecraft.network.Packet;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.LiteralText;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.PacketByteBuf;
+
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.network.ClientSidePacketRegistry;
+import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
+
+public class PatchworkPlayNetworkingMessages implements ModInitializer, MessageFactory {
+	private static final Logger LOGGER = LogManager.getLogger("patchwork-networking");
+	private static final Identifier IDENTIFIER = new Identifier("fml", "play");
+	private static final NetworkChannelVersion VERSION = new NetworkChannelVersion("FML2", version -> true, version -> true);
+	private static final short SPAWN_ENTITY = 0;
+	private static final short OPEN_CONTAINER = 1;
+
+	@Override
+	public void onInitialize() {
+		PatchworkNetworking.getVersionManager().createChannel(IDENTIFIER, VERSION);
+		PatchworkNetworking.setFactory(this);
+
+		// TODO: Move to client initializer
+		ClientSidePacketRegistry.INSTANCE.register(IDENTIFIER, (context, buf) -> {
+			int id = buf.readUnsignedByte();
+
+			if (id == SPAWN_ENTITY) {
+				FMLPlayMessages.SpawnEntity spawn = FMLPlayMessages.SpawnEntity.decode(buf);
+				FMLPlayMessages.SpawnEntity.handle(spawn, context);
+			} else if (id == OPEN_CONTAINER) {
+				FMLPlayMessages.OpenContainer open = FMLPlayMessages.OpenContainer.decode(buf);
+				FMLPlayMessages.OpenContainer.handle(open, context);
+			} else {
+				LOGGER.warn("Received an unknown fml:play message with an id of {} and a payload of {} bytes", id, buf.readableBytes());
+			}
+		});
+
+		ServerSidePacketRegistry.INSTANCE.register(IDENTIFIER, (context, buf) -> {
+			LOGGER.warn("Received an fml:play on the server, this should not happen! Kicking the offending client.");
+
+			ServerPlayerEntity entity = (ServerPlayerEntity) context.getPlayer();
+
+			entity.networkHandler.disconnect(new LiteralText("fml:play messages should only be sent to the client!"));
+		});
+	}
+
+	@Override
+	public Packet<?> getEntitySpawningPacket(Entity entity) {
+		FMLPlayMessages.SpawnEntity message = new FMLPlayMessages.SpawnEntity(entity);
+		PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer());
+
+		buf.writeByte(SPAWN_ENTITY);
+		FMLPlayMessages.SpawnEntity.encode(message, buf);
+
+		return ServerSidePacketRegistry.INSTANCE.toPacket(IDENTIFIER, buf);
+	}
+
+	@Override
+	public void sendContainerOpenPacket(ServerPlayerEntity player, NameableContainerProvider provider, Consumer<PacketByteBuf> extraDataWriter) {
+		if (player.world.isClient) {
+			return;
+		}
+
+		player.method_14247();
+
+		ContainerSyncAccess access = (ContainerSyncAccess) player;
+		int openContainerId = access.patchwork$getNewContainerSyncId();
+
+		PacketByteBuf extraData = new PacketByteBuf(Unpooled.buffer());
+		extraDataWriter.accept(extraData);
+
+		// reset to beginning in case modders read for whatever reason
+		extraData.readerIndex(0);
+
+		PacketByteBuf output = new PacketByteBuf(Unpooled.buffer());
+		output.writeVarInt(extraData.readableBytes());
+		output.writeBytes(extraData);
+
+		if (output.readableBytes() > 32600 || output.readableBytes() < 1) {
+			throw new IllegalArgumentException("Invalid PacketByteBuf for openGui, found " + output.readableBytes() + " bytes");
+		}
+
+		Container c = provider.createMenu(openContainerId, player.inventory, player);
+		ContainerType<?> type = c.getType();
+
+		FMLPlayMessages.OpenContainer msg = new FMLPlayMessages.OpenContainer(type, openContainerId, provider.getDisplayName(), output);
+		Packet<?> packet = PatchworkPlayNetworkingMessages.getOpenContainerPacket(msg);
+
+		player.networkHandler.sendPacket(packet);
+		player.container = c;
+		player.container.addListener(player);
+
+		// TODO MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, c));
+	}
+
+	private static Packet<?> getOpenContainerPacket(FMLPlayMessages.OpenContainer message) {
+		PacketByteBuf buf = new PacketByteBuf(Unpooled.buffer());
+
+		buf.writeByte(OPEN_CONTAINER);
+		FMLPlayMessages.OpenContainer.encode(message, buf);
+
+		return ServerSidePacketRegistry.INSTANCE.toPacket(IDENTIFIER, buf);
+	}
+}