From 76cf02909b29dcfd6826d10bbea21fa3c2c3e505 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 1 Feb 2017 17:59:15 +0100 Subject: [PATCH] Move string and bone to mcl_mobitems --- mods/mcl_core/crafting.lua | 11 +---------- mods/mcl_core/craftitems.lua | 14 -------------- mods/mcl_core/nodes.lua | 2 +- mods/mcl_dye/depends.txt | 1 + mods/mcl_dye/init.lua | 2 +- mods/mcl_fishing/init.lua | 14 +++++++------- mods/mcl_mobitems/init.lua | 14 ++++++++++++++ .../textures/mcl_mobitems_bone.png} | Bin .../textures/mcl_mobitems_string.png} | Bin mods/mcl_throwing/init.lua | 12 ++++++------ mods/mobs_mc/skeleton.lua | 4 ++-- mods/mobs_mc/spider.lua | 2 +- 12 files changed, 34 insertions(+), 42 deletions(-) rename mods/{mcl_core/textures/default_bone.png => mcl_mobitems/textures/mcl_mobitems_bone.png} (100%) rename mods/{mcl_core/textures/default_string.png => mcl_mobitems/textures/mcl_mobitems_string.png} (100%) diff --git a/mods/mcl_core/crafting.lua b/mods/mcl_core/crafting.lua index 65d39f9bf..b741a814c 100644 --- a/mods/mcl_core/crafting.lua +++ b/mods/mcl_core/crafting.lua @@ -149,7 +149,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "mcl_dye:bone_block", + output = "mcl_core:bone_block", recipe = { { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, { "mcl_dye:white", "mcl_dye:white", "mcl_dye:white" }, @@ -1009,12 +1009,3 @@ minetest.register_craft({ recipe = "mcl_core:stick", burntime = 5, }) - --- ---Temporary --- TODO: Remove when string is ready -minetest.register_craft({ - output = "mcl_core:string", - recipe = {{"mcl_core:paper",}, - {"mcl_core:paper"}}, -}) diff --git a/mods/mcl_core/craftitems.lua b/mods/mcl_core/craftitems.lua index e31abac95..b98a856f0 100644 --- a/mods/mcl_core/craftitems.lua +++ b/mods/mcl_core/craftitems.lua @@ -111,13 +111,6 @@ minetest.register_craftitem("mcl_core:gunpowder", { groups = { craftitem=1 }, }) -minetest.register_craftitem("mcl_core:bone", { - description = "Bone", - inventory_image = "default_bone.png", - stack_max = 64, - groups = { craftitem=1 }, -}) - minetest.register_craftitem("mcl_core:glowstone_dust", { description = "Glowstone Dust", inventory_image = "default_glowstone_dust.png", @@ -132,13 +125,6 @@ minetest.register_craftitem("mcl_core:sugar", { groups = { craftitem = 1 }, }) -minetest.register_craftitem("mcl_core:string",{ - description = "String", - inventory_image = "default_string.png", - stack_max = 64, - groups = { craftitem = 1 }, -}) - minetest.register_craftitem("mcl_core:bowl",{ description = "Bowl", inventory_image = "default_bowl.png", diff --git a/mods/mcl_core/nodes.lua b/mods/mcl_core/nodes.lua index 95bd1ddca..0b5d8a170 100644 --- a/mods/mcl_core/nodes.lua +++ b/mods/mcl_core/nodes.lua @@ -1676,6 +1676,6 @@ minetest.register_node("mcl_core:cobweb", { liquid_range = 0, walkable = false, groups = {snappy=1,liquid=3,deco_block=1}, - drop = "mcl_core:string", + drop = "mcl_mobitems:string", }) diff --git a/mods/mcl_dye/depends.txt b/mods/mcl_dye/depends.txt index 5b71cc42b..0172fb67c 100644 --- a/mods/mcl_dye/depends.txt +++ b/mods/mcl_dye/depends.txt @@ -1,2 +1,3 @@ mcl_core mcl_flowers +mcl_mobitems diff --git a/mods/mcl_dye/init.lua b/mods/mcl_dye/init.lua index 77f0cc10c..9ff3c5ac0 100644 --- a/mods/mcl_dye/init.lua +++ b/mods/mcl_dye/init.lua @@ -243,5 +243,5 @@ minetest.register_craft({ }) minetest.register_craft({ output = "mcl_dye:white 3", - recipe = {{"mcl_core:bone"}}, + recipe = {{"mcl_mobitems:bone"}}, }) diff --git a/mods/mcl_fishing/init.lua b/mods/mcl_fishing/init.lua index 2c9cce436..f356cc6a2 100644 --- a/mods/mcl_fishing/init.lua +++ b/mods/mcl_fishing/init.lua @@ -43,18 +43,18 @@ minetest.register_tool("mcl_fishing:fishing_rod", { elseif r <= 47 then itemname = "mcl_core:stick" elseif r <= 52 then - itemname = "mcl_core:string" + itemname = "mcl_mobitems:string" elseif r <= 62 then itemname = "mcl_potions:glass_bottle" --TODO itemname = "mcl_potions:bottle_water" elseif r <= 72 then - itemname = "mcl_core:bone" + itemname = "mcl_mobitems:bone" elseif r <= 73 then itemname = "mcl_dye:black" itemcount = 10 else -- TODO: Tripwire hook - itemname = "mcl_core:string" + itemname = "mcl_mobitems:string" end else -- Treasure @@ -97,16 +97,16 @@ minetest.register_craft({ output = "mcl_fishing:fishing_rod", recipe = { {'','','mcl_core:stick'}, - {'','mcl_core:stick','mcl_core:string'}, - {'mcl_core:stick','','mcl_core:string'}, + {'','mcl_core:stick','mcl_mobitems:string'}, + {'mcl_core:stick','','mcl_mobitems:string'}, } }) minetest.register_craft({ output = "mcl_fishing:fishing_rod", recipe = { {'mcl_core:stick', '', ''}, - {'mcl_core:string', 'mcl_core:stick', ''}, - {'mcl_core:string','','mcl_core:stick'}, + {'mcl_mobitems:string', 'mcl_core:stick', ''}, + {'mcl_mobitems:string','','mcl_core:stick'}, } }) diff --git a/mods/mcl_mobitems/init.lua b/mods/mcl_mobitems/init.lua index 139c421e9..e83cfdd5c 100644 --- a/mods/mcl_mobitems/init.lua +++ b/mods/mcl_mobitems/init.lua @@ -120,6 +120,20 @@ minetest.register_craftitem("mcl_mobitems:spider_eye", { stack_max = 64, }) +minetest.register_craftitem("mcl_mobitems:bone", { + description = "Bone", + inventory_image = "mcl_mobitems_bone.png", + stack_max = 64, + groups = { craftitem=1 }, +}) + +minetest.register_craftitem("mcl_mobitems:string",{ + description = "String", + inventory_image = "mcl_mobitems_string.png", + stack_max = 64, + groups = { craftitem = 1 }, +}) + minetest.register_craftitem("mcl_mobitems:blaze_rod", { description = "Blaze Rod", wield_image = "mcl_mobitems_blaze_rod.png", diff --git a/mods/mcl_core/textures/default_bone.png b/mods/mcl_mobitems/textures/mcl_mobitems_bone.png similarity index 100% rename from mods/mcl_core/textures/default_bone.png rename to mods/mcl_mobitems/textures/mcl_mobitems_bone.png diff --git a/mods/mcl_core/textures/default_string.png b/mods/mcl_mobitems/textures/mcl_mobitems_string.png similarity index 100% rename from mods/mcl_core/textures/default_string.png rename to mods/mcl_mobitems/textures/mcl_mobitems_string.png diff --git a/mods/mcl_throwing/init.lua b/mods/mcl_throwing/init.lua index 997dc7dba..4cb7fe0e8 100644 --- a/mods/mcl_throwing/init.lua +++ b/mods/mcl_throwing/init.lua @@ -121,17 +121,17 @@ minetest.register_tool("mcl_throwing:bow_2", { minetest.register_craft({ output = 'mcl_throwing:bow', recipe = { - {'', 'mcl_core:stick', 'mcl_core:string'}, - {'mcl_core:stick', '', 'mcl_core:string'}, - {'', 'mcl_core:stick', 'mcl_core:string'}, + {'', 'mcl_core:stick', 'mcl_mobitems:string'}, + {'mcl_core:stick', '', 'mcl_mobitems:string'}, + {'', 'mcl_core:stick', 'mcl_mobitems:string'}, } }) minetest.register_craft({ output = 'mcl_throwing:bow', recipe = { - {'mcl_core:string', 'mcl_core:stick', ''}, - {'mcl_core:string', '', 'mcl_core:stick'}, - {'mcl_core:string', 'mcl_core:stick', ''}, + {'mcl_mobitems:string', 'mcl_core:stick', ''}, + {'mcl_mobitems:string', '', 'mcl_core:stick'}, + {'mcl_mobitems:string', 'mcl_core:stick', ''}, } }) diff --git a/mods/mobs_mc/skeleton.lua b/mods/mobs_mc/skeleton.lua index a7402afc3..0a817664f 100644 --- a/mods/mobs_mc/skeleton.lua +++ b/mods/mobs_mc/skeleton.lua @@ -33,7 +33,7 @@ mobs:register_mob("mobs_mc:skeleton", { chance = 1, min = 0, max = 2,}, - {name = "mcl_core:bone", + {name = "mcl_mobitems:bone", chance = 1, min = 0, max = 2,}, @@ -97,7 +97,7 @@ mobs:register_mob("mobs_mc:skeleton2", { chance = 1, min = 0, max = 1,}, - {name = "mcl_core:bone", + {name = "mcl_mobitems:bone", chance = 1, min = 0, max = 2,}, diff --git a/mods/mobs_mc/spider.lua b/mods/mobs_mc/spider.lua index 8b253fc97..b53929076 100644 --- a/mods/mobs_mc/spider.lua +++ b/mods/mobs_mc/spider.lua @@ -40,7 +40,7 @@ mobs:register_mob("mobs_mc:spider", { replace_offset = -1, peaceful = false, drops = { - {name = "mcl_core:string", + {name = "mcl_mobitems:string", chance = 1, min = 0, max = 2,}, {name = "mcl_mobitems:spider_eye", chance = 3, min = 1, max = 1,},