mtcontrib/homedecor_modpack
1
0
Fork 2
mirror of https://github.com/mt-mods/homedecor_modpack.git synced 2025-11-04 02:25:27 +01:00
Code Issues Releases Wiki Activity

switch existing to xcompat textures

Browse Source
This commit is contained in:
wsor4035
2024-03-03 14:43:40 -05:00
parent 080551e647
commit f432c53117
18 changed files with 28 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fake_fire/init.lua
View File

@@ -178,7 +178,7 @@ local sbox = {
fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16}, fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16},
} }
local wtex = homedecor.textures.default_junglewood local wtex = homedecor.textures.wood.jungle.planks
minetest.register_node("fake_fire:fancy_fire", { minetest.register_node("fake_fire:fancy_fire", {
inventory_image = "fancy_fire_inv.png", inventory_image = "fancy_fire_inv.png",

4
homedecor_bathroom/init.lua
View File

@@ -2,8 +2,8 @@ local S = minetest.get_translator("homedecor_bathroom")
local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil
local wood_tex = homedecor.textures.default_wood local wood_tex = homedecor.textures.wood.apple.planks
local water_tex = homedecor.textures.water local water_tex = homedecor.textures.water.tile
homedecor.register("bathroom_tiles_dark", { homedecor.register("bathroom_tiles_dark", {
description = S("Bathroom/kitchen tiles (dark)"), description = S("Bathroom/kitchen tiles (dark)"),

2
homedecor_bedroom/init.lua
View File

@@ -2,7 +2,7 @@ local S = minetest.get_translator("homedecor_bedroom")
local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil
local wood_tex, wool_tex = homedecor.textures.default_wood, homedecor.textures.wool_white local wood_tex, wool_tex = homedecor.textures.wood.apple.planks, homedecor.textures.wool.white
local bed_sbox = { local bed_sbox = {
type = "wallmounted", type = "wallmounted",

2
homedecor_climate_control/init.lua
View File

@@ -7,7 +7,7 @@ homedecor.register("air_conditioner", {
mesh = "homedecor_ac.obj", mesh = "homedecor_ac.obj",
tiles = { tiles = {
"homedecor_ac.png", "homedecor_ac.png",
homedecor.textures.glass homedecor.textures.glass.pane
}, },
groups = { snappy = 3, dig_stone = 3 }, groups = { snappy = 3, dig_stone = 3 },
use_texture_alpha = "clip", use_texture_alpha = "clip",

2
homedecor_clocks/init.lua
View File

@@ -135,7 +135,7 @@ homedecor.register("grandfather_clock", {
description = S("Grandfather Clock"), description = S("Grandfather Clock"),
mesh = "homedecor_grandfather_clock.obj", mesh = "homedecor_grandfather_clock.obj",
tiles = { tiles = {
homedecor.textures.glass, homedecor.textures.glass.pane,
"homedecor_grandfather_clock_face.png", "homedecor_grandfather_clock_face.png",
homedecor.lux_wood, homedecor.lux_wood,
"homedecor_grandfather_clock_face_edge.png", "homedecor_grandfather_clock_face_edge.png",

3
homedecor_common/init.lua
View File

@@ -54,8 +54,7 @@ homedecor.color_dark_grey = 0xff606060
homedecor.color_med_grey = 0xffa0a0a0 homedecor.color_med_grey = 0xffa0a0a0
-- load different handler subsystems -- load different handler subsystems
dofile(modpath.."/textures.lua") dofile(modpath.."/xcompat.lua")
dofile(modpath.."/materials.lua")
dofile(modpath.."/nodeboxes.lua") dofile(modpath.."/nodeboxes.lua")
dofile(modpath.."/expansion.lua") dofile(modpath.."/expansion.lua")
dofile(modpath.."/furnaces.lua") dofile(modpath.."/furnaces.lua")

1
homedecor_common/materials.lua
View File

@@ -1 +0,0 @@
homedecor.materials = xcompat.materials

34
homedecor_common/textures.lua
View File

@@ -1,34 +0,0 @@
homedecor.plain_wood = { name = "homedecor_generic_wood_plain.png", color = 0xffa76820 }
homedecor.mahogany_wood = { name = "homedecor_generic_wood_plain.png", color = 0xff7d2506 }
homedecor.white_wood = "homedecor_generic_wood_plain.png"
homedecor.dark_wood = { name = "homedecor_generic_wood_plain.png", color = 0xff39240f }
homedecor.lux_wood = { name = "homedecor_generic_wood_luxury.png", color = 0xff643f23 }
homedecor.textures = {
glass =
"[combine:16x16:" ..
"0,0=\\[combine\\:1x16\\^[noalpha\\^[colorize\\:#ffffff:" ..
"0,0=\\[combine\\:16x1\\^[noalpha\\^[colorize\\:#ffffff:" ..
"0,15=\\[combine\\:16x1\\^[noalpha\\^[colorize\\:#ffffff:" ..
"15,0=\\[combine\\:1x16\\^[noalpha\\^[colorize\\:#ffffff",
default_wood = "[combine:16x16^[noalpha^[colorize:#654321",
default_junglewood = "[combine:16x16^[noalpha^[colorize:#563d2d",
water = "[combine:16x16^[noalpha^[colorize:#00008b",
wool_white = "[combine:16x16^[noalpha^[colorize:#ffffff",
wool_black = "[combine:16x16^[noalpha^[colorize:#000000",
wool_grey = "[combine:16x16^[noalpha^[colorize:#313b3c",
wool_dark_grey = "[combine:16x16^[noalpha^[colorize:#313b3c",
}
if minetest.get_modpath("default") then
homedecor.textures = {
glass = "default_glass.png",
default_wood = "default_wood.png",
default_junglewood = "default_junglewood.png",
water = "default_water.png",
wool_white = "wool_white.png",
wool_black = "wool_black.png",
wool_grey = "wool_grey.png",
wool_dark_grey = "wool_dark_grey.png",
}
end

8
homedecor_common/xcompat.lua Normal file
View File

@@ -0,0 +1,8 @@
homedecor.plain_wood = { name = "homedecor_generic_wood_plain.png", color = 0xffa76820 }
homedecor.mahogany_wood = { name = "homedecor_generic_wood_plain.png", color = 0xff7d2506 }
homedecor.white_wood = "homedecor_generic_wood_plain.png"
homedecor.dark_wood = { name = "homedecor_generic_wood_plain.png", color = 0xff39240f }
homedecor.lux_wood = { name = "homedecor_generic_wood_luxury.png", color = 0xff643f23 }
homedecor.materials = xcompat.materials
homedecor.textures = xcompat.textures

2
homedecor_exterior/init.lua
View File

@@ -43,7 +43,7 @@ homedecor.register("barbecue", {
minetest.register_alias("homedecor:barbecue_meat", "air") minetest.register_alias("homedecor:barbecue_meat", "air")
local wood_tex = homedecor.textures.default_wood local wood_tex = homedecor.textures.wood.apple.planks
homedecor.register("doghouse", { homedecor.register("doghouse", {
mesh = "homedecor_doghouse.obj", mesh = "homedecor_doghouse.obj",

2
homedecor_furniture/init.lua
View File

@@ -5,7 +5,7 @@ local ob_cbox = {
fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 } fixed = { -0.5, -0.5, 0, 0.5, 0.5, 0.5 }
} }
local wood_tex = homedecor.textures.default_wood local wood_tex = homedecor.textures.wood.apple.planks
homedecor.register("openframe_bookshelf", { homedecor.register("openframe_bookshelf", {
description = S("Bookshelf (open-frame)"), description = S("Bookshelf (open-frame)"),

2
homedecor_kitchen/init.lua
View File

@@ -145,7 +145,7 @@ homedecor.register("dishwasher_"..m, {
}) })
end end
local wood_tex = homedecor.textures.default_wood local wood_tex = homedecor.textures.wood.apple.planks
local cabinet_sides = "("..wood_tex.."^[transformR90)^homedecor_kitchen_cabinet_bevel.png" local cabinet_sides = "("..wood_tex.."^[transformR90)^homedecor_kitchen_cabinet_bevel.png"
local cabinet_sides_colored = "(homedecor_generic_wood_plain.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png" local cabinet_sides_colored = "(homedecor_generic_wood_plain.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png"

4
homedecor_misc/init.lua
View File

@@ -11,8 +11,8 @@ local S = minetest.get_translator("homedecor_misc")
homedecor_misc = {} homedecor_misc = {}
local wool_black, wool_grey = homedecor.textures.wool_black, homedecor.textures.wool_grey local wool_black, wool_grey = homedecor.textures.wool.black, homedecor.textures.wool.grey
local wood_tex = homedecor.textures.default_wood local wood_tex = homedecor.textures.wood.apple.planks
homedecor.register("ceiling_paint", { homedecor.register("ceiling_paint", {
description = S("Textured Ceiling Paint"), description = S("Textured Ceiling Paint"),

2
homedecor_pictures_and_paintings/init.lua
View File

@@ -1,6 +1,6 @@
local S = minetest.get_translator("homedecor_pictures_and_paintings") local S = minetest.get_translator("homedecor_pictures_and_paintings")
local wood_tex = homedecor.textures.default_wood local wood_tex = homedecor.textures.wood.apple.planks
local pframe_cbox = { local pframe_cbox = {
type = "fixed", type = "fixed",

4
homedecor_roofing/init.lua
View File

@@ -5,8 +5,8 @@ homedecor_roofing = {}
minetest.register_node(":homedecor:skylight", { minetest.register_node(":homedecor:skylight", {
description = S("Glass Skylight"), description = S("Glass Skylight"),
drawtype = "raillike", drawtype = "raillike",
tiles = { homedecor.textures.glass }, tiles = { homedecor.textures.glass.pane },
wield_image = homedecor.textures.glass, wield_image = homedecor.textures.glass.pane,
inventory_image = "homedecor_skylight_inv.png", inventory_image = "homedecor_skylight_inv.png",
groups = { snappy = 3, dig_tree = 2 , axey=5}, groups = { snappy = 3, dig_tree = 2 , axey=5},
is_ground_content = false, is_ground_content = false,

6
homedecor_seating/armchairs.lua
View File

@@ -40,9 +40,9 @@ homedecor.register("armchair", {
description = S("Armchair"), description = S("Armchair"),
mesh = "forniture_armchair.obj", mesh = "forniture_armchair.obj",
tiles = { tiles = {
homedecor.textures.wool_white, homedecor.textures.wool.white,
{ name = homedecor.textures.wool_dark_grey, color = 0xffffffff }, { name = homedecor.textures.wool.dark_grey, color = 0xffffffff },
{ name = homedecor.textures.default_wood, color = 0xffffffff } { name = homedecor.textures.wood.apple.planks, color = 0xffffffff }
}, },
inventory_image = "homedecor_armchair_inv.png", inventory_image = "homedecor_armchair_inv.png",
paramtype2 = "colorwallmounted", paramtype2 = "colorwallmounted",

2
homedecor_seating/misc.lua
View File

@@ -162,7 +162,7 @@ homedecor.register("kitchen_chair_padded", {
mesh = "homedecor_kitchen_chair.obj", mesh = "homedecor_kitchen_chair.obj",
tiles = { tiles = {
homedecor.plain_wood, homedecor.plain_wood,
homedecor.textures.wool_white, homedecor.textures.wool.white,
}, },
inventory_image = "homedecor_chair_padded_inv.png", inventory_image = "homedecor_chair_padded_inv.png",
paramtype2 = "colorwallmounted", paramtype2 = "colorwallmounted",

2
homedecor_windows_and_treatments/init.lua
View File

@@ -161,7 +161,7 @@ homedecor.register("curtain_open", {
local mats = { local mats = {
{ "brass", S("brass"), "homedecor_generic_metal_brass.png" }, { "brass", S("brass"), "homedecor_generic_metal_brass.png" },
{ "wrought_iron", S("wrought iron"), "homedecor_generic_metal_wrought_iron.png" }, { "wrought_iron", S("wrought iron"), "homedecor_generic_metal_wrought_iron.png" },
{ "wood", S("wood"), homedecor.textures.default_wood } { "wood", S("wood"), homedecor.textures.wood.apple.planks }
} }
for _, m in ipairs(mats) do for _, m in ipairs(mats) do