mtcontrib
/
dfcaverns
mirror of https://github.com/FaceDeer/dfcaverns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bypass dependency indirection for df_farming.

This commit is contained in:
FaceDeer 2022-08-07 21:30:13 -06:00
parent 67bde482e1
commit 40b8468b88
10 changed files with 39 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
df_farming/cave_wheat.lua
View File

@ -19,7 +19,7 @@ local register_cave_wheat = function(number)
buildable_to = true, buildable_to = true,
floodable = true, floodable = true,
groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1}, 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 = { selection_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
@ -132,15 +132,15 @@ if minetest.get_modpath("cottages") then
recipe_registered = true recipe_registered = true
end 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({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "df_farming:cave_flour", output = "df_farming:cave_flour",
recipe = { recipe = {
"df_farming:cave_wheat", "df_farming:cave_wheat", "df_farming:cave_wheat", "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 recipe_registered = true
end end
@ -168,7 +168,7 @@ minetest.register_node("df_farming:cave_straw", {
tiles = {"dfcaverns_cave_straw.png"}, tiles = {"dfcaverns_cave_straw.png"},
is_ground_content = false, is_ground_content = false,
groups = {snappy=3, flammable=4, fall_damage_add_percent=-30, straw=1}, 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_blast_resistance = 0.5,
_mcl_hardness = 0.5, _mcl_hardness = 0.5,
}) })
@ -210,7 +210,7 @@ if minetest.get_modpath("footprints") then
}, },
groups = {snappy = 3, flammable = 2, attached_node = 1}, groups = {snappy = 3, flammable = 2, attached_node = 1},
drop = "", drop = "",
sounds = df_farming.sounds.leaves, sounds = df_dependencies.sound_leaves(),
_mcl_blast_resistance = 0.5, _mcl_blast_resistance = 0.5,
_mcl_hardness = 0.5, _mcl_hardness = 0.5,
}) })

29
df_farming/dependencies.lua
View File

@ -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)

4
df_farming/dimple_cup.lua
View File

