Move string and bone to mcl_mobitems

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"}},
-})

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",

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",
 })
 

mods/mcl_dye/depends.txt

@@ -1,2 +1,3 @@
 mcl_core
 mcl_flowers
+mcl_mobitems

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"}},
 })

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_mobitems:string'},
-		{'mcl_core:stick','','mcl_core: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_mobitems:string', 'mcl_core:stick', ''},
-		{'mcl_core:string','','mcl_core:stick'},
+		{'mcl_mobitems:string','','mcl_core:stick'},
 	}
 })
 

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",

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_mobitems:string'},
-		{'mcl_core:stick', '', 'mcl_core:string'},
+		{'mcl_core:stick', '', 'mcl_mobitems:string'},
-		{'', 'mcl_core:stick', 'mcl_core:string'},
+		{'', 'mcl_core:stick', 'mcl_mobitems:string'},
 	}
 })
 minetest.register_craft({
 	output = 'mcl_throwing:bow',
 	recipe = {
-		{'mcl_core:string', 'mcl_core:stick', ''},
+		{'mcl_mobitems:string', 'mcl_core:stick', ''},
-		{'mcl_core:string', '', 'mcl_core:stick'},
+		{'mcl_mobitems:string', '', 'mcl_core:stick'},
-		{'mcl_core:string', 'mcl_core:stick', ''},
+		{'mcl_mobitems:string', 'mcl_core:stick', ''},
 	}
 })
 

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,},

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,},