Public Access
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e511e7c10b | ||
|
|
05a06a4dc8 | ||
|
|
1dcd3a178e |
No files matched your search
@@ -12,6 +12,8 @@ The Notebook page atlas is copied from Legacy's assets/mystcraft/gui/bookui_page
|
||||
under the same license.
|
||||
The Writing Desk item texture is copied from Legacy's
|
||||
assets/mystcraft/textures/items/writingdesk.png under the same license.
|
||||
The Writing Desk block texture is copied from Legacy's
|
||||
assets/mystcraft/textures/entity/desk.png under the same license.
|
||||
|
||||
The initial build layout is derived from the official NeoForge 1.21.1
|
||||
ModDevGradle MDK: https://github.com/NeoForgeMDKs/MDK-1.21.1-ModDevGradle
|
||||
@@ -14,17 +14,24 @@ have not been ported yet.
|
||||
Milestone 4 now includes stackable blank Pages plus server-created symbol,
|
||||
unresolved-symbol, and baseline link-panel states. Page visuals follow the
|
||||
legacy runtime-composition rules. Craft an Ink Vial from two black dye, a glass
|
||||
bottle, and a water bucket; the bucket is returned. Hold a blank Page in one
|
||||
bottle, and a water bucket; the bucket is returned. Hold vanilla paper in one
|
||||
hand and use the Ink Vial in the other to prepare a baseline Link Panel Page.
|
||||
Each vial holds 16 ink units, and the default link-panel cost is two units.
|
||||
The spent vial returns a glass bottle. Server owners can adjust the symbol-copy
|
||||
and link-panel costs in the `writing` section of `rivencraft-server.toml`.
|
||||
Symbol-page transcription will become available through the Writing Desk.
|
||||
The Writing Desk can copy a selected written page from its collection tabs.
|
||||
The Writing Desk is now craftable from planks, a glass bottle, and a feather.
|
||||
Its four collection tabs, ink/source/page work slots, and inventory persist
|
||||
Its four collection tabs, paper input, ink vial input, empty glass-bottle return,
|
||||
16-unit ink meter, and inventory persist
|
||||
through world saves; breaking it drops stored contents. The desk screen is a
|
||||
functional foundation styled after Legacy's left tabs, central writing surface,
|
||||
and right inventory. Transcription controls are not implemented yet.
|
||||
and right inventory. Put vanilla paper in the
|
||||
upper-left slot and Ink Vials in the upper-right; a copy appears in the
|
||||
lower-left result slot when the selected page is valid. Taking it consumes one
|
||||
paper and, by default, one ink. An empty meter consumes a vial to refill and
|
||||
returns a vanilla glass bottle to the lower-right slot. The ALL browser searches
|
||||
and filters symbols held in the desk's loose pages and Notebooks; selection
|
||||
is validated against the server's current symbol catalog.
|
||||
Selecting a stored page on the desk surface shows its Legacy-proportioned
|
||||
portrait preview and name above the player inventory.
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 553 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 166 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 116 KiB |
@@ -9,6 +9,7 @@ project's GNU LGPL v3 license. Rivencraft itself uses the same license.
|
||||
| `assets/rivencraft/textures/item/page.png` | `assets/mystcraft/textures/items/page_background.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only |
|
||||
| `assets/rivencraft/textures/gui/notebook_pages.png` | `assets/mystcraft/gui/bookui_pagel.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only; Notebook draws the native 30×40 page at atlas coordinates `(156, 0)` |
|
||||
| `assets/rivencraft/textures/item/writing_desk.png` | `assets/mystcraft/textures/items/writingdesk.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only |
|
||||
| `assets/rivencraft/textures/block/writing_desk.png` | `assets/mystcraft/textures/entity/desk.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only; single-block model adapts the desk geometry and UV regions from `ModelWritingDesk` |
|
||||
| `assets/rivencraft/textures/item/linking_book_unwritten.png` | `assets/mystcraft/textures/items/unlinked.png` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Namespace/path rename only |
|
||||
| `assets/rivencraft/textures/item/page_link_panel.png` | `page_background.png` and `PageBuilder.BasicPageSprite` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Reproduces the legacy 160 px scale, black panel at `(25,30)`–`(135,75)`, and 128 px resample |
|
||||
| `assets/rivencraft/textures/item/page_symbol*.png` and `page_unresolved.png` | `page_background.png`, `textures/symbolcomponents.png`, `WordData`, `ModSymbols`, and `PageBuilder.PageSprite` | `9bc8ddc061845df0cd5ea47f4fdef773cff786ae` | Static 1.21.1 renditions of the legacy runtime-composed four-word symbol pages; `normal_time` uses the legacy Full Length poem |
|
||||
|
||||
@@ -53,8 +53,8 @@ unresolved symbol, and baseline link panel. Symbol and unresolved-symbol pages
|
||||
retain their namespaced symbol reference; unresolved pages can be inspected and
|
||||
removed but are rejected as usable writing until their data pack returns.
|
||||
|
||||
Only server-side writing operations may turn a blank page into a known symbol
|
||||
page or link panel. The shared `PageItem` creation and validation gates reject
|
||||
Only server-side writing operations may create a known symbol
|
||||
page or link panel from vanilla paper. The shared `PageItem` creation and validation gates reject
|
||||
new pages for identifiers absent from the server catalog. Later Writing Desk
|
||||
and Book Binder packets must call these gates rather than accepting page
|
||||
contents supplied by a client.
|
||||
@@ -82,9 +82,12 @@ used to craft another. The animated item texture comes from Mystcraft Legacy.
|
||||
|
||||
The server config sets ink costs independently for symbol copying (default one
|
||||
unit) and baseline link-panel preparation (default two units). To prepare a
|
||||
panel, hold a blank Page in one hand and use an Ink Vial in the other. The
|
||||
server checks the held items, blank state, and sufficient ink before consuming
|
||||
anything. A stack of blank Pages yields exactly one Link Panel Page per use;
|
||||
panel, hold vanilla paper in one hand and use an Ink Vial in the other. The
|
||||
server checks the held items and sufficient ink before consuming
|
||||
anything. A stack of paper yields exactly one Link Panel Page per use;
|
||||
if the inventory is full, the result is dropped instead of deleted. Symbol
|
||||
copying will be implemented by the Writing Desk. Link-property modifiers are
|
||||
copying is implemented by the Writing Desk: it previews a copy of the selected
|
||||
resolved page, then spends paper and ink only when that copy is taken. The
|
||||
desk's 16-unit ink meter refills from an Ink Vial when needed and returns a
|
||||
vanilla glass bottle. Link-property modifiers are
|
||||
deferred beyond this baseline flow.
|
||||
+1
-1
@@ -35,7 +35,7 @@ mod_name=Rivencraft
|
||||
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
|
||||
mod_license=LGPL-3.0-or-later
|
||||
# The mod version. Rivencraft uses the x.y.z.b policy documented in README.md.
|
||||
mod_version=0.3.5.1
|
||||
mod_version=0.3.6.0
|
||||
immersive_portals_version=6.0.7
|
||||
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
|
||||
# This should match the base package used for the mod sources.
|
||||
|
||||
@@ -3,6 +3,7 @@ package net.dnorberg.rivencraft.block;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||
import net.dnorberg.rivencraft.writing.WritingDeskCatalog;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
@@ -48,7 +49,10 @@ public final class WritingDeskBlock extends BaseEntityBlock {
|
||||
serverPlayer.openMenu(new SimpleMenuProvider(
|
||||
(id, inventory, ignored) -> new WritingDeskMenu(id, inventory, desk),
|
||||
Component.translatable("container.rivencraft.writing_desk")),
|
||||
buffer -> buffer.writeBlockPos(pos));
|
||||
buffer -> {
|
||||
buffer.writeBlockPos(pos);
|
||||
WritingDeskCatalog.write(buffer, WritingDeskCatalog.available(desk));
|
||||
});
|
||||
}
|
||||
return InteractionResult.sidedSuccess(level.isClientSide);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package net.dnorberg.rivencraft.block.entity;
|
||||
|
||||
import net.dnorberg.rivencraft.item.InkVialItem;
|
||||
import net.dnorberg.rivencraft.writing.WritingInkService;
|
||||
import net.dnorberg.rivencraft.registry.ModBlockEntities;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.minecraft.core.BlockPos;
|
||||
@@ -10,25 +12,29 @@ import net.minecraft.world.Container;
|
||||
import net.minecraft.world.ContainerHelper;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
||||
/** The four Legacy-like collection tabs and four work slots are owned by the block, not its viewers. */
|
||||
/** Four collection tabs, paper, ink vials and empty-vial return are owned by the block. */
|
||||
public final class WritingDeskBlockEntity extends BlockEntity implements Container {
|
||||
public static final int COLLECTIONS = 4;
|
||||
public static final int INK = 4;
|
||||
public static final int SOURCE = 5;
|
||||
public static final int RETURN = 5;
|
||||
public static final int PAPER = 6;
|
||||
public static final int OUTPUT = 7;
|
||||
/** Unused by new desks; retained so old saves cannot silently lose slot contents. */
|
||||
public static final int LEGACY_OUTPUT = 7;
|
||||
public static final int SIZE = 8;
|
||||
private NonNullList<ItemStack> items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||
private int activeCollection;
|
||||
private int inkRemaining;
|
||||
|
||||
public WritingDeskBlockEntity(BlockPos pos, BlockState state) {
|
||||
super(ModBlockEntities.WRITING_DESK.get(), pos, state);
|
||||
}
|
||||
|
||||
public int activeCollection() { return activeCollection; }
|
||||
public int inkRemaining() { return inkRemaining; }
|
||||
public void setActiveCollection(int index) {
|
||||
if (index >= 0 && index < COLLECTIONS && activeCollection != index) {
|
||||
activeCollection = index;
|
||||
@@ -60,15 +66,47 @@ public final class WritingDeskBlockEntity extends BlockEntity implements Contain
|
||||
if (slot < COLLECTIONS) return stack.is(ModItems.NOTEBOOK.get()) || stack.is(ModItems.PAGE.get());
|
||||
return switch (slot) {
|
||||
case INK -> stack.is(ModItems.INK_VIAL.get());
|
||||
case SOURCE -> stack.is(ModItems.PAGE.get()) || stack.is(ModItems.NOTEBOOK.get());
|
||||
case PAPER -> stack.is(ModItems.PAGE.get());
|
||||
case OUTPUT -> false;
|
||||
case RETURN -> false;
|
||||
case PAPER -> stack.is(Items.PAPER);
|
||||
case LEGACY_OUTPUT -> false;
|
||||
default -> false;
|
||||
};
|
||||
}
|
||||
|
||||
/** The output is virtual; inputs are committed only after a result can be given to a player. */
|
||||
public boolean canConsumeCopyMaterials() {
|
||||
ItemStack paper = items.get(PAPER);
|
||||
if (!canPlaceItem(PAPER, paper) || paper.isEmpty()) return false;
|
||||
int cost = WritingInkService.symbolCopyCost();
|
||||
if (inkRemaining >= cost) return true;
|
||||
ItemStack vial = items.get(INK);
|
||||
ItemStack returned = items.get(RETURN);
|
||||
return vial.is(ModItems.INK_VIAL.get()) && inkRemaining + InkVialItem.remaining(vial) >= cost
|
||||
&& (returned.isEmpty() || returned.is(Items.GLASS_BOTTLE)
|
||||
&& returned.getCount() < returned.getMaxStackSize());
|
||||
}
|
||||
|
||||
public boolean consumeCopyMaterials() {
|
||||
if (!canConsumeCopyMaterials()) return false;
|
||||
int cost = WritingInkService.symbolCopyCost();
|
||||
if (inkRemaining < cost) {
|
||||
ItemStack vial = items.get(INK);
|
||||
inkRemaining += Math.clamp(InkVialItem.remaining(vial), 0, InkVialItem.CAPACITY);
|
||||
vial.shrink(1);
|
||||
if (vial.isEmpty()) items.set(INK, ItemStack.EMPTY);
|
||||
ItemStack returned = items.get(RETURN);
|
||||
if (returned.isEmpty()) items.set(RETURN, new ItemStack(Items.GLASS_BOTTLE));
|
||||
else returned.grow(1);
|
||||
}
|
||||
inkRemaining -= cost;
|
||||
removeItem(PAPER, 1);
|
||||
setChanged();
|
||||
return true;
|
||||
}
|
||||
@Override public void clearContent() {
|
||||
items.clear();
|
||||
items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||
inkRemaining = 0;
|
||||
setChanged();
|
||||
}
|
||||
@Override protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
|
||||
@@ -76,10 +114,12 @@ public final class WritingDeskBlockEntity extends BlockEntity implements Contain
|
||||
items = NonNullList.withSize(SIZE, ItemStack.EMPTY);
|
||||
ContainerHelper.loadAllItems(tag, items, registries);
|
||||
activeCollection = Math.clamp(tag.getInt("ActiveCollection"), 0, COLLECTIONS - 1);
|
||||
inkRemaining = Math.clamp(tag.getInt("InkRemaining"), 0, InkVialItem.CAPACITY);
|
||||
}
|
||||
@Override protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
|
||||
super.saveAdditional(tag, registries);
|
||||
ContainerHelper.saveAllItems(tag, items, registries);
|
||||
tag.putInt("ActiveCollection", activeCollection);
|
||||
tag.putInt("InkRemaining", inkRemaining);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package net.dnorberg.rivencraft.client;
|
||||
|
||||
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||
import net.dnorberg.rivencraft.network.WritingDeskCatalogPayload;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.neoforged.neoforge.network.handling.IPayloadContext;
|
||||
|
||||
public final class ClientWritingDeskCatalog {
|
||||
private ClientWritingDeskCatalog() {}
|
||||
|
||||
public static void handle(WritingDeskCatalogPayload payload, IPayloadContext context) {
|
||||
context.enqueueWork(() -> {
|
||||
var player = Minecraft.getInstance().player;
|
||||
if (player != null && player.containerMenu instanceof WritingDeskMenu menu
|
||||
&& menu.containerId == payload.containerId()) {
|
||||
menu.setCatalog(payload.symbols());
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -276,7 +276,11 @@ public final class NotebookScreen extends AbstractContainerScreen<NotebookMenu>
|
||||
if (content.kind() == net.dnorberg.rivencraft.writing.PageContent.Kind.UNRESOLVED_SYMBOL) {
|
||||
return UNRESOLVED_SYMBOL;
|
||||
}
|
||||
return switch (content.symbol().orElseThrow().id().toString()) {
|
||||
return symbolTexture(content.symbol().orElseThrow().id());
|
||||
}
|
||||
|
||||
static ResourceLocation symbolTexture(ResourceLocation id) {
|
||||
return switch (id.toString()) {
|
||||
case "rivencraft:terrain/standard" -> STANDARD_TERRAIN;
|
||||
case "rivencraft:biome/native" -> NATIVE_BIOMES;
|
||||
case "rivencraft:lighting/normal" -> NORMAL_LIGHTING;
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
package net.dnorberg.rivencraft.client.screen;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Objects;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.item.PageItem;
|
||||
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||
import net.dnorberg.rivencraft.writing.SymbolDisplayMetadata;
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.client.gui.components.EditBox;
|
||||
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
@@ -21,6 +26,11 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
private int lastCollection = -1;
|
||||
private int selectedPage;
|
||||
private int scrollRows;
|
||||
private boolean allMode;
|
||||
private ResourceLocation selectedSymbol;
|
||||
private ResourceLocation selectedCategory;
|
||||
private EditBox search;
|
||||
private Button categoryButton;
|
||||
|
||||
public WritingDeskScreen(WritingDeskMenu menu, Inventory inventory, Component title) {
|
||||
super(menu, inventory, title);
|
||||
@@ -31,6 +41,48 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
inventoryLabelY = 79;
|
||||
}
|
||||
|
||||
@Override protected void init() {
|
||||
super.init();
|
||||
addRenderableWidget(Button.builder(Component.literal("ALL"), button -> {
|
||||
allMode = true;
|
||||
scrollRows = 0;
|
||||
}).bounds(leftPos + 48, topPos - 18, 29, 18).build());
|
||||
categoryButton = addRenderableWidget(Button.builder(Component.literal("All types"), button -> {
|
||||
List<ResourceLocation> categories = menu.catalog().stream()
|
||||
.map(SymbolDisplayMetadata::category).distinct().sorted().toList();
|
||||
int next = selectedCategory == null ? 0 : categories.indexOf(selectedCategory) + 1;
|
||||
selectedCategory = next >= categories.size() ? null : categories.get(next);
|
||||
categoryButton.setMessage(Component.literal(selectedCategory == null
|
||||
? "All types" : selectedCategory.getPath()));
|
||||
allMode = true;
|
||||
scrollRows = 0;
|
||||
}).bounds(leftPos + 79, topPos - 18, 66, 18).build());
|
||||
search = new EditBox(font, leftPos + 147, topPos - 18, 69, 18,
|
||||
Component.translatable("screen.rivencraft.writing_desk.search"));
|
||||
search.setMaxLength(64);
|
||||
search.setHint(Component.translatable("screen.rivencraft.writing_desk.search"));
|
||||
search.setResponder(value -> {
|
||||
allMode = true;
|
||||
scrollRows = 0;
|
||||
});
|
||||
addRenderableWidget(search);
|
||||
}
|
||||
|
||||
private List<SymbolDisplayMetadata> filteredCatalog() {
|
||||
String query = search == null ? "" : search.getValue().trim().toLowerCase(Locale.ROOT);
|
||||
return menu.catalog().stream()
|
||||
.filter(entry -> selectedCategory == null || selectedCategory.equals(entry.category()))
|
||||
.filter(entry -> query.isEmpty()
|
||||
|| entry.id().toString().toLowerCase(Locale.ROOT).contains(query)
|
||||
|| Component.translatable(entry.nameTranslationKey()).getString()
|
||||
.toLowerCase(Locale.ROOT).contains(query))
|
||||
.toList();
|
||||
}
|
||||
|
||||
@Override public void renderBackground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
|
||||
// Legacy leaves the world visible around the desk instead of dimming it.
|
||||
}
|
||||
|
||||
@Override protected void renderBg(GuiGraphics graphics, float partialTick, int mouseX, int mouseY) {
|
||||
int x = leftPos;
|
||||
int y = topPos;
|
||||
@@ -47,6 +99,11 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
slotFrame(graphics, 228, 20);
|
||||
slotFrame(graphics, 228, 57);
|
||||
slotFrame(graphics, 370, 57);
|
||||
graphics.fill(x + 350, y + 20, x + 364, y + 75, 0xFF303035);
|
||||
graphics.fill(x + 352, y + 22, x + 362, y + 73, 0xFF15151B);
|
||||
int filled = 51 * menu.inkRemaining() / 16;
|
||||
if (filled > 0) graphics.fill(x + 352, y + 73 - filled, x + 362, y + 73, 0xFF6666AA);
|
||||
graphics.renderOutline(x + 350, y + 20, 14, 55, 0xFF484848);
|
||||
for (int row = 0; row < 3; row++) {
|
||||
for (int column = 0; column < 9; column++) slotFrame(graphics, 224 + column * 18, 91 + row * 18);
|
||||
}
|
||||
@@ -68,6 +125,11 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
super.render(graphics, mouseX, mouseY, partialTick);
|
||||
renderCollection(graphics);
|
||||
renderTooltip(graphics, mouseX, mouseY);
|
||||
if (mouseX >= leftPos + 350 && mouseX < leftPos + 364
|
||||
&& mouseY >= topPos + 20 && mouseY < topPos + 75) {
|
||||
graphics.renderTooltip(font, Component.translatable("screen.rivencraft.writing_desk.ink",
|
||||
menu.inkRemaining(), 16), mouseX, mouseY);
|
||||
}
|
||||
}
|
||||
|
||||
private List<ItemStack> pages() {
|
||||
@@ -80,6 +142,10 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
}
|
||||
|
||||
private void renderCollection(GuiGraphics graphics) {
|
||||
if (allMode) {
|
||||
renderCatalog(graphics);
|
||||
return;
|
||||
}
|
||||
List<ItemStack> pages = pages();
|
||||
if (lastCollection != menu.activeCollection()) {
|
||||
lastCollection = menu.activeCollection();
|
||||
@@ -110,6 +176,41 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
graphics.drawString(font, title, leftPos + 254, topPos + 67, 0xFFE0E0E0, false);
|
||||
}
|
||||
|
||||
private void renderCatalog(GuiGraphics graphics) {
|
||||
List<SymbolDisplayMetadata> filtered = filteredCatalog();
|
||||
if (filtered.isEmpty()) {
|
||||
graphics.drawString(font, Component.translatable("screen.rivencraft.writing_desk.no_symbols"),
|
||||
leftPos + 52, topPos + 24, 0xFFC4B8A3, false);
|
||||
}
|
||||
for (int i = scrollRows * 5; i < filtered.size() && i < scrollRows * 5 + 15; i++) {
|
||||
SymbolDisplayMetadata entry = filtered.get(i);
|
||||
int x = leftPos + 48 + (i % 5) * 31;
|
||||
int y = topPos + 18 + (i / 5 - scrollRows) * 41;
|
||||
drawSymbolPage(graphics, entry.id(), x, y);
|
||||
if (Objects.equals(entry.id(), selectedSymbol)) {
|
||||
graphics.renderOutline(x, y, 30, 40, 0xFFFFD061);
|
||||
}
|
||||
}
|
||||
SymbolDisplayMetadata selected = menu.catalog().stream()
|
||||
.filter(entry -> Objects.equals(entry.id(), selectedSymbol)).findFirst().orElse(null);
|
||||
if (selected == null) return;
|
||||
graphics.pose().pushPose();
|
||||
graphics.pose().translate(leftPos + 294, topPos + 12, 0);
|
||||
graphics.pose().scale(1.35F, 1.35F, 1.0F);
|
||||
drawSymbolPage(graphics, selected.id(), 0, 0);
|
||||
graphics.pose().popPose();
|
||||
String title = font.plainSubstrByWidth(
|
||||
Component.translatable(selected.nameTranslationKey()).getString(), 112);
|
||||
graphics.fill(leftPos + 251, topPos + 64, leftPos + 365, topPos + 77, 0xFF202020);
|
||||
graphics.drawString(font, title, leftPos + 254, topPos + 67, 0xFFE0E0E0, false);
|
||||
}
|
||||
|
||||
private void drawSymbolPage(GuiGraphics graphics, ResourceLocation id, int x, int y) {
|
||||
graphics.blit(PAGE_ATLAS, x, y, 30, 40, 156, 0, 30, 40, 256, 256);
|
||||
graphics.blit(NotebookScreen.symbolTexture(id), x + 1, y + 6,
|
||||
28, 28, 16, 16, 96, 96, 128, 128);
|
||||
}
|
||||
|
||||
private void drawPage(GuiGraphics graphics, ItemStack page, int x, int y) {
|
||||
graphics.blit(PAGE_ATLAS, x, y, 30, 40, 156, 0, 30, 40, 256, 256);
|
||||
if (page.isEmpty()) return;
|
||||
@@ -129,10 +230,25 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
int column = x / 31;
|
||||
int row = y / 41;
|
||||
int index = (row + scrollRows) * 5 + column;
|
||||
List<ItemStack> pages = pages();
|
||||
if (x % 31 < 30 && y % 41 < 40 && index < pages.size()
|
||||
&& !pages.get(index).isEmpty()) {
|
||||
selectedPage = index;
|
||||
if (allMode) {
|
||||
List<SymbolDisplayMetadata> filtered = filteredCatalog();
|
||||
if (x % 31 < 30 && y % 41 < 40 && index < filtered.size()) {
|
||||
SymbolDisplayMetadata entry = filtered.get(index);
|
||||
selectedSymbol = entry.id();
|
||||
int serverIndex = menu.catalog().indexOf(entry);
|
||||
if (serverIndex >= 0 && minecraft != null && minecraft.gameMode != null) {
|
||||
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, 100 + serverIndex);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
List<ItemStack> pages = pages();
|
||||
if (x % 31 < 30 && y % 41 < 40 && index < pages.size()
|
||||
&& !pages.get(index).isEmpty()) {
|
||||
selectedPage = index;
|
||||
if (minecraft != null && minecraft.gameMode != null) {
|
||||
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, 16 + index);
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -141,6 +257,8 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
for (int i = 0; i < 4; i++) {
|
||||
int top = topPos + 16 + i * 37;
|
||||
if (mouseY >= top && mouseY < top + 32) {
|
||||
allMode = false;
|
||||
selectedSymbol = null;
|
||||
if (minecraft != null && minecraft.gameMode != null) {
|
||||
minecraft.gameMode.handleInventoryButtonClick(menu.containerId, i);
|
||||
}
|
||||
@@ -154,10 +272,23 @@ public final class WritingDeskScreen extends AbstractContainerScreen<WritingDesk
|
||||
@Override public boolean mouseScrolled(double mouseX, double mouseY, double scrollX, double scrollY) {
|
||||
if (mouseX >= leftPos + 48 && mouseX < leftPos + 203
|
||||
&& mouseY >= topPos + 18 && mouseY < topPos + 141) {
|
||||
int rows = (pages().size() + 4) / 5;
|
||||
int rows = ((allMode ? filteredCatalog().size() : pages().size()) + 4) / 5;
|
||||
scrollRows = Math.clamp(scrollRows - (int) Math.signum(scrollY), 0, Math.max(0, rows - 3));
|
||||
return true;
|
||||
}
|
||||
return super.mouseScrolled(mouseX, mouseY, scrollX, scrollY);
|
||||
}
|
||||
|
||||
@Override public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
|
||||
if (search != null && search.isFocused()) {
|
||||
if (keyCode == 256) {
|
||||
setFocused(null);
|
||||
search.setFocused(false);
|
||||
} else {
|
||||
search.keyPressed(keyCode, scanCode, modifiers);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return super.keyPressed(keyCode, scanCode, modifiers);
|
||||
}
|
||||
}
|
||||
@@ -244,14 +244,14 @@ public final class WritingDataGameTests {
|
||||
@GameTest(template = "empty")
|
||||
public static void linkPanelPreparationConsumesOnePageAndConfiguredInkOnlyOnSuccess(GameTestHelper helper) {
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
ItemStack pages = new ItemStack(ModItems.PAGE.get(), 2);
|
||||
ItemStack pages = new ItemStack(Items.PAPER, 2);
|
||||
ItemStack vial = new ItemStack(ModItems.INK_VIAL.get());
|
||||
player.setItemInHand(InteractionHand.MAIN_HAND, vial);
|
||||
player.setItemInHand(InteractionHand.OFF_HAND, pages);
|
||||
|
||||
helper.assertTrue(WritingInkService.prepareLinkPanel(player, InteractionHand.MAIN_HAND),
|
||||
"A blank Page and sufficient ink must prepare one link panel");
|
||||
helper.assertValueEqual(pages.getCount(), 1, "Preparation must consume exactly one blank Page");
|
||||
"Paper and sufficient ink must prepare one link panel");
|
||||
helper.assertValueEqual(pages.getCount(), 1, "Preparation must consume exactly one paper");
|
||||
helper.assertValueEqual(InkVialItem.remaining(player.getMainHandItem()),
|
||||
InkVialItem.CAPACITY - WritingInkService.linkPanelCost(),
|
||||
"Preparation must consume exactly the server-configured ink cost");
|
||||
@@ -274,14 +274,14 @@ public final class WritingDataGameTests {
|
||||
ItemStack lowInk = new ItemStack(ModItems.INK_VIAL.get());
|
||||
lowInk.set(ModDataComponents.INK_REMAINING.get(), WritingInkService.linkPanelCost() - 1);
|
||||
player.setItemInHand(InteractionHand.MAIN_HAND, lowInk);
|
||||
player.setItemInHand(InteractionHand.OFF_HAND, new ItemStack(ModItems.PAGE.get()));
|
||||
player.setItemInHand(InteractionHand.OFF_HAND, new ItemStack(Items.PAPER));
|
||||
helper.assertFalse(WritingInkService.prepareLinkPanel(player, InteractionHand.MAIN_HAND),
|
||||
"Insufficient ink must reject link-panel preparation");
|
||||
helper.assertValueEqual(InkVialItem.remaining(player.getMainHandItem()),
|
||||
WritingInkService.linkPanelCost() - 1,
|
||||
"Insufficient ink must remain untouched");
|
||||
helper.assertValueEqual(PageItem.content(player.getOffhandItem()).kind(), PageContent.Kind.BLANK,
|
||||
"Insufficient ink must leave the Page blank");
|
||||
helper.assertTrue(player.getOffhandItem().is(Items.PAPER),
|
||||
"Insufficient ink must leave paper untouched");
|
||||
|
||||
lowInk.set(ModDataComponents.INK_REMAINING.get(), WritingInkService.linkPanelCost());
|
||||
helper.assertTrue(WritingInkService.prepareLinkPanel(player, InteractionHand.MAIN_HAND),
|
||||
@@ -290,7 +290,7 @@ public final class WritingDataGameTests {
|
||||
"A depleted Ink Vial must return a reusable glass bottle");
|
||||
helper.assertValueEqual(PageItem.content(player.getOffhandItem()).kind(),
|
||||
PageContent.Kind.LINK_PANEL,
|
||||
"A single blank Page must be replaced by one Link Panel Page");
|
||||
"A single paper must be replaced by one Link Panel Page");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@@ -298,7 +298,7 @@ public final class WritingDataGameTests {
|
||||
public static void stackedInkVialsSplitWithoutChangingTheOtherVials(GameTestHelper helper) {
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
player.setItemInHand(InteractionHand.MAIN_HAND, new ItemStack(ModItems.INK_VIAL.get(), 2));
|
||||
player.setItemInHand(InteractionHand.OFF_HAND, new ItemStack(ModItems.PAGE.get()));
|
||||
player.setItemInHand(InteractionHand.OFF_HAND, new ItemStack(Items.PAPER));
|
||||
|
||||
helper.assertTrue(WritingInkService.prepareLinkPanel(player, InteractionHand.MAIN_HAND),
|
||||
"A stack of full vials must support preparing one panel");
|
||||
|
||||
@@ -1,15 +1,24 @@
|
||||
package net.dnorberg.rivencraft.gametest;
|
||||
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||
import net.dnorberg.rivencraft.menu.WritingDeskMenu;
|
||||
import net.dnorberg.rivencraft.item.PageItem;
|
||||
import net.dnorberg.rivencraft.registry.ModBlocks;
|
||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||
import net.dnorberg.rivencraft.writing.WritingDeskCatalog;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.gametest.framework.GameTest;
|
||||
import net.minecraft.gametest.framework.GameTestHelper;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.inventory.ClickType;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import net.neoforged.neoforge.gametest.GameTestHolder;
|
||||
@@ -26,7 +35,7 @@ public final class WritingDeskGameTests {
|
||||
var original = new WritingDeskBlockEntity(pos, ModBlocks.WRITING_DESK.get().defaultBlockState());
|
||||
original.setItem(0, new ItemStack(ModItems.NOTEBOOK.get()));
|
||||
original.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||
original.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(ModItems.PAGE.get(), 12));
|
||||
original.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 12));
|
||||
original.setActiveCollection(2);
|
||||
var saved = original.saveWithoutMetadata(helper.getLevel().registryAccess());
|
||||
var restored = new WritingDeskBlockEntity(pos, ModBlocks.WRITING_DESK.get().defaultBlockState());
|
||||
@@ -46,12 +55,12 @@ public final class WritingDeskGameTests {
|
||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||
desk.setItem(0, new ItemStack(ModItems.NOTEBOOK.get()));
|
||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(ModItems.PAGE.get(), 12));
|
||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 12));
|
||||
helper.getLevel().setBlock(pos, Blocks.AIR.defaultBlockState(), 3);
|
||||
var drops = helper.getLevel().getEntitiesOfClass(ItemEntity.class, new AABB(pos).inflate(2));
|
||||
int notebooks = drops.stream().filter(e -> e.getItem().is(ModItems.NOTEBOOK.get())).mapToInt(e -> e.getItem().getCount()).sum();
|
||||
int ink = drops.stream().filter(e -> e.getItem().is(ModItems.INK_VIAL.get())).mapToInt(e -> e.getItem().getCount()).sum();
|
||||
int pages = drops.stream().filter(e -> e.getItem().is(ModItems.PAGE.get())).mapToInt(e -> e.getItem().getCount()).sum();
|
||||
int pages = drops.stream().filter(e -> e.getItem().is(Items.PAPER)).mapToInt(e -> e.getItem().getCount()).sum();
|
||||
helper.assertValueEqual(notebooks, 1, "Notebook must drop exactly once");
|
||||
helper.assertValueEqual(ink, 1, "Ink must drop exactly once");
|
||||
helper.assertValueEqual(pages, 12, "Pages must drop without loss");
|
||||
@@ -65,21 +74,195 @@ public final class WritingDeskGameTests {
|
||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||
player.getInventory().setItem(9, new ItemStack(ModItems.PAGE.get(), 12));
|
||||
player.getInventory().setItem(9, new ItemStack(Items.PAPER, 12));
|
||||
WritingDeskMenu menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||
helper.assertTrue(menu.stillValid(player), "Placed desk must keep its menu valid");
|
||||
helper.assertTrue(menu.clickMenuButton(player, 3), "Active collection control must accept a valid tab");
|
||||
helper.assertValueEqual(desk.activeCollection(), 3, "Selected tab must be stored on the desk");
|
||||
menu.quickMoveStack(player, 8);
|
||||
menu.quickMoveStack(player, 9);
|
||||
helper.assertValueEqual(desk.getItem(WritingDeskBlockEntity.PAPER).getCount(), 12, "Shift-click must deposit all pages");
|
||||
helper.assertTrue(player.getInventory().getItem(9).isEmpty(), "Shift-click must consume player source stack");
|
||||
menu.quickMoveStack(player, WritingDeskBlockEntity.PAPER);
|
||||
helper.assertTrue(desk.getItem(WritingDeskBlockEntity.PAPER).isEmpty(), "Shift-click must empty desk source slot");
|
||||
int total = player.getInventory().items.stream().filter(stack -> stack.is(ModItems.PAGE.get()))
|
||||
int total = player.getInventory().items.stream().filter(stack -> stack.is(Items.PAPER))
|
||||
.mapToInt(ItemStack::getCount).sum();
|
||||
helper.assertValueEqual(total, 12, "Round-trip must not lose or duplicate pages");
|
||||
helper.getLevel().setBlock(pos, Blocks.AIR.defaultBlockState(), 3);
|
||||
helper.assertFalse(menu.stillValid(player), "Removed desk must invalidate menu");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void takingCopySpendsPaperAndOneInkThenReturnsGlassBottle(GameTestHelper helper) {
|
||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||
ItemStack source = PageItem.createLinkPanelPage();
|
||||
desk.setItem(0, source.copy());
|
||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||
WritingDeskMenu menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||
menu.broadcastChanges();
|
||||
helper.assertTrue(menu.getSlot(WritingDeskMenu.COPY_RESULT).getItem().is(ModItems.PAGE.get()),
|
||||
"A source page with paper and ink must preview one copy");
|
||||
helper.assertValueEqual(desk.getItem(WritingDeskBlockEntity.PAPER).getCount(), 2,
|
||||
"Previewing must not consume paper");
|
||||
helper.assertValueEqual(desk.inkRemaining(), 0, "Previewing must not consume ink");
|
||||
menu.clicked(WritingDeskMenu.COPY_RESULT, 0, ClickType.PICKUP, player);
|
||||
helper.assertTrue(menu.getCarried().is(ModItems.PAGE.get()), "Taking result must give the copied page");
|
||||
helper.assertValueEqual(desk.getItem(WritingDeskBlockEntity.PAPER).getCount(), 1,
|
||||
"Taking a copy must consume one paper");
|
||||
helper.assertValueEqual(desk.inkRemaining(), 15, "First copy must refill to 16 and consume one ink");
|
||||
helper.assertTrue(desk.getItem(WritingDeskBlockEntity.INK).isEmpty(), "Refill must consume one vial");
|
||||
helper.assertTrue(desk.getItem(WritingDeskBlockEntity.RETURN).is(Items.GLASS_BOTTLE),
|
||||
"Refill must return a vanilla glass bottle");
|
||||
helper.assertTrue(desk.getItem(0).is(ModItems.PAGE.get()), "Source page must remain untouched");
|
||||
helper.assertTrue(menu.quickMoveStack(player, WritingDeskMenu.COPY_RESULT).is(ModItems.PAGE.get()),
|
||||
"A second copy must remain available from the same ink fill");
|
||||
helper.assertTrue(desk.getItem(WritingDeskBlockEntity.PAPER).isEmpty(),
|
||||
"Two copies must consume exactly two paper");
|
||||
helper.assertValueEqual(desk.inkRemaining(), 14, "Two copies must spend exactly two of sixteen ink");
|
||||
helper.assertValueEqual(desk.getItem(WritingDeskBlockEntity.RETURN).getCount(), 1,
|
||||
"A second copy must not consume another vial");
|
||||
var saved = desk.saveWithoutMetadata(helper.getLevel().registryAccess());
|
||||
var restored = new WritingDeskBlockEntity(pos, ModBlocks.WRITING_DESK.get().defaultBlockState());
|
||||
restored.loadWithComponents(saved, helper.getLevel().registryAccess());
|
||||
helper.assertValueEqual(restored.inkRemaining(), 14, "Ink meter must persist across saves");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void shiftClickCopiesOnlyWhenResourcesAndBottleSpaceExist(GameTestHelper helper) {
|
||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||
desk.setItem(0, PageItem.createLinkPanelPage());
|
||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER, 2));
|
||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||
desk.setItem(WritingDeskBlockEntity.RETURN, new ItemStack(Items.GLASS_BOTTLE, 64));
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||
WritingDeskMenu menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||
helper.assertTrue(menu.quickMoveStack(player, WritingDeskMenu.COPY_RESULT).isEmpty(),
|
||||
"Full bottle return must block refill without consuming supplies");
|
||||
helper.assertValueEqual(desk.getItem(WritingDeskBlockEntity.PAPER).getCount(), 2,
|
||||
"Blocked copy must leave paper untouched");
|
||||
desk.removeItem(WritingDeskBlockEntity.RETURN, 1);
|
||||
ItemStack copied = menu.quickMoveStack(player, WritingDeskMenu.COPY_RESULT);
|
||||
helper.assertTrue(copied.is(ModItems.PAGE.get()), "Shift-click must transfer one copy");
|
||||
helper.assertValueEqual(desk.getItem(WritingDeskBlockEntity.PAPER).getCount(), 1,
|
||||
"Shift-click must consume one paper");
|
||||
helper.assertValueEqual(desk.inkRemaining(), 15, "Shift-click must consume one ink");
|
||||
int copies = player.getInventory().items.stream().filter(stack -> stack.is(ModItems.PAGE.get()))
|
||||
.mapToInt(ItemStack::getCount).sum();
|
||||
helper.assertValueEqual(copies, 1, "Shift-click must give exactly one page");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void selectedNotebookPageControlsCopyPreview(GameTestHelper helper) {
|
||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||
ItemStack notebook = new ItemStack(ModItems.NOTEBOOK.get());
|
||||
notebook.set(ModDataComponents.NOTEBOOK_CONTENTS.get(),
|
||||
new NotebookContents(List.of(ItemStack.EMPTY, PageItem.createLinkPanelPage())));
|
||||
desk.setItem(0, notebook);
|
||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||
WritingDeskMenu menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||
menu.broadcastChanges();
|
||||
helper.assertTrue(menu.getSlot(WritingDeskMenu.COPY_RESULT).getItem().isEmpty(),
|
||||
"An empty selected position must not create a copy");
|
||||
helper.assertTrue(menu.clickMenuButton(player, 17), "Second page selection must be accepted");
|
||||
menu.broadcastChanges();
|
||||
helper.assertTrue(menu.getSlot(WritingDeskMenu.COPY_RESULT).getItem().is(ModItems.PAGE.get()),
|
||||
"Selecting the populated page must show a copy");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void twoViewersCannotTakeTheSameLastSheet(GameTestHelper helper) {
|
||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||
desk.setItem(0, PageItem.createLinkPanelPage());
|
||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||
var first = helper.makeMockServerPlayerInLevel();
|
||||
var second = helper.makeMockServerPlayerInLevel();
|
||||
first.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||
second.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||
WritingDeskMenu firstMenu = new WritingDeskMenu(1, first.getInventory(), desk);
|
||||
WritingDeskMenu secondMenu = new WritingDeskMenu(2, second.getInventory(), desk);
|
||||
firstMenu.broadcastChanges();
|
||||
secondMenu.broadcastChanges();
|
||||
helper.assertTrue(firstMenu.quickMoveStack(first, WritingDeskMenu.COPY_RESULT).is(ModItems.PAGE.get()),
|
||||
"First viewer should take the last available copy");
|
||||
helper.assertTrue(secondMenu.quickMoveStack(second, WritingDeskMenu.COPY_RESULT).isEmpty(),
|
||||
"Second viewer must not copy the already-consumed paper");
|
||||
helper.assertTrue(desk.getItem(WritingDeskBlockEntity.PAPER).isEmpty(),
|
||||
"Shared desk must spend paper only once");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void catalogAggregatesKnownSymbolsAcrossCollections(GameTestHelper helper) {
|
||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||
ResourceLocation known = ResourceLocation.parse("rivencraft:terrain/standard");
|
||||
ItemStack page = PageItem.createSymbolPage(new SymbolReference(known));
|
||||
ItemStack notebook = new ItemStack(ModItems.NOTEBOOK.get());
|
||||
notebook.set(ModDataComponents.NOTEBOOK_CONTENTS.get(), new NotebookContents(List.of(page.copy())));
|
||||
desk.setItem(0, page);
|
||||
desk.setItem(1, notebook);
|
||||
helper.assertValueEqual(WritingDeskCatalog.available(desk).size(), 1,
|
||||
"Duplicate symbols across loose pages and notebooks must appear once");
|
||||
helper.assertValueEqual(WritingDeskCatalog.available(desk).getFirst().id(), known,
|
||||
"Catalog must retain the authoritative symbol ID");
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||
WritingDeskMenu menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||
helper.assertFalse(menu.clickMenuButton(player, 101), "Out-of-range catalog index must be rejected");
|
||||
helper.assertTrue(menu.clickMenuButton(player, 100), "Known catalog symbol must be selectable");
|
||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||
menu.broadcastChanges();
|
||||
helper.assertTrue(menu.getSlot(WritingDeskMenu.COPY_RESULT).getItem().is(ModItems.PAGE.get()),
|
||||
"Catalog selection must preview a copy of the known symbol");
|
||||
desk.setItem(0, ItemStack.EMPTY);
|
||||
desk.setItem(1, ItemStack.EMPTY);
|
||||
menu.broadcastChanges();
|
||||
helper.assertTrue(menu.catalog().isEmpty(), "Removed sources must invalidate catalog for the viewer");
|
||||
helper.assertTrue(menu.getSlot(WritingDeskMenu.COPY_RESULT).getItem().isEmpty(),
|
||||
"Removed sources must invalidate the copy output");
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
@GameTest(template = "empty")
|
||||
public static void fullInventoryCannotConsumeCopyMaterials(GameTestHelper helper) {
|
||||
BlockPos pos = helper.absolutePos(new BlockPos(1, 1, 1));
|
||||
helper.getLevel().setBlock(pos, ModBlocks.WRITING_DESK.get().defaultBlockState(), 3);
|
||||
WritingDeskBlockEntity desk = (WritingDeskBlockEntity) helper.getLevel().getBlockEntity(pos);
|
||||
desk.setItem(0, PageItem.createLinkPanelPage());
|
||||
desk.setItem(WritingDeskBlockEntity.PAPER, new ItemStack(Items.PAPER));
|
||||
desk.setItem(WritingDeskBlockEntity.INK, new ItemStack(ModItems.INK_VIAL.get()));
|
||||
var player = helper.makeMockServerPlayerInLevel();
|
||||
player.moveTo(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5);
|
||||
for (int i = 0; i < 36; i++) player.getInventory().setItem(i, new ItemStack(Items.COBBLESTONE, 64));
|
||||
WritingDeskMenu menu = new WritingDeskMenu(1, player.getInventory(), desk);
|
||||
helper.assertTrue(menu.quickMoveStack(player, WritingDeskMenu.COPY_RESULT).isEmpty(),
|
||||
"Full inventory must reject shift-click copy");
|
||||
helper.assertValueEqual(desk.getItem(WritingDeskBlockEntity.PAPER).getCount(), 1,
|
||||
"Rejected copy must preserve paper");
|
||||
helper.assertValueEqual(desk.inkRemaining(), 0, "Rejected copy must preserve ink meter");
|
||||
helper.assertTrue(desk.getItem(WritingDeskBlockEntity.INK).is(ModItems.INK_VIAL.get()),
|
||||
"Rejected copy must preserve ink vial");
|
||||
helper.succeed();
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,21 @@
|
||||
package net.dnorberg.rivencraft.menu;
|
||||
|
||||
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||
import net.dnorberg.rivencraft.item.PageItem;
|
||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.dnorberg.rivencraft.registry.ModMenus;
|
||||
import net.dnorberg.rivencraft.writing.NotebookContents;
|
||||
import net.dnorberg.rivencraft.writing.PageContent;
|
||||
import net.dnorberg.rivencraft.writing.SymbolCatalog;
|
||||
import net.dnorberg.rivencraft.writing.SymbolDisplayMetadata;
|
||||
import net.dnorberg.rivencraft.writing.SymbolReference;
|
||||
import net.dnorberg.rivencraft.writing.WritingDeskCatalog;
|
||||
import net.dnorberg.rivencraft.network.WritingDeskCatalogPayload;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.neoforged.neoforge.network.PacketDistributor;
|
||||
import java.util.List;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.world.Container;
|
||||
import net.minecraft.world.SimpleContainer;
|
||||
@@ -12,34 +25,53 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
|
||||
import net.minecraft.world.inventory.DataSlot;
|
||||
import net.minecraft.world.inventory.Slot;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
|
||||
public final class WritingDeskMenu extends AbstractContainerMenu {
|
||||
private static final int PLAYER_START = WritingDeskBlockEntity.SIZE;
|
||||
public static final int COPY_RESULT = WritingDeskBlockEntity.SIZE;
|
||||
private static final int PLAYER_START = COPY_RESULT + 1;
|
||||
private final Container desk;
|
||||
private final WritingDeskBlockEntity blockEntity;
|
||||
private final SimpleContainer result = new SimpleContainer(1);
|
||||
private final boolean clientSide;
|
||||
private int syncedActiveCollection;
|
||||
private int syncedInkRemaining;
|
||||
private int selectedPage;
|
||||
private ResourceLocation selectedSymbol;
|
||||
private List<SymbolDisplayMetadata> catalog = List.of();
|
||||
private final ServerPlayer serverViewer;
|
||||
|
||||
public WritingDeskMenu(int id, Inventory inventory, RegistryFriendlyByteBuf data) {
|
||||
this(id, inventory, inventory.player.level().getBlockEntity(data.readBlockPos())
|
||||
instanceof WritingDeskBlockEntity found ? found : null);
|
||||
catalog = WritingDeskCatalog.read(data);
|
||||
}
|
||||
|
||||
public WritingDeskMenu(int id, Inventory inventory, WritingDeskBlockEntity blockEntity) {
|
||||
super(ModMenus.WRITING_DESK.get(), id);
|
||||
this.blockEntity = blockEntity;
|
||||
this.desk = blockEntity == null ? new SimpleContainer(WritingDeskBlockEntity.SIZE) : blockEntity;
|
||||
this.clientSide = inventory.player.level().isClientSide;
|
||||
this.serverViewer = inventory.player instanceof ServerPlayer serverPlayer ? serverPlayer : null;
|
||||
if (blockEntity != null && !clientSide) catalog = WritingDeskCatalog.available(blockEntity);
|
||||
addDataSlot(new DataSlot() {
|
||||
@Override public int get() { return WritingDeskMenu.this.blockEntity == null
|
||||
? syncedActiveCollection : WritingDeskMenu.this.blockEntity.activeCollection(); }
|
||||
@Override public void set(int value) { syncedActiveCollection = value; }
|
||||
});
|
||||
addDataSlot(new DataSlot() {
|
||||
@Override public int get() { return WritingDeskMenu.this.blockEntity == null
|
||||
? syncedInkRemaining : WritingDeskMenu.this.blockEntity.inkRemaining(); }
|
||||
@Override public void set(int value) { syncedInkRemaining = value; }
|
||||
});
|
||||
for (int i = 0; i < WritingDeskBlockEntity.COLLECTIONS; i++) {
|
||||
addSlot(new DeskSlot(desk, i, 12, 20 + i * 37, 1));
|
||||
}
|
||||
addSlot(new DeskSlot(desk, WritingDeskBlockEntity.INK, 370, 20, 1));
|
||||
addSlot(new DeskSlot(desk, WritingDeskBlockEntity.SOURCE, 228, 20, 1));
|
||||
addSlot(new DeskSlot(desk, WritingDeskBlockEntity.PAPER, 228, 57, 64));
|
||||
addSlot(new DeskSlot(desk, WritingDeskBlockEntity.OUTPUT, 370, 57, 64));
|
||||
addSlot(new DeskSlot(desk, WritingDeskBlockEntity.INK, 370, 20, 16));
|
||||
addSlot(new DeskSlot(desk, WritingDeskBlockEntity.RETURN, 370, 57, 64));
|
||||
addSlot(new DeskSlot(desk, WritingDeskBlockEntity.PAPER, 228, 20, 64));
|
||||
addSlot(new DeskSlot(desk, WritingDeskBlockEntity.LEGACY_OUTPUT, -1000, -1000, 64));
|
||||
addSlot(new CopySlot(result, 0, 228, 57));
|
||||
for (int row = 0; row < 3; row++) {
|
||||
for (int column = 0; column < 9; column++) {
|
||||
addSlot(new Slot(inventory, column + row * 9 + 9, 224 + column * 18, 91 + row * 18));
|
||||
@@ -51,10 +83,31 @@ public final class WritingDeskMenu extends AbstractContainerMenu {
|
||||
}
|
||||
|
||||
public int activeCollection() { return syncedActiveCollection; }
|
||||
public int inkRemaining() { return syncedInkRemaining; }
|
||||
public List<SymbolDisplayMetadata> catalog() { return catalog; }
|
||||
public void setCatalog(List<SymbolDisplayMetadata> symbols) { catalog = List.copyOf(symbols); }
|
||||
|
||||
@Override public boolean clickMenuButton(Player player, int id) {
|
||||
if (blockEntity == null || !stillValid(player) || id < 0 || id >= WritingDeskBlockEntity.COLLECTIONS) return false;
|
||||
blockEntity.setActiveCollection(id);
|
||||
if (blockEntity == null || !stillValid(player)) return false;
|
||||
if (id >= 0 && id < WritingDeskBlockEntity.COLLECTIONS) {
|
||||
blockEntity.setActiveCollection(id);
|
||||
selectedPage = 0;
|
||||
selectedSymbol = null;
|
||||
} else if (id >= 16 && id < 16 + NotebookContents.MAX_PAGES) {
|
||||
selectedPage = id - 16;
|
||||
selectedSymbol = null;
|
||||
} else if (id >= 100 && id < 100 + catalog.size()) {
|
||||
if (!catalog.equals(WritingDeskCatalog.available(blockEntity))) {
|
||||
refreshCatalog();
|
||||
return false;
|
||||
}
|
||||
ResourceLocation requested = catalog.get(id - 100).id();
|
||||
if (!WritingDeskCatalog.available(blockEntity).stream().anyMatch(entry -> entry.id().equals(requested))) {
|
||||
return false;
|
||||
}
|
||||
selectedSymbol = requested;
|
||||
} else return false;
|
||||
refreshOutput();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -64,11 +117,23 @@ public final class WritingDeskMenu extends AbstractContainerMenu {
|
||||
|
||||
@Override public ItemStack quickMoveStack(Player player, int index) {
|
||||
if (!stillValid(player) || index < 0 || index >= slots.size()) return ItemStack.EMPTY;
|
||||
if (index == COPY_RESULT) {
|
||||
refreshOutput();
|
||||
if (!canCopy()) return ItemStack.EMPTY;
|
||||
ItemStack copy = selectedSource().copyWithCount(1);
|
||||
ItemStack movingCopy = copy.copy();
|
||||
if (!moveItemStackTo(movingCopy, PLAYER_START, slots.size(), true) || !movingCopy.isEmpty()) {
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
blockEntity.consumeCopyMaterials();
|
||||
refreshOutput();
|
||||
return copy;
|
||||
}
|
||||
Slot slot = slots.get(index);
|
||||
if (!slot.hasItem()) return ItemStack.EMPTY;
|
||||
ItemStack moving = slot.getItem();
|
||||
ItemStack original = moving.copy();
|
||||
if (index < PLAYER_START) {
|
||||
if (index < COPY_RESULT) {
|
||||
if (!moveItemStackTo(moving, PLAYER_START, slots.size(), true)) return ItemStack.EMPTY;
|
||||
} else if (!moveIntoDesk(moving)) {
|
||||
return ItemStack.EMPTY;
|
||||
@@ -81,14 +146,85 @@ public final class WritingDeskMenu extends AbstractContainerMenu {
|
||||
private boolean moveIntoDesk(ItemStack moving) {
|
||||
if (moving.is(ModItems.INK_VIAL.get())) return moveItemStackTo(moving, 4, 5, false);
|
||||
if (moving.is(ModItems.NOTEBOOK.get())) return moveItemStackTo(moving, 0, 4, false);
|
||||
if (moving.is(ModItems.PAGE.get())) {
|
||||
return moveItemStackTo(moving, 6, 7, false)
|
||||
|| moveItemStackTo(moving, 0, 4, false)
|
||||
|| moveItemStackTo(moving, 5, 6, false);
|
||||
}
|
||||
if (moving.is(Items.PAPER))
|
||||
return moveItemStackTo(moving, WritingDeskBlockEntity.PAPER,
|
||||
WritingDeskBlockEntity.PAPER + 1, false);
|
||||
if (moving.is(ModItems.PAGE.get())) return moveItemStackTo(moving, 0, 4, false);
|
||||
return false;
|
||||
}
|
||||
|
||||
private ItemStack selectedSource() {
|
||||
if (selectedSymbol != null) {
|
||||
SymbolReference reference = new SymbolReference(selectedSymbol);
|
||||
return SymbolCatalog.isKnown(reference)
|
||||
&& blockEntity != null
|
||||
&& WritingDeskCatalog.available(blockEntity).stream()
|
||||
.anyMatch(entry -> entry.id().equals(selectedSymbol))
|
||||
? PageItem.createSymbolPage(reference) : ItemStack.EMPTY;
|
||||
}
|
||||
ItemStack collection = desk.getItem(blockEntity == null ? syncedActiveCollection : blockEntity.activeCollection());
|
||||
if (collection.is(ModItems.PAGE.get())) return selectedPage == 0 ? collection : ItemStack.EMPTY;
|
||||
if (collection.is(ModItems.NOTEBOOK.get())) {
|
||||
List<ItemStack> pages = collection.getOrDefault(
|
||||
ModDataComponents.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY).pages();
|
||||
return selectedPage < pages.size() ? pages.get(selectedPage) : ItemStack.EMPTY;
|
||||
}
|
||||
return ItemStack.EMPTY;
|
||||
}
|
||||
|
||||
private boolean canCopy() {
|
||||
ItemStack source = selectedSource();
|
||||
return blockEntity != null && source.is(ModItems.PAGE.get())
|
||||
&& PageItem.content(source).kind() != PageContent.Kind.BLANK
|
||||
&& PageItem.isUsableWriting(source) && blockEntity.canConsumeCopyMaterials();
|
||||
}
|
||||
|
||||
private void refreshOutput() {
|
||||
if (clientSide) return;
|
||||
ItemStack preview = canCopy() ? selectedSource().copyWithCount(1) : ItemStack.EMPTY;
|
||||
if (!ItemStack.matches(result.getItem(0), preview)) result.setItem(0, preview);
|
||||
}
|
||||
|
||||
private void refreshCatalog() {
|
||||
if (clientSide || blockEntity == null) return;
|
||||
List<SymbolDisplayMetadata> current = WritingDeskCatalog.available(blockEntity);
|
||||
if (!current.equals(catalog)) {
|
||||
catalog = current;
|
||||
if (serverViewer != null && serverViewer.containerMenu == this) {
|
||||
PacketDistributor.sendToPlayer(serverViewer, new WritingDeskCatalogPayload(containerId, catalog));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override public void broadcastChanges() {
|
||||
refreshCatalog();
|
||||
refreshOutput();
|
||||
super.broadcastChanges();
|
||||
}
|
||||
|
||||
@Override public void clicked(int slotId, int button, net.minecraft.world.inventory.ClickType clickType,
|
||||
Player player) {
|
||||
if (!stillValid(player)) {
|
||||
player.closeContainer();
|
||||
return;
|
||||
}
|
||||
refreshCatalog();
|
||||
refreshOutput();
|
||||
super.clicked(slotId, button, clickType, player);
|
||||
}
|
||||
|
||||
private final class CopySlot extends Slot {
|
||||
private CopySlot(Container container, int index, int x, int y) { super(container, index, x, y); }
|
||||
@Override public boolean mayPlace(ItemStack stack) { return false; }
|
||||
@Override public boolean mayPickup(Player player) {
|
||||
return clientSide ? hasItem() : WritingDeskMenu.this.stillValid(player) && canCopy();
|
||||
}
|
||||
@Override public void onTake(Player player, ItemStack stack) {
|
||||
if (!clientSide && blockEntity.consumeCopyMaterials()) refreshOutput();
|
||||
super.onTake(player, stack);
|
||||
}
|
||||
}
|
||||
|
||||
private static final class DeskSlot extends Slot {
|
||||
private final int limit;
|
||||
private DeskSlot(Container container, int index, int x, int y, int limit) {
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.dnorberg.rivencraft.block.entity.BookStandBlockEntity;
|
||||
import net.dnorberg.rivencraft.client.ClientLinkPreviewHandler;
|
||||
import net.dnorberg.rivencraft.client.ClientBookInteractionHandler;
|
||||
import net.dnorberg.rivencraft.client.ClientAgeCelestialAngles;
|
||||
import net.dnorberg.rivencraft.client.ClientWritingDeskCatalog;
|
||||
import net.dnorberg.rivencraft.event.AgeCelestialAngleSync;
|
||||
import net.dnorberg.rivencraft.item.DescriptiveBookItem;
|
||||
import net.dnorberg.rivencraft.item.LinkingBookItem;
|
||||
@@ -68,6 +69,8 @@ public final class ModNetworking {
|
||||
ClientLinkPreviewHandler::handle);
|
||||
registrar.playToClient(AgeCelestialAnglePayload.TYPE, AgeCelestialAnglePayload.STREAM_CODEC,
|
||||
ClientAgeCelestialAngles::handle);
|
||||
registrar.playToClient(WritingDeskCatalogPayload.TYPE, WritingDeskCatalogPayload.STREAM_CODEC,
|
||||
ClientWritingDeskCatalog::handle);
|
||||
}
|
||||
|
||||
private static void requestDescriptiveBookScreen(RequestDescriptiveBookScreenPayload payload, IPayloadContext context) {
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package net.dnorberg.rivencraft.network;
|
||||
|
||||
import java.util.List;
|
||||
import net.dnorberg.rivencraft.Rivencraft;
|
||||
import net.dnorberg.rivencraft.writing.SymbolDisplayMetadata;
|
||||
import net.dnorberg.rivencraft.writing.WritingDeskCatalog;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
|
||||
/** Current server-approved symbols from this open Writing Desk menu. */
|
||||
public record WritingDeskCatalogPayload(int containerId, List<SymbolDisplayMetadata> symbols)
|
||||
implements CustomPacketPayload {
|
||||
public static final Type<WritingDeskCatalogPayload> TYPE = new Type<>(
|
||||
ResourceLocation.fromNamespaceAndPath(Rivencraft.MOD_ID, "writing_desk_catalog"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, WritingDeskCatalogPayload> STREAM_CODEC =
|
||||
StreamCodec.of(
|
||||
(buffer, payload) -> {
|
||||
buffer.writeVarInt(payload.containerId());
|
||||
WritingDeskCatalog.write(buffer, payload.symbols());
|
||||
},
|
||||
buffer -> new WritingDeskCatalogPayload(buffer.readVarInt(), WritingDeskCatalog.read(buffer)));
|
||||
|
||||
@Override public Type<? extends CustomPacketPayload> type() { return TYPE; }
|
||||
}
|
||||
@@ -31,7 +31,6 @@ public final class ModCreativeTabs {
|
||||
.title(Component.translatable("itemGroup.rivencraft.pages"))
|
||||
.icon(PageItem::createLinkPanelPage)
|
||||
.displayItems((parameters, output) -> {
|
||||
output.accept(ModItems.PAGE.get());
|
||||
output.accept(PageItem.createLinkPanelPage());
|
||||
})
|
||||
.build());
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
package net.dnorberg.rivencraft.writing;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TreeMap;
|
||||
import net.dnorberg.rivencraft.block.entity.WritingDeskBlockEntity;
|
||||
import net.dnorberg.rivencraft.item.PageItem;
|
||||
import net.dnorberg.rivencraft.registry.ModDataComponents;
|
||||
import net.dnorberg.rivencraft.registry.ModItems;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
/** A bounded, server-derived view of symbols physically present in the desk. */
|
||||
public final class WritingDeskCatalog {
|
||||
private static final int MAX_ENTRIES = WritingDeskBlockEntity.COLLECTIONS * NotebookContents.MAX_PAGES;
|
||||
|
||||
private WritingDeskCatalog() {}
|
||||
|
||||
public static List<SymbolDisplayMetadata> available(WritingDeskBlockEntity desk) {
|
||||
Map<ResourceLocation, SymbolDisplayMetadata> unique = new TreeMap<>();
|
||||
for (int slot = 0; slot < WritingDeskBlockEntity.COLLECTIONS; slot++) {
|
||||
ItemStack collection = desk.getItem(slot);
|
||||
if (collection.is(ModItems.PAGE.get())) add(unique, collection);
|
||||
if (collection.is(ModItems.NOTEBOOK.get())) {
|
||||
List<ItemStack> pages = collection.getOrDefault(
|
||||
ModDataComponents.NOTEBOOK_CONTENTS.get(), NotebookContents.EMPTY).pages();
|
||||
pages.forEach(page -> add(unique, page));
|
||||
}
|
||||
}
|
||||
return unique.values().stream()
|
||||
.sorted(Comparator.comparing((SymbolDisplayMetadata symbol) -> symbol.category().toString())
|
||||
.thenComparing(symbol -> symbol.id().toString()))
|
||||
.toList();
|
||||
}
|
||||
|
||||
private static void add(Map<ResourceLocation, SymbolDisplayMetadata> unique, ItemStack page) {
|
||||
if (!page.is(ModItems.PAGE.get())) return;
|
||||
PageContent content = PageItem.content(page).resolve();
|
||||
if (content.kind() != PageContent.Kind.SYMBOL) return;
|
||||
SymbolReference reference = content.symbol().orElseThrow();
|
||||
SymbolCatalog.find(reference).ifPresent(definition ->
|
||||
unique.put(reference.id(), definition.display(reference.id())));
|
||||
}
|
||||
|
||||
public static void write(RegistryFriendlyByteBuf buffer, List<SymbolDisplayMetadata> entries) {
|
||||
if (entries.size() > MAX_ENTRIES) throw new IllegalArgumentException("Desk symbol catalog exceeds limit");
|
||||
buffer.writeVarInt(entries.size());
|
||||
entries.forEach(entry -> SymbolDisplayMetadata.STREAM_CODEC.encode(buffer, entry));
|
||||
}
|
||||
|
||||
public static List<SymbolDisplayMetadata> read(RegistryFriendlyByteBuf buffer) {
|
||||
int count = buffer.readVarInt();
|
||||
if (count < 0 || count > MAX_ENTRIES) throw new IllegalArgumentException("Invalid desk symbol count " + count);
|
||||
List<SymbolDisplayMetadata> entries = new ArrayList<>(count);
|
||||
for (int index = 0; index < count; index++) {
|
||||
entries.add(SymbolDisplayMetadata.STREAM_CODEC.decode(buffer));
|
||||
}
|
||||
return List.copyOf(entries);
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ public final class WritingInkService {
|
||||
int remaining = InkVialItem.remaining(vial);
|
||||
return vial.is(ModItems.INK_VIAL.get()) && remaining >= linkPanelCost()
|
||||
&& remaining <= InkVialItem.CAPACITY
|
||||
&& page.is(ModItems.PAGE.get()) && PageItem.content(page).kind() == PageContent.Kind.BLANK;
|
||||
&& page.is(Items.PAPER);
|
||||
}
|
||||
|
||||
public static boolean prepareLinkPanel(Player player, InteractionHand vialHand) {
|
||||
|
||||
@@ -18,8 +18,11 @@
|
||||
"item.rivencraft.ink_vial": "Ink Vial",
|
||||
"block.rivencraft.writing_desk": "Writing Desk",
|
||||
"container.rivencraft.writing_desk": "Writing Desk",
|
||||
"screen.rivencraft.writing_desk.ink": "Ink: %s/%s",
|
||||
"screen.rivencraft.writing_desk.search": "Search",
|
||||
"screen.rivencraft.writing_desk.no_symbols": "No available symbols",
|
||||
"item.rivencraft.ink_vial.remaining": "Ink: %s/%s",
|
||||
"item.rivencraft.ink_vial.usage": "Use with a blank Page in the other hand to prepare a Link Panel.",
|
||||
"item.rivencraft.ink_vial.usage": "Use with paper in the other hand to prepare a Link Panel.",
|
||||
"screen.rivencraft.notebook.search": "Search pages",
|
||||
"screen.rivencraft.notebook.move_previous": "Move selected page left",
|
||||
"screen.rivencraft.notebook.move_next": "Move selected page right",
|
||||
|
||||
@@ -1,8 +1,69 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_bottom_top",
|
||||
"parent": "minecraft:block/block",
|
||||
"ambientocclusion": false,
|
||||
"textures": {
|
||||
"top": "rivencraft:item/writing_desk",
|
||||
"side": "minecraft:block/oak_planks",
|
||||
"bottom": "minecraft:block/oak_planks"
|
||||
}
|
||||
"particle": "rivencraft:block/writing_desk",
|
||||
"desk": "rivencraft:block/writing_desk"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [0, 8, 0], "to": [16, 9, 16],
|
||||
"faces": {
|
||||
"up": {"uv": [1, 0, 3, 2], "texture": "#desk"},
|
||||
"down": {"uv": [1, 2, 3, 4], "texture": "#desk"},
|
||||
"north": {"uv": [1, 0, 3, 0.125], "texture": "#desk"},
|
||||
"south": {"uv": [1, 0, 3, 0.125], "texture": "#desk"},
|
||||
"east": {"uv": [1, 0, 3, 0.125], "texture": "#desk"},
|
||||
"west": {"uv": [1, 0, 3, 0.125], "texture": "#desk"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 0, 1], "to": [2, 8, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
|
||||
"south": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
|
||||
"east": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
|
||||
"west": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [14, 0, 1], "to": [16, 8, 15],
|
||||
"faces": {
|
||||
"north": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
|
||||
"south": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
|
||||
"east": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"},
|
||||
"west": {"uv": [5.625, 0.125, 5.875, 2], "texture": "#desk"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 3, 2], "to": [15, 4, 14],
|
||||
"faces": {
|
||||
"up": {"uv": [0, 4.25, 3.75, 6.125], "texture": "#desk"},
|
||||
"down": {"uv": [0, 4.25, 3.75, 6.125], "texture": "#desk"},
|
||||
"north": {"uv": [0, 4.25, 3.75, 4.5], "texture": "#desk"},
|
||||
"south": {"uv": [0, 4.25, 3.75, 4.5], "texture": "#desk"},
|
||||
"east": {"uv": [0, 4.25, 3.75, 4.5], "texture": "#desk"},
|
||||
"west": {"uv": [0, 4.25, 3.75, 4.5], "texture": "#desk"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 9, 14], "to": [15, 15, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [8, 0, 11.75, 2], "texture": "#desk"},
|
||||
"south": {"uv": [8, 0, 11.75, 2], "texture": "#desk"},
|
||||
"east": {"uv": [8, 0, 8.25, 2], "texture": "#desk"},
|
||||
"west": {"uv": [8, 0, 8.25, 2], "texture": "#desk"},
|
||||
"up": {"uv": [8, 0, 11.75, 0.25], "texture": "#desk"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 12, 9], "to": [15, 13, 15],
|
||||
"faces": {
|
||||
"up": {"uv": [8, 3.625, 11.75, 4.375], "texture": "#desk"},
|
||||
"down": {"uv": [8, 3.625, 11.75, 4.375], "texture": "#desk"},
|
||||
"north": {"uv": [8, 3.625, 11.75, 3.75], "texture": "#desk"},
|
||||
"south": {"uv": [8, 3.625, 11.75, 3.75], "texture": "#desk"}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": { "layer0": "rivencraft:item/writing_desk" }
|
||||
"parent": "rivencraft:block/writing_desk"
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 99 KiB |
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shapeless",
|
||||
"category": "misc",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:paper"
|
||||
}
|
||||
],
|
||||
"result": {
|
||||
"count": 1,
|
||||
"id": "rivencraft:page"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user