item icons

Co-authored-by: object-Object <[email protected]> Squashed commit of the following: commit f3a940ec8d7a1538b0abbc5de8b3fed3a7b91d39 Author: SamsTheNerd <[email protected]> Date: Sun Nov 5 18:22:12 2023 -0500 code goes ~ and has no spaces commit 176506fce4a8dc356229ffdc59e6f022d3df0eaa Author: Sam <[email protected]> Date: Sun Nov 5 18:15:59 2023 -0500 no space on spoilered Co-authored-by: [object Object] <[email protected]> commit 7d48b949a3bfa4dc0f55e361981269e0043881fe Author: SamsTheNerd <[email protected]> Date: Sun Nov 5 16:46:25 2023 -0500 the most reviewed and least DS_Stored code in the world commit 34df7d2037ae29774de30384b8579b9111cbda6e Author: Sam <[email protected]> Date: Sun Nov 5 16:14:43 2023 -0500 underscore villager requirements Co-authored-by: [object Object] <[email protected]> commit 6df7eb5c7ad255876b5bfaf5f07c5a6c20f0026e Author: SamsTheNerd <[email protected]> Date: Fri Oct 20 19:20:23 2023 -0400 added informative blurb to mindflay recipe cards about villager requirements commit 39db858977564449784c4ede8dc59daad4822b2d Author: SamsTheNerd <[email protected]> Date: Thu Oct 19 23:42:00 2023 -0400 added mindflay render cards commit 5d8706f918398cb62a2a9617e001e6a8b60f157d Author: SamsTheNerd <[email protected]> Date: Thu Oct 19 23:40:45 2023 -0400 added flayable entity renders commit c5d7cf168b082af17e37d2d475a322475571437e Author: object-Object <[email protected]> Date: Thu Oct 19 21:04:47 2023 -0400 Fix multi-texture lazy loading and alignment stuff commit aba5ddf3f107143fb003f88ecfdc60e61c163914 Author: SamsTheNerd <[email protected]> Date: Thu Oct 19 18:32:50 2023 -0400 added Texture as possible value for icon fields + added icons to toc commit bf3b0543dc38e9c7514b20523258f33b3f0f27ea Author: SamsTheNerd <[email protected]> Date: Thu Oct 19 18:30:31 2023 -0400 removed the mob effect textures from the missing list commit 2326f0793b56eb5acbe0ad36dbba65e5a8e2b2ab Author: SamsTheNerd <[email protected]> Date: Thu Oct 19 18:29:52 2023 -0400 added mob effect icons and enchanted book icon so that it loads all the images properly for now atleast commit 01fc21a7c8931446ae70148994ba959acf5077d8 Author: SamsTheNerd <[email protected]> Date: Thu Oct 19 00:19:16 2023 -0400 category and entry icons ! doesn't work for raw textures yet though commit db21372d06baddc44d98a07945851ab419eb8a82 Author: SamsTheNerd <[email protected]> Date: Thu Oct 19 00:18:12 2023 -0400 changed patchouli icon ids to 0.11 ones so we don't crash
hexdoc-dev · Nov 6, 2023 · 7202a5c · 7202a5c
1 parent c2f7a10
commit 7202a5c
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 13 deletions.
diff --git a/src/hexdoc/_templates/entry.html.jinja b/src/hexdoc/_templates/entry.html.jinja
@@ -1,6 +1,6 @@
 {% import "macros/formatting.html.jinja" as fmt -%}
 
-<div id="{{ entry.id.path }}">
+<div id="{{ entry.id.path }}" class="entry">
   {% call fmt.maybe_spoilered(entry) %}
     {{- fmt.section_header(entry, "h3", "entry-title") }}
 

diff --git a/src/hexdoc/_templates/index.css.jinja b/src/hexdoc/_templates/index.css.jinja
@@ -62,6 +62,18 @@ blockquote.crafting-info {
   font-size: inherit;
 }
 
