even more coverage of recipes n stuff

Author: eerussianguy

src/components/crafting_recipe.py

@@ -89,6 +89,38 @@ def format_crafting_recipe_from_data(context: Context, buffer: List[str], identi
         ))
 
 
+def extract_items_from_ingredient(data: Any) -> List[str]:
+    """
+    Recursively extract item/tag names from an ingredient.
+    Returns a list of item names (e.g., ['minecraft:stone'] or ['#minecraft:planks'])
+    """
+    if 'item' in data:
+        return [data['item']]
+    elif 'tag' in data:
+        return ['#' + data['tag']]
+    elif 'type' in data and data['type'] in ('tfc:not_rotten', 'tfc:has_trait', 'tfc:lacks_trait'):
+        # These types wrap another ingredient
+        if 'ingredient' in data:
+            return extract_items_from_ingredient(data['ingredient'])
+        else:
+            # If no nested ingredient, return empty (just a filter)
+            return []
+    elif 'type' in data and (data['type'] == 'tfc:and' or data['type'] == 'neoforge:compound'):
+        # Recursively extract from all children
+        items = []
+        for child in data['children']:
+            items.extend(extract_items_from_ingredient(child))
+        return items
+    elif isinstance(data, list):
+        items = []
+        for item in data:
+            items.extend(extract_items_from_ingredient(item))
+        return items
+    else:
+        # Unknown format, return empty
+        return []
+
+
 def format_ingredient(context: Context, data: Any) -> Tuple[str, str | None]:
     if 'item' in data:
         return item_loader.get_item_image(context, data['item'])
@@ -105,17 +137,23 @@ def format_ingredient(context: Context, data: Any) -> Tuple[str, str | None]:
         # Handle any fluid using the fluid bucket image with colorization
         return fluid_loader.get_fluid_bucket_image(context, data['fluid'])
     elif 'type' in data and (data['type'] == 'tfc:and' or data['type'] == 'neoforge:compound'):
-        csvstring = ''
-        for i in data['children']:
-            if 'item' in i:
-                csvstring += ',' + str(i['item'])
-        return item_loader.get_item_image(context, csvstring)
-    elif isinstance(data, List):
-        csvstring = ''
-        for i in data:
-            if 'item' in i:
-                csvstring += ',' + str(i['item'])
-        return item_loader.get_item_image(context, csvstring)
+        # Extract all item/tag names from children recursively
+        items = extract_items_from_ingredient(data)
+        if items:
+            csvstring = ','.join(items)
+            return item_loader.get_item_image(context, csvstring)
+        else:
+            # Fallback to placeholder
+            return ('../../_images/placeholder_64.png', None)
+    elif isinstance(data, list):
+        # Extract all item/tag names from list recursively
+        items = extract_items_from_ingredient(data)
+        if items:
+            csvstring = ','.join(items)
+            return item_loader.get_item_image(context, csvstring)
+        else:
+            # Fallback to placeholder
+            return ('../../_images/placeholder_64.png', None)
     else:
         util.error('Unsupported ingredient: %s' % str(data))
 

src/components/misc_recipe.py

@@ -10,7 +10,7 @@
 def format_misc_recipe(context: Context, buffer: List[str], identifier: str):
     data = context.loader.load_recipe(identifier)
     recipe_type = data['type']
-    if recipe_type == 'tfc:quern':
+    if recipe_type == 'tfc:quern' or recipe_type == 'firmalife:drying':
         format_misc_recipe_from_data(context, buffer, identifier, data)
     elif recipe_type == 'tfc:heating':
         format_misc_recipe_from_data(context, buffer, identifier, data, result='result_item')

src/loader.py

@@ -19,13 +19,13 @@ def __init__(self, tfc_dir: str, output_dir: str, use_mcmeta: bool, use_addons:
         self.domains = ['tfc']
         if use_mcmeta:
             self.loaders += [
-                ('forge', ('forge', 'minecraft', 'c'), mcmeta.load_from_forge),
+                ('forge', ('forge', 'neoforge', 'minecraft', 'c'), mcmeta.load_from_forge),
                 ('minecraft', ('minecraft',), mcmeta.load_from_mc)
             ]
             self.domains += ['forge', 'minecraft']
         if use_addons:
             for addon in versions.ADDONS:
-                self.loaders.append((addon.mod_id, (addon.mod_id, 'c', 'tfc', 'minecraft'), make_load_from_addon(addon)))
+                self.loaders.append((addon.mod_id, (addon.mod_id, 'c', 'tfc', 'neoforge', 'minecraft'), make_load_from_addon(addon)))
                 self.domains.append(addon.mod_id)
 
         # Load paletted permutation textures from atlas

src/main.py

@@ -354,6 +354,7 @@ def parse_page(context: Context, entry_id: str, buffer: List[str], data: Any, se
         'tfc:loom_recipe',
         'tfc:anvil_recipe',
         'tfc:glassworking_recipe',
+        'tfc:drying_recipe'
     ):
         try:
             misc_recipe.format_misc_recipe(context, buffer, data['recipe'])

src/versions.py

@@ -68,7 +68,7 @@ class OldVersion(NamedTuple):
 LANGUAGES = ('en_us', 'ja_jp', 'pt_br', 'ko_kr', 'uk_ua', 'zh_cn', 'zh_hk', 'zh_tw', 'ru_ru')
 
 ADDONS = (
-    Addon('eerussianguy', 'firmalife', 'v3.0.0', 'firmalife', ['src/main/resources', 'src/generated/resources']),
+    Addon('eerussianguy', 'firmalife', 'v3.0.1', 'firmalife', ['src/main/resources', 'src/generated/resources']),
     Addon('Notenoughmail', 'precision-prospecting', 'v2.0', 'precisionprospecting', ['src/generated/resources', 'src/main/resources']),
 )