From 998983445b253a6b24c6593733c36a2f312951fa Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Sun, 14 May 2023 11:41:39 +0000 Subject: [PATCH] Rename Bucket Textures (#3708) This pull request renames buckets so that they use the `mcl_` naming convention. I originally was going to do some renaming on a bigger scope, but decided against it for now. Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3708 Reviewed-by: ancientmarinerdev Co-authored-by: FossFanatic Co-committed-by: FossFanatic --- mods/ITEMS/mcl_buckets/init.lua | 2 +- mods/ITEMS/mcl_buckets/register.lua | 6 +++--- textures/{bucket.png => mcl_buckets_bucket.png} | Bin ...{bucket_lava.png => mcl_buckets_lava_bucket.png} | Bin ...water.png => mcl_buckets_river_water_bucket.png} | Bin ...ucket_water.png => mcl_buckets_water_bucket.png} | Bin 6 files changed, 4 insertions(+), 4 deletions(-) rename textures/{bucket.png => mcl_buckets_bucket.png} (100%) rename textures/{bucket_lava.png => mcl_buckets_lava_bucket.png} (100%) rename textures/{bucket_river_water.png => mcl_buckets_river_water_bucket.png} (100%) rename textures/{bucket_water.png => mcl_buckets_water_bucket.png} (100%) diff --git a/mods/ITEMS/mcl_buckets/init.lua b/mods/ITEMS/mcl_buckets/init.lua index ecc8674822..6aebbc7598 100644 --- a/mods/ITEMS/mcl_buckets/init.lua +++ b/mods/ITEMS/mcl_buckets/init.lua @@ -325,7 +325,7 @@ minetest.register_craftitem("mcl_buckets:bucket_empty", { _doc_items_longdesc = S("A bucket can be used to collect and release liquids."), _doc_items_usagehelp = S("Punch a liquid source to collect it. You can then use the filled bucket to place the liquid somewhere else."), _tt_help = S("Collects liquids"), - inventory_image = "bucket.png", + inventory_image = "mcl_buckets_bucket.png", stack_max = 16, liquids_pointable = use_select_box, on_place = on_place_bucket_empty, diff --git a/mods/ITEMS/mcl_buckets/register.lua b/mods/ITEMS/mcl_buckets/register.lua index d9054d498f..109941ab05 100644 --- a/mods/ITEMS/mcl_buckets/register.lua +++ b/mods/ITEMS/mcl_buckets/register.lua @@ -38,7 +38,7 @@ if mod_mcl_core then end end, bucketname = "mcl_buckets:bucket_lava", - inventory_image = "bucket_lava.png", + inventory_image = "mcl_buckets_lava_bucket.png", name = S("Lava Bucket"), longdesc = S("A bucket can be used to collect and release liquids. This one is filled with hot lava, safely contained inside. Use with caution."), usagehelp = S("Get in a safe distance and place the bucket to empty it and create a lava source at this spot. Don't burn yourself!"), @@ -50,7 +50,7 @@ if mod_mcl_core then source_place = "mcl_core:water_source", source_take = {"mcl_core:water_source"}, bucketname = "mcl_buckets:bucket_water", - inventory_image = "bucket_water.png", + inventory_image = "mcl_buckets_water_bucket.png", name = S("Water Bucket"), longdesc = S("A bucket can be used to collect and release liquids. This one is filled with water."), usagehelp = S("Place it to empty the bucket and create a water source."), @@ -89,7 +89,7 @@ if mod_mclx_core then source_place = "mclx_core:river_water_source", source_take = {"mclx_core:river_water_source"}, bucketname = "mcl_buckets:bucket_river_water", - inventory_image = "bucket_river_water.png", + inventory_image = "mcl_buckets_river_water_bucket.png", name = S("River Water Bucket"), longdesc = S("A bucket can be used to collect and release liquids. This one is filled with river water."), usagehelp = S("Place it to empty the bucket and create a river water source."), diff --git a/textures/bucket.png b/textures/mcl_buckets_bucket.png similarity index 100% rename from textures/bucket.png rename to textures/mcl_buckets_bucket.png diff --git a/textures/bucket_lava.png b/textures/mcl_buckets_lava_bucket.png similarity index 100% rename from textures/bucket_lava.png rename to textures/mcl_buckets_lava_bucket.png diff --git a/textures/bucket_river_water.png b/textures/mcl_buckets_river_water_bucket.png similarity index 100% rename from textures/bucket_river_water.png rename to textures/mcl_buckets_river_water_bucket.png diff --git a/textures/bucket_water.png b/textures/mcl_buckets_water_bucket.png similarity index 100% rename from textures/bucket_water.png rename to textures/mcl_buckets_water_bucket.png