From 296520c06c95da9f058f80edd55ee858d52e1f0e Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sat, 11 Feb 2017 22:05:14 +0100
Subject: [PATCH] Move slimeball to mcl_mobitems

---
 mods/mcl_mobitems/init.lua                    |  20 +++++++++++++++++-
 .../textures/mcl_mobitems_slimeball.png}      | Bin
 mods/mcl_temp_helper_recipes/init.lua         |   2 +-
 mods/mobs_mc/license.txt                      |   2 +-
 mods/mobs_mc/slimes.lua                       |   2 +-
 mods/redstone/mesecons_alias/init.lua         |   3 +++
 mods/redstone/mesecons_materials/init.lua     |  20 ------------------
 mods/redstone/mesecons_pistons/depends.txt    |   1 +
 mods/redstone/mesecons_pistons/init.lua       |   2 +-
 mods/redstone/mesecons_solarpanel/depends.txt |   1 -
 10 files changed, 27 insertions(+), 26 deletions(-)
 rename mods/{redstone/mesecons_textures/textures/jeija_glue.png => mcl_mobitems/textures/mcl_mobitems_slimeball.png} (100%)

diff --git a/mods/mcl_mobitems/init.lua b/mods/mcl_mobitems/init.lua
index f914eea3d6..f72a73e266 100644
--- a/mods/mcl_mobitems/init.lua
+++ b/mods/mcl_mobitems/init.lua
@@ -228,6 +228,12 @@ minetest.register_craftitem("mcl_mobitems:shulker_shell", {
 	groups = { craftitem = 1 },
 })
 
