From 90298821a358955e481a429cb98923a7d016b71d Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 5 Jan 2020 10:49:04 +0100 Subject: [PATCH] Remove mob aliases --- mods/ENTITIES/mobs_mc/cow+mooshroom.lua | 3 --- mods/ENTITIES/mobs_mc/creeper.lua | 3 --- mods/ENTITIES/mobs_mc/horse.lua | 3 --- mods/ENTITIES/mobs_mc/ocelot.lua | 3 --- mods/ENTITIES/mobs_mc/pig.lua | 3 --- mods/ENTITIES/mobs_mc/polar_bear.lua | 4 ---- mods/ENTITIES/mobs_mc/rabbit.lua | 3 --- mods/ENTITIES/mobs_mc/sheep.lua | 2 -- mods/ENTITIES/mobs_mc/skeleton+stray.lua | 3 --- mods/ENTITIES/mobs_mc/slime+magma_cube.lua | 8 -------- mods/ENTITIES/mobs_mc/spider.lua | 4 ---- mods/ENTITIES/mobs_mc/squid.lua | 3 --- mods/ENTITIES/mobs_mc/villager.lua | 3 --- mods/ENTITIES/mobs_mc/wolf.lua | 6 ------ mods/ENTITIES/mobs_mc/zombie.lua | 3 --- mods/ENTITIES/mobs_mc/zombiepig.lua | 3 --- 16 files changed, 57 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua index cfc4991f..c93ebec4 100644 --- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua +++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua @@ -138,9 +138,6 @@ mobs:register_mob("mobs_mc:mooshroom", mooshroom_def) mobs:spawn_specific("mobs_mc:cow", mobs_mc.spawn.grassland, {"air"}, 9, minetest.LIGHT_MAX+1, 30, 17000, 20, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) mobs:spawn_specific("mobs_mc:mooshroom", mobs_mc.spawn.mushroom_island, {"air"}, 9, minetest.LIGHT_MAX+1, 30, 17000, 10, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) --- compatibility -mobs:alias_mob("mobs_animal:cow", "mobs_mc:cow") - -- spawn egg mobs:register_egg("mobs_mc:cow", S("Cow"), "mobs_mc_spawn_icon_cow.png", 0) mobs:register_egg("mobs_mc:mooshroom", S("Mooshroom"), "mobs_mc_spawn_icon_mooshroom.png", 0) diff --git a/mods/ENTITIES/mobs_mc/creeper.lua b/mods/ENTITIES/mobs_mc/creeper.lua index b1c31054..4bda7a70 100644 --- a/mods/ENTITIES/mobs_mc/creeper.lua +++ b/mods/ENTITIES/mobs_mc/creeper.lua @@ -120,9 +120,6 @@ mobs:register_mob("mobs_mc:creeper", { mobs:spawn_specific("mobs_mc:creeper", mobs_mc.spawn.solid, {"air"}, 0, 7, 20, 16500, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) --- compatibility -mobs:alias_mob("mobs:creeper", "mobs_mc:creeper") - -- spawn eggs mobs:register_egg("mobs_mc:creeper", S("Creeper"), "mobs_mc_spawn_icon_creeper.png", 0) diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua index 7eea999a..bf95fa84 100644 --- a/mods/ENTITIES/mobs_mc/horse.lua +++ b/mods/ENTITIES/mobs_mc/horse.lua @@ -402,9 +402,6 @@ mobs:register_mob("mobs_mc:mule", mule) mobs:spawn_specific("mobs_mc:horse", mobs_mc.spawn.grassland_savanna, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 12, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max) mobs:spawn_specific("mobs_mc:donkey", mobs_mc.spawn.grassland_savanna, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 12, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max) --- compatibility -mobs:alias_mob("mobs:horse", "mobs_mc:horse") - -- spawn eggs mobs:register_egg("mobs_mc:horse", S("Horse"), "mobs_mc_spawn_icon_horse.png", 0) mobs:register_egg("mobs_mc:skeleton_horse", S("Skeleton Horse"), "mobs_mc_spawn_icon_horse_skeleton.png", 0) diff --git a/mods/ENTITIES/mobs_mc/ocelot.lua b/mods/ENTITIES/mobs_mc/ocelot.lua index e2b37220..f57a4e4a 100644 --- a/mods/ENTITIES/mobs_mc/ocelot.lua +++ b/mods/ENTITIES/mobs_mc/ocelot.lua @@ -201,9 +201,6 @@ mobs:spawn({ end, }) --- compatibility -mobs:alias_mob("mobs:kitten", "mobs_mc:ocelot") - -- spawn eggs -- FIXME: The spawn icon shows a cat texture, not an ocelot texture mobs:register_egg("mobs_mc:ocelot", S("Ocelot"), "mobs_mc_spawn_icon_cat.png", 0) diff --git a/mods/ENTITIES/mobs_mc/pig.lua b/mods/ENTITIES/mobs_mc/pig.lua index 472d8f77..768a3052 100644 --- a/mods/ENTITIES/mobs_mc/pig.lua +++ b/mods/ENTITIES/mobs_mc/pig.lua @@ -178,9 +178,6 @@ mobs:register_mob("mobs_mc:pig", { mobs:spawn_specific("mobs_mc:pig", mobs_mc.spawn.grassland, {"air"}, 9, minetest.LIGHT_MAX+1, 30, 15000, 30, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) --- compatibility -mobs:alias_mob("mobs:pig", "mobs_mc:pig") - -- spawn eggs mobs:register_egg("mobs_mc:pig", S("Pig"), "mobs_mc_spawn_icon_pig.png", 0) diff --git a/mods/ENTITIES/mobs_mc/polar_bear.lua b/mods/ENTITIES/mobs_mc/polar_bear.lua index 438ea320..09ca4d8f 100644 --- a/mods/ENTITIES/mobs_mc/polar_bear.lua +++ b/mods/ENTITIES/mobs_mc/polar_bear.lua @@ -56,10 +56,6 @@ mobs:register_mob("mobs_mc:polar_bear", { }) --- compatibility -mobs:alias_mob("mobs_mc:polarbear", "mobs_mc:polar_bear") - - mobs:spawn_specific("mobs_mc:polar_bear", mobs_mc.spawn.snow, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 7000, 3, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) -- spawn egg diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua index 8803b754..104aee14 100644 --- a/mods/ENTITIES/mobs_mc/rabbit.lua +++ b/mods/ENTITIES/mobs_mc/rabbit.lua @@ -162,9 +162,6 @@ mobs:register_egg("mobs_mc:rabbit", S("Rabbit"), "mobs_mc_spawn_icon_rabbit.png" mobs:register_egg("mobs_mc:killer_bunny", S("Killer Bunny"), "mobs_mc_spawn_icon_rabbit.png^[colorize:#FF0000:192", 0) -- TODO: Update inventory image --- compatibility -mobs:alias_mob("mobs:bunny", "mobs_mc:rabbit") - if minetest.settings:get_bool("log_mods") then minetest.log("action", "MC Bunny loaded") end diff --git a/mods/ENTITIES/mobs_mc/sheep.lua b/mods/ENTITIES/mobs_mc/sheep.lua index 3d643ec8..1e254557 100644 --- a/mods/ENTITIES/mobs_mc/sheep.lua +++ b/mods/ENTITIES/mobs_mc/sheep.lua @@ -260,8 +260,6 @@ mobs:register_mob("mobs_mc:sheep", { }) mobs:spawn_specific("mobs_mc:sheep", mobs_mc.spawn.grassland, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 3, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) --- compatibility -mobs:alias_mob("mobs_animal:sheep", "mobs_mc:sheep") -- spawn eggs mobs:register_egg("mobs_mc:sheep", S("Sheep"), "mobs_mc_spawn_icon_sheep.png", 0) diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua index 4157f750..0530f8b6 100644 --- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua +++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua @@ -121,9 +121,6 @@ table.insert(stray.drops, { mobs:register_mob("mobs_mc:stray", stray) --- compatibility -mobs:alias_mob("mobs:skeleton", "mobs_mc:skeleton") - -- Overworld spawn mobs:spawn_specific("mobs_mc:skeleton", mobs_mc.spawn.solid, {"air"}, 0, 7, 20, 17000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) -- Nether spawn diff --git a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua index 00486499..23c40f21 100644 --- a/mods/ENTITIES/mobs_mc/slime+magma_cube.lua +++ b/mods/ENTITIES/mobs_mc/slime+magma_cube.lua @@ -267,14 +267,6 @@ mobs:spawn_specific("mobs_mc:magma_cube_small", mobs_mc.spawn.nether_fortress, { mobs:spawn_specific("mobs_mc:magma_cube_big", mobs_mc.spawn.nether_fortress, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 11200, 4, mmin, mmax) --- Compability -mobs:alias_mob("mobs_mc:greensmall", "mobs_mc:slime_tiny") -mobs:alias_mob("mobs_mc:greenmedium", "mobs_mc:slime_small") -mobs:alias_mob("mobs_mc:greenbig", "mobs_mc:slime_big") -mobs:alias_mob("mobs_mc:lavasmall", "mobs_mc:magma_cube_tiny") -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", S("Magma Cube"), "mobs_mc_spawn_icon_magmacube.png") mobs:register_egg("mobs_mc:slime_big", S("Slime"), "mobs_mc_spawn_icon_slime.png") diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua index 5a353c88..bb93b974 100644 --- a/mods/ENTITIES/mobs_mc/spider.lua +++ b/mods/ENTITIES/mobs_mc/spider.lua @@ -77,10 +77,6 @@ mobs:register_mob("mobs_mc:cave_spider", cave_spider) mobs:spawn_specific("mobs_mc:spider", mobs_mc.spawn.solid, {"air"}, 0, 7, 30, 17000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) --- compatibility -mobs:alias_mob("mobs:spider", "mobs_mc:spider") -mobs:alias_mob("esmobs:spider", "mobs_mc:spider") - -- spawn eggs mobs:register_egg("mobs_mc:spider", S("Spider"), "mobs_mc_spawn_icon_spider.png", 0) mobs:register_egg("mobs_mc:cave_spider", S("Cave Spider"), "mobs_mc_spawn_icon_cave_spider.png", 0) diff --git a/mods/ENTITIES/mobs_mc/squid.lua b/mods/ENTITIES/mobs_mc/squid.lua index d2a45f44..3b045a3b 100644 --- a/mods/ENTITIES/mobs_mc/squid.lua +++ b/mods/ENTITIES/mobs_mc/squid.lua @@ -61,8 +61,5 @@ local water = mobs_mc.spawn_height.water --name, nodes, neighbours, minlight, maxlight, interval, chance, active_object_count, min_height, max_height mobs:spawn_specific("mobs_mc:squid", mobs_mc.spawn.water, {mobs_mc.items.water_source}, 0, minetest.LIGHT_MAX+1, 30, 5500, 3, water-16, water) --- compatibility -mobs:alias_mob("mobs:squid", "mobs_mc:squid") - -- spawn eggs mobs:register_egg("mobs_mc:squid", S("Squid"), "mobs_mc_spawn_icon_squid.png", 0) diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index fe1ff526..4e3229c5 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -1032,9 +1032,6 @@ mobs:register_mob("mobs_mc:villager", { mobs:spawn_specific("mobs_mc:villager", mobs_mc.spawn.village, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 8000, 4, mobs_mc.spawn_height.water+1, mobs_mc.spawn_height.overworld_max) --- compatibility -mobs:alias_mob("mobs:villager", "mobs_mc:villager") - -- spawn eggs mobs:register_egg("mobs_mc:villager", S("Villager"), "mobs_mc_spawn_icon_villager.png", 0) diff --git a/mods/ENTITIES/mobs_mc/wolf.lua b/mods/ENTITIES/mobs_mc/wolf.lua index e8e5de1f..820eaca3 100644 --- a/mods/ENTITIES/mobs_mc/wolf.lua +++ b/mods/ENTITIES/mobs_mc/wolf.lua @@ -206,12 +206,6 @@ mobs:register_mob("mobs_mc:dog", dog) -- Spawn mobs:spawn_specific("mobs_mc:wolf", mobs_mc.spawn.wolf, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 9000, 20, mobs_mc.spawn_height.water+3, mobs_mc.spawn_height.overworld_max) --- Compatibility -mobs:alias_mob("mobs:wolf", "mobs_mc:wolf") -mobs:alias_mob("mobs:dog", "mobs_mc:dog") -mobs:alias_mob("esmobs:wolf", "mobs_mc:wolf") -mobs:alias_mob("esmobs:dog", "mobs_mc:dog") - mobs:register_egg("mobs_mc:wolf", S("Wolf"), "mobs_mc_spawn_icon_wolf.png", 0) if minetest.settings:get_bool("log_mods") then diff --git a/mods/ENTITIES/mobs_mc/zombie.lua b/mods/ENTITIES/mobs_mc/zombie.lua index d7548988..c67e73c3 100644 --- a/mods/ENTITIES/mobs_mc/zombie.lua +++ b/mods/ENTITIES/mobs_mc/zombie.lua @@ -124,9 +124,6 @@ mobs:spawn_specific("mobs_mc:baby_zombie", mobs_mc.spawn.solid, {"air"}, 0, 7, 3 mobs:spawn_specific("mobs_mc:husk", mobs_mc.spawn.desert, {"air"}, 0, 7, 30, 6500, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) mobs:spawn_specific("mobs_mc:baby_husk", mobs_mc.spawn.desert, {"air"}, 0, 7, 30, 65000, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) --- Compatibility -mobs:alias_mob("mobs:zombie", "mobs_mc:zombie") - -- Spawn eggs mobs:register_egg("mobs_mc:husk", S("Husk"), "mobs_mc_spawn_icon_husk.png", 0) mobs:register_egg("mobs_mc:zombie", S("Zombie"), "mobs_mc_spawn_icon_zombie.png", 0) diff --git a/mods/ENTITIES/mobs_mc/zombiepig.lua b/mods/ENTITIES/mobs_mc/zombiepig.lua index 77bd0e19..2f2aeede 100644 --- a/mods/ENTITIES/mobs_mc/zombiepig.lua +++ b/mods/ENTITIES/mobs_mc/zombiepig.lua @@ -108,9 +108,6 @@ mobs:spawn_specific("mobs_mc:baby_pigman", mobs_mc.spawn.solid, {"air"}, 0, mine -- Spawning in Nether portals in the Overworld mobs:spawn_specific("mobs_mc:pigman", mobs_mc.spawn.nether_portal, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 500, 4, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.overworld_max) --- compatibility -mobs:alias_mob("mobs:pigman", "mobs_mc:pigman") - -- spawn eggs mobs:register_egg("mobs_mc:pigman", S("Zombie Pigman"), "mobs_mc_spawn_icon_zombie_pigman.png", 0)