From 40b8468b88c52d6a4fded752a8802da1ab3ff0af Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Sun, 7 Aug 2022 21:30:13 -0600 Subject: [PATCH] bypass dependency indirection for df_farming. --- df_farming/cave_wheat.lua | 12 ++++++------ df_farming/dependencies.lua | 29 ----------------------------- df_farming/dimple_cup.lua | 4 ++-- df_farming/init.lua | 1 - df_farming/mod.conf | 2 +- df_farming/pig_tail.lua | 12 ++++++------ df_farming/plants.lua | 8 ++++---- df_farming/plump_helmet.lua | 10 +++++----- df_farming/quarry_bush.lua | 2 +- df_farming/sweet_pod.lua | 23 ++++++++++++++--------- 10 files changed, 39 insertions(+), 64 deletions(-) delete mode 100644 df_farming/dependencies.lua diff --git a/df_farming/cave_wheat.lua b/df_farming/cave_wheat.lua index 5cadb8e..e01a829 100644 --- a/df_farming/cave_wheat.lua +++ b/df_farming/cave_wheat.lua @@ -19,7 +19,7 @@ local register_cave_wheat = function(number) buildable_to = true, floodable = true, groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", fixed = { @@ -132,15 +132,15 @@ if minetest.get_modpath("cottages") then recipe_registered = true end -if minetest.registered_items[df_farming.node_names.mortar_pestle] ~= nil then +if minetest.registered_items[df_dependencies.node_name_mortar_pestle] ~= nil then minetest.register_craft({ type = "shapeless", output = "df_farming:cave_flour", recipe = { "df_farming:cave_wheat", "df_farming:cave_wheat", "df_farming:cave_wheat", - "df_farming:cave_wheat", df_farming.node_names.mortar_pestle + "df_farming:cave_wheat", df_dependencies.node_name_mortar_pestle }, - replacements = {{"group:food_mortar_pestle", df_farming.node_names.mortar_pestle}}, + replacements = {{"group:food_mortar_pestle", df_dependencies.node_name_mortar_pestle}}, }) recipe_registered = true end @@ -168,7 +168,7 @@ minetest.register_node("df_farming:cave_straw", { tiles = {"dfcaverns_cave_straw.png"}, is_ground_content = false, groups = {snappy=3, flammable=4, fall_damage_add_percent=-30, straw=1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, }) @@ -210,7 +210,7 @@ if minetest.get_modpath("footprints") then }, groups = {snappy = 3, flammable = 2, attached_node = 1}, drop = "", - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.5, _mcl_hardness = 0.5, }) diff --git a/df_farming/dependencies.lua b/df_farming/dependencies.lua deleted file mode 100644 index 8d7aef8..0000000 --- a/df_farming/dependencies.lua +++ /dev/null @@ -1,29 +0,0 @@ -df_farming.sounds = {} - -df_farming.sounds.leaves = df_dependencies.sound_leaves() -df_farming.sounds.syrup = df_dependencies.sound_water() - -if minetest.get_modpath("oil") then - df_farming.sounds.syrup.footstep = {name = "oil_oil_footstep", gain = 0.2} -end - -df_farming.node_names = {} - -df_farming.node_names.dirt = df_dependencies.node_name_dirt -df_farming.node_names.dirt_wet = df_dependencies.node_name_dirt_wet -df_farming.node_names.mortar_pestle = df_dependencies.node_name_mortar_pestle -df_farming.node_names.bucket = df_dependencies.node_name_bucket_empty -df_farming.node_names.wool_white = df_dependencies.node_name_wool_white -df_farming.node_names.string = df_dependencies.node_name_string - -df_farming.node_names.dirt_moss = "df_farming:dirt_with_cave_moss" -df_farming.node_names.floor_fungus = "df_farming:cobble_with_floor_fungus" - -df_farming.bucket_register_liquid = df_dependencies.bucket_register_liquid - --- these are only for initialization -minetest.after(0, function() - df_farming.sounds = nil - df_farming.node_names = nil - df_farming.bucket_register_liquid = nil -end) \ No newline at end of file diff --git a/df_farming/dimple_cup.lua b/df_farming/dimple_cup.lua index 3409c8c..26aae39 100644 --- a/df_farming/dimple_cup.lua +++ b/df_farming/dimple_cup.lua @@ -17,7 +17,7 @@ local register_dimple_cup = function(number) is_ground_content = false, buildable_to = true, groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, color_blue = 1, light_sensitive_fungus = 11, flower = 1, flora = 1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", fixed = { @@ -72,7 +72,7 @@ local def = { is_ground_content = false, buildable_to = true, groups = {snappy = 3, flammable = 2, plant = 1, attached_node = 1, color_blue = 1, light_sensitive_fungus = 11, flower = 1, flora = 1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", fixed = { diff --git a/df_farming/init.lua b/df_farming/init.lua index 528b981..5e96c59 100644 --- a/df_farming/init.lua +++ b/df_farming/init.lua @@ -5,7 +5,6 @@ local modpath = minetest.get_modpath(modname) --load companion lua files dofile(modpath.."/config.lua") -dofile(modpath.."/dependencies.lua") dofile(modpath.."/doc.lua") dofile(modpath.."/aliases.lua") diff --git a/df_farming/mod.conf b/df_farming/mod.conf index a072bcb..39c296a 100644 --- a/df_farming/mod.conf +++ b/df_farming/mod.conf @@ -1,4 +1,4 @@ name = df_farming description = Adds farmable underground plants that die in sunlight. Also includes various cooking reactions. depends = df_dependencies -optional_depends = farming, cottages, dynamic_liquid, doc, crafting, footprints, oil +optional_depends = cottages, dynamic_liquid, doc, crafting, footprints, oil diff --git a/df_farming/pig_tail.lua b/df_farming/pig_tail.lua index 381a44f..b9d7fe9 100644 --- a/df_farming/pig_tail.lua +++ b/df_farming/pig_tail.lua @@ -19,7 +19,7 @@ local register_pig_tail = function(number) floodable = true, buildable_to = true, groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", fixed = { @@ -97,18 +97,18 @@ minetest.register_craftitem("df_farming:pig_tail_thread", { groups = {flammable = 1, thread = 1}, }) -if df_farming.node_names.wool_white then +if df_dependencies.node_name_wool_white then minetest.register_craft({ - output = df_farming.node_names.wool_white, + output = df_dependencies.node_name_wool_white, recipe = { {"group:thread", "group:thread"}, {"group:thread", "group:thread"}, } }) end -if df_farming.node_names.string then +if df_dependencies.node_name_string then minetest.register_craft({ - output = df_farming.node_names.string .. " 2", + output = df_dependencies.node_name_string .. " 2", recipe = { {"group:thread"}, {"group:thread"}, @@ -139,7 +139,7 @@ if minetest.get_modpath("footprints") then }, groups = {snappy = 3, flammable = 2, attached_node = 1}, drop = "", - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), _mcl_blast_resistance = 0.2, _mcl_hardness = 0.2, }) diff --git a/df_farming/plants.lua b/df_farming/plants.lua index 8b6ea72..f3a7ef7 100644 --- a/df_farming/plants.lua +++ b/df_farming/plants.lua @@ -16,7 +16,7 @@ minetest.register_node("df_farming:dead_fungus", { buildable_to = true, floodable = true, groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, flow_through = 1, flora = 1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5}, @@ -51,7 +51,7 @@ minetest.register_node("df_farming:cavern_fungi", { floodable = true, light_source = 6, groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flow_through = 1, flora = 1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5}, @@ -74,8 +74,8 @@ end ----------------------------------------------------------------------------------------- -local marginal = {[df_farming.node_names.dirt] = true, [df_farming.node_names.dirt_moss] = true, [df_farming.node_names.floor_fungus] = true} -local growable = {[df_farming.node_names.dirt_wet] = true, [df_farming.node_names.dirt] = true, [df_farming.node_names.dirt_moss] = true, [df_farming.node_names.floor_fungus] = true} +local marginal = {[df_dependencies.node_name_dirt] = true} +local growable = {[df_dependencies.node_name_dirt_wet] = true, [df_dependencies.node_name_dirt] = true} df_farming.plant_timer = function(pos, plantname, elapsed) local next_stage_time = minetest.registered_nodes[plantname]._dfcaverns_next_stage_time diff --git a/df_farming/plump_helmet.lua b/df_farming/plump_helmet.lua index 277cafa..3966277 100644 --- a/df_farming/plump_helmet.lua +++ b/df_farming/plump_helmet.lua @@ -114,7 +114,7 @@ minetest.register_node("df_farming:plump_helmet_1", { paramtype = "light", paramtype2 = "facedir", is_ground_content = false, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, walkable = false, floodable = true, @@ -156,7 +156,7 @@ minetest.register_node("df_farming:plump_helmet_2", { drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, walkable = false, is_ground_content = false, @@ -198,7 +198,7 @@ minetest.register_node("df_farming:plump_helmet_3", { drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, walkable = false, is_ground_content = false, @@ -238,7 +238,7 @@ minetest.register_node("df_farming:plump_helmet_4", { drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, walkable = false, is_ground_content = false, @@ -297,7 +297,7 @@ minetest.register_node("df_farming:plump_helmet_4_picked", { drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, walkable = false, is_ground_content = false, diff --git a/df_farming/quarry_bush.lua b/df_farming/quarry_bush.lua index e3e6eac..a9d22e5 100644 --- a/df_farming/quarry_bush.lua +++ b/df_farming/quarry_bush.lua @@ -19,7 +19,7 @@ local register_quarry_bush = function(number) is_ground_content = false, floodable = true, groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", fixed = { diff --git a/df_farming/sweet_pod.lua b/df_farming/sweet_pod.lua index 53bef3a..cfcba35 100644 --- a/df_farming/sweet_pod.lua +++ b/df_farming/sweet_pod.lua @@ -2,6 +2,11 @@ local S = minetest.get_translator(minetest.get_current_modname()) local sweet_pod_grow_time = df_farming.config.plant_growth_time * df_farming.config.sweet_pod_delay_multiplier / 6 +local syrup_sound = df_dependencies.sound_water() +if minetest.get_modpath("oil") then + syrup_sound.footstep = {name = "oil_oil_footstep", gain = 0.2} +end + local register_sweet_pod = function(number) local name = "df_farming:sweet_pod_"..tostring(number) local def = { @@ -17,7 +22,7 @@ local register_sweet_pod = function(number) buildable_to = true, floodable = true, groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1}, - sounds = df_farming.sounds.leaves, + sounds = df_dependencies.sound_leaves(), selection_box = { type = "fixed", fixed = { @@ -116,14 +121,14 @@ if minetest.get_modpath("cottages") then recipe_registered = true end -if minetest.registered_items[df_farming.node_names.mortar_pestle] ~= nil then +if minetest.registered_items[df_dependencies.node_name_mortar_pestle] ~= nil then minetest.register_craft({ type = "shapeless", output = "df_farming:sugar", recipe = { - "df_farming:sweet_pods", df_farming.node_names.mortar_pestle + "df_farming:sweet_pods", df_dependencies.node_name_mortar_pestle }, - replacements = {{"group:food_mortar_pestle", df_farming.node_names.mortar_pestle}}, + replacements = {{"group:food_mortar_pestle", df_dependencies.node_name_mortar_pestle}}, }) recipe_registered = true end @@ -186,7 +191,7 @@ if df_dependencies.bucket_register_liquid then liquid_range = 2, post_effect_color = {a = 204, r = 179, g = 131, b = 88}, groups = {liquid = 3, flammable = 2, dig_by_piston=1}, - sounds = df_farming.sounds.syrup, + sounds = syrup_sound, _mcl_blast_resistance = 100, _mcl_hardness = -1, }) @@ -237,12 +242,12 @@ if df_dependencies.bucket_register_liquid then liquid_range = 2, post_effect_color = {a = 204, r = 179, g = 131, b = 88}, groups = {liquid = 3, flammable = 2, not_in_creative_inventory = 1, dig_by_piston=1}, - sounds = df_farming.sounds.syrup, + sounds = syrup_sound, _mcl_blast_resistance = 100, _mcl_hardness = -1, }) - df_farming.bucket_register_liquid( + df_dependencies.bucket_register_liquid( "df_farming:dwarven_syrup_source", "df_farming:dwarven_syrup_flowing", "df_farming:dwarven_syrup_bucket", @@ -253,7 +258,7 @@ if df_dependencies.bucket_register_liquid then if minetest.get_modpath("crafting") then simplecrafting_lib.register("furnace", { input = { - [df_farming.node_names.bucket] = 1, + [df_dependencies.node_name_bucket_empty] = 1, ["df_farming:sugar"] = 3, ["simplecrafting_lib:heat"] = 5, }, @@ -263,7 +268,7 @@ if df_dependencies.bucket_register_liquid then minetest.register_craft({ type = "shapeless", output = "df_farming:dwarven_syrup_bucket", - recipe = {df_farming.node_names.bucket, "df_farming:sugar", "df_farming:sugar", "df_farming:sugar"}, + recipe = {df_dependencies.node_name_bucket_empty, "df_farming:sugar", "df_farming:sugar", "df_farming:sugar"}, }) end