From d2a49799aeee8becbbbaf0e609bd71f3e14867f7 Mon Sep 17 00:00:00 2001 From: teknomunk Date: Sun, 5 May 2024 16:22:19 +0000 Subject: [PATCH] Change over internal name so that /spawn_mob works --- mods/ENTITIES/mobs_mc/enderman.lua | 12 ++++++------ mods/ITEMS/mcl_bows/arrow.lua | 2 +- mods/ITEMS/mcl_bows/rocket.lua | 2 +- mods/ITEMS/mcl_farming/pumpkin.lua | 2 +- mods/ITEMS/mcl_mobspawners/init.lua | 2 +- mods/ITEMS/mcl_potions/tipped_arrow.lua | 2 +- mods/MAPGEN/mcl_end_island/init.lua | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua index 94ad07b7c..cd2cb54c1 100644 --- a/mods/ENTITIES/mobs_mc/enderman.lua +++ b/mods/ENTITIES/mobs_mc/enderman.lua @@ -109,7 +109,7 @@ local psdefs = {{ texture = "mcl_portals_particle"..math.random(1, 5)..".png", }} -mcl_mobs.register_mob("mobs_mc:enderman", { +mcl_mobs.register_mob("mobs_mc:rover", { description = S("Rover"), type = "monster", spawn_class = "passive", @@ -495,7 +495,7 @@ mcl_mobs.register_mob("mobs_mc:enderman", { -- End spawn mcl_mobs:spawn_specific( -"mobs_mc:enderman", +"mobs_mc:rover", "end", "ground", { @@ -515,7 +515,7 @@ mcl_vars.mg_end_min, mcl_vars.mg_end_max) -- Overworld spawn mcl_mobs:spawn_specific( -"mobs_mc:enderman", +"mobs_mc:rover", "overworld", "ground", { @@ -664,7 +664,7 @@ mcl_vars.mg_overworld_max) -- Nether spawn (rare) mcl_mobs:spawn_specific( -"mobs_mc:enderman", +"mobs_mc:rover", "nether", "ground", { @@ -681,7 +681,7 @@ mcl_vars.mg_nether_max) -- Warped Forest spawn (common) mcl_mobs:spawn_specific( -"mobs_mc:enderman", +"mobs_mc:rover", "nether", "ground", { @@ -696,4 +696,4 @@ mcl_vars.mg_nether_min, mcl_vars.mg_nether_max) -- spawn eggs -mcl_mobs.register_egg("mobs_mc:enderman", S("Rover"), "#252525", "#151515", 0) +mcl_mobs.register_egg("mobs_mc:rover", S("Rover"), "#252525", "#151515", 0) diff --git a/mods/ITEMS/mcl_bows/arrow.lua b/mods/ITEMS/mcl_bows/arrow.lua index 37e41fa6d..652819aa6 100644 --- a/mods/ITEMS/mcl_bows/arrow.lua +++ b/mods/ITEMS/mcl_bows/arrow.lua @@ -249,7 +249,7 @@ function ARROW_ENTITY.on_step(self, dtime) end -- Punch target object but avoid hurting enderman. - if not lua or lua.name ~= "mobs_mc:enderman" then + if not lua or lua.name ~= "mobs_mc:rover" then if not self._in_player then damage_particles(vector.add(pos, vector.multiply(self.object:get_velocity(), 0.1)), self._is_critical) end diff --git a/mods/ITEMS/mcl_bows/rocket.lua b/mods/ITEMS/mcl_bows/rocket.lua index 26998bb7c..8cd690171 100644 --- a/mods/ITEMS/mcl_bows/rocket.lua +++ b/mods/ITEMS/mcl_bows/rocket.lua @@ -470,7 +470,7 @@ function ARROW_ENTITY.on_step(self, dtime) end -- Punch target object but avoid hurting enderman. - if not lua or lua.name ~= "mobs_mc:enderman" then + if not lua or lua.name ~= "mobs_mc:rover" then if self._in_player == false then damage_particles(self.object:get_pos(), self._is_critical) end diff --git a/mods/ITEMS/mcl_farming/pumpkin.lua b/mods/ITEMS/mcl_farming/pumpkin.lua index 47c2a0ddf..fe437f5cf 100644 --- a/mods/ITEMS/mcl_farming/pumpkin.lua +++ b/mods/ITEMS/mcl_farming/pumpkin.lua @@ -119,7 +119,7 @@ pumpkin_face_base_def.groups.non_combat_armor=1 pumpkin_face_base_def.groups.armor_head=1 pumpkin_face_base_def.groups.non_combat_armor_head=1 pumpkin_face_base_def._mcl_armor_mob_range_factor = 0 -pumpkin_face_base_def._mcl_armor_mob_range_mob = "mobs_mc:enderman" +pumpkin_face_base_def._mcl_armor_mob_range_mob = "mobs_mc:rover" pumpkin_face_base_def._mcl_armor_element = "head" pumpkin_face_base_def._mcl_armor_texture = "mcl_farming_pumpkin_face.png" diff --git a/mods/ITEMS/mcl_mobspawners/init.lua b/mods/ITEMS/mcl_mobspawners/init.lua index 290980e78..ae6326009 100644 --- a/mods/ITEMS/mcl_mobspawners/init.lua +++ b/mods/ITEMS/mcl_mobspawners/init.lua @@ -39,7 +39,7 @@ end local doll_size_overrides = { ["mobs_mc:guardian"] = { x = 0.6, y = 0.6 }, ["mobs_mc:guardian_elder"] = { x = 0.72, y = 0.72 }, - ["mobs_mc:enderman"] = { x = 0.8, y = 0.8 }, + ["mobs_mc:rover"] = { x = 0.8, y = 0.8 }, ["mobs_mc:iron_golem"] = { x = 0.9, y = 0.9 }, ["mobs_mc:ghast"] = { x = 1.05, y = 1.05 }, ["mobs_mc:wither"] = { x = 1.2, y = 1.2 }, diff --git a/mods/ITEMS/mcl_potions/tipped_arrow.lua b/mods/ITEMS/mcl_potions/tipped_arrow.lua index 53a37705e..c0def3983 100644 --- a/mods/ITEMS/mcl_potions/tipped_arrow.lua +++ b/mods/ITEMS/mcl_potions/tipped_arrow.lua @@ -266,7 +266,7 @@ function mcl_potions.register_arrow(name, desc, color, def) -- Punch target object but avoid hurting enderman. if lua then - if lua.name ~= "mobs_mc:enderman" then + if lua.name ~= "mobs_mc:rover" then obj:punch(self.object, 1.0, { full_punch_interval=1.0, damage_groups={fleshy=self._damage}, diff --git a/mods/MAPGEN/mcl_end_island/init.lua b/mods/MAPGEN/mcl_end_island/init.lua index 434c3c6ef..46c841beb 100644 --- a/mods/MAPGEN/mcl_end_island/init.lua +++ b/mods/MAPGEN/mcl_end_island/init.lua @@ -34,7 +34,7 @@ end, function(minp,maxp,blockseed) table.shuffle(nn) if nn and #nn > 0 then for i=1,pr:next(1,math.min(5,#nn)) do - minetest.add_entity(vector.offset(nn[i],0,1,0),"mobs_mc:enderman") + minetest.add_entity(vector.offset(nn[i],0,1,0),"mobs_mc:rover") end end end, 15, true)