master #5

Merged
epCode merged 255 commits from VoxeLibre/VoxeLibre:master into master 2021-02-02 23:20:01 +01:00
4 changed files with 5 additions and 2 deletions
Showing only changes of commit 689e6edac2 - Show all commits

View File

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 B

View File

@ -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,,,,,,,

1 Source path Source file Target path Target file xs ys xl yl xt yt Blacklisted?
388 /assets/minecraft/textures/blocks fire_layer_0.png wheat_stage_6.png /mods/ITEMS/mcl_fire/textures /mods/ITEMS/mcl_farming/textures fire_basic_flame_animated.png mcl_farming_wheat_stage_6.png
389 /assets/minecraft/textures/blocks fire_layer_0.png wheat_stage_7.png /mods/ITEMS/mcl_fire/textures /mods/ITEMS/mcl_farming/textures fire_basic_flame.png mcl_farming_wheat_stage_7.png 0 0 16 16 0 0 y
390 /assets/minecraft/textures/items /assets/minecraft/textures/blocks fireball.png fire_layer_0.png /mods/ITEMS/mcl_fire/textures mcl_fire_fire_charge.png fire_basic_flame_animated.png
391 /assets/minecraft/textures/blocks fire_layer_0.png /mods/ITEMS/mcl_fire/textures mcl_burning_entity_flame_animated.png
392 /assets/minecraft/textures/blocks fire_layer_0.png /mods/ITEMS/mcl_fire/textures mcl_burning_hud_flame_animated.png
393 /assets/minecraft/textures/items /assets/minecraft/textures/blocks flint_and_steel.png fire_layer_0.png /mods/ITEMS/mcl_fire/textures mcl_fire_flint_and_steel.png fire_basic_flame.png 0 0 16 16 0 0 y
394 /assets/minecraft/textures/items fish_clownfish_raw.png fireball.png /mods/ITEMS/mcl_fishing/textures /mods/ITEMS/mcl_fire/textures mcl_fishing_clownfish_raw.png mcl_fire_fire_charge.png
395 /assets/minecraft/textures/items fish_cod_cooked.png flint_and_steel.png /mods/ITEMS/mcl_fishing/textures /mods/ITEMS/mcl_fire/textures mcl_fishing_fish_cooked.png mcl_fire_flint_and_steel.png