diff --git a/mods/ENTITIES/drippingwater/init.lua b/mods/ENTITIES/drippingwater/init.lua index 580397549e..8e3ef4c181 100644 --- a/mods/ENTITIES/drippingwater/init.lua +++ b/mods/ENTITIES/drippingwater/init.lua @@ -7,6 +7,7 @@ --water +local water_tex = "default_water_source_animated.png^[verticalframe:16:0" minetest.register_entity("drippingwater:drop_water", { hp_max = 1, physical = true, @@ -14,7 +15,7 @@ minetest.register_entity("drippingwater:drop_water", { collisionbox = {0,0,0,0,0,0}, visual = "cube", visual_size = {x=0.05, y=0.1}, - textures = {"default_water.png","default_water.png","default_water.png","default_water.png", "default_water.png", "default_water.png"}, + textures = {water_tex, water_tex, water_tex, water_tex, water_tex, water_tex}, spritediv = {x=1, y=1}, initial_sprite_basepos = {x=0, y=0}, @@ -44,6 +45,7 @@ minetest.register_entity("drippingwater:drop_water", { --lava +local lava_tex = "default_lava_source_animated.png^[verticalframe:16:0" minetest.register_entity("drippingwater:drop_lava", { hp_max = 1, physical = true, @@ -51,7 +53,7 @@ minetest.register_entity("drippingwater:drop_lava", { collisionbox = {0,0,0,0,0,0}, visual = "cube", visual_size = {x=0.05, y=0.1}, - textures = {"default_lava.png","default_lava.png","default_lava.png","default_lava.png", "default_lava.png", "default_lava.png"}, + textures = {lava_tex, lava_tex, lava_tex, lava_tex, lava_tex, lava_tex}, spritediv = {x=1, y=1}, initial_sprite_basepos = {x=0, y=0}, diff --git a/mods/ITEMS/mcl_cauldrons/depends.txt b/mods/ITEMS/mcl_cauldrons/depends.txt index 9699080ad4..cbc0405cc0 100644 --- a/mods/ITEMS/mcl_cauldrons/depends.txt +++ b/mods/ITEMS/mcl_cauldrons/depends.txt @@ -1,2 +1,3 @@ +mcl_core mcl_sounds doc? diff --git a/mods/ITEMS/mcl_cauldrons/init.lua b/mods/ITEMS/mcl_cauldrons/init.lua index 9cc27fa8ba..c5ee690073 100644 --- a/mods/ITEMS/mcl_cauldrons/init.lua +++ b/mods/ITEMS/mcl_cauldrons/init.lua @@ -78,7 +78,7 @@ local register_filled_cauldron = function(water_level, description) collision_box = cauldron_nodeboxes[0], selection_box = { type = "regular" }, tiles = { - "default_water.png^mcl_cauldrons_cauldron_top.png", + "(default_water_source_animated.png^[verticalframe:16:0)^mcl_cauldrons_cauldron_top.png", "mcl_cauldrons_cauldron_inner.png^mcl_cauldrons_cauldron_bottom.png", "mcl_cauldrons_cauldron_side.png" }, diff --git a/mods/ITEMS/mcl_core/nodes_liquid.lua b/mods/ITEMS/mcl_core/nodes_liquid.lua index 825194e302..449c5eec89 100644 --- a/mods/ITEMS/mcl_core/nodes_liquid.lua +++ b/mods/ITEMS/mcl_core/nodes_liquid.lua @@ -7,19 +7,19 @@ local LAVA_VISC = 7 minetest.register_node("mcl_core:water_flowing", { description = "Flowing Water", _doc_items_create_entry = false, - inventory_image = minetest.inventorycube("default_water.png"), + wield_image = "default_water_flowing_animated.png^[verticalframe:64:0", drawtype = "flowingliquid", - tiles = {name="default_water_flowing_animated.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=2.0}}, + tiles = {"default_water_flowing_animated.png^[verticalframe:64:0"}, special_tiles = { { image="default_water_flowing_animated.png", backface_culling=false, - animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=2.0} + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0} }, { image="default_water_flowing_animated.png", backface_culling=true, - animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=2.0} + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0} }, }, sounds = mcl_sounds.node_sound_water_defaults(table), @@ -54,16 +54,15 @@ Water interacts with lava in various ways: • When flowing water touches flowing lava either from above or horizontally, the lava turns into cobblestone. • When water is directly below lava, the water turns into stone.]], _doc_items_hidden = false, - inventory_image = minetest.inventorycube("default_water.png"), drawtype = "liquid", tiles = { - {name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=5.0}} + {name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}} }, special_tiles = { -- New-style water source material (mostly unused) { name="default_water_source_animated.png", - animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=5.0}, + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}, backface_culling = false, } }, @@ -92,19 +91,19 @@ Water interacts with lava in various ways: minetest.register_node("mcl_core:lava_flowing", { description = "Flowing Lava", _doc_items_create_entry = false, - inventory_image = minetest.inventorycube("default_lava.png"), + wield_image = "default_lava_flowing_animated.png^[verticalframe:64:0", drawtype = "flowingliquid", - tiles = {"default_lava.png"}, + tiles = {"default_lava_flowing_animated.png^[verticalframe:64:0"}, special_tiles = { { image="default_lava_flowing_animated.png", backface_culling=false, - animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=3.3} + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=6.6} }, { image="default_lava_flowing_animated.png", backface_culling=true, - animation={type="vertical_frames", aspect_w=64, aspect_h=64, length=3.3} + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=6.6} }, }, paramtype = "light", @@ -145,7 +144,6 @@ Lava interacts with water various ways: • When still lava is directly below or horizontally next to water, the lava turns into obsidian. • When flowing water touches flowing lava either from above or horizontally, the lava turns into cobblestone. • When lava is directly above water, the water turns into stone.]], - inventory_image = minetest.inventorycube("default_lava.png"), drawtype = "liquid", tiles = { {name="default_lava_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}} @@ -154,7 +152,7 @@ Lava interacts with water various ways: -- New-style lava source material (mostly unused) { name="default_lava_source_animated.png", - animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=3.0}, + animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}, backface_culling = false, } }, diff --git a/mods/ITEMS/mcl_core/textures/default_lava.png b/mods/ITEMS/mcl_core/textures/default_lava.png deleted file mode 100644 index e5b3bf8301..0000000000 Binary files a/mods/ITEMS/mcl_core/textures/default_lava.png and /dev/null differ diff --git a/mods/ITEMS/mcl_core/textures/default_lava_flowing_animated.png b/mods/ITEMS/mcl_core/textures/default_lava_flowing_animated.png index cb4560d595..05d26e6406 100644 Binary files a/mods/ITEMS/mcl_core/textures/default_lava_flowing_animated.png and b/mods/ITEMS/mcl_core/textures/default_lava_flowing_animated.png differ diff --git a/mods/ITEMS/mcl_core/textures/default_lava_source_animated.png b/mods/ITEMS/mcl_core/textures/default_lava_source_animated.png index 40ca1a1329..1bfec72004 100644 Binary files a/mods/ITEMS/mcl_core/textures/default_lava_source_animated.png and b/mods/ITEMS/mcl_core/textures/default_lava_source_animated.png differ diff --git a/mods/ITEMS/mcl_core/textures/default_water.png b/mods/ITEMS/mcl_core/textures/default_water.png deleted file mode 100644 index 664208eca2..0000000000 Binary files a/mods/ITEMS/mcl_core/textures/default_water.png and /dev/null differ diff --git a/mods/ITEMS/mcl_core/textures/default_water_flowing_animated.png b/mods/ITEMS/mcl_core/textures/default_water_flowing_animated.png index c8123a16ce..812fa97d78 100644 Binary files a/mods/ITEMS/mcl_core/textures/default_water_flowing_animated.png and b/mods/ITEMS/mcl_core/textures/default_water_flowing_animated.png differ diff --git a/mods/ITEMS/mcl_core/textures/default_water_source_animated.png b/mods/ITEMS/mcl_core/textures/default_water_source_animated.png index cb82db57ea..5d45822441 100644 Binary files a/mods/ITEMS/mcl_core/textures/default_water_source_animated.png and b/mods/ITEMS/mcl_core/textures/default_water_source_animated.png differ