From 13e562986a0c01ac278f2e43f1fbfda7c93f81bc Mon Sep 17 00:00:00 2001 From: wsor4035 <24964441+wsor4035@users.noreply.github.com> Date: Sun, 3 Mar 2024 14:48:55 -0500 Subject: [PATCH] replace the rest of the hard coded texture conversions to use homedecor.textures --- building_blocks/node_stairs.lua | 14 ++++++-------- homedecor_clocks/init.lua | 8 +------- homedecor_exterior/init.lua | 3 +-- homedecor_laundry/init.lua | 3 +-- homedecor_lighting/init.lua | 5 ++--- homedecor_roofing/init.lua | 3 +-- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index d45e21a8..349c4bcb 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -76,10 +76,11 @@ building_blocks_stairs("building_blocks:Adobe", { key = "node_sound_stone_defaults", }, }) -local grasstex = {"[combine:16x16^[noalpha^[colorize:#006400"} -if minetest.get_modpath("default") then - grasstex = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"} -end +local grasstex = { + homedecor.textures.grass.top, + homedecor.textures.grass.dirt, + homedecor.textures.grass.side +} building_blocks_stairs("building_blocks:fakegrass", { tiles = grasstex, description = S("Fake Grass"), @@ -147,10 +148,7 @@ minetest.register_node("building_blocks:brobble_spread", { }) if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then - local graveltex = "[combine:16x16^[noalpha^[colorize:#3a3b3c" - if minetest.get_modpath("default") then - graveltex = "default_gravel.png" - end + local graveltex = homedecor.textures.gravel minetest.register_node("building_blocks:gravel_spread", { drawtype = "raillike", description = S("Gravel Spread"), diff --git a/homedecor_clocks/init.lua b/homedecor_clocks/init.lua index 42d3629e..854a4b50 100644 --- a/homedecor_clocks/init.lua +++ b/homedecor_clocks/init.lua @@ -1,12 +1,6 @@ local S = minetest.get_translator("homedecor_clocks") -local wood -if minetest.get_modpath("default") then - wood = "default_wood.png" -else - - wood = "[combine:16x16^[noalpha^[colorize:#563d2d" -end +local wood = homedecor.textures.wood.apple.planks local plastic_craft = { output = "homedecor:analog_clock_plastic 2", diff --git a/homedecor_exterior/init.lua b/homedecor_exterior/init.lua index 6348ecc7..7fbc4668 100644 --- a/homedecor_exterior/init.lua +++ b/homedecor_exterior/init.lua @@ -288,8 +288,7 @@ homedecor.register("swing_rope", { selection_box = homedecor.nodebox.null }) -local water_tex = "default_water.png" -if not minetest.get_modpath("default") then water_tex = "[combine:16x16^[noalpha^[colorize:#00008b" end +local water_tex = homedecor.textures.water.tile local cobble_tex = minetest.registered_nodes["mapgen_stone"].tiles[1] local stone_drop = minetest.registered_nodes["mapgen_stone"].drop if stone_drop and type(stone_drop) == "string" then diff --git a/homedecor_laundry/init.lua b/homedecor_laundry/init.lua index 084bce11..96508220 100644 --- a/homedecor_laundry/init.lua +++ b/homedecor_laundry/init.lua @@ -80,8 +80,7 @@ local ib_cbox = { fixed = { -6/16, -8/16, -4/16, 17/16, 4/16, 4/16 } } -local wool_tex = "wool_grey.png" -if not minetest.get_modpath("wool") then wool_tex = "[combine:16x16^[noalpha^[colorize:#3A3B3C" end +local wool_tex = homedecor.textures.wool.grey homedecor.register("ironing_board", { description = S("Ironing board"), diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index f3e4073a..9fba9c62 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -452,7 +452,7 @@ for brightness_level = 0, 14 do lighttex = "homedecor_plasma_lamp_off.png" end - local gtex=minetest.get_modpath("default") and "default_gold_block.png" or "[combine:16x16^[noalpha^[colorize:#FFD700" + local gtex=homedecor.textures.metal.gold.block homedecor.register("plasma_lamp_"..brightness_level, { description = S("Plasma Lamp/Light"), drawtype = "mesh", @@ -703,8 +703,7 @@ for brightness_level = 0, 14 do fixed = { -0.25, -0.5, -0.25, 0.25, 1.5, 0.25 } } - local wool_brightened=(minetest.get_modpath("wool") and "wool_grey.png" or "[combine:16x16^[noalpha6[colorize:#A9A9A9") - .. "^[colorize:#ffffff:"..(brightness_level * 15) + local wool_brightened=homedecor.textures.wool.grey .. "^[colorize:#ffffff:"..(brightness_level * 15) homedecor.register("table_lamp_"..brightness_level, { description = S("Table Lamp/Light"), diff --git a/homedecor_roofing/init.lua b/homedecor_roofing/init.lua index e10b8709..123f12bd 100644 --- a/homedecor_roofing/init.lua +++ b/homedecor_roofing/init.lua @@ -336,8 +336,7 @@ homedecor_roofing.register_slope("homedecor", "glass", S("Glass Shingles") ) -local brick_tex = "default_brick.png" -if not minetest.get_modpath("default") then brick_tex = "[combine:16x16^[noalpha^[colorize:#AA4A44" end +local brick_tex = homedecor.textures.brick homedecor.register("chimney", { description = S("Chimney"),