From e76a91c968054a714a7f7a32d11432bb01cb2e86 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Mon, 8 Aug 2022 21:56:26 -0600 Subject: [PATCH] bypass dependency indirection for df_caverns --- df_caverns/dependencies.lua | 26 ------------------ df_caverns/node_ids.lua | 23 ++++++++++++++-- df_caverns/oil_sea.lua | 2 +- df_caverns/primordial.lua | 2 +- df_primordial_items/jungle_nodes.lua | 1 - .../textures/dfcaverns_glowtato.png | Bin 698 -> 698 bytes .../textures/dfcaverns_primordial_fruit.png | Bin 619 -> 480 bytes 7 files changed, 22 insertions(+), 32 deletions(-) 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 6456425dc1b054e8707e5ebbd3661207b0e7b5ed..fb11de326a2cedb97499bdc556bd33c3cd297821 100644 GIT binary patch delta 685 zcmV;e0#g0D1-b>08Gi!+001a04^sdD0i;k&R7C&)06J5#NRrPgGIcL1cP2S)KZnR7 zMR;|-=|!B@r}O`Hx$9!3!eO%LRH^J&!uNX9{9={5Pn_S;|Ngu8{=WPEy!iftyYP;| z+`9Pv&Hnz~{{P_q|JC>TukZYq$LcUPgC{0wFE)uKCuux%y?-k%dNDzkN@d4gi0Z57 z`nmZ2yZ8Oo|Nh|r{^bAujMMXL$o*5Y^h~7UKY+kLWUg+k=e6_vy!rjS`TolP{@DKi zGyff_+rKVWWf7z%l?Sj{kio0$^QK_Lz%nz{m=gX)BpZOS;M5{^0V{(r04yf zYn{m1_P%zys=xcB{(;rxr>{i)^lJ4TDd{f^c4nb7dM z^7*;;{%oA>+y4Er(~(u;bYJ{F+t^bN~PV6LeBeQvd(} z00000000000000000000Wbv_$00028Nkl55->K%hw8^xNH9V9%pt8Ya&f|K z-K7vdi+{3|XE*DV1)63h(*Uvv7Fi0ern*j)T!onjWqb8zx`S=B(?i6hA=08Gi-<001BJ|6u?C010qNS#tmYE+YT{E+YYWr9XB6000McNliru zeSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00J~g zL_t(I%gvHWYZGx8#()2r$)41tN!rG=rVCvtR!vc%RRl#rihop~fD|_1diO@P$s z>9gTO!%c=ih8Btt2nAR-9Zb_95ztTyY(M}FMLO#1tAF31^VoIY_Rj9Br5%D}nz-Nc zSmjm35K1M8Cjb-`fdC2}!LHPj^$EI8of~h=L^Gak6(5 zwt_0ZYO$t%e_?O7b8^vwSc8v9s+Hz_X|idE2BA<@hzn?fM-(+BSR$;}-1~JvchcF@ z=6I;uI)8pc$Rwd91cqqX9$~!%qCoS4CSck;-`EyBUthtiIS<+rkO&K2kD}thhA7Gi zg{tsj)#c4Hsv;7;_iIM;DMdfMl9a@HYVrx7rvVx^QL`x=0e98{%idNG#=Rx T6jOWu00000NkvXXu0mjf@L)I6 diff --git a/df_primordial_items/textures/dfcaverns_primordial_fruit.png b/df_primordial_items/textures/dfcaverns_primordial_fruit.png index 723374b77ca73fd718423c1dfe3718d9b99a5b31..dcb7c1cd2a6e1b42ead6f28cad938ded68145cd9 100644 GIT binary patch delta 297 zcmV+^0oMNO1mFXZBw`3qOjJbx00960|N8%?|IYvZ$^ZZO|NHg*`t|+$mHz+v|NZR# z_U8K3cJ}_?{`cbg!E4|7*!#3+&-ASMyKB_rlJ%}!%eQROu3OB;XWOA#!K_-#r&q?E zQ@)>8!2kcLk;ohf|Mm0zm(Tftk?e#R$Rhq8@{Ek^NCF%ztc;A>oJb;OcJ_=8?p)k( z0iJ-sAjaUZa9%!`2*0w5s+xL8D6;@eL{L{x-@uUB$XEy_B5ZD9X=QC=D*`t#N7T{D v*~QgO3}KbHgtw2cpCqyarKDwK8886=s@V?z0>9e^00000NkvXXu0mjf%95W+ delta 461 zcmV;;0W$vJ1M38kB!5a!OjJbx008~}zyAN)`v0c?|Ed4~_5c6utlDVv{g?6Zc{{Q*^^5ppMi~RlU{`Thj?bi6zcJ}_?{`cbg<*oI{ zYUsgh-}(Q!`PlpK+4Qem(6ndI^sM=-TFbj@)Z>!%v0KlsTuIBfY|^P(&8}O_#%J51 zTEV_y+N@g3r&q?EQ@)>8z`JGH|NsB_`_uRF_x}Cn|NrFpsr&!B|Nqqg|N8&`?EnAH z|NhDU|M>rrs)v7qS_6sz001;}QchCK!MV$)(005jxL_t(|USq%nER1YSC<4qDCaiMo zNCF)331;S;NCI3=Ufw3$JO}~a)HqWU6Fz>pfPkRAgNb>GqmVFMM8qc~)FdocR7@Nu zB9WG!VUn4XD=8%n5s;C!w6eCb&C0fuSAd8pDmlBjy1CnVcq&6Rsi^w;`3D3B1*^e~ zQP&8Mh>VJk(S%#2rLB{gl$@fA