Add Wood Frame

diff --git a/hive.lua b/hive.lua
index 13a3b9531502e3753c2b4dc90aea541a1b9edd6d..7256239c4cbceea7543972b62667a9fba7df625c 100644 (file)
--- a/hive.lua
+++ b/hive.lua
@@ -6,7 +6,7 @@ function hive.construct(pos)
        local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots
 
        local formspec = "size[8,5;]"..xbg..
-               "label[1.35,0;Bees are making honey\nwith pollen around...]image[6,0;1,1;xdecor_bee.png]image[5,0;1,1;hive_layout.png]list[current_name;honey;5,0;1,1;]list[current_player;main;0,1.35;8,4;]"
+               "label[1.35,0;Bees are making honey\nwith pollen around...]image[6,0;1,1;hive_bee.png]image[5,0;1,1;hive_layout.png]list[current_name;honey;5,0;1,1;]list[current_player;main;0,1.35;8,4;]"
 
        meta:set_string("formspec", formspec)
        meta:set_string("infotext", "Artificial Hive")

diff --git a/nodes.lua b/nodes.lua
index 052992f35e4553963e68ae94827798d2e5f5b3a5..927c8d3d570c7a5f69a1966d784e16c413c51d1d 100644 (file)
--- a/nodes.lua
+++ b/nodes.lua
@@ -513,6 +513,23 @@ xdecor.register("tv", {
        }
 })
 
+xpanes.register_pane("wood_frame", {
+       description = "Wood Frame",
+       tiles = {"xdecor_wood_frame.png"},
+       drawtype = "airlike",
+       paramtype = "light",
+       textures = {"xdecor_wood_frame.png", "xdecor_wood_frame.png", "xpanes_space.png"},
+       inventory_image = "xdecor_wood_frame.png",
+       wield_image = "xdecor_wood_frame.png",
+       groups = {choppy=3, pane=1, flammable=3},
+       sounds = default.node_sound_wood_defaults(),
+       recipe = {
+               {"group:wood", "group:stick", "group:wood"},
+               {"group:stick", "group:stick", "group:stick"},
+               {"group:wood", "group:stick", "group:wood"}
+       }
+})
+
 xdecor.register("woodframed_glass", {
        description = "Wood Framed Glass",
        drawtype = "glasslike_framed",

diff --git a/textures/hive_bee.png b/textures/hive_bee.png
new file mode 100644 (file)
index 0000000..9ab99f1
Binary files /dev/null and b/textures/hive_bee.png differ

diff --git a/textures/hive_layout.png b/textures/hive_layout.png
index 9d7aeb0db798cc2547f864226e20cc38bbc43ae1..90280d8e803cec969597282718bf31c572f9568a 100644 (file)
Binary files a/textures/hive_layout.png and b/textures/hive_layout.png differ

diff --git a/textures/worktable_anvil.png b/textures/worktable_anvil.png
new file mode 100644 (file)
index 0000000..4a3021d
Binary files /dev/null and b/textures/worktable_anvil.png differ

diff --git a/textures/worktable_saw.png b/textures/worktable_saw.png
new file mode 100644 (file)
index 0000000..56de7a1
Binary files /dev/null and b/textures/worktable_saw.png differ

diff --git a/textures/xdecor_anvil.png b/textures/xdecor_anvil.png
deleted file mode 100644 (file)
index 4a3021d..0000000
Binary files a/textures/xdecor_anvil.png and /dev/null differ

diff --git a/textures/xdecor_bee.png b/textures/xdecor_bee.png
deleted file mode 100644 (file)
index 9ab99f1..0000000
Binary files a/textures/xdecor_bee.png and /dev/null differ

diff --git a/textures/xdecor_lightbox.png b/textures/xdecor_lightbox.png
index 4bfd18326c1c94513ac07c3763ede326b9fd9d80..a89b09b3dd1bab665a18b49c3cbe14c38a33320e 100644 (file)
Binary files a/textures/xdecor_lightbox.png and b/textures/xdecor_lightbox.png differ

diff --git a/textures/xdecor_saw.png b/textures/xdecor_saw.png
deleted file mode 100644 (file)
index 56de7a1..0000000
Binary files a/textures/xdecor_saw.png and /dev/null differ

diff --git a/textures/xdecor_wood_frame.png b/textures/xdecor_wood_frame.png
new file mode 100644 (file)
index 0000000..fcbfd16
Binary files /dev/null and b/textures/xdecor_wood_frame.png differ

diff --git a/worktable.lua b/worktable.lua
index dd798dbaceb5579efd8e0a5ec012cbf059d4712c..62eb1d39c51026ffbb7ddce2ed52b0b112078896 100644 (file)
--- a/worktable.lua
+++ b/worktable.lua
@@ -55,7 +55,7 @@ function worktable.construct(pos)
        inv:set_size("hammer", 1)
 
        local formspec = "size[8,7;]"..xbg..
-               "list[context;forms;4,0;4,3;]label[0.95,1.23;Cut]box[-0.05,1;2.05,0.9;#555555]image[3,1;1,1;gui_furnace_arrow_bg.png^[transformR270]label[0.95,2.23;Repair]box[-0.05,2;2.05,0.9;#555555]image[0,1;1,1;xdecor_saw.png]image[0,2;1,1;xdecor_anvil.png]image[3,2;1,1;hammer_layout.png]list[current_name;input;2,1;1,1;]list[current_name;tool;2,2;1,1;]list[current_name;hammer;3,2;1,1;]button[0,0;2,1;craft;Crafting]button[2,0;2,1;storage;Storage]list[current_player;main;0,3.25;8,4;]"
+               "list[context;forms;4,0;4,3;]label[0.95,1.23;Cut]box[-0.05,1;2.05,0.9;#555555]image[3,1;1,1;gui_furnace_arrow_bg.png^[transformR270]label[0.95,2.23;Repair]box[-0.05,2;2.05,0.9;#555555]image[0,1;1,1;worktable_saw.png]image[0,2;1,1;worktable_anvil.png]image[3,2;1,1;hammer_layout.png]list[current_name;input;2,1;1,1;]list[current_name;tool;2,2;1,1;]list[current_name;hammer;3,2;1,1;]button[0,0;2,1;craft;Crafting]button[2,0;2,1;storage;Storage]list[current_player;main;0,3.25;8,4;]"
 
        meta:set_string("formspec", formspec)
        meta:set_string("infotext", "Work Table")