From 7fa7afba54c905254231c8e4e71d68f3f60e9cee Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 16 Jan 2017 18:20:06 +0100
Subject: [PATCH] mobs_mc: Item names

---
 mods/mobs_mc/cow.lua      | 10 +++++-----
 mods/mobs_mc/creeper.lua  | 34 +---------------------------------
 mods/mobs_mc/enderman.lua |  2 +-
 mods/mobs_mc/horse.lua    | 12 ++++++------
 mods/mobs_mc/wolf.lua     |  4 ++--
 5 files changed, 15 insertions(+), 47 deletions(-)

diff --git a/mods/mobs_mc/cow.lua b/mods/mobs_mc/cow.lua
index 1d04dbe7aa..a5cc7d2629 100644
--- a/mods/mobs_mc/cow.lua
+++ b/mods/mobs_mc/cow.lua
@@ -20,11 +20,11 @@ mobs:register_mob("mobs_mc:cow", {
 	walk_velocity = 1,
 	armor = 200,
 	drops = {
-		{name = "mobs:beef_raw",
+		{name = "mcl_mobitems:beef_raw",
 		chance = 1,
 		min = 1,
 		max = 3,},
-		{name = "mobs:leather",
+		{name = "mcl_mobitems:leather",
 		chance = 1,
 		min = 0,
 		max = 2,},
@@ -107,12 +107,12 @@ mobs:register_mob("mobs_mc:cow", {
 
 			inv:remove_item("main", "bucket:bucket_empty")
 
-			if inv:room_for_item("main", {name = "mobs:bucket_milk"}) then
-				clicker:get_inventory():add_item("main", "mobs:bucket_milk")
+			if inv:room_for_item("main", {name = "mcl_mobitems:milk"}) then
+				clicker:get_inventory():add_item("main", "mcl_mobitems:milk")
 			else
 				local pos = self.object:getpos()
 				pos.y = pos.y + 0.5
-				minetest.add_item(pos, {name = "mobs:bucket_milk"})
+				minetest.add_item(pos, {name = "mcl_mobitems:milk"})
 			end
 
 			self.gotten = true -- milked
diff --git a/mods/mobs_mc/creeper.lua b/mods/mobs_mc/creeper.lua
index 672d9298e5..cce05436b6 100644
--- a/mods/mobs_mc/creeper.lua
+++ b/mods/mobs_mc/creeper.lua
@@ -35,42 +35,10 @@ mobs:register_mob("mobs_mc:creeper", {
 	armor = 200,
 	maxdrops = 3,
 	drops = {
-		{name = "tnt:gunpowder",
+		{name = "default:gunpowder",
 		chance = 1,
 		min = 0,
 		max = 2,},
-		{name = "default:flint_and_steel",
-		chance = 1,
-		min = 0,
-		max = 1,},
-		{name = "farorb:farorb",
-		chance = 1,
-		min = 0,
-		max = 1,},
-		{name = "jdukebox:disc_1",
-		chance = 10,
-		min = 0,
-		max = 1,},
-		{name = "jdukebox:disc_2",
-		chance = 10,
-		min = 0,
-		max = 1,},
-		{name = "jdukebox:disc_3",
-		chance = 10,
-		min = 0,
-		max = 1,},
-		{name = "jdukebox:disc_4",
-		chance = 10,
-		min = 0,
-		max = 1,},
-		{name = "jdukebox:disc_5",
-		chance = 10,
-		min = 0,
-		max = 1,},
-		{name = "jdukebox:disc_6",
-		chance = 10,
-		min = 0,
-		max = 1,},
 	},
 	animation = {
 		speed_normal = 24,
diff --git a/mods/mobs_mc/enderman.lua b/mods/mobs_mc/enderman.lua
index a4719eb2d1..18f99bbb4c 100644
--- a/mods/mobs_mc/enderman.lua
+++ b/mods/mobs_mc/enderman.lua
@@ -37,7 +37,7 @@ mobs:register_mob("mobs_mc:enderman", {
 		chance = 11,
 		min = 1,
 		max = 1,},
-		{name = "farorb:farorb",
+		{name = "mcl_ender_pearl:ender_pearl",
 		chance = 3,
 		min = 0,
 		max = 1,},
diff --git a/mods/mobs_mc/horse.lua b/mods/mobs_mc/horse.lua
index 62ed7da0e8..e79545ad6d 100644
--- a/mods/mobs_mc/horse.lua
+++ b/mods/mobs_mc/horse.lua
@@ -224,8 +224,8 @@ mobs:register_mob("mobs_mc:horse", {
 
 	on_rightclick = function(self, clicker)
 		local tool = clicker:get_wielded_item()
-		if tool:get_name() == "mobs:saddle" then
-			clicker:get_inventory():remove_item("main", "mobs:saddle")
+		if tool:get_name() == "mcl_mobitems:saddle" then
+			clicker:get_inventory():remove_item("main", "mcl_mobitems:saddle")
 			local pos = self.object:getpos()
 			self.object:remove()
 			minetest.add_entity(pos, "mobs_mc:horseh1")
@@ -267,8 +267,8 @@ mobs:register_mob("mobs_mc:horse2", {
 
 	on_rightclick = function(self, clicker)
 		local tool = clicker:get_wielded_item()
-		if tool:get_name() == "mobs:saddle" then
-			clicker:get_inventory():remove_item("main", "mobs:saddle")
+		if tool:get_name() == "mcl_mobitems:saddle" then
+			clicker:get_inventory():remove_item("main", "mcl_mobitems:saddle")
 			local pos = self.object:getpos()
 			self.object:remove()
 			minetest.add_entity(pos, "mobs_mc:horsepegh1")
@@ -310,8 +310,8 @@ mobs:register_mob("mobs_mc:horse3", {
 
 	on_rightclick = function(self, clicker)
 		local tool = clicker:get_wielded_item()
-		if tool:get_name() == "mobs:saddle" then
-			clicker:get_inventory():remove_item("main", "mobs:saddle")
+		if tool:get_name() == "mcl_mobitems:saddle" then
+			clicker:get_inventory():remove_item("main", "mcl_mobitems:saddle")
 			local pos = self.object:getpos()
 			self.object:remove()
 			minetest.add_entity(pos, "mobs_mc:horsearah1")
diff --git a/mods/mobs_mc/wolf.lua b/mods/mobs_mc/wolf.lua
index 28a3573440..c6158f2a81 100644
--- a/mods/mobs_mc/wolf.lua
+++ b/mods/mobs_mc/wolf.lua
@@ -48,7 +48,7 @@ mobs:register_mob("mobs_mc:dog", {
 	light_damage = 0,
 	on_rightclick = function(self, clicker)
 		local item = clicker:get_wielded_item()
-		if item:get_name() == "mobs:meat_raw" then
+		if item:get_name() == "mcl_mobitems:meat_raw" then
 			local hp = self.object:get_hp()
 			if hp + 4 > self.hp_max then return end
 			if not minetest.setting_getbool("creative_mode") then
@@ -142,7 +142,7 @@ mobs:register_mob("mobs_mc:wolf", {
 	armor = 200,
 	attack_type = "dogfight",
 	drops = {
-		{name = "mobs:meat_raw",
+		{name = "mcl_mobitems:meat_raw",
 		chance = 1,
 		min = 2,
 		max = 3,},