fix recipe loading and a lot of resource loading issues

Author: eerussianguy

src/components/barrel_recipe.py

@@ -22,8 +22,9 @@ def format_barrel_recipe_from_data(context: Context, buffer: List[str], data: An
     input_fluid_div = input_item_div = output_fluid_div = output_item_div = duration = """"""
 
     if 'input_item' in data:
-        in_path, in_name = crafting_recipe.format_ingredient(context, data['input_item']['ingredient'])
-        in_count = data['input_item']['count'] if 'count' in data['input_item'] else 1
+        in_item = data['input_item']
+        in_path, in_name = crafting_recipe.format_ingredient(context, in_item if 'ingredient' not in in_item else in_item['ingredient'])
+        in_count = in_item['count'] if 'count' in in_item else 1
         input_item_div = make_icon(in_name, in_path, 1, crafting_recipe.format_count(in_count))
     if 'output_item' in data:
         out_path, out_name, out_count = crafting_recipe.format_item_stack(context, data['output_item'])

src/components/crafting_recipe.py

@@ -37,13 +37,15 @@ def format_crafting_recipe_from_data(context: Context, buffer: List[str], identi
         return format_crafting_recipe_from_data(context, buffer, identifier, data['recipe'])
     elif recipe_type == 'tfc:advanced_shaped_crafting':
         data['type'] = 'minecraft:crafting_shaped'
-        util.require('stack' in data['result'], 'Advanced shaped crafting with complex modifiers: \'%s\'' % data['result'])
-        data['result'] = data['result']['stack']  # Discard modifiers
+        stack = util.anyof(data['result'], 'stack', 'id')
+        util.require(stack is not None, 'Advanced shaped crafting with complex modifiers: \'%s\'' % data['result'])
+        data['result'] = stack  # Discard modifiers
         return format_crafting_recipe_from_data(context, buffer, identifier, data)
     elif recipe_type == 'tfc:advanced_shapeless_crafting':
         data['type'] = 'minecraft:crafting_shapeless'
-        util.require('stack' in data['result'], 'Advanced shapeless crafting with complex modifiers: \'%s\'' % data['result'])
-        data['result'] = data['result']['stack']  # Discard modifiers
+        stack = util.anyof(data['result'], 'stack', 'id')
+        util.require(stack is not None, 'Advanced shapeless crafting with complex modifiers: \'%s\'' % data['result'])
+        data['result'] = stack  # Discard modifiers
         return format_crafting_recipe_from_data(context, buffer, identifier, data)
     else:
         raise util.error('Unknown crafting recipe type: %s for recipe %s' % (recipe_type, identifier))
@@ -87,7 +89,7 @@ def format_crafting_recipe_from_data(context: Context, buffer: List[str], identi
         ))
 
 
-def format_ingredient(context: Context, data: Any) -> Tuple[str, str]:
+def format_ingredient(context: Context, data: Any) -> Tuple[str, str | None]:
     if 'item' in data:
         return item_loader.get_item_image(context, data['item'])
     elif 'tag' in data:
@@ -99,14 +101,27 @@ def format_ingredient(context: Context, data: Any) -> Tuple[str, str]:
     elif 'type' in data and data['type'] == 'tfc:fluid_item':
         util.require(data['fluid_ingredient']['ingredient'] == 'minecraft:water', 'Unknown `tfc:fluid_item` ingredient: \'%s\'' % data)
         return item_loader.get_item_image(context, 'minecraft:water_bucket')
+    elif 'type' in data and data['type'] == 'tfc:fluid_content':
+        util.require(data['fluid']['fluid'] == 'minecraft:water', 'Unknown `tfc:fluid_content` ingredient: \'%s\'' % data)
+        return item_loader.get_item_image(context, 'minecraft:water_bucket')
+    elif 'type' in data and data['type'] == 'tfc:and':
+        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)
     else:
-        util.error('Unsupported ingredient: %s' % data)
+        util.error('Unsupported ingredient: %s' % str(data))
+
+def format_sized_ingredient(context: Context, data: Any) -> Tuple[Tuple[str, str | Any], int]:
+    ing = format_ingredient(context, data)
+    return ing, 1 if 'count' not in data else data['count']
 
 def format_item_stack(context: Context, data: Any) -> Tuple[str, str, int]:
     if 'modifiers' in data and 'stack' in data:

src/components/misc_recipe.py

@@ -23,8 +23,10 @@ def format_misc_recipe(context: Context, buffer: List[str], identifier: str):
     elif recipe_type == 'tfc:loom':
         # 1.18 uses an ingredient with 'input_count' parameter
         # 1.20 uses an item stack ingredient with 'ingredient' and 'count' fields
-        if 'ingredient' in data and 'input_count' in data:
-            format_misc_recipe_from_data(context, buffer, identifier, data, in_count=data['input_count'])
+        # 1.21 changed the 'ingredient' field to 'item'
+        if 'ingredient' in data:
+            count = data['input_count'] if 'input_count' in data else data['ingredient']['count'] if 'count' in data['ingredient'] else 1
+            format_misc_recipe_from_data(context, buffer, identifier, data, in_count=count)
         elif 'ingredient' in data and 'ingredient' in data['ingredient'] and 'count' in data['ingredient']:
             ing = data['ingredient']
             format_misc_recipe_from_data(context, buffer, identifier, data, ingredient=ing['ingredient'], in_count=ing['count'])

src/loader.py

@@ -15,11 +15,11 @@ def __init__(self, tfc_dir: str, output_dir: str, use_mcmeta: bool, use_addons:
         self.tfc_dir = tfc_dir
         self.output_dir = output_dir
 
-        self.loaders = [('tfc', ('tfc', 'forge', 'minecraft'), self.load_from_tfc)]
+        self.loaders = [('tfc', ('tfc', 'forge', 'minecraft', 'c'), self.load_from_tfc)]
         self.domains = ['tfc']
         if use_mcmeta:
             self.loaders += [
-                ('forge', ('forge', 'minecraft'), mcmeta.load_from_forge),
+                ('forge', ('forge', 'minecraft', 'c'), mcmeta.load_from_forge),
                 ('minecraft', ('minecraft',), mcmeta.load_from_mc)
             ]
             self.domains += ['forge', 'minecraft']
@@ -84,9 +84,10 @@ def load_resource(self, path: str, resource_type: str, resource_root: str, resou
 
     def load_from_tfc(self, path: str, reader):
         try:
-            path = util.path_join(self.tfc_dir, 'src/main/resources', path)
+            base_path = path
+            path = util.path_join(self.tfc_dir, 'src/main/resources', base_path)
             if not os.path.exists(path):
-                path = util.path_join(self.tfc_dir, 'src/generated/resources', path)
+                path = util.path_join(self.tfc_dir, 'src/generated/resources', base_path)
             if path.endswith('.png'):
                 with open(path, 'rb') as f:
                     return reader(f)

src/util.py

@@ -14,6 +14,13 @@ def resource_location(path: str) -> str:
         return 'minecraft:%s' % path
     return path
 
+def anyof(dict, *args):
+    for arg in args:
+        if arg in dict:
+            return dict[arg]
+    error('None of %s in %s' % (str(args), str(dict)))
+    return None
+
 def walk(path: str):
     if os.path.isfile(path):
         yield path