diff --git a/df_caverns/dependencies.lua b/df_caverns/dependencies.lua index 7b66691..e69de29 100644 --- a/df_caverns/dependencies.lua +++ b/df_caverns/dependencies.lua @@ -1,26 +0,0 @@ -if df_dependencies.node_name_fireflies then - df_caverns.node_id.fireflies = minetest.get_content_id(df_dependencies.node_name_fireflies) -end - -df_caverns.node_id.cobble = minetest.get_content_id(df_dependencies.node_name_cobble) -df_caverns.node_id.desert_sand = minetest.get_content_id(df_dependencies.node_name_desert_sand) -df_caverns.node_id.dirt = minetest.get_content_id(df_dependencies.node_name_dirt) -df_caverns.node_id.gravel = minetest.get_content_id(df_dependencies.node_name_gravel) -df_caverns.node_id.ice = minetest.get_content_id(df_dependencies.node_name_ice) -df_caverns.node_id.lava = minetest.get_content_id(df_dependencies.node_name_lava_source) -df_caverns.node_id.meseore = minetest.get_content_id(df_dependencies.node_name_stone_with_mese) -df_caverns.node_id.mossycobble = minetest.get_content_id(df_dependencies.node_name_mossycobble) -df_caverns.node_id.obsidian = minetest.get_content_id(df_dependencies.node_name_obsidian) -df_caverns.node_id.sand = minetest.get_content_id(df_dependencies.node_name_sand) -df_caverns.node_id.silver_sand = minetest.get_content_id(df_dependencies.node_name_silver_sand) -df_caverns.node_id.snow = minetest.get_content_id(df_dependencies.node_name_snow) -df_caverns.node_id.stone = minetest.get_content_id(df_dependencies.node_name_stone) -df_caverns.node_id.stone_with_coal = minetest.get_content_id(df_dependencies.node_name_stone_with_coal) -df_caverns.node_id.water = minetest.get_content_id(df_dependencies.node_name_water_source) - -df_caverns.node_name = {} -df_caverns.node_name.stone = df_dependencies.node_name_stone - -minetest.after(0, function() - df_caverns.node_name = nil -end) \ No newline at end of file diff --git a/df_caverns/node_ids.lua b/df_caverns/node_ids.lua index 4e2e255..0b003cd 100644 --- a/df_caverns/node_ids.lua +++ b/df_caverns/node_ids.lua @@ -1,9 +1,26 @@ df_caverns.node_id = {} -minetest.after(1, function() df_caverns.node_id = nil end) -- should only be used during initialization. +minetest.after(0, function() df_caverns.node_id = nil end) -- should only be used during initialization. -local modpath = minetest.get_modpath(minetest.get_current_modname()) -dofile(modpath.."/dependencies.lua") +if df_dependencies.node_name_fireflies then + df_caverns.node_id.fireflies = minetest.get_content_id(df_dependencies.node_name_fireflies) +end + +df_caverns.node_id.cobble = minetest.get_content_id(df_dependencies.node_name_cobble) +df_caverns.node_id.desert_sand = minetest.get_content_id(df_dependencies.node_name_desert_sand) +df_caverns.node_id.dirt = minetest.get_content_id(df_dependencies.node_name_dirt) +df_caverns.node_id.gravel = minetest.get_content_id(df_dependencies.node_name_gravel) +df_caverns.node_id.ice = minetest.get_content_id(df_dependencies.node_name_ice) +df_caverns.node_id.lava = minetest.get_content_id(df_dependencies.node_name_lava_source) +df_caverns.node_id.meseore = minetest.get_content_id(df_dependencies.node_name_stone_with_mese) +df_caverns.node_id.mossycobble = minetest.get_content_id(df_dependencies.node_name_mossycobble) +df_caverns.node_id.obsidian = minetest.get_content_id(df_dependencies.node_name_obsidian) +df_caverns.node_id.sand = minetest.get_content_id(df_dependencies.node_name_sand) +df_caverns.node_id.silver_sand = minetest.get_content_id(df_dependencies.node_name_silver_sand) +df_caverns.node_id.snow = minetest.get_content_id(df_dependencies.node_name_snow) +df_caverns.node_id.stone = minetest.get_content_id(df_dependencies.node_name_stone) +df_caverns.node_id.stone_with_coal = minetest.get_content_id(df_dependencies.node_name_stone_with_coal) +df_caverns.node_id.water = minetest.get_content_id(df_dependencies.node_name_water_source) if minetest.get_modpath("big_webs") then df_caverns.node_id.big_webs = minetest.get_content_id("big_webs:webbing") diff --git a/df_caverns/oil_sea.lua b/df_caverns/oil_sea.lua index d855c06..466b0e7 100644 --- a/df_caverns/oil_sea.lua +++ b/df_caverns/oil_sea.lua @@ -115,7 +115,7 @@ end) minetest.register_ore({ ore_type = "scatter", ore = "mine_gas:gas_seep", - wherein = df_caverns.node_name.stone, + wherein = df_dependencies.node_name_stone, clust_scarcity = 32 * 32 * 32, clust_num_ores = 27, clust_size = 6, diff --git a/df_caverns/primordial.lua b/df_caverns/primordial.lua index 080bdea..62ee845 100644 --- a/df_caverns/primordial.lua +++ b/df_caverns/primordial.lua @@ -395,7 +395,7 @@ subterrane.register_layer({ columns = { maximum_radius = 20, minimum_radius = 5, - node = df_caverns.node_name.stone, -- no flowstone below the Sunless Sea, replace with something else + node = df_dependencies.node_name_stone, -- no flowstone below the Sunless Sea, replace with something else weight = 0.5, maximum_count = 60, minimum_count = 10, diff --git a/df_primordial_items/jungle_nodes.lua b/df_primordial_items/jungle_nodes.lua index 44a22c9..3b7925d 100644 --- a/df_primordial_items/jungle_nodes.lua +++ b/df_primordial_items/jungle_nodes.lua @@ -212,7 +212,6 @@ minetest.register_node("df_primordial_items:jungle_grass_3", { ----------------------------------------------------------------------------------------- -- Ivy --- TODO: this is not actually used, find somewhere to put it minetest.register_node("df_primordial_items:jungle_ivy", { description = S("Primordial Jungle Ivy"), _doc_items_longdesc = df_primordial_items.doc.ivy_desc, diff --git a/df_primordial_items/textures/dfcaverns_glowtato.png b/df_primordial_items/textures/dfcaverns_glowtato.png index 6456425..fb11de3 100644 Binary files a/df_primordial_items/textures/dfcaverns_glowtato.png and b/df_primordial_items/textures/dfcaverns_glowtato.png differ diff --git a/df_primordial_items/textures/dfcaverns_primordial_fruit.png b/df_primordial_items/textures/dfcaverns_primordial_fruit.png index 723374b..dcb7c1c 100644 Binary files a/df_primordial_items/textures/dfcaverns_primordial_fruit.png and b/df_primordial_items/textures/dfcaverns_primordial_fruit.png differ