keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Change openGui to take a Consumer<PacketBuffer>

This commit is contained in:
Vincent Lee 2019-02-16 23:43:02 -06:00 committed by cpw
parent bd1769b11f
commit 3f2c66dca5
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/minecraftforge/fml/network/NetworkHooks.java
View File

@ -36,6 +36,7 @@ import net.minecraftforge.event.entity.player.PlayerContainerEvent;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Objects; import java.util.Objects;
import java.util.function.Consumer;
public class NetworkHooks public class NetworkHooks
{ {
@ -89,19 +90,24 @@ public class NetworkHooks
return FMLHandshakeHandler.tickLogin(networkManager); return FMLHandshakeHandler.tickLogin(networkManager);
} }
public static void openGui(EntityPlayerMP player, IInteractionObject containerSupplier)
{
openGui(player, containerSupplier, buf -> {});
}
/** /**
* Server method to tell the client to open a GUI on behalf of the server * Server method to tell the client to open a GUI on behalf of the server
* *
* The {@link IInteractionObject#getGuiID()} is treated as a {@link ResourceLocation}. * The {@link IInteractionObject#getGuiID()} is treated as a {@link ResourceLocation}.
* It should refer to a valid modId namespace, to trigger opening on the client. * It should refer to a valid modId namespace, to trigger opening on the client.
* The namespace is directly used to lookup the modId in the client side. * The namespace is directly used to lookup the modId in the client side.
* The maximum size for #extraData is 32600 bytes. * The maximum size for #extraDataWriter is 32600 bytes.
* *
* @param player The player to open the GUI for * @param player The player to open the GUI for
* @param containerSupplier The Container Supplier * @param containerSupplier The Container Supplier
* @param extraData Additional data for the GUI * @param extraDataWriter Consumer to write any additional data the GUI needs
*/ */
public static void openGui(EntityPlayerMP player, IInteractionObject containerSupplier, @Nullable PacketBuffer extraData) public static void openGui(EntityPlayerMP player, IInteractionObject containerSupplier, Consumer<PacketBuffer> extraDataWriter)
{ {
if (player.world.isRemote) return; if (player.world.isRemote) return;
ResourceLocation id = new ResourceLocation(containerSupplier.getGuiID()); ResourceLocation id = new ResourceLocation(containerSupplier.getGuiID());
@ -114,13 +120,13 @@ public class NetworkHooks
player.openContainer.addListener(player); player.openContainer.addListener(player);
MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, c)); MinecraftForge.EVENT_BUS.post(new PlayerContainerEvent.Open(player, c));
PacketBuffer extraData = new PacketBuffer(Unpooled.buffer());
extraDataWriter.accept(extraData);
extraData.readerIndex(0); // reset to beginning in case modders read for whatever reason
PacketBuffer output = new PacketBuffer(Unpooled.buffer()); PacketBuffer output = new PacketBuffer(Unpooled.buffer());
if (extraData == null) { output.writeVarInt(extraData.readableBytes());
output.writeVarInt(0); output.writeBytes(extraData);
} else {
output.writeVarInt(extraData.readableBytes());
output.writeBytes(extraData);
}
if (output.readableBytes() > 32600 || output.readableBytes() < 1) { if (output.readableBytes() > 32600 || output.readableBytes() < 1) {
throw new IllegalArgumentException("Invalid PacketBuffer for openGui, found "+ output.readableBytes()+ " bytes"); throw new IllegalArgumentException("Invalid PacketBuffer for openGui, found "+ output.readableBytes()+ " bytes");