diff --git a/mods/craftguide/init.lua b/mods/craftguide/init.lua index b39465f..3010d58 100644 --- a/mods/craftguide/init.lua +++ b/mods/craftguide/init.lua @@ -20,7 +20,7 @@ local group_stereotypes = { dye = "dye:white", vessel = "vessels:glass_bottle", coal = "hades_core:coal_lump", - flower = "flowers:dandelion_yellow", + flower = "hades_flowers:yellow", window_wood = "windows:windows_wood", chest = "hades_chests:chest", unlocked_chest = "hades_chests:chest", diff --git a/mods/dye/init.lua b/mods/dye/init.lua index 31d0bb3..e3bcb40 100644 --- a/mods/dye/init.lua +++ b/mods/dye/init.lua @@ -135,32 +135,32 @@ end minetest.register_craft({ type = "shapeless", output = "dye:blue 4", - recipe = {"flowers:geranium"}, + recipe = {"hades_flowers:blue"}, }) minetest.register_craft({ type = "shapeless", output = "dye:white 4", - recipe = {"flowers:dandelion_white"}, + recipe = {"hades_flowers:white"}, }) minetest.register_craft({ type = "shapeless", output = "dye:red 4", - recipe = {"flowers:rose"}, + recipe = {"hades_flowers:red"}, }) minetest.register_craft({ type = "shapeless", output = "dye:violet 4", - recipe = {"flowers:viola"}, + recipe = {"hades_flowers:violet"}, }) minetest.register_craft({ type = "shapeless", output = "dye:orange 4", - recipe = {"flowers:tulip"}, + recipe = {"hades_flowers:orange"}, }) minetest.register_craft({ type = "shapeless", output = "dye:yellow 4", - recipe = {"flowers:dandelion_yellow"}, + recipe = {"hades_flowers:yellow"}, }) minetest.register_craft({ diff --git a/mods/farming/init.lua b/mods/farming/init.lua index c226674..230f953 100644 --- a/mods/farming/init.lua +++ b/mods/farming/init.lua @@ -164,8 +164,8 @@ minetest.register_craftitem("farming:spice", { minetest.register_craft({ output = 'farming:flowergrass', recipe = { - {'flowers:dandelion_white', 'flowers:dandelion_yellow', 'flowers:geranium'}, - {'flowers:rose', 'flowers:tulip', 'flowers:viola'}, + {'hades_flowers:dandelion_white', 'hades_flowers:dandelion_yellow', 'hades_flowers:geranium'}, + {'hades_flowers:rose', 'hades_flowers:tulip', 'hades_flowers:viola'}, {'hades_core:grass_1', 'hades_core:dirt', 'hades_core:grass_1'}, } }) diff --git a/mods/flowerpots/mod.conf b/mods/flowerpots/mod.conf index d720464..3e5e755 100644 --- a/mods/flowerpots/mod.conf +++ b/mods/flowerpots/mod.conf @@ -1,2 +1,2 @@ name = flowerpots -depends = hades_sounds, hades_core, hades_trees, flowers +depends = hades_sounds, hades_core, hades_trees, hades_flowers diff --git a/mods/flowerpots/nodes.lua b/mods/flowerpots/nodes.lua index f2556d5..06fe91a 100644 --- a/mods/flowerpots/nodes.lua +++ b/mods/flowerpots/nodes.lua @@ -1,12 +1,12 @@ local S = minetest.get_translator("flowerpots") local flowers = { - {"rose", "flowers:rose", S("Red Flower")}, - {"tulip", "flowers:tulip", S("Orange Flower")}, - {"geranium", "flowers:geranium", S("Blue Flower")}, - {"viola", "flowers:viola", S("Violet Flower")}, - {"dandelion_yellow", "flowers:dandelion_yellow", S("Yellow Flower")}, - {"dandelion_white", "flowers:dandelion_white", S("White Flower")}, + {"red", "hades_flowers:red", S("Red Flower")}, + {"orange", "hades_flowers:orange", S("Orange Flower")}, + {"blue", "hades_flowers:blue", S("Blue Flower")}, + {"violet", "hades_flowers:violet", S("Violet Flower")}, + {"yellow", "hades_flowers:yellow", S("Yellow Flower")}, + {"white", "hades_flowers:white", S("White Flower")}, -- TODO: Maybe add these later? -- {"grass", "hades_core:grass_1", S("Grass")}, @@ -172,9 +172,9 @@ end minetest.register_alias("flowers:flower_pot", "flowerpots:flower_pot") -minetest.register_alias("flowers:potted_rose", "flowerpots:flower_pot_rose") -minetest.register_alias("flowers:potted_dandelion_yellow", "flowerpots:flower_pot_dandelion_yellow") -minetest.register_alias("flowers:potted_dandelion_white", "flowerpots:flower_pot_dandelion_white") -minetest.register_alias("flowers:potted_viola", "flowerpots:flower_pot_viola") -minetest.register_alias("flowers:potted_geranium", "flowerpots:flower_pot_geranium") -minetest.register_alias("flowers:potted_tulip", "flowerpots:flower_pot_tulip") +minetest.register_alias("flowers:potted_rose", "flowerpots:flower_pot_red") +minetest.register_alias("flowers:potted_dandelion_yellow", "flowerpots:flower_pot_yellow") +minetest.register_alias("flowers:potted_dandelion_white", "flowerpots:flower_pot_white") +minetest.register_alias("flowers:potted_viola", "flowerpots:flower_pot_violet") +minetest.register_alias("flowers:potted_geranium", "flowerpots:flower_pot_blue") +minetest.register_alias("flowers:potted_tulip", "flowerpots:flower_pot_orange") diff --git a/mods/hades_bushes/init.lua b/mods/hades_bushes/init.lua index d7ca8a7..255bf70 100644 --- a/mods/hades_bushes/init.lua +++ b/mods/hades_bushes/init.lua @@ -53,7 +53,7 @@ minetest.register_node("hades_bushes:white", { minetest.register_craft({ output = 'hades_bushes:white', recipe = { - {'flowers:dandelion_white', '', ''}, + {'hades_flowers:white', '', ''}, {'hades_bushes:green', '', ''}, {'hades_core:dirt', '', ''}, } @@ -81,7 +81,7 @@ minetest.register_node("hades_bushes:yellow", { minetest.register_craft({ output = 'hades_bushes:yellow', recipe = { - {'flowers:dandelion_yellow', '', ''}, + {'hades_flowers:yellow', '', ''}, {'hades_bushes:green', '', ''}, {'hades_core:dirt', '', ''}, } @@ -109,7 +109,7 @@ minetest.register_node("hades_bushes:blue", { minetest.register_craft({ output = 'hades_bushes:blue', recipe = { - {'flowers:geranium', '', ''}, + {'hades_flowers:blue', '', ''}, {'hades_bushes:green', '', ''}, {'hades_core:dirt', '', ''}, } @@ -137,7 +137,7 @@ minetest.register_node("hades_bushes:red", { minetest.register_craft({ output = 'hades_bushes:red', recipe = { - {'flowers:rose', '', ''}, + {'hades_flowers:red', '', ''}, {'hades_bushes:green', '', ''}, {'hades_core:dirt', '', ''}, } @@ -165,7 +165,7 @@ minetest.register_node("hades_bushes:orange", { minetest.register_craft({ output = 'hades_bushes:orange', recipe = { - {'flowers:tulip', '', ''}, + {'hades_flowers:orange', '', ''}, {'hades_bushes:green', '', ''}, {'hades_core:dirt', '', ''}, } @@ -194,7 +194,7 @@ minetest.register_node("hades_bushes:violet", { minetest.register_craft({ output = 'hades_bushes:violet', recipe = { - {'flowers:viola', '', ''}, + {'hades_flowers:violet', '', ''}, {'hades_bushes:green', '', ''}, {'hades_core:dirt', '', ''}, } diff --git a/mods/hades_bushes/mod.conf b/mods/hades_bushes/mod.conf index c83cc8e..c439897 100644 --- a/mods/hades_bushes/mod.conf +++ b/mods/hades_bushes/mod.conf @@ -1,2 +1,2 @@ name = hades_bushes -depends = hades_sounds, hades_core, flowers +depends = hades_sounds, hades_core, hades_flowers diff --git a/mods/hades_fertilizer/init.lua b/mods/hades_fertilizer/init.lua index f15fb39..a4dcbf9 100644 --- a/mods/hades_fertilizer/init.lua +++ b/mods/hades_fertilizer/init.lua @@ -80,7 +80,7 @@ local get_apply_fertilizer = function(super) if not super then return itemstack end -- [SUPER] Grow random flower in empty flowerpot local flowers = { - "rose", "dandelion_white", "dandelion_yellow", "tulip", "geranium", "viola", + "red", "white", "yellow", "orange", "yellow", "violet", } local flower = flowers[math.random(1, #flowers)] minetest.set_node(pos, {name="flowerpots:flower_pot_"..flower}) @@ -214,12 +214,12 @@ local get_apply_fertilizer = function(super) {"hades_core:junglegrass", 0}, {"hades_core:junglegrass", 0}, {"farming:flowergrass", 0}, - {"flowers:rose", 0}, - {"flowers:dandelion_white", 0}, - {"flowers:dandelion_yellow", 0}, - {"flowers:tulip", 0}, - {"flowers:viola", 0}, - {"flowers:geranium", 0}, + {"hades_flowers:red", 0}, + {"hades_flowers:white", 0}, + {"hades_flowers:yellow", 0}, + {"hades_flowers:orange", 0}, + {"hades_flowers:violet", 0}, + {"hades_flowers:blue", 0}, } else plants = { diff --git a/mods/hades_fertilizer/mod.conf b/mods/hades_fertilizer/mod.conf index e806bb3..eafb12d 100644 --- a/mods/hades_fertilizer/mod.conf +++ b/mods/hades_fertilizer/mod.conf @@ -1,3 +1,3 @@ name = hades_fertilizer description = Tool to make plants grow -depends = hades_core, hades_trees, farming, vines, flowers, flowerpots +depends = hades_core, hades_trees, farming, vines, hades_flowers, flowerpots diff --git a/mods/flowers/README.txt b/mods/hades_flowers/README.txt similarity index 79% rename from mods/flowers/README.txt rename to mods/hades_flowers/README.txt index 04f96d9..0f92e4e 100644 --- a/mods/flowers/README.txt +++ b/mods/hades_flowers/README.txt @@ -1,5 +1,7 @@ -Minetest 0.4 mod: flowers -========================= +Hades Revisited mod: hades_flowers +================================== + +Derivate work from flowers mod from Minetest Game. License of source code: ----------------------- diff --git a/mods/flowers/init.lua b/mods/hades_flowers/init.lua similarity index 67% rename from mods/flowers/init.lua rename to mods/hades_flowers/init.lua index 77b824a..4c8866b 100644 --- a/mods/flowers/init.lua +++ b/mods/hades_flowers/init.lua @@ -1,22 +1,21 @@ -local S = minetest.get_translator("flowers") +local S = minetest.get_translator("hades_flowers") --- Minetest 0.4 mod: default -- See README.txt for licensing and other information. -- Aliases for original flowers mod -minetest.register_alias("flowers:flower_dandelion_white", "flowers:dandelion_white") -minetest.register_alias("flowers:flower_dandelion_yellow", "flowers:dandelion_yellow") -minetest.register_alias("flowers:flower_geranium", "flowers:geranium") -minetest.register_alias("flowers:flower_rose", "flowers:rose") -minetest.register_alias("flowers:flower_tulip", "flowers:tulip") -minetest.register_alias("flowers:flower_viola", "flowers:viola") +minetest.register_alias("flowers:dandelion_white", "hades_flowers:white") +minetest.register_alias("flowers:dandelion_yellow", "hades_flowers:yellow") +minetest.register_alias("flowers:geranium", "hades_flowers:blue") +minetest.register_alias("flowers:rose", "hades_flowers:red") +minetest.register_alias("flowers:tulip", "hades_flowers:orange") +minetest.register_alias("flowers:viola", "hades_flowers:violet") -minetest.register_node("flowers:dandelion_white", { +minetest.register_node("hades_flowers:white", { description = S("White Flower"), drawtype = "plantlike", - tiles = { "flowers_dandelion_white.png" }, - inventory_image = "flowers_dandelion_white.png", - wield_image = "flowers_dandelion_white.png", + tiles = { "hades_flowers_white.png" }, + inventory_image = "hades_flowers_white.png", + wield_image = "hades_flowers_white.png", waving = 1, sunlight_propagates = true, paramtype = "light", @@ -31,12 +30,12 @@ minetest.register_node("flowers:dandelion_white", { }, }) -minetest.register_node("flowers:dandelion_yellow", { +minetest.register_node("hades_flowers:yellow", { description = S("Yellow Flower"), drawtype = "plantlike", - tiles = { "flowers_dandelion_yellow.png" }, - inventory_image = "flowers_dandelion_yellow.png", - wield_image = "flowers_dandelion_yellow.png", + tiles = { "hades_flowers_yellow.png" }, + inventory_image = "hades_flowers_yellow.png", + wield_image = "hades_flowers_yellow.png", waving = 1, sunlight_propagates = true, paramtype = "light", @@ -51,12 +50,12 @@ minetest.register_node("flowers:dandelion_yellow", { }, }) -minetest.register_node("flowers:geranium", { +minetest.register_node("hades_flowers:blue", { description = S("Blue Flower"), drawtype = "plantlike", - tiles = { "flowers_geranium.png" }, - inventory_image = "flowers_geranium.png", - wield_image = "flowers_geranium.png", + tiles = { "hades_flowers_blue.png" }, + inventory_image = "hades_flowers_blue.png", + wield_image = "hades_flowers_blue.png", waving = 1, sunlight_propagates = true, paramtype = "light", @@ -71,12 +70,12 @@ minetest.register_node("flowers:geranium", { }, }) -minetest.register_node("flowers:rose", { +minetest.register_node("hades_flowers:red", { description = S("Red Flower"), drawtype = "plantlike", - tiles = { "flowers_rose.png" }, - inventory_image = "flowers_rose.png", - wield_image = "flowers_rose.png", + tiles = { "hades_flowers_red.png" }, + inventory_image = "hades_flowers_red.png", + wield_image = "hades_flowers_red.png", waving = 1, sunlight_propagates = true, paramtype = "light", @@ -91,12 +90,12 @@ minetest.register_node("flowers:rose", { }, }) -minetest.register_node("flowers:tulip", { +minetest.register_node("hades_flowers:orange", { description = S("Orange Flower"), drawtype = "plantlike", - tiles = { "flowers_tulip.png" }, - inventory_image = "flowers_tulip.png", - wield_image = "flowers_tulip.png", + tiles = { "hades_flowers_orange.png" }, + inventory_image = "hades_flowers_orange.png", + wield_image = "hades_flowers_orange.png", waving = 1, sunlight_propagates = true, paramtype = "light", @@ -111,12 +110,12 @@ minetest.register_node("flowers:tulip", { }, }) -minetest.register_node("flowers:viola", { +minetest.register_node("hades_flowers:violet", { description = S("Violet Flower"), drawtype = "plantlike", - tiles = { "flowers_viola.png" }, - inventory_image = "flowers_viola.png", - wield_image = "flowers_viola.png", + tiles = { "hades_flowers_violet.png" }, + inventory_image = "hades_flowers_violet.png", + wield_image = "hades_flowers_violet.png", waving = 1, sunlight_propagates = true, paramtype = "light", @@ -158,8 +157,8 @@ minetest.register_abm({ local pos0 = {x=pos.x-4,y=pos.y-4,z=pos.z-4} local pos1 = {x=pos.x+4,y=pos.y+4,z=pos.z+4} - local flowers = minetest.find_nodes_in_area(pos0, pos1, "group:flora") - if #flowers > 3 then + local hades_flowers = minetest.find_nodes_in_area(pos0, pos1, "group:flora") + if #hades_flowers > 3 then return end @@ -180,7 +179,7 @@ minetest.register_abm({ }) minetest.register_craft({ - output = 'flowers:dandelion_white', + output = 'hades_flowers:white', recipe = { {'farming:seed_cotton', 'farming:seed_cotton', 'farming:seed_cotton'}, {'hades_core:grass_1', 'hades_core:grass_1', 'hades_core:grass_1'}, @@ -188,42 +187,42 @@ minetest.register_craft({ } }) minetest.register_craft({ - output = 'flowers:dandelion_yellow', + output = 'hades_flowers:yellow', recipe = { - {'flowers:dandelion_white', 'flowers:dandelion_white', 'flowers:dandelion_white'}, + {'hades_flowers:white', 'hades_flowers:white', 'hades_flowers:white'}, {'hades_core:grass_1', 'hades_core:gold_lump', 'hades_core:grass_1'}, {'hades_core:dirt', 'hades_core:dirt', 'hades_core:dirt'}, } }) minetest.register_craft({ - output = 'flowers:rose', + output = 'hades_flowers:red', recipe = { - {'flowers:dandelion_white', 'flowers:dandelion_white', 'flowers:dandelion_white'}, + {'hades_flowers:white', 'hades_flowers:white', 'hades_flowers:white'}, {'hades_core:grass_1', 'hades_core:ruby', 'hades_core:grass_1'}, {'hades_core:dirt', 'hades_core:dirt', 'hades_core:dirt'}, } }) minetest.register_craft({ - output = 'flowers:viola', + output = 'hades_flowers:violet', recipe = { - {'flowers:rose', 'flowers:rose', 'flowers:rose'}, - {'flowers:geranium', 'flowers:geranium', 'flowers:geranium'}, + {'hades_flowers:red', 'hades_flowers:red', 'hades_flowers:red'}, + {'hades_flowers:blue', 'hades_flowers:blue', 'hades_flowers:blue'}, {'hades_core:dirt', 'hades_core:dirt', 'hades_core:dirt'}, } }) minetest.register_craft({ - output = 'flowers:geranium', + output = 'hades_flowers:blue', recipe = { - {'flowers:dandelion_white', 'flowers:dandelion_white', 'flowers:dandelion_white'}, + {'hades_flowers:white', 'hades_flowers:white', 'hades_flowers:white'}, {'hades_core:grass_1', 'hades_core:sapphire', 'hades_core:grass_1'}, {'hades_core:dirt', 'hades_core:dirt', 'hades_core:dirt'}, } }) minetest.register_craft({ - output = 'flowers:tulip', + output = 'hades_flowers:orange', recipe = { - {'flowers:dandelion_yellow', 'flowers:dandelion_yellow', 'flowers:dandelion_yellow'}, - {'flowers:rose', 'flowers:rose', 'flowers:rose'}, + {'hades_flowers:yellow', 'hades_flowers:yellow', 'hades_flowers:yellow'}, + {'hades_flowers:red', 'hades_flowers:red', 'hades_flowers:red'}, {'hades_core:dirt', 'hades_core:dirt', 'hades_core:dirt'}, } }) diff --git a/mods/flowers/mod.conf b/mods/hades_flowers/mod.conf similarity index 62% rename from mods/flowers/mod.conf rename to mods/hades_flowers/mod.conf index 4123d50..d06548d 100644 --- a/mods/flowers/mod.conf +++ b/mods/hades_flowers/mod.conf @@ -1,2 +1,2 @@ -name = flowers +name = hades_flowers depends = hades_sounds, hades_core diff --git a/mods/flowers/textures/flowers_geranium.png b/mods/hades_flowers/textures/hades_flowers_blue.png similarity index 100% rename from mods/flowers/textures/flowers_geranium.png rename to mods/hades_flowers/textures/hades_flowers_blue.png diff --git a/mods/flowers/textures/flowers_tulip.png b/mods/hades_flowers/textures/hades_flowers_orange.png similarity index 100% rename from mods/flowers/textures/flowers_tulip.png rename to mods/hades_flowers/textures/hades_flowers_orange.png diff --git a/mods/flowers/textures/flowers_rose.png b/mods/hades_flowers/textures/hades_flowers_red.png similarity index 100% rename from mods/flowers/textures/flowers_rose.png rename to mods/hades_flowers/textures/hades_flowers_red.png diff --git a/mods/flowers/textures/flowers_viola.png b/mods/hades_flowers/textures/hades_flowers_violet.png similarity index 100% rename from mods/flowers/textures/flowers_viola.png rename to mods/hades_flowers/textures/hades_flowers_violet.png diff --git a/mods/flowers/textures/flowers_dandelion_white.png b/mods/hades_flowers/textures/hades_flowers_white.png similarity index 100% rename from mods/flowers/textures/flowers_dandelion_white.png rename to mods/hades_flowers/textures/hades_flowers_white.png diff --git a/mods/flowers/textures/flowers_dandelion_yellow.png b/mods/hades_flowers/textures/hades_flowers_yellow.png similarity index 100% rename from mods/flowers/textures/flowers_dandelion_yellow.png rename to mods/hades_flowers/textures/hades_flowers_yellow.png