From 689e6edac29f1c200aabf5a2ec9df37e3cc8f4e1 Mon Sep 17 00:00:00 2001
From: MysticTempest <molecularmarc.he@gmail.com>
Date: Fri, 22 Jan 2021 03:07:21 -0600
Subject: [PATCH] Make 'mcl_burning' support other texture packs.

---
 mods/ENTITIES/mcl_burning/engine.lua              |   5 +++--
 .../mcl_burning_entity_flame_animated.png         | Bin 0 -> 762 bytes
 .../textures/mcl_burning_hud_flame_animated.png   | Bin 0 -> 762 bytes
 tools/Conversion_Table.csv                        |   2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 mods/ITEMS/mcl_fire/textures/mcl_burning_entity_flame_animated.png
 create mode 100644 mods/ITEMS/mcl_fire/textures/mcl_burning_hud_flame_animated.png

diff --git a/mods/ENTITIES/mcl_burning/engine.lua b/mods/ENTITIES/mcl_burning/engine.lua
index 1c9f4f56..d8ec8b84 100644
--- a/mods/ENTITIES/mcl_burning/engine.lua
+++ b/mods/ENTITIES/mcl_burning/engine.lua
@@ -240,11 +240,12 @@ function mcl_burning.tick(obj, dtime)
 end
 
 function mcl_burning.update_animation_frame(obj, fire_entity, animation_frame)
-	local fire_texture = "fire_basic_flame_animated.png^[opacity:180^[verticalframe:" .. mcl_burning.animation_frames .. ":" .. animation_frame
+	local fire_texture = "mcl_burning_entity_flame_animated.png^[opacity:180^[verticalframe:" .. mcl_burning.animation_frames .. ":" .. animation_frame
+	local fire_HUD_texture = "mcl_burning_hud_flame_animated.png^[opacity:180^[verticalframe:" .. mcl_burning.animation_frames .. ":" .. animation_frame
 	fire_entity:set_properties({textures = {"blank.png", "blank.png", fire_texture, fire_texture, fire_texture, fire_texture}})
 	if obj:is_player() then
 		local hud_id = mcl_burning.get(obj, "int", "hud_id") - 1
-		obj:hud_change(hud_id, "text", fire_texture)
+		obj:hud_change(hud_id, "text", fire_HUD_texture)
 	end
 end
 
