From 2f6bbf83e711c393ded91e033d03fa5f0f47b94f Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 26 Mar 2020 15:51:52 +0100 Subject: [PATCH] Rename many items with misleading technical names E.g. default:sand for Volcanic Ash, so it's renamed to default:ash --- mods/columnia/register.lua | 12 +- mods/default/README.txt | 8 +- mods/default/crafting.lua | 152 ++++++++++----------- mods/default/functions.lua | 14 +- mods/default/mapgen.lua | 33 ++--- mods/default/nodes.lua | 100 +++++++------- .../textures/{default_sand.png => default_ash.png} | Bin ...efault_sand_block.png => default_ash_block.png} | Bin ...{default_chondrit.png => default_chondrite.png} | Bin ...ndrit_block.png => default_chondrite_block.png} | Bin ...ndrit_brick.png => default_chondrite_brick.png} | Bin .../{default_essexit.png => default_essexite.png} | Bin ...ssexit_block.png => default_essexite_block.png} | Bin ...ssexit_brick.png => default_essexite_brick.png} | Bin ...lt_desert_sand.png => default_fertile_sand.png} | Bin ...stone.png => default_floor_chondrite_stone.png} | Bin ...one2.png => default_floor_chondrite_stone2.png} | Bin ...it_gold.png => default_floor_essexite_gold.png} | Bin ..._gold2.png => default_floor_essexite_gold2.png} | Bin ...sexit.png => default_floor_marble_essexite.png} | Bin ...xit2.png => default_floor_marble_essexite2.png} | Bin ...lt_desert_stone.png => default_stone_baked.png} | Bin ...one_block.png => default_stone_block_baked.png} | Bin ...one_brick.png => default_stone_brick_baked.png} | Bin mods/farming_plus/paletree.lua | 2 +- mods/flowers/init.lua | 4 +- mods/glowcrystals/init.lua | 6 +- mods/gluncarp/carpets.lua | 128 ++++++++--------- mods/highlandpools/init.lua | 6 +- mods/mesecons/mesecons_materials/init.lua | 4 +- mods/mobs/api.lua | 2 +- mods/mobs_hades/README.txt | 2 +- mods/mobs_hades/mutant.lua | 8 +- mods/mobs_hades/stone_monster.lua | 6 +- mods/pipeworks/crafts.lua | 12 +- mods/plantlife/API.txt | 2 +- mods/plantlife/flowers_plus/init.lua | 4 +- mods/plantlife/plants_lib/init.lua | 2 +- mods/staffgaia/init.lua | 2 +- mods/stairs/init.lua | 24 ++-- 40 files changed, 265 insertions(+), 268 deletions(-) rename mods/default/textures/{default_sand.png => default_ash.png} (100%) rename mods/default/textures/{default_sand_block.png => default_ash_block.png} (100%) rename mods/default/textures/{default_chondrit.png => default_chondrite.png} (100%) rename mods/default/textures/{default_chondrit_block.png => default_chondrite_block.png} (100%) rename mods/default/textures/{default_chondrit_brick.png => default_chondrite_brick.png} (100%) rename mods/default/textures/{default_essexit.png => default_essexite.png} (100%) rename mods/default/textures/{default_essexit_block.png => default_essexite_block.png} (100%) rename mods/default/textures/{default_essexit_brick.png => default_essexite_brick.png} (100%) rename mods/default/textures/{default_desert_sand.png => default_fertile_sand.png} (100%) rename mods/default/textures/{default_floor_chondrit_stone.png => default_floor_chondrite_stone.png} (100%) rename mods/default/textures/{default_floor_chondrit_stone2.png => default_floor_chondrite_stone2.png} (100%) rename mods/default/textures/{default_floor_essexit_gold.png => default_floor_essexite_gold.png} (100%) rename mods/default/textures/{default_floor_essexit_gold2.png => default_floor_essexite_gold2.png} (100%) rename mods/default/textures/{default_floor_marble_essexit.png => default_floor_marble_essexite.png} (100%) rename mods/default/textures/{default_floor_marble_essexit2.png => default_floor_marble_essexite2.png} (100%) rename mods/default/textures/{default_desert_stone.png => default_stone_baked.png} (100%) rename mods/default/textures/{default_desert_stone_block.png => default_stone_block_baked.png} (100%) rename mods/default/textures/{default_desert_stone_brick.png => default_stone_brick_baked.png} (100%) diff --git a/mods/columnia/register.lua b/mods/columnia/register.lua index dad3f18..307d7f7 100644 --- a/mods/columnia/register.lua +++ b/mods/columnia/register.lua @@ -17,8 +17,8 @@ columnia.register_all("default:stone") columnia.register_all("default:cactus", nil, "default_cactus_side.png") columnia.register_all("default:cactus_block") columnia.register_all("default:cactus_brick") -columnia.register_all("default:desert_stone") -columnia.register_all("default:desert_stonebrick") +columnia.register_all("default:stone_baked") +columnia.register_all("default:stonebrick_baked") columnia.register_all("default:mossycobble") columnia.register_all("default:obsidian") columnia.register_all("default:obsidianbrick") @@ -69,13 +69,13 @@ columnia.register_all("default:brick_yellow", "Yellow Brick") columnia.register_all("default:marble_brick") columnia.register_all("default:marble") -columnia.register_all("default:chondrit") -columnia.register_all("default:chondrit_brick") +columnia.register_all("default:chondrite") +columnia.register_all("default:chondrite_brick") columnia.register_all("default:tuff") columnia.register_all("default:tuff_brick") columnia.register_all("default:tuff_baked") columnia.register_all("default:tuff_baked_brick") -columnia.register_all("default:essexit") -columnia.register_all("default:essexit_brick") +columnia.register_all("default:essexite") +columnia.register_all("default:essexite_brick") columnia.register_all("columnia:rusty_block") diff --git a/mods/default/README.txt b/mods/default/README.txt index 2b97c02..d674f9c 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -72,10 +72,10 @@ VanessaE (WTFPL): default_nc_rb.png default_nc_side.png default_grass_*.png - default_desert_sand.png - default_desert_stone.png - default_desert_stone_brick.png - default_sand.png + default_fertile_sand.png + default_stone_baked.png + default_stone_brick_baked.png + default_ash.png default_sandstone_brick.png Calinou (CC BY-SA): diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 7d96cf2..c95873a 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -634,14 +634,14 @@ minetest.register_craft({ minetest.register_craft({ output = 'default:sandstone', recipe = { - {'default:desert_sand', 'default:desert_sand'}, - {'default:desert_sand', 'default:desert_sand'}, + {'default:fertile_sand', 'default:fertile_sand'}, + {'default:fertile_sand', 'default:fertile_sand'}, } }) minetest.register_craft({ - output = 'default:desert_sand 4', + output = 'default:fertile_sand 4', recipe = { {'default:sandstone'}, } @@ -799,34 +799,34 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:desert_stone_block', + output = 'default:stone_baked_block', recipe = { - {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, - {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, - {'default:desert_stone', 'default:desert_stone', 'default:desert_stone'}, + {'default:stone_baked', 'default:stone_baked', 'default:stone_baked'}, + {'default:stone_baked', 'default:stone_baked', 'default:stone_baked'}, + {'default:stone_baked', 'default:stone_baked', 'default:stone_baked'}, } }) minetest.register_craft({ - output = 'default:desert_stone 9', + output = 'default:stone_baked 9', recipe = { - {'default:desert_stone_block'} + {'default:stone_baked_block'} } }) minetest.register_craft({ - output = 'default:essexit_block', + output = 'default:essexite_block', recipe = { - {'default:essexit', 'default:essexit', 'default:essexit'}, - {'default:essexit', 'default:essexit', 'default:essexit'}, - {'default:essexit', 'default:essexit', 'default:essexit'}, + {'default:essexite', 'default:essexite', 'default:essexite'}, + {'default:essexite', 'default:essexite', 'default:essexite'}, + {'default:essexite', 'default:essexite', 'default:essexite'}, } }) minetest.register_craft({ - output = 'default:essexit 9', + output = 'default:essexite 9', recipe = { - {'default:essexit_block'} + {'default:essexite_block'} } }) @@ -879,34 +879,34 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:chondrit_block', + output = 'default:chondrite_block', recipe = { - {'default:chondrit', 'default:chondrit', 'default:chondrit'}, - {'default:chondrit', 'default:chondrit', 'default:chondrit'}, - {'default:chondrit', 'default:chondrit', 'default:chondrit'}, + {'default:chondrite', 'default:chondrite', 'default:chondrite'}, + {'default:chondrite', 'default:chondrite', 'default:chondrite'}, + {'default:chondrite', 'default:chondrite', 'default:chondrite'}, } }) minetest.register_craft({ - output = 'default:chondrit 9', + output = 'default:chondrite 9', recipe = { - {'default:chondrit_block'} + {'default:chondrite_block'} } }) minetest.register_craft({ - output = 'default:sand_block', + output = 'default:ash_block', recipe = { - {'default:sand', 'default:sand', 'default:sand'}, - {'default:sand', 'default:sand', 'default:sand'}, - {'default:sand', 'default:sand', 'default:sand'}, + {'default:ash', 'default:ash', 'default:ash'}, + {'default:ash', 'default:ash', 'default:ash'}, + {'default:ash', 'default:ash', 'default:ash'}, } }) minetest.register_craft({ - output = 'default:sand 9', + output = 'default:ash 9', recipe = { - {'default:sand_block'} + {'default:ash_block'} } }) @@ -954,10 +954,10 @@ minetest.register_craft({ minetest.register_craft({ - output = 'default:desert_stonebrick 4', + output = 'default:stone_bakedbrick 4', recipe = { - {'default:desert_stone', 'default:desert_stone'}, - {'default:desert_stone', 'default:desert_stone'}, + {'default:stone_baked', 'default:stone_baked'}, + {'default:stone_baked', 'default:stone_baked'}, } }) @@ -981,7 +981,7 @@ minetest.register_craft({ type = "cooking", cooktime = 15, output = "default:glass", - recipe = "default:desert_sand", + recipe = "default:fertile_sand", }) @@ -1003,7 +1003,7 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", cooktime = 15, - output = "default:desert_stone", + output = "default:stone_baked", recipe = "default:cobble_baked", }) @@ -1061,21 +1061,21 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", cooktime = 10, - output = "default:desert_stone", + output = "default:stone_baked", recipe = "default:stone", }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "default:sand", - recipe = "default:desert_stone", + output = "default:ash", + recipe = "default:stone_baked", }) minetest.register_craft({ type = "cooking", cooktime = 10, - output = "default:sand", + output = "default:ash", recipe = "default:tuff_baked", }) @@ -1337,26 +1337,26 @@ minetest.register_craft({ }) minetest.register_craft({ type = "shapeless", - output = 'default:desert_sand 2', - recipe = {'default:cobble', 'default:sand'}, + output = 'default:fertile_sand 2', + recipe = {'default:cobble', 'default:ash'}, }) minetest.register_craft({ type = "shapeless", - output = 'default:desert_sand 2', - recipe = {'default:mossycobble', 'default:sand'}, + output = 'default:fertile_sand 2', + recipe = {'default:mossycobble', 'default:ash'}, }) minetest.register_craft({ type = "shapeless", - output = 'default:desert_sand 2', - recipe = {'default:tuff', 'default:sand'}, + output = 'default:fertile_sand 2', + recipe = {'default:tuff', 'default:ash'}, }) minetest.register_craft({ type = "shapeless", - output = 'default:desert_sand 2', - recipe = {'default:mossytuff', 'default:sand'}, + output = 'default:fertile_sand 2', + recipe = {'default:mossytuff', 'default:ash'}, }) minetest.register_craft({ @@ -1397,7 +1397,7 @@ minetest.register_craft({ output = 'default:cactus', recipe = { {'', 'default:papyrus', ''}, - {'default:sand', 'default:dirt', 'default:sand'}, + {'default:ash', 'default:dirt', 'default:ash'}, } }) @@ -1422,7 +1422,7 @@ minetest.register_craft({ recipe = { {'', 'default:sapling', ''}, {'', 'default:sapling', ''}, - {'default:sand', 'default:dirt', 'default:sand'}, + {'default:ash', 'default:dirt', 'default:ash'}, } }) @@ -1593,18 +1593,18 @@ minetest.register_craft({ minetest.register_craft({ - output = 'default:chondrit_brick 4', + output = 'default:chondrite_brick 4', recipe = { - {'default:chondrit', 'default:chondrit'}, - {'default:chondrit', 'default:chondrit'}, + {'default:chondrite', 'default:chondrite'}, + {'default:chondrite', 'default:chondrite'}, } }) minetest.register_craft({ - output = 'default:essexit_brick 4', + output = 'default:essexite_brick 4', recipe = { - {'default:essexit', 'default:essexit'}, - {'default:essexit', 'default:essexit'}, + {'default:essexite', 'default:essexite'}, + {'default:essexite', 'default:essexite'}, } }) @@ -1634,26 +1634,26 @@ minetest.register_craft({ -- floors minetest.register_craft({ - output = 'default:floor_chondrit_stone 4', + output = 'default:floor_chondrite_stone 4', recipe = { - {'default:stone', 'default:chondrit'}, - {'default:chondrit', 'default:stone'}, + {'default:stone', 'default:chondrite'}, + {'default:chondrite', 'default:stone'}, } }) minetest.register_craft({ - output = 'default:floor_chondrit_stone2 4', + output = 'default:floor_chondrite_stone2 4', recipe = { - {'default:chondrit', 'default:stone'}, - {'default:stone', 'default:chondrit'}, + {'default:chondrite', 'default:stone'}, + {'default:stone', 'default:chondrite'}, } }) minetest.register_craft({ output = 'default:floor_bstone_stone 4', recipe = { - {'default:stone', 'default:desert_stone'}, - {'default:desert_stone', 'default:stone'}, + {'default:stone', 'default:stone_baked'}, + {'default:stone_baked', 'default:stone'}, } }) @@ -1668,48 +1668,48 @@ minetest.register_craft({ minetest.register_craft({ output = 'default:floor_bstone_sandstone 4', recipe = { - {'default:desert_stone', 'default:sandstone'}, - {'default:sandstone', 'default:desert_stone'}, + {'default:stone_baked', 'default:sandstone'}, + {'default:sandstone', 'default:stone_baked'}, } }) minetest.register_craft({ output = 'default:floor_bstone_sandstone2 4', recipe = { - {'default:sandstone', 'default:desert_stone'}, - {'default:desert_stone', 'default:sandstone'}, + {'default:sandstone', 'default:stone_baked'}, + {'default:stone_baked', 'default:sandstone'}, } }) minetest.register_craft({ - output = 'default:floor_marble_essexit 4', + output = 'default:floor_marble_essexite 4', recipe = { - {'default:marble', 'default:essexit'}, - {'default:essexit', 'default:marble'}, + {'default:marble', 'default:essexite'}, + {'default:essexite', 'default:marble'}, } }) minetest.register_craft({ - output = 'default:floor_marble_essexit2 4', + output = 'default:floor_marble_essexite2 4', recipe = { - {'default:essexit', 'default:marble'}, - {'default:marble', 'default:essexit'}, + {'default:essexite', 'default:marble'}, + {'default:marble', 'default:essexite'}, } }) minetest.register_craft({ - output = 'default:floor_essexit_gold 3', + output = 'default:floor_essexite_gold 3', recipe = { - {'default:essexit', 'default:essexit'}, - {'default:essexit', 'default:gold_ingot'}, + {'default:essexite', 'default:essexite'}, + {'default:essexite', 'default:gold_ingot'}, } }) minetest.register_craft({ - output = 'default:floor_essexit_gold2 3', + output = 'default:floor_essexite_gold2 3', recipe = { - {'default:gold_ingot', 'default:essexit'}, - {'default:essexit', 'default:essexit'}, + {'default:gold_ingot', 'default:essexite'}, + {'default:essexite', 'default:essexite'}, } }) diff --git a/mods/default/functions.lua b/mods/default/functions.lua index 31d148f..39c434f 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -446,7 +446,7 @@ minetest.register_abm({ if node.name == "default:mossystone" then nn = "default:stone" else - nn = "default:desert_stone" + nn = "default:stone_baked" end minetest.set_node(pos, {name=nn}) end, @@ -602,7 +602,7 @@ minetest.register_abm({ -- minetest.register_abm({ - nodenames = {"default:sand"}, + nodenames = {"default:ash"}, interval = 550, chance = 35, action = function(pos, node) @@ -614,7 +614,7 @@ minetest.register_abm({ return else pos.y = pos.y-1 - minetest.set_node(pos, {name="default:desert_sand"}) + minetest.set_node(pos, {name="default:fertile_sand"}) end end end, @@ -626,7 +626,7 @@ minetest.register_abm({ -- minetest.register_abm({ - nodenames = {"default:desert_sand"}, + nodenames = {"default:fertile_sand"}, neighbors = {"group:water"}, interval = 25, chance = 5, @@ -636,7 +636,7 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"default:desert_sand"}, + nodenames = {"default:fertile_sand"}, neighbors = {"default:dirt", "default:dirt_with_grass"}, interval = 50, chance = 5, @@ -650,7 +650,7 @@ minetest.register_abm({ }) minetest.register_abm({ - nodenames = {"default:sand"}, + nodenames = {"default:ash"}, neighbors = {"group:water"}, interval = 700, chance = 75, @@ -687,7 +687,7 @@ minetest.register_abm({ -- chance = 20, -- action = function(pos, node) -- if minetest.find_node_near(pos, 10, {"group:water"}) == nil then - -- minetest.set_node(pos, {name="default:desert_sand"}) + -- minetest.set_node(pos, {name="default:fertile_sand"}) -- else -- return -- end diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index fe5f19a..773ab4b 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -5,21 +5,18 @@ -- minetest.register_alias("mapgen_air", "air") minetest.register_alias("mapgen_stone", "default:stone") -minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal") -minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron") -minetest.register_alias("mapgen_dirt", "default:sand") -minetest.register_alias("mapgen_dirt_with_grass", "default:sand") -minetest.register_alias("mapgen_sand", "default:sand") -minetest.register_alias("mapgen_clay", "default:sand") +minetest.register_alias("mapgen_dirt", "default:ash") +minetest.register_alias("mapgen_dirt_with_grass", "default:ash") +minetest.register_alias("mapgen_sand", "default:ash") minetest.register_alias("mapgen_water_source", "default:lava_source") minetest.register_alias("mapgen_river_water_source", "default:lava_source") minetest.register_alias("mapgen_lava_source", "default:lava_source") minetest.register_alias("mapgen_gravel", "default:lava_source") minetest.register_alias("mapgen_desert_stone", "default:stone") -minetest.register_alias("mapgen_desert_sand", "default:sand") -minetest.register_alias("mapgen_dirt_with_snow", "default:sand") -minetest.register_alias("mapgen_snowblock", "default:sand") -minetest.register_alias("mapgen_snow", "default:sand") +minetest.register_alias("mapgen_desert_sand", "default:ash") +minetest.register_alias("mapgen_dirt_with_snow", "default:ash") +minetest.register_alias("mapgen_snowblock", "default:ash") +minetest.register_alias("mapgen_snow", "default:ash") minetest.register_alias("mapgen_ice", "default:stone") minetest.register_alias("mapgen_sandstone", "default:tuff") @@ -443,7 +440,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:sand", + ore = "default:ash", wherein = "default:stone", clust_scarcity = 20*20*20, clust_num_ores = 5*5*3, @@ -467,7 +464,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:chondrit", + ore = "default:chondrite", ore_param2 = 128, wherein = "default:stone", clust_scarcity = 10*10*10, @@ -480,7 +477,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:chondrit", + ore = "default:chondrite", ore_param2 = 128, wherein = "default:stone", clust_scarcity = 20*20*20, @@ -493,7 +490,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:chondrit", + ore = "default:chondrite", ore_param2 = 128, wherein = "default:stone", clust_scarcity = 20*20*20, @@ -506,7 +503,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:essexit", + ore = "default:essexite", ore_param2 = 128, wherein = "default:stone", clust_scarcity = 10*10*10, @@ -518,7 +515,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:essexit", + ore = "default:essexite", ore_param2 = 128, wherein = "default:stone", clust_scarcity = 10*10*10, @@ -531,7 +528,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", - ore = "default:essexit", + ore = "default:essexite", ore_param2 = 128, wherein = "default:stone", clust_scarcity = 20*10*20, @@ -645,7 +642,7 @@ minetest.register_decoration({ }, y_min = 1, y_max = 100, - decoration = "default:sand", + decoration = "default:ash", }) function default.make_papyrus(pos, size) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 4caa0ce..509db5c 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -19,26 +19,26 @@ minetest.register_node("default:mossystone", { sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:chondrit", { +minetest.register_node("default:chondrite", { description = "Chondrite", - tiles = {"default_chondrit.png"}, + tiles = {"default_chondrite.png"}, is_ground_content = true, groups = {cracky=2, stone=1, porous=1}, - drop = 'default:chondrit', + drop = 'default:chondrite', sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:chondrit_block", { +minetest.register_node("default:chondrite_block", { description = "Chondrite Block", - tiles = {"default_chondrit_block.png"}, + tiles = {"default_chondrite_block.png"}, is_ground_content = false, groups = {cracky=2}, sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:chondrit_brick", { +minetest.register_node("default:chondrite_brick", { description = "Chondrite Brick", - tiles = {"default_chondrit_brick.png"}, + tiles = {"default_chondrite_brick.png"}, groups = {cracky=2, stone=1}, is_ground_content = false, sounds = default.node_sound_stone_defaults(), @@ -125,42 +125,42 @@ minetest.register_node("default:marble_brick", { sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:essexit", { +minetest.register_node("default:essexite", { description = "Essexite", - tiles = {"default_essexit.png"}, + tiles = {"default_essexite.png"}, is_ground_content = true, groups = {cracky=1, stone=1, porous=1}, - drop = 'default:essexit', + drop = 'default:essexite', sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:essexit_block", { +minetest.register_node("default:essexite_block", { description = "Essexite Block", - tiles = {"default_essexit_block.png"}, + tiles = {"default_essexite_block.png"}, is_ground_content = false, groups = {cracky=2,}, sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:essexit_brick", { +minetest.register_node("default:essexite_brick", { description = "Essexite Brick", - tiles = {"default_essexit_brick.png"}, + tiles = {"default_essexite_brick.png"}, groups = {cracky=1, stone=1}, sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:desert_stone", { +minetest.register_node("default:stone_baked", { description = "Burned Stone", - tiles = {"default_desert_stone.png"}, + tiles = {"default_stone_baked.png"}, is_ground_content = true, groups = {cracky=3, stone=1, porous=1}, drop = "default:cobble_baked", sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:desert_stone_block", { +minetest.register_node("default:stone_block_baked", { description = "Burned Stone Block", - tiles = {"default_desert_stone_block.png"}, + tiles = {"default_stone_block_baked.png"}, is_ground_content = false, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), @@ -174,22 +174,22 @@ minetest.register_node("default:obsidianbrick", { }) -- floors -minetest.register_node("default:floor_chondrit_stone", { +minetest.register_node("default:floor_chondrite_stone", { description = "Chondrite/Stone Block", - tiles = {"default_floor_chondrit_stone.png"}, + tiles = {"default_floor_chondrite_stone.png"}, is_ground_content = false, groups = {cracky=3, stone=1}, sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:floor_chondrit_stone2", { +minetest.register_node("default:floor_chondrite_stone2", { description = "Chondrite/Stone Tile", tiles = { - "default_floor_chondrit_stone2.png", - "default_floor_chondrit_stone2.png", - "default_floor_chondrit_stone2.png", - "default_floor_chondrit_stone2.png", - "default_floor_chondrit_stone2.png^[transformFX", + "default_floor_chondrite_stone2.png", + "default_floor_chondrite_stone2.png", + "default_floor_chondrite_stone2.png", + "default_floor_chondrite_stone2.png", + "default_floor_chondrite_stone2.png^[transformFX", }, is_ground_content = false, groups = {cracky=3, stone=1}, @@ -252,45 +252,45 @@ minetest.register_node("default:floor_bstone_sandstone2", { sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:floor_marble_essexit", { +minetest.register_node("default:floor_marble_essexite", { description = "Marble/Essexite Tile", tiles = { - "default_floor_marble_essexit.png", - "default_floor_marble_essexit.png", - "default_floor_marble_essexit.png", - "default_floor_marble_essexit.png", - "default_floor_marble_essexit.png^[transformR90", + "default_floor_marble_essexite.png", + "default_floor_marble_essexite.png", + "default_floor_marble_essexite.png", + "default_floor_marble_essexite.png", + "default_floor_marble_essexite.png^[transformR90", }, is_ground_content = false, groups = {cracky=2, stone=1}, sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:floor_marble_essexit2", { +minetest.register_node("default:floor_marble_essexite2", { description = "Marble/Essexite Block", tiles = { - "default_floor_marble_essexit2.png", - "default_floor_marble_essexit2.png", - "default_floor_marble_essexit2.png", - "default_floor_marble_essexit2.png", - "default_floor_marble_essexit2.png^[transformR90", + "default_floor_marble_essexite2.png", + "default_floor_marble_essexite2.png", + "default_floor_marble_essexite2.png", + "default_floor_marble_essexite2.png", + "default_floor_marble_essexite2.png^[transformR90", }, is_ground_content = false, groups = {cracky=2, stone=1}, sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:floor_essexit_gold", { +minetest.register_node("default:floor_essexite_gold", { description = "Golden Essexite Block", - tiles = {"default_floor_essexit_gold.png"}, + tiles = {"default_floor_essexite_gold.png"}, is_ground_content = false, groups = {cracky=2, stone=1}, sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("default:floor_essexit_gold2", { +minetest.register_node("default:floor_essexite_gold2", { description = "Golden Essexite Tile", - tiles = {"default_floor_essexit_gold2.png"}, + tiles = {"default_floor_essexite_gold2.png"}, is_ground_content = false, groups = {cracky=2, stone=1}, sounds = default.node_sound_stone_defaults(), @@ -413,9 +413,9 @@ minetest.register_node("default:stonebrick", { }) -minetest.register_node("default:desert_stonebrick", { +minetest.register_node("default:stonebrick_baked", { description = "Burned Stone Brick", - tiles = {"default_desert_stone_brick.png"}, + tiles = {"default_stone_brick_baked.png"}, groups = {cracky=2, stone=1}, sounds = default.node_sound_stone_defaults(), }) @@ -476,25 +476,25 @@ minetest.register_abm({ }) -minetest.register_node("default:sand", { +minetest.register_node("default:ash", { description = "Volcanic Ash", - tiles = {"default_sand.png"}, + tiles = {"default_ash.png"}, is_ground_content = true, groups = {crumbly=3, falling_node=1, sand=1, porous=1}, sounds = default.node_sound_sand_defaults(), }) -minetest.register_node("default:sand_block", { +minetest.register_node("default:ash_block", { description = "Volcanic Ash Block", - tiles = {"default_sand_block.png"}, + tiles = {"default_ash_block.png"}, is_ground_content = false, groups = {crumbly=3}, sounds = default.node_sound_sand_defaults(), }) -minetest.register_node("default:desert_sand", { +minetest.register_node("default:fertile_sand", { description = "Fertile Sand", - tiles = {"default_desert_sand.png"}, + tiles = {"default_fertile_sand.png"}, is_ground_content = true, groups = {crumbly=3, falling_node=1, sand=1, porous=1}, sounds = default.node_sound_sand_defaults(), diff --git a/mods/default/textures/default_sand.png b/mods/default/textures/default_ash.png similarity index 100% rename from mods/default/textures/default_sand.png rename to mods/default/textures/default_ash.png diff --git a/mods/default/textures/default_sand_block.png b/mods/default/textures/default_ash_block.png similarity index 100% rename from mods/default/textures/default_sand_block.png rename to mods/default/textures/default_ash_block.png diff --git a/mods/default/textures/default_chondrit.png b/mods/default/textures/default_chondrite.png similarity index 100% rename from mods/default/textures/default_chondrit.png rename to mods/default/textures/default_chondrite.png diff --git a/mods/default/textures/default_chondrit_block.png b/mods/default/textures/default_chondrite_block.png similarity index 100% rename from mods/default/textures/default_chondrit_block.png rename to mods/default/textures/default_chondrite_block.png diff --git a/mods/default/textures/default_chondrit_brick.png b/mods/default/textures/default_chondrite_brick.png similarity index 100% rename from mods/default/textures/default_chondrit_brick.png rename to mods/default/textures/default_chondrite_brick.png diff --git a/mods/default/textures/default_essexit.png b/mods/default/textures/default_essexite.png similarity index 100% rename from mods/default/textures/default_essexit.png rename to mods/default/textures/default_essexite.png diff --git a/mods/default/textures/default_essexit_block.png b/mods/default/textures/default_essexite_block.png similarity index 100% rename from mods/default/textures/default_essexit_block.png rename to mods/default/textures/default_essexite_block.png diff --git a/mods/default/textures/default_essexit_brick.png b/mods/default/textures/default_essexite_brick.png similarity index 100% rename from mods/default/textures/default_essexit_brick.png rename to mods/default/textures/default_essexite_brick.png diff --git a/mods/default/textures/default_desert_sand.png b/mods/default/textures/default_fertile_sand.png similarity index 100% rename from mods/default/textures/default_desert_sand.png rename to mods/default/textures/default_fertile_sand.png diff --git a/mods/default/textures/default_floor_chondrit_stone.png b/mods/default/textures/default_floor_chondrite_stone.png similarity index 100% rename from mods/default/textures/default_floor_chondrit_stone.png rename to mods/default/textures/default_floor_chondrite_stone.png diff --git a/mods/default/textures/default_floor_chondrit_stone2.png b/mods/default/textures/default_floor_chondrite_stone2.png similarity index 100% rename from mods/default/textures/default_floor_chondrit_stone2.png rename to mods/default/textures/default_floor_chondrite_stone2.png diff --git a/mods/default/textures/default_floor_essexit_gold.png b/mods/default/textures/default_floor_essexite_gold.png similarity index 100% rename from mods/default/textures/default_floor_essexit_gold.png rename to mods/default/textures/default_floor_essexite_gold.png diff --git a/mods/default/textures/default_floor_essexit_gold2.png b/mods/default/textures/default_floor_essexite_gold2.png similarity index 100% rename from mods/default/textures/default_floor_essexit_gold2.png rename to mods/default/textures/default_floor_essexite_gold2.png diff --git a/mods/default/textures/default_floor_marble_essexit.png b/mods/default/textures/default_floor_marble_essexite.png similarity index 100% rename from mods/default/textures/default_floor_marble_essexit.png rename to mods/default/textures/default_floor_marble_essexite.png diff --git a/mods/default/textures/default_floor_marble_essexit2.png b/mods/default/textures/default_floor_marble_essexite2.png similarity index 100% rename from mods/default/textures/default_floor_marble_essexit2.png rename to mods/default/textures/default_floor_marble_essexite2.png diff --git a/mods/default/textures/default_desert_stone.png b/mods/default/textures/default_stone_baked.png similarity index 100% rename from mods/default/textures/default_desert_stone.png rename to mods/default/textures/default_stone_baked.png diff --git a/mods/default/textures/default_desert_stone_block.png b/mods/default/textures/default_stone_block_baked.png similarity index 100% rename from mods/default/textures/default_desert_stone_block.png rename to mods/default/textures/default_stone_block_baked.png diff --git a/mods/default/textures/default_desert_stone_brick.png b/mods/default/textures/default_stone_brick_baked.png similarity index 100% rename from mods/default/textures/default_desert_stone_brick.png rename to mods/default/textures/default_stone_brick_baked.png diff --git a/mods/farming_plus/paletree.lua b/mods/farming_plus/paletree.lua index d3d5f43..a32cd0e 100644 --- a/mods/farming_plus/paletree.lua +++ b/mods/farming_plus/paletree.lua @@ -53,7 +53,7 @@ minetest.register_abm({ interval = 60, chance = 20, action = function(pos, node) - farming:generate_paletree(pos, "default:paletree", "farming_plus:pale_leaves", {"default:dirt", "default:dirt_with_grass", "default:sand", "default:desert_sand"}) + farming:generate_paletree(pos, "default:paletree", "farming_plus:pale_leaves", {"default:dirt", "default:dirt_with_grass", "default:ash", "default:fertile_sand"}) end }) diff --git a/mods/flowers/init.lua b/mods/flowers/init.lua index 39a8187..8b3c617 100644 --- a/mods/flowers/init.lua +++ b/mods/flowers/init.lua @@ -123,14 +123,14 @@ minetest.register_node("flowers:viola", { minetest.register_abm({ nodenames = {"group:flora"}, - neighbors = {"default:dirt_with_grass", "default:desert_sand"}, + neighbors = {"default:dirt_with_grass", "default:fertile_sand"}, interval = 50, chance = 30, action = function(pos, node) pos.y = pos.y - 1 local under = minetest.get_node(pos) pos.y = pos.y + 1 - if under.name == "default:desert_sand" then + if under.name == "default:fertile_sand" then minetest.set_node(pos, {name="default:dry_shrub"}) elseif under.name ~= "default:dirt_with_grass" then return diff --git a/mods/glowcrystals/init.lua b/mods/glowcrystals/init.lua index 815b700..099e81a 100644 --- a/mods/glowcrystals/init.lua +++ b/mods/glowcrystals/init.lua @@ -12,7 +12,7 @@ Details: Adds several items for lighting, made out of glowing crystals - a bette minetest.register_node( "glowcrystals:glowcrystal_ore", { description = "Glowing Crystal Ore", - tiles = { "default_essexit.png^glowcrystals_ore_glowcrystal.png" }, + tiles = { "default_essexite.png^glowcrystals_ore_glowcrystal.png" }, is_ground_content = true, paramtype = "light", sunlight_propagates = true, @@ -163,7 +163,7 @@ minetest.register_craft({ minetest.register_ore({ ore_type = "scatter", ore = "glowcrystals:glowcrystal_ore", - wherein = "default:essexit", + wherein = "default:essexite", clust_scarcity = 9*9*9, clust_num_ores = 4, clust_size = 3, @@ -174,7 +174,7 @@ minetest.register_ore({ minetest.register_ore({ ore_type = "scatter", ore = "glowcrystals:glowcrystal_ore", - wherein = "default:essexit", + wherein = "default:essexite", clust_scarcity = 24*24*24, clust_num_ores = 27, clust_size = 6, diff --git a/mods/gluncarp/carpets.lua b/mods/gluncarp/carpets.lua index 8fdad47..1835888 100644 --- a/mods/gluncarp/carpets.lua +++ b/mods/gluncarp/carpets.lua @@ -27,8 +27,8 @@ local carpetdesc = carpet_tab[i][2] {"cobble", "Cobblestone", "default_cobble", "default:cobble"}, {"stonebrick", "Stone Brick", "default_stone_brick", "default:stonebrick"}, {"mossycobble", "Mossy Cobblestone", "default_mossycobble", "default:mossycobble"}, - {"desert_stone", "Desert Stone", "default_desert_stone", "default:desert_stone"}, - {"desert_stonebrick", "Desert Stone Brick", "default_desert_stone_brick", "default:desert_stonebrick"}, + {"stone_baked", "Burned Stone", "default_stone_baked", "default:stone_baked"}, + {"stonebrick_baked", "Burned Stone Brick", "default_stone_brick_baked", "default:stonebrick_baked"}, {"sandstone", "Sandstone", "default_sandstone", "default:sandstone"}, {"sandstonebrick", "Sandstone Brick", "default_sandstone_brick", "default:sandstonebrick"}, {"obsidian", "Obsidian", "default_obsidian", "default:obsidian"}, @@ -84,24 +84,24 @@ local carpetdesc = carpet_tab[i][2] -- more stones {"marble_brick", "Marble Brick", "default_marble_brick", "default:marble_brick"}, {"marble", "Marble", "default_marble", "default:marble"}, - {"chondrit_brick", "Chondrite Brick", "default_chondrit_brick", "default:chondrit_brick"}, - {"chondrit", "Chondrite", "default_chondrit", "default:chondrit"}, + {"chondrite_brick", "Chondrite Brick", "default_chondrite_brick", "default:chondrite_brick"}, + {"chondrite", "Chondrite", "default_chondrite", "default:chondrite"}, {"tuff_brick", "Tuff Brick", "default_tuff_brick", "default:tuff_brick"}, {"tuff", "Tuff", "default_tuff", "default:tuff"}, {"tuff_baked_brick", "Burned Tuff Brick", "default_tuff_baked_brick", "default:tuff_baked_brick"}, {"tuff_baked", "Burned Tuff", "default_tuff_baked", "default:tuff_baked"}, - {"essexit_brick", "Essexite Brick", "default_essexit_brick", "default:essexit_brick"}, - {"essexit", "Essexite", "default_essexit", "default:essexit"}, - {"floor_essexit_gold2", "Golden Essexite Tile", "default_floor_essexit_gold2", "default:floor_essexit_gold2"}, - {"floor_essexit_gold", "Golden Essexite Block", "default_floor_essexit_gold", "default:floor_essexit_gold"}, - {"floor_marble_essexit2", "Marble/Essexite Tile", "default_floor_marble_essexit2", "default:floor_marble_essexit2"}, - {"floor_marble_essexit", "Marble/Essexite Block", "default_floor_marble_essexit", "default:floor_marble_essexit"}, + {"essexite_brick", "Essexite Brick", "default_essexite_brick", "default:essexite_brick"}, + {"essexite", "Essexite", "default_essexite", "default:essexite"}, + {"floor_essexite_gold2", "Golden Essexite Tile", "default_floor_essexite_gold2", "default:floor_essexite_gold2"}, + {"floor_essexite_gold", "Golden Essexite Block", "default_floor_essexite_gold", "default:floor_essexite_gold"}, + {"floor_marble_essexite2", "Marble/Essexite Tile", "default_floor_marble_essexite2", "default:floor_marble_essexite2"}, + {"floor_marble_essexite", "Marble/Essexite Block", "default_floor_marble_essexite", "default:floor_marble_essexite"}, {"floor_bstone_sandstone2", "Burned Stone/Sandstone Tile", "default_floor_bstone_sandstone2", "default:floor_bstone_sandstone2"}, {"floor_bstone_sandstone", "Burned Stone/Sandstone Block", "default_floor_bstone_sandstone", "default:floor_bstone_sandstone"}, {"floor_btuff_tuff", "Burned Tuff/Tuff Tile", "default_floor_btuff_tuff", "default:floor_btuff_tuff"}, {"floor_bstone_stone", "Burned Stone/Stone Tile", "default_floor_bstone_stone", "default:floor_bstone_stone"}, - {"floor_chondrit_stone2", "Chondrite/Stone Tile", "default_floor_chondrit_stone2", "default:floor_chondrit_stone2"}, - {"floor_chondrit_stone", "Chondrite/Stone Block", "default_floor_chondrit_stone", "default:floor_chondrit_stone"}, + {"floor_chondrite_stone2", "Chondrite/Stone Tile", "default_floor_chondrite_stone2", "default:floor_chondrite_stone2"}, + {"floor_chondrite_stone", "Chondrite/Stone Block", "default_floor_chondrite_stone", "default:floor_chondrite_stone"}, } @@ -144,14 +144,14 @@ minetest.register_node("gluncarp:"..carpetname, { elseif nodeu == "default:mossycobble" then minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_mossycobble"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:desert_stone" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_desert_stone"}) + elseif nodeu == "default:stone_baked" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_stone_baked"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:desert_cobble" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_desert_cobble"}) + elseif nodeu == "default:cobble_baked" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_cobble_baked"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:desert_stonebrick" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_desert_stonebrick"}) + elseif nodeu == "default:stonebrick_baked" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_stonebrick_baked"}) minetest.set_node(pos,{name = "air"}) elseif nodeu == "default:sandstone" then minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_sandstone"}) @@ -309,11 +309,11 @@ minetest.register_node("gluncarp:"..carpetname, { elseif nodeu == "default:marble" then minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_marble"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:chondrit_brick" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_chondrit_brick"}) + elseif nodeu == "default:chondrite_brick" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_chondrite_brick"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:chondrit" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_chondrit"}) + elseif nodeu == "default:chondrite" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_chondrite"}) minetest.set_node(pos,{name = "air"}) elseif nodeu == "default:tuff_brick" then minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_tuff_brick"}) @@ -327,23 +327,23 @@ minetest.register_node("gluncarp:"..carpetname, { elseif nodeu == "default:tuff_baked" then minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_tuff_baked"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:essexit_brick" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_essexit_brick"}) + elseif nodeu == "default:essexite_brick" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_essexite_brick"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:essexit" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_essexit"}) + elseif nodeu == "default:essexite" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_essexite"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:floor_essexit_gold2" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_essexit_gold2"}) + elseif nodeu == "default:floor_essexite_gold2" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_essexite_gold2"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:floor_essexit_gold" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_essexit_gold"}) + elseif nodeu == "default:floor_essexite_gold" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_essexite_gold"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:floor_marble_essexit2" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_marble_essexit2"}) + elseif nodeu == "default:floor_marble_essexite2" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_marble_essexite2"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:floor_marble_essexit" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_marble_essexit"}) + elseif nodeu == "default:floor_marble_essexite" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_marble_essexite"}) minetest.set_node(pos,{name = "air"}) elseif nodeu == "default:floor_bstone_sandstone2" then minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_bstone_sandstone2"}) @@ -357,11 +357,11 @@ minetest.register_node("gluncarp:"..carpetname, { elseif nodeu == "default:floor_bstone_stone" then minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_bstone_stone"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:floor_chondrit_stone2" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_chondrit_stone2"}) + elseif nodeu == "default:floor_chondrite_stone2" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_chondrite_stone2"}) minetest.set_node(pos,{name = "air"}) - elseif nodeu == "default:floor_chondrit_stone" then - minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_chondrit_stone"}) + elseif nodeu == "default:floor_chondrite_stone" then + minetest.set_node({x=pos.x, y=pos.y-1, z=pos.z},{name = "gluncarp:"..carpetname.."_on_floor_chondrite_stone"}) minetest.set_node(pos,{name = "air"}) else return @@ -394,12 +394,12 @@ minetest.register_node("gluncarp:"..carpetname.."_on_"..mat, { minetest.set_node(pos,{name = "default:stonebrick"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_mossycobble" then minetest.set_node(pos,{name = "default:mossycobble"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_desert_stone" then - minetest.set_node(pos,{name = "default:desert_stone"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_desert_cobble" then - minetest.set_node(pos,{name = "default:desert_cobble"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_desert_stonebrick" then - minetest.set_node(pos,{name = "default:desert_stonebrick"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_stone_baked" then + minetest.set_node(pos,{name = "default:stone_baked"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_cobble_baked" then + minetest.set_node(pos,{name = "default:cobble_baked"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_stonebrick_baked" then + minetest.set_node(pos,{name = "default:stonebrick_baked"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_sandstone" then minetest.set_node(pos,{name = "default:sandstone"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_sandstonebrick" then @@ -504,10 +504,10 @@ minetest.register_node("gluncarp:"..carpetname.."_on_"..mat, { minetest.set_node(pos,{name = "default:marble_brick"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_marble" then minetest.set_node(pos,{name = "default:marble"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_chondrit_brick" then - minetest.set_node(pos,{name = "default:chondrit_brick"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_chondrit" then - minetest.set_node(pos,{name = "default:chondrit"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_chondrite_brick" then + minetest.set_node(pos,{name = "default:chondrite_brick"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_chondrite" then + minetest.set_node(pos,{name = "default:chondrite"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_tuff_brick" then minetest.set_node(pos,{name = "default:tuff_brick"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_tuff" then @@ -516,18 +516,18 @@ minetest.register_node("gluncarp:"..carpetname.."_on_"..mat, { minetest.set_node(pos,{name = "default:tuff_baked_brick"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_tuff_baked" then minetest.set_node(pos,{name = "default:tuff_baked"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_essexit_brick" then - minetest.set_node(pos,{name = "default:essexit_brick"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_essexit" then - minetest.set_node(pos,{name = "default:essexit"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_essexit_gold2" then - minetest.set_node(pos,{name = "default:floor_essexit_gold2"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_essexit_gold" then - minetest.set_node(pos,{name = "default:floor_essexit_gold"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_marble_essexit2" then - minetest.set_node(pos,{name = "default:floor_marble_essexit2"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_marble_essexit" then - minetest.set_node(pos,{name = "default:floor_marble_essexit"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_essexite_brick" then + minetest.set_node(pos,{name = "default:essexite_brick"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_essexite" then + minetest.set_node(pos,{name = "default:essexite"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_essexite_gold2" then + minetest.set_node(pos,{name = "default:floor_essexite_gold2"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_essexite_gold" then + minetest.set_node(pos,{name = "default:floor_essexite_gold"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_marble_essexite2" then + minetest.set_node(pos,{name = "default:floor_marble_essexite2"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_marble_essexite" then + minetest.set_node(pos,{name = "default:floor_marble_essexite"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_bstone_sandstone2" then minetest.set_node(pos,{name = "default:floor_bstone_sandstone2"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_bstone_sandstone" then @@ -536,10 +536,10 @@ minetest.register_node("gluncarp:"..carpetname.."_on_"..mat, { minetest.set_node(pos,{name = "default:floor_btuff_tuff"}) elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_bstone_stone" then minetest.set_node(pos,{name = "default:floor_bstone_stone"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_chondrit_stone2" then - minetest.set_node(pos,{name = "default:floor_chondrit_stone2"}) - elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_chondrit_stone" then - minetest.set_node(pos,{name = "default:floor_chondrit_stone"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_chondrite_stone2" then + minetest.set_node(pos,{name = "default:floor_chondrite_stone2"}) + elseif oldnode.name == "gluncarp:"..carpetname.."_on_floor_chondrite_stone" then + minetest.set_node(pos,{name = "default:floor_chondrite_stone"}) else return end diff --git a/mods/highlandpools/init.lua b/mods/highlandpools/init.lua index 2ca2a9c..81c3468 100644 --- a/mods/highlandpools/init.lua +++ b/mods/highlandpools/init.lua @@ -35,7 +35,7 @@ minetest.register_on_generated(function(minp, maxp, seed) local c_air = minetest.get_content_id("air") local c_ignore = minetest.get_content_id("ignore") local c_lava = minetest.get_content_id("default:lava_source") - local c_sand = minetest.get_content_id("default:sand") + local c_ash = minetest.get_content_id("default:ash") local c_vgravel = minetest.get_content_id("default:gravel_volcanic") @@ -49,7 +49,7 @@ minetest.register_on_generated(function(minp, maxp, seed) break elseif c_node == c_lava then break - elseif c_node == c_sand then + elseif c_node == c_ash then yasurf = y + 1 break end @@ -154,7 +154,7 @@ minetest.register_on_generated(function(minp, maxp, seed) local viu = area:index(x, y, z) if data[viu] == c_air then data[viu] = c_lava - elseif data[viu] == c_sand then + elseif data[viu] == c_ash then data[viu] = c_vgravel break else diff --git a/mods/mesecons/mesecons_materials/init.lua b/mods/mesecons/mesecons_materials/init.lua index 357c801..b6ca348 100644 --- a/mods/mesecons/mesecons_materials/init.lua +++ b/mods/mesecons/mesecons_materials/init.lua @@ -56,7 +56,7 @@ minetest.register_craftitem("mesecons_materials:silicon", { minetest.register_craft({ output = "mesecons_materials:silicon 4", recipe = { - {"default:desert_sand", "default:desert_sand"}, - {"default:desert_sand", "default:steel_ingot"}, + {"default:fertile_sand", "default:fertile_sand"}, + {"default:fertile_sand", "default:steel_ingot"}, } }) diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index 52b964e..df1d1e4 100644 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -90,7 +90,7 @@ local node_permanent_flame = "fire:permanent_flame" local node_ice = "default:stone" local node_snowblock = "default:stone" local node_snow = "default:stone" -mobs.fallback_node = minetest.registered_aliases["mapgen_sand"] or "default:sand" +mobs.fallback_node = minetest.registered_aliases["mapgen_sand"] or "default:ash" -- play sound diff --git a/mods/mobs_hades/README.txt b/mods/mobs_hades/README.txt index e1c9785..5dcd2b8 100644 --- a/mods/mobs_hades/README.txt +++ b/mods/mobs_hades/README.txt @@ -31,4 +31,4 @@ Changelog: 0.4 - Dungeon Masters and Mese Monsters have much better aim due to shoot_offset, also they can both shoot through nodes that aren't walkable (flowers, grass etc) plus new sheep sound :) 0.3 - Added LOTT's Spider mob, made Cobwebs, added KPavel's Bee with Honey and Beehives (made texture), Warthogs now have sound and can be tamed, taming of shaved sheep or milked cow with 8 wheat so it will not despawn, many bug fixes :) 0.2 - Cooking bucket of milk into cheese now returns empty bucket -0.1 - Initial Release \ No newline at end of file +0.1 - Initial Release diff --git a/mods/mobs_hades/mutant.lua b/mods/mobs_hades/mutant.lua index b9b3673..ac73eb4 100644 --- a/mods/mobs_hades/mutant.lua +++ b/mods/mobs_hades/mutant.lua @@ -24,7 +24,7 @@ mobs:register_mob("mobs_hades:mutant", { run_velocity = 4, damage = 1, drops = { - {name = "default:sand", + {name = "default:ash", chance = 2, min = 3, max = 5,}, @@ -68,7 +68,7 @@ mobs:register_mob("mobs_hades:mutant", { blood_texture = "mobs_blood.png", floats = 1, }) -mobs:register_spawn("mobs_hades:mutant", {"default:sand"}, minetest.LIGHT_MAX, 0, 16000, 1, 31000) -mobs:register_spawn("mobs_hades:mutant", {"default:sand"}, 5, 0, 6000, 3, 31000) +mobs:register_spawn("mobs_hades:mutant", {"default:ash"}, minetest.LIGHT_MAX, 0, 16000, 1, 31000) +mobs:register_spawn("mobs_hades:mutant", {"default:ash"}, 5, 0, 6000, 3, 31000) -mobs:register_egg("mobs_hades:mutant", "Mutant Spawn Egg", "default_sand.png", 1, false) +mobs:register_egg("mobs_hades:mutant", "Mutant Spawn Egg", "default_ash.png", 1, false) diff --git a/mods/mobs_hades/stone_monster.lua b/mods/mobs_hades/stone_monster.lua index 86274b5..fb10363 100644 --- a/mods/mobs_hades/stone_monster.lua +++ b/mods/mobs_hades/stone_monster.lua @@ -25,7 +25,7 @@ local stone_monster = { chance = 2, min = 3, max = 5,}, - {name = "default:chondrit", + {name = "default:chondrite", chance=3, min=1, max=2,}, @@ -72,8 +72,8 @@ deep_stone_monster.view_range = 20 mobs:register_mob("mobs_hades:deep_stone_monster", deep_stone_monster) -mobs:spawn_specific("mobs_hades:deep_stone_monster", {"default:stone", "default:mossystone", "default:chondrit", "default:essexit"}, "air", 0, 3, 90, 7000, 1, -5000, -2500) -mobs:spawn_specific("mobs_hades:deep_stone_monster", {"default:stone", "default:mossystone", "default:chondrit", "default:essexit"}, "air", 0, 3, 90, 7000, 1, -30000, -5000) +mobs:spawn_specific("mobs_hades:deep_stone_monster", {"default:stone", "default:mossystone", "default:chondrite", "default:essexite"}, "air", 0, 3, 90, 7000, 1, -5000, -2500) +mobs:spawn_specific("mobs_hades:deep_stone_monster", {"default:stone", "default:mossystone", "default:chondrite", "default:essexite"}, "air", 0, 3, 90, 7000, 1, -30000, -5000) mobs:register_egg("mobs_hades:stone_monster", "Stone Monster Spawn Egg", "default_stone.png", 1, false) mobs:register_egg("mobs_hades:deep_stone_monster", "Deep Stone Monster Spawn Egg", "default_stone.png^[colorize:#000000:127", 1, false) diff --git a/mods/pipeworks/crafts.lua b/mods/pipeworks/crafts.lua index de9f8f3..805c59e 100644 --- a/mods/pipeworks/crafts.lua +++ b/mods/pipeworks/crafts.lua @@ -201,7 +201,7 @@ minetest.register_craft( { output = "pipeworks:teleport_tube_1 2", recipe = { { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "default:desert_stone", "travelnet:teleporter_device", "default:desert_stone" }, + { "default:stone_baked", "travelnet:teleporter_device", "default:stone_baked" }, { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } }, }) @@ -210,7 +210,7 @@ minetest.register_craft( { output = "pipeworks:sand_tube_1 2", recipe = { { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "default:sand", "default:sand", "default:sand" }, + { "default:ash", "default:ash", "default:ash" }, { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } }, }) @@ -219,7 +219,7 @@ minetest.register_craft( { output = "pipeworks:sand_tube_1 2", recipe = { { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "default:desert_sand", "default:desert_sand", "default:desert_sand" }, + { "default:fertile_sand", "default:fertile_sand", "default:fertile_sand" }, { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } }, }) @@ -227,7 +227,7 @@ minetest.register_craft( { minetest.register_craft( { output = "pipeworks:sand_tube_1", recipe = { - { "default:desert_sand", "pipeworks:tube_1", "default:desert_sand" }, + { "default:fertile_sand", "pipeworks:tube_1", "default:fertile_sand" }, }, }) @@ -235,7 +235,7 @@ minetest.register_craft( { output = "pipeworks:mese_sand_tube_1 2", recipe = { { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "default:sand", "default:mese_crystal", "default:sand" }, + { "default:ash", "default:mese_crystal", "default:ash" }, { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } }, }) @@ -244,7 +244,7 @@ minetest.register_craft( { output = "pipeworks:mese_sand_tube_1 2", recipe = { { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "default:desert_sand", "default:mese_crystal", "default:desert_sand" }, + { "default:fertile_sand", "default:mese_crystal", "default:fertile_sand" }, { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } }, }) diff --git a/mods/plantlife/API.txt b/mods/plantlife/API.txt index b813640..4e698f9 100644 --- a/mods/plantlife/API.txt +++ b/mods/plantlife/API.txt @@ -46,7 +46,7 @@ sradius: Don't spawn within this many nodes of the avoid items schance: The value passed to the ABM's chance parameter, normally in the 10-100 range (1-in-X chance of operating on a given node) ssurface: String with the name of the node on which to spawn the plant - in question, such as "default:sand" or + in question, such as "default:ash" or "default:dirt_with_grass". It is not recommended to put air, stone, or plain dirt here if you can use some other node, as doing so will cause the engine to process potentially large diff --git a/mods/plantlife/flowers_plus/init.lua b/mods/plantlife/flowers_plus/init.lua index 9585c43..9c53fc3 100644 --- a/mods/plantlife/flowers_plus/init.lua +++ b/mods/plantlife/flowers_plus/init.lua @@ -364,7 +364,7 @@ plantslib:register_generate_plant({ --rarity = seaweed_rarity, -- min_elevation = 1, --max_elevation = 100, - --near_nodes = {"default:sand"}, + --near_nodes = {"default:ash"}, --near_nodes_size = 1, --near_nodes_vertical = 0, --near_nodes_count = 3, @@ -375,7 +375,7 @@ plantslib:register_generate_plant({ --"flowers_plus.grow_seaweed" --) --plantslib:register_generate_plant({ - --surface = {"default:sand"}, + --surface = {"default:ash"}, --max_count = seaweed_max_count*2, --rarity = seaweed_rarity/2, -- min_elevation = 1, diff --git a/mods/plantlife/plants_lib/init.lua b/mods/plantlife/plants_lib/init.lua index c21bb9c..b11f0af 100644 --- a/mods/plantlife/plants_lib/init.lua +++ b/mods/plantlife/plants_lib/init.lua @@ -333,7 +333,7 @@ function plantslib:spawn_on_surfaces(sd,sp,sr,sc,ss,sa) else local currentsurface = minetest.get_node(pos).name if currentsurface ~= "default:water_source" - or (currentsurface == "default:water_source" and table.getn(minetest.find_nodes_in_area({x=pos.x, y=pos.y-biome.depth_max-1, z=pos.z}, {x=pos.x, y=pos.y, z=pos.z}, {"default:dirt", "default:dirt_with_grass", "default:sand"})) > 0 ) + or (currentsurface == "default:water_source" and table.getn(minetest.find_nodes_in_area({x=pos.x, y=pos.y-biome.depth_max-1, z=pos.z}, {x=pos.x, y=pos.y, z=pos.z}, {"default:dirt", "default:dirt_with_grass", "default:ash"})) > 0 ) then local rnd = math.random(1, biome.spawn_plants_count) local plant_to_spawn = biome.spawn_plants[rnd] diff --git a/mods/staffgaia/init.lua b/mods/staffgaia/init.lua index c69649c..372ccb6 100644 --- a/mods/staffgaia/init.lua +++ b/mods/staffgaia/init.lua @@ -3,7 +3,7 @@ staffgaia = {} local conv = function(pos) local nodename = minetest.get_node(pos).name - if nodename == "default:sand" or nodename == "default:desert_sand" or nodename == "default:desert_stone" or nodename == "default:stone" or nodename == "default:cobble" or nodename == "default:mossystone" or nodename == "default:tuff" or nodename == "default:tuff_baked" or nodename == "default:mossytuff" or nodename == "default:mossycobble" then + if nodename == "default:ash" or nodename == "default:fertile_sand" or nodename == "default:stone_baked" or nodename == "default:stone" or nodename == "default:cobble" or nodename == "default:mossystone" or nodename == "default:tuff" or nodename == "default:tuff_baked" or nodename == "default:mossytuff" or nodename == "default:mossycobble" then -- minetest.remove_node(pos) minetest.set_node(pos, {name="default:dirt"}) minetest.check_for_falling(pos) diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index cd85aaa..a2a8e6b 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -555,18 +555,18 @@ stairs.register_stair_and_slab("stone", "default:stone", "Stone Slab", default.node_sound_stone_defaults()) -stairs.register_stair_and_slab("desert_stonebrick", "default:desert_stonebrick", +stairs.register_stair_and_slab("stonebrick_baked", "default:stonebrick_baked", {cracky=3}, - {"default_desert_stone_brick.png"}, + {"default_stone_brick_baked.png"}, "Burned Stone Brick Stair", "Outer Burned Stone Brick Stair", "Inner Burned Stone Brick Stair", "Burned Stone Brick Slab", default.node_sound_stone_defaults()) -stairs.register_stair_and_slab("desert_stone", "default:desert_stone", +stairs.register_stair_and_slab("stone_baked", "default:stone_baked", {cracky=3}, - {"default_desert_stone.png"}, + {"default_stone_baked.png"}, "Burned Stone Stair", "Outer Burned Stone Stair", "Inner Burned Stone Stair", @@ -774,18 +774,18 @@ stairs.register_stair_and_slab("stonebrick", "default:stonebrick", "Stone Brick Slab", default.node_sound_stone_defaults()) -stairs.register_stair_and_slab("chondrit_brick", "default:chondrit_brick", +stairs.register_stair_and_slab("chondrite_brick", "default:chondrite_brick", {cracky=2}, - {"default_chondrit_brick.png"}, + {"default_chondrite_brick.png"}, "Chondrite Brick Stair", "Outer Chondrite Brick Stair", "Inner Chondrite Brick Stair", "Chondrite Brick Slab", default.node_sound_stone_defaults()) -stairs.register_stair_and_slab("chondrit", "default:chondrit", +stairs.register_stair_and_slab("chondrite", "default:chondrite", {cracky=2}, - {"default_chondrit.png"}, + {"default_chondrite.png"}, "Chondrite Stair", "Outer Chondrite Stair", "Inner Chondrite Stair", @@ -846,18 +846,18 @@ stairs.register_stair_and_slab("tuff_baked", "default:tuff_baked", "Burned Tuff Slab", default.node_sound_stone_defaults()) -stairs.register_stair_and_slab("essexit_brick", "default:essexit_brick", +stairs.register_stair_and_slab("essexite_brick", "default:essexite_brick", {cracky=1}, - {"default_essexit_brick.png"}, + {"default_essexite_brick.png"}, "Essexite Brick Stair", "Outer Essexite Brick Stair", "Inner Essexite Brick Stair", "Essexite Brick Slab", default.node_sound_stone_defaults()) -stairs.register_stair_and_slab("essexit", "default:essexit", +stairs.register_stair_and_slab("essexite", "default:essexite", {cracky=1}, - {"default_essexit.png"}, + {"default_essexite.png"}, "Essexite Stair", "Outer Essexite Stair", "Inner Essexite Stair", -- 2.11.4.GIT