From 680e802af001ab5b9f074cddafa46fd932c90149 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Thu, 25 Apr 2013 17:18:21 -0400 Subject: [PATCH] Default game has flowers now, so this removes all duplicate stuff from my flowers mod, and renames it to flowers_plus. --- flowers/textures/flowers_dandelion_white.png | Bin 169 -> 0 bytes flowers/textures/flowers_dandelion_yellow.png | Bin 166 -> 0 bytes flowers/textures/flowers_geranium.png | Bin 361 -> 0 bytes flowers/textures/flowers_rose.png | Bin 171 -> 0 bytes flowers/textures/flowers_tulip.png | Bin 159 -> 0 bytes flowers/textures/flowers_viola.png | Bin 140 -> 0 bytes {flowers => flowers_plus}/depends.txt | 0 .../flowers-changelog.txt | 0 {flowers => flowers_plus}/init.lua | 38 +++++------------- .../textures/flowers_cotton_plant.png | Bin .../textures/flowers_cotton_wad.png | Bin .../textures/flowers_flowerpot.png | Bin .../textures/flowers_potted_cotton_plant.png | Bin .../flowers_potted_dandelion_white.png | Bin .../flowers_potted_dandelion_yellow.png | Bin .../textures/flowers_potted_geranium.png | Bin .../textures/flowers_potted_rose.png | Bin .../textures/flowers_potted_tulip.png | Bin .../textures/flowers_potted_viola.png | Bin .../textures/flowers_seaweed.png | Bin .../textures/flowers_waterlily.png | Bin .../textures/flowers_waterlily_22.5.png | Bin .../textures/flowers_waterlily_45.png | Bin .../textures/flowers_waterlily_67.5.png | Bin 24 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 flowers/textures/flowers_dandelion_white.png delete mode 100644 flowers/textures/flowers_dandelion_yellow.png delete mode 100644 flowers/textures/flowers_geranium.png delete mode 100644 flowers/textures/flowers_rose.png delete mode 100644 flowers/textures/flowers_tulip.png delete mode 100644 flowers/textures/flowers_viola.png rename {flowers => flowers_plus}/depends.txt (100%) rename {flowers => flowers_plus}/flowers-changelog.txt (100%) rename {flowers => flowers_plus}/init.lua (88%) rename {flowers => flowers_plus}/textures/flowers_cotton_plant.png (100%) rename {flowers => flowers_plus}/textures/flowers_cotton_wad.png (100%) rename {flowers => flowers_plus}/textures/flowers_flowerpot.png (100%) rename {flowers => flowers_plus}/textures/flowers_potted_cotton_plant.png (100%) rename {flowers => flowers_plus}/textures/flowers_potted_dandelion_white.png (100%) rename {flowers => flowers_plus}/textures/flowers_potted_dandelion_yellow.png (100%) rename {flowers => flowers_plus}/textures/flowers_potted_geranium.png (100%) rename {flowers => flowers_plus}/textures/flowers_potted_rose.png (100%) rename {flowers => flowers_plus}/textures/flowers_potted_tulip.png (100%) rename {flowers => flowers_plus}/textures/flowers_potted_viola.png (100%) rename {flowers => flowers_plus}/textures/flowers_seaweed.png (100%) rename {flowers => flowers_plus}/textures/flowers_waterlily.png (100%) rename {flowers => flowers_plus}/textures/flowers_waterlily_22.5.png (100%) rename {flowers => flowers_plus}/textures/flowers_waterlily_45.png (100%) rename {flowers => flowers_plus}/textures/flowers_waterlily_67.5.png (100%) diff --git a/flowers/textures/flowers_dandelion_white.png b/flowers/textures/flowers_dandelion_white.png deleted file mode 100644 index b22d6d4644b7cc8cc1ff653d9c58d163d2ec79db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|l097o(u`H(92`!1w&QKh4$2!MF6?CM7Z6oM629UqUE1!^C9@uhz7< R#R08j@O1TaS?83{1OP(iJX8Px diff --git a/flowers/textures/flowers_dandelion_yellow.png b/flowers/textures/flowers_dandelion_yellow.png deleted file mode 100644 index 500adef8efb469520f44acb82102945520c3cc29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|54w#*DsIMh&NDbHKmL;Z^NEG`g2}={2>}+hOr8IlpPHs{ z3a2JIa0sL}+}GLmUxi)C=kjLb{}1lnnDVWA;*tmlvnOZP*hgGtV%VT3^Xlr1|L#D$ O7(8A5T-G@yGywo3={m9i diff --git a/flowers/textures/flowers_geranium.png b/flowers/textures/flowers_geranium.png deleted file mode 100644 index 5325982eac3e749ef71ec3c2e16df67bd5a730e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmV-v0ha!WP)>P|7_OhMV&GyCXHYe9 zC(Z?SfwTY1Xp}HKJhzR(RG**0)=Gq7#==(&U;iIsU}xcA*uN$Pu8#$q0bjppFg&`r zmw}n_FN3h)Zw6lO9}GVj&NKY~Zo%;R|91w0Uii=Oo#EHtZwxE~yBLn1dCySOeVaj6 zBah+F{~rvDj6aAALKc9R|z8{kbzjIFg6sxgF9GliBFv_q`eYoB7>)^pUXO@geCxvrY$c3 diff --git a/flowers/depends.txt b/flowers_plus/depends.txt similarity index 100% rename from flowers/depends.txt rename to flowers_plus/depends.txt diff --git a/flowers/flowers-changelog.txt b/flowers_plus/flowers-changelog.txt similarity index 100% rename from flowers/flowers-changelog.txt rename to flowers_plus/flowers-changelog.txt diff --git a/flowers/init.lua b/flowers_plus/init.lua similarity index 88% rename from flowers/init.lua rename to flowers_plus/init.lua index 267ba3e..58885db 100644 --- a/flowers/init.lua +++ b/flowers_plus/init.lua @@ -7,7 +7,7 @@ local flowers_seed_diff = 329 -- register cotton plant -minetest.register_node("flowers:cotton_plant", { +minetest.register_node(":flowers:cotton_plant", { description = flowerdesc, drawtype = "plantlike", tiles = { "flowers_cotton_plant.png" }, @@ -31,7 +31,7 @@ minetest.register_alias("flowers:flower_cotton_pot", "flowers:potted_cotton_plan -- register the various rotations of waterlilies -minetest.register_node("flowers:waterlily", { +minetest.register_node(":flowers:waterlily", { description = "Waterlily", drawtype = "nodebox", tiles = { "flowers_waterlily.png" }, @@ -54,7 +54,7 @@ minetest.register_node("flowers:waterlily", { buildable_to = true, }) -minetest.register_node("flowers:waterlily_225", { +minetest.register_node(":flowers:waterlily_225", { description = "Waterlily", drawtype = "nodebox", tiles = { "flowers_waterlily_22.5.png" }, @@ -76,7 +76,7 @@ minetest.register_node("flowers:waterlily_225", { buildable_to = true, }) -minetest.register_node("flowers:waterlily_45", { +minetest.register_node(":flowers:waterlily_45", { description = "Waterlily", drawtype = "raillike", tiles = { "flowers_waterlily_45.png" }, @@ -98,7 +98,7 @@ minetest.register_node("flowers:waterlily_45", { buildable_to = true, }) -minetest.register_node("flowers:waterlily_675", { +minetest.register_node(":flowers:waterlily_675", { description = "Waterlily", drawtype = "nodebox", tiles = { "flowers_waterlily_67.5.png" }, @@ -120,7 +120,7 @@ minetest.register_node("flowers:waterlily_675", { buildable_to = true, }) -minetest.register_node("flowers:seaweed", { +minetest.register_node(":flowers:seaweed", { description = "Seaweed", drawtype = "signlike", tiles = { "flowers_seaweed.png" }, @@ -155,7 +155,7 @@ for i in ipairs(flowers_list) do local flowerdesc = flowers_list[i][1] local flower = flowers_list[i][2] - minetest.register_node("flowers:potted_"..flower, { + minetest.register_node(":flowers:potted_"..flower, { description = "Potted "..flowerdesc, drawtype = "plantlike", tiles = { "flowers_potted_"..flower..".png" }, @@ -182,26 +182,6 @@ for i in ipairs(flowers_list) do }) minetest.register_alias("flowers:flower_"..flower.."_pot", "flowers:potted_"..flower) - - minetest.register_node("flowers:"..flower, { - description = "Potted "..flowerdesc, - drawtype = "plantlike", - tiles = { "flowers_"..flower..".png" }, - inventory_image = "flowers_"..flower..".png", - wield_image = "flowers_"..flower..".png", - sunlight_propagates = true, - paramtype = "light", - walkable = false, - groups = { snappy = 3,flammable=2 }, - sounds = default.node_sound_leaves_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.25, 0.25, 0.5, 0.25 }, - }, - }) - - minetest.register_alias("flowers:flower_"..flower, "flowers:"..flower) - end local extra_aliases = { @@ -311,7 +291,7 @@ plantslib:spawn_on_surfaces({ -- crafting recipes! -minetest.register_craftitem("flowers:flower_pot", { +minetest.register_craftitem(":flowers:flower_pot", { description = "Flower Pot", inventory_image = "flowers_flowerpot.png", }) @@ -326,7 +306,7 @@ minetest.register_craft( { minetest.register_alias("flowers:cotton", "flowers:cotton_wad") -minetest.register_craftitem("flowers:cotton_wad", { +minetest.register_craftitem(":flowers:cotton_wad", { description = "Cotton wad", image = "flowers_cotton_wad.png", }) diff --git a/flowers/textures/flowers_cotton_plant.png b/flowers_plus/textures/flowers_cotton_plant.png similarity index 100% rename from flowers/textures/flowers_cotton_plant.png rename to flowers_plus/textures/flowers_cotton_plant.png diff --git a/flowers/textures/flowers_cotton_wad.png b/flowers_plus/textures/flowers_cotton_wad.png similarity index 100% rename from flowers/textures/flowers_cotton_wad.png rename to flowers_plus/textures/flowers_cotton_wad.png diff --git a/flowers/textures/flowers_flowerpot.png b/flowers_plus/textures/flowers_flowerpot.png similarity index 100% rename from flowers/textures/flowers_flowerpot.png rename to flowers_plus/textures/flowers_flowerpot.png diff --git a/flowers/textures/flowers_potted_cotton_plant.png b/flowers_plus/textures/flowers_potted_cotton_plant.png similarity index 100% rename from flowers/textures/flowers_potted_cotton_plant.png rename to flowers_plus/textures/flowers_potted_cotton_plant.png diff --git a/flowers/textures/flowers_potted_dandelion_white.png b/flowers_plus/textures/flowers_potted_dandelion_white.png similarity index 100% rename from flowers/textures/flowers_potted_dandelion_white.png rename to flowers_plus/textures/flowers_potted_dandelion_white.png diff --git a/flowers/textures/flowers_potted_dandelion_yellow.png b/flowers_plus/textures/flowers_potted_dandelion_yellow.png similarity index 100% rename from flowers/textures/flowers_potted_dandelion_yellow.png rename to flowers_plus/textures/flowers_potted_dandelion_yellow.png diff --git a/flowers/textures/flowers_potted_geranium.png b/flowers_plus/textures/flowers_potted_geranium.png similarity index 100% rename from flowers/textures/flowers_potted_geranium.png rename to flowers_plus/textures/flowers_potted_geranium.png diff --git a/flowers/textures/flowers_potted_rose.png b/flowers_plus/textures/flowers_potted_rose.png similarity index 100% rename from flowers/textures/flowers_potted_rose.png rename to flowers_plus/textures/flowers_potted_rose.png diff --git a/flowers/textures/flowers_potted_tulip.png b/flowers_plus/textures/flowers_potted_tulip.png similarity index 100% rename from flowers/textures/flowers_potted_tulip.png rename to flowers_plus/textures/flowers_potted_tulip.png diff --git a/flowers/textures/flowers_potted_viola.png b/flowers_plus/textures/flowers_potted_viola.png similarity index 100% rename from flowers/textures/flowers_potted_viola.png rename to flowers_plus/textures/flowers_potted_viola.png diff --git a/flowers/textures/flowers_seaweed.png b/flowers_plus/textures/flowers_seaweed.png similarity index 100% rename from flowers/textures/flowers_seaweed.png rename to flowers_plus/textures/flowers_seaweed.png diff --git a/flowers/textures/flowers_waterlily.png b/flowers_plus/textures/flowers_waterlily.png similarity index 100% rename from flowers/textures/flowers_waterlily.png rename to flowers_plus/textures/flowers_waterlily.png diff --git a/flowers/textures/flowers_waterlily_22.5.png b/flowers_plus/textures/flowers_waterlily_22.5.png similarity index 100% rename from flowers/textures/flowers_waterlily_22.5.png rename to flowers_plus/textures/flowers_waterlily_22.5.png diff --git a/flowers/textures/flowers_waterlily_45.png b/flowers_plus/textures/flowers_waterlily_45.png similarity index 100% rename from flowers/textures/flowers_waterlily_45.png rename to flowers_plus/textures/flowers_waterlily_45.png diff --git a/flowers/textures/flowers_waterlily_67.5.png b/flowers_plus/textures/flowers_waterlily_67.5.png similarity index 100% rename from flowers/textures/flowers_waterlily_67.5.png rename to flowers_plus/textures/flowers_waterlily_67.5.png