Update to 26.1-snapshot-4

Author: shartte

docs/docs/02-changelog.md

@@ -3,6 +3,10 @@ import Video from '@site/src/components/Video';
 
 # Changelog
 
+## 26.1.0.7-alpha (Minecraft 26.1-snapshot-4)
+
+- Use ItemStackTemplate for navigation nodes to avoid crash on startup.
+
 ## 26.1.0.6-alpha (Minecraft 26.1-snapshot-4)
 
 - First update to 26.1-snapshot-4

src/main/java/guideme/compiler/tags/SubPagesCompiler.java

@@ -79,11 +79,11 @@ protected void compile(PageCompiler compiler, LytBlockContainer parent, MdxJsxEl
 
             LytBlock listItemBlock = listItemPar;
 
-            if (showIcons && !childNode.icon().isEmpty()) {
+            if (showIcons && childNode.icon() != null) {
                 var lytHBox = new LytHBox();
 
                 var icon = new LytItemImage();
-                icon.setItem(childNode.icon());
+                icon.setItem(childNode.icon().create());
                 lytHBox.append(icon);
                 lytHBox.append(listItemPar);
                 lytHBox.setAlignItems(AlignItems.CENTER);

src/main/java/guideme/internal/screen/GuideNavBar.java

@@ -251,8 +251,9 @@ public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float par
                 }
 
                 var icon = row.node.icon();
-                if (!icon.isEmpty()) {
-                    renderContext.renderItem(icon, row.paragraph.getBounds().x() - 9, row.paragraph.getBounds().y(), 1,
+                if (icon != null) {
+                    renderContext.renderItem(icon.create(), row.paragraph.getBounds().x() - 9,
+                            row.paragraph.getBounds().y(), 1,
                             8,
                             8);
                 }
@@ -336,7 +337,7 @@ private void updateLayout() {
                 indent = 0;
             }
 
-            if (!row.node.icon().isEmpty()) {
+            if (row.node.icon() != null) {
                 indent += 8; // Indent for icon;
             }
 

src/main/java/guideme/internal/screen/GuideSearchScreen.java

@@ -168,8 +168,8 @@ private void search(String query) {
             var icon = NavigationUtil.createNavigationIcon(page);
 
             var image = new LytItemImage();
-            if (!icon.isEmpty()) {
-                image.setItem(icon);
+            if (icon != null) {
+                image.setItem(icon.create());
             }
             searchResultItem.append(image);
 

src/main/java/guideme/internal/siteexport/SiteExporter.java

@@ -53,6 +53,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.AbstractCookingRecipe;
 import net.minecraft.world.item.crafting.CraftingRecipe;
@@ -182,6 +183,16 @@ public void referenceItem(ItemStack stack) {
         }
     }
 
+    @Override
+    public void referenceItem(ItemStackTemplate stack) {
+        if (stack != null) {
+            items.add(stack.item().value());
+            if (!stack.components().isEmpty()) {
+                LOG.error("Couldn't handle stack with NBT tag: {}", stack);
+            }
+        }
+    }
+
     @Override
     public void referenceFluid(Fluid fluid) {
         fluids.add(fluid);

src/main/java/guideme/internal/siteexport/model/NavigationNodeJson.java

@@ -18,8 +18,8 @@ public static NavigationNodeJson of(NavigationNode node) {
             jsonNode.pageId = node.pageId().toString();
         }
         jsonNode.title = node.title();
-        if (!node.icon().isEmpty()) {
-            jsonNode.icon = SiteExportWriter.serializeItemStack(node.icon());
+        if (node.icon() != null) {
+            jsonNode.icon = SiteExportWriter.serializeItemStack(node.icon().create());
         }
         jsonNode.children = node.children().stream().map(NavigationNodeJson::of).toList();
         jsonNode.position = node.position();

src/main/java/guideme/internal/util/NavigationUtil.java

@@ -4,7 +4,8 @@
 import guideme.compiler.ParsedGuidePage;
 import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ItemStackTemplate;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -14,10 +15,10 @@ public final class NavigationUtil {
     private NavigationUtil() {
     }
 
-    public static ItemStack createNavigationIcon(ParsedGuidePage page) {
+    public static @Nullable ItemStackTemplate createNavigationIcon(ParsedGuidePage page) {
         var navigation = page.getFrontmatter().navigationEntry();
 
-        var icon = ItemStack.EMPTY;
+        ItemStackTemplate icon = null;
         if (navigation != null && navigation.iconItemId() != null) {
             var iconItem = BuiltInRegistries.ITEM.get(navigation.iconItemId()).orElse(null);
             if (iconItem != null) {
@@ -26,13 +27,13 @@ public static ItemStack createNavigationIcon(ParsedGuidePage page) {
                             .resultOrPartial(
                                     err -> LOG.error("Failed to deserialize component patch {} for icon {}: {}",
                                             navigation.iconComponents(), navigation.iconItemId(), err));
-                    icon = new ItemStack(iconItem, 1, patch.orElse(DataComponentPatch.EMPTY));
+                    icon = new ItemStackTemplate(iconItem, 1, patch.orElse(DataComponentPatch.EMPTY));
                 } else {
-                    icon = new ItemStack(iconItem);
+                    icon = new ItemStackTemplate(iconItem);
                 }
             }
 
-            if (icon.isEmpty()) {
+            if (icon == null) {
                 LOG.error("Couldn't find icon {} for icon of page {}", navigation.iconItemId(), page);
             }
         }

src/main/java/guideme/navigation/NavigationNode.java

@@ -2,13 +2,13 @@
 
 import java.util.List;
 import net.minecraft.resources.Identifier;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ItemStackTemplate;
 import org.jetbrains.annotations.Nullable;
 
 public record NavigationNode(
         @Nullable Identifier pageId,
         String title,
-        ItemStack icon,
+        @org.jspecify.annotations.Nullable ItemStackTemplate icon,
         List<NavigationNode> children,
         int position,
         boolean hasPage) {

src/main/java/guideme/siteexport/ResourceExporter.java

@@ -3,6 +3,7 @@
 import java.nio.file.Path;
 import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.ItemStackTemplate;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.display.SlotDisplay;
@@ -25,6 +26,11 @@ default void referenceItem(ItemLike item) {
      */
     void referenceItem(ItemStack stack);
 
+    /**
+     * Ensures the data needed to show tooltips or icons for this item is exported.
+     */
+    void referenceItem(@org.jspecify.annotations.Nullable ItemStackTemplate stack);
+
     /**
      * Ensures the data needed to show tooltips or icons for this fluid is exported.
      */

src/testmod/resources/assets/testmod/guides/testmod/guide/subpage.md

@@ -2,6 +2,7 @@
 navigation:
   title: Subpage
   parent: markdown.md
+  icon: minecraft:paper
 ---