diff --git a/src/main/java/slimeknights/mantle/client/book/data/BookData.java b/src/main/java/slimeknights/mantle/client/book/data/BookData.java index de02298..586f5d0 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/BookData.java +++ b/src/main/java/slimeknights/mantle/client/book/data/BookData.java @@ -18,6 +18,8 @@ import slimeknights.mantle.client.book.data.content.ContentError; import slimeknights.mantle.client.book.data.element.ItemStackData; import slimeknights.mantle.client.book.repository.BookRepository; import slimeknights.mantle.client.screen.book.BookScreen; +import slimeknights.mantle.network.MantleNetwork; +import slimeknights.mantle.network.packet.DropLecternBookPacket; import javax.annotation.Nullable; import java.io.BufferedReader; @@ -371,8 +373,18 @@ public class BookData implements IDataItem { * @param pageUpdater Function to call to save the page */ public void openGui(ITextComponent title, String page, @Nullable Consumer pageUpdater) { + this.openGui(title, page, pageUpdater, null); + } + + /** + * Generic method to open the book GUI in a situation when the book can be picked up (i.e. lectern) + * @param title Screen title + * @param page Starting page + * @param pageUpdater Function to call to save the page + */ + public void openGui(ITextComponent title, String page, @Nullable Consumer pageUpdater, @Nullable Consumer bookPickup) { this.load(); - Minecraft.getInstance().displayGuiScreen(new BookScreen(title, this, page, pageUpdater)); + Minecraft.getInstance().displayGuiScreen(new BookScreen(title, this, page, pageUpdater, bookPickup)); } /** @@ -403,7 +415,12 @@ public class BookData implements IDataItem { @SuppressWarnings("unused") // API public void openGui(BlockPos pos, ItemStack stack) { String page = BookHelper.getCurrentSavedPage(stack); - openGui(stack.getDisplayName(), page, newPage -> BookLoader.updateSavedPage(pos, newPage)); + + Consumer bookPickup = (v) -> { + MantleNetwork.INSTANCE.network.sendToServer(new DropLecternBookPacket(pos)); + }; + + openGui(stack.getDisplayName(), page, newPage -> BookLoader.updateSavedPage(pos, newPage), bookPickup); } /** diff --git a/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java b/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java index 54cf23d..9d06da8 100644 --- a/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java +++ b/src/main/java/slimeknights/mantle/client/screen/book/BookScreen.java @@ -8,12 +8,14 @@ import net.minecraft.advancements.AdvancementProgress; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.multiplayer.ClientAdvancementManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.glfw.GLFW; @@ -63,6 +65,8 @@ public class BookScreen extends Screen { public final BookData book; @Nullable private Consumer pageUpdater; + @Nullable + private Consumer bookPickup; private int page = -1; private int oldPage = -2; @@ -80,10 +84,11 @@ public class BookScreen extends Screen { PAGE_HEIGHT = (int) ((PAGE_HEIGHT_UNSCALED - (PAGE_PADDING_TOP + PAGE_PADDING_BOT + PAGE_MARGIN + PAGE_MARGIN)) / PAGE_SCALE); } - public BookScreen(ITextComponent title, BookData book, String page, @Nullable Consumer pageUpdater) { + public BookScreen(ITextComponent title, BookData book, String page, @Nullable Consumer pageUpdater, @Nullable Consumer bookPickup) { super(title); this.book = book; this.pageUpdater = pageUpdater; + this.bookPickup = bookPickup; this.minecraft = Minecraft.getInstance(); this.font = this.minecraft.fontRenderer; @@ -299,6 +304,18 @@ public class BookScreen extends Screen { this.buildPages(); })); + if(this.bookPickup != null) { + int margin = 10; + if(this.height / 2 + PAGE_HEIGHT_UNSCALED / 2 + margin + 20 >= this.height) { + margin = 0; + } + + this.addButton(new Button(this.width / 2 - 196 / 2, this.height / 2 + PAGE_HEIGHT_UNSCALED / 2 + margin, 196, 20, new TranslationTextComponent("lectern.take_book"), (p_212998_1_) -> { + this.closeScreen(); + this.bookPickup.accept(null); + })); + } + this.buildPages(); } diff --git a/src/main/java/slimeknights/mantle/network/MantleNetwork.java b/src/main/java/slimeknights/mantle/network/MantleNetwork.java index a8b70ed..2017460 100644 --- a/src/main/java/slimeknights/mantle/network/MantleNetwork.java +++ b/src/main/java/slimeknights/mantle/network/MantleNetwork.java @@ -2,6 +2,7 @@ package slimeknights.mantle.network; import net.minecraftforge.fml.network.NetworkDirection; import slimeknights.mantle.Mantle; +import slimeknights.mantle.network.packet.DropLecternBookPacket; import slimeknights.mantle.network.packet.OpenLecternBookPacket; import slimeknights.mantle.network.packet.UpdateHeldPagePacket; import slimeknights.mantle.network.packet.UpdateLecternPagePacket; @@ -17,5 +18,6 @@ public class MantleNetwork { INSTANCE.registerPacket(OpenLecternBookPacket.class, OpenLecternBookPacket::new, NetworkDirection.PLAY_TO_CLIENT); INSTANCE.registerPacket(UpdateHeldPagePacket.class, UpdateHeldPagePacket::new, NetworkDirection.PLAY_TO_SERVER); INSTANCE.registerPacket(UpdateLecternPagePacket.class, UpdateLecternPagePacket::new, NetworkDirection.PLAY_TO_SERVER); + INSTANCE.registerPacket(DropLecternBookPacket.class, DropLecternBookPacket::new, NetworkDirection.PLAY_TO_SERVER); } } diff --git a/src/main/java/slimeknights/mantle/network/packet/DropLecternBookPacket.java b/src/main/java/slimeknights/mantle/network/packet/DropLecternBookPacket.java new file mode 100644 index 0000000..83c7892 --- /dev/null +++ b/src/main/java/slimeknights/mantle/network/packet/DropLecternBookPacket.java @@ -0,0 +1,64 @@ +package slimeknights.mantle.network.packet; + +import lombok.AllArgsConstructor; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.LecternBlock; +import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraft.tileentity.LecternTileEntity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.server.ServerWorld; +import net.minecraftforge.fml.network.NetworkEvent.Context; +import slimeknights.mantle.item.ILecternBookItem; + +/** + * Packet to open a book on a lectern + */ +@AllArgsConstructor +public class DropLecternBookPacket implements IThreadsafePacket { + private final BlockPos pos; + + public DropLecternBookPacket(PacketBuffer buffer) { + this.pos = buffer.readBlockPos(); + } + + @Override + public void encode(PacketBuffer buffer) { + buffer.writeBlockPos(pos); + } + + @Override + public void handleThreadsafe(Context context) { + ServerPlayerEntity player = context.getSender(); + if(player == null) { + return; + } + + ServerWorld world = player.getServerWorld(); + BlockState state = world.getBlockState(pos); + + if(state.getBlock() instanceof LecternBlock && state.get(LecternBlock.HAS_BOOK)) { + TileEntity te = world.getTileEntity(pos); + if(te instanceof LecternTileEntity) { + LecternTileEntity lecternTe = (LecternTileEntity) te; + + ItemStack book = lecternTe.getBook().copy(); + if(!book.isEmpty()) { + if(!player.addItemStackToInventory(book)) { + player.dropItem(book, false, false); + } + + lecternTe.clear(); + + // fix lectern state + world.setBlockState(pos, state.with(LecternBlock.POWERED, false).with(LecternBlock.HAS_BOOK, false), 3); + world.notifyNeighborsOfStateChange(pos.down(), state.getBlock()); + } + } + } + + } +}