+minetest.register_craftitem("mcl_mobitems:slimeball", {
+	description = "Slimeball",
+	inventory_image = "mcl_mobitems_slimeball.png",
+	groups = { craftitem = 1 },
+})
+
 minetest.register_tool("mcl_mobitems:carrot_on_a_stick", {
 	description = "Carrot on a Stick",
 	wield_image = "mcl_mobitems_carrot_on_a_stick.png",
@@ -235,6 +241,7 @@ minetest.register_tool("mcl_mobitems:carrot_on_a_stick", {
 	groups = { transport = 1 },
 })
 
+
 -----------
 -- Crafting
 -----------
@@ -289,7 +296,7 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "shapeless",
 	output = "mcl_mobitems:magma_cream",
-	recipe = {"mcl_mobitems:blaze_powder", "mesecons_materials:glue"},
+	recipe = {"mcl_mobitems:blaze_powder", "mcl_mobitems:slimeball"},
 })
 
 minetest.register_craft({
@@ -326,4 +333,15 @@ minetest.register_craft({
 	burntime = 120,
 })
 
+minetest.register_craft({
+	output = 'mcl_mobitems:slimeball 9',
+	recipe = {{"mcl_core:slimeblock"}},
+})
+
+minetest.register_craft({
+	output = "mcl_core:slimeblock",
+	recipe = {{"mcl_mobitems:slimeball","mcl_mobitems:slimeball","mcl_mobitems:slimeball",},
+		{"mcl_mobitems:slimeball","mcl_mobitems:slimeball","mcl_mobitems:slimeball",},
+		{"mcl_mobitems:slimeball","mcl_mobitems:slimeball","mcl_mobitems:slimeball",}},
+})
 
diff --git a/mods/redstone/mesecons_textures/textures/jeija_glue.png b/mods/mcl_mobitems/textures/mcl_mobitems_slimeball.png
similarity index 100%
rename from mods/redstone/mesecons_textures/textures/jeija_glue.png
rename to mods/mcl_mobitems/textures/mcl_mobitems_slimeball.png
diff --git a/mods/mcl_temp_helper_recipes/init.lua b/mods/mcl_temp_helper_recipes/init.lua
index 87d495f012..117a36a14f 100644
--- a/mods/mcl_temp_helper_recipes/init.lua
+++ b/mods/mcl_temp_helper_recipes/init.lua
@@ -123,7 +123,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = 'mesecons_materials:slimeball',
+	output = 'mcl_mobitems:slimeball',
 	type = "cooking",
 	recipe = "mcl_core:sapling",
 	cooktime = 10,
diff --git a/mods/mobs_mc/license.txt b/mods/mobs_mc/license.txt
index 5e5f5d0af7..ca7b4b601f 100644
--- a/mods/mobs_mc/license.txt
+++ b/mods/mobs_mc/license.txt
@@ -146,7 +146,7 @@ Details
 
 Green slimes:
   > spawn in jungle grass or in temples mossy cobble (default:mossycobble).
-  > on die, they drop a randomish amount of glue (from mesecon mod)
+  > on die, they drop a randomish amount of slimeballs
   > Lava hurts them.
 
 Lava slimes:
diff --git a/mods/mobs_mc/slimes.lua b/mods/mobs_mc/slimes.lua
index 7f780bf789..3dc735d7f2 100644
--- a/mods/mobs_mc/slimes.lua
+++ b/mods/mobs_mc/slimes.lua
@@ -32,7 +32,7 @@ mobs:register_mob("mobs_mc:greensmall", {
 	damage = 0,
 	armor = 100,
 	drops = {
-		{name = "mesecons_materials:glue",
+		{name = "mcl_mobitems:slimeball",
 		chance = 1,
 		min = 0,
 		max = 2,},
diff --git a/mods/redstone/mesecons_alias/init.lua b/mods/redstone/mesecons_alias/init.lua
index 395c36824c..a27d1a5b7e 100644
--- a/mods/redstone/mesecons_alias/init.lua
+++ b/mods/redstone/mesecons_alias/init.lua
@@ -36,3 +36,6 @@ minetest.register_alias("mesecons_pistons:piston_up_normal", "mesecons_pistons:p
 minetest.register_alias("mesecons_pistons:piston_down_normal", "mesecons_pistons:piston_down_normal_on")
 minetest.register_alias("mesecons_pistons:piston_up_sticky", "mesecons_pistons:piston_up_sticky_on")
 minetest.register_alias("mesecons_pistons:piston_down_sticky", "mesecons_pistons:piston_down_sticky_on")
+
+--MineClone 2 specials
+minetest.register_alias("mesecons_materials:glue", "mcl_mobitems:slimeball")
diff --git a/mods/redstone/mesecons_materials/init.lua b/mods/redstone/mesecons_materials/init.lua
index fc57e5fb9e..e69de29bb2 100644
--- a/mods/redstone/mesecons_materials/init.lua
+++ b/mods/redstone/mesecons_materials/init.lua
@@ -1,20 +0,0 @@
-minetest.register_craftitem("mesecons_materials:slimeball", {
-	image = "jeija_glue.png",
-	on_place_on_ground = minetest.craftitem_place_item,
-    	description="Slimeball",
-	groups = { craftitem = 1 },
-})
-
-minetest.register_craft({
-	output = 'mesecons_materials:slimeball 9',
-	recipe = {{"mcl_core:slimeblock"}},
-})
-
-minetest.register_craft({
-	output = "mcl_core:slimeblock",
-	recipe = {{"mesecons_materials:slimeball","mesecons_materials:slimeball","mesecons_materials:slimeball",},
-		{"mesecons_materials:slimeball","mesecons_materials:slimeball","mesecons_materials:slimeball",},
-		{"mesecons_materials:slimeball","mesecons_materials:slimeball","mesecons_materials:slimeball",}},
-})
-
-minetest.register_alias("mesecons_materials:glue", "mesecons_materials:slimeball")
diff --git a/mods/redstone/mesecons_pistons/depends.txt b/mods/redstone/mesecons_pistons/depends.txt
index 01f085ba26..cdd7980acc 100644
--- a/mods/redstone/mesecons_pistons/depends.txt
+++ b/mods/redstone/mesecons_pistons/depends.txt
@@ -1,2 +1,3 @@
 mesecons
 mesecons_mvps
+mcl_mobitems
diff --git a/mods/redstone/mesecons_pistons/init.lua b/mods/redstone/mesecons_pistons/init.lua
index d99351a9e5..fb7f2e5928 100644
--- a/mods/redstone/mesecons_pistons/init.lua
+++ b/mods/redstone/mesecons_pistons/init.lua
@@ -758,7 +758,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "mesecons_pistons:piston_sticky_off",
 	recipe = {
-		{"mesecons_materials:slimeball"},
+		{"mcl_mobitems:slimeball"},
 		{"mesecons_pistons:piston_normal_off"},
 	}
 })
diff --git a/mods/redstone/mesecons_solarpanel/depends.txt b/mods/redstone/mesecons_solarpanel/depends.txt
index bc7b0627e0..acaa924122 100644
--- a/mods/redstone/mesecons_solarpanel/depends.txt
+++ b/mods/redstone/mesecons_solarpanel/depends.txt
@@ -1,2 +1 @@
 mesecons
-mesecons_materials