From 731f42ac88c31c8e2e7def0e867b3e351fb97f70 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 19 Aug 2020 18:47:58 +0200 Subject: [PATCH] Rename and move texture: tnt_smoke --- mods/CORE/mcl_explosions/init.lua | 2 +- mods/CORE/mcl_explosions/mod.conf | 1 + .../textures/mcl_particles_smoke.png} | Bin mods/ENTITIES/mcl_mobs/api.lua | 16 ++++++++-------- mods/ENTITIES/mcl_mobs/mod.conf | 1 + mods/ENTITIES/mobs_mc/depends.txt | 1 + mods/ENTITIES/mobs_mc/snowman.lua | 2 +- mods/ITEMS/REDSTONE/mesecons_torch/init.lua | 2 +- mods/ITEMS/mcl_tnt/depends.txt | 1 + mods/ITEMS/mcl_tnt/init.lua | 6 +++--- tools/Conversion_Table.csv | 2 +- 11 files changed, 19 insertions(+), 15 deletions(-) rename mods/{ITEMS/mcl_tnt/textures/tnt_smoke.png => CORE/mcl_particles/textures/mcl_particles_smoke.png} (100%) diff --git a/mods/CORE/mcl_explosions/init.lua b/mods/CORE/mcl_explosions/init.lua index 84f3322df4..fdf1d6ad16 100644 --- a/mods/CORE/mcl_explosions/init.lua +++ b/mods/CORE/mcl_explosions/init.lua @@ -124,7 +124,7 @@ local function add_particles(pos, radius) maxexptime = 1.0, minsize = radius * 0.5, maxsize = radius * 1.0, - texture = "tnt_smoke.png", + texture = "mcl_particles_smoke.png", }) end diff --git a/mods/CORE/mcl_explosions/mod.conf b/mods/CORE/mcl_explosions/mod.conf index 7ce4b678d9..4ec206e17a 100644 --- a/mods/CORE/mcl_explosions/mod.conf +++ b/mods/CORE/mcl_explosions/mod.conf @@ -1,3 +1,4 @@ name = mcl_explosions description = A common API to create explosions. +depends = mcl_particles optional_depends = mcl_fire diff --git a/mods/ITEMS/mcl_tnt/textures/tnt_smoke.png b/mods/CORE/mcl_particles/textures/mcl_particles_smoke.png similarity index 100% rename from mods/ITEMS/mcl_tnt/textures/tnt_smoke.png rename to mods/CORE/mcl_particles/textures/mcl_particles_smoke.png diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua index 098485f327..7dd4b70688 100644 --- a/mods/ENTITIES/mcl_mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -516,7 +516,7 @@ mobs.death_effect = function(pos, collisionbox) maxexptime = 1.5, minsize = 0.5, maxsize = 1.5, - texture = "tnt_smoke.png", + texture = "mcl_particles_smoke.png", }) end @@ -841,7 +841,7 @@ local do_env_damage = function(self) if not (mod_weather and (mcl_weather.rain.raining or mcl_weather.state == "snow") and mcl_weather.is_outdoor(pos)) then self.health = self.health - damage - effect(pos, 5, "tnt_smoke.png") + effect(pos, 5, "mcl_particles_smoke.png") if check_for_death(self, "light", {type = "light"}) then return true @@ -907,7 +907,7 @@ local do_env_damage = function(self) self.health = self.health - self.water_damage - effect(pos, 5, "tnt_smoke.png", nil, nil, 1, nil) + effect(pos, 5, "mcl_particles_smoke.png", nil, nil, 1, nil) if check_for_death(self, "water", {type = "environment", pos = pos, node = self.standing_in}) then @@ -952,7 +952,7 @@ local do_env_damage = function(self) self.health = self.health - nodef.damage_per_second - effect(pos, 5, "tnt_smoke.png") + effect(pos, 5, "mcl_particles_smoke.png") if check_for_death(self, "dps", {type = "environment", pos = pos, node = self.standing_in}) then @@ -2327,7 +2327,7 @@ local do_states = function(self, dtime) }, true) entity_physics(pos, entity_damage_radius) - effect(pos, 32, "tnt_smoke.png", nil, nil, node_break_radius, 1, 0) + effect(pos, 32, "mcl_particles_smoke.png", nil, nil, node_break_radius, 1, 0) end end self.object:remove() @@ -2643,7 +2643,7 @@ local falling = function(self, pos) if damage > 0 then self.health = self.health - damage - effect(pos, 5, "tnt_smoke.png", 1, 2, 2, nil) + effect(pos, 5, "mcl_particles_smoke.png", 1, 2, 2, nil) if check_for_death(self, "fall", {type = "fall"}) then return true @@ -3960,7 +3960,7 @@ function mobs:safe_boom(self, pos, strength) }, true) local radius = strength entity_physics(pos, radius) - effect(pos, 32, "tnt_smoke.png", radius * 3, radius * 5, radius, 1, 0) + effect(pos, 32, "mcl_particles_smoke.png", radius * 3, radius * 5, radius, 1, 0) end @@ -4181,7 +4181,7 @@ function mobs:spawn_child(pos, mob_type) end local ent = child:get_luaentity() - effect(pos, 15, "tnt_smoke.png", 1, 2, 2, 15, 5) + effect(pos, 15, "mcl_particles_smoke.png", 1, 2, 2, 15, 5) ent.child = true diff --git a/mods/ENTITIES/mcl_mobs/mod.conf b/mods/ENTITIES/mcl_mobs/mod.conf index a32827a65b..d1840c697f 100644 --- a/mods/ENTITIES/mcl_mobs/mod.conf +++ b/mods/ENTITIES/mcl_mobs/mod.conf @@ -1,2 +1,3 @@ name = mcl_mobs +depends = mcl_particles optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor diff --git a/mods/ENTITIES/mobs_mc/depends.txt b/mods/ENTITIES/mobs_mc/depends.txt index b37d4adb99..4a2756661f 100644 --- a/mods/ENTITIES/mobs_mc/depends.txt +++ b/mods/ENTITIES/mobs_mc/depends.txt @@ -1,4 +1,5 @@ mcl_init +mcl_particles default? mcl_mobs mcl_tnt? diff --git a/mods/ENTITIES/mobs_mc/snowman.lua b/mods/ENTITIES/mobs_mc/snowman.lua index 983391e0ac..5069240bdb 100644 --- a/mods/ENTITIES/mobs_mc/snowman.lua +++ b/mods/ENTITIES/mobs_mc/snowman.lua @@ -144,7 +144,7 @@ local summon_particles = function(obj) maxexptime = 2.0, minsize = 2.0, maxsize = 3.0, - texture = "tnt_smoke.png", + texture = "mcl_particles_smoke.png", }) end diff --git a/mods/ITEMS/REDSTONE/mesecons_torch/init.lua b/mods/ITEMS/REDSTONE/mesecons_torch/init.lua index 5e68306ff0..c7c4a4ca2a 100644 --- a/mods/ITEMS/REDSTONE/mesecons_torch/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_torch/init.lua @@ -56,7 +56,7 @@ local torch_overheated = function(pos) velocity = {x = 0, y = 0.6, z = 0}, expirationtime = 1.2, size = 1.5, - texture = "tnt_smoke.png", + texture = "mcl_particles_smoke.png", }) local timer = minetest.get_node_timer(pos) timer:start(TORCH_COOLOFF) diff --git a/mods/ITEMS/mcl_tnt/depends.txt b/mods/ITEMS/mcl_tnt/depends.txt index e4c208ea6b..6a2354764d 100644 --- a/mods/ITEMS/mcl_tnt/depends.txt +++ b/mods/ITEMS/mcl_tnt/depends.txt @@ -1,4 +1,5 @@ mcl_explosions +mcl_particles mcl_sounds? mcl_mobitems? mcl_death_messages? diff --git a/mods/ITEMS/mcl_tnt/init.lua b/mods/ITEMS/mcl_tnt/init.lua index 14865febf0..ef4fb33c22 100644 --- a/mods/ITEMS/mcl_tnt/init.lua +++ b/mods/ITEMS/mcl_tnt/init.lua @@ -28,7 +28,7 @@ tnt.smoke_step = function(pos) expirationtime = 0.15 + math.random() * 0.25, size = 1.0 + math.random(), collisiondetection = false, - texture = "tnt_smoke.png" + texture = "mcl_particles_smoke.png" }) end @@ -130,12 +130,12 @@ local function add_effects(pos, radius, drops) maxexptime = 2.5, minsize = radius * 1, maxsize = radius * 3, - texture = "tnt_smoke.png", + texture = "mcl_particles_smoke.png", }) -- we just dropped some items. Look at the items entities and pick -- one of them to use as texture - local texture = "tnt_smoke.png" --fallback texture + local texture = "mcl_particles_smoke.png" --fallback texture local most = 0 for name, stack in pairs(drops) do local count = stack:get_count() diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 987ab64e1b..0cad45eaf7 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -776,7 +776,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,hbhunger_icon_health_poison.png,88,0,9,9,0,0,y /assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,hbhunger_icon.png,52,27,9,9,0,0,y /assets/minecraft/textures/gui,icons.png,/mods/PLAYER/mcl_hunger/textures,mcl_hunger_icon_foodpoison.png,88,27,9,9,0,0,y -/assets/minecraft/textures/particle,particles.png,/mods/ITEMS/mcl_tnt/textures,tnt_smoke.png,56,0,8,8,0,0,y +/assets/minecraft/textures/particle,particles.png,/mods/CORE/mcl_particles/textures,mcl_particles_smoke.png,56,0,8,8,0,0,y /assets/minecraft/textures/blocks,shulker_top_black.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_black_shulker_box_top.png,,,,,,,y /assets/minecraft/textures/blocks,shulker_top_blue.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_blue_shulker_box_top.png,,,,,,,y /assets/minecraft/textures/blocks,shulker_top_brown.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_brown_shulker_box_top.png,,,,,,,y