Use additional_categories for wood processing

lignumis/prototypes/compatibility/aai-loaders.lua

@@ -46,7 +46,7 @@ AAILoaders.make_tier({
     order = "d[loader]-a00[aai-wood-loader]"
 })
 
-data.raw.recipe["aai-wood-loader"].category = "wood-processing-or-assembling"
+data.raw.recipe["aai-wood-loader"].additional_categories = { "wood-processing" }
 
 if not basic_circuit_board then
     local nauvis_recipe = Recipe:new("aai-wood-loader"):clone("wood-loader-electronic-circuit")

lignumis/prototypes/compatibility/crushing-industry.lua

@@ -90,10 +90,9 @@ end
 local gold_recipe = Recipe:new("burner-crusher")
     :replaceIngredient("iron-gear-wheel", "wooden-gear-wheel")
     :replaceIngredient("iron-plate", "gold-plate")
-    :assign({
+if settings.startup["lignumis-lumber-mill-more-recipes"].value then
-        category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or
+    gold_recipe.prototype.additional_categories = { "wood-processing" }
-        "crafting"
+end
-    })
 
 gold_recipe:clone("burner-crusher-copper")
     :replaceIngredient("gold-plate", "copper-plate")

lignumis/prototypes/compatibility/lane-splitters.lua

