implement Worlds MessageReceiver and sendBookView

Author: Faithcaio

src/main/java/org/spongepowered/common/mixin/api/mcp/entity/player/EntityPlayerMPMixin_API.java

@@ -139,6 +139,7 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
@@ -231,7 +232,7 @@ public void sendBookView(final BookView bookView) {
             // Don't bother sending messages to fake players
             return;
         }
-        BookFaker.fakeBookView(bookView, this);
+        BookFaker.fakeBookView(bookView, Collections.singletonList(this));
     }
 
     @Override

src/main/java/org/spongepowered/common/mixin/api/mcp/world/WorldMixin_API.java

@@ -93,8 +93,11 @@
 import org.spongepowered.api.entity.projectile.EnderPearl;
 import org.spongepowered.api.entity.projectile.source.ProjectileSource;
 import org.spongepowered.api.service.context.Context;
+import org.spongepowered.api.text.BookView;
 import org.spongepowered.api.text.Text;
+import org.spongepowered.api.text.channel.MessageChannel;
 import org.spongepowered.api.text.chat.ChatType;
+import org.spongepowered.api.text.chat.ChatTypes;
 import org.spongepowered.api.text.title.Title;
 import org.spongepowered.api.util.AABB;
 import org.spongepowered.api.util.Direction;
@@ -126,6 +129,7 @@
 import org.spongepowered.common.bridge.world.chunk.ChunkBridge;
 import org.spongepowered.common.mixin.core.network.play.server.SPacketBlockChangeAccessor;
 import org.spongepowered.common.registry.provider.DirectionFacingProvider;
+import org.spongepowered.common.util.BookFaker;
 import org.spongepowered.common.util.Constants;
 import org.spongepowered.common.util.VecHelper;
 import org.spongepowered.common.world.SpongeDimension;
@@ -532,9 +536,27 @@ public void sendMessage(ChatType type, Text message) {
         checkNotNull(type, "type");
         checkNotNull(message, "message");
 
-        for (Player player : this.getPlayers()) {
-            player.sendMessage(type, message);
+        this.getMessageChannel().send(message, type);
+    }
+
+    @Override
+    public void sendMessage(Text message) {
+        this.sendMessage(ChatTypes.CHAT, message);
+    }
+
+    private MessageChannel impl$messageChannel;
+
+    @Override
+    public MessageChannel getMessageChannel() {
+        if (this.impl$messageChannel == null) {
+            return MessageChannel.fixed(this.getPlayers());
         }
+        return this.impl$messageChannel;
+    }
+
+    @Override
+    public void setMessageChannel(MessageChannel channel) {
+        this.impl$messageChannel = channel;
     }
 
     @Override
@@ -546,6 +568,12 @@ public void sendTitle(Title title) {
         }
     }
 
+    @Override
+    public void sendBookView(BookView bookView) {
+        checkNotNull(bookView, "bookView");
+        BookFaker.fakeBookView(bookView, this.getPlayers());
+    }
+
     @Override
     public void resetTitle() {
         getPlayers().forEach(Player::resetTitle);
@@ -1150,4 +1178,6 @@ public boolean validateRawData(int x, int y, int z, DataView container) {
     public void setRawData(int x, int y, int z, DataView container) throws InvalidDataException {
         throw new UnsupportedOperationException(); // TODO Data API
     }
+
 }
+

src/main/java/org/spongepowered/common/util/BookFaker.java

@@ -39,33 +39,38 @@
 import org.spongepowered.api.text.BookView;
 import org.spongepowered.common.item.inventory.util.ItemStackUtil;
 
+import java.util.Collection;
+
 public class BookFaker {
 
     public static final int WINDOW_PLAYER_INVENTORY = 0;
 
-    public static void fakeBookView(BookView bookView, Player player) {
-        EntityPlayerMP mcPlayer = (EntityPlayerMP) player;
-        NetHandlerPlayServer receiver = mcPlayer.connection;
+    public static void fakeBookView(BookView bookView, Collection<Player> players) {
 
         // First we need to send a fake a Book ItemStack with the BookView's
         // contents to the player's hand
-        ItemStack item = ItemStack.of(ItemTypes.WRITTEN_BOOK, 1);
+        final ItemStack item = ItemStack.of(ItemTypes.WRITTEN_BOOK, 1);
         item.offer(Keys.DISPLAY_NAME, bookView.getTitle());
         item.offer(Keys.BOOK_AUTHOR, bookView.getAuthor());
         item.offer(Keys.BOOK_PAGES, bookView.getPages());
 
-        InventoryPlayer inventory = mcPlayer.inventory;
-        int bookSlot = inventory.mainInventory.size() + inventory.currentItem;
-        receiver.sendPacket(new SPacketSetSlot(WINDOW_PLAYER_INVENTORY, bookSlot, ItemStackUtil.toNative(item)));
+        for (Player player : players) {
+            final EntityPlayerMP mcPlayer = (EntityPlayerMP) player;
+            final NetHandlerPlayServer receiver = mcPlayer.connection;
+
+            final InventoryPlayer inventory = mcPlayer.inventory;
+            final int bookSlot = inventory.mainInventory.size() + inventory.currentItem;
+            receiver.sendPacket(new SPacketSetSlot(WINDOW_PLAYER_INVENTORY, bookSlot, ItemStackUtil.toNative(item)));
 
-        // Next we tell the client to open the Book GUI
-        PacketBuffer packetbuffer = new PacketBuffer(Unpooled.buffer());
-        packetbuffer.writeEnumValue(EnumHand.MAIN_HAND);
-        receiver.sendPacket(new SPacketCustomPayload("MC|BOpen", packetbuffer));
+            // Next we tell the client to open the Book GUI
+            final PacketBuffer packetbuffer = new PacketBuffer(Unpooled.buffer());
+            packetbuffer.writeEnumValue(EnumHand.MAIN_HAND);
+            receiver.sendPacket(new SPacketCustomPayload("MC|BOpen", packetbuffer));
 
-        // Now we can remove the fake Book since it's contents will have already
-        // been transferred to the GUI
-        receiver.sendPacket(new SPacketSetSlot(WINDOW_PLAYER_INVENTORY, bookSlot, inventory.getCurrentItem()));
+            // Now we can remove the fake Book since it's contents will have already
+            // been transferred to the GUI
+            receiver.sendPacket(new SPacketSetSlot(WINDOW_PLAYER_INVENTORY, bookSlot, inventory.getCurrentItem()));
+        }
     }
 
 }