Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-10-08 10:50:11 +02:00
Handle no-NBT lecterns
Dieser Commit ist enthalten in:
Ursprung
f02105e9c7
Commit
6775d88704
@ -203,17 +203,27 @@ public class GeyserSpigotWorldManager extends GeyserWorldManager {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
BookMeta bookMeta = (BookMeta) itemStack.getItemMeta();
|
BookMeta bookMeta = (BookMeta) itemStack.getItemMeta();
|
||||||
NbtMapBuilder lecternTag = LecternInventoryTranslator.getBaseLecternTag(x, y, z, bookMeta.getPageCount());
|
// On the count: allow the book to show/open even there are no pages. We know there is a book here, after all, and this matches Java behavior
|
||||||
|
boolean hasBookPages = bookMeta.getPageCount() > 0;
|
||||||
|
NbtMapBuilder lecternTag = LecternInventoryTranslator.getBaseLecternTag(x, y, z, hasBookPages ? bookMeta.getPageCount() : 1);
|
||||||
lecternTag.putInt("page", lectern.getPage() / 2);
|
lecternTag.putInt("page", lectern.getPage() / 2);
|
||||||
NbtMapBuilder bookTag = NbtMap.builder()
|
NbtMapBuilder bookTag = NbtMap.builder()
|
||||||
.putByte("Count", (byte) itemStack.getAmount())
|
.putByte("Count", (byte) itemStack.getAmount())
|
||||||
.putShort("Damage", (short) 0)
|
.putShort("Damage", (short) 0)
|
||||||
.putString("Name", "minecraft:writable_book");
|
.putString("Name", "minecraft:writable_book");
|
||||||
List<NbtMap> pages = new ArrayList<>();
|
List<NbtMap> pages = new ArrayList<>(bookMeta.getPageCount());
|
||||||
for (String page : bookMeta.getPages()) {
|
if (hasBookPages) {
|
||||||
|
for (String page : bookMeta.getPages()) {
|
||||||
|
NbtMapBuilder pageBuilder = NbtMap.builder()
|
||||||
|
.putString("photoname", "")
|
||||||
|
.putString("text", page);
|
||||||
|
pages.add(pageBuilder.build());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Empty page
|
||||||
NbtMapBuilder pageBuilder = NbtMap.builder()
|
NbtMapBuilder pageBuilder = NbtMap.builder()
|
||||||
.putString("photoname", "")
|
.putString("photoname", "")
|
||||||
.putString("text", page);
|
.putString("text", "");
|
||||||
pages.add(pageBuilder.build());
|
pages.add(pageBuilder.build());
|
||||||
}
|
}
|
||||||
bookTag.putCompound("tag", NbtMap.builder().putList("pages", NbtType.COMPOUND, pages).build());
|
bookTag.putCompound("tag", NbtMap.builder().putList("pages", NbtType.COMPOUND, pages).build());
|
||||||
|
@ -175,7 +175,7 @@ public class GeyserSession implements CommandSender {
|
|||||||
* See {@link org.geysermc.connector.network.translators.world.WorldManager#getLecternDataAt(GeyserSession, int, int, int, boolean)}
|
* See {@link org.geysermc.connector.network.translators.world.WorldManager#getLecternDataAt(GeyserSession, int, int, int, boolean)}
|
||||||
* for more information.
|
* for more information.
|
||||||
*/
|
*/
|
||||||
private final List<Vector3i> lecternCache = new ArrayList<>();
|
private final Set<Vector3i> lecternCache = new ObjectOpenHashSet<>();
|
||||||
|
|
||||||
@Setter
|
@Setter
|
||||||
private boolean droppingLecternBook;
|
private boolean droppingLecternBook;
|
||||||
|
@ -33,6 +33,7 @@ import com.github.steveice10.opennbt.tag.builtin.ListTag;
|
|||||||
import com.nukkitx.math.vector.Vector3i;
|
import com.nukkitx.math.vector.Vector3i;
|
||||||
import com.nukkitx.nbt.NbtMap;
|
import com.nukkitx.nbt.NbtMap;
|
||||||
import com.nukkitx.nbt.NbtMapBuilder;
|
import com.nukkitx.nbt.NbtMapBuilder;
|
||||||
|
import com.nukkitx.nbt.NbtType;
|
||||||
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
|
import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
|
||||||
import org.geysermc.connector.inventory.GeyserItemStack;
|
import org.geysermc.connector.inventory.GeyserItemStack;
|
||||||
import org.geysermc.connector.inventory.Inventory;
|
import org.geysermc.connector.inventory.Inventory;
|
||||||
@ -43,6 +44,8 @@ import org.geysermc.connector.network.translators.inventory.updater.InventoryUpd
|
|||||||
import org.geysermc.connector.utils.BlockEntityUtils;
|
import org.geysermc.connector.utils.BlockEntityUtils;
|
||||||
import org.geysermc.connector.utils.InventoryUtils;
|
import org.geysermc.connector.utils.InventoryUtils;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
|
||||||
public class LecternInventoryTranslator extends BaseInventoryTranslator {
|
public class LecternInventoryTranslator extends BaseInventoryTranslator {
|
||||||
private final InventoryUpdater updater;
|
private final InventoryUpdater updater;
|
||||||
|
|
||||||
@ -96,11 +99,12 @@ public class LecternInventoryTranslator extends BaseInventoryTranslator {
|
|||||||
// If the method returns true, this is already handled for us
|
// If the method returns true, this is already handled for us
|
||||||
GeyserItemStack geyserItemStack = inventory.getItem(0);
|
GeyserItemStack geyserItemStack = inventory.getItem(0);
|
||||||
CompoundTag tag = geyserItemStack.getNbt();
|
CompoundTag tag = geyserItemStack.getNbt();
|
||||||
|
// Position has to be the last interacted position... right?
|
||||||
|
Vector3i position = session.getLastInteractionBlockPosition();
|
||||||
|
// shouldRefresh means that we should boot out the client on our side because their lectern GUI isn't updated yet
|
||||||
|
boolean shouldRefresh = !session.getConnector().getWorldManager().shouldExpectLecternHandled() && !session.getLecternCache().contains(position);
|
||||||
|
NbtMap blockEntityTag;
|
||||||
if (tag != null) {
|
if (tag != null) {
|
||||||
// Position has to be the last interacted position... right?
|
|
||||||
Vector3i position = session.getLastInteractionBlockPosition();
|
|
||||||
// shouldRefresh means that we should boot out the client on our side because their lectern GUI isn't updated yet
|
|
||||||
boolean shouldRefresh = !session.getConnector().getWorldManager().shouldExpectLecternHandled() && !session.getLecternCache().contains(position);
|
|
||||||
int pagesSize = ((ListTag) tag.get("pages")).size();
|
int pagesSize = ((ListTag) tag.get("pages")).size();
|
||||||
ItemData itemData = geyserItemStack.getItemData(session);
|
ItemData itemData = geyserItemStack.getItemData(session);
|
||||||
NbtMapBuilder lecternTag = getBaseLecternTag(position.getX(), position.getY(), position.getZ(), pagesSize);
|
NbtMapBuilder lecternTag = getBaseLecternTag(position.getX(), position.getY(), position.getZ(), pagesSize);
|
||||||
@ -111,20 +115,35 @@ public class LecternInventoryTranslator extends BaseInventoryTranslator {
|
|||||||
.putCompound("tag", itemData.getTag())
|
.putCompound("tag", itemData.getTag())
|
||||||
.build());
|
.build());
|
||||||
lecternTag.putInt("page", lecternContainer.getCurrentBedrockPage());
|
lecternTag.putInt("page", lecternContainer.getCurrentBedrockPage());
|
||||||
NbtMap blockEntityTag = lecternTag.build();
|
blockEntityTag = lecternTag.build();
|
||||||
// Even with serverside access to lecterns, we don't easily know which lectern this is, so we need to rebuild
|
} else {
|
||||||
// the block entity tag
|
// There is *a* book here, but... no NBT.
|
||||||
lecternContainer.setBlockEntityTag(blockEntityTag);
|
NbtMapBuilder lecternTag = getBaseLecternTag(position.getX(), position.getY(), position.getZ(), 1);
|
||||||
lecternContainer.setPosition(position);
|
NbtMapBuilder bookTag = NbtMap.builder()
|
||||||
if (shouldRefresh) {
|
.putByte("Count", (byte) 1)
|
||||||
// Update the lectern because it's not updated client-side
|
.putShort("Damage", (short) 0)
|
||||||
BlockEntityUtils.updateBlockEntity(session, blockEntityTag, position);
|
.putString("Name", "minecraft:writable_book")
|
||||||
session.getLecternCache().add(position);
|
.putCompound("tag", NbtMap.builder().putList("pages", NbtType.COMPOUND, Collections.singletonList(
|
||||||
// Close the window - we will reopen it once the client has this data synced
|
NbtMap.builder()
|
||||||
ClientCloseWindowPacket closeWindowPacket = new ClientCloseWindowPacket(lecternContainer.getId());
|
.putString("photoname", "")
|
||||||
session.sendDownstreamPacket(closeWindowPacket);
|
.putString("text", "")
|
||||||
InventoryUtils.closeInventory(session, inventory.getId(), false);
|
.build()
|
||||||
}
|
)).build());
|
||||||
|
|
||||||
|
blockEntityTag = lecternTag.putCompound("book", bookTag.build()).build();
|
||||||
|
}
|
||||||
|
// Even with serverside access to lecterns, we don't easily know which lectern this is, so we need to rebuild
|
||||||
|
// the block entity tag
|
||||||
|
lecternContainer.setBlockEntityTag(blockEntityTag);
|
||||||
|
lecternContainer.setPosition(position);
|
||||||
|
if (shouldRefresh) {
|
||||||
|
// Update the lectern because it's not updated client-side
|
||||||
|
BlockEntityUtils.updateBlockEntity(session, blockEntityTag, position);
|
||||||
|
session.getLecternCache().add(position);
|
||||||
|
// Close the window - we will reopen it once the client has this data synced
|
||||||
|
ClientCloseWindowPacket closeWindowPacket = new ClientCloseWindowPacket(lecternContainer.getId());
|
||||||
|
session.sendDownstreamPacket(closeWindowPacket);
|
||||||
|
InventoryUtils.closeInventory(session, inventory.getId(), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -401,7 +401,6 @@ public class ChunkUtils {
|
|||||||
boolean newLecternHasBook = BlockStateValues.getLecternBookStates().get(blockState);
|
boolean newLecternHasBook = BlockStateValues.getLecternBookStates().get(blockState);
|
||||||
if (!session.getConnector().getWorldManager().shouldExpectLecternHandled() && lecternCachedHasBook != newLecternHasBook) {
|
if (!session.getConnector().getWorldManager().shouldExpectLecternHandled() && lecternCachedHasBook != newLecternHasBook) {
|
||||||
// Refresh the block entirely - it either has a book or no longer has a book
|
// Refresh the block entirely - it either has a book or no longer has a book
|
||||||
session.getConnector().getLogger().warning("Refreshing lectern entirely");
|
|
||||||
NbtMap newLecternTag;
|
NbtMap newLecternTag;
|
||||||
if (newLecternHasBook) {
|
if (newLecternHasBook) {
|
||||||
newLecternTag = session.getConnector().getWorldManager().getLecternDataAt(session, position.getX(), position.getY(), position.getZ(), false);
|
newLecternTag = session.getConnector().getWorldManager().getLecternDataAt(session, position.getX(), position.getY(), position.getZ(), false);
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren