From 8fb45f1e94c3e38a51cf2b84b8641e99d3f1d8e4 Mon Sep 17 00:00:00 2001 From: whosit Date: Thu, 27 May 2021 16:32:51 +0300 Subject: [PATCH] rename textures to avoid name collisions --- init.lua | 6 +++--- ...arrow_000.png => waypoint_compass_arrow_000.png} | Bin ...arrow_010.png => waypoint_compass_arrow_010.png} | Bin ...arrow_020.png => waypoint_compass_arrow_020.png} | Bin ...arrow_030.png => waypoint_compass_arrow_030.png} | Bin ...arrow_040.png => waypoint_compass_arrow_040.png} | Bin ...arrow_050.png => waypoint_compass_arrow_050.png} | Bin ...arrow_060.png => waypoint_compass_arrow_060.png} | Bin ...arrow_070.png => waypoint_compass_arrow_070.png} | Bin ...arrow_080.png => waypoint_compass_arrow_080.png} | Bin ...age.png => waypoint_compass_inventory_image.png} | Bin .../{waypoint.png => waypoint_compass_waypoint.png} | Bin 12 files changed, 3 insertions(+), 3 deletions(-) rename textures/{arrow_000.png => waypoint_compass_arrow_000.png} (100%) rename textures/{arrow_010.png => waypoint_compass_arrow_010.png} (100%) rename textures/{arrow_020.png => waypoint_compass_arrow_020.png} (100%) rename textures/{arrow_030.png => waypoint_compass_arrow_030.png} (100%) rename textures/{arrow_040.png => waypoint_compass_arrow_040.png} (100%) rename textures/{arrow_050.png => waypoint_compass_arrow_050.png} (100%) rename textures/{arrow_060.png => waypoint_compass_arrow_060.png} (100%) rename textures/{arrow_070.png => waypoint_compass_arrow_070.png} (100%) rename textures/{arrow_080.png => waypoint_compass_arrow_080.png} (100%) rename textures/{Waypoint_compass_inventory_image.png => waypoint_compass_inventory_image.png} (100%) rename textures/{waypoint.png => waypoint_compass_waypoint.png} (100%) diff --git a/init.lua b/init.lua index 5df7f52..59fd07c 100644 --- a/init.lua +++ b/init.lua @@ -5,7 +5,7 @@ local TARGET_ABOVE = false -- place waypoint inside the block or above it local POINT_TO_OBJECTS = false -- unimplemented local POINT_TO_LIQUIDS = true local COMPASS_RANGE = 180 -local WAYPOINT_ICON = "waypoint.png" +local WAYPOINT_ICON = "waypoint_compass_waypoint.png" local WAYPOINT_SCALE = {x=-1/16*9,y=-1} local waypoint_lib = dofile(minetest.get_modpath("waypoint_compass") .. "/waypoint_lib.lua") @@ -110,7 +110,7 @@ local function show_hud_waypoint(player, compass_item_meta) local waypoint = waypoint_lib.WaypointHUD:new(player, waypoint_pos, waypoint_name, waypoint_color, WAYPOINT_ICON, WAYPOINT_SCALE, hexcolor, - size, alignment, "arrow_%03d.png", hexcolor, 9, + size, alignment, "waypoint_compass_arrow_%03d.png", hexcolor, 9, true) waypoint:show(player) @@ -340,7 +340,7 @@ minetest.register_tool( "waypoint_compass:compass", { description = "Waypoint compass\n(sneak+place to set point)", --short_description = "Waypoint compass", - inventory_image = "Waypoint_compass_inventory_image.png", + inventory_image = "waypoint_compass_inventory_image.png", wield_scale = {x = 0.5, y = 0.5, z = 0.5}, range = 2.0, -- TODO what's the good range? on_place = function(itemstack, placer, pointed_thing) diff --git a/textures/arrow_000.png b/textures/waypoint_compass_arrow_000.png similarity index 100% rename from textures/arrow_000.png rename to textures/waypoint_compass_arrow_000.png diff --git a/textures/arrow_010.png b/textures/waypoint_compass_arrow_010.png similarity index 100% rename from textures/arrow_010.png rename to textures/waypoint_compass_arrow_010.png diff --git a/textures/arrow_020.png b/textures/waypoint_compass_arrow_020.png similarity index 100% rename from textures/arrow_020.png rename to textures/waypoint_compass_arrow_020.png diff --git a/textures/arrow_030.png b/textures/waypoint_compass_arrow_030.png similarity index 100% rename from textures/arrow_030.png rename to textures/waypoint_compass_arrow_030.png diff --git a/textures/arrow_040.png b/textures/waypoint_compass_arrow_040.png similarity index 100% rename from textures/arrow_040.png rename to textures/waypoint_compass_arrow_040.png diff --git a/textures/arrow_050.png b/textures/waypoint_compass_arrow_050.png similarity index 100% rename from textures/arrow_050.png rename to textures/waypoint_compass_arrow_050.png diff --git a/textures/arrow_060.png b/textures/waypoint_compass_arrow_060.png similarity index 100% rename from textures/arrow_060.png rename to textures/waypoint_compass_arrow_060.png diff --git a/textures/arrow_070.png b/textures/waypoint_compass_arrow_070.png similarity index 100% rename from textures/arrow_070.png rename to textures/waypoint_compass_arrow_070.png diff --git a/textures/arrow_080.png b/textures/waypoint_compass_arrow_080.png similarity index 100% rename from textures/arrow_080.png rename to textures/waypoint_compass_arrow_080.png diff --git a/textures/Waypoint_compass_inventory_image.png b/textures/waypoint_compass_inventory_image.png similarity index 100% rename from textures/Waypoint_compass_inventory_image.png rename to textures/waypoint_compass_inventory_image.png diff --git a/textures/waypoint.png b/textures/waypoint_compass_waypoint.png similarity index 100% rename from textures/waypoint.png rename to textures/waypoint_compass_waypoint.png