bypass dependency indirection for df_caverns

This commit is contained in:
FaceDeer 2022-08-08 21:56:26 -06:00
parent 18bf4d7942
commit e76a91c968
7 changed files with 22 additions and 32 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 698 B

After

Width:  |  Height:  |  Size: 698 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 619 B

After

Width:  |  Height:  |  Size: 480 B