@ -17,7 +17,7 @@ local register_dimple_cup = function(number)
is_ground_content = false, is_ground_content = false,
buildable_to = true, 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}, 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 = { selection_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
@ -72,7 +72,7 @@ local def = {
is_ground_content = false, is_ground_content = false,
buildable_to = true, buildable_to = true,
groups = {snappy = 3, flammable = 2, plant = 1, attached_node = 1, color_blue = 1, light_sensitive_fungus = 11, flower = 1, flora = 1}, 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 = { selection_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {

1
df_farming/init.lua
View File

@ -5,7 +5,6 @@ local modpath = minetest.get_modpath(modname)
--load companion lua files --load companion lua files
dofile(modpath.."/config.lua") dofile(modpath.."/config.lua")
dofile(modpath.."/dependencies.lua")
dofile(modpath.."/doc.lua") dofile(modpath.."/doc.lua")
dofile(modpath.."/aliases.lua") dofile(modpath.."/aliases.lua")

2
df_farming/mod.conf
View File

@ -1,4 +1,4 @@
name = df_farming name = df_farming
description = Adds farmable underground plants that die in sunlight. Also includes various cooking reactions. description = Adds farmable underground plants that die in sunlight. Also includes various cooking reactions.
depends = df_dependencies depends = df_dependencies
optional_depends = farming, cottages, dynamic_liquid, doc, crafting, footprints, oil optional_depends = cottages, dynamic_liquid, doc, crafting, footprints, oil

12
df_farming/pig_tail.lua
View File

@ -19,7 +19,7 @@ local register_pig_tail = function(number)
floodable = true, floodable = true,
buildable_to = 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}, 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 = { selection_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
@ -97,18 +97,18 @@ minetest.register_craftitem("df_farming:pig_tail_thread", {
groups = {flammable = 1, thread = 1}, groups = {flammable = 1, thread = 1},
}) })
if df_farming.node_names.wool_white then if df_dependencies.node_name_wool_white then
minetest.register_craft({ minetest.register_craft({
output = df_farming.node_names.wool_white, output = df_dependencies.node_name_wool_white,
recipe = { recipe = {
{"group:thread", "group:thread"}, {"group:thread", "group:thread"},
{"group:thread", "group:thread"}, {"group:thread", "group:thread"},
} }
}) })
end end
if df_farming.node_names.string then if df_dependencies.node_name_string then
minetest.register_craft({ minetest.register_craft({
output = df_farming.node_names.string .. " 2", output = df_dependencies.node_name_string .. " 2",
recipe = { recipe = {
{"group:thread"}, {"group:thread"},
{"group:thread"}, {"group:thread"},
@ -139,7 +139,7 @@ if minetest.get_modpath("footprints") then
}, },
groups = {snappy = 3, flammable = 2, attached_node = 1}, groups = {snappy = 3, flammable = 2, attached_node = 1},
drop = "", drop = "",
sounds = df_farming.sounds.leaves, sounds = df_dependencies.sound_leaves(),
_mcl_blast_resistance = 0.2, _mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2, _mcl_hardness = 0.2,
}) })

8
df_farming/plants.lua
View File

@ -16,7 +16,7 @@ minetest.register_node("df_farming:dead_fungus", {
buildable_to = true, buildable_to = true,
floodable = true, floodable = true,
groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, flow_through = 1, flora = 1}, 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 = { selection_box = {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5}, 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, floodable = true,
light_source = 6, 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}, 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 = { selection_box = {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.0, 0.5}, 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 marginal = {[df_dependencies.node_name_dirt] = 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 growable = {[df_dependencies.node_name_dirt_wet] = true, [df_dependencies.node_name_dirt] = true}
df_farming.plant_timer = function(pos, plantname, elapsed) df_farming.plant_timer = function(pos, plantname, elapsed)
local next_stage_time = minetest.registered_nodes[plantname]._dfcaverns_next_stage_time local next_stage_time = minetest.registered_nodes[plantname]._dfcaverns_next_stage_time

10
df_farming/plump_helmet.lua
View File

@ -114,7 +114,7 @@ minetest.register_node("df_farming:plump_helmet_1", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
is_ground_content = false, is_ground_content = false,
sounds = df_farming.sounds.leaves, sounds = df_dependencies.sound_leaves(),
sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}},
walkable = false, walkable = false,
floodable = true, floodable = true,
@ -156,7 +156,7 @@ minetest.register_node("df_farming:plump_helmet_2", {
drawtype = "nodebox", drawtype = "nodebox",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sounds = df_farming.sounds.leaves, sounds = df_dependencies.sound_leaves(),
sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}},
walkable = false, walkable = false,
is_ground_content = false, is_ground_content = false,
@ -198,7 +198,7 @@ minetest.register_node("df_farming:plump_helmet_3", {
drawtype = "nodebox", drawtype = "nodebox",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sounds = df_farming.sounds.leaves, sounds = df_dependencies.sound_leaves(),
sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}},
walkable = false, walkable = false,
is_ground_content = false, is_ground_content = false,
@ -238,7 +238,7 @@ minetest.register_node("df_farming:plump_helmet_4", {
drawtype = "nodebox", drawtype = "nodebox",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sounds = df_farming.sounds.leaves, sounds = df_dependencies.sound_leaves(),
sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}},
walkable = false, walkable = false,
is_ground_content = false, is_ground_content = false,
@ -297,7 +297,7 @@ minetest.register_node("df_farming:plump_helmet_4_picked", {
drawtype = "nodebox", drawtype = "nodebox",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sounds = df_farming.sounds.leaves, sounds = df_dependencies.sound_leaves(),
sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}},
walkable = false, walkable = false,
is_ground_content = false, is_ground_content = false,

2
df_farming/quarry_bush.lua
View File

@ -19,7 +19,7 @@ local register_quarry_bush = function(number)
is_ground_content = false, is_ground_content = false,
floodable = true, floodable = true,
groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1}, 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 = { selection_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {

23
df_farming/sweet_pod.lua
View File

@ -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 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 register_sweet_pod = function(number)
local name = "df_farming:sweet_pod_"..tostring(number) local name = "df_farming:sweet_pod_"..tostring(number)
local def = { local def = {
@ -17,7 +22,7 @@ local register_sweet_pod = function(number)
buildable_to = true, buildable_to = true,
floodable = true, floodable = true,
groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, flora = 1}, 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 = { selection_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
@ -116,14 +121,14 @@ if minetest.get_modpath("cottages") then
recipe_registered = true recipe_registered = true
end 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({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "df_farming:sugar", output = "df_farming:sugar",
recipe = { 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 recipe_registered = true
end end
@ -186,7 +191,7 @@ if df_dependencies.bucket_register_liquid then
liquid_range = 2, liquid_range = 2,
post_effect_color = {a = 204, r = 179, g = 131, b = 88}, post_effect_color = {a = 204, r = 179, g = 131, b = 88},
groups = {liquid = 3, flammable = 2, dig_by_piston=1}, groups = {liquid = 3, flammable = 2, dig_by_piston=1},
sounds = df_farming.sounds.syrup, sounds = syrup_sound,
_mcl_blast_resistance = 100, _mcl_blast_resistance = 100,
_mcl_hardness = -1, _mcl_hardness = -1,
}) })
@ -237,12 +242,12 @@ if df_dependencies.bucket_register_liquid then
liquid_range = 2, liquid_range = 2,
post_effect_color = {a = 204, r = 179, g = 131, b = 88}, 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}, 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_blast_resistance = 100,
_mcl_hardness = -1, _mcl_hardness = -1,
}) })
df_farming.bucket_register_liquid( df_dependencies.bucket_register_liquid(
"df_farming:dwarven_syrup_source", "df_farming:dwarven_syrup_source",
"df_farming:dwarven_syrup_flowing", "df_farming:dwarven_syrup_flowing",
"df_farming:dwarven_syrup_bucket", "df_farming:dwarven_syrup_bucket",
@ -253,7 +258,7 @@ if df_dependencies.bucket_register_liquid then
if minetest.get_modpath("crafting") then if minetest.get_modpath("crafting") then
simplecrafting_lib.register("furnace", { simplecrafting_lib.register("furnace", {
input = { input = {
[df_farming.node_names.bucket] = 1, [df_dependencies.node_name_bucket_empty] = 1,
["df_farming:sugar"] = 3, ["df_farming:sugar"] = 3,
["simplecrafting_lib:heat"] = 5, ["simplecrafting_lib:heat"] = 5,
}, },
@ -263,7 +268,7 @@ if df_dependencies.bucket_register_liquid then
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",
output = "df_farming:dwarven_syrup_bucket", 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 end