From a821690c66dd1fbeb6d0831e94a6bd3426e0af00 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 18 Feb 2017 16:09:01 +0100 Subject: [PATCH] Rename mcl_cocoa to mcl_cocoas --- mods/ITEMS/mcl_cocoa/mod.conf | 1 - .../{mcl_cocoa => mcl_cocoas}/README.txt | 0 .../{mcl_cocoa => mcl_cocoas}/depends.txt | 0 .../{mcl_cocoa => mcl_cocoas}/description.txt | 0 mods/ITEMS/{mcl_cocoa => mcl_cocoas}/init.lua | 18 +++++++++--------- mods/ITEMS/mcl_cocoas/mod.conf | 1 + .../textures/mcl_cocoas_cocoa_stage_0.png} | Bin .../textures/mcl_cocoas_cocoa_stage_1.png} | Bin .../textures/mcl_cocoas_cocoa_stage_2.png} | Bin mods/ITEMS/mcl_dye/depends.txt | 2 +- mods/ITEMS/mcl_dye/init.lua | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 mods/ITEMS/mcl_cocoa/mod.conf rename mods/ITEMS/{mcl_cocoa => mcl_cocoas}/README.txt (100%) rename mods/ITEMS/{mcl_cocoa => mcl_cocoas}/depends.txt (100%) rename mods/ITEMS/{mcl_cocoa => mcl_cocoas}/description.txt (100%) rename mods/ITEMS/{mcl_cocoa => mcl_cocoas}/init.lua (82%) create mode 100644 mods/ITEMS/mcl_cocoas/mod.conf rename mods/ITEMS/{mcl_cocoa/textures/mcl_cocoa_cocoa_stage_0.png => mcl_cocoas/textures/mcl_cocoas_cocoa_stage_0.png} (100%) rename mods/ITEMS/{mcl_cocoa/textures/mcl_cocoa_cocoa_stage_1.png => mcl_cocoas/textures/mcl_cocoas_cocoa_stage_1.png} (100%) rename mods/ITEMS/{mcl_cocoa/textures/mcl_cocoa_cocoa_stage_2.png => mcl_cocoas/textures/mcl_cocoas_cocoa_stage_2.png} (100%) diff --git a/mods/ITEMS/mcl_cocoa/mod.conf b/mods/ITEMS/mcl_cocoa/mod.conf deleted file mode 100644 index 9dde388afc..0000000000 --- a/mods/ITEMS/mcl_cocoa/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = mcl_cocoa diff --git a/mods/ITEMS/mcl_cocoa/README.txt b/mods/ITEMS/mcl_cocoas/README.txt similarity index 100% rename from mods/ITEMS/mcl_cocoa/README.txt rename to mods/ITEMS/mcl_cocoas/README.txt diff --git a/mods/ITEMS/mcl_cocoa/depends.txt b/mods/ITEMS/mcl_cocoas/depends.txt similarity index 100% rename from mods/ITEMS/mcl_cocoa/depends.txt rename to mods/ITEMS/mcl_cocoas/depends.txt diff --git a/mods/ITEMS/mcl_cocoa/description.txt b/mods/ITEMS/mcl_cocoas/description.txt similarity index 100% rename from mods/ITEMS/mcl_cocoa/description.txt rename to mods/ITEMS/mcl_cocoas/description.txt diff --git a/mods/ITEMS/mcl_cocoa/init.lua b/mods/ITEMS/mcl_cocoas/init.lua similarity index 82% rename from mods/ITEMS/mcl_cocoa/init.lua rename to mods/ITEMS/mcl_cocoas/init.lua index b65061dcfd..f6586ebfcc 100644 --- a/mods/ITEMS/mcl_cocoa/init.lua +++ b/mods/ITEMS/mcl_cocoas/init.lua @@ -1,7 +1,7 @@ -mcl_cocoa = {} +mcl_cocoas = {} -- place cocoa -function mcl_cocoa.place_cocoa(itemstack, placer, pointed_thing, plantname) +function mcl_cocoas.place_cocoa(itemstack, placer, pointed_thing, plantname) local pt = pointed_thing @@ -59,7 +59,7 @@ end -- Cocoa definition local crop_def = { drawtype = "plantlike", - tiles = {"mcl_cocoa_cocoa_stage_0.png"}, + tiles = {"mcl_cocoas_cocoa_stage_0.png"}, paramtype = "light", paramtype2 = "facedir", walkable = true, @@ -75,16 +75,16 @@ local crop_def = { } -- stage 1 -minetest.register_node("mcl_cocoa:cocoa_1", table.copy(crop_def)) +minetest.register_node("mcl_cocoas:cocoa_1", table.copy(crop_def)) -- stage2 -crop_def.tiles = {"mcl_cocoa_cocoa_stage_1.png"} -minetest.register_node("mcl_cocoa:cocoa_2", table.copy(crop_def)) +crop_def.tiles = {"mcl_cocoas_cocoa_stage_1.png"} +minetest.register_node("mcl_cocoas:cocoa_2", table.copy(crop_def)) -- stage 3 (final) -crop_def.tiles = {"mcl_cocoa_cocoa_stage_2.png"} +crop_def.tiles = {"mcl_cocoas_cocoa_stage_2.png"} crop_def.drop = "mcl_dye:brown 3", -minetest.register_node("mcl_cocoa:cocoa_3", table.copy(crop_def)) +minetest.register_node("mcl_cocoas:cocoa_3", table.copy(crop_def)) -- Add random cocoa pods to jungle trees minetest.register_on_generated(function(minp, maxp) @@ -119,7 +119,7 @@ minetest.register_on_generated(function(minp, maxp) and minetest.get_node_light(pos) > 12 then minetest.swap_node(pos, { - name = "mcl_cocoa:cocoa_" .. tostring(math.random(1, 3)) + name = "mcl_cocoas:cocoa_" .. tostring(math.random(1, 3)) }) end diff --git a/mods/ITEMS/mcl_cocoas/mod.conf b/mods/ITEMS/mcl_cocoas/mod.conf new file mode 100644 index 0000000000..923ea97856 --- /dev/null +++ b/mods/ITEMS/mcl_cocoas/mod.conf @@ -0,0 +1 @@ +name = mcl_cocoas diff --git a/mods/ITEMS/mcl_cocoa/textures/mcl_cocoa_cocoa_stage_0.png b/mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_stage_0.png similarity index 100% rename from mods/ITEMS/mcl_cocoa/textures/mcl_cocoa_cocoa_stage_0.png rename to mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_stage_0.png diff --git a/mods/ITEMS/mcl_cocoa/textures/mcl_cocoa_cocoa_stage_1.png b/mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_stage_1.png similarity index 100% rename from mods/ITEMS/mcl_cocoa/textures/mcl_cocoa_cocoa_stage_1.png rename to mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_stage_1.png diff --git a/mods/ITEMS/mcl_cocoa/textures/mcl_cocoa_cocoa_stage_2.png b/mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_stage_2.png similarity index 100% rename from mods/ITEMS/mcl_cocoa/textures/mcl_cocoa_cocoa_stage_2.png rename to mods/ITEMS/mcl_cocoas/textures/mcl_cocoas_cocoa_stage_2.png diff --git a/mods/ITEMS/mcl_dye/depends.txt b/mods/ITEMS/mcl_dye/depends.txt index 77bac790d1..83185405ec 100644 --- a/mods/ITEMS/mcl_dye/depends.txt +++ b/mods/ITEMS/mcl_dye/depends.txt @@ -1,4 +1,4 @@ mcl_core mcl_flowers mcl_mobitems -mcl_cocoa +mcl_cocoas diff --git a/mods/ITEMS/mcl_dye/init.lua b/mods/ITEMS/mcl_dye/init.lua index 2449ab3e70..172b165d5a 100644 --- a/mods/ITEMS/mcl_dye/init.lua +++ b/mods/ITEMS/mcl_dye/init.lua @@ -227,7 +227,7 @@ minetest.register_craftitem("mcl_dye:brown", { stack_max = 64, groups = dyelocal.dyes[4][3], on_place = function(itemstack, user, pointed_thing) - return mcl_cocoa.place_cocoa(itemstack, placer, pointed_thing, "mcl_cocoa:cocoa_1") + return mcl_cocoas.place_cocoa(itemstack, placer, pointed_thing, "mcl_cocoas:cocoa_1") end, })