From ce3ca0afb397155d9f448ead7952fa5376eb31db Mon Sep 17 00:00:00 2001 From: Juraj Vajda Date: Mon, 3 Apr 2023 20:07:41 -0400 Subject: [PATCH] Add MCL support and some new textures --- LICENSE.txt | 6 +++++- mapgen_after.lua | 12 +++++------ mapgen_bamboo_forest.lua | 20 +++++++++--------- mapgen_crystal_forest.lua | 2 +- mapgen_crystal_forest_dunes.lua | 2 +- mapgen_crystal_forest_ocean.lua | 2 +- mapgen_crystal_forest_shore.lua | 2 +- mapgen_crystal_forest_under.lua | 2 +- mapgen_forsaken_desert_under.lua | 2 +- mod.conf | 2 +- mod_support_mcl_aliases.lua | 1 + nodes.lua | 7 +++--- textures/everness_baobab_wood.png | Bin 191 -> 248 bytes ...ral_forest_deep_ocean_lantern_animated.png | Bin 876 -> 1443 bytes ...coral_forest_deep_ocean_lantern_bottom.png | Bin 0 -> 261 bytes ...ss_coral_forest_deep_ocean_lantern_top.png | Bin 0 -> 261 bytes textures/everness_sequoia_tree_side.png | Bin 268 -> 254 bytes 17 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 textures/everness_coral_forest_deep_ocean_lantern_bottom.png create mode 100644 textures/everness_coral_forest_deep_ocean_lantern_top.png diff --git a/LICENSE.txt b/LICENSE.txt index 8b79e86..6b49e7b 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -488,7 +488,7 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_baobab_tree_sapling.png - everness_baobab_tree_side.png - everness_baobab_tree_top.png -- everness_baobab_wood.png -- Derived from texture Pixel Perfection by XSSheep (CC-BY-SA-4.0) +- everness_baobab_wood.png - everness_bloodspore_plant_small.png - everness_bloodspore_plant.png - everness_blooming_cooksonia.png @@ -853,6 +853,9 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_mcl_doors_door_willow_upper.png - everness_mcl_doors_trapdoor_bamboo_side.png - everness_mcl_doors_trapdoor_crystal_wood_side.png +- everness_coral_forest_deep_ocean_lantern_animated.png +- everness_coral_forest_deep_ocean_lantern_bottom.png +- everness_coral_forest_deep_ocean_lantern_top.png **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated @@ -864,6 +867,7 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_grass_top_2.png - everness_grass_with_blue_extra_top_2.png - everness_grass_with_yellow_extra_top_1.png +- everness_rising_soul_particle.png ### Sounds diff --git a/mapgen_after.lua b/mapgen_after.lua index 9fea01d..1e96008 100644 --- a/mapgen_after.lua +++ b/mapgen_after.lua @@ -315,12 +315,12 @@ minetest.register_on_generated(function(minp, maxp, blockseed) 'default:stone', 'default:sand', 'default:gravel', - 'everness_mapgen_stone_with_coal', - 'everness_mapgen_stone_with_iron', - 'everness_mapgen_stone_with_tin', - 'everness_mapgen_stone_with_gold', - 'everness_mapgen_stone_with_mese', - 'everness_mapgen_stone_with_diamond', + 'default:stone_with_coal', + 'default:stone_with_iron', + 'default:stone_with_tin', + 'default:stone_with_gold', + 'default:stone_with_mese', + 'default:stone_with_diamond', 'everness:cave_barrel_cactus', 'everness:venus_trap', 'everness:illumi_root', diff --git a/mapgen_bamboo_forest.lua b/mapgen_bamboo_forest.lua index 1250e9e..61bcf6a 100644 --- a/mapgen_bamboo_forest.lua +++ b/mapgen_bamboo_forest.lua @@ -166,7 +166,7 @@ local function register_grass_decoration(offset, scale, length) biomes = { 'everness_bamboo_forest' }, y_max = y_max, y_min = y_min, - decoration = 'everness_mapgen_grass_' .. length, + decoration = 'default:grass_' .. length, }) end @@ -187,7 +187,7 @@ local function register_flower(seed, flower_name) biomes = { 'everness_bamboo_forest' }, y_max = y_max, y_min = y_min, - decoration = flower_name, + decoration = 'flowers:' .. flower_name, }) end @@ -248,14 +248,14 @@ register_grass_decoration(0.03, 0.03, 1) -- Flowers -register_flower(436, 'flowers:rose') -register_flower(19822, 'flowers:tulip') -register_flower(1220999, 'flowers:dandelion_yellow') -register_flower(800081, 'flowers:chrysanthemum_green') -register_flower(36662, 'flowers:geranium') -register_flower(1133, 'flowers:viola') -register_flower(73133, 'flowers:dandelion_white') -register_flower(42, 'flowers:tulip_black') +register_flower(436, 'rose') +register_flower(19822, 'tulip') +register_flower(1220999, 'dandelion_yellow') +register_flower(800081, 'chrysanthemum_green') +register_flower(36662, 'geranium') +register_flower(1133, 'viola') +register_flower(73133, 'dandelion_white') +register_flower(42, 'tulip_black') -- -- On Generated diff --git a/mapgen_crystal_forest.lua b/mapgen_crystal_forest.lua index aea48ee..ecae77f 100644 --- a/mapgen_crystal_forest.lua +++ b/mapgen_crystal_forest.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_crystal_forest_dunes.lua b/mapgen_crystal_forest_dunes.lua index fd797cc..df2bcf8 100644 --- a/mapgen_crystal_forest_dunes.lua +++ b/mapgen_crystal_forest_dunes.lua @@ -35,7 +35,7 @@ minetest.register_biome({ depth_riverbed = 2, node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_cobble', vertical_blend = 1, y_max = y_max, y_min = y_min, diff --git a/mapgen_crystal_forest_ocean.lua b/mapgen_crystal_forest_ocean.lua index 75c9c8f..913d08a 100644 --- a/mapgen_crystal_forest_ocean.lua +++ b/mapgen_crystal_forest_ocean.lua @@ -36,7 +36,7 @@ minetest.register_biome({ node_cave_liquid = 'default:water_source', node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_crystal_forest_shore.lua b/mapgen_crystal_forest_shore.lua index 4e83242..2beb6e9 100644 --- a/mapgen_crystal_forest_shore.lua +++ b/mapgen_crystal_forest_shore.lua @@ -36,7 +36,7 @@ minetest.register_biome({ node_cave_liquid = 'default:water_source', node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_crystal_forest_under.lua b/mapgen_crystal_forest_under.lua index 9fc1ce5..d9ec365 100644 --- a/mapgen_crystal_forest_under.lua +++ b/mapgen_crystal_forest_under.lua @@ -30,7 +30,7 @@ minetest.register_biome({ node_cave_liquid = { 'default:water_source', 'default:lava_source' }, node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 35, diff --git a/mapgen_forsaken_desert_under.lua b/mapgen_forsaken_desert_under.lua index efde7ef..51262f5 100644 --- a/mapgen_forsaken_desert_under.lua +++ b/mapgen_forsaken_desert_under.lua @@ -30,7 +30,7 @@ minetest.register_biome({ node_cave_liquid = { 'default:water_source', 'default:lava_source' }, node_dungeon = 'default:cobble', node_dungeon_alt = 'default:mossycobble', - node_dungeon_stair = 'everness_mapgen_stair_cobblestair_cobble', + node_dungeon_stair = 'stairs:stair_cobble', y_max = y_max, y_min = y_min, heat_point = 100, diff --git a/mod.conf b/mod.conf index b961c7b..97c2de9 100644 --- a/mod.conf +++ b/mod.conf @@ -1,6 +1,6 @@ name = everness description = Never ending discovery in Everness mapgen. depends = -optional_depends = default, xpanes, doors, stairs, walls, x_obsidianmese, x_tumbleweed, x_farming, x_clay, mcl_core, mcl_fences, mcl_walls, mcl_stairs, mcl_util, mcl_autogroup, mcl_doors, mcl_vars, mcl_mapgen_core, mcl_biomes, mcl_dungeons, mcl_structures, mcl_terrain_features, mcl_villages, tsm_railcorridors +optional_depends = default, xpanes, doors, stairs, walls, x_obsidianmese, x_tumbleweed, x_farming, x_clay, mcl_core, mcl_fences, mcl_walls, mcl_stairs, mcl_util, mcl_autogroup, mcl_doors, mcl_mapgen_core, rp_default supported_games = minetest_game min_minetest_version = 5.4 diff --git a/mod_support_mcl_aliases.lua b/mod_support_mcl_aliases.lua index 03e3974..899fe69 100644 --- a/mod_support_mcl_aliases.lua +++ b/mod_support_mcl_aliases.lua @@ -162,6 +162,7 @@ minetest.register_alias('stairs:stair_outer_quartz_chiseled', 'mcl_stairs:stair_ minetest.register_alias('stairs:stair_quartz_chiseled', 'mcl_stairs:stair_quartz_chiseled') minetest.register_alias('stairs:stair_inner_quartz_chiseled', 'mcl_stairs:stair_quartz_chiseled_inner') minetest.register_alias('stairs:slab_quartz_chiseled', 'mcl_stairs:slab_quartz_chiseled') +minetest.register_alias('stairs:stair_coral_desert_stone_block', 'mcl_stairs:stair_coral_desert_stone_block') minetest.register_alias('everness:cursed_brick_wall', 'everness:cursedbrickwall') minetest.register_alias('walls:cobble', 'mcl_walls:cobble') diff --git a/nodes.lua b/nodes.lua index f3853cb..9ff8ed9 100644 --- a/nodes.lua +++ b/nodes.lua @@ -8567,17 +8567,18 @@ Everness:register_node('everness:floating_crystal', { Everness:register_node('everness:coral_forest_deep_ocean_lantern', { description = S('Coral Forest Deep Ocean Lantern'), tiles = { + { name = 'everness_coral_forest_deep_ocean_lantern_top.png' }, + { name = 'everness_coral_forest_deep_ocean_lantern_bottom.png' }, { name = 'everness_coral_forest_deep_ocean_lantern_animated.png', animation = { type = 'vertical_frames', aspect_w = 16, aspect_h = 16, - length = 1, + length = 2, }, }, }, - drawtype = 'glasslike', sunlight_propagates = true, is_ground_content = false, sounds = Everness.node_sound_glass_defaults(), @@ -8594,5 +8595,5 @@ Everness:register_node('everness:coral_forest_deep_ocean_lantern', { _mcl_blast_resistance = 0.3, _mcl_hardness = 0.3, paramtype = 'light', - light_source = 12, + light_source = 14, }) diff --git a/textures/everness_baobab_wood.png b/textures/everness_baobab_wood.png index a8bfa027eda472648805f1386b46ae81f14cd88b..8e1631411408bd783e6d014dff98a4b094035832 100644 GIT binary patch delta 220 zcmV<203-ju0r&xsB!4haOjJd^g;&_BdSEsk!;WBrP%vmmE|FF-qi8^}cT0I$JOV@5mi_N(oO_0OE>!x(^}G# z6!f=8DagEmnneH!IU<1mw}_vg?hg9{?PWGQW!ewM W?gcVCIP%H>0000el@)ij6LuNq z>5Wi%Go~hQOR(NlXV2&YlB>U}=4^r{62&x}?k%cw_Yz#E5F7(*6LQ><`2&6C0|^}^ RRl@)P002ovPDHLkV1izuLb3n= diff --git a/textures/everness_coral_forest_deep_ocean_lantern_animated.png b/textures/everness_coral_forest_deep_ocean_lantern_animated.png index f103b30997dfb58dc608de889dd91d8b7c92ba1e..b4781c8961733509c7d1bf2be3c0c2be27f77215 100644 GIT binary patch delta 1436 zcmV;N1!MZ`2BQm*8Gi-<000wx_m%(v1!_q|K~#7F>{J7gTu~5wu~Rl<+qP}nwr$(C zZQHi(yW8Ef)pm^Cvv}`bFNjQ`c0hm0b$; zDIfqJE#CkBjemE)e#x#Nfji~Yqnx~2%__jG-LV40#`VY6DQ(2iho3+2`rB8$`0^Pq zzkI>dk00^w#}7Hbun{Pc9CD=wFTZ``MT}5LC1-dz{sadjC^Qs5olbWlmH5hXo__ue zqq)ER`4itA4roMbBr-Nu$s+sZa!ESm(7EB^_4n`i5`P$oAJ&s2EDYh%(PG5Ag~1UK z2(;1swo$#Z`dVD0En#680mD|JhU}dd9WeqLA=jP42m9!sCw~cvi9CB75?yi#NrBTy zvJ#m>L`;l?9BKEMxHx(9HpGsJ0g{!-{8$5$0zyJ0&p&o&=)Cj%Ehvb(+IATvK5#%N z6h;5hrhj2Qv!zTyjhL=&%b;=ng6PqylAwRP${5z65(YOai#21L;_lIzczb;vPH!5C z{Y(2|T(c_ZU#k>4cdUqx9m?b1_u&8cfZ&7v$N#op7F(_xK^VTz99mvxhCwrf#>~tj zvxk|td4@{=os4q&v>eWE7A>d-tLUq;ey~r*;eUa^18si~a~2Q43xNl{`HW1q3E&v) zY*S}8!N9`bHk{Gu=#bje37(hpAk}J6y3-`3R;FaLPWeHP%7#kWZX0rY9t@8TB_8Da zU3OTVVwEDrDt;vXLrY`UxkV}&%r3gGIseS5iFE}499^fPh%i4g##T*6m zX@7|ap+c6FYMCm!O5@{WnFj{5a@{nTuC1j!fL*GFMmk$-5eb{kgMD~F(({dDmEOBI zB_8w_^FQW+H=UrBkdL-%75c{Ru0)J{ndG1IpwRDft2>k^p1GcID`bgAm8(!x`}RCg zcX!}A3@Nmu<%0E`?X;*npZysR?s?E%%ztfp(433~9u#%;=LgN{nCjyp7ifFClw;Xf z8<|u#b!yM1R>)S^JLFgc83M1x(%s^L(x_2&Xi~ghr36pu7Ek5gV$L@-#v{u1I#e-q zxO_PeJ_UXBB^02|ghHPJKKdB&Qli-)XDUH!@u)2iaH_-21WMc{!uourbk^7QA~2o`{WRnwqYt-^jWNG~?mBp!V9 zduUyW{d$0=$~=IP97%Bp$?T zRm2M4_kbZ<;=wD|CjIpOH8G{Sg`SV%mi90-j zJ3BCpII-sef(Bl2BoryM*WwZD88MORcJ6ubfAL+B6gWJ~`q>|S5nj{VzPzG3I; zN{}t(0jN_O8vKp~tB-~ZDht#Lyxa4DWu(Ld6k1fL=6Hmv{ipo_28yh}gMUadN0Cxq z-~rkktQGz*+>O!E5j7cLLxqgQ1AjKj8xZs00BdC)K#00u9Q2m*Am8iY0O1P+73}(h z&wiK01FZeS{s5)inTV0X5a(u;awrjsS4)51AAqt@0X-5v7kXwoO>9PAfB`k_d4SU< qCnq>S3hlC{TF>YWu=YRW!4)stSLdgi+q}B~0000CEz5Jh=45^RI0!4XoArj7)IL4RYaFgyW{gvUVkH4qh? z$+@}Tu&E-s=|4Mj?(FPtzVyYLx9{KG-y;Hab9?vt$Y<@2-a| zVE~?YAZqsTv=K2Fa2{^g2solgYR2|4Ack`vo%;^RBLK;q!Ar1)h>s-zSPb^Ffhhfy zOY$(o$z0sr$oY(xE^R>3ZV*DSGRZ>urz!(JYvgt1Gj#2E>L z5@DGkjxpp1Z#-+Sn7|# zel`%LpMP>mUWRx^It-gOxtTFIH03=5>H&xWzzA|n^rHYlcHfes1RxoMH0b^wyyAMm z#vqOCjR;hi8uY|Ks+?$JcjzYh9-5VI<1H}Y=f8&|unKk=yk^U4?_)Ive%PzWaQE7r z1QBN>3gd4z_oOHde$YiNS#LaJxpp5j|2fwvPcZocrkP9ke%qWX|9vP*B7! qrHKKEW3ZnMMCqqol9#!;z55HA2%%nlu(J{X0000Ig?W88uZND+@7yA5BGh_O>J=KA_$So-U3d9MQ=freBPB z%S24lIM&Zua^yfj+?fmSHd*NE-q_f6FxbP>v$1hwOXAYY^FODbGcYoi(EU|i{+&-W ztWBkPv-P*T0cpt|ToymyeGLsYYintkUwbh)^s0mqkKgywn9#6fj)GsecUEgnH)?LY z(0T1bz_du7cTQY9K3+Y+5{Fn1PGfr86cKgw0^`OKQHBkd4ZPI%->e3@jlt8^&t;uc GLK6Ue_Fa+y literal 0 HcmV?d00001 diff --git a/textures/everness_coral_forest_deep_ocean_lantern_top.png b/textures/everness_coral_forest_deep_ocean_lantern_top.png new file mode 100644 index 0000000000000000000000000000000000000000..2426110332ad1af1e1fffb300ad4159f6361ec63 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUwNzqu)nQRrtZa@4`_kHE^^PuFc=_%v$r@n^2?^GtQ4(3Qb}zLxJ3EafMD|!tUUpXL zq(H)o&A$2_ky8{C9!W31>NaN)PowbvD7ov8Qc^iguFR7v>6$q;ana$~zPFYinJLL7 zyrq0?lxor3gUXG80S%6CxDI!jY*^~BTVdKZ<2P*)QG5)|J-YYxojcWlZe#Ft^>bP0 Hl+XkK?VMYD literal 0 HcmV?d00001 diff --git a/textures/everness_sequoia_tree_side.png b/textures/everness_sequoia_tree_side.png index 060a271873e9507c5ee64d85f4e8a8b1b9b3f013..a48c52f21481e91e147671b3503738238cbe7dd3 100644 GIT binary patch delta 226 zcmV<803H8~0{#JzB!4haOjJcs77IBJ2Pq2$F%1SI2?Q++22&UeKM)8u4hAL)1v3r@ zTN({L4+lpR2|*DEVjU0B@+b)a004Qv>iF>$VRa=)BdX`++*wr)d7`N<$ zGBi=+g~Jmi%nL@?dH+H8Kk!qA2H{L2-1@tggom>tL$Eu+6VMndb9sWqjj)7{VAETw caRasd0Jkv*BRlvD%>V!Z07*qoM6N<$f=*9T@&Et; delta 240 zcmV071cPSE_5fsIot6!viH}X=9YHw!5Lv>Jw qrK1j@Ax?&kw^W|o>DMOn_>4cxU