diff --git a/handlers/nodeboxes.lua b/handlers/nodeboxes.lua index 9cfa488..9f0953f 100644 --- a/handlers/nodeboxes.lua +++ b/handlers/nodeboxes.lua @@ -26,9 +26,9 @@ xdecor.pixelnodebox = function(size, boxes) (x / size) - 0.5, (y / size) - 0.5, (z / size) - 0.5, - (w / size) - 0.5, - (h / size) - 0.5, - (l / size) - 0.5 + ((x + w) / size) - 0.5, + ((y + h) / size) - 0.5, + ((z + l) / size) - 0.5 } end return { type = "fixed", fixed = fixed } diff --git a/nodes.lua b/nodes.lua index 86017f6..87ab473 100644 --- a/nodes.lua +++ b/nodes.lua @@ -413,10 +413,10 @@ xdecor.register("stonepath", { sounds = default.node_sound_stone_defaults(), sunlight_propagates = true, node_box = xdecor.pixelnodebox(16, { - {8, 0, 8, 14, 0.5, 14}, - {1, 0, 1, 7, 0.5, 7}, - {1, 0, 10, 6, 0.5, 15}, - {10, 0, 2, 14, 0.5, 6} + {8, 0, 8, 6, 0.5, 6}, + {1, 0, 1, 6, 0.5, 6}, + {1, 0, 10, 5, 0.5, 5}, + {10, 0, 2, 4, 0.5, 4} }), selection_box = xdecor.nodebox.slab_y(0.05) }) @@ -440,7 +440,7 @@ xdecor.register("table", { groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, sounds = default.node_sound_wood_defaults(), node_box = xdecor.pixelnodebox(16, { - {0, 14, 0, 16, 16, 16}, {5.5, 0, 5.5, 10.5, 14, 10.5} + {0, 14, 0, 16, 2, 16}, {5.5, 0, 5.5, 5, 14, 6} }) }) diff --git a/sitting.lua b/sitting.lua index 8e36fa8..c336d4e 100644 --- a/sitting.lua +++ b/sitting.lua @@ -61,12 +61,12 @@ xdecor.register("chair", { groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, on_rotate = screwdriver.rotate_simple, node_box = xdecor.pixelnodebox(16, { - {3, 0, 11, 5, 16, 13}, - {11, 0, 11, 13, 16, 13}, - {5, 9, 11.5, 11, 15, 12.5}, - {3, 0, 3, 5, 6, 5}, - {11, 0, 3, 13, 6, 5}, - {3, 6, 3, 13, 8, 11} + {3, 0, 11, 2, 16, 2}, + {11, 0, 11, 2, 16, 2}, + {5, 9, 11.5, 6, 6, 1}, + {3, 0, 3, 2, 6, 2}, + {11, 0, 3, 2, 6, 2}, + {3, 6, 3, 10, 2, 8} }), can_dig = dig, on_rightclick = function(pos, node, clicker) diff --git a/textures/xdecor_cauldron_top_empty.png b/textures/xdecor_cauldron_top_empty.png index 2687e26..d302287 100644 Binary files a/textures/xdecor_cauldron_top_empty.png and b/textures/xdecor_cauldron_top_empty.png differ diff --git a/textures/xdecor_crate.png b/textures/xdecor_crate.png index 1a4754f..273dbbe 100644 Binary files a/textures/xdecor_crate.png and b/textures/xdecor_crate.png differ diff --git a/textures/xdecor_half_cabinet_front.png b/textures/xdecor_half_cabinet_front.png index b227e1b..3e4964c 100644 Binary files a/textures/xdecor_half_cabinet_front.png and b/textures/xdecor_half_cabinet_front.png differ diff --git a/textures/xdecor_painting_1.png b/textures/xdecor_painting_1.png index 1792b88..6ba2cb6 100644 Binary files a/textures/xdecor_painting_1.png and b/textures/xdecor_painting_1.png differ diff --git a/worktable.lua b/worktable.lua index 630367d..bc9b6e7 100644 --- a/worktable.lua +++ b/worktable.lua @@ -27,26 +27,26 @@ local nodes = { -- Nodes allowed to be cut. Registration format: [mod name] = [[ } local defs = { - -- Name Yield X Y Z W H L - {"nanoslab", 16, { 0, 0, 0, 8, 1, 8 }}, - {"micropanel", 16, { 0, 0, 0, 16, 1, 8 }}, - {"microslab", 8, { 0, 0, 0, 16, 1, 16 }}, - {"thinstair", 8, { 0, 7, 0, 16, 8, 8 }, - { 0, 15, 8, 16, 16, 16 }}, - {"cube", 4, { 0, 0, 8, 8, 8, 16 }}, - {"panel", 4, { 0, 0, 0, 16, 8, 8 }}, - {"slab", 2, { 0, 0, 0, 16, 8, 16 }}, - {"doublepanel", 2, { 0, 0, 0, 16, 8, 8 }, - { 0, 8, 8, 16, 16, 16 }}, - {"halfstair", 2, { 0, 0, 0, 8, 8, 16 }, - { 0, 8, 8, 8, 16, 16 }}, - {"outerstair", 1, { 0, 0, 0, 16, 8, 16 }, - { 0, 8, 8, 8, 16, 16 }}, - {"stair", 1, { 0, 0, 0, 16, 8, 16 }, - { 0, 8, 8, 16, 16, 16 }}, - {"innerstair", 1, { 0, 0, 0, 16, 8, 16 }, - { 0, 8, 8, 16, 16, 16 }, - { 0, 8, 0, 8, 16, 8 }} + -- Name Yield X Y Z W H L + {"nanoslab", 16, { 0, 0, 0, 8, 1, 8 }}, + {"micropanel", 16, { 0, 0, 0, 16, 1, 8 }}, + {"microslab", 8, { 0, 0, 0, 16, 1, 16 }}, + {"thinstair", 8, { 0, 7, 0, 16, 1, 8 }, + { 0, 15, 8, 16, 1, 8 }}, + {"cube", 4, { 0, 0, 8, 8, 8, 8 }}, + {"panel", 4, { 0, 0, 0, 16, 8, 8 }}, + {"slab", 2, { 0, 0, 0, 16, 8, 16 }}, + {"doublepanel", 2, { 0, 0, 0, 16, 8, 8 }, + { 0, 8, 8, 16, 8, 8 }}, + {"halfstair", 2, { 0, 0, 0, 8, 8, 16 }, + { 0, 8, 8, 8, 8, 8 }}, + {"outerstair", 1, { 0, 0, 0, 16, 8, 16 }, + { 0, 8, 8, 8, 8, 8 }}, + {"stair", 1, { 0, 0, 0, 16, 8, 16 }, + { 0, 8, 8, 16, 8, 8 }}, + {"innerstair", 1, { 0, 0, 0, 16, 8, 16 }, + { 0, 8, 8, 16, 8, 8 }, + { 0, 8, 0, 8, 8, 8 }} } function worktable.get_recipe(item)