Merge pull request #50 from Wuzzy2/textures

Major texture file name cleanup

1_items_default.lua

@@ -443,7 +443,7 @@ end
 if c("rotten_flesh") then
 	minetest.register_craftitem("mobs_mc:rotten_flesh", {
 		description = "Rotten Flesh",
-		inventory_image = "mobs_rotten_flesh.png",
+		inventory_image = "mcl_mobitems_rotten_flesh.png",
 		-- Simplified poisonous food
 		groups = { food = 2, eatable = -4 },
 		on_use = minetest.item_eat(-4),

bat.lua

@@ -10,7 +10,7 @@ mobs:register_mob("mobs_mc:bat", {
 	visual = "mesh",
 	mesh = "mobs_mc_bat.b3d",
 	textures = {
-		{"bat.png"},
+		{"mobs_mc_bat.png"},
 	},
 	visual_size = {x=1, y=1},
 	sounds = {
@@ -55,7 +55,7 @@ mobs:spawn_specific("mobs_mc:bat", mobs_mc.spawn.solid,{"air"},0, maxlight, 20,
 
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:bat", "Bat", "bat_inv.png", 0)
+mobs:register_egg("mobs_mc:bat", "Bat", "mobs_mc_spawn_icon_bat.png", 0)
 
 
 if minetest.settings:get_bool("log_mods") then

blaze.lua

@@ -20,7 +20,7 @@ mobs:register_mob("mobs_mc:blaze", {
 	visual = "mesh",
 	mesh = "mobs_mc_blaze.b3d",
 	textures = {
-		{"blaze.png"},
+		{"mobs_mc_blaze.png"},
 	},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
@@ -104,8 +104,7 @@ mobs:register_arrow("mobs_mc:blaze_fireball", {
 })
 
 -- spawn eggs
---mobs:register_egg("mobs_mc:blaze", "Spawn Blaze", "spawn_egg_blaze.png")
-mobs:register_egg("mobs_mc:blaze", "Blaze", "blaze_inv.png", 0)
+mobs:register_egg("mobs_mc:blaze", "Blaze", "mobs_mc_spawn_icon_blaze.png", 0)
 
 
 

chicken.lua

@@ -23,7 +23,7 @@ mobs:register_mob("mobs_mc:chicken", {
 	visual = "mesh",
 	mesh = "mobs_mc_chicken.b3d",
 	textures = {
-		{"chicken.png"},
+		{"mobs_mc_chicken.png"},
 	},
 	visual_size = {x=2.2, y=2.2},
 
@@ -95,7 +95,7 @@ mobs:register_mob("mobs_mc:chicken", {
 mobs:register_spawn("mobs_mc:chicken", mobs_mc.spawn.grassland, minetest.LIGHT_MAX+1, 9, 7000, 3, 31000)
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:chicken", "Chicken", "chicken_inv.png", 0)
+mobs:register_egg("mobs_mc:chicken", "Chicken", "mobs_mc_spawn_icon_chicken.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC chicken loaded")

creeper.lua

@@ -22,7 +22,7 @@ mobs:register_mob("mobs_mc:creeper", {
 	visual = "mesh",
 	mesh = "mobs_mc_creeper.b3d",
 	textures = {
-		{"creeper.png"},
+		{"mobs_mc_creeper.png"},
 	},
 	visual_size = {x=3, y=3},
 	sounds = {
@@ -174,7 +174,7 @@ mobs:spawn_specific("mobs_mc:creeper", mobs_mc.spawn.solid, {"air"},0, 7, 20, 65
 mobs:alias_mob("mobs:creeper", "mobs_mc:creeper")
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:creeper", "Creeper", "creeper_inv.png", 0)
+mobs:register_egg("mobs_mc:creeper", "Creeper", "mobs_mc_spawn_icon_creeper.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Creeper loaded")

ender_dragon.lua

@@ -47,7 +47,7 @@ mobs:register_mob("mobs_mc:enderdragon", {
 	visual = "mesh",
 	mesh = "mobs_mc_ender_dragon.b3d",
 	textures = {
-		{"enderdragon.png"},
+		{"mobs_mc_enderdragon.png"},
 	},
 	visual_size = {x=1, y=1},
 	makes_footstep_sound = true,
@@ -187,5 +187,5 @@ mobs:register_arrow(":mobs_mc:fireball2", {
 	end
 })
 
-mobs:register_egg("mobs_mc:enderdragon", "Ender Dragon", "enderdragon_inv.png", 0)
+mobs:register_egg("mobs_mc:enderdragon", "Ender Dragon", "mobs_mc_spawn_icon_enderdragon.png", 0)
 

endermite.lua

@@ -14,7 +14,7 @@ mobs:register_mob("mobs_mc:endermite", {
 	visual = "mesh",
 	mesh = "mobs_mc_endermite.b3d",
 	textures = {
-		{"endermite.png"},
+		{"mobs_mc_endermite.png"},
 	},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = false,
@@ -36,4 +36,4 @@ mobs:register_mob("mobs_mc:endermite", {
 
 })
 
-mobs:register_egg("mobs_mc:endermite", "Endermite", "endermite_inv.png", 0)
+mobs:register_egg("mobs_mc:endermite", "Endermite", "mobs_mc_spawn_icon_endermite.png", 0)

ghast.lua

@@ -22,10 +22,9 @@ mobs:register_mob("mobs_mc:ghast", {
 	visual = "mesh",
 	mesh = "mobs_mc_ghast.b3d",
 	textures = {
-		{"ghast.png"},
+		{"mobs_mc_ghast.png"},
 	},
 	visual_size = {x=4, y=4},
-	blood_texture ="mobs_blood.png",
 	makes_footstep_sound = true,
 	sounds = {
 		shoot = "mobs_fireball",
@@ -111,8 +110,7 @@ mobs:register_arrow(":mobs_monster:fireball", {
 
 
 -- spawn eggs
---mobs:register_egg("mobs_mc:ghast", "Ghast", "ghast_front.png")
-mobs:register_egg("mobs_mc:ghast", "Ghast", "ghast_inv.png", 0)
+mobs:register_egg("mobs_mc:ghast", "Ghast", "mobs_mc_spawn_icon_ghast.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Ghast loaded")

guardian.lua

@@ -23,7 +23,7 @@ mobs:register_mob("mobs_mc:guardian", {
 	visual = "mesh",
 	mesh = "mobs_mc_guardian.b3d",
 	textures = {
-		{"guardian.png"},
+		{"mobs_mc_guardian.png"},
 	},
 	visual_size = {x=4, y=4},
     sounds = {
@@ -61,4 +61,4 @@ mobs:register_mob("mobs_mc:guardian", {
 mobs:register_spawn("mobs_mc:guardian", mobs_mc.spawn.water, minetest.LIGHT_MAX+1, 0, 5000, 2, -1000, true)
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:guardian", "Guardian", "guardian_inv.png", 0)
+mobs:register_egg("mobs_mc:guardian", "Guardian", "mobs_mc_spawn_icon_guardian.png", 0)

guardian_elder.lua

@@ -24,7 +24,7 @@ mobs:register_mob("mobs_mc:guardian_elder", {
 	visual = "mesh",
 	mesh = "mobs_mc_guardian.b3d",
 	textures = {
-		{"guardian_elder.png"},
+		{"mobs_mc_guardian_elder.png"},
 	},
 	visual_size = {x=4, y=4},
     sounds = {
@@ -62,5 +62,5 @@ mobs:register_mob("mobs_mc:guardian_elder", {
 mobs:register_spawn("mobs_mc:guardian_elder", mobs_mc.spawn.water, minetest.LIGHT_MAX+1, 0, 5000, 2, -1000, true)
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:guardian_elder", "Guardian Elder", "guardian_elder_inv.png", 0)
+mobs:register_egg("mobs_mc:guardian_elder", "Guardian Elder", "mobs_mc_spawn_icon_guardian_elder.png", 0)
 

iron_golem.lua

@@ -21,7 +21,7 @@ mobs:register_mob("mobs_mc:iron_golem", {
 	visual = "mesh",
 	mesh = "mobs_mc_iron_golem.b3d",
 	textures = {
-		{"iron_golem.png"},
+		{"mobs_mc_iron_golem.png"},
 	},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
@@ -70,7 +70,7 @@ mobs:register_mob("mobs_mc:iron_golem", {
 
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:iron_golem", "Iron Golem", "iron_golem_inv.png", 0)
+mobs:register_egg("mobs_mc:iron_golem", "Iron Golem", "mobs_mc_spawn_icon_iron_golem.png", 0)
 
 
 if minetest.settings:get_bool("log_mods") then

llama.lua

@@ -21,7 +21,7 @@ mobs:register_mob("mobs_mc:llama", {
     rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_llama.b3d",
-    textures = {{"llama.png"},{"llama1.png"},{"llama2.png"},{"llama3.png"},{"llama4.png"}},
+	textures = {{"mobs_mc_llama.png"},{"mobs_mc_llama_brown.png"},{"mobs_mc_llama_creamy.png"},{"mobs_mc_llama_white.png"},{"mobs_mc_llama_gray.png"}},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
 	runaway = true,
@@ -149,7 +149,7 @@ mobs:register_mob("mobs_mc:llama", {
 mobs:register_spawn("mobs_mc:llama", mobs_mc.spawn.savanna, minetest.LIGHT_MAX+1, 0, 15000, 1, 40)
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:llama", "Llama", "llama_inv.png", 0)
+mobs:register_egg("mobs_mc:llama", "Llama", "mobs_mc_spawn_icon_llama.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Llama loaded")

parrot.lua

@@ -22,12 +22,9 @@ mobs:register_mob("mobs_mc:parrot", {
     rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_parrot.b3d",
-	textures = {{"parrot_blue.png"},{"parrot_green.png"},{"parrot_grey.png"},{"parrot_red_blue.png"},{"parrot_yellow_blue.png"}},
+	textures = {{"mobs_mc_parrot_blue.png"},{"mobs_mc_parrot_green.png"},{"mobs_mc_parrot_grey.png"},{"mobs_mc_parrot_red_blue.png"},{"mobs_mc_parrot_yellow_blue.png"}},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
-	sounds = {
-		random = "Villagerdeny",
-	},
 	walk_velocity = .8,
 	run_velocity = 2.6,
 	drops = {
@@ -84,7 +81,7 @@ mobs:register_mob("mobs_mc:parrot", {
 mobs:spawn_specific("mobs_mc:parrot", mobs_mc.spawn.jungle, {"air"}, 0, minetest.LIGHT_MAX+1, 20, 20000, 2, 15, 20)
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:parrot", "Parrot", "parrot_inv.png", 0)
+mobs:register_egg("mobs_mc:parrot", "Parrot", "mobs_mc_spawn_icon_parrot.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Parrot loaded")

polar_bear.lua

@@ -21,7 +21,7 @@ mobs:register_mob("mobs_mc:polar_bear", {
 	visual = "mesh",
 	mesh = "mobs_mc_polar_bear.b3d",
 	textures = {
-		{"polarbear.png"},
+		{"mobs_mc_polarbear.png"},
 	},
 	visual_size = {x=3.0, y=3.0},
 	makes_footstep_sound = true,
@@ -74,7 +74,7 @@ mobs:register_spawn("mobs_mc:polar_bear", mobs_mc.spawn.snow, minetest.LIGHT_MAX
 
 
 
-mobs:register_egg("mobs_mc:polar_bear", "Polar Bear", "polarbear_inv.png", 0)
+mobs:register_egg("mobs_mc:polar_bear", "Polar Bear", "mobs_mc_spawn_icon_polarbear.png", 0)
 
 
 if minetest.settings:get_bool("log_mods") then

rabbit.lua

@@ -159,10 +159,10 @@ end
 mobs:spawn(spawn_grass)
 
 -- Spawn egg
-mobs:register_egg("mobs_mc:rabbit", "Rabbit", "rabbit_inv.png", 0)
+mobs:register_egg("mobs_mc:rabbit", "Rabbit", "mobs_mc_spawn_icon_rabbit.png", 0)
 
 -- Note: This spawn egg does not exist in Minecraft
-mobs:register_egg("mobs_mc:killer_bunny", "Killer Bunny", "rabbit_inv.png^[colorize:#FF0000:192", 0) -- TODO: Update inventory image
+mobs:register_egg("mobs_mc:killer_bunny", "Killer Bunny", "mobs_mc_spawn_icon_rabbit.png^[colorize:#FF0000:192", 0) -- TODO: Update inventory image
 
 
 -- compatibility

shulker.lua

@@ -27,7 +27,8 @@ mobs:register_mob("mobs_mc:shulker", {
     rotate = -180,
 	visual = "mesh",
 	mesh = "mobs_mc_shulker.b3d",
-    textures = {{"shulker.png"},{"shulker1.png"},{"shulker2.png"},{"shulker3.png"},{"shulker4.png"},{"shulker5.png"},{"shulker6.png"},{"shulker7.png"},{"shulker8.png"},{"shulker9.png"},{"shulker10.png"},{"shulker11.png"},{"shulker12.png"},{"shulker13.png"},{"shulker14.png"},{"shulker15.png"},{"shulker16.png"},},
+	textures = { "mobs_mc_shulker_purple.png", },
+	-- TODO: Make shulker dye-able
 	visual_size = {x=3, y=3},
 	walk_velocity = 0.0000000001,
 	run_velocity = 0.0000000001,
@@ -74,7 +75,7 @@ mobs:register_arrow("mobs_mc:shulkerbullet", {
 })
 
 
-mobs:register_egg("mobs_mc:shulker", "Shulker", "shulker_inv.png", 0)
+mobs:register_egg("mobs_mc:shulker", "Shulker", "mobs_mc_spawn_icon_shulker.png", 0)
 
 mobs:spawn_specific("mobs_mc:shulker", mobs_mc.spawn.end_city, 0, minetest.LIGHT_MAX+1, 5, 3, 1, -31000, -5000)
 

silverfish.lua

@@ -14,7 +14,7 @@ mobs:register_mob("mobs_mc:silverfish", {
 	visual = "mesh",
 	mesh = "mobs_mc_silverfish.b3d",
 	textures = {
-		{"silverfish.png"},
+		{"mobs_mc_silverfish.png"},
 	},
 	pathfinding = 1,
 	visual_size = {x=3, y=3},
@@ -40,7 +40,7 @@ mobs:register_mob("mobs_mc:silverfish", {
 	damage = 1,
 })
 
-mobs:register_egg("mobs_mc:silverfish", "Silverfish", "silverfish_inv.png", 0)
+mobs:register_egg("mobs_mc:silverfish", "Silverfish", "mobs_mc_spawn_icon_silverfish.png", 0)
 
 -- Monster egg blocks (Minetest Game)
 if minetest.get_modpath("default") and mobs_mc.create_monster_egg_nodes then

skeleton.lua

@@ -24,7 +24,7 @@ mobs:register_mob("mobs_mc:skeleton", {
 	mesh = "mobs_mc_skeleton.b3d",
 	    rotate = -180,
 	textures = {
-		{"skeleton.png"},
+		{"mobs_mc_skeleton.png"},
 	},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
@@ -95,7 +95,7 @@ mobs:alias_mob("mobs:skeleton", "mobs_mc:skeleton")
 mobs:spawn_specific("mobs_mc:skeleton", mobs_mc.spawn.solid,{"air"},0, 7, 20, 7000, 2, -110, 31000)
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:skeleton", "Skeleton", "skeleton_inv.png", 0)
+mobs:register_egg("mobs_mc:skeleton", "Skeleton", "mobs_mc_spawn_icon_skeleton.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Skeleton loaded")

skeleton_stray.lua

@@ -24,7 +24,7 @@ mobs:register_mob("mobs_mc:stray", {
 	visual = "mesh",
 	mesh = "mobs_mc_skeleton_stray.b3d",
 	textures = {
-		{"stray.png"},
+		{"mobs_mc_stray.png"},
 	},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
@@ -90,7 +90,7 @@ mobs:register_mob("mobs_mc:stray", {
 mobs:spawn_specific("mobs_mc:stray", mobs_mc.spawn.snow, {"air"}, minetest.LIGHT_MAX+1, minetest.LIGHT_MAX+1, 20, 9000, 2, -110, 31000)
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:stray", "Stray", "stray_inv.png", 0)
+mobs:register_egg("mobs_mc:stray", "Stray", "mobs_mc_spawn_icon_stray.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Stray Skeleton loaded")

skeleton_wither.lua

@@ -24,7 +24,7 @@ mobs:register_mob("mobs_mc:witherskeleton", {
 	visual = "mesh",
 	mesh = "mobs_mc_wither_skeleton.b3d",
 	textures = {
-		{"witherskeleton.png"},
+		{"mobs_mc_witherskeleton.png"},
 	},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
@@ -85,7 +85,7 @@ mobs:register_mob("mobs_mc:witherskeleton", {
 --spawn
 mobs:register_spawn("mobs_mc:witherskeleton", mobs_mc.spawn.nether_fortress, 7, 0, 5000, 3, -3000, true)
 -- spawn eggs
-mobs:register_egg("mobs_mc:witherskeleton", "Wither Skeleton", "witherskeleton_inv.png", 0)
+mobs:register_egg("mobs_mc:witherskeleton", "Wither Skeleton", "mobs_mc_spawn_icon_witherskeleton.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Wither Skeleton loaded")

slime+magma_cube.lua

@@ -431,8 +431,8 @@ mobs:alias_mob("mobs_mc:lavamedium", "mobs_mc:magma_cube_small")
 mobs:alias_mob("mobs_mc:lavabig", "mobs_mc:magma_cube_big")
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:magma_cube_big", "Magma Cube", "magmacube_inv.png")
-mobs:register_egg("mobs_mc:slime_big", "Slime", "slime_inv.png")
+mobs:register_egg("mobs_mc:magma_cube_big", "Magma Cube", "mobs_mc_spawn_icon_magmacube.png")
+mobs:register_egg("mobs_mc:slime_big", "Slime", "mobs_mc_spawn_icon_slime.png")
 
 
 if minetest.settings:get_bool("log_mods") then

snowman.lua

@@ -48,7 +48,7 @@ mobs:register_mob("mobs_mc:enderman", {
 	visual = "mesh",
 	mesh = "mobs_mc_snowman.b3d",
 	textures = {
-	{"mobs_endermen.png"}
+	{"mobs_mc_snowman.png"}
 	},
 	visual_size = {x=1.2, y=2.5},
 	makes_footstep_sound = true,
@@ -106,7 +106,7 @@ mobs:register_mob("mobs_mc:enderman", {
 
 
 -- spawn eggs
-mobs:register_egg("mobs_mc:enderman", "Enderman", "spawn_egg_overlay.png")
+mobs:register_egg("mobs_mc:snowman", "Snow Golem", "mobs_mc_spawn_icon_snowman.png", 0)
 
 
 if minetest.settings:get_bool("log_mods") then

spider.lua

@@ -26,7 +26,7 @@ mobs:register_mob("mobs_mc:spider", {
 	visual = "mesh",
 	mesh = "mobs_mc_spider.b3d",
 	textures = {
-		{"spider.png"},
+		{"mobs_mc_spider.png"},
 	},
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = false,
@@ -65,8 +65,7 @@ mobs:alias_mob("mobs:spider", "mobs_mc:spider")
 mobs:alias_mob("esmobs:spider", "mobs_mc:spider")
 
 -- spawn eggs
---mobs:register_egg("mobs_mc:spider", "Spider", "mobs_cobweb.png", 1)
-mobs:register_egg("mobs_mc:spider", "Spider", "spider_inv.png", 0)
+mobs:register_egg("mobs_mc:spider", "Spider", "mobs_mc_spawn_icon_spider.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Spiders loaded")

spider_cave.lua

@@ -26,7 +26,7 @@ mobs:register_mob("mobs_mc:cavespider", {
 	visual = "mesh",
 	mesh = "mobs_mc_spider.b3d",
 	textures = {
-		{"cave_spider.png"},
+		{"mobs_mc_cave_spider.png"},
 	},
 	visual_size = {x=2, y=2},
 	makes_footstep_sound = false,
@@ -59,8 +59,7 @@ mobs:register_mob("mobs_mc:cavespider", {
 })
 
 -- spawn eggs
---mobs:register_egg("mobs_mc:spider", "Spider", "mobs_cobweb.png", 1)
-mobs:register_egg("mobs_mc:cavespider", "Cave Spider", "cave_spider_inv.png", 0)
+mobs:register_egg("mobs_mc:cavespider", "Cave Spider", "mobs_mc_spawn_icon_cave_spider.png", 0)
 
 if minetest.settings:get_bool("log_mods") then
 	minetest.log("action", "MC Spiders loaded")

squid.lua

@@ -17,7 +17,7 @@ mobs:register_mob("mobs_mc:squid", {
     visual = "mesh",
     mesh = "mobs_mc_squid.b3d",
     textures = {
-        {"squid.png"}
+        {"mobs_mc_squid.png"}
     },
     sounds = {
 		damage = "mobs_mc_squid_hurt",
@@ -62,5 +62,4 @@ mobs:spawn_specific("mobs_mc:squid", mobs_mc.spawn.water, {mobs_mc.items.water_s
 mobs:alias_mob("mobs:squid", "mobs_mc:squid")
 
 -- spawn eggs
---mobs:register_egg("mobs_mc:squid", "Spawn Squid", "spawn_egg_squid.png")
-mobs:register_egg("mobs_mc:squid", "Squid", "squid_inv.png", 0)
+mobs:register_egg("mobs_mc:squid", "Squid", "mobs_mc_spawn_icon_squid.png", 0)