From ea16f89ac819d6da0bdc2af5ff02e03cbd1805f0 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Thu, 15 Oct 2015 19:50:55 +0200 Subject: [PATCH] [homedecor] Update --- .../building_blocks/init.lua | 18 ++ .../computer/models/tetris_arcade.obj | 139 +++++++++++++-- mods/homedecor_modpack/homedecor/bedroom.lua | 24 ++- mods/homedecor_modpack/homedecor/books.lua | 16 +- mods/homedecor_modpack/homedecor/exterior.lua | 52 +++--- mods/homedecor_modpack/homedecor/fences.lua | 56 ++---- .../homedecor/misc-nodes.lua | 3 +- .../homedecor/models/homedecor_cube.obj | 23 +++ .../homedecor/models/homedecor_door_plain.obj | 61 ++++--- .../models/homedecor_door_plain_right.obj | 61 ++++--- .../models/homedecor_fence_barbed_wire.obj | 60 +++++++ .../homedecor_fence_barbed_wire_corner.obj | 79 +++++++++ .../models/homedecor_fence_chainlink.obj | 105 ++++++++++++ .../homedecor_fence_chainlink_corner.obj | 162 ++++++++++++++++++ .../homedecor/models/homedecor_shrubbery.obj | 117 +++++++++++++ .../textures/homedecor_shrubbery_bottom.png | Bin 404 -> 0 bytes ..._top.png => homedecor_shrubbery_green.png} | Bin .../homedecor_shrubbery_green_bottom.png | Bin 0 -> 767 bytes .../homedecor_shrubbery_green_sides.png | Bin 317 -> 0 bytes ...ed_top.png => homedecor_shrubbery_red.png} | Bin .../homedecor_shrubbery_red_bottom.png | Bin 0 -> 865 bytes .../homedecor_shrubbery_red_sides.png | Bin 448 -> 0 bytes .../textures/homedecor_shrubbery_roots.png | Bin 0 -> 668 bytes ...top.png => homedecor_shrubbery_yellow.png} | Bin .../homedecor_shrubbery_yellow_bottom.png | Bin 0 -> 876 bytes .../homedecor_shrubbery_yellow_sides.png | Bin 447 -> 0 bytes mods/homedecor_modpack/lrfurn/armchairs.lua | 21 +-- mods/homedecor_modpack/lrfurn/init.lua | 18 ++ mods/homedecor_modpack/lrfurn/longsofas.lua | 24 +-- mods/homedecor_modpack/lrfurn/sofas.lua | 24 +-- .../lrfurn/textures/lrfurn_bg_white.png | Bin 0 -> 121 bytes .../textures/lrfurn_coffeetable_back.png | Bin .../textures/lrfurn_coffeetable_front.png | Bin .../lrfurn/textures/lrfurn_sofa_black.png | Bin 619 -> 0 bytes .../lrfurn/textures/lrfurn_sofa_blue.png | Bin 811 -> 0 bytes .../lrfurn/textures/lrfurn_sofa_bottom.png | Bin .../lrfurn/textures/lrfurn_sofa_green.png | Bin 869 -> 0 bytes .../lrfurn/textures/lrfurn_sofa_grey.png | Bin 622 -> 0 bytes .../lrfurn/textures/lrfurn_sofa_orange.png | Bin 686 -> 0 bytes .../lrfurn/textures/lrfurn_sofa_overlay.png | Bin 0 -> 2855 bytes .../lrfurn/textures/lrfurn_sofa_red.png | Bin 789 -> 0 bytes .../lrfurn/textures/lrfurn_sofa_violet.png | Bin 774 -> 0 bytes .../lrfurn/textures/lrfurn_sofa_white.png | Bin 640 -> 0 bytes .../lrfurn/textures/lrfurn_sofa_yellow.png | Bin 671 -> 0 bytes mods/homedecor_modpack/signs_lib/init.lua | 22 ++- 45 files changed, 847 insertions(+), 238 deletions(-) mode change 100755 => 100644 mods/homedecor_modpack/computer/models/tetris_arcade.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_cube.obj mode change 100755 => 100644 mods/homedecor_modpack/homedecor/models/homedecor_door_plain.obj mode change 100755 => 100644 mods/homedecor_modpack/homedecor/models/homedecor_door_plain_right.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_fence_barbed_wire.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_fence_barbed_wire_corner.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_fence_chainlink.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_fence_chainlink_corner.obj create mode 100644 mods/homedecor_modpack/homedecor/models/homedecor_shrubbery.obj delete mode 100755 mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_bottom.png rename mods/homedecor_modpack/homedecor/textures/{homedecor_shrubbery_green_top.png => homedecor_shrubbery_green.png} (100%) mode change 100755 => 100644 create mode 100644 mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green_bottom.png delete mode 100755 mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green_sides.png rename mods/homedecor_modpack/homedecor/textures/{homedecor_shrubbery_red_top.png => homedecor_shrubbery_red.png} (100%) mode change 100755 => 100644 create mode 100644 mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red_bottom.png delete mode 100755 mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red_sides.png create mode 100644 mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_roots.png rename mods/homedecor_modpack/homedecor/textures/{homedecor_shrubbery_yellow_top.png => homedecor_shrubbery_yellow.png} (100%) mode change 100755 => 100644 create mode 100644 mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_yellow_bottom.png delete mode 100755 mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_yellow_sides.png create mode 100644 mods/homedecor_modpack/lrfurn/textures/lrfurn_bg_white.png mode change 100755 => 100644 mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_back.png mode change 100755 => 100644 mods/homedecor_modpack/lrfurn/textures/lrfurn_coffeetable_front.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_black.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png mode change 100755 => 100644 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png create mode 100644 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_overlay.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_violet.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png delete mode 100755 mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_yellow.png diff --git a/mods/homedecor_modpack/building_blocks/init.lua b/mods/homedecor_modpack/building_blocks/init.lua index 24cede0c..fd12087e 100755 --- a/mods/homedecor_modpack/building_blocks/init.lua +++ b/mods/homedecor_modpack/building_blocks/init.lua @@ -93,6 +93,24 @@ minetest.register_craft({ {"default:wood", "default:junglewood"}, } }) +if minetest.get_modpath("moreblocks") then + minetest.register_craft({ + output = 'building_blocks:sticks 2', + recipe = { + {'group:stick', '' , 'group:stick'}, + {'group:stick', 'group:stick', 'group:stick'}, + {'group:stick', 'group:stick', 'group:stick'}, + } + }) +else + minetest.register_craft({ + output = 'building_blocks:sticks', + recipe = { + {'group:stick', 'group:stick'}, + {'group:stick', 'group:stick'}, + } + }) +end minetest.register_craft({ output = 'building_blocks:sticks', diff --git a/mods/homedecor_modpack/computer/models/tetris_arcade.obj b/mods/homedecor_modpack/computer/models/tetris_arcade.obj old mode 100755 new mode 100644 index 66d651f6..12a41a8e --- a/mods/homedecor_modpack/computer/models/tetris_arcade.obj +++ b/mods/homedecor_modpack/computer/models/tetris_arcade.obj @@ -1,34 +1,143 @@ -# Blender v2.72 (sub 0) OBJ File: '' +# Blender v2.66 (sub 1) OBJ File: '' # www.blender.org -mtllib vending_machine.mtl -o Cube +mtllib tetris_arcade.mtl +o Cube.001 +v -0.450000 1.299500 -0.450000 +v -0.450000 1.299500 -0.500000 +v 0.450000 1.299500 -0.500000 +v 0.450000 1.299500 -0.450000 +v -0.450000 1.499500 -0.450000 +v -0.450000 1.499500 -0.500000 +v 0.450000 1.499500 -0.500000 +v 0.450000 1.499500 -0.450000 +v 0.450000 -0.495000 -0.500000 +v 0.450000 0.305000 -0.500001 +v -0.450000 -0.495000 -0.499999 +v -0.450000 0.305000 -0.500000 +v 0.450000 -0.498500 0.500000 +v 0.450000 -0.498500 -0.500000 +v 0.500000 -0.498500 -0.500000 +v 0.500000 -0.498500 0.500000 +v 0.450000 1.498500 0.500000 +v 0.450000 1.498500 -0.500000 +v 0.500000 1.498500 -0.500000 +v 0.500000 1.498500 0.500000 v 0.499998 -0.499998 -0.499998 v 0.499998 -0.499998 0.499998 v -0.499998 -0.499998 0.499998 v -0.499998 -0.499998 -0.499998 v 0.499998 1.499994 -0.499998 -v 0.499998 1.499994 0.499998 -v -0.499998 1.499994 0.499998 v -0.499998 1.499994 -0.499998 +v -0.499998 1.499994 0.499998 +v 0.499998 1.499994 0.499998 +v -0.500000 -0.498500 0.500000 +v -0.500000 -0.498500 -0.500000 +v -0.450000 -0.498500 -0.500000 +v -0.450000 -0.498500 0.500000 +v -0.500000 1.498500 0.500000 +v -0.500000 1.498500 -0.500000 +v -0.450000 1.498500 -0.500000 +v -0.450000 1.498500 0.500000 +v 0.450000 0.304976 -0.499762 +v 0.450000 0.474024 -0.137239 +v -0.450000 0.304976 -0.499761 +v -0.450000 0.474024 -0.137238 +v 0.450000 0.472946 -0.138083 +v 0.450000 0.613900 -0.086780 +v -0.450000 0.472946 -0.138082 +v -0.450000 0.613900 -0.086779 +v 0.450000 0.610884 -0.085130 +v 0.450000 1.398731 0.053788 +v -0.450000 0.610884 -0.085130 +v -0.450000 1.398731 0.053789 +v 0.450000 1.395000 0.055138 +v 0.450000 1.495000 0.055138 +v -0.450000 1.395000 0.055138 +v -0.450000 1.495000 0.055138 +vt 0.250108 0.745030 +vt 0.250224 0.516409 +vt 0.494888 0.516008 +vt 0.495027 0.744660 +vt 0.500090 0.744658 +vt 0.250080 0.744698 +vt 0.250023 0.693307 +vt 0.500163 0.693337 +vt 0.244872 0.999900 +vt 0.000100 0.999900 +vt 0.000100 0.925965 +vt 0.244701 0.925965 +vt -0.000234 0.985285 +vt 0.246386 0.985398 +vt 0.246568 0.999900 +vt 0.254685 0.396330 +vt 0.255312 0.252326 +vt 0.489851 0.252497 +vt 0.489923 0.396494 +vt 0.746604 0.251526 +vt 1.000599 0.251553 +vt 1.000481 0.749319 +vt 0.748216 0.749150 +vt 0.971448 0.251053 +vt 0.999396 0.251108 +vt 1.000262 0.749144 +vt 0.972149 0.748806 +vt 0.250110 0.749633 +vt 0.000464 0.749633 +vt 0.001279 0.251648 +vt 0.250023 0.251690 +vt 0.742499 0.744632 +vt 0.500700 0.744632 +vt 0.500700 0.255368 +vt 0.742499 0.255368 +vt 0.951737 0.252687 +vt 0.999900 0.252686 +vt 0.999900 0.748679 +vt 0.951737 0.748679 +vt 1.000029 0.749233 +vt 0.744529 0.749104 +vt 0.745177 0.251367 +vt 1.001019 0.251067 +vt 0.255742 0.485017 +vt 0.255492 0.401623 +vt 0.494936 0.401277 +vt 0.495186 0.485021 +vt 0.260753 0.515705 +vt 0.260629 0.484664 +vt 0.494387 0.484878 +vt 0.494282 0.515673 +vt -0.000037 0.745106 +vt 0.000017 0.703328 +vt 0.245542 0.703882 +vt 0.245632 0.745399 vt 0.250050 0.250050 vt 0.000100 0.250050 vt 0.000100 0.000100 vt 0.250050 0.000100 vt 0.250050 0.749950 vt 0.250050 0.999900 -vt 0.000100 0.999900 vt 0.000100 0.749950 vt 0.999900 0.250049 vt 0.999900 0.749949 vt 0.749950 0.749950 vt 0.749950 0.250050 -vt 0.500000 0.749950 -vt 0.500000 0.250050 -usemtl Material +usemtl Material.001 s off -f 1/1 2/2 3/3 4/4 -f 5/5 8/6 7/7 6/8 -f 1/1 5/5 6/8 2/2 -f 2/9 6/10 7/11 3/12 -f 3/12 7/11 8/13 4/14 -f 5/5 1/1 4/14 8/13 +f 46/1 45/2 47/3 48/4 +usemtl Material.001_tetris_arcade.png +f 6/5 7/6 3/7 2/8 +f 8/9 5/10 1/11 4/12 +f 1/10 2/13 3/14 4/15 +f 10/16 9/17 11/18 12/19 +f 17/20 18/21 14/22 13/23 +f 18/24 19/25 15/26 14/27 +f 19/28 20/29 16/30 15/31 +f 33/32 34/33 30/34 29/35 +f 34/36 35/37 31/38 30/39 +f 35/40 36/41 32/42 31/43 +f 38/44 37/45 39/46 40/47 +f 42/48 41/49 43/50 44/51 +f 50/52 49/53 51/54 52/55 +usemtl Material.001_NONE +f 21/56 22/57 23/58 24/59 +f 25/60 26/61 27/10 28/62 +f 22/63 28/64 27/65 23/66 diff --git a/mods/homedecor_modpack/homedecor/bedroom.lua b/mods/homedecor_modpack/homedecor/bedroom.lua index e765e4a9..683e53aa 100755 --- a/mods/homedecor_modpack/homedecor/bedroom.lua +++ b/mods/homedecor_modpack/homedecor/bedroom.lua @@ -1,15 +1,21 @@ local S = homedecor.gettext local bedcolors = { - { "red", "#d00000:150" }, - { "green", "#00d000:150" }, - { "blue", "#0000d0:150" }, - { "violet", "#7000e0:150" }, - { "brown", "#603010:175" }, - { "darkgrey", "#101010:150" }, - { "orange", "#ff3000:150" }, - { "yellow", "#ffe000:150" }, - { "pink", "#ff80b0:150" } + { "black", "#000000:200" }, --new cg72 + { "brown", "#603010:175" }, + { "blue", "#0000d0:150" }, + { "cyan", "#009fa7:150" }, --new cg72 + { "darkgrey", "#101010:175" }, + { "dark_green", "#007000:150" }, + { "green", "#00d000:150" }, --new cg72 + { "grey", "#101010:100" }, --new cg72 + { "magenta", "#e0048b:150" }, --new cg72 + { "orange", "#ff3000:150" }, + { "pink", "#ff80b0:150" }, + { "red", "#d00000:150" }, + { "violet", "#7000e0:150" }, + { "white", "#000000:000" }, --new cg72 + { "yellow", "#ffe000:150" } } local bed_sbox = { diff --git a/mods/homedecor_modpack/homedecor/books.lua b/mods/homedecor_modpack/homedecor/books.lua index 725e77ae..4783cb39 100755 --- a/mods/homedecor_modpack/homedecor/books.lua +++ b/mods/homedecor_modpack/homedecor/books.lua @@ -59,15 +59,15 @@ for c in ipairs(bookcolors) do on_place = function(itemstack, placer, pointed_thing) local plname = placer:get_player_name() local pos = pointed_thing.under - local node = minetest.get_node(pos) - local n = minetest.registered_nodes[node.name] - if not n.buildable_to then + local node = minetest.get_node_or_nil(pos) + local def = node and minetest.registered_nodes[node.name] + if not def or not def.buildable_to then pos = pointed_thing.above - node = minetest.get_node(pos) - n = minetest.registered_nodes[node.name] - if not n.buildable_to then return end + node = minetest.get_node_or_nil(pos) + def = node and minetest.registered_nodes[node.name] + if not def or not def.buildable_to then return itemstack end end - if minetest.is_protected(pos, plname) then return end + if minetest.is_protected(pos, plname) then return itemstack end local fdir = minetest.dir_to_facedir(placer:get_look_dir()) minetest.set_node(pos, { name = "homedecor:book_"..color, @@ -89,7 +89,7 @@ for c in ipairs(bookcolors) do if data.title and data.title ~= "" then meta:set_string("infotext", data.title) end - if not minetest.setting_getbool("creative_mode") then + if not homedecor.expect_infinite_stacks then itemstack:take_item() end return itemstack diff --git a/mods/homedecor_modpack/homedecor/exterior.lua b/mods/homedecor_modpack/homedecor/exterior.lua index 97307dc3..c9434b21 100755 --- a/mods/homedecor_modpack/homedecor/exterior.lua +++ b/mods/homedecor_modpack/homedecor/exterior.lua @@ -241,6 +241,9 @@ homedecor.register("swing", { type = "fixed", fixed = { -0.3125, 0.33, -0.125, 0.3125, 0.5, 0.1875 } }, + hint = { + place_on = "bottom" + }, on_place = function(itemstack, placer, pointed_thing) local isceiling, pos = homedecor.find_ceiling(itemstack, placer, pointed_thing) if isceiling then @@ -249,13 +252,13 @@ homedecor.register("swing", { for i = 0, 4 do -- search up to 5 spaces downward from the ceiling for the first non-buildable-to node... height = i local testpos = { x=pos.x, y=pos.y-i-1, z=pos.z } - local testnode = minetest.get_node(testpos) - local testreg = core.registered_nodes[testnode.name] + local testnode = minetest.get_node_or_nil(testpos) + local testreg = testnode and core.registered_nodes[testnode.name] - if not testreg.buildable_to then + if not testreg or not testreg.buildable_to then if i < 1 then minetest.chat_send_player(placer:get_player_name(), "No room under there to hang a swing.") - return + return itemstack else break end @@ -274,12 +277,11 @@ homedecor.register("swing", { if not homedecor.expect_infinite_stacks then itemstack:take_item() - return itemstack end - else minetest.chat_send_player(placer:get_player_name(), "You have to point at the bottom side of an overhanging object to place a swing.") end + return itemstack end, after_dig_node = function(pos, oldnode, oldmetadata, digger) for i = 0, 4 do @@ -351,36 +353,20 @@ if minetest.get_modpath("bucket") then }) end -local shrub_model = { - type = "fixed", - fixed = { - {-0.312500,-0.500000,0.250000,-0.187500,-0.437500,0.375000}, --NodeBox 1 - {0.187500,-0.500000,-0.125000,0.312500,-0.437500,0.000000}, --NodeBox 2 - {0.000000,-0.500000,-0.312500,0.125000,-0.437500,-0.187500}, --NodeBox 3 - {-0.375000,-0.500000,-0.062500,-0.250000,-0.437500,0.062500}, --NodeBox 4 - {0.000000,-0.500000,-0.250000,0.125000,-0.437500,-0.125000}, --NodeBox 5 - {0.187500,-0.437500,-0.187500,0.375000,-0.375000,0.062500}, --NodeBox 6 - {-0.062500,-0.437500,0.125000,0.187500,-0.375000,0.375000}, --NodeBox 7 - {-0.062500,-0.437500,-0.375000,0.187500,-0.375000,-0.062500}, --NodeBox 8 - {-0.375000,-0.437500,0.187500,-0.125000,-0.375000,0.431179}, --NodeBox 9 - {-0.437500,-0.437500,-0.125000,-0.187500,-0.375000,0.125000}, --NodeBox 10 - {-0.437500,-0.375000,-0.437500,0.439966,-0.312500,0.420887}, --NodeBox 11 - {-0.500000,-0.312500,-0.500000,0.500000,0.500000,0.500000}, --NodeBox 12 - {0.000000,-0.500000,0.187500,0.125000,-0.437500,0.312500}, --NodeBox 13 - } -} - homedecor.shrub_colors = { "green", "red", "yellow" } +local shrub_cbox = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 } + for _, color in ipairs(homedecor.shrub_colors) do minetest.register_node("homedecor:shrubbery_large_"..color, { description = S("Shrubbery ("..color..")"), - drawtype = "allfaces_optional", - tiles = {"homedecor_shrubbery_"..color.."_top.png"}, + drawtype = "mesh", + mesh = "homedecor_cube.obj", + tiles = {"homedecor_shrubbery_"..color..".png"}, paramtype = "light", is_ground_content = false, groups = {snappy=3, flammable=2}, @@ -389,17 +375,19 @@ for _, color in ipairs(homedecor.shrub_colors) do minetest.register_node("homedecor:shrubbery_"..color, { description = S("Shrubbery ("..color..")"), - drawtype = "nodebox", + drawtype = "mesh", + mesh = "homedecor_shrubbery.obj", tiles = { - "homedecor_shrubbery_"..color.."_top.png", - "homedecor_shrubbery_bottom.png", - "homedecor_shrubbery_"..color.."_sides.png" + "homedecor_shrubbery_"..color..".png", + "homedecor_shrubbery_"..color.."_bottom.png", + "homedecor_shrubbery_roots.png" }, paramtype = "light", is_ground_content = false, groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), - node_box = shrub_model + selection_box = shrub_cbox, + collision_box = shrub_cbox, }) end diff --git a/mods/homedecor_modpack/homedecor/fences.lua b/mods/homedecor_modpack/homedecor/fences.lua index c82ba4c6..8352431c 100755 --- a/mods/homedecor_modpack/homedecor/fences.lua +++ b/mods/homedecor_modpack/homedecor/fences.lua @@ -184,43 +184,27 @@ homedecor.register("fence_privacy_corner", { homedecor.register("fence_barbed_wire", { description = S("Barbed Wire Fence"), + mesh = "homedecor_fence_barbed_wire.obj", tiles = {"homedecor_fence_barbed_wire.png"}, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.slab_z(-0.125), - node_box = { - type = "fixed", - fixed = { - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, -- left post - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post - { -6/16, -8/16, 7/16, 6/16, 8/16, 7/16 } -- the wire - } - }, + collision_box = homedecor.nodebox.slab_z(-0.125), }) homedecor.register("fence_barbed_wire_corner", { description = S("Barbed Wire Fence Corner"), - tiles = { - "homedecor_fence_barbed_wire.png" - }, + mesh = "homedecor_fence_barbed_wire_corner.obj", + tiles = { "homedecor_fence_barbed_wire.png" }, groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.corner_xz(0.125, -0.125), - node_box = { - type = "fixed", - fixed = { - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, -- left post - { 6/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post - { -6/16, -8/16, 7/16, 6/16, 8/16, 7/16 }, -- the wire - - { -8/16, -8/16, -8/16, -6/16, 8/16, -6/16 }, -- front post - { -7/16, -8/16, -6/16, -7/16, 8/16, 6/16 } -- more wire - } - }, + collision_box = homedecor.nodebox.corner_xz(0.125, -0.125), }) homedecor.register("fence_chainlink", { description = S("Chainlink Fence"), + mesh="homedecor_fence_chainlink.obj", tiles = { "homedecor_fence_chainlink_tb.png", "homedecor_fence_chainlink_tb.png", @@ -232,20 +216,13 @@ homedecor.register("fence_chainlink", { groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.slab_z(-0.125), - node_box = { - type = "fixed", - fixed = { - { -8/16, -8/16, 6/16, -7/16, 8/16, 8/16 }, -- left post - { 7/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post - { -8/16, 7/16, 13/32, 8/16, 8/16, 15/32 }, -- top piece - { -8/16, -8/16, 13/32, 8/16, -7/16, 15/32 }, -- bottom piece - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 } -- the chainlink itself - } - }, + collision_box = homedecor.nodebox.slab_z(-0.125), }) + homedecor.register("fence_chainlink_corner", { description = S("Chainlink Fence Corner"), + mesh = "homedecor_fence_chainlink_corner.obj", tiles = { "homedecor_fence_chainlink_corner_top.png", "homedecor_fence_chainlink_corner_top.png", @@ -257,20 +234,7 @@ homedecor.register("fence_chainlink_corner", { groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.corner_xz(0.125, -0.125), - node_box = { - type = "fixed", - fixed = { - { -8/16, -8/16, 6/16, -6/16, 8/16, 8/16 }, -- left post, rear - { -8/16, -8/16, -8/16, -6/16, 8/16, -7/16 }, -- left post, front - { 7/16, -8/16, 6/16, 8/16, 8/16, 8/16 }, -- right post, rear - { -8/16, 7/16, 13/32, 8/16, 8/16, 15/32 }, -- top piece, rear - { -8/16, -8/16, 13/32, 8/16, -7/16, 15/32 }, -- bottom piece, rear - { -15/32, 7/16, -8/16, -13/32, 8/16, 8/16 }, -- top piece, side - { -15/32, -8/16, -8/16, -13/32, -7/16, 8/16 }, -- bottom piece, side - { -8/16, -8/16, 7/16, 8/16, 8/16, 7/16 }, -- the chainlink itself, rear - { -7/16, -8/16, -8/16, -7/16, 8/16, 8/16 } -- the chainlink itself, side - } - }, + collision_box = homedecor.nodebox.corner_xz(0.125, -0.125), }) homedecor.register("fence_wrought_iron_2", { diff --git a/mods/homedecor_modpack/homedecor/misc-nodes.lua b/mods/homedecor_modpack/homedecor/misc-nodes.lua index 31177e10..b623cde9 100755 --- a/mods/homedecor_modpack/homedecor/misc-nodes.lua +++ b/mods/homedecor_modpack/homedecor/misc-nodes.lua @@ -515,6 +515,7 @@ end homedecor.register("spiral_staircase", { description = "Spiral Staircase", mesh = "homedecor_spiral_staircase.obj", + wield_scale = { x=0.4, y=0.4, z=0.4 }, tiles = { "homedecor_generic_metal_wrought_iron.png", }, @@ -545,7 +546,7 @@ homedecor.register("spiral_staircase", { {0.4375, 2.125, -1.5, 0.5, 3.3125, 0.5}, -- NodeBox30 } }, - groups = {choppy=2}, + groups = {cracky = 1}, sounds = default.node_sound_wood_defaults(), on_rotate = screwdriver.rotate_simple, after_place_node = function(pos, placer, itemstack, pointed_thing) diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_cube.obj b/mods/homedecor_modpack/homedecor/models/homedecor_cube.obj new file mode 100644 index 00000000..d0a18993 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_cube.obj @@ -0,0 +1,23 @@ +# Blender v2.73 (sub 0) OBJ File: 'cobe+1.001.blend' +# www.blender.org +o Cylinder +v -0.499500 -0.499500 0.499500 +v -0.499500 -0.499500 -0.499500 +v 0.499500 -0.499500 -0.499500 +v 0.499500 -0.499500 0.499500 +v -0.499500 0.499500 0.499500 +v -0.499500 0.499500 -0.499500 +v 0.499500 0.499500 -0.499500 +v 0.499500 0.499500 0.499500 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +g Cylinder_Cylinder_None +s off +f 5/1 6/2 2/3 1/4 +f 6/1 7/2 3/3 2/4 +f 7/1 8/2 4/3 3/4 +f 8/1 5/2 1/3 4/4 +f 1/1 2/2 3/3 4/4 +f 8/1 7/2 6/3 5/4 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_plain.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_plain.obj old mode 100755 new mode 100644 index c04ecfc3..035c0c09 --- a/mods/homedecor_modpack/homedecor/models/homedecor_door_plain.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_door_plain.obj @@ -1,38 +1,35 @@ # Blender v2.73 (sub 0) OBJ File: 'door-plain.blend' # www.blender.org o Cylinder -v 0.499750 1.499500 0.499969 -v -0.499750 1.499500 0.499969 -v 0.499750 -0.499500 0.499969 -v -0.499750 -0.499500 0.499969 -v -0.499750 1.499500 0.375031 -v 0.499750 1.499500 0.375031 -v -0.499750 -0.499500 0.375031 -v 0.499750 -0.499500 0.375031 -vt 0.578000 0.000250 -vt 0.078250 0.000250 -vt 0.078250 0.999750 -vt 0.578000 0.999750 -vt 0.015641 0.000250 -vt 0.078109 0.000250 -vt 0.078109 0.999750 -vt 0.015641 0.999750 -vt 0.578141 0.999750 -vt 0.640609 0.999750 -vt 0.640609 0.000250 -vt 0.578141 0.000250 -vt 0.671891 0.250125 -vt 0.734359 0.250125 -vt 0.734359 0.749875 -vt 0.671891 0.749875 -vt 0.765641 0.749875 -vt 0.828109 0.749875 -vt 0.828109 0.250125 -vt 0.765641 0.250125 +v 0.497500 1.495000 0.496875 +v -0.497500 1.495000 0.496875 +v 0.497500 -0.495000 0.496875 +v -0.497500 -0.495000 0.496875 +v -0.497500 1.495000 0.378125 +v 0.497500 1.495000 0.378125 +v -0.497500 -0.495000 0.378125 +v 0.497500 -0.495000 0.378125 +vt 0.578125 0.000000 +vt 0.078125 0.000000 +vt 0.078125 1.000000 +vt 0.578125 1.000000 +vt 0.015625 -0.000000 +vt 0.015625 1.000000 +vt 0.640625 1.000000 +vt 0.640625 0.000000 +vt 0.671875 0.250000 +vt 0.734375 0.250000 +vt 0.734375 0.750000 +vt 0.671875 0.750000 +vt 0.765625 0.750000 +vt 0.828125 0.750000 +vt 0.828125 0.250000 +vt 0.765625 0.250000 +g Cylinder_Cylinder_None s off f 4/1 3/2 1/3 2/4 f 8/2 7/1 5/4 6/3 -f 3/5 8/6 6/7 1/8 -f 2/9 5/10 7/11 4/12 -f 1/13 6/14 5/15 2/16 -f 4/17 7/18 8/19 3/20 +f 3/5 8/2 6/3 1/6 +f 2/4 5/7 7/8 4/1 +f 1/9 6/10 5/11 2/12 +f 4/13 7/14 8/15 3/16 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_door_plain_right.obj b/mods/homedecor_modpack/homedecor/models/homedecor_door_plain_right.obj old mode 100755 new mode 100644 index 44be4cd7..f735e3ea --- a/mods/homedecor_modpack/homedecor/models/homedecor_door_plain_right.obj +++ b/mods/homedecor_modpack/homedecor/models/homedecor_door_plain_right.obj @@ -1,38 +1,35 @@ # Blender v2.73 (sub 0) OBJ File: 'door-plain-right.blend' # www.blender.org o Cylinder -v 0.499750 1.499500 0.499969 -v -0.499750 1.499500 0.499969 -v 0.499750 -0.499500 0.499969 -v -0.499750 -0.499500 0.499969 -v -0.499750 1.499500 0.375031 -v 0.499750 1.499500 0.375031 -v -0.499750 -0.499500 0.375031 -v 0.499750 -0.499500 0.375031 -vt 0.078250 0.000250 -vt 0.578000 0.000250 -vt 0.578000 0.999750 -vt 0.078250 0.999750 -vt 0.578141 0.000250 -vt 0.640609 0.000250 -vt 0.640609 0.999750 -vt 0.578141 0.999750 -vt 0.015641 0.999750 -vt 0.078109 0.999750 -vt 0.078109 0.000250 -vt 0.015641 0.000250 -vt 0.671891 0.250125 -vt 0.734359 0.250125 -vt 0.734359 0.749875 -vt 0.671891 0.749875 -vt 0.765641 0.749875 -vt 0.828109 0.749875 -vt 0.828109 0.250125 -vt 0.765641 0.250125 +v 0.497500 1.495000 0.496875 +v -0.497500 1.495000 0.496875 +v 0.497500 -0.495000 0.496875 +v -0.497500 -0.495000 0.496875 +v -0.497500 1.495000 0.378125 +v 0.497500 1.495000 0.378125 +v -0.497500 -0.495000 0.378125 +v 0.497500 -0.495000 0.378125 +vt 0.078125 0.000000 +vt 0.578125 0.000000 +vt 0.578125 1.000000 +vt 0.078125 1.000000 +vt 0.640625 0.000000 +vt 0.640625 1.000000 +vt 0.015625 1.000000 +vt 0.015625 0.000000 +vt 0.734375 0.750000 +vt 0.671875 0.750000 +vt 0.671875 0.250000 +vt 0.734375 0.250000 +vt 0.828125 0.250000 +vt 0.765625 0.250000 +vt 0.765625 0.750000 +vt 0.828125 0.750000 +g Cylinder_Cylinder_None s off f 4/1 3/2 1/3 2/4 f 8/2 7/1 5/4 6/3 -f 3/5 8/6 6/7 1/8 -f 2/9 5/10 7/11 4/12 -f 1/13 6/14 5/15 2/16 -f 4/17 7/18 8/19 3/20 +f 3/5 8/2 6/3 1/6 +f 2/4 5/7 7/8 4/1 +f 1/9 6/10 5/11 2/12 +f 4/13 7/14 8/15 3/16 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_fence_barbed_wire.obj b/mods/homedecor_modpack/homedecor/models/homedecor_fence_barbed_wire.obj new file mode 100644 index 00000000..37fba1ee --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_fence_barbed_wire.obj @@ -0,0 +1,60 @@ +# Blender v2.73 (sub 0) OBJ File: 'homedecor-fence-barbed.blend' +# www.blender.org +o Cylinder +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.375000 +v 0.500000 -0.500000 0.375000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.375000 +v 0.500000 0.500000 0.375000 +v 0.500000 0.500000 0.500000 +v 0.375000 -0.500000 0.375000 +v 0.375000 -0.500000 0.500000 +v 0.375000 0.500000 0.375000 +v 0.375000 0.500000 0.500000 +v -0.375000 -0.500000 0.500000 +v -0.375000 -0.500000 0.375000 +v -0.375000 0.500000 0.500000 +v -0.375000 0.500000 0.375000 +v 0.375000 -0.500000 0.437500 +v 0.375000 0.500000 0.437500 +v -0.375000 -0.500000 0.437500 +v -0.375000 0.500000 0.437500 +vt 1.000000 1.000000 +vt 0.875000 1.000000 +vt 0.875000 -0.000000 +vt 1.000000 -0.000000 +vt 1.000000 0.875000 +vt 0.875000 0.875000 +vt 0.125000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.125000 0.000000 +vt 1.000000 0.125000 +vt 0.875000 0.125000 +vt 0.000000 0.125000 +vt 0.125000 0.125000 +vt 0.000000 0.875000 +vt 0.125000 0.875000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +g Cylinder_Cylinder_None +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 8/5/2 7/1/2 11/2/2 12/6/2 +f 7/7/3 8/8/3 4/9/3 3/10/3 +f 4/9/4 8/8/4 12/7/4 10/10/4 +f 3/4/5 4/11/5 10/12/5 9/3/5 +f 11/2/1 9/3/1 10/4/1 12/1/1 +f 7/1/6 3/4/6 9/3/6 11/2/6 +f 15/8/3 13/9/3 14/10/3 16/7/3 +f 1/13/5 2/9/5 14/10/5 13/14/5 +f 2/9/6 6/8/6 16/7/6 14/10/6 +f 6/8/2 5/15/2 15/16/2 16/7/2 +f 5/1/4 1/4/4 13/3/4 15/2/4 +f 17/10/6 19/3/6 20/2/6 18/7/6 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_fence_barbed_wire_corner.obj b/mods/homedecor_modpack/homedecor/models/homedecor_fence_barbed_wire_corner.obj new file mode 100644 index 00000000..3f4a7251 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_fence_barbed_wire_corner.obj @@ -0,0 +1,79 @@ +# Blender v2.73 (sub 0) OBJ File: 'homedecor-fence-barbed-corner.blend' +# www.blender.org +o Cylinder +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.375000 +v 0.500000 -0.500000 0.375000 +v 0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.375000 +v 0.500000 0.500000 0.375000 +v 0.500000 0.500000 0.500000 +v 0.375000 -0.500000 0.375000 +v 0.375000 -0.500000 0.500000 +v 0.375000 0.500000 0.375000 +v 0.375000 0.500000 0.500000 +v -0.375000 -0.500000 0.500000 +v -0.375000 -0.500000 0.375000 +v -0.375000 0.500000 0.500000 +v -0.375000 0.500000 0.375000 +v 0.375000 -0.500000 0.437500 +v 0.375000 0.500000 0.437500 +v -0.375000 -0.500000 0.437500 +v -0.375000 0.500000 0.437500 +v 0.375000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.375000 0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +v 0.375000 -0.500000 -0.375000 +v 0.500000 -0.500000 -0.375000 +v 0.375000 0.500000 -0.375000 +v 0.500000 0.500000 -0.375000 +v 0.437500 -0.500000 -0.375000 +v 0.437500 0.500000 -0.375000 +v 0.437500 -0.500000 0.375000 +v 0.437500 0.500000 0.375000 +vt 1.000000 1.000000 +vt 0.875000 1.000000 +vt 0.875000 -0.000000 +vt 1.000000 -0.000000 +vt 1.000000 0.875000 +vt 0.875000 0.875000 +vt 0.125000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.125000 0.000000 +vt 1.000000 0.125000 +vt 0.875000 0.125000 +vt 0.000000 0.125000 +vt 0.125000 0.125000 +vt 0.000000 0.875000 +vt 0.125000 0.875000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +g Cylinder_Cylinder_None +s off +f 5/1/1 6/2/1 2/3/1 1/4/1 +f 8/5/2 7/1/2 11/2/2 12/6/2 +f 7/7/3 8/8/3 4/9/3 3/10/3 +f 4/9/4 8/8/4 12/7/4 10/10/4 +f 3/4/5 4/11/5 10/12/5 9/3/5 +f 11/2/1 9/3/1 10/4/1 12/1/1 +f 7/1/6 3/4/6 9/3/6 11/2/6 +f 15/8/3 13/9/3 14/10/3 16/7/3 +f 1/13/5 2/9/5 14/10/5 13/14/5 +f 2/9/6 6/8/6 16/7/6 14/10/6 +f 6/8/2 5/15/2 15/16/2 16/7/2 +f 5/1/4 1/4/4 13/3/4 15/2/4 +f 17/10/6 19/3/6 20/2/6 18/7/6 +f 24/5/2 23/1/2 27/2/2 28/6/2 +f 23/7/6 24/8/6 22/9/6 21/10/6 +f 22/9/3 24/8/3 28/7/3 26/10/3 +f 21/4/5 22/11/5 26/12/5 25/3/5 +f 27/2/4 25/3/4 26/4/4 28/1/4 +f 23/1/1 21/4/1 25/3/1 27/2/1 +f 29/10/1 31/3/1 32/2/1 30/7/1 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_fence_chainlink.obj b/mods/homedecor_modpack/homedecor/models/homedecor_fence_chainlink.obj new file mode 100644 index 00000000..f7001410 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_fence_chainlink.obj @@ -0,0 +1,105 @@ +# Blender v2.73 (sub 0) OBJ File: 'homedecor-fence-chainlink.blend' +# www.blender.org +o Cylinder +v 0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.375000 +v 0.500000 -0.500000 0.375000 +v 0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.375000 +v 0.500000 0.500000 0.375000 +v 0.437500 -0.500000 0.500000 +v 0.437500 -0.500000 0.375000 +v 0.437500 0.500000 0.500000 +v 0.437500 0.500000 0.375000 +v -0.437500 -0.500000 0.500000 +v -0.437500 -0.500000 0.375000 +v -0.437500 0.500000 0.500000 +v -0.437500 0.500000 0.375000 +v -0.437500 0.500000 0.406250 +v -0.437500 -0.500000 0.406250 +v 0.437500 0.500000 0.406250 +v 0.437500 -0.500000 0.406250 +v -0.437500 0.500000 0.468750 +v -0.437500 -0.500000 0.468750 +v 0.437500 0.500000 0.468750 +v 0.437500 -0.500000 0.468750 +v -0.437500 0.437500 0.406250 +v 0.437500 0.437500 0.406250 +v -0.437500 0.437500 0.468750 +v 0.437500 0.437500 0.468750 +v -0.437500 -0.437500 0.406250 +v 0.437500 -0.437500 0.406250 +v -0.437500 -0.437500 0.468750 +v 0.437500 -0.437500 0.468750 +v -0.437500 0.437500 0.437500 +v 0.437500 0.437500 0.437500 +v -0.437500 -0.437500 0.437500 +v 0.437500 -0.437500 0.437500 +vt 0.000000 1.000000 +vt 0.000000 0.875000 +vt 0.062500 0.875000 +vt 0.062500 1.000000 +vt 1.000000 0.875000 +vt 1.000000 1.000000 +vt 0.937500 1.000000 +vt 0.937500 0.875000 +vt 0.062500 0.968750 +vt 0.062500 0.906250 +vt 0.937500 0.906250 +vt 0.937500 0.968750 +vt 1.000000 0.125000 +vt 0.937500 0.125000 +vt 0.937500 0.000000 +vt 1.000000 0.000000 +vt 0.000000 0.000000 +vt 0.062500 0.000000 +vt 0.062500 0.125000 +vt 0.000000 0.125000 +vt 0.062500 0.093750 +vt 0.062500 0.031250 +vt 0.937500 0.031250 +vt 0.937500 0.093750 +vt 0.875000 1.000000 +vt 0.875000 0.000000 +vt 0.125000 1.000000 +vt 0.125000 0.000000 +vt 0.062500 0.937500 +vt 0.937500 0.937500 +vt 0.062500 0.062500 +vt 0.937500 0.062500 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 -0.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +g Cylinder_Cylinder_top +s off +f 5/1/1 8/2/1 12/3/1 11/4/1 +f 7/5/1 6/6/1 15/7/1 16/8/1 +f 23/9/1 19/10/1 17/11/1 21/12/1 +f 30/10/1 29/11/1 31/12/1 32/9/1 +g Cylinder_Cylinder_bottom +f 3/13/2 14/14/2 13/15/2 2/16/2 +f 1/17/2 9/18/2 10/19/2 4/20/2 +f 26/21/2 28/22/2 27/23/2 25/24/2 +f 24/22/2 22/23/2 18/24/2 20/21/2 +g Cylinder_Cylinder_right +f 6/6/3 7/25/3 3/26/3 2/16/3 +f 12/25/3 10/26/3 9/16/3 11/6/3 +g Cylinder_Cylinder_left +f 8/27/4 5/1/4 1/17/4 4/28/4 +f 13/17/4 14/28/4 16/27/4 15/1/4 +g Cylinder_Cylinder_back +f 1/17/5 5/1/5 11/4/5 9/18/5 +f 6/6/5 2/16/5 13/15/5 15/7/5 +f 28/29/5 23/4/5 21/7/5 27/30/5 +f 32/31/5 31/32/5 22/15/5 24/18/5 +g Cylinder_Cylinder_front +f 8/1/6 4/17/6 10/18/6 12/4/6 +f 3/16/6 7/6/6 16/7/6 14/15/6 +f 25/30/6 17/7/6 19/4/6 26/29/6 +f 18/15/6 29/32/6 30/31/6 20/18/6 +f 33/30/5 35/32/5 36/31/5 34/29/5 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_fence_chainlink_corner.obj b/mods/homedecor_modpack/homedecor/models/homedecor_fence_chainlink_corner.obj new file mode 100644 index 00000000..a210d416 --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_fence_chainlink_corner.obj @@ -0,0 +1,162 @@ +# Blender v2.73 (sub 0) OBJ File: 'homedecor-fence-chainlink-corner.blend' +# www.blender.org +o Cylinder +v -0.500000 -0.500000 0.500000 +v -0.500000 -0.500000 0.375000 +v 0.500000 -0.500000 0.375000 +v -0.500000 0.500000 0.500000 +v -0.500000 0.500000 0.375000 +v 0.500000 0.500000 0.375000 +v -0.437500 -0.500000 0.500000 +v -0.437500 -0.500000 0.375000 +v -0.437500 0.500000 0.500000 +v -0.437500 0.500000 0.375000 +v -0.437500 0.500000 0.406250 +v -0.437500 -0.500000 0.406250 +v 0.375000 0.500000 0.406250 +v 0.375000 -0.500000 0.406250 +v -0.437500 0.500000 0.468750 +v -0.437500 -0.500000 0.468750 +v 0.375000 0.500000 0.468750 +v 0.375000 -0.500000 0.468750 +v -0.437500 0.437500 0.406250 +v 0.375000 0.437500 0.406250 +v -0.437500 0.437500 0.468750 +v 0.375000 0.437500 0.468750 +v -0.437500 -0.437500 0.406250 +v 0.375000 -0.437500 0.406250 +v -0.437500 -0.437500 0.468750 +v 0.375000 -0.437500 0.468750 +v -0.437500 0.437500 0.437500 +v -0.437500 -0.437500 0.437500 +v 0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 0.500000 +v 0.375000 -0.500000 0.500000 +v 0.375000 -0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +v 0.500000 0.500000 0.500000 +v 0.375000 0.500000 0.500000 +v 0.375000 0.500000 -0.500000 +v 0.500000 -0.500000 -0.437500 +v 0.375000 -0.500000 -0.437500 +v 0.500000 0.500000 -0.437500 +v 0.375000 0.500000 -0.437500 +v 0.406250 0.500000 0.375000 +v 0.406250 -0.500000 0.375000 +v 0.406250 0.500000 -0.437500 +v 0.406250 -0.500000 -0.437500 +v 0.468750 0.500000 0.375000 +v 0.468750 -0.500000 0.375000 +v 0.468750 0.500000 -0.437500 +v 0.468750 -0.500000 -0.437500 +v 0.406250 0.437500 0.375000 +v 0.406250 0.437500 -0.437500 +v 0.468750 0.437500 0.375000 +v 0.468750 0.437500 -0.437500 +v 0.406250 -0.437500 0.375000 +v 0.406250 -0.437500 -0.437500 +v 0.468750 -0.437500 0.375000 +v 0.468750 -0.437500 -0.437500 +v 0.375000 0.437500 0.437500 +v 0.437500 0.437500 -0.437500 +v 0.375000 -0.437500 0.437500 +v 0.437500 -0.437500 -0.437500 +v 0.375000 -0.500000 0.375000 +v 0.375000 0.500000 0.375000 +v 0.437500 0.437500 0.375000 +v 0.437500 -0.437500 0.375000 +vt 0.875000 0.937500 +vt 1.000000 0.937500 +vt 1.000000 1.000000 +vt 0.875000 1.000000 +vt 0.062500 0.000000 +vt 0.062500 0.125000 +vt 0.000000 0.125000 +vt 0.000000 0.000000 +vt 0.875000 0.125000 +vt 0.875000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.125000 +vt 0.906250 0.125000 +vt 0.968750 0.125000 +vt 0.968750 0.937500 +vt 0.906250 0.937500 +vt 0.875000 0.093750 +vt 0.062500 0.093750 +vt 0.062500 0.031250 +vt 0.875000 0.031250 +vt 1.000000 0.062500 +vt 0.875000 0.062500 +vt 0.062500 0.875000 +vt 0.062500 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.875000 +vt 0.875000 0.875000 +vt 1.000000 0.875000 +vt 0.968750 0.062500 +vt 0.968750 0.875000 +vt 0.906250 0.875000 +vt 0.906250 0.062500 +vt 0.875000 0.906250 +vt 0.875000 0.968750 +vt 0.062500 0.968750 +vt 0.062500 0.906250 +vt 0.062500 0.937500 +vt 0.062500 0.062500 +vt 0.937500 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.937500 +vt 0.937500 0.937500 +vt 0.937500 0.062500 +vt 0.125000 0.062500 +vt 0.125000 0.000000 +vt 0.937500 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn -1.000000 0.000000 -0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.000000 0.000000 1.000000 +vn 0.000000 0.000000 -1.000000 +g Cylinder_Cylinder_top +s off +f 40/1/1 39/2/1 33/3/1 36/4/1 +f 9/5/1 10/6/1 5/7/1 4/8/1 +f 62/9/1 35/10/1 34/11/1 6/12/1 +f 41/13/1 45/14/1 47/15/1 43/16/1 +f 54/16/1 53/13/1 55/14/1 56/15/1 +f 13/17/1 11/18/1 15/19/1 17/20/1 +f 26/20/1 24/17/1 23/18/1 25/19/1 +g Cylinder_Cylinder_bottom +f 32/10/2 29/11/2 37/21/2 38/22/2 +f 8/23/2 7/24/2 1/25/2 2/26/2 +f 61/27/2 3/28/2 30/3/2 31/4/2 +f 52/29/2 51/30/2 49/31/2 50/32/2 +f 46/30/2 42/31/2 44/32/2 48/29/2 +f 20/33/2 22/34/2 21/35/2 19/36/2 +f 14/33/2 18/34/2 16/35/2 12/36/2 +g Cylinder_Cylinder_right +f 5/4/3 2/10/3 1/11/3 4/3/3 +f 50/37/3 49/1/3 41/4/3 43/24/3 +f 44/5/3 42/10/3 53/22/3 54/38/3 +f 32/8/3 38/5/3 40/24/3 36/25/3 +f 61/10/3 31/11/3 35/3/3 62/4/3 +g Cylinder_Cylinder_left +f 47/39/4 45/40/4 51/41/4 52/42/4 +f 56/43/4 55/44/4 46/45/4 48/46/4 +f 37/46/4 29/11/4 33/3/4 39/39/4 +f 30/8/4 3/45/4 6/40/4 34/25/4 +f 8/45/4 10/40/4 9/25/4 7/8/4 +f 64/44/4 60/43/4 58/42/4 63/41/4 +g Cylinder_Cylinder_back +f 31/10/5 30/11/5 34/3/5 35/4/5 +f 38/10/5 37/11/5 39/3/5 40/4/5 +f 7/5/5 9/24/5 4/25/5 1/8/5 +f 17/4/5 15/24/5 21/37/5 22/1/5 +f 26/22/5 25/38/5 16/5/5 18/10/5 +g Cylinder_Cylinder_front +f 36/40/6 33/25/6 29/8/6 32/45/6 +f 3/8/6 61/45/6 62/40/6 6/25/6 +f 2/11/6 5/3/6 10/39/6 8/46/6 +f 20/41/6 19/42/6 11/39/6 13/40/6 +f 24/44/6 14/45/6 12/46/6 23/43/6 +f 59/44/6 28/43/6 27/42/6 57/41/6 diff --git a/mods/homedecor_modpack/homedecor/models/homedecor_shrubbery.obj b/mods/homedecor_modpack/homedecor/models/homedecor_shrubbery.obj new file mode 100644 index 00000000..c4e6c8ad --- /dev/null +++ b/mods/homedecor_modpack/homedecor/models/homedecor_shrubbery.obj @@ -0,0 +1,117 @@ +# Blender v2.73 (sub 0) OBJ File: 'shrubbery.blend' +# www.blender.org +o Cylinder +v -0.499483 -0.312503 0.499551 +v -0.499483 -0.312503 -0.499449 +v 0.499517 -0.312503 -0.499449 +v 0.499517 -0.312503 0.499551 +v -0.499483 0.499185 0.499551 +v -0.499483 0.499185 -0.499449 +v 0.499517 0.499185 -0.499449 +v 0.499517 0.499185 0.499551 +v 0.187330 -0.499815 0.249801 +v 0.187330 -0.499815 0.124926 +v 0.312205 -0.499815 0.124926 +v 0.312205 -0.499815 0.249801 +v 0.062455 -0.312503 0.374676 +v 0.062455 -0.312503 0.000051 +v 0.437080 -0.312503 0.000051 +v 0.437080 -0.312503 0.374676 +v 0.350010 -0.406159 0.287607 +v 0.149524 -0.406159 0.287607 +v 0.350010 -0.406159 0.087120 +v 0.149524 -0.406159 0.087120 +v 0.000017 -0.499815 -0.187261 +v 0.000017 -0.499815 -0.312136 +v 0.124892 -0.499815 -0.312136 +v 0.124892 -0.499815 -0.187261 +v -0.124858 -0.312503 -0.062386 +v -0.124858 -0.312503 -0.437011 +v 0.249767 -0.312503 -0.437011 +v 0.249767 -0.312503 -0.062386 +v 0.162698 -0.406159 -0.149456 +v -0.037789 -0.406159 -0.149456 +v 0.162698 -0.406159 -0.349942 +v -0.037789 -0.406159 -0.349942 +v -0.312170 -0.499815 0.312239 +v -0.312170 -0.499815 0.187364 +v -0.187295 -0.499815 0.187364 +v -0.187295 -0.499815 0.312239 +v -0.437045 -0.312503 0.437114 +v -0.437045 -0.312503 0.062489 +v -0.062420 -0.312503 0.062489 +v -0.062420 -0.312503 0.437114 +v -0.149490 -0.406159 0.350045 +v -0.349976 -0.406159 0.350045 +v -0.149490 -0.406159 0.149558 +v -0.349976 -0.406159 0.149558 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt -0.000000 0.187500 +vt 1.000000 0.187500 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 0.375000 0.437500 +vt 0.500000 0.437500 +vt 0.500000 0.562500 +vt 0.375000 0.562500 +vt 0.725343 0.656248 +vt 0.812500 0.750000 +vt 0.437500 0.750000 +vt 0.524656 0.656248 +vt 0.287844 0.906248 +vt 0.375000 1.000000 +vt 0.087156 0.906248 +vt 0.725344 0.906248 +vt 0.812500 1.000000 +vt 0.437500 1.000000 +vt 0.524656 0.906248 +vt 0.287844 0.656248 +vt 0.375000 0.750000 +vt 0.000000 0.750000 +vt 0.087156 0.656248 +vt 0.250000 0.562495 +vt 0.125000 0.562495 +vt 0.250000 0.812495 +vt 0.125000 0.812495 +vt 0.687500 0.812495 +vt 0.562500 0.812495 +vt 0.687500 0.562495 +vt 0.562500 0.562495 +g Cylinder_Cylinder_top-sides +s off +f 5/1 6/2 2/3 1/4 +f 6/1 7/2 3/3 2/4 +f 7/1 8/2 4/3 3/4 +f 8/1 5/2 1/3 4/4 +f 8/5 7/6 6/1 5/2 +g Cylinder_Cylinder_bottom +f 1/5 2/6 3/1 4/2 +g Cylinder_Cylinder_roots +f 9/7 10/8 11/9 12/10 +f 17/11 16/12 13/13 18/14 +f 19/15 15/16 16/2 17/17 +f 20/18 14/19 15/20 19/21 +f 18/22 13/23 14/24 20/25 +f 9/26 18/22 20/25 10/27 +f 10/28 20/15 19/17 11/29 +f 11/30 19/18 17/21 12/31 +f 12/32 17/11 18/14 9/33 +f 21/7 22/8 23/9 24/10 +f 29/11 28/12 25/13 30/14 +f 31/15 27/16 28/2 29/17 +f 32/18 26/19 27/20 31/21 +f 30/22 25/23 26/24 32/25 +f 21/26 30/22 32/25 22/27 +f 22/28 32/15 31/17 23/29 +f 23/30 31/18 29/21 24/31 +f 24/32 29/11 30/14 21/33 +f 33/7 34/8 35/9 36/10 +f 41/11 40/12 37/13 42/14 +f 43/15 39/16 40/2 41/17 +f 44/18 38/19 39/20 43/21 +f 42/22 37/23 38/24 44/25 +f 33/26 42/22 44/25 34/27 +f 34/28 44/15 43/17 35/29 +f 35/30 43/18 41/21 36/31 +f 36/32 41/11 42/14 33/33 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_bottom.png deleted file mode 100755 index 15b0b6d8c7268a5f7de5abeb104967532e811611..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf(g2?jS9S&l1%3uy2?jkW2198E zLuCddWd>sz22(i(GkFFxJqAl91}h~7J1Z`GOD;!sMkgTBV06}CcJ|_O)nazjVs_VN zao1(>)MfF}XZ6)*^)qA*Fk%lhW)CuE4>9EkHRFh~;)=22j-|*T>Jfj4qoNy z;useuT3alaBq#dmfzWdo zbyd%a77LraBXfW7h%a0FurYX*XWCYQxaLFG`X)aAV%_<~aOpR_*l<5y_I=ye37P-Q u{#rOqq*~DW;)}YxHuihR`X=7_$p6SnF#E{QGY5dKX7F_Nb6Mw<&;$S!oPg8- diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green.png old mode 100755 new mode 100644 similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green_top.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..e8c4a134116f0c3306a292fdb6dd6bde48f4c843 GIT binary patch literal 767 zcmVY`!6osF67#J`EuK|zzAz&PPx`>)_imOOukuKT=t1OAS>JRY`=nv_#US^d=H{Li> z6(QHMEH&dao>1(FU@`;(48y!#IMB4p-CXJDe(Icqbn=Q%;WlmcrM#$FxqjwSYC)+&x`48bXZMEx%+zdlbrn4n3+@`JkR-fHipeHoaDGh*m ztQg$O;kWwSH8J08%qZp+W$rtZw9PFvU8wj!ZWwFJQw?m9%f-s8t+YnT11(Gk`V`g-M(F~bQ zG6`eG-{eWSOnZt_B%{e3At3m8JLJ#y2<`On zQgoi*2>1Ik-C#<`$q;x0QT=I$qqCmKq;4+(2=^t{k2dG+q408wz#9nMrmdutS8mf* z`#Vw<&7^7^>@BgoWmA2-yQ;qXy0oP3i!?^ZJ)BLG*V_hut50@KN47(pO%v~GxTIHq zSXwerf3l4xoxD0dycCu+@UDhbUQGzRfspNxd(}Kof4|0(29`9?AC~C7`GDKBRp1Ro z=VgFatrY<122&=pn7`hRc>G{P6>}*ru1DN0nTV zDr*@mX%KvzVWxG);hgjKP|Rb+*_#i`rp9`X`$iJ!O;?yP4SP9iQeMYUGIZ}oZmNu|G~ xBTl9>IxmBzEB|BV&u#mE>n=32RWB~Fe*khhX9NsSCk_Ar002ovPDHLkV1lpbaqa*B literal 0 HcmV?d00001 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_green_sides.png deleted file mode 100755 index 6c9661a55597014047c3745567a02f70a7c430d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}LV!<*E0E?_;ghluk`-f6kYiAm zVo+0NP*-EskYvy_Vbzjj&<&N>(_qlkVKcO1GgV?XHRdog;;>X^aMEOP(q?nhV|TC8 z^U!7YGT;a@;S4t8Ot9lgvFFWn<}30MD)AAz_2Xa@&<@6uAirP+hi5m^fShhm7sn6@ zN!EkhPFEQO4jf2X7!s$`b>Pwb-}fg;wsZ(^E-aOqexg;T>x}A=n3INcSkJJ`?#NIx z=`?IKoi=e=V@||mgO)oo*9~J-96QvMj-;k|9yE1w@^Dj|-XZ(wPtm?w>-hKY&&~h- z|J?ELzV^p2e-z7JFWeh{y!7Mi$G`jkZ@;g9UVr=Z+t>GR_rHFE?NHT~rxStBV(@hJ Kb6Mw<&;$THQE7Vs diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red_top.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red.png old mode 100755 new mode 100644 similarity index 100% rename from mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red_top.png rename to mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red.png diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red_bottom.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..1f289fc79481cf1266737e04653f18febba7bac5 GIT binary patch literal 865 zcmV-n1D^beP)U%s8GId;D|JBog~(?Tf9gwYBz#JMTzN>!vp&0Y3Ih5}K{Vf@#f@8d`JleO;xZA1%PBIv9WmE^SL}?(KzlgKbc{((WR8J`L4Pr+_Ei| z9|tX#Oov{aFrGCz=tN{J4OJ0r1jl63DqBI1qGJ*dhDa%CMqNH%d`)&XeIWqymuz{> zO0jo*LeYJ>#MD*d!H|{)Z&@xoiBC?~=ydzIX`L`0GNn4Gx4l`}$oGl*31gN{%20V0 z4@ibXCLEKfHy})6vX)LaOo$EW`h9XE2ERoC%DwfP*n4y&-X6(w(1{SC#`BslD&u8- ze$o=|sS|*Uy2FRgG}YZe)Xap#EnkR=H!FYYw|K{}X+~XY`zPF8Sm3MnHp{xpzrhP^ zQzL5{JXqToxw0*<>jl1E-xk@k7;kvfaw9n6>SUhC7d#vs;bc`(jXqZ8;r?oaqH9ugP0Hys zPck7DuOyE)eX-?tP(IK{0cakFg#97g%`P_*lcuJxR^mz1Zhp@hiX&2={x)y zwwW$vcKZtmMadRBuvr&9kp2WvJ{NoKW2j#QU!lnUc6BLEa#lVm7)^@=MW_S@X_re!f}u-EP}GhvZQX?(hPN#0wp3E|E= z(sfm|gFegSWBk(GXL&x))5ZyZhY{}?1ys literal 0 HcmV?d00001 diff --git a/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red_sides.png b/mods/homedecor_modpack/homedecor/textures/homedecor_shrubbery_red_sides.png deleted file mode 100755 index b961ed1304a50899aac5150e04c33eefb5f0b0ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmV;x0YCnUP)#}M%rn)#6{k9$tPIS}_bv%@7bv!uP zSZd=dARfvU!6myxYYJR~Ez?$F55+_IUx5ML)7)M>l)BU-)3gauH{4iedbT3_AdGxN zG!o5#ZMMO2jWVFUtnAm>@4_@E>YkD8@H_d(MBUTa_j#NtMzX_~`JdJInZL)^UsodP zhI%AB>)~+CD+}0$nPq7!yT6?QV>0%DeK&XMMs#h(_9;f*YY{d|?9_@6?*lC!3iM7u ztLE`HRV2R0yFhUHkh933z8lb~SNJ*4IPZmgyLrM3q4^~6R9djCgGvkT-e~68g44q) zGXWI^Zx6OmX~C^p(vPZqpJu4EAjkwW0p4-E&8H)YY}Tkvb3T8R{J2i()ho0jpW2p3 qEAmlE&O8vPB&QL=V6Tcwa-IRkoET@&Q7=$IgvSi7Ql{7JFXcEdahkoSN6GwhAKZD^62M#c_kkU4GKa@C@Wy=-^bKlv0 zc4zU$JU$vQ3dDPVJPaRRt6k|5Nd<%7Svic@>!DsRlSgfDGb0&+kLyWUw@L<^-0Y3h zWy2`ZWs@rY_9!$>yO_v)UuW80%m~_sDe~0K>=iK-TvQbfxX-nG9 z?~FSci@wSGX|$TfH``J$s9lE;ib6OUi?idnFm67P1PBfQ>#`9HzTNJC;2-zJ=^JV4 zR&t6EibMM2zSx;&obXLv!ufo_0+MNa`X*9Qu*ppiwwlF{ua);G+u2m{&ZEbdYBh_2 zQM@ZPUT!VsO10ec$Y>rYnp~WPmW* zYCDXALY}j6o#KWV|)BD<7+#09M^HGWY$koW=c4_Na9 zKtc#1u|TBhf(lC029XAdI89ThvEw+wnQ?57?YS(HSmJEnbI#)Em7en=$Ks09D%?4* z01EG)>TFH{ByH<|IYArs#o8gNuH-wm399FA;)VY90K-UO|Gyr z7ILcI?a^uU7z_uAgmhkbU3$LHP~4#1?BXAENrZzmT0OiFG@K4n23gxaMqB!JN4)&) zP`oj2QLVRWOTo^TBR;r0#Qn9Jkf%-n;+Lbm^Y#GiC0A@~KKq-FpfI0P(zevCnT(nm zl`3Th)#sntC%bpEYJAvK({@7Lyq@l(Jj0miV|*{G%Bv2qU6z!iij}`y;t8Edxx+-( zWMkJQ64Lp%+ao_3WBFc1ByCH5G&_hUZA&fvxGT~F22Y;WiM;4h-#8Lxxx=-QI6pir zla>Z)X^_uF*=%?e=5p$==!oBoEwri0H~`gJn^wo?S*5|9>q9DKg(#LATpBjfHGygB zEI-&2W4Q=_uN;xTV5+6>c7%|&r52`={QBU4v^37Xnn*}zyL!xe$rW#18&IW6i*{IJ zXUh?bZ{}3R^H@D-p~cPx`2Nu$W;lS`?4G!(w+RI_)=RD^%;nVm)tVU2gqb`SWBx`~ zZS1-%Kdg$$sW{riNR<6eM?|wBM$%CL($b*kD_)(D>hbCkh1*$`i5a{+Xp&DvF(Uy! zT*#}XZ+3*X^4MWyI;mbfKPHtAP;%N_%*1fJT`C=)scFfdPhIvp9n#X^iQ`gicx)bc z{nVaBc`nx&cB}O$N4|`nrl&85=%h<0000}#ZsY- z7?RgM7hipSjahDT?z#7!cXIHnp5pg8JPB1+)f`=IoWqk)ot@T{U-eX24@TDw& zi4TFW9t;UK*&Z5EU=vK4rV?`~tOtJzG-#h@_riLhGCk5wli*jqv1PhvDl!j3%hyCL zQ4g4AYaH7s4Vufcex3O)bo1suqS+|(@btyaeZ(s=?r&y5n~XVN-pyV*7F|=Zd5V_zUxc+1GqqxU%~hh8qGntw zMTgHw(#<=pxPs?iLO+JmtjlUC$73hvpyqM?`i_d(PlufT%_1aINlDpdx@x(a#Z|0#R-Rs ppGS5RI<7!=6Q(@aoi8A}2|tAeBIq=j%98*9002ovPDHLkV1f{{&H4ZU diff --git a/mods/homedecor_modpack/lrfurn/armchairs.lua b/mods/homedecor_modpack/lrfurn/armchairs.lua index ab1fa782..59b88ba0 100755 --- a/mods/homedecor_modpack/lrfurn/armchairs.lua +++ b/mods/homedecor_modpack/lrfurn/armchairs.lua @@ -1,14 +1,3 @@ -local armchairs_list = { - { "Red Armchair", "red"}, - { "Orange Armchair", "orange"}, - { "Yellow Armchair", "yellow"}, - { "Green Armchair", "green"}, - { "Blue Armchair", "blue"}, - { "Violet Armchair", "violet"}, - { "Black Armchair", "black"}, - { "Grey Armchair", "grey"}, - { "White Armchair", "white"}, -} local armchair_cbox = { type = "fixed", @@ -18,16 +7,16 @@ local armchair_cbox = { } } -for i in ipairs(armchairs_list) do - local armchairdesc = armchairs_list[i][1] - local colour = armchairs_list[i][2] +for i in ipairs(lrfurn.colors) do + local colour = lrfurn.colors[i][1] + local hue = lrfurn.colors[i][2] minetest.register_node("lrfurn:armchair_"..colour, { - description = armchairdesc, + description = "Armchair ("..colour..")", drawtype = "mesh", mesh = "lrfurn_armchair.obj", tiles = { - "lrfurn_sofa_"..colour..".png", + "lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png", "lrfurn_sofa_bottom.png" }, paramtype = "light", diff --git a/mods/homedecor_modpack/lrfurn/init.lua b/mods/homedecor_modpack/lrfurn/init.lua index 7155f204..64e2ab95 100755 --- a/mods/homedecor_modpack/lrfurn/init.lua +++ b/mods/homedecor_modpack/lrfurn/init.lua @@ -8,6 +8,24 @@ lrfurn.fdir_to_fwd = { { -1, 0 }, } +lrfurn.colors = { -- mod changed to use colorize feature of minetest engine (cg72) + { "black", "#000000:230" }, + { "brown", "#251005:225" }, + { "blue", "#0000d0:225" }, + { "cyan", "#009fa7:250" }, + { "dark_grey", "#101010:175" }, + { "dark_green", "#007000:230" }, + { "green", "#00d000:250" }, + { "grey", "#101010:100" }, + { "magenta", "#e0048b:250" }, + { "orange", "#ee9000:240" }, + { "pink", "#ff90b0:250" }, + { "red", "#800000:240" }, + { "violet", "#9000d0:250" }, + { "white", "#000000:000" }, + { "yellow", "#dde000:240" } +} + function lrfurn.check_forward(pos, fdir, long, placer) if not fdir or fdir > 3 then fdir = 0 end diff --git a/mods/homedecor_modpack/lrfurn/longsofas.lua b/mods/homedecor_modpack/lrfurn/longsofas.lua index 8d217ec5..39781f58 100755 --- a/mods/homedecor_modpack/lrfurn/longsofas.lua +++ b/mods/homedecor_modpack/lrfurn/longsofas.lua @@ -1,14 +1,3 @@ -local longsofas_list = { - { "Red Long Sofa", "red"}, - { "Orange Long Sofa", "orange"}, - { "Yellow Long Sofa", "yellow"}, - { "Green Long Sofa", "green"}, - { "Blue Long Sofa", "blue"}, - { "Violet Long Sofa", "violet"}, - { "Black Long Sofa", "black"}, - { "Grey Long Sofa", "grey"}, - { "White Long Sofa", "white"}, -} local longsofa_sbox = { type = "fixed", @@ -17,22 +6,22 @@ local longsofa_sbox = { local longsofa_cbox = { type = "fixed", - fixed = { + fixed = { {-0.5, -0.5, -0.5, 0.5, 0, 2.5 }, {-0.5, -0.5, 0.5, -0.4, 0.5, 2.5 } } } -for i in ipairs(longsofas_list) do - local longsofadesc = longsofas_list[i][1] - local colour = longsofas_list[i][2] +for i in ipairs(lrfurn.colors) do + local colour = lrfurn.colors[i][1] + local hue = lrfurn.colors[i][2] minetest.register_node("lrfurn:longsofa_"..colour, { - description = longsofadesc, + description = "Long Sofa ("..colour..")", drawtype = "mesh", mesh = "lrfurn_sofa_long.obj", tiles = { - "lrfurn_sofa_"..colour..".png", + "lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png", "lrfurn_sofa_bottom.png" }, paramtype = "light", @@ -63,7 +52,6 @@ for i in ipairs(longsofas_list) do end pos.y = pos.y-0.5 clicker:setpos(pos) - clicker:set_hp(20) end }) diff --git a/mods/homedecor_modpack/lrfurn/sofas.lua b/mods/homedecor_modpack/lrfurn/sofas.lua index 71b22fe8..242e80dc 100755 --- a/mods/homedecor_modpack/lrfurn/sofas.lua +++ b/mods/homedecor_modpack/lrfurn/sofas.lua @@ -1,14 +1,4 @@ -local sofas_list = { - { "Red Sofa", "red"}, - { "Orange Sofa", "orange"}, - { "Yellow Sofa", "yellow"}, - { "Green Sofa", "green"}, - { "Blue Sofa", "blue"}, - { "Violet Sofa", "violet"}, - { "Black Sofa", "black"}, - { "Grey Sofa", "grey"}, - { "White Sofa", "white"}, -} + local sofa_sbox = { type = "fixed", @@ -17,22 +7,22 @@ local sofa_sbox = { local sofa_cbox = { type = "fixed", - fixed = { + fixed = { {-0.5, -0.5, -0.5, 0.5, 0, 1.5 }, {-0.5, -0.5, 0.5, -0.4, 0.5, 1.5 } } } -for i in ipairs(sofas_list) do - local sofadesc = sofas_list[i][1] - local colour = sofas_list[i][2] +for i in ipairs(lrfurn.colors) do + local colour = lrfurn.colors[i][1] + local hue = lrfurn.colors[i][2] minetest.register_node("lrfurn:sofa_"..colour, { - description = sofadesc, + description = "Sofa ("..colour..")", drawtype = "mesh", mesh = "lrfurn_sofa_short.obj", tiles = { - "lrfurn_sofa_"..colour..".png", + "lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png", "lrfurn_sofa_bottom.png" }, paramtype = "light", diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_bg_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_bg_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a5adc1fb7f0888db42c78e2805f1707ce4e2f35a GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^4j{|{BpCXc^q7DYXMsm#F#`j)FbFd;%$g$s6x8-~ zaSVw#{Pv8YAOiyj%Yy6w=9;$5W@lV+($`%4$G4j3EIjDt{@ZLTLvjXzJT4A(24aaDOT1t?3<1D{|k)n-&RNI=MXp*xIKCUTMOTiC}7Fn_&ka*oX z_ffztNfrbOT6mS3s~B)gz!?ctyvjv4^-3r52MM_);EWro<|Ukw+b|3_I9TMHgxnEu zMgl^MQunvve!ma5UYFk_{z6$jzAGFFtR`)RBZ1Yjt#DjM+b9!kul&aU zpg?pEqN@& z&PW3Df_v=UgAVh6XIzRvOO{by>*m<#np2n-VBP=*6ebFo2%e2>AqP-}?GY?h;q{GF z?gUQaPT)S+2_!J=1QNLK#2*xh&Ovk)qWd7a6JLFpz5r_Q6km8Uni~KB002ovPDHLk FV1o5e7H$9l diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_blue.png deleted file mode 100755 index 2668de290729a32ad83df8a204b52d03b4da53ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 811 zcmV+`1JwM9P)7@{8-q97TgAsVD28>J!~q$3@rBp#$B9;PK9rzat$ zCn2XOA*U%Ks466;DkP{YC8;bXs4OO`E-0!nDylFltT8LAGcBz&F0M5%uQo8STg+*@ z0006?NklhC*go*`s%g(^ zD&pBOTvotfU(?|g(0UIHx`ydnUoX9I*1<(4JQF@r$qF*r-K#*~`g-Y` zDOkaK708;R;_JIR91h+0SAlMOUJ>+%@RxlHA3ONp~Yu;911w)(z1LQl` zzOUgFtf1qgr}@c6F{b>zsy}y)RK2SH>VHkMKTGNc%4YXjSMQwS7`eb;>H1-sVL}VW zIOih$gLCq#fN5q-aQ$0Qg0nRA-6b?wEv;=e09b=c1_plQTaz+iu>q9~3}PIw$;V|^ zK8R-kum+V33~+%1CJ)EH?~ez`kO7MgsAOP31PMfY{5hRYKgX5_1}rw9l7Rs&smke3 zT74@51AsNCWcW?oZiXAEz`y`B?EwP=?`CX|7>`MoI&ui!d`IVl(^U?4^c?!ia_gMOrd p!D*ysXE417)2ARtYWgP5O}`HV{ZKE_zAXR%002ovPDHLkV1jG*O|t+1 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_bottom.png old mode 100755 new mode 100644 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_green.png deleted file mode 100755 index 4a23a190bcf5dbbae7152805207273a36f980268..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 869 zcmV-r1DgDaP)Dtjs{d@L+|EG>R5E`BaAfG;qCFfoHMGJ`Tfoi|1R00Lb}L_t(|+Rc-1 zbD}U1#;a(tL@IxJM$?>{!<4pirB^wmMXBHaQ#CqdI_r8P4EKWP1v9_w&ckMRbJbjT zK7j`v!yMX24Nap1W5mBh1~cZu1H)lrDV3IjIR=cmY=#V?kir9V8YS6LNyJPTqhW*$ zHZiYW0gpGx;3E--TYq1=V+`z41BDC-8I;JFIY zn3MV2d%oRn^Y^y}Iqd-m@;F5XD>;T0lmt-ISgw%4l-|M~lmt-IEuA6*a$|h=eSoI` zg2oNGYM-u&M|toV#joomRlQpMj{mHa%=tA>{J#opVOV{>bWgu|cm3wp9aQ4JsKKSdIlIr2()8m5dBL>J8XS zxhpTs)Bsq6N=62BL2Z$4cSTX`wy79u0IWeJBLgOxEwkO{e!u_RWlLKFU=1o68Ss#+ zoML}akx5$vU=1o68O)w$)eTf~;|d!0;Qvp-r@k6>njMs?QELFKK_w#t;*jc_sFMHj z7Ru#U>#hN_ehaM=dcGGJ8K942^lWw25e$Sx`89s$_L7krEP#!#l&(GmQz^P+_pwEMIQ>b2no`;--h<{-kTunO6WgXQC#XJsgueQP00000NkvXXu0mjf@X%fp diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_grey.png deleted file mode 100755 index 406c1146262702032a8d877677c32054c17bdd08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmV-!0+IcRP)yf~Dfb9{$ za7F?jich`( zer$=K1IGx1!c~y98-Z5^$5=~Tg@zSw4!j5)W5F6EK(ctw`*Ia#7H0$r1kXaSz$>X3 zh^`-wCuOqL|M{oR7IsOg({boK0jwggNFYkGg4PV6koQUS0r(aOA!d5Ny%E-9Xi>vGRaDP-_T4`eWNHd$4D1)psTPwf~6`v zzLD~sKmu|na3Aah61eUJ61eTe4-^Q_L2wm<`yjXzA3aRJ0j*!XOBpud0000007*qo IM6N<$f__F45dZ)H diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_orange.png deleted file mode 100755 index 54dfb5aa21a657a0dabfffd823ba41f2960cd5b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 686 zcmV;f0#W^mP)qye0R5K$|Cj*(ngIWs0RNl-|D6E;o&Y%qlpO#7 z0s~1zK~#7F&6d$_t1t|PH|Q`V$HYlskg}Hb{a^BcOEm=}6_gwPi)o(?KaOqMexyrl zhy$N_0VNBH{4>sh*1~{{iUYYa*7-@!8kNU6Wk?vb4aR|@Zo|L|ttsLhHmxwYcC^0& z>aN1zC)nlG%b_PK7tI(YZTJxew_ulNibt}dqz$*N3i#BoL$9Y0CATUF9f9qK+pM9t zuuopWCQ!hw+Aco(A2j2B22 z@4{ImUf(w?3`Eo3urLr~d&6>!^P)V(yYh}tV368_fzu(E!sNfPMw<>U?FAA-1n#NmH^Zn!| znvj1{L`h9umCZ0|I0T#og UUY|*@Z~y=R07*qoM6N<$f~&AN`v3p{ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_overlay.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..d02df2db111373383fbd0bd04ce71395c2a41273 GIT binary patch literal 2855 zcmV+?3)u9DP)h9^Do;Cx<8d^fK5Mm_u zSiLYyHee89VUSrOHb^kDv=?LHh5rErlJ_Ic!Yd;rWDE0@XYeq?OuMIRrmDKL^PTq< zaai1&SyeriS=|i+iDlYXde)Y27Y2Cjz-=)Qn z>~jJvc)|$yi_hhJ0xbY3z z2s5r2u6`q)zB`EbY#vG56q1{gjuyUjlv3H%?ZKdc1;8gNo|1@{IOt^F$Fxl;JGuzQ zw7Sc1sZK8y00Mb;esk0fJ7z~Bt;%5uAG`b3hf_dG7Jz|WgrZURyJn;)IZyie zVcF51>6(O6CpzSDFlMgLE&x&a#nU&R3{1}g+znLdZzV^EC5!g)E#sf$CcrZ6M~;cF z_sl9HpzJ>S-RV7A(lspukcA)f9g1#SPM=+Xj!S6^cC4L!Au1{VnoMzfH zi9}NBG{7hvNBwJK!1~_{zXGz}ty6U&#`7E+*fPr9(?1*C3k@=u#%F*(NIyE@zd6k6 z$GrCMGphxdYHjVLdgTghPW8fW1t^|L0EeN4r(O0wc>Im5BYUQ2U=kh}_(@z^4DR3E zTS?j+em8=jl(ptQOh%4~cpU#p{F?OS&(u&6jFf`pGdBtCJ$Kp#IPNT zg_K*2n4=qf#Go79+0dm$dFc%uEixQk#>~*o8tBr)kg-5tz=`vX0_Mz#Ii$1wWTD4S zF$PvnIe$JhyvsgfhrBs-OLNPd?+Th1RLQF+QsDZjr z8ptmCyvhmpnNgvPHbsKN;K?X#(k<^yp=b8ZRHq?V_(UIf=mSHh9o;toj{~%&C9u?) zTefJEC!?KwUupozv?Tx!?Q-rCw=x;no*=7C7=fet&i^*K(K2a=yNBdQe#=)QC0^O>PSh>uXh*(K`;Z;GEizu zV$*0YBEn&@FIguK!*iwMX+ROeT7`P-6R~1t7D~Mke9gg$RL#5*F0Nq5lsbMMMpWsi zzTvwSg5vSB_0!M%+O|s7{MJdR->}rBZ?sZ12GD7MzKow;fKpffi$MwXE%W9MbETrT zvnMnzrw@Fsfu%0O1;*^rPkp7&#s>fxYlnrdq+hwwL^I8Um@|s9_6|KKHgj!ew27eS za6*TrMMW}qA4gw}1_C<*Qv)OY4?A{5r3|BY;twrMbfn6z^qRZ=Tb#$<5j~3Ej1Pg^ zwr6r3htmL~B#$OB2{E!g8T~3tX0*A*DGW>^i9oK4c=`(a z%=xH4Pe~+}SW;@ba@w8T@DG{Riek8lp}7Vml?=@`N}6lF4yl@Y)PTL38;87!3!xFt z`(@+OQ;N@(z2^j&QBbgCc}am;ky8LU86G9nE3&iVwcfX2o?Uzbb0%a2g!UyTpA+B! z6D>Om^yXS>$2f_l3{X;-@_=0+Bj7tCo-hkt6AKJIkT9T6#D1LAujraOjW;Q|4Rq-8 zQ%*JuaB^*Vr)mqpu7OMkCXrl6VW|(ygQ~Q^(T$Va!P&xAre|`^6>f9nPa}4T?V>%s zF>BK^u}nj*wFxqXVOZ!q(B4*|IOI^wD;P+` zNu_;L2j0CioCpBF%=d#O(kT48eo@YGp0G|x`lmV$+mlhK%!UBn9J&`&=;ZSBR8eSwQ+%^$GoW$nB6F~=(`fS7_a_sg-rD4f}yp`EYYZqJF?@amTJQSt66HsR} z_cK|0x&ZVfg_4|{#kO3yIxsvg)n?~0EL^C6H-yn)FeQrQ?pR(Fh#F2f@kT3YK*p|N zgd?hml<4G4FmuKTdpav5l%}%7vrM2+v&m-_AVz>>9=+?n7T1grBMv6|K%TVd&@Nl= zr(e@LA>FpAjKXOE_y?0Yq%^bWZpkTf}Vxw%ax+#mwF?DIIC*Abse zDv)U=^!NfThTI<%Ndqsj)XlqGN0Rs1hxU`sxD{fFMVJPdgr&>-z=)EFm`^r0t?NQd zSrEupYRgs%ROWn2%8c?H6V!ACO~M>tF%Q-BVtcD(1lxGPnFfB7g!z`G7Sj|Xm+v>{ zQqM)lm8M9U@Wag}a1<1bpGDT^8tdYQz-)V?@+O}AWz&@dv)t;rEoog5Z0Y)W8hSpf zJ_$eY^{0Ss0+{c~mt8-Ktg)b%CJqqA$D~b)|F%+$ks16?hXCzYR@`jRn%(mx^?+d7GziWL{LyEWFaFS@Rvfg%?*X_ z%kgXO7u>*ht>E?Y#!987!ji{!8WmPQCqk)b|5qRNW?`boN<_s++nd!pnAA9FiQl5! zQY*^(lcn7h7uDzE#}PB*@3#3sN(Y<4)n8f9+xGv@_%HPJZaG$8yG{TA002ovPDHLk FV1kReXvhEn literal 0 HcmV?d00001 diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_red.png deleted file mode 100755 index 0f0c7110bdda7061c6a11fab03a32b16fdc41fff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 789 zcmV+w1M2*VP)bH2?>D>4T1^^g9{6U3=D-04TTR6h7b^k5fO+I5{MKOh!z%!6BCIS z7m64diy0Y<8yk!o8jTwpjU64192|}w9*-X%k0BwDARv(;A(0~^k|H9KBqWk1CX*#4 zlPM{bCMK09CzUBFmMSWiEG(ETESN4XnJq1wFE5-hFq|?nV5KoV0006&NklyK)>v~5R`h)YM(=WRomObHVx?U5851u`r zg}s>XJ>wcnUWvg*a(v*$QfXtQm5e=H<8ng`imkv0epb{?uey*vu8D0y3=Sm>p8(1O zG5D^Pd+YwC?GD!ARcni=sOoQG&{oPllRnZ46;;*Vo4~zw|I)W9pyIs=suEcK@zoxW z$M)+ZXSX{*MJOwpf=TfNJyGl_H8h1xM0f``6QE)wGGf32@890nGzC=j0`@dNy)Z67 zzZK=@zOL-9irwYEx<2%(E(@&c{byOcX%L*f5QD`sh>}!D$d%GsnJENCg+wGa>Z-Y@vQaxg?7%h?0~WL4H_4e9?GB}%b_03q8-hnAkL&A&!i;Ir6bQqarMps00J&aL_t(| z+Rc?+bE+^9hFekyBt)7INvj8nO*vAj*#H0QPU4u0xXcK{x!}EUe0F!CHIKs_t7>3yY~=I~ zWOD=tKdrjn+F$y920>D_Kfs_j%AX02bPAHn^kW@dZ|yIA-$9TZ>%cS;i_h==bUO9l zp90^{AV|u_0E4~GgG27O5F~TG2L=U8gKOS*5F}Gp00W$$>03Yvep;ViFk!NMtDCPw zYwWD{f84kB@9`?*258#DS5v>0k`ep@3?h`IG-q52rOI-vDP@~0D91|at@{*`vz(?0 zibf2gU``$YJBUUMk}L@}VPdn+G2_5j#{Ed~ZmFs#h!JPgD6WEA!g zum@WV47lc4cjw>B*y6<?SG!&HUP_iFL6XXHYzxyna9dcP z@Js;%JyY-<%oH#fW(pWwW@>c?%V)5B3woxOzr?la9~1rBPA#lO%>V!Z07*qoM6N<$ Ef@{oLqyPW_ diff --git a/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png b/mods/homedecor_modpack/lrfurn/textures/lrfurn_sofa_white.png deleted file mode 100755 index 27ff12a98dcf45162bad8da02076b8cbf01b7ef3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 640 zcmV-`0)PF9P)9>Jt#06u-T5=9N=I#>v%bE`$57&88g{EazMX zs$;0$f1F19*w@Idf#qbKf-1rv z6ytBrDq4^%iGmq|!0Ohij~qOLV1^*c6HBSPiVikF2Ll33aa_G$d*!`~@4&?)(7}L! z)-=^Kavp}^tOpC-fQt>#!GNHWRVw@Q*X45gI`<;I0T&yfgW-|ZFdZ|PCx%|8ci`d? z=wL{&+d{Bo|33ro8hEQfC|TbJIvAb@Ia=R|I(T6grZeN)dE(%OS$O<`vN*mA7!WKK zZ3zQ{McEcGlyPj7tBt+#FZ>G$ylddCf_EQ0zLjwnuMdwicrOTs*ArkS0KuUx*AtZO z0TA@=hvrYlx_&N$Ai?^2XZi*wD2Na)#`|4g=w*RXWI5+D5R61Qt!1-oWKHuZ$@TY! zMjGlbiafELWTpmMh4mTCsqpwlN;euHkQ)v5!A1iF!$t!HmyPxd3A}6It%7$Scz5EX ahv^UADavL|xY!U{AkiGw7{xnN9r3a}+x#3()`(o?h*rwtmUrJGW@LAT>1W{dn zrZG|q41}M~%8rcdA|ag9T;rR#9PNp@6<%y zF$o&Cfq`F5d?q|HC<&U?A5{=<9WVVfg(P@X!8!{Kx5e)nez^_w+=C=2^NLfjeOf^v z#6Z2pDX?zS9t1)R)M^F;qVlir$5Z&DlIY`l`XZ&pj?;Ww+hr_qX5 z^aTb*MXl;J%V0vY)IZGu%$iUR}cD4A3Q-~iO&6qHuU zu0#M1ptJ%5J?O@)Zu8!6ZZ-6Plq2lPxQUh<>$ab}HfNg%zya9eCdw##jt@D0&xrsW zU{6Ma?=uG9l3hV|5AvsQya(&==7+flKwje>I7Z|A7Ui9xS9}43+#Y04A%739C)L*PC)cflGb`%E)5OBrGV%KcJS{IiG*S4W zi4_#2G>ZspMMXubXO>|Q=3Y^i1VaVbgR0Ym9lu9A=&qtpi`{8QE4rg37