diff --git a/mods/ITEMS/mcl_fire/textures/mcl_burning_entity_flame_animated.png b/mods/ITEMS/mcl_fire/textures/mcl_burning_entity_flame_animated.png
new file mode 100644
index 0000000000000000000000000000000000000000..434bdffddb392c8f3a47674a1fc73d6fe6a3a82c
GIT binary patch
literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq000mG004jl0{{R3@VoR80000aP)t-s0002s
zT`{*i3pQ{=|NsB(o-hB;Kan2}GAt|LT``d#4!1iC&u)V^0000CbW%=J0RR600RR90
z00000xO;kN0007cNkl<ZcmZwGfoJ4S6u|LmH^1Lup_yi~9LQu7LqV@C<-jC)CoC}0
znR37`*#acd3Izu^0QVPMH3th01@@o2H<|3Y>vdp1vf+Kb81m*hIUv4tzmkxd!_mpi
zljNMpOcjU^%S#fT+9%P;F;j%#U#e&8V??8cRszxc%%~o*;A~s92puzBv4&hT5!SJf
z;38aiG;+hH6CD7*af!xR$Qk167vjSN1_eI7DwhBI;2|XaPX*FusI(4Bo1wX;IfDAW
zp&aoIduWJAv4?6&u9XP&*yCf5h?~E9CNyL<IFSJ+JW0DB+{4r7XOK9Z47(A<YVZfJ
zJ(*XJJ@6^eHvr^3d8pV1@QG+EQ`y3*#SC23g^oiNci6+IS$AX4!fbl_s^_3p;<h6P
zm;f+405fo?e1fTm0YF5qAXAV4u~;V*d#=h%Q$LBwdD$A}3q)RFkHB}*ir17zm_geu
zb^GbI3j`jpLtkV5(_(P&B=E5Zkv*4W?0G*(52vrf0D};@h7o0Mf_!JuZB>~7W^`JM
zd&EP`>ZvE)R%1`qnvL5}YwmdSPsRjz_tt*qFW7VH_5(ixz!6KxeAfdkC>_F}d_)8#
ztAOJ>o1CeHA#|M9RAUdLz8QP?f|*T>J+a{C4)N!i!sdHeeRmi#X|bO}wv-kGps*Q{
zhY>G0l)!2?^#F57a^s*f1!ws3y=I&I5z#ZIL<i*Jma}@1g8fX~eJ?Izv!JeLzu&u{
zW8&e|#se~f;81A+(|t$yyWKcTGMJ4hj)KBMo*k)TyzgCJC%E2^yFNEJJt5bP;JUK+
stE0?NhDa+`b8Rzj!<wt<zPB{`1$iO7uSa&q(EtDd07*qoM6N<$f>z94T>t<8

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_fire/textures/mcl_burning_hud_flame_animated.png b/mods/ITEMS/mcl_fire/textures/mcl_burning_hud_flame_animated.png
new file mode 100644
index 0000000000000000000000000000000000000000..434bdffddb392c8f3a47674a1fc73d6fe6a3a82c
GIT binary patch
literal 762
zcmV<W0tNkvP)<h;3K|Lk000e1NJLTq000mG004jl0{{R3@VoR80000aP)t-s0002s
zT`{*i3pQ{=|NsB(o-hB;Kan2}GAt|LT``d#4!1iC&u)V^0000CbW%=J0RR600RR90
z00000xO;kN0007cNkl<ZcmZwGfoJ4S6u|LmH^1Lup_yi~9LQu7LqV@C<-jC)CoC}0
znR37`*#acd3Izu^0QVPMH3th01@@o2H<|3Y>vdp1vf+Kb81m*hIUv4tzmkxd!_mpi
zljNMpOcjU^%S#fT+9%P;F;j%#U#e&8V??8cRszxc%%~o*;A~s92puzBv4&hT5!SJf
z;38aiG;+hH6CD7*af!xR$Qk167vjSN1_eI7DwhBI;2|XaPX*FusI(4Bo1wX;IfDAW
zp&aoIduWJAv4?6&u9XP&*yCf5h?~E9CNyL<IFSJ+JW0DB+{4r7XOK9Z47(A<YVZfJ
zJ(*XJJ@6^eHvr^3d8pV1@QG+EQ`y3*#SC23g^oiNci6+IS$AX4!fbl_s^_3p;<h6P
zm;f+405fo?e1fTm0YF5qAXAV4u~;V*d#=h%Q$LBwdD$A}3q)RFkHB}*ir17zm_geu
zb^GbI3j`jpLtkV5(_(P&B=E5Zkv*4W?0G*(52vrf0D};@h7o0Mf_!JuZB>~7W^`JM
zd&EP`>ZvE)R%1`qnvL5}YwmdSPsRjz_tt*qFW7VH_5(ixz!6KxeAfdkC>_F}d_)8#
ztAOJ>o1CeHA#|M9RAUdLz8QP?f|*T>J+a{C4)N!i!sdHeeRmi#X|bO}wv-kGps*Q{
zhY>G0l)!2?^#F57a^s*f1!ws3y=I&I5z#ZIL<i*Jma}@1g8fX~eJ?Izv!JeLzu&u{
zW8&e|#se~f;81A+(|t$yyWKcTGMJ4hj)KBMo*k)TyzgCJC%E2^yFNEJJt5bP;JUK+
stE0?NhDa+`b8Rzj!<wt<zPB{`1$iO7uSa&q(EtDd07*qoM6N<$f>z94T>t<8

literal 0
HcmV?d00001

diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv
index 0a931f04..9f5a247e 100644
--- a/tools/Conversion_Table.csv
+++ b/tools/Conversion_Table.csv
@@ -388,6 +388,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/blocks,wheat_stage_6.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_wheat_stage_6.png,,,,,,,
 /assets/minecraft/textures/blocks,wheat_stage_7.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_wheat_stage_7.png,,,,,,,
 /assets/minecraft/textures/blocks,fire_layer_0.png,/mods/ITEMS/mcl_fire/textures,fire_basic_flame_animated.png,,,,,,,
+/assets/minecraft/textures/blocks,fire_layer_0.png,/mods/ITEMS/mcl_fire/textures,mcl_burning_entity_flame_animated.png,,,,,,,
+/assets/minecraft/textures/blocks,fire_layer_0.png,/mods/ITEMS/mcl_fire/textures,mcl_burning_hud_flame_animated.png,,,,,,,
 /assets/minecraft/textures/blocks,fire_layer_0.png,/mods/ITEMS/mcl_fire/textures,fire_basic_flame.png,0,0,16,16,0,0,y
 /assets/minecraft/textures/items,fireball.png,/mods/ITEMS/mcl_fire/textures,mcl_fire_fire_charge.png,,,,,,,
 /assets/minecraft/textures/items,flint_and_steel.png,/mods/ITEMS/mcl_fire/textures,mcl_fire_flint_and_steel.png,,,,,,,