+/* to account for the section icons */
+
+.entry-title, .category-title {
+  display: flex;
+  align-items: end;
+
+  .texture {
+    margin-right: 4px;
+    display: inline-block;
+  }
+}
+
 /* we do a bit of crafting (mostly stolen from https://computercraft.info/wiki) */
 
 .crafting-tables {
@@ -139,8 +151,20 @@ blockquote.crafting-info {
   position: absolute;
 }
 
+.toc-elem > .texture {
+  margin-right: 2px;
+  display: inline-block;
+  vertical-align: middle;
+  position: relative;
+}
+
+.toc-elem .texture {
+  width: 16px;
+  height: 16px;
+}
+
 .multi-textures .texture:not(.multi-texture-active) {
-  z-index: -1;
+  visibility: hidden;
 }
 
 .spotlight {
@@ -149,7 +173,7 @@ blockquote.crafting-info {
   margin: -6px 0 8px 0;
 }
 
-.spotlight .texture {
+.spotlight > .texture {
   position: absolute;
   top: 10px;
   left: 10px;

diff --git a/src/hexdoc/_templates/macros/formatting.html.jinja b/src/hexdoc/_templates/macros/formatting.html.jinja
@@ -1,4 +1,5 @@
 {% import "macros/styles.html.jinja" as styles with context -%}
+{% import "macros/recipes.html.jinja" as recipe_macros with context %}
 
 {# jump to top icon in section headers #}
 {% macro jump_to_top() -%}
@@ -21,13 +22,28 @@
 {# header for categories and entries #}
 {% macro section_header(value, header_tag, class_name) -%}
   <{{ header_tag }} class="{{ class_name }} page-header">
+    {{ render_icon(value.icon) }}
     {{- value.name ~ jump_to_top() ~ permalink(value.id.path) -}}
   </{{ header_tag }}>
 {%- endmacro %}
 
+{% macro render_icon(item_or_texture, name="") -%}
+  {% if item_or_texture.gaslighting is defined %}
+      {{ recipe_macros.render_item(item_or_texture) }}
+    {% else %}
+      {{
+      recipe_macros.render_texture(
+        name=name,
+        texture=item_or_texture,
+        class_names=[],
+      )
+      }}
+    {% endif %}
+{%- endmacro%}
+
 {# link to value.id, with spoiler blur if value is a spoiler #}
 {% macro maybe_spoilered_link(value) -%}
-  <a href="#{{ value.id.path }}"{{ ' class="spoilered"'|safe if value.is_spoiler }}>{{ value.name }}</a>
+  <a href="#{{ value.id.path }}" class="toc-elem {{ 'spoilered' if value.is_spoiler }}">{{ render_icon(value.icon) }} {{ value.name }}</a>
 {%- endmacro %}
 
 {# macro block which spoiler blurs its content if value is a spoiler #}

diff --git a/src/hexdoc/_templates/macros/recipes.html.jinja b/src/hexdoc/_templates/macros/recipes.html.jinja
@@ -23,7 +23,7 @@
       title="{{ name }}"
       alt="Image of {{ name }}"
       src="{{ texture.url }}"
-      {{ 'loading="lazy"' if lazy }}
+      {{ 'loading="lazy"'|safe if lazy }}
       class="{{ (class_names + ['texture'])|join(' ') }}"
     >
   {% endif %}
@@ -32,7 +32,7 @@
 {# display a single item, with a badge if the count is greater than 1 #}
 {% macro render_item(item, is_first=true, count=1) -%}
   {% if item.gaslighting %}
-    <div class="multi-textures gaslight-textures {{ 'multi-texture-active' if is_first }}">
+    <div class="texture item-texture multi-textures gaslight-textures {{ 'multi-texture-active' if is_first }}">
       {% for texture in item.textures %}
         {{
           render_texture(
@@ -98,7 +98,7 @@
                 {% if cell_ingredients is none %}
                   <div></div> {#- empty slot / air #}
                 {% else %}
-                  <div class="multi-textures cycle-textures">
+                  <div class="texture item-texture multi-textures cycle-textures">
                     {{ render_ingredients(cell_ingredients) }}
                   </div>
                 {% endif %}

diff --git a/src/hexdoc/_templates/textures.jcss.jinja b/src/hexdoc/_templates/textures.jcss.jinja
@@ -1,13 +1,13 @@
 {% for animation in animations %}
   .{{ animation.class_name }} {
     animation: {{ animation.class_name }} {{ animation.time_seconds }}s linear infinite;
-    background-size: 32px;
+    background-size: 100%;
     background-image: url("{{ animation.url }}");
   }
 
   @keyframes {{ animation.class_name }} {
     {% for frame in animation.frames %}
-      {{ frame.start_percent }}%, {{ frame.end_percent }}% { background-position-y: {{ frame.index * -32 }}px }
+      {{ frame.start_percent }}%, {{ frame.end_percent }}% { background-position-y: {{ -100 * frame.index }}% }
     {% endfor %}
   }
 {% endfor %}
diff --git a/src/hexdoc/patchouli/category.py b/src/hexdoc/patchouli/category.py
@@ -2,8 +2,9 @@
 
 from pydantic import Field
 
-from hexdoc.core import ItemStack, LoaderContext, ResourceLocation
+from hexdoc.core import LoaderContext, ResourceLocation
 from hexdoc.minecraft import LocalizedStr
+from hexdoc.minecraft.assets import ItemWithTexture, Texture
 from hexdoc.model import IDModel
 from hexdoc.utils import Sortable, sorted_dict
 
@@ -22,7 +23,7 @@ class Category(IDModel, Sortable):
     # required
     name: LocalizedStr
     description: FormatTree
-    icon: ItemStack
+    icon: ItemWithTexture | Texture
 
     # optional
     parent_id: ResourceLocation | None = Field(default=None, alias="parent")

diff --git a/src/hexdoc/patchouli/entry.py b/src/hexdoc/patchouli/entry.py
@@ -4,6 +4,7 @@
 
 from hexdoc.core import ItemStack, ResourceLocation
 from hexdoc.minecraft import LocalizedStr
+from hexdoc.minecraft.assets import ItemWithTexture, Texture
 from hexdoc.minecraft.recipe import CraftingRecipe
 from hexdoc.model import Color, IDModel
 from hexdoc.utils import Sortable, cast_or_raise
@@ -24,7 +25,7 @@ class Entry(IDModel, Sortable):
     # required (entry.json)
     name: LocalizedStr
     category_id: ResourceLocation = Field(alias="category")
-    icon: ItemStack
+    icon: ItemWithTexture | Texture
     pages: list[Page]
 
     # optional (entry.json)

diff --git a/test/_submodules/HexMod b/test/_submodules/HexMod