diff --git a/nodes.lua b/nodes.lua index 32e21d2..940e84f 100644 --- a/nodes.lua +++ b/nodes.lua @@ -137,7 +137,7 @@ xdecor.register("chair", { {11, 0, 3, 2, 6, 2}, {3, 6, 3, 10, 2, 8} }), can_dig = xdecor.sit_dig, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + on_rightclick = function(pos, node, clicker, _, pointed_thing) pos.y = pos.y + 0 -- Sitting position. xdecor.sit(pos, node, clicker, pointed_thing) end @@ -202,7 +202,11 @@ xdecor.register("cushion", { groups = {snappy=3, flammable=3, fall_damage_add_percent=-50}, on_place = minetest.rotate_node, node_box = xdecor.nodebox.slab_y(0.5), - can_dig = xdecor.sit_dig + can_dig = xdecor.sit_dig, + on_rightclick = function(pos, node, clicker, _, pointed_thing) + pos.y = pos.y + 0 -- Sitting position. + xdecor.sit(pos, node, clicker, pointed_thing) + end }) xdecor.register("cushion_block", { @@ -430,7 +434,7 @@ xdecor.register("tatami", { xdecor.register("trampoline", { description = "Trampoline", - tiles = {"xdecor_trampoline.png", "xdecor_trampoline_sides.png"}, + tiles = {"xdecor_trampoline.png", "mailbox_blank16.png", "xdecor_trampoline_sides.png"}, groups = {snappy=3, flammable=3, fall_damage_add_percent=-80, bouncy=90}, node_box = xdecor.nodebox.slab_y(0.5) }) diff --git a/textures/ench_ui.png b/textures/ench_ui.png index 1413b7b..a67291d 100644 Binary files a/textures/ench_ui.png and b/textures/ench_ui.png differ diff --git a/textures/hive_layout.png b/textures/hive_layout.png index 90280d8..95b5d2d 100644 Binary files a/textures/hive_layout.png and b/textures/hive_layout.png differ diff --git a/textures/king_black.png b/textures/king_black.png index f557771..7a1c277 100644 Binary files a/textures/king_black.png and b/textures/king_black.png differ diff --git a/textures/mese_layout.png b/textures/mese_layout.png index 02d6248..ef6cfaf 100644 Binary files a/textures/mese_layout.png and b/textures/mese_layout.png differ diff --git a/textures/xdecor_bamboo_frame.png b/textures/xdecor_bamboo_frame.png index 58a76b4..37a3bbb 100644 Binary files a/textures/xdecor_bamboo_frame.png and b/textures/xdecor_bamboo_frame.png differ diff --git a/textures/xdecor_baricade.png b/textures/xdecor_baricade.png index 2b8b73a..76688c4 100644 Binary files a/textures/xdecor_baricade.png and b/textures/xdecor_baricade.png differ diff --git a/textures/xdecor_barrel_sides.png b/textures/xdecor_barrel_sides.png index d79ab01..49b689c 100644 Binary files a/textures/xdecor_barrel_sides.png and b/textures/xdecor_barrel_sides.png differ diff --git a/textures/xdecor_barrel_top.png b/textures/xdecor_barrel_top.png index f61cf49..5ce7178 100644 Binary files a/textures/xdecor_barrel_top.png and b/textures/xdecor_barrel_top.png differ diff --git a/textures/xdecor_book_open.png b/textures/xdecor_book_open.png index 508e808..c632132 100644 Binary files a/textures/xdecor_book_open.png and b/textures/xdecor_book_open.png differ diff --git a/textures/xdecor_bowl.png b/textures/xdecor_bowl.png index 2667c73..02aa990 100644 Binary files a/textures/xdecor_bowl.png and b/textures/xdecor_bowl.png differ diff --git a/textures/xdecor_bowl_soup.png b/textures/xdecor_bowl_soup.png index c246e3e..57ed763 100644 Binary files a/textures/xdecor_bowl_soup.png and b/textures/xdecor_bowl_soup.png differ diff --git a/textures/xdecor_cabinet_sides.png b/textures/xdecor_cabinet_sides.png index 0d80269..2cb0538 100644 Binary files a/textures/xdecor_cabinet_sides.png and b/textures/xdecor_cabinet_sides.png differ diff --git a/textures/xdecor_cactusbrick.png b/textures/xdecor_cactusbrick.png index 7f9af7e..92ebfb5 100644 Binary files a/textures/xdecor_cactusbrick.png and b/textures/xdecor_cactusbrick.png differ diff --git a/textures/xdecor_candle_wield.png b/textures/xdecor_candle_wield.png index d5a8a0c..f923fa4 100644 Binary files a/textures/xdecor_candle_wield.png and b/textures/xdecor_candle_wield.png differ diff --git a/textures/xdecor_cauldron_sides.png b/textures/xdecor_cauldron_sides.png index f698b2f..21f0e5e 100644 Binary files a/textures/xdecor_cauldron_sides.png and b/textures/xdecor_cauldron_sides.png differ diff --git a/textures/xdecor_cauldron_top_anim_boiling_water.png b/textures/xdecor_cauldron_top_anim_boiling_water.png index 6d8f81d..7b2f37b 100644 Binary files a/textures/xdecor_cauldron_top_anim_boiling_water.png and b/textures/xdecor_cauldron_top_anim_boiling_water.png differ diff --git a/textures/xdecor_cauldron_top_anim_soup.png b/textures/xdecor_cauldron_top_anim_soup.png index 6df888f..a224fe6 100644 Binary files a/textures/xdecor_cauldron_top_anim_soup.png and b/textures/xdecor_cauldron_top_anim_soup.png differ diff --git a/textures/xdecor_cauldron_top_empty.png b/textures/xdecor_cauldron_top_empty.png index d302287..c0dc495 100644 Binary files a/textures/xdecor_cauldron_top_empty.png and b/textures/xdecor_cauldron_top_empty.png differ diff --git a/textures/xdecor_cauldron_top_idle.png b/textures/xdecor_cauldron_top_idle.png index 938abe0..d8315e8 100644 Binary files a/textures/xdecor_cauldron_top_idle.png and b/textures/xdecor_cauldron_top_idle.png differ diff --git a/textures/xdecor_chainlink.png b/textures/xdecor_chainlink.png index bd8f7cf..85fab4e 100644 Binary files a/textures/xdecor_chainlink.png and b/textures/xdecor_chainlink.png differ diff --git a/textures/xdecor_coalstone_tile.png b/textures/xdecor_coalstone_tile.png index bd1e4bd..79a9a24 100644 Binary files a/textures/xdecor_coalstone_tile.png and b/textures/xdecor_coalstone_tile.png differ diff --git a/textures/xdecor_cobweb.png b/textures/xdecor_cobweb.png index 29e9415..c67cf30 100644 Binary files a/textures/xdecor_cobweb.png and b/textures/xdecor_cobweb.png differ diff --git a/textures/xdecor_crafting_guide.png b/textures/xdecor_crafting_guide.png index 1bc4fb6..4d08530 100644 Binary files a/textures/xdecor_crafting_guide.png and b/textures/xdecor_crafting_guide.png differ diff --git a/textures/xdecor_cushion.png b/textures/xdecor_cushion.png index eddca8d..272d627 100644 Binary files a/textures/xdecor_cushion.png and b/textures/xdecor_cushion.png differ diff --git a/textures/xdecor_dandelion_white_pot.png b/textures/xdecor_dandelion_white_pot.png index 9142155..9f21a84 100644 Binary files a/textures/xdecor_dandelion_white_pot.png and b/textures/xdecor_dandelion_white_pot.png differ diff --git a/textures/xdecor_dandelion_yellow_pot.png b/textures/xdecor_dandelion_yellow_pot.png index a44f5ef..847b210 100644 Binary files a/textures/xdecor_dandelion_yellow_pot.png and b/textures/xdecor_dandelion_yellow_pot.png differ diff --git a/textures/xdecor_desertstone_tile.png b/textures/xdecor_desertstone_tile.png index b546c56..39a5bcc 100644 Binary files a/textures/xdecor_desertstone_tile.png and b/textures/xdecor_desertstone_tile.png differ diff --git a/textures/xdecor_empty_shelf.png b/textures/xdecor_empty_shelf.png index 650d0a6..9839896 100644 Binary files a/textures/xdecor_empty_shelf.png and b/textures/xdecor_empty_shelf.png differ diff --git a/textures/xdecor_enchantment_bottom.png b/textures/xdecor_enchantment_bottom.png index 781be5c..b83ec33 100644 Binary files a/textures/xdecor_enchantment_bottom.png and b/textures/xdecor_enchantment_bottom.png differ diff --git a/textures/xdecor_enchantment_side.png b/textures/xdecor_enchantment_side.png index c03654d..39fae6b 100644 Binary files a/textures/xdecor_enchantment_side.png and b/textures/xdecor_enchantment_side.png differ diff --git a/textures/xdecor_enchantment_top.png b/textures/xdecor_enchantment_top.png index 3a3f703..6b67af8 100644 Binary files a/textures/xdecor_enchantment_top.png and b/textures/xdecor_enchantment_top.png differ diff --git a/textures/xdecor_enderchest_front.png b/textures/xdecor_enderchest_front.png index 3cd5aaf..f41a228 100644 Binary files a/textures/xdecor_enderchest_front.png and b/textures/xdecor_enderchest_front.png differ diff --git a/textures/xdecor_enderchest_side.png b/textures/xdecor_enderchest_side.png index 8a7c516..f433225 100644 Binary files a/textures/xdecor_enderchest_side.png and b/textures/xdecor_enderchest_side.png differ diff --git a/textures/xdecor_enderchest_top.png b/textures/xdecor_enderchest_top.png index 62a4cca..ea0638a 100644 Binary files a/textures/xdecor_enderchest_top.png and b/textures/xdecor_enderchest_top.png differ diff --git a/textures/xdecor_geranium_pot.png b/textures/xdecor_geranium_pot.png index 33d61f3..696ea48 100644 Binary files a/textures/xdecor_geranium_pot.png and b/textures/xdecor_geranium_pot.png differ diff --git a/textures/xdecor_glyph16.png b/textures/xdecor_glyph16.png index d10a72b..e62062c 100644 Binary files a/textures/xdecor_glyph16.png and b/textures/xdecor_glyph16.png differ diff --git a/textures/xdecor_glyph5.png b/textures/xdecor_glyph5.png index f0635bf..49f92ff 100644 Binary files a/textures/xdecor_glyph5.png and b/textures/xdecor_glyph5.png differ diff --git a/textures/xdecor_half_cabinet_front.png b/textures/xdecor_half_cabinet_front.png index 3e4964c..e866a9b 100644 Binary files a/textures/xdecor_half_cabinet_front.png and b/textures/xdecor_half_cabinet_front.png differ diff --git a/textures/xdecor_hard_clay.png b/textures/xdecor_hard_clay.png index cc058bd..89c2b23 100644 Binary files a/textures/xdecor_hard_clay.png and b/textures/xdecor_hard_clay.png differ diff --git a/textures/xdecor_hive_front.png b/textures/xdecor_hive_front.png index ce77048..a00cd92 100644 Binary files a/textures/xdecor_hive_front.png and b/textures/xdecor_hive_front.png differ diff --git a/textures/xdecor_hive_side.png b/textures/xdecor_hive_side.png index deddd39..f849612 100644 Binary files a/textures/xdecor_hive_side.png and b/textures/xdecor_hive_side.png differ diff --git a/textures/xdecor_hive_top.png b/textures/xdecor_hive_top.png index b691e1c..8654c4b 100644 Binary files a/textures/xdecor_hive_top.png and b/textures/xdecor_hive_top.png differ diff --git a/textures/xdecor_iron_lightbox.png b/textures/xdecor_iron_lightbox.png index 870d610..90d5f3b 100644 Binary files a/textures/xdecor_iron_lightbox.png and b/textures/xdecor_iron_lightbox.png differ diff --git a/textures/xdecor_itemframe.png b/textures/xdecor_itemframe.png index 60e1365..526c95a 100644 Binary files a/textures/xdecor_itemframe.png and b/textures/xdecor_itemframe.png differ diff --git a/textures/xdecor_ivy.png b/textures/xdecor_ivy.png index d540e18..02162a3 100644 Binary files a/textures/xdecor_ivy.png and b/textures/xdecor_ivy.png differ diff --git a/textures/xdecor_japanese_door.png b/textures/xdecor_japanese_door.png index 1b44b0a..e9f9fdf 100644 Binary files a/textures/xdecor_japanese_door.png and b/textures/xdecor_japanese_door.png differ diff --git a/textures/xdecor_lantern.png b/textures/xdecor_lantern.png index 3ddcf53..6771758 100644 Binary files a/textures/xdecor_lantern.png and b/textures/xdecor_lantern.png differ diff --git a/textures/xdecor_lever_off.png b/textures/xdecor_lever_off.png index 143ad88..3487020 100644 Binary files a/textures/xdecor_lever_off.png and b/textures/xdecor_lever_off.png differ diff --git a/textures/xdecor_lever_on.png b/textures/xdecor_lever_on.png index 933d138..86870bd 100644 Binary files a/textures/xdecor_lever_on.png and b/textures/xdecor_lever_on.png differ diff --git a/textures/xdecor_mailbox.png b/textures/xdecor_mailbox.png index 4fe6213..f94cc36 100644 Binary files a/textures/xdecor_mailbox.png and b/textures/xdecor_mailbox.png differ diff --git a/textures/xdecor_mailbox_bottom.png b/textures/xdecor_mailbox_bottom.png index 5c743f7..7b879d9 100644 Binary files a/textures/xdecor_mailbox_bottom.png and b/textures/xdecor_mailbox_bottom.png differ diff --git a/textures/xdecor_mailbox_side.png b/textures/xdecor_mailbox_side.png index 86858cb..61df62b 100644 Binary files a/textures/xdecor_mailbox_side.png and b/textures/xdecor_mailbox_side.png differ diff --git a/textures/xdecor_mailbox_top.png b/textures/xdecor_mailbox_top.png index 4890366..2b54fb1 100644 Binary files a/textures/xdecor_mailbox_top.png and b/textures/xdecor_mailbox_top.png differ diff --git a/textures/xdecor_moonbrick.png b/textures/xdecor_moonbrick.png index a69a1cf..6e4f135 100644 Binary files a/textures/xdecor_moonbrick.png and b/textures/xdecor_moonbrick.png differ diff --git a/textures/xdecor_multishelf.png b/textures/xdecor_multishelf.png index f7d4f0d..1c6c43f 100644 Binary files a/textures/xdecor_multishelf.png and b/textures/xdecor_multishelf.png differ diff --git a/textures/xdecor_packed_ice.png b/textures/xdecor_packed_ice.png index c8047d6..762103f 100644 Binary files a/textures/xdecor_packed_ice.png and b/textures/xdecor_packed_ice.png differ diff --git a/textures/xdecor_painting_2.png b/textures/xdecor_painting_2.png index dc56640..9646ce5 100644 Binary files a/textures/xdecor_painting_2.png and b/textures/xdecor_painting_2.png differ diff --git a/textures/xdecor_painting_3.png b/textures/xdecor_painting_3.png index 6c0467b..f3343db 100644 Binary files a/textures/xdecor_painting_3.png and b/textures/xdecor_painting_3.png differ diff --git a/textures/xdecor_painting_4.png b/textures/xdecor_painting_4.png index ceea0f7..bced6c4 100644 Binary files a/textures/xdecor_painting_4.png and b/textures/xdecor_painting_4.png differ diff --git a/textures/xdecor_painting_empty.png b/textures/xdecor_painting_empty.png index fe1cc6f..39ca15a 100644 Binary files a/textures/xdecor_painting_empty.png and b/textures/xdecor_painting_empty.png differ diff --git a/textures/xdecor_pressure_stone.png b/textures/xdecor_pressure_stone.png index 899e8f2..4d2c0ec 100644 Binary files a/textures/xdecor_pressure_stone.png and b/textures/xdecor_pressure_stone.png differ diff --git a/textures/xdecor_pressure_wood.png b/textures/xdecor_pressure_wood.png index 1313479..deca4b6 100644 Binary files a/textures/xdecor_pressure_wood.png and b/textures/xdecor_pressure_wood.png differ diff --git a/textures/xdecor_prison_door.png b/textures/xdecor_prison_door.png index ecd05d0..90cdf14 100644 Binary files a/textures/xdecor_prison_door.png and b/textures/xdecor_prison_door.png differ diff --git a/textures/xdecor_rope.png b/textures/xdecor_rope.png index 03405ac..f55bae9 100644 Binary files a/textures/xdecor_rope.png and b/textures/xdecor_rope.png differ diff --git a/textures/xdecor_rope_wield.png b/textures/xdecor_rope_wield.png new file mode 100644 index 0000000..1f8105d Binary files /dev/null and b/textures/xdecor_rope_wield.png differ diff --git a/textures/xdecor_rose_pot.png b/textures/xdecor_rose_pot.png index 873e0f8..3d63f53 100644 Binary files a/textures/xdecor_rose_pot.png and b/textures/xdecor_rose_pot.png differ diff --git a/textures/xdecor_rusty_bar.png b/textures/xdecor_rusty_bar.png index fdf818a..b721a67 100644 Binary files a/textures/xdecor_rusty_bar.png and b/textures/xdecor_rusty_bar.png differ diff --git a/textures/xdecor_rusty_prison_door.png b/textures/xdecor_rusty_prison_door.png index b285244..805c006 100644 Binary files a/textures/xdecor_rusty_prison_door.png and b/textures/xdecor_rusty_prison_door.png differ diff --git a/textures/xdecor_screen_door.png b/textures/xdecor_screen_door.png index 11feb15..7f7ae73 100644 Binary files a/textures/xdecor_screen_door.png and b/textures/xdecor_screen_door.png differ diff --git a/textures/xdecor_screen_door_inv.png b/textures/xdecor_screen_door_inv.png index 94cbd8c..377a97c 100644 Binary files a/textures/xdecor_screen_door_inv.png and b/textures/xdecor_screen_door_inv.png differ diff --git a/textures/xdecor_slide_door.png b/textures/xdecor_slide_door.png index fc18f5d..fa9078c 100644 Binary files a/textures/xdecor_slide_door.png and b/textures/xdecor_slide_door.png differ diff --git a/textures/xdecor_stone_tile.png b/textures/xdecor_stone_tile.png index 20b116a..a058cf7 100644 Binary files a/textures/xdecor_stone_tile.png and b/textures/xdecor_stone_tile.png differ diff --git a/textures/xdecor_tatami.png b/textures/xdecor_tatami.png index 6d5daae..53e5c85 100644 Binary files a/textures/xdecor_tatami.png and b/textures/xdecor_tatami.png differ diff --git a/textures/xdecor_trampoline.png b/textures/xdecor_trampoline.png index 760f49d..9347a60 100644 Binary files a/textures/xdecor_trampoline.png and b/textures/xdecor_trampoline.png differ diff --git a/textures/xdecor_trampoline_sides.png b/textures/xdecor_trampoline_sides.png index 3b96ebb..9df79a5 100644 Binary files a/textures/xdecor_trampoline_sides.png and b/textures/xdecor_trampoline_sides.png differ diff --git a/textures/xdecor_tulip_pot.png b/textures/xdecor_tulip_pot.png index 97ec205..44acdb8 100644 Binary files a/textures/xdecor_tulip_pot.png and b/textures/xdecor_tulip_pot.png differ diff --git a/textures/xdecor_viola_pot.png b/textures/xdecor_viola_pot.png index 438543d..95499b5 100644 Binary files a/textures/xdecor_viola_pot.png and b/textures/xdecor_viola_pot.png differ diff --git a/textures/xdecor_wood.png b/textures/xdecor_wood.png index 66c970d..2f0023e 100644 Binary files a/textures/xdecor_wood.png and b/textures/xdecor_wood.png differ diff --git a/textures/xdecor_wood_tile.png b/textures/xdecor_wood_tile.png index b65f9d9..f7de1d5 100644 Binary files a/textures/xdecor_wood_tile.png and b/textures/xdecor_wood_tile.png differ diff --git a/textures/xdecor_woodframed_glass.png b/textures/xdecor_woodframed_glass.png index c2ce207..137b679 100644 Binary files a/textures/xdecor_woodframed_glass.png and b/textures/xdecor_woodframed_glass.png differ diff --git a/textures/xdecor_woodframed_glass_detail.png b/textures/xdecor_woodframed_glass_detail.png index 341f8fe..0ca309c 100644 Binary files a/textures/xdecor_woodframed_glass_detail.png and b/textures/xdecor_woodframed_glass_detail.png differ diff --git a/textures/xdecor_woodglass_door.png b/textures/xdecor_woodglass_door.png index 93a6cca..c752b4e 100644 Binary files a/textures/xdecor_woodglass_door.png and b/textures/xdecor_woodglass_door.png differ diff --git a/textures/xdecor_workbench_front.png b/textures/xdecor_workbench_front.png index a7b04df..cc2142d 100644 Binary files a/textures/xdecor_workbench_front.png and b/textures/xdecor_workbench_front.png differ diff --git a/textures/xdecor_workbench_sides.png b/textures/xdecor_workbench_sides.png index 6e80cb3..29c4b3b 100644 Binary files a/textures/xdecor_workbench_sides.png and b/textures/xdecor_workbench_sides.png differ diff --git a/textures/xdecor_workbench_top.png b/textures/xdecor_workbench_top.png index 2e3a7d1..f9a36cf 100644 Binary files a/textures/xdecor_workbench_top.png and b/textures/xdecor_workbench_top.png differ