@@ -23,7 +23,7 @@ lane_splitter.prototype.structure_patch.west.filename = data.raw.splitter["wood-
 lane_splitter.prototype.structure_patch.north.filename = data.raw.splitter["wood-splitter"].structure_patch.north.filename
 lane_splitter.item.icon = Lignumis.graphics .. "icons/wood-lane-splitter.png"
 lane_splitter.item.order = "d[lane-splitter]-0[wood-lane-splitter]"
-lane_splitter.recipe.category = "wood-processing-or-assembling"
+lane_splitter.recipe.additional_categories = { "wood-processing" }
 
 data:extend({
     lane_splitter.prototype,

lignumis/prototypes/content/basic-circuit-board.lua

@@ -19,7 +19,8 @@ data:extend({
     {
         type = "recipe",
         name = "basic-circuit-board",
-        category = "wood-processing-or-assembling",
+        category = "crafting",
+        additional_categories = { "wood-processing" },
         icons = {
             { icon = Lignumis.graphics .. "icons/basic-circuit-board.png" },
             { icon = Lignumis.graphics .. "icons/gold-cable.png", scale = 0.25, shift = { 8, 8 } }
@@ -36,7 +37,8 @@ data:extend({
         type = "recipe",
         name = "basic-circuit-board-copper",
         localised_name = { "item-name.basic-circuit-board" },
-        category = "wood-processing-or-assembling",
+        category = "crafting",
+        additional_categories = { "wood-processing" },
         icons = {
             { icon = Lignumis.graphics .. "icons/basic-circuit-board.png" },
             { icon = "__base__/graphics/icons/copper-cable.png", scale = 0.25, shift = { 8, 8 } }

lignumis/prototypes/content/basic-gun-turret.lua

@@ -58,7 +58,7 @@ local turret_recipe = {
     results = { { type = "item", name = "basic-gun-turret", amount = 1 } }
 }
 if settings.startup["lignumis-lumber-mill-more-recipes"].value then
-    turret_recipe.category = "wood-processing-or-assembling"
+    turret_recipe.additional_categories = { "wood-processing" }
 end
 
 local turret_technology = {

lignumis/prototypes/content/burner-agricultural-tower.lua

@@ -84,7 +84,8 @@ data:extend({
     {
         type = "recipe",
         name = "burner-agricultural-tower",
-        category = "wood-processing-or-assembling",
+        category = "crafting",
+        additional_categories = { "wood-processing" },
         energy_required = 10,
         ingredients = {
             { type = "item", name = "stone-brick",       amount = 5 },
@@ -116,7 +117,8 @@ data:extend({
     {
         type = "recipe",
         name = "burner-agricultural-tower-copper",
-        category = "wood-processing-or-assembling",
+        category = "crafting",
+        additional_categories = { "wood-processing" },
         localised_name = { "entity-name.burner-agricultural-tower" },
         icons = {
             { icon = Lignumis.graphics .. "icons/burner-agricultural-tower.png" },

lignumis/prototypes/content/burner-assembling-machine.lua

@@ -17,7 +17,6 @@ assembling_machine.crafting_categories = {
     "crafting",
     "electronics",
     "pressing",
-    "wood-processing-or-assembling",
     "organic-or-assembling",
     "electronics-or-assembling",
     "metallurgy-or-assembling"
@@ -50,8 +49,6 @@ remnants.animation[2].filename = gfx .. "burner-assembling-machine-remnants.png"
 remnants.animation[3].filename = gfx .. "burner-assembling-machine-remnants.png"
 remnants.order = "0[burner-assembling-machine]"
 
-local crafting_category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or "crafting"
-
 data:extend({
     assembling_machine,
     remnants,
@@ -70,7 +67,8 @@ data:extend({
     {
         type = "recipe",
         name = "burner-assembling-machine",
-        category = crafting_category,
+        category = "crafting",
+        additional_categories = settings.startup["lignumis-lumber-mill-more-recipes"].value and { "wood-processing" } or nil,
         enabled = false,
         ingredients = {
             { type = "item", name = "wooden-gear-wheel", amount = 5 },

lignumis/prototypes/content/burner-long-handed-inserter.lua

@@ -44,8 +44,6 @@ remnants.animation[3].filename = gfx .. "burner-long-handed-inserter-remnants.pn
 remnants.animation[4].filename = gfx .. "burner-long-handed-inserter-remnants.png"
 remnants.order = "a-c-0"
 
-local crafting_category = settings.startup["lignumis-lumber-mill-more-recipes"].value and "wood-processing-or-assembling" or "crafting"
-
 data:extend({
     long_handed_inserter,
     remnants,
@@ -65,7 +63,8 @@ data:extend({
     {
         type = "recipe",
         name = "burner-long-handed-inserter",
-        category = crafting_category,
+        category = "crafting",
+        additional_categories = settings.startup["lignumis-lumber-mill-more-recipes"].value and { "wood-processing" } or nil,
         enabled = false,
         ingredients = {
             { type = "item", name = "wooden-gear-wheel", amount = 1 },

lignumis/prototypes/content/lumber-mill.lua

@@ -7,19 +7,17 @@ local basic_circuit_board = settings.startup["lignumis-basic-circuit-board"].val
 data:extend({
     {
         type = "recipe-category",
-        name = "wood-processing-or-assembling"
+        name = "wood-processing"
     }
 })
 
-table.insert(data.raw["character"]["character"].crafting_categories, "wood-processing-or-assembling")
-
 local has_oxygen = data.raw["surface-property"]["oxygen"] ~= nil
 
 LumberMill.EntityBuilder:new()
     :burnerEnergySource({ emissions_per_minute = { noise = 100 } })
     :baseProductivity(0.5)
     :apply({
-        crafting_categories = { "wood-processing-or-assembling" },
+    crafting_categories = { "wood-processing" },
         crafting_speed = 2,
         energy_usage = "1000kW",
         surface_conditions = {
@@ -50,7 +48,7 @@ LumberMill.RecipeBuilder:new()
         { type = "item", name = "burner-assembling-machine", amount = 2 }
     }))
     :apply({
-        category = "wood-processing-or-assembling"
+    additional_categories = { "wood-processing" }
     })
 
 LumberMill.TechnologyBuilder:new()
@@ -72,7 +70,7 @@ LumberMill.RecipeBuilder:new()
     :apply({
         name = "lumber-mill-copper",
         localised_name = { "entity-name.lumber-mill" },
-        category = "wood-processing-or-assembling",
+    additional_categories = { "wood-processing" },
         icons = {
             { icon = lumber_mill_item.icon },
             { icon = basic_circuit_board and "__base__/graphics/icons/copper-plate.png" or "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } }

lignumis/prototypes/content/lumber.lua

@@ -23,7 +23,8 @@ data:extend({
     {
         type = "recipe",
         name = "lumber",
-        category = "wood-processing-or-assembling",
+        category = "crafting",
+        additional_categories = { "wood-processing" },
         allow_productivity = true,
         allow_as_intermediate = true,
         ingredients = { { type = "item", name = "wood", amount = 2 } },

lignumis/prototypes/content/steam-assembling-machine.lua

@@ -20,7 +20,6 @@ assembling_machine.crafting_categories = {
     "crafting",
     "electronics",
     "pressing",
-    "wood-processing-or-assembling",
     "organic-or-assembling",
     "electronics-or-assembling",
     "metallurgy-or-assembling",

lignumis/prototypes/content/wood-lab.lua

@@ -144,7 +144,8 @@ data:extend({
     {
         type = "recipe",
         name = "wood-lab",
-        category = "wood-processing-or-assembling",
+        category = "crafting",
+        additional_categories = { "wood-processing" },
         energy_required = 2,
         ingredients = {
             { type = "item", name = "lumber",            amount = 6 },

lignumis/prototypes/content/wood-logistics.lua

@@ -58,13 +58,13 @@ Belt.RecipeBuilder:new()
     })
     :apply({
         transportBelt = {
-            category = "wood-processing-or-assembling"
+            additional_categories = { "wood-processing" }
         },
         undergroundBelt = {
-            category = "wood-processing-or-assembling"
+            additional_categories = { "wood-processing" }
         },
         splitter = {
-            category = "wood-processing-or-assembling"
+            additional_categories = { "wood-processing" }
         }
     })
 
@@ -91,7 +91,7 @@ if not basic_circuit_board then
                         { icon = splitter_item.icon },
                         { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } }
                     },
-                    category = "wood-processing-or-assembling"
+                    additional_categories = { "wood-processing" }
                 }
             })
             .splitter

lignumis/prototypes/content/wood-military.lua

@@ -82,7 +82,8 @@ data:extend({
     {
         type = "recipe",
         name = "wood-darts-magazine",
-        category = "wood-processing-or-assembling",
+        category = "crafting",
+        additional_categories = { "wood-processing" },
         energy_required = 1,
         ingredients = { { type = "item", name = "wood", amount = 2 } },
         results = { { type = "item", name = "wood-darts-magazine", amount = 1 } }

lignumis/prototypes/content/wooden-gearwheel.lua

@@ -17,7 +17,8 @@ data:extend({
     {
         type = "recipe",
         name = "wooden-gear-wheel",
-        category = "wood-processing-or-assembling",
+        category = "crafting",
+        additional_categories = { "wood-processing" },
         ingredients = { { type = "item", name = "lumber", amount = 1 } },
         results = { { type = "item", name = "wooden-gear-wheel", amount = 2 } },
         allow_productivity = true

lignumis/prototypes/integrations/Wood-Walls.lua

@@ -1,4 +1,4 @@
 local recipe = data.raw.recipe["wooden-wall"]
 recipe.ingredients = { { type = "item", name = "lumber", amount = 4 } }
 recipe.results = { { type = "item", name = "wooden-wall", amount = 1 } }
-recipe.category = "wood-processing-or-assembling"
+recipe.additional_categories = { "wood-processing" }

lignumis/prototypes/integrations/vanilla.lua

@@ -21,7 +21,8 @@ local drill_item = data.raw["item"]["burner-mining-drill"]
 drill_item.icon = Lignumis.graphics .. "icons/burner-mining-drill.png"
 
 local drill_recipe = data.raw["recipe"]["burner-mining-drill"]
-drill_recipe.category = "wood-processing-or-assembling"
+drill_recipe.category = "crafting"
+drill_recipe.additional_categories = { "wood-processing" }
 drill_recipe.ingredients = {
     { type = "item", name = "stone-furnace",     amount = 1 },
     { type = "item", name = "wooden-gear-wheel", amount = basic_circuit_board and 2 or 3 },
@@ -48,7 +49,7 @@ burner_inserter_recipe.ingredients = {
     { type = "item", name = "lumber",            amount = 1 }
 }
 if settings.startup["lignumis-lumber-mill-more-recipes"].value then
-    burner_inserter_recipe.category = "wood-processing-or-assembling"
+    burner_inserter_recipe.additional_categories = { "wood-processing" }
 end
 
 
@@ -131,10 +132,7 @@ if mods["Diversitree"] then
     data.raw.plant["s6xdvt-fake-tree"].surface_conditions[1].min = 900
 end
 
-table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "wood-processing-or-assembling")
 table.insert(data.raw["assembling-machine"]["assembling-machine-1"].crafting_categories, "organic-or-assembling")
-table.insert(data.raw["assembling-machine"]["assembling-machine-2"].crafting_categories, "wood-processing-or-assembling")
-table.insert(data.raw["assembling-machine"]["assembling-machine-3"].crafting_categories, "wood-processing-or-assembling")
 
 
 -- Disable vanilla early game recipes