Generate translations + clean up old generation code

Author: runcows

gm4_furniture/beet.yaml

@@ -8,6 +8,9 @@ data_pack:
 resource_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
   - gm4_furniture.generate
   - gm4.plugins.extend.module

gm4_furniture/data/gm4_furniture/template/function/crafting_template.mcfunction

@@ -1,83 +1,65 @@
-from beet import Context, subproject, Cache
+from beet import Context, subproject, Cache, Language, Function
 from pathlib import Path
 from typing import Any
 from gm4.utils import CSV
 from gm4.plugins.resource_pack import ContainerGuiOptions, GuiFont
 
 def beet_default(ctx: Context):
 
-    trades_init = []
-    trades_list = []
-    trades_append = []
-
-    furniture_sets = {}
+    trades_init: list[str] = []
+    trades_list: list[str] = []
+    trades_append: list[str] = []
+    
+    furniture_sets: dict[str,CSV] = {}
 
     for path in sorted(Path('gm4_furniture/raw_data/furniture_set').glob('*.csv')):
         furniture_sets[path.stem] = CSV.from_file(path)
 
     # loop through the different sheets, each sheet hold a different 'set_name'
     # of furniture which need to be sorted in the furniture_station storage
-    for set_name,furniture_set in furniture_sets.items():
+    for set_name, furniture_set in furniture_sets.items():
 
         # call generate_trade_data to build the commands
         new_trades_init,new_trades_list,new_trades_append = generate_trade_data(ctx, furniture_set, set_name)
         # append the trade data to the total list
         trades_init.append(new_trades_init)
-        trades_list.append(new_trades_list)
+        trades_list += new_trades_list
         trades_append.append(new_trades_append)
 
         # read furniture data from this sheet, and then create the placement function
         # and loot table for each furniture
         generate_furniture_data(ctx, furniture_set, set_name)
 
-
-    # build the trade data commands
-    trades_init = '\n'.join(trades_init)
-    trades_list = '\n'.join(trades_list)
-    trades_append = '\n'.join(trades_append)
-    # build the trade data function from crafting_template
-    subproject_config = {
-        "data_pack": {
-            "load": [
-                {
-                    f"data/gm4_furniture/function/generate_trades.mcfunction": "data/gm4_furniture/template/function/crafting_template.mcfunction",
-                }
-            ],
-            "render": {
-                "function": "*"
-            }
-        },
-        "meta": {
-            "trades_init": trades_init,
-            "trades_list": trades_list,
-            "trades_append": trades_append,
-        }
-    }
-
-    ctx.require(subproject(subproject_config))
-
-
-
-def generate_trade_data(ctx, furniture_set, set_name):
+    # generate trades function
+    function_strings: list[str] = [
+        "# create storage to hold the trade data for furniture items in furniture station",
+        "# @s = unspecified",
+        "# at unspecified",
+        "# run from init",
+        "# generated by generate.py\n"
+    ]
+    for string in trades_init + trades_list + trades_append:
+        function_strings.append(string)
+    function_strings.append("\ndata remove storage gm4_furniture:temp new_trades")
+    ctx.data.functions['gm4_furniture:generate_trades'] = Function(function_strings)
+
+def generate_trade_data(ctx: Context, furniture_set: CSV, set_name: str):
 
     # create a command to make an empty storage called new_trades that holds the set_name name and tool cmd
     new_trades_init = "data modify storage gm4_furniture:temp new_trades." + set_name + " set value {\"minecraft:item_model\":\"gm4_furniture:set_tool/" + set_name + "\",trades:[]}"
 
     # iterate over the rows in the spreadsheet and add the trade data for each furniture to the storage
-    new_trades_list = []
+    new_trades_list: list[str] = []
     for row in furniture_set:
         new_trades_list.append("data modify storage gm4_furniture:temp new_trades." + set_name + ".trades append value {cost:[{id:" + row['craft_item_1_id'] + ",count:" + row['craft_item_1_count'] + "b},{id:" + row['craft_item_2_id'] + ",count:" + row['craft_item_2_count'] + "b}],result:{furniture_id:\"" + set_name + "/" + row['technical_id'] + "\",count:" + row['craft_result_count'] + "}}")
-    new_trades_list = '\n'.join(new_trades_list)
 
     # add command to append the main furniture_station storage with the newly created new_trades
     new_trades_append = "data modify storage gm4_furniture:data furniture_station prepend from storage gm4_furniture:temp new_trades." + set_name
 
     # return the created commands
     return(new_trades_init,new_trades_list,new_trades_append)
 
-
-
-def generate_furniture_data(ctx, furniture_set, set_name):
+def generate_furniture_data(ctx: Context, furniture_set: CSV, set_name: str):
 
     # create furniture loot tables and placement functions for every furniture in this category
     for row in furniture_set:
@@ -121,7 +103,10 @@ def generate_furniture_data(ctx, furniture_set, set_name):
         }
 
         ctx.require(subproject(subproject_config))
-
+        
+        ctx.generate("gm4_translations:en_us", merge=Language({
+            f"block.gm4_furniture.{ set_name }.{ row['technical_id'] }": row['display_name']
+        }))
 
 class FurnitureStationGui(ContainerGuiOptions):
     container = "furniture_station"

gm4_furniture/generate.py

@@ -0,0 +1,7 @@
+key,en_us
+container.gm4.furniture_station,"Furniture Station"
+item.gm4_furniture.furniture_station,"Furniture Station"
+item.gm4_furniture.furniture_station,"Furniture Station"
+item.gm4_furniture.paintbrush,"Paintbrush"
+item.gm4_furniture.paintbrush.description_1," to paint furniture"
+item.gm4_furniture.paintbrush.description_2," furniture to pick color"