From 70c0f1559eb53170cc3cad025bf504d72ddb5bf2 Mon Sep 17 00:00:00 2001
From: philipmi <michael@philipp.vip>
Date: Thu, 23 Feb 2023 20:17:08 +0100
Subject: [PATCH] Add Cactus + Moon Brick Wall and fix wall materials being
 added to wall group

---
 README.md |  9 ++++++---
 init.lua  | 12 ++++++++++--
 mod.conf  |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ba08868..979ab03 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Brick Walls
 This simple mod adds brick walls for the walls mod. There are walls for many types of bricks from different mods.
 
 Walls are added for the following brick types:
-- From default (mtg):
+- From `default` (mtg):
     - Brick
     - Stone Brick
     - Desert Stone Brick
@@ -16,14 +16,17 @@ Walls are added for the following brick types:
     - Desert Sandstone Brick
     - Silver Sandstone Brick
     - Obsidian Brick
-- From nether:
+- From `nether`:
     - Nether Brick
     - Compressed Nether Brick
     - Cracked Nether Brick
     - Deep Nether Brick
-- From ethereal:
+- From `ethereal`:
     - Ice Brick
     - Snow Brick
+- From `xdecor`:
+    - Cactus Brick
+    - Moon Brick
 
 The number of blocks that walls connect to will also be expanded.
 For the walls to be added, it's required to enable the mods containing the corresponding materials (bricks).
diff --git a/init.lua b/init.lua
index 3afc1a8..07dbcb3 100644
--- a/init.lua
+++ b/init.lua
@@ -20,6 +20,9 @@ brickwalls = {
     -- ethereal
     {"brickwalls:icebrick", "Ice Brick Wall", "ethereal:icebrick"},
     {"brickwalls:snowbrick", "Snow Brick Wall", "ethereal:snowbrick"},
+    -- xdecor
+    {"brickwalls:cactusbrick", "Cactus Brick Wall", "xdecor:cactusbrick"},
+    {"brickwalls:moonbrick", "Moon Brick Wall", "xdecor:moonbrick"},
 }
 
 for _, i in pairs(brickwalls) do
@@ -30,7 +33,10 @@ for _, i in pairs(brickwalls) do
                         i[3], minetest.registered_nodes[i[3]].sounds)
 
         -- change groups
-        local groups = minetest.registered_nodes[i[3]].groups
+        local groups = {}
+        for k, v in pairs(minetest.registered_nodes[i[3]].groups) do
+            groups[k] = v
+        end
         groups.wall = 1
         minetest.override_item(i[1], {groups = groups})
     end
@@ -55,7 +61,9 @@ for n, def in pairs(minetest.registered_nodes) do
                 "nether:brick", "nether:brick_compressed", "nether:brick_cracked", "nether:brick_deep",
                 --"nether:fence_nether_brick",
                 -- ethereal
-                "ethereal:icebrick", "ethereal:snowbrick"
+                "ethereal:icebrick", "ethereal:snowbrick",
+                -- xdecor
+                "xdecor:cactusbrick", "xdecor:moonbrick",
             }
         })
     end
diff --git a/mod.conf b/mod.conf
index 879fec5..9598611 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,6 +1,6 @@
 name = brickwalls
 author = philipmi
 depends = walls
-optional_depends = default, nether, ethereal
+optional_depends = default, nether, ethereal, xdecor
 description = Adds brick walls from different types of bricks.
 title = Brick Walls