Rename Liquid Textures (#3758)

This pull request renames the textures of water and lava to more closely follow the MineClone 2 naming convention.

The code has also been changed to now reflect these new names.

Reviewed-on: MineClone2/MineClone2#3758
Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
Co-authored-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Co-committed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
This commit is contained in:
FossFanatic 2023-11-02 23:47:26 +00:00 committed by the-real-herowl
parent da911bd4d4
commit ce403b9245
11 changed files with 71 additions and 83 deletions

View File

@ -21,7 +21,7 @@ mcl_dripping.register_drop({
-- The group the liquid's nodes belong to
liquid = "water",
-- The texture used (particles will take a random 2x2 area of it)
texture = "default_water_source_animated.png",
texture = "mcl_core_water_source_animation.png",
-- Define particle glow, ranges from `0` to `minetest.LIGHT_MAX`
light = 1,
-- The nodes (or node group) the particles will spawn under

View File

@ -82,7 +82,7 @@ end
mcl_dripping.register_drop({
liquid = "water",
texture = "default_water_source_animated.png",
texture = "mcl_core_water_source_animation.png",
light = 1,
nodes = { "group:opaque", "group:leaves" },
sound = "drippingwater_drip",
@ -92,7 +92,7 @@ mcl_dripping.register_drop({
mcl_dripping.register_drop({
liquid = "lava",
texture = "default_lava_source_animated.png",
texture = "mcl_core_lava_source_animation.png",
light = math.max(7, minetest.registered_nodes["mcl_core:lava_source"].light_source - 3),
nodes = { "group:opaque" },
sound = "drippingwater_lavadrip",

View File

@ -67,12 +67,12 @@ local function register_filled_cauldron(water_level, description, liquid)
local water_tex
if liquid == "river_water" then
id = id .. "r"
water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF"
water_tex = "mcl_core_water_source_animation.png^[verticalframe:16:0^[multiply:#0084FF"
elseif liquid == "lava" then
id = id .. "_lava"
water_tex = "default_lava_source_animated.png^[verticalframe:16:0"
water_tex = "mcl_core_lava_source_animation.png^[verticalframe:16:0"
else
water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#3F76E4"
water_tex = "mcl_core_water_source_animation.png^[verticalframe:16:0^[multiply:#3F76E4"
end
minetest.register_node(id, {
description = description,

View File

@ -18,17 +18,17 @@ end
minetest.register_node("mcl_core:water_flowing", {
description = S("Flowing Water"),
_doc_items_create_entry = false,
wield_image = "default_water_flowing_animated.png^[verticalframe:64:0",
wield_image = "mcl_core_water_flow_animation.png^[verticalframe:64:0",
drawtype = "flowingliquid",
tiles = {"default_water_flowing_animated.png^[verticalframe:64:0"},
tiles = {"mcl_core_water_flow_animation.png^[verticalframe:64:0"},
special_tiles = {
{
image="default_water_flowing_animated.png",
image="mcl_core_water_flow_animation.png",
backface_culling=false,
animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}
},
{
image="default_water_flowing_animated.png",
image="mcl_core_water_flow_animation.png",
backface_culling=false,
animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.5}
},
@ -71,12 +71,12 @@ S("• When water is directly below lava, the water turns into stone."),
drawtype = "liquid",
waving = 3,
tiles = {
{name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}
{name="mcl_core_water_source_animation.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}
},
special_tiles = {
-- New-style water source material (mostly unused)
{
name="default_water_source_animated.png",
name="mcl_core_water_source_animation.png",
animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0},
backface_culling = false,
}
@ -119,17 +119,17 @@ S("• When water is directly below lava, the water turns into stone."),
minetest.register_node("mcl_core:lava_flowing", {
description = S("Flowing Lava"),
_doc_items_create_entry = false,
wield_image = "default_lava_flowing_animated.png^[verticalframe:64:0",
wield_image = "mcl_core_lava_flow_animation.png^[verticalframe:64:0",
drawtype = "flowingliquid",
tiles = {"default_lava_flowing_animated.png^[verticalframe:64:0"},
tiles = {"mcl_core_lava_flow_animation.png^[verticalframe:64:0"},
special_tiles = {
{
image="default_lava_flowing_animated.png",
image="mcl_core_lava_flow_animation.png",
backface_culling=false,
animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=6.6}
},
{
image="default_lava_flowing_animated.png",
image="mcl_core_lava_flow_animation.png",
backface_culling=false,
animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=6.6}
},
@ -182,12 +182,12 @@ S("• When flowing water touches flowing lava either from above or horizontally
S("• When lava is directly above water, the water turns into stone."),
drawtype = "liquid",
tiles = {
{name="default_lava_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}
{name="mcl_core_lava_source_animation.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}
},
special_tiles = {
-- New-style lava source material (mostly unused)
{
name="default_lava_source_animated.png",
name="mcl_core_lava_source_animation.png",
animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0},
backface_culling = false,
}

View File

@ -183,7 +183,7 @@ mcl_flowerpots.register_potted_flower("mcl_mangrove:propagule", {
image = "mcl_mangrove_propagule.png",
})
local water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#3F76E4"
local water_tex = "mcl_core_water_source_animation.png^[verticalframe:16:0^[multiply:#3F76E4"
local wlroots = {
description = S("water logged mangrove roots"),
@ -194,12 +194,12 @@ local wlroots = {
S("These cannot be crafted yet only occure when get in contact of water."),
_doc_items_hidden = false,
tiles = {
{name="default_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}}
{name="mcl_core_water_source_animation.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",
name="mcl_core_water_source_animation.png",
animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0},
backface_culling = false,
}
@ -245,7 +245,7 @@ local rwlroots = table.copy(wlroots)
-- FIXME luacheck complains that this is a repeated definition of water_tex.
-- Maybe the tiles definition below should be replaced with the animated tile
-- definition as per above?
water_tex = "default_water_source_animated.png^[verticalframe:16:0^[multiply:#0084FF"
water_tex = "mcl_core_water_source_animation.png^[verticalframe:16:0^[multiply:#0084FF"
rwlroots.tiles = {
"("..water_tex..")^mcl_mangrove_roots_top.png",
"("..water_tex..")^mcl_mangrove_roots_side.png",

View File

@ -4664,7 +4664,7 @@
126,
164
],
"default_water_source_animated.png": [
"mcl_core_water_source_animation.png": [
37,
98,
129
@ -4984,7 +4984,7 @@
79,
64
],
"default_water_flowing_animated.png": [
"mcl_core_water_flow_animation.png": [
38,
101,
129
@ -5009,7 +5009,7 @@
89,
86
],
"default_lava_flowing_animated.png": [
"mcl_core_lava_flow_animation.png": [
177,
42,
16
@ -5059,7 +5059,7 @@
142,
123
],
"default_lava_source_animated.png": [
"mcl_core_lava_source_animation.png": [
180,
45,
17
@ -6604,16 +6604,6 @@
56,
64
],
"default_river_water_flowing_animated.png": [
38,
123,
130
],
"default_river_water_source_animated.png": [
37,
120,
130
],
"mcl_armor_stand_item.png": [
134,
114,
@ -9009,17 +8999,17 @@
127,
113
],
"bucket_river_water.png": [
"mcl_buckets_river_water_bucket.png": [
139,
152,
155
],
"bucket_water.png": [
"mcl_buckets_water_bucket.png": [
139,
147,
155
],
"bucket.png": [
"mcl_buckets_bucket.png": [
147,
143,
139

View File

Before

Width:  |  Height:  |  Size: 248 B

After

Width:  |  Height:  |  Size: 248 B

View File

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 990 B

View File

Before

Width:  |  Height:  |  Size: 854 B

After

Width:  |  Height:  |  Size: 854 B

View File

Before

Width:  |  Height:  |  Size: 551 B

After

Width:  |  Height:  |  Size: 551 B

View File

@ -7,9 +7,9 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
/assets/minecraft/textures/gui,icons.png,/mods/HUD/hudbars/textures,hudbars_icon_breath.png,16,18,9,9,0,0,y
/assets/minecraft/textures/gui,icons.png,/mods/HUD/mcl_base_textures/textures,heart.png,52,0,9,9,0,0,y
/assets/minecraft/textures/gui,icons.png,/mods/HUD/mcl_base_textures/textures,bubble.png,16,18,9,9,0,0,y
/assets/minecraft/textures/items,bucket_empty.png,/mods/ITEMS/mcl_buckets/textures,bucket.png,,,,,,,
/assets/minecraft/textures/items,bucket_water.png,/mods/ITEMS/mcl_buckets/textures,bucket_water.png,,,,,,,
/assets/minecraft/textures/items,bucket_water.png,/mods/ITEMS/mcl_buckets/textures,bucket_river_water.png,,,,,,,
/assets/minecraft/textures/items,bucket_empty.png,/mods/ITEMS/mcl_buckets/textures,mcl_buckets_bucket.png,,,,,,,
/assets/minecraft/textures/items,bucket_water.png,/mods/ITEMS/mcl_buckets/textures,mcl_buckets_water_bucket.png,,,,,,,
/assets/minecraft/textures/items,bucket_water.png,/mods/ITEMS/mcl_buckets/textures,mcl_buckets_river_water_bucket.png,,,,,,,
/assets/minecraft/textures/items,bucket_lava.png,/mods/ITEMS/mcl_buckets/textures,mcl_buckets_lava_bucket.png,,,,,,,
/assets/minecraft/textures/items,item_frame.png,/mods/ITEMS/mcl_itemframes/textures,mcl_itemframes_item_frame.png,,,,,,,
/assets/minecraft/textures/blocks,anvil_base.png,/mods/ITEMS/mcl_anvils/textures,mcl_anvils_anvil_base.png,,,,,,,
@ -171,8 +171,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
/assets/minecraft/textures/blocks,log_jungle_top.png,/mods/ITEMS/mcl_core/textures,default_jungletree_top.png,,,,,,,
/assets/minecraft/textures/blocks,planks_jungle.png,/mods/ITEMS/mcl_core/textures,default_junglewood.png,,,,,,,
/assets/minecraft/textures/blocks,ladder.png,/mods/ITEMS/mcl_core/textures,default_ladder.png,,,,,,,
/assets/minecraft/textures/blocks,lava_still.png,/mods/ITEMS/mcl_core/textures,default_lava_source_animated.png,,,,,,,
/assets/minecraft/textures/blocks,lava_flow.png,/mods/ITEMS/mcl_core/textures,default_lava_flowing_animated.png,,,,,,,
/assets/minecraft/textures/blocks,lava_still.png,/mods/ITEMS/mcl_core/textures,mcl_core_lava_source_animation.png,,,,,,,
/assets/minecraft/textures/blocks,lava_flow.png,/mods/ITEMS/mcl_core/textures,mcl_core_lava_flow_animation.png,,,,,,,
/assets/minecraft/textures/blocks,cobblestone_mossy.png,/mods/ITEMS/mcl_core/textures,default_mossycobble.png,,,,,,,
/assets/minecraft/textures/blocks,obsidian.png,/mods/ITEMS/mcl_core/textures,default_obsidian.png,,,,,,,
/assets/minecraft/textures/items,paper.png,/mods/ITEMS/mcl_core/textures,default_paper.png,,,,,,,
@ -187,10 +187,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
/assets/minecraft/textures/blocks,stone.png,/mods/ITEMS/mcl_core/textures,default_stone.png,,,,,,,
/assets/minecraft/textures/blocks,log_oak.png,/mods/ITEMS/mcl_core/textures,default_tree.png,,,,,,,
/assets/minecraft/textures/blocks,log_oak_top.png,/mods/ITEMS/mcl_core/textures,default_tree_top.png,,,,,,,
/assets/minecraft/textures/blocks,water_still.png,/mods/ITEMS/mcl_core/textures,default_water_source_animated.png,,,,,,,
/assets/minecraft/textures/blocks,water_flow.png,/mods/ITEMS/mcl_core/textures,default_water_flowing_animated.png,,,,,,,
/assets/minecraft/textures/blocks,water_still.png,/mods/ITEMS/mcl_core/textures,default_river_water_source_animated.png,,,,,,,
/assets/minecraft/textures/blocks,water_flow.png,/mods/ITEMS/mcl_core/textures,default_river_water_flowing_animated.png,,,,,,,
/assets/minecraft/textures/blocks,water_still.png,/mods/ITEMS/mcl_core/textures,mcl_core_water_source_animation.png,,,,,,,
/assets/minecraft/textures/blocks,water_flow.png,/mods/ITEMS/mcl_core/textures,mcl_core_water_flow_animation.png,,,,,,,
/assets/minecraft/textures/blocks,planks_oak.png,/mods/ITEMS/mcl_core/textures,default_wood.png,,,,,,,
/assets/minecraft/textures/blocks,stone_andesite.png,/mods/ITEMS/mcl_core/textures,mcl_core_andesite.png,,,,,,,
/assets/minecraft/textures/blocks,stone_andesite_smooth.png,/mods/ITEMS/mcl_core/textures,mcl_core_andesite_smooth.png,,,,,,,

1 Source path Source file Target path Target file xs ys xl yl xt yt Blacklisted?
7 /assets/minecraft/textures/gui icons.png /mods/HUD/hudbars/textures hudbars_icon_breath.png 16 18 9 9 0 0 y
8 /assets/minecraft/textures/gui icons.png /mods/HUD/mcl_base_textures/textures heart.png 52 0 9 9 0 0 y
9 /assets/minecraft/textures/gui icons.png /mods/HUD/mcl_base_textures/textures bubble.png 16 18 9 9 0 0 y
10 /assets/minecraft/textures/items bucket_empty.png /mods/ITEMS/mcl_buckets/textures bucket.png mcl_buckets_bucket.png
11 /assets/minecraft/textures/items bucket_water.png /mods/ITEMS/mcl_buckets/textures bucket_water.png mcl_buckets_water_bucket.png
12 /assets/minecraft/textures/items bucket_water.png /mods/ITEMS/mcl_buckets/textures bucket_river_water.png mcl_buckets_river_water_bucket.png
13 /assets/minecraft/textures/items bucket_lava.png /mods/ITEMS/mcl_buckets/textures mcl_buckets_lava_bucket.png
14 /assets/minecraft/textures/items item_frame.png /mods/ITEMS/mcl_itemframes/textures mcl_itemframes_item_frame.png
15 /assets/minecraft/textures/blocks anvil_base.png /mods/ITEMS/mcl_anvils/textures mcl_anvils_anvil_base.png
171 /assets/minecraft/textures/blocks log_jungle_top.png /mods/ITEMS/mcl_core/textures default_jungletree_top.png
172 /assets/minecraft/textures/blocks planks_jungle.png /mods/ITEMS/mcl_core/textures default_junglewood.png
173 /assets/minecraft/textures/blocks ladder.png /mods/ITEMS/mcl_core/textures default_ladder.png
174 /assets/minecraft/textures/blocks lava_still.png /mods/ITEMS/mcl_core/textures default_lava_source_animated.png mcl_core_lava_source_animation.png
175 /assets/minecraft/textures/blocks lava_flow.png /mods/ITEMS/mcl_core/textures default_lava_flowing_animated.png mcl_core_lava_flow_animation.png
176 /assets/minecraft/textures/blocks cobblestone_mossy.png /mods/ITEMS/mcl_core/textures default_mossycobble.png
177 /assets/minecraft/textures/blocks obsidian.png /mods/ITEMS/mcl_core/textures default_obsidian.png
178 /assets/minecraft/textures/items paper.png /mods/ITEMS/mcl_core/textures default_paper.png
187 /assets/minecraft/textures/blocks stone.png /mods/ITEMS/mcl_core/textures default_stone.png
188 /assets/minecraft/textures/blocks log_oak.png /mods/ITEMS/mcl_core/textures default_tree.png
189 /assets/minecraft/textures/blocks log_oak_top.png /mods/ITEMS/mcl_core/textures default_tree_top.png
190 /assets/minecraft/textures/blocks water_still.png /mods/ITEMS/mcl_core/textures default_water_source_animated.png mcl_core_water_source_animation.png
191 /assets/minecraft/textures/blocks water_flow.png /mods/ITEMS/mcl_core/textures default_water_flowing_animated.png mcl_core_water_flow_animation.png
/assets/minecraft/textures/blocks water_still.png /mods/ITEMS/mcl_core/textures default_river_water_source_animated.png
/assets/minecraft/textures/blocks water_flow.png /mods/ITEMS/mcl_core/textures default_river_water_flowing_animated.png
192 /assets/minecraft/textures/blocks planks_oak.png /mods/ITEMS/mcl_core/textures default_wood.png
193 /assets/minecraft/textures/blocks stone_andesite.png /mods/ITEMS/mcl_core/textures mcl_core_andesite.png
194 /assets/minecraft/textures/blocks stone_andesite_smooth.png /mods/ITEMS/mcl_core/textures mcl_core_andesite_smooth.png