From 660c85dddc7263dfd561e9e53a41f6dd03a30198 Mon Sep 17 00:00:00 2001 From: Michieal Date: Wed, 15 Feb 2023 09:32:32 -0500 Subject: [PATCH] Changed mcl_buckets' image use to be named properly. This fixes issue #3455 --- mods/HUD/mcl_achievements/init.lua | 4 ++-- mods/ITEMS/mcl_buckets/fishbuckets.lua | 2 +- ...tl_bucket.png => mcl_buckets_axolotl_bucket.png} | Bin .../{cod_bucket.png => mcl_buckets_cod_bucket.png} | Bin ...bucket.png => mcl_buckets_pufferfish_bucket.png} | Bin ...mon_bucket.png => mcl_buckets_salmon_bucket.png} | Bin ...ket.png => mcl_buckets_tropical_fish_bucket.png} | Bin 7 files changed, 3 insertions(+), 3 deletions(-) rename textures/{mcl_achievements_axolotl_bucket.png => mcl_buckets_axolotl_bucket.png} (100%) rename textures/{cod_bucket.png => mcl_buckets_cod_bucket.png} (100%) rename textures/{pufferfish_bucket.png => mcl_buckets_pufferfish_bucket.png} (100%) rename textures/{salmon_bucket.png => mcl_buckets_salmon_bucket.png} (100%) rename textures/{tropical_fish_bucket.png => mcl_buckets_tropical_fish_bucket.png} (100%) diff --git a/mods/HUD/mcl_achievements/init.lua b/mods/HUD/mcl_achievements/init.lua index a4f12a987..518a2cfbd 100644 --- a/mods/HUD/mcl_achievements/init.lua +++ b/mods/HUD/mcl_achievements/init.lua @@ -297,7 +297,7 @@ awards.register_achievement("mcl:whatAdeal", { awards.register_achievement("mcl:tacticalFishing", { title = S("Tactical Fishing"), description = S("Catch a fish... without a fishing rod!"), - icon = "pufferfish_bucket.png", + icon = "mcl_buckets_pufferfish_bucket.png", type = "Advancement", group = "Husbandry", }) @@ -305,7 +305,7 @@ awards.register_achievement("mcl:tacticalFishing", { awards.register_achievement("mcl:cutestPredator", { title = S("The Cutest Predator"), description = S("Catch an Axolotl with a bucket!"), - icon = "mcl_achievements_axolotl_bucket.png", + icon = "mcl_buckets_axolotl_bucket.png", type = "Advancement", group = "Husbandry", }) diff --git a/mods/ITEMS/mcl_buckets/fishbuckets.lua b/mods/ITEMS/mcl_buckets/fishbuckets.lua index 9eb966084..185f72486 100644 --- a/mods/ITEMS/mcl_buckets/fishbuckets.lua +++ b/mods/ITEMS/mcl_buckets/fishbuckets.lua @@ -56,7 +56,7 @@ for techname, fishname in pairs(fish_names) do _doc_items_longdesc = S("This bucket is filled with water and @1.", S(fishname)), _doc_items_usagehelp = S("Place it to empty the bucket and place a @1. Obtain by right clicking on a @2 with a bucket of water.", S(fishname), S(fishname)), _tt_help = S("Places a water source and a @1.", S(fishname)), - inventory_image = techname .. "_bucket.png", + inventory_image = "mcl_buckets_" .. techname .. "_bucket.png", stack_max = 1, groups = {bucket = 1, fish_bucket = 1}, liquids_pointable = false, diff --git a/textures/mcl_achievements_axolotl_bucket.png b/textures/mcl_buckets_axolotl_bucket.png similarity index 100% rename from textures/mcl_achievements_axolotl_bucket.png rename to textures/mcl_buckets_axolotl_bucket.png diff --git a/textures/cod_bucket.png b/textures/mcl_buckets_cod_bucket.png similarity index 100% rename from textures/cod_bucket.png rename to textures/mcl_buckets_cod_bucket.png diff --git a/textures/pufferfish_bucket.png b/textures/mcl_buckets_pufferfish_bucket.png similarity index 100% rename from textures/pufferfish_bucket.png rename to textures/mcl_buckets_pufferfish_bucket.png diff --git a/textures/salmon_bucket.png b/textures/mcl_buckets_salmon_bucket.png similarity index 100% rename from textures/salmon_bucket.png rename to textures/mcl_buckets_salmon_bucket.png diff --git a/textures/tropical_fish_bucket.png b/textures/mcl_buckets_tropical_fish_bucket.png similarity index 100% rename from textures/tropical_fish_bucket.png rename to textures/mcl_buckets_tropical_fish_bucket.png