diff --git a/mods/ITEMS/mcl_core/nodes_glass.lua b/mods/ITEMS/mcl_core/nodes_glass.lua index 19bb0028c6..595d4c8d36 100644 --- a/mods/ITEMS/mcl_core/nodes_glass.lua +++ b/mods/ITEMS/mcl_core/nodes_glass.lua @@ -26,7 +26,7 @@ function mcl_core.add_glass(desc, recipeitem, colorgroup, color) _doc_items_longdesc = "Stained glass is a decorational and mostly transparent block which comes in various different colors.", drawtype = "glasslike", is_ground_content = false, - tiles = {"xpanes_pane_glass_"..color..".png"}, + tiles = {"mcl_core_glass_"..color..".png"}, paramtype = "light", sunlight_propagates = "true", use_texture_alpha = true, diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_black.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_black.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_black.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_black.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_blue.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_blue.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_blue.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_blue.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_brown.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_brown.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_brown.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_brown.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_cyan.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_cyan.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_cyan.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_cyan.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_gray.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_gray.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_gray.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_gray.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_green.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_green.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_green.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_green.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_light_blue.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_light_blue.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_light_blue.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_light_blue.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_lime.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_lime.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_lime.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_lime.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_magenta.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_magenta.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_magenta.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_magenta.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_orange.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_orange.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_orange.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_orange.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_pink.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_pink.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_pink.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_pink.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_purple.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_purple.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_purple.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_purple.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_red.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_red.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_red.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_red.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_silver.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_silver.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_silver.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_silver.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_white.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_white.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_white.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_white.png diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_yellow.png b/mods/ITEMS/mcl_core/textures/mcl_core_glass_yellow.png similarity index 100% rename from mods/ITEMS/xpanes/textures/xpanes_pane_glass_yellow.png rename to mods/ITEMS/mcl_core/textures/mcl_core_glass_yellow.png diff --git a/mods/ITEMS/xpanes/init.lua b/mods/ITEMS/xpanes/init.lua index 8c5f366aa4..e95a3814f5 100644 --- a/mods/ITEMS/xpanes/init.lua +++ b/mods/ITEMS/xpanes/init.lua @@ -166,14 +166,23 @@ function xpanes.register_pane(name, def) end end +-- Register glass pane (stained and unstained) local pane = function(description, node, append) + local texture1 + + -- Special case: Default (unstained) glass texture + if append == "_natural" then + texture1 = "default_glass.png" + else + texture1 = "mcl_core_glass"..append..".png" + end xpanes.register_pane("pane"..append, { description = description, _doc_items_longdesc = "Glass panes are thin layers of glass which neatly connect to their neighbors as you build them.", - textures = {"xpanes_pane_glass"..append..".png","xpanes_pane_half_glass"..append..".png","xpanes_top_glass"..append..".png"}, + textures = {texture1, "xpanes_pane_half_glass"..append..".png", "xpanes_top_glass"..append..".png"}, use_texture_alpha = true, - inventory_image = "xpanes_pane_glass"..append..".png", - wield_image = "xpanes_pane_glass"..append..".png", + inventory_image = texture1, + wield_image = texture1, sounds = mcl_sounds.node_sound_glass_defaults(), groups = {handy=1, material_glass=1}, recipe = { @@ -186,7 +195,7 @@ local pane = function(description, node, append) }) end --- Iron Bar +-- Iron Bars xpanes.register_pane("bar", { description = "Iron Bars", _doc_items_longdesc = "Iron bars neatly connect to their neighbors as you build them.", @@ -203,8 +212,10 @@ xpanes.register_pane("bar", { _mcl_hardness = 5, }) --- Glass -pane("Glass Pane", "mcl_core:glass", "_natural") +-- Glass Pane +pane("Glass Pane", "mcl_core:glass", "_natural") -- triggers special case + +-- Stained Glass Pane pane("Red Stained Glass Pane", "mcl_core:glass_red", "_red") pane("Green Stained Glass Pane", "mcl_core:glass_green", "_green") pane("Blue Stained Glass Pane", "mcl_core:glass_blue", "_blue") diff --git a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_natural.png b/mods/ITEMS/xpanes/textures/xpanes_pane_glass_natural.png deleted file mode 100644 index dae5249052..0000000000 Binary files a/mods/ITEMS/xpanes/textures/xpanes_pane_glass_natural.png and /dev/null differ