diff --git a/build-date b/build-date new file mode 100644 index 00000000..1c638c19 --- /dev/null +++ b/build-date @@ -0,0 +1 @@ +20210302-0653 diff --git a/mods/computer/computers.lua b/mods/computer/computers.lua deleted file mode 100644 index 754735a4..00000000 --- a/mods/computer/computers.lua +++ /dev/null @@ -1,339 +0,0 @@ -local S = minetest.get_translator("computer") - --- Amiga 500 lookalike -computer.register("computer:shefriendSOO", { - description = S("SheFriendSOO"), - tiles_off = { front=true }, - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 17, 32, 32, 12 }, -- Monitor Screen - { 3, 3, 29, 26, 26, 3 }, -- Monitor Tube - { 0, 0, 0, 32, 4, 17 } -- Keyboard - }) -}) - --- Some generic laptop -minetest.register_node("computer:vanio", { - drawtype = "mesh", - mesh = "computer_laptop.obj", - description = S("Pony Vanio"), - inventory_image = "computer_laptop_inv.png", - tiles = {"computer_laptop.png"}, - paramtype = "light", - paramtype2 = "facedir", - light_source = 4, - groups = {snappy=3}, - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.35, -0.5, -0.35, 0.35, 0.05, 0.35}, - }, - on_rightclick = function(pos, node, clicker, itemstack) - node.name = "computer:vanio_off" - minetest.set_node(pos, node) - return itemstack - end -}) - -minetest.register_node("computer:vanio_off", { - drawtype = "mesh", - mesh = "computer_laptop_closed.obj", - tiles = {"computer_laptop.png"}, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3, not_in_creative_inventory=1}, - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.35, -0.5, -0.35, 0.35, -0.4, 0.25}, - }, - drop = "computer:vanio", - on_rightclick = function(pos, node, clicker, itemstack) - node.name = "computer:vanio" - minetest.set_node(pos, node) - return itemstack - end -}) - --- Sony PlayStation lookalike -computer.register("computer:slaystation", { - description = S("Pony SlayStation"), - inventory_image = "computer_ps1_inv.png", - tiles_off = { top=true }, - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 11, 32, 6, 21 }, -- Console - { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip - { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip - { 5, 0, 4, 5, 2, 5 }, -- Controller 1 Center - { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip - { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip - { 22, 0, 4, 5, 2, 5 } -- Controller 2 Center - }) -}) - --- Sony PlayStation 2 lookalike -computer.register("computer:slaystation2", { - description = S("Pony SlayStation 2"), - inventory_image = "computer_ps2_inv.png", - tiles_off = { front=true }, - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 2, 2, 11, 28, 3, 19 }, -- Console (Upper part) - { 2, 0, 11, 26, 2, 19 }, -- Console (Lower part) - { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip - { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip - { 5, 0, 1, 5, 2, 8 }, -- Controller 1 Center - { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip - { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip - { 22, 0, 1, 5, 2, 8 } -- Controller 2 Center - }) -}) - --- Sinclair ZX Spectrum lookalike -computer.register("computer:specter", { - description = S("SX Specter"), - inventory_image = "computer_specter_inv.png", - tiles_off = { }, - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 3, 0, 0, 26, 4, 17 }, -- Keyboard - { 18, 0, 18, 12, 6, 14 } -- Tape Player - }) -}) - --- Nintendo Wii lookalike -computer.register("computer:wee", { - description = S("Nientiendo Wee"), - inventory_image = "computer_wii_inv.png", - tiles_off = { front=true }, - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 11, 0, 3, 10, 6, 26 }, -- Base - { 12, 6, 4, 8, 22, 24 } -- Top - }) -}) - --- Apple iPad lookalike -minetest.register_node("computer:piepad", { - description = S("Snapple Piepad"), - drawtype = "signlike", - tiles = {"computer_piepad_inv.png"}, - inventory_image = "computer_piepad_inv.png", - wield_image = "computer_piepad_inv.png", - paramtype = "light", - paramtype2 = "wallmounted", - light_source = 8, - walkable = false, - groups = {oddly_breakable_by_hand=2}, - selection_box = {type = "wallmounted"}, - sounds = default.node_sound_wood_defaults() -}) - --- Commodore 64 lookalike -computer.register("computer:admiral64", { - description = S("Admiral64"), - inventory_image = "computer_ad64_inv.png", - tiles_off = { }, - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 0, 32, 4, 18 } -- Keyboard - }) -}) - --- Commodore 128 lookalike -computer.register("computer:admiral128", { - description = S("Admiral128"), - inventory_image = "computer_ad128_inv.png", - tiles_off = { }, - node_box = computer.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 0, 32, 4, 27 } -- Keyboard - }) -}) - --- XBox lookalike -computer.register("computer:hueg_box", { - description = S("HUEG Box"), - tiles_off = { }, - node_box = computer.pixelnodebox(16, { - -- X Y Z W H L - { 0, 0, 7, 16, 6, 9 }, -- Console - { 2, 0, 1, 11, 3, 6 }, -- Controller - { 2, 0, 0, 2, 3, 1 }, - { 11, 0, 0, 2, 3, 1 }, - }) -}) - --- Generic Flat Screen LCD (16x9) with keyboard -local mo_sbox = { - type = "fixed", - fixed = { -0.5, -0.5, -0.43, 0.5, 0.2, 0.25 } -} - -minetest.register_node("computer:monitor", { - description = S("Monitor and keyboard"), - inventory_image = "computer_monitor_inv.png", - drawtype = "mesh", - mesh = "computer_monitor.obj", - tiles = {"computer_black.png", "monitor_plastic.png", "computer_black.png", "monitor_plastic.png"}, - paramtype = "light", - paramtype2 = "facedir", - walkable = false, - groups = {snappy=3}, - selection_box = mo_sbox, - on_rightclick = function(pos, node, clicker, itemstack) - node.name = "computer:monitor_on" - minetest.set_node(pos, node) - return itemstack - end -}) - -minetest.register_node("computer:monitor_on", { - drawtype = "mesh", - mesh = "computer_monitor.obj", - tiles = {"monitor_display.png^[transformFX", "monitor_plastic.png", "computer_black.png", "monitor_plastic.png"}, - paramtype = "light", - paramtype2 = "facedir", - light_source = 9, - walkable = false, - groups = {snappy=3, not_in_creative_inventory=1}, - selection_box = mo_sbox, - drop = "computer:monitor", - on_rightclick = function(pos, node, clicker, itemstack) - node.name = "computer:monitor" - minetest.set_node(pos, node) - return itemstack - end -}) - -minetest.register_alias("computer:monitor_bios", "computer:monitor") -minetest.register_alias("computer:monitor_loading", "computer:monitor") -minetest.register_alias("computer:monitor_login", "computer:monitor") -minetest.register_alias("computer:monitor_desktop", "computer:monitor") - ---WIFI Router (linksys look-a-like) -minetest.register_node("computer:router", { - description = S("WIFI Router"), - inventory_image = "computer_router_inv.png", - tiles = { - "computer_router_t.png", - "computer_router_bt.png", - "computer_router_l.png", - "computer_router_r.png", - "computer_router_b.png", - { - name = "computer_router_f_animated.png", - animation = {type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0} - }, - }, --"computer_router_f.png"}, - paramtype = "light", - paramtype2 = "facedir", - walkable = false, - groups = {snappy=3}, - sound = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.25, -0.5, -0.0625, 0.25, -0.375, 0.3125}, - {-0.1875, -0.4375, 0.3125, -0.125, -0.1875, 0.375}, - {0.125, -0.4375, 0.3125, 0.1875, -0.1875, 0.375}, - {-0.0625, -0.4375, 0.3125, 0.0625, -0.25, 0.375} - } - } -}) - -local pct_cbox = { - type = "fixed", - fixed = { -0.1875, -0.5, -0.36, 0.1875, 0.34, 0.46 } -} - ---Modern PC Tower -minetest.register_node("computer:tower", { - description = S("Computer Tower"), - inventory_image = "computer_tower_inv.png", - drawtype = "mesh", - mesh = "computer_tower.obj", - tiles = {"computer_tower.png"}, - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - sound = default.node_sound_wood_defaults(), - selection_box = pct_cbox, - collision_box = pct_cbox -}) - -minetest.register_alias("computer:tower_on", "computer:tower") - ---Rack Server -minetest.register_node("computer:server", { - drawtype = "nodebox", - description = S("Rack Server"), - tiles = { - 'computer_server_t.png', - 'computer_server_bt.png', - 'computer_server_l.png', - 'computer_server_r.png', - 'computer_server_bt.png', - 'computer_server_f_off.png' - }, - inventory_image = "computer_server_inv.png", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3}, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} - }, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} - }, - sounds = default.node_sound_wood_defaults(), - on_rightclick = function(pos, node, clicker, itemstack) - node.name = "computer:server_on" - minetest.set_node(pos, node) - return itemstack - end, - on_place = function(itemstack, placer, pointed_thing) - local pos = pointed_thing.above - if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then - minetest.chat_send_player( placer:get_player_name(), - S("Not enough vertical space to place a server!" )) - return itemstack - end - return minetest.item_place(itemstack, placer, pointed_thing) - end -}) - -minetest.register_node("computer:server_on", { - drawtype = "nodebox", - tiles = { - 'computer_server_t.png', - 'computer_server_bt.png', - 'computer_server_l.png', - 'computer_server_r.png', - 'computer_server_bt.png', - 'computer_server_f_on.png', - }, - inventory_image = "computer_server_inv.png", - paramtype = "light", - paramtype2 = "facedir", - groups = {snappy=3,not_in_creative_inventory=1}, - selection_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} - }, - node_box = { - type = "fixed", - fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} - }, - sounds = default.node_sound_wood_defaults(), - drop = 'computer:server', - on_rightclick = function(pos, node, clicker, itemstack) - node.name = "computer:server" - minetest.set_node(pos, node) - return itemstack - end -}) diff --git a/mods/computer/mod.conf b/mods/computer/mod.conf deleted file mode 100644 index 83fb7529..00000000 --- a/mods/computer/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = computer -depends = default, basic_materials, unifieddyes -optional_depends = screwdriver diff --git a/mods/computer/printers.lua b/mods/computer/printers.lua deleted file mode 100644 index f4357eae..00000000 --- a/mods/computer/printers.lua +++ /dev/null @@ -1,90 +0,0 @@ --- Printers of some kind or another - -local S = minetest.get_translator("computer") - -minetest.register_node("computer:printer", { - description = S("Printer-Scanner Combo"), - inventory_image = "computer_printer_inv.png", - tiles = {"computer_printer_t.png","computer_printer_bt.png","computer_printer_l.png", - "computer_printer_r.png","computer_printer_b.png","computer_printer_f.png"}, - paramtype = "light", - paramtype2 = "facedir", - walkable = true, - groups = {snappy=3}, - sound = default.node_sound_wood_defaults(), - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.4375, -0.3125, -0.125, 0.4375, -0.0625, 0.375}, - {-0.4375, -0.5, -0.125, 0.4375, -0.4375, 0.375}, - {-0.4375, -0.5, -0.125, -0.25, -0.0625, 0.375}, - {0.25, -0.5, -0.125, 0.4375, -0.0625, 0.375}, - {-0.4375, -0.5, -0.0625, 0.4375, -0.0625, 0.375}, - {-0.375, -0.4375, 0.25, 0.375, -0.0625, 0.4375}, - {-0.25, -0.25, 0.4375, 0.25, 0.0625, 0.5}, - {-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0} - }, - }, -}) - --- "bedflinger" style 3D Printer (Prusa i3 or equivalent) - -local cbox = { - type = "fixed", - fixed = {-0.25, -0.25, -0.5, 0.3, 0.3, 0.25 } -} - -minetest.register_node("computer:3dprinter_bedflinger", { - description = S('3D Printer ("bedflinger" design)'), - inventory_image = "computer_3dprinter_bedflinger_inv.png", - tiles = { - { name = "computer_3dprinter.png", color = 0xffffffff }, - "computer_3dprinter_filament.png" - }, - paramtype = "light", - walkable = true, - groups = {snappy=3, ud_param2_colorable = 1}, - sound = default.node_sound_wood_defaults(), - drawtype = "mesh", - mesh = "computer_3dprinter_bedflinger.obj", - paramtype2 = "colorwallmounted", - palette = "unifieddyes_palette_colorwallmounted.png", - selection_box = cbox, - collision_box = cbox, - after_place_node = function(pos, placer, itemstack, pointed_thing) - unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - end, - on_dig = unifieddyes.on_dig, - on_rotate = unifieddyes.fix_after_screwdriver_nsew, -}) - --- COreXY style printer (Hypercube or similar) - -cbox = { - type = "fixed", - fixed = {-0.4375, -0.5, -0.5, 0.4375, 0.5, 0.375 } -} - -minetest.register_node("computer:3dprinter_corexy", { - description = S('3D Printer (CoreXY design)'), - tiles = { - { name = "computer_3dprinter.png", color = 0xffffffff }, - "computer_3dprinter_filament.png" - }, - paramtype = "light", - walkable = true, - groups = {snappy=3, ud_param2_colorable = 1}, - sound = default.node_sound_wood_defaults(), - drawtype = "mesh", - mesh = "computer_3dprinter_corexy.obj", - paramtype2 = "colorwallmounted", - palette = "unifieddyes_palette_colorwallmounted.png", - selection_box = cbox, - collision_box = cbox, - after_place_node = function(pos, placer, itemstack, pointed_thing) - unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) - end, - on_dig = unifieddyes.on_dig, - on_rotate = unifieddyes.fix_after_screwdriver_nsew, -}) diff --git a/mods/computer/textures/homedecor_plastic_base.png b/mods/computer/textures/homedecor_plastic_base.png deleted file mode 100644 index 510af8ee..00000000 Binary files a/mods/computer/textures/homedecor_plastic_base.png and /dev/null differ diff --git a/mods/computer/textures/homedecor_plastic_base_inv.png b/mods/computer/textures/homedecor_plastic_base_inv.png deleted file mode 100644 index 414c902e..00000000 Binary files a/mods/computer/textures/homedecor_plastic_base_inv.png and /dev/null differ diff --git a/mods/computer/textures/homedecor_plastic_sheeting.png b/mods/computer/textures/homedecor_plastic_sheeting.png deleted file mode 100644 index 232d27bd..00000000 Binary files a/mods/computer/textures/homedecor_plastic_sheeting.png and /dev/null differ diff --git a/mods/computer/.luacheckrc b/mods/computers/.luacheckrc similarity index 100% rename from mods/computer/.luacheckrc rename to mods/computers/.luacheckrc diff --git a/mods/computer/CHANGES.txt b/mods/computers/CHANGES.txt similarity index 100% rename from mods/computer/CHANGES.txt rename to mods/computers/CHANGES.txt diff --git a/mods/computer/README.txt b/mods/computers/README.txt similarity index 67% rename from mods/computer/README.txt rename to mods/computers/README.txt index beed59e6..f7fccdef 100644 --- a/mods/computer/README.txt +++ b/mods/computers/README.txt @@ -17,21 +17,27 @@ For now just use creative mode or the `/give' or `/giveme' chat commands These are the items currently defined by this mod: -computer:printer (printer scanner combo) -computer:server (rack server) -computer:tower (modern type) -computer:monitor (LCD with keyboard) -computer:router (wifi type) -computer:babytower -computer:shefriendSOO -computer:slaystation -computer:vanio -computer:spectre -computer:slaystation2 -computer:admiral64 -computer:admiral128 +"computers:shefriendSOO", +"computers:vanio", +"computers:vanio_off", +"computers:slaystation", +"computers:slaystation2", +"computers:specter", +"computers:wee", +"computers:piepad", +"computers:admiral64", +"computers:admiral128", +"computers:hueg_box", +"computers:monitor", +"computers:monitor_on", +"computers:router", +"computers:tower", +"computers:server", +"computers:server_on", +"computers:printer", +"computers:tetris_arcade", -There's also a `computer:computer' alias to `computer:babytower'. +There's also a `computers:computer' alias to `computers:babytower'. Thanks to all the people in the forums and the #minetest IRC channel for their support and suggestions; in no particular order: diff --git a/mods/computer/TODO.txt b/mods/computers/TODO.txt similarity index 100% rename from mods/computer/TODO.txt rename to mods/computers/TODO.txt diff --git a/mods/computers/aliases.lua b/mods/computers/aliases.lua new file mode 100644 index 00000000..bd3e1fd1 --- /dev/null +++ b/mods/computers/aliases.lua @@ -0,0 +1,24 @@ +minetest.register_alias("computer:shefriendSOO", "computers:shefriendSOO") +minetest.register_alias("computer:vanio", "computers:vanio") +minetest.register_alias("computer:vanio_off", "computers:vanio_off") +minetest.register_alias("computer:slaystation", "computers:slaystation") +minetest.register_alias("computer:slaystation2", "computers:slaystation2") +minetest.register_alias("computer:specter", "computers:specter") +minetest.register_alias("computer:wee", "computers:wee") +minetest.register_alias("computer:piepad", "computers:piepad") +minetest.register_alias("computer:admiral64", "computers:admiral64") +minetest.register_alias("computer:admiral128", "computers:admiral128") +minetest.register_alias("computer:hueg_box", "computers:hueg_box") +minetest.register_alias("computer:monitor", "computers:monitor") +minetest.register_alias("computer:monitor_on", "computers:monitor_on") +minetest.register_alias("computer:monitor_bios", "computers:monitor") +minetest.register_alias("computer:monitor_loading", "computers:monitor") +minetest.register_alias("computer:monitor_login", "computers:monitor") +minetest.register_alias("computer:monitor_desktop", "computers:monitor") +minetest.register_alias("computer:router", "computers:router") +minetest.register_alias("computer:tower", "computers:tower") +minetest.register_alias("computer:tower_on", "computers:tower") +minetest.register_alias("computer:server", "computers:server") +minetest.register_alias("computer:server_on", "computers:server_on") +minetest.register_alias("computer:printer", "computers:printer") +minetest.register_alias("computer:tetris_arcade", "computers:tetris_arcade") diff --git a/mods/computers/computers.lua b/mods/computers/computers.lua new file mode 100644 index 00000000..0853e6b5 --- /dev/null +++ b/mods/computers/computers.lua @@ -0,0 +1,300 @@ +local S = minetest.get_translator("computers") + +-- Amiga 500 lookalike +computers.register("computers:shefriendSOO", { + description = S("SheFriendSOO"), + tiles_off = { front=true }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 17, 32, 32, 12 }, -- Monitor Screen + { 3, 3, 29, 26, 26, 3 }, -- Monitor Tube + { 0, 0, 0, 32, 4, 17 } -- Keyboard + }) +}) + +-- Some generic laptop +minetest.register_node("computers:vanio", { + drawtype = "mesh", + mesh = "computers_laptop.obj", + description = S("Pony Vanio"), + inventory_image = "computers_laptop_inv.png", + tiles = {"computers_laptop.png"}, + paramtype = "light", + paramtype2 = "facedir", + light_source = 4, + groups = {snappy=3}, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.35, -0.5, -0.35, 0.35, 0.05, 0.35}, + }, + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computers:vanio_off" + minetest.set_node(pos, node) + return itemstack + end +}) + +minetest.register_node("computers:vanio_off", { + drawtype = "mesh", + mesh = "computers_laptop_closed.obj", + tiles = {"computers_laptop.png"}, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3, not_in_creative_inventory=1}, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.35, -0.5, -0.35, 0.35, -0.4, 0.25}, + }, + drop = "computers:vanio", + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computers:vanio" + minetest.set_node(pos, node) + return itemstack + end +}) + +-- Sinclair ZX Spectrum lookalike +computers.register("computers:specter", { + description = S("SX Specter"), + inventory_image = "computers_specter_inv.png", + tiles_off = { }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 3, 0, 0, 26, 4, 17 }, -- Keyboard + { 18, 0, 18, 12, 6, 14 } -- Tape Player + }) +}) + +-- Apple iPad lookalike +minetest.register_node("computers:piepad", { + description = S("Snapple Piepad"), + drawtype = "signlike", + tiles = {"computers_piepad_inv.png"}, + inventory_image = "computers_piepad_inv.png", + wield_image = "computers_piepad_inv.png", + paramtype = "light", + paramtype2 = "wallmounted", + light_source = 8, + walkable = false, + groups = {oddly_breakable_by_hand=2}, + selection_box = {type = "wallmounted"}, + sounds = default.node_sound_wood_defaults() +}) + +-- Commodore 64 lookalike +computers.register("computers:admiral64", { + description = S("Admiral64"), + inventory_image = "computers_ad64_inv.png", + tiles_off = { }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 0, 32, 4, 18 } -- Keyboard + }) +}) + +-- Commodore 128 lookalike +computers.register("computers:admiral128", { + description = S("Admiral128"), + inventory_image = "computers_ad128_inv.png", + tiles_off = { }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 0, 32, 4, 27 } -- Keyboard + }) +}) + +-- Generic Flat Screen LCD (16x9) with keyboard +local mo_sbox = { + type = "fixed", + fixed = { -0.5, -0.5, -0.43, 0.5, 0.2, 0.25 } +} + +minetest.register_node("computers:monitor", { + description = S("Monitor and keyboard"), + inventory_image = "computers_monitor_inv.png", + drawtype = "mesh", + mesh = "computers_monitor.obj", + tiles = {"computers_black.png", "computers_monitor_plastic.png", "computers_black.png", "computers_monitor_plastic.png"}, + paramtype = "light", + paramtype2 = "facedir", + walkable = false, + groups = {snappy=3}, + selection_box = mo_sbox, + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computers:monitor_on" + minetest.set_node(pos, node) + return itemstack + end +}) + +minetest.register_node("computers:monitor_on", { + drawtype = "mesh", + mesh = "computers_monitor.obj", + tiles = {"computers_monitor_display.png^[transformFX", "computers_monitor_plastic.png", "computers_black.png", "computers_monitor_plastic.png"}, + paramtype = "light", + paramtype2 = "facedir", + light_source = 9, + walkable = false, + groups = {snappy=3, not_in_creative_inventory=1}, + selection_box = mo_sbox, + drop = "computers:monitor", + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computers:monitor" + minetest.set_node(pos, node) + return itemstack + end +}) + +--WIFI Router (linksys look-a-like) +minetest.register_node("computers:router", { + description = S("WIFI Router"), + inventory_image = "computers_router_inv.png", + tiles = { + "computers_router_t.png", + "computers_router_bt.png", + "computers_router_l.png", + "computers_router_r.png", + "computers_router_b.png", + { + name = "computers_router_f_animated.png", + animation = {type="vertical_frames", aspect_w=32, aspect_h=32, length=1.0} + }, + }, --"computers_router_f.png"}, + paramtype = "light", + paramtype2 = "facedir", + walkable = false, + groups = {snappy=3}, + sound = default.node_sound_wood_defaults(), + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.25, -0.5, -0.0625, 0.25, -0.375, 0.3125}, + {-0.1875, -0.4375, 0.3125, -0.125, -0.1875, 0.375}, + {0.125, -0.4375, 0.3125, 0.1875, -0.1875, 0.375}, + {-0.0625, -0.4375, 0.3125, 0.0625, -0.25, 0.375} + } + } +}) + +local pct_cbox = { + type = "fixed", + fixed = { -0.1875, -0.5, -0.36, 0.1875, 0.34, 0.46 } +} + +--Modern PC Tower +minetest.register_node("computers:tower", { + description = S("Computer Tower"), + inventory_image = "computers_tower_inv.png", + drawtype = "mesh", + mesh = "computers_tower.obj", + tiles = {"computers_tower.png"}, + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + sound = default.node_sound_wood_defaults(), + selection_box = pct_cbox, + collision_box = pct_cbox +}) + +--Rack Server +minetest.register_node("computers:server", { + drawtype = "nodebox", + description = S("Rack Server"), + tiles = { + 'computers_server_t.png', + 'computers_server_bt.png', + 'computers_server_l.png', + 'computers_server_r.png', + 'computers_server_bt.png', + 'computers_server_f_off.png' + }, + inventory_image = "computers_server_inv.png", + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} + }, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} + }, + sounds = default.node_sound_wood_defaults(), + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computers:server_on" + minetest.set_node(pos, node) + return itemstack + end, + on_place = function(itemstack, placer, pointed_thing) + local pos = pointed_thing.above + if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name ~= "air" then + minetest.chat_send_player( placer:get_player_name(), + S("Not enough vertical space to place a server!" )) + return itemstack + end + return minetest.item_place(itemstack, placer, pointed_thing) + end +}) + +minetest.register_node("computers:server_on", { + drawtype = "nodebox", + tiles = { + 'computers_server_t.png', + 'computers_server_bt.png', + 'computers_server_l.png', + 'computers_server_r.png', + 'computers_server_bt.png', + 'computers_server_f_on.png', + }, + inventory_image = "computers_server_inv.png", + paramtype = "light", + paramtype2 = "facedir", + groups = {snappy=3,not_in_creative_inventory=1}, + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} + }, + node_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} + }, + sounds = default.node_sound_wood_defaults(), + drop = 'computers:server', + on_rightclick = function(pos, node, clicker, itemstack) + node.name = "computers:server" + minetest.set_node(pos, node) + return itemstack + end +}) + +-- Printer of some kind + +minetest.register_node("computers:printer", { + description = S("Printer-Scanner Combo"), + inventory_image = "computers_printer_inv.png", + tiles = {"computers_printer_t.png","computers_printer_bt.png","computers_printer_l.png", + "computers_printer_r.png","computers_printer_b.png","computers_printer_f.png"}, + paramtype = "light", + paramtype2 = "facedir", + walkable = true, + groups = {snappy=3}, + sound = default.node_sound_wood_defaults(), + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + {-0.4375, -0.3125, -0.125, 0.4375, -0.0625, 0.375}, + {-0.4375, -0.5, -0.125, 0.4375, -0.4375, 0.375}, + {-0.4375, -0.5, -0.125, -0.25, -0.0625, 0.375}, + {0.25, -0.5, -0.125, 0.4375, -0.0625, 0.375}, + {-0.4375, -0.5, -0.0625, 0.4375, -0.0625, 0.375}, + {-0.375, -0.4375, 0.25, 0.375, -0.0625, 0.4375}, + {-0.25, -0.25, 0.4375, 0.25, 0.0625, 0.5}, + {-0.25, -0.481132, -0.3125, 0.25, -0.4375, 0} + }, + }, +}) diff --git a/mods/computer/tetris.lua b/mods/computers/gaming.lua similarity index 71% rename from mods/computer/tetris.lua rename to mods/computers/gaming.lua index c8031c3b..cab3eff7 100644 --- a/mods/computer/tetris.lua +++ b/mods/computers/gaming.lua @@ -1,4 +1,68 @@ -local S = minetest.get_translator("computer") +local S = minetest.get_translator("computers") + +-- Sony PlayStation lookalike +computers.register("computers:slaystation", { + description = S("Pony SlayStation"), + inventory_image = "computers_ps1_inv.png", + tiles_off = { top=true }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 11, 32, 6, 21 }, -- Console + { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip + { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip + { 5, 0, 4, 5, 2, 5 }, -- Controller 1 Center + { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip + { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip + { 22, 0, 4, 5, 2, 5 } -- Controller 2 Center + }) +}) + +-- Sony PlayStation 2 lookalike +computers.register("computers:slaystation2", { + description = S("Pony SlayStation 2"), + inventory_image = "computers_ps2_inv.png", + tiles_off = { front=true }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 2, 2, 11, 28, 3, 19 }, -- Console (Upper part) + { 2, 0, 11, 26, 2, 19 }, -- Console (Lower part) + { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip + { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip + { 5, 0, 1, 5, 2, 8 }, -- Controller 1 Center + { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip + { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip + { 22, 0, 1, 5, 2, 8 } -- Controller 2 Center + }) +}) + +-- Nintendo Wii lookalike +computers.register("computers:wee", { + description = S("Nientiendo Wee"), + inventory_image = "computers_wii_inv.png", + tiles_off = { front=true }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 11, 0, 3, 10, 6, 26 }, -- Base + { 12, 6, 4, 8, 22, 24 } -- Top + }) +}) + +-- XBox lookalike +computers.register("computers:hueg_box", { + description = S("HUEG Box"), + tiles_off = { }, + node_box = computers.pixelnodebox(16, { + -- X Y Z W H L + { 0, 0, 7, 16, 6, 9 }, -- Console + { 2, 0, 1, 11, 3, 6 }, -- Controller + { 2, 0, 0, 2, 3, 1 }, + { 11, 0, 0, 2, 3, 1 }, + }) +}) + + + +-- Tetris arcade machine local shapes = { { { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } }, @@ -27,10 +91,10 @@ local shapes = { { x = {0, 1, 2, 1}, y = {1, 1, 1, 2} }, { x = {0, 1, 1, 1}, y = {1, 0, 1, 2} } } } -local colors = { "computer_cyan.png", "computer_magenta.png", "computer_red.png", - "computer_blue.png", "computer_green.png", "computer_orange.png", "computer_yellow.png" } +local colors = { "computers_cyan.png", "computers_magenta.png", "computers_red.png", + "computers_blue.png", "computers_green.png", "computers_orange.png", "computers_yellow.png" } -local background = "image[0,0;3.55,6.66;computer_black.png]" +local background = "image[0,0;3.55,6.66;computers_black.png]" local buttons = "button[3,4.5;0.6,0.6;left;<]" .."button[3.6,4.5;0.6,0.6;rotateleft;"..minetest.formspec_escape(S("L")).."]" .."button[4.2,4.5;0.6,0.6;down;v]" @@ -242,11 +306,11 @@ local function step(pos, fields) return run end -minetest.register_node("computer:tetris_arcade", { +minetest.register_node("computers:tetris_arcade", { description=S("Tetris Arcade"), drawtype = "mesh", - mesh = "tetris_arcade.obj", - tiles = {"tetris_arcade.png"}, + mesh = "computers_tetris_arcade.obj", + tiles = {"computers_tetris_arcade.png"}, paramtype = "light", paramtype2 = "facedir", groups = {snappy=3}, @@ -282,7 +346,7 @@ minetest.register_node("computer:tetris_arcade", { return itemstack end local dir = placer:get_look_dir() - local node = {name="computer:tetris_arcade", param1=0, param2 = minetest.dir_to_facedir(dir)} + local node = {name="computers:tetris_arcade", param1=0, param2 = minetest.dir_to_facedir(dir)} minetest.set_node(pos, node) itemstack:take_item() return itemstack diff --git a/mods/computer/init.lua b/mods/computers/init.lua similarity index 90% rename from mods/computer/init.lua rename to mods/computers/init.lua index 8c6ef71d..c017277a 100644 --- a/mods/computer/init.lua +++ b/mods/computers/init.lua @@ -1,6 +1,6 @@ -computer = {} +computers = {} -computer.register = function (name, def) +computers.register = function (name, def) if (name:sub(1, 1) == ":") then name = name:sub(2) end local modname, basename = name:match("^([^:]+):(.*)") local TEXPFX = modname.."_"..basename.."_" @@ -60,7 +60,7 @@ computer.register = function (name, def) }) end -computer.register_handheld = function (name, def) +computers.register_handheld = function (name, def) if (name:sub(1, 1) == ":") then name = name:sub(2) end local modname, basename = name:match("^([^:]+):(.*)") local TEXPFX = modname.."_"..basename.."_inv" @@ -72,7 +72,7 @@ computer.register_handheld = function (name, def) }) end -computer.pixelnodebox = function (size, boxes) +computers.pixelnodebox = function (size, boxes) local fixed = { } for _, box in ipairs(boxes) do local x, y, z, w, h, l = unpack(box) @@ -91,8 +91,8 @@ computer.pixelnodebox = function (size, boxes) } end -local MODPATH = minetest.get_modpath("computer") +local MODPATH = minetest.get_modpath("computers") dofile(MODPATH.."/computers.lua") -dofile(MODPATH.."/printers.lua") dofile(MODPATH.."/recipes.lua") -dofile(MODPATH.."/tetris.lua") +dofile(MODPATH.."/gaming.lua") +dofile(MODPATH.."/aliases.lua") diff --git a/mods/computer/locale/computer.de.tr b/mods/computers/locale/computers.de.tr similarity index 88% rename from mods/computer/locale/computer.de.tr rename to mods/computers/locale/computers.de.tr index 437c64d2..0d0485cf 100644 --- a/mods/computer/locale/computer.de.tr +++ b/mods/computers/locale/computers.de.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter=Z Inspektor SheFriendSOO=Freundin S00 Snapple Piepad=Apfel-Ei-Pat WIFI Router=WiFi-Router - -### printers.lua ### - -3D Printer ("bedflinger")=3D Drucker ("Bettschubser") Printer-Scanner Combo=Multifunktionsdrucker ### tetris.lua ### diff --git a/mods/computer/locale/computer.es.tr b/mods/computers/locale/computers.es.tr similarity index 89% rename from mods/computer/locale/computer.es.tr rename to mods/computers/locale/computers.es.tr index 66ec244b..f0d5a4d4 100644 --- a/mods/computer/locale/computer.es.tr +++ b/mods/computers/locale/computers.es.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Enrutador WIFI - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Impresora y escáner combinados ### tetris.lua ### diff --git a/mods/computer/locale/computer.fr.tr b/mods/computers/locale/computers.fr.tr similarity index 89% rename from mods/computer/locale/computer.fr.tr rename to mods/computers/locale/computers.fr.tr index 4b170d9b..91784b49 100644 --- a/mods/computer/locale/computer.fr.tr +++ b/mods/computers/locale/computers.fr.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Routeur WiFi - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Imprimante multi-fonction ### tetris.lua ### diff --git a/mods/computer/locale/computer.it.tr b/mods/computers/locale/computers.it.tr similarity index 86% rename from mods/computer/locale/computer.it.tr rename to mods/computers/locale/computers.it.tr index b8a72ee5..0a639cbb 100644 --- a/mods/computer/locale/computer.it.tr +++ b/mods/computers/locale/computers.it.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router= - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo= ### tetris.lua ### diff --git a/mods/computer/locale/computer.ms.tr b/mods/computers/locale/computers.ms.tr similarity index 89% rename from mods/computer/locale/computer.ms.tr rename to mods/computers/locale/computers.ms.tr index 89841cc0..e33788e5 100644 --- a/mods/computer/locale/computer.ms.tr +++ b/mods/computers/locale/computers.ms.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Penghala WIFI - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Pencetak Semua Dalam Satu ### tetris.lua ### diff --git a/mods/computer/locale/computer.pt.tr b/mods/computers/locale/computers.pt.tr similarity index 89% rename from mods/computer/locale/computer.pt.tr rename to mods/computers/locale/computers.pt.tr index f2824ed8..caad3ceb 100644 --- a/mods/computer/locale/computer.pt.tr +++ b/mods/computers/locale/computers.pt.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Roteador WIFI - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Tudo em Um Impressora-Scaner ### tetris.lua ### diff --git a/mods/computer/locale/computer.pt_BR.tr b/mods/computers/locale/computers.pt_BR.tr similarity index 89% rename from mods/computer/locale/computer.pt_BR.tr rename to mods/computers/locale/computers.pt_BR.tr index f2824ed8..caad3ceb 100644 --- a/mods/computer/locale/computer.pt_BR.tr +++ b/mods/computers/locale/computers.pt_BR.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=Roteador WIFI - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=Tudo em Um Impressora-Scaner ### tetris.lua ### diff --git a/mods/computer/locale/computer.ru.tr b/mods/computers/locale/computers.ru.tr similarity index 91% rename from mods/computer/locale/computer.ru.tr rename to mods/computers/locale/computers.ru.tr index 3e835f21..a5cca85b 100644 --- a/mods/computer/locale/computer.ru.tr +++ b/mods/computers/locale/computers.ru.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=WIFI-роутер - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=МФУ ### tetris.lua ### diff --git a/mods/computer/locale/computer.zh_CN.tr b/mods/computers/locale/computers.zh_CN.tr similarity index 89% rename from mods/computer/locale/computer.zh_CN.tr rename to mods/computers/locale/computers.zh_CN.tr index c725e412..b4c67294 100644 --- a/mods/computer/locale/computer.zh_CN.tr +++ b/mods/computers/locale/computers.zh_CN.tr @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router=无线路由器 - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo=打印扫描一体机 ### tetris.lua ### diff --git a/mods/computer/locale/template.txt b/mods/computers/locale/template.txt similarity index 84% rename from mods/computer/locale/template.txt rename to mods/computers/locale/template.txt index 2e84c9b5..ce997f61 100644 --- a/mods/computer/locale/template.txt +++ b/mods/computers/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: computer +# textdomain: computers ### computers.lua ### @@ -18,10 +18,6 @@ SX Specter= SheFriendSOO= Snapple Piepad= WIFI Router= - -### printers.lua ### - -3D Printer ("bedflinger")= Printer-Scanner Combo= ### tetris.lua ### diff --git a/mods/computers/mod.conf b/mods/computers/mod.conf new file mode 100644 index 00000000..64381f03 --- /dev/null +++ b/mods/computers/mod.conf @@ -0,0 +1,3 @@ +name = computers +depends = default, basic_materials +optional_depends = screwdriver diff --git a/mods/computer/models/computer_laptop.obj b/mods/computers/models/computers_laptop.obj similarity index 100% rename from mods/computer/models/computer_laptop.obj rename to mods/computers/models/computers_laptop.obj diff --git a/mods/computer/models/computer_laptop_closed.obj b/mods/computers/models/computers_laptop_closed.obj similarity index 100% rename from mods/computer/models/computer_laptop_closed.obj rename to mods/computers/models/computers_laptop_closed.obj diff --git a/mods/computer/models/computer_monitor.obj b/mods/computers/models/computers_monitor.obj similarity index 100% rename from mods/computer/models/computer_monitor.obj rename to mods/computers/models/computers_monitor.obj diff --git a/mods/computer/models/tetris_arcade.obj b/mods/computers/models/computers_tetris_arcade.obj similarity index 100% rename from mods/computer/models/tetris_arcade.obj rename to mods/computers/models/computers_tetris_arcade.obj diff --git a/mods/computer/models/computer_tower.obj b/mods/computers/models/computers_tower.obj similarity index 100% rename from mods/computer/models/computer_tower.obj rename to mods/computers/models/computers_tower.obj diff --git a/mods/computer/recipes.lua b/mods/computers/recipes.lua similarity index 85% rename from mods/computer/recipes.lua rename to mods/computers/recipes.lua index f8828760..75eafb0c 100644 --- a/mods/computer/recipes.lua +++ b/mods/computers/recipes.lua @@ -1,7 +1,7 @@ -- Copyright (C) 2012-2013 Diego Martínez minetest.register_craft({ - output = "computer:shefriendSOO", + output = "computers:shefriendSOO", recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" }, @@ -10,7 +10,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:slaystation", + output = "computers:slaystation", recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "basic_materials:plastic_sheet", "group:wood", "basic_materials:plastic_sheet" } @@ -18,7 +18,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:vanio", + output = "computers:vanio", recipe = { { "basic_materials:plastic_sheet", "", "" }, { "default:glass", "", "" }, @@ -27,7 +27,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:specter", + output = "computers:specter", recipe = { { "", "", "basic_materials:plastic_sheet" }, { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, @@ -36,7 +36,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:slaystation2", + output = "computers:slaystation2", recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" } @@ -44,7 +44,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:admiral64", + output = "computers:admiral64", recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "group:wood", "group:wood", "group:wood" } @@ -52,7 +52,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:admiral128", + output = "computers:admiral128", recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } @@ -60,7 +60,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:wee", + output = "computers:wee", recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "basic_materials:plastic_sheet", "default:copper_ingot", "basic_materials:plastic_sheet" } @@ -68,7 +68,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:piepad", + output = "computers:piepad", recipe = { { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" } @@ -78,7 +78,7 @@ minetest.register_craft({ --new stuff minetest.register_craft({ - output = "computer:monitor", + output = "computers:monitor", recipe = { { "basic_materials:plastic_sheet", "default:glass","" }, { "basic_materials:plastic_sheet", "default:glass","" }, @@ -87,7 +87,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:router", + output = "computers:router", recipe = { { "default:steel_ingot","","" }, { "default:steel_ingot" ,"basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, @@ -96,7 +96,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:tower", + output = "computers:tower", recipe = { { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" }, { "basic_materials:plastic_sheet", "default:mese_crystal", "basic_materials:plastic_sheet" }, @@ -105,7 +105,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:printer", + output = "computers:printer", recipe = { { "basic_materials:plastic_sheet", "default:steel_ingot","" }, { "basic_materials:plastic_sheet", "default:mese_crystal", "basic_materials:plastic_sheet" }, @@ -114,7 +114,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:printer", + output = "computers:printer", recipe = { { "basic_materials:plastic_sheet", "default:steel_ingot","" }, { "basic_materials:plastic_sheet", "default:mese_crystal", "basic_materials:plastic_sheet" }, @@ -123,16 +123,16 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "computer:server", + output = "computers:server", recipe = { - { "computer:tower", "computer:tower", "computer:tower", }, - { "computer:tower", "computer:tower", "computer:tower" }, - { "computer:tower", "computer:tower", "computer:tower" } + { "computers:tower", "computers:tower", "computers:tower", }, + { "computers:tower", "computers:tower", "computers:tower" }, + { "computers:tower", "computers:tower", "computers:tower" } } }) minetest.register_craft({ - output = "computer:tetris_arcade", + output = "computers:tetris_arcade", recipe = { { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet", }, { "dye:black", "default:glass", "dye:black" }, diff --git a/mods/computer/textures/computer_ad128_inv.png b/mods/computers/textures/computers_ad128_inv.png similarity index 100% rename from mods/computer/textures/computer_ad128_inv.png rename to mods/computers/textures/computers_ad128_inv.png diff --git a/mods/computer/textures/computer_ad64_inv.png b/mods/computers/textures/computers_ad64_inv.png similarity index 100% rename from mods/computer/textures/computer_ad64_inv.png rename to mods/computers/textures/computers_ad64_inv.png diff --git a/mods/computer/textures/computer_admiral128_bk.png b/mods/computers/textures/computers_admiral128_bk.png similarity index 100% rename from mods/computer/textures/computer_admiral128_bk.png rename to mods/computers/textures/computers_admiral128_bk.png diff --git a/mods/computer/textures/computer_admiral128_bt.png b/mods/computers/textures/computers_admiral128_bt.png similarity index 100% rename from mods/computer/textures/computer_admiral128_bt.png rename to mods/computers/textures/computers_admiral128_bt.png diff --git a/mods/computer/textures/computer_admiral128_ft.png b/mods/computers/textures/computers_admiral128_ft.png similarity index 100% rename from mods/computer/textures/computer_admiral128_ft.png rename to mods/computers/textures/computers_admiral128_ft.png diff --git a/mods/computer/textures/computer_admiral128_lt.png b/mods/computers/textures/computers_admiral128_lt.png similarity index 100% rename from mods/computer/textures/computer_admiral128_lt.png rename to mods/computers/textures/computers_admiral128_lt.png diff --git a/mods/computer/textures/computer_admiral128_rt.png b/mods/computers/textures/computers_admiral128_rt.png similarity index 100% rename from mods/computer/textures/computer_admiral128_rt.png rename to mods/computers/textures/computers_admiral128_rt.png diff --git a/mods/computer/textures/computer_admiral128_tp.png b/mods/computers/textures/computers_admiral128_tp.png similarity index 100% rename from mods/computer/textures/computer_admiral128_tp.png rename to mods/computers/textures/computers_admiral128_tp.png diff --git a/mods/computer/textures/computer_admiral64_bk.png b/mods/computers/textures/computers_admiral64_bk.png similarity index 100% rename from mods/computer/textures/computer_admiral64_bk.png rename to mods/computers/textures/computers_admiral64_bk.png diff --git a/mods/computer/textures/computer_admiral64_bt.png b/mods/computers/textures/computers_admiral64_bt.png similarity index 100% rename from mods/computer/textures/computer_admiral64_bt.png rename to mods/computers/textures/computers_admiral64_bt.png diff --git a/mods/computer/textures/computer_admiral64_ft.png b/mods/computers/textures/computers_admiral64_ft.png similarity index 100% rename from mods/computer/textures/computer_admiral64_ft.png rename to mods/computers/textures/computers_admiral64_ft.png diff --git a/mods/computer/textures/computer_admiral64_lt.png b/mods/computers/textures/computers_admiral64_lt.png similarity index 100% rename from mods/computer/textures/computer_admiral64_lt.png rename to mods/computers/textures/computers_admiral64_lt.png diff --git a/mods/computer/textures/computer_admiral64_rt.png b/mods/computers/textures/computers_admiral64_rt.png similarity index 100% rename from mods/computer/textures/computer_admiral64_rt.png rename to mods/computers/textures/computers_admiral64_rt.png diff --git a/mods/computer/textures/computer_admiral64_tp.png b/mods/computers/textures/computers_admiral64_tp.png similarity index 100% rename from mods/computer/textures/computer_admiral64_tp.png rename to mods/computers/textures/computers_admiral64_tp.png diff --git a/mods/computer/textures/computer_black.png b/mods/computers/textures/computers_black.png similarity index 100% rename from mods/computer/textures/computer_black.png rename to mods/computers/textures/computers_black.png diff --git a/mods/computer/textures/computer_blue.png b/mods/computers/textures/computers_blue.png similarity index 100% rename from mods/computer/textures/computer_blue.png rename to mods/computers/textures/computers_blue.png diff --git a/mods/computer/textures/computer_computer_front_old.png b/mods/computers/textures/computers_computer_front_old.png similarity index 100% rename from mods/computer/textures/computer_computer_front_old.png rename to mods/computers/textures/computers_computer_front_old.png diff --git a/mods/computer/textures/computer_computer_top_old.png b/mods/computers/textures/computers_computer_top_old.png similarity index 100% rename from mods/computer/textures/computer_computer_top_old.png rename to mods/computers/textures/computers_computer_top_old.png diff --git a/mods/computer/textures/computer_cyan.png b/mods/computers/textures/computers_cyan.png similarity index 100% rename from mods/computer/textures/computer_cyan.png rename to mods/computers/textures/computers_cyan.png diff --git a/mods/computer/textures/computer_green.png b/mods/computers/textures/computers_green.png similarity index 100% rename from mods/computer/textures/computer_green.png rename to mods/computers/textures/computers_green.png diff --git a/mods/computer/textures/computer_hueg_box_bk.png b/mods/computers/textures/computers_hueg_box_bk.png similarity index 100% rename from mods/computer/textures/computer_hueg_box_bk.png rename to mods/computers/textures/computers_hueg_box_bk.png diff --git a/mods/computer/textures/computer_hueg_box_bt.png b/mods/computers/textures/computers_hueg_box_bt.png similarity index 100% rename from mods/computer/textures/computer_hueg_box_bt.png rename to mods/computers/textures/computers_hueg_box_bt.png diff --git a/mods/computer/textures/computer_hueg_box_ft.png b/mods/computers/textures/computers_hueg_box_ft.png similarity index 100% rename from mods/computer/textures/computer_hueg_box_ft.png rename to mods/computers/textures/computers_hueg_box_ft.png diff --git a/mods/computer/textures/computer_hueg_box_lt.png b/mods/computers/textures/computers_hueg_box_lt.png similarity index 100% rename from mods/computer/textures/computer_hueg_box_lt.png rename to mods/computers/textures/computers_hueg_box_lt.png diff --git a/mods/computer/textures/computer_hueg_box_rt.png b/mods/computers/textures/computers_hueg_box_rt.png similarity index 100% rename from mods/computer/textures/computer_hueg_box_rt.png rename to mods/computers/textures/computers_hueg_box_rt.png diff --git a/mods/computer/textures/computer_hueg_box_tp.png b/mods/computers/textures/computers_hueg_box_tp.png similarity index 100% rename from mods/computer/textures/computer_hueg_box_tp.png rename to mods/computers/textures/computers_hueg_box_tp.png diff --git a/mods/computer/textures/computer_laptop.png b/mods/computers/textures/computers_laptop.png similarity index 100% rename from mods/computer/textures/computer_laptop.png rename to mods/computers/textures/computers_laptop.png diff --git a/mods/computer/textures/computer_laptop_inv.png b/mods/computers/textures/computers_laptop_inv.png similarity index 100% rename from mods/computer/textures/computer_laptop_inv.png rename to mods/computers/textures/computers_laptop_inv.png diff --git a/mods/computer/textures/computer_magenta.png b/mods/computers/textures/computers_magenta.png similarity index 100% rename from mods/computer/textures/computer_magenta.png rename to mods/computers/textures/computers_magenta.png diff --git a/mods/computer/textures/monitor_display.png b/mods/computers/textures/computers_monitor_display.png similarity index 100% rename from mods/computer/textures/monitor_display.png rename to mods/computers/textures/computers_monitor_display.png diff --git a/mods/computer/textures/computer_monitor_inv.png b/mods/computers/textures/computers_monitor_inv.png similarity index 100% rename from mods/computer/textures/computer_monitor_inv.png rename to mods/computers/textures/computers_monitor_inv.png diff --git a/mods/computer/textures/monitor_plastic.png b/mods/computers/textures/computers_monitor_plastic.png similarity index 100% rename from mods/computer/textures/monitor_plastic.png rename to mods/computers/textures/computers_monitor_plastic.png diff --git a/mods/computer/textures/computer_orange.png b/mods/computers/textures/computers_orange.png similarity index 100% rename from mods/computer/textures/computer_orange.png rename to mods/computers/textures/computers_orange.png diff --git a/mods/computer/textures/computer_piepad_inv.png b/mods/computers/textures/computers_piepad_inv.png similarity index 100% rename from mods/computer/textures/computer_piepad_inv.png rename to mods/computers/textures/computers_piepad_inv.png diff --git a/mods/computer/textures/computer_piepad_inv_off.png b/mods/computers/textures/computers_piepad_inv_off.png similarity index 100% rename from mods/computer/textures/computer_piepad_inv_off.png rename to mods/computers/textures/computers_piepad_inv_off.png diff --git a/mods/computer/textures/computer_printer_b.png b/mods/computers/textures/computers_printer_b.png similarity index 100% rename from mods/computer/textures/computer_printer_b.png rename to mods/computers/textures/computers_printer_b.png diff --git a/mods/computer/textures/computer_printer_bt.png b/mods/computers/textures/computers_printer_bt.png similarity index 100% rename from mods/computer/textures/computer_printer_bt.png rename to mods/computers/textures/computers_printer_bt.png diff --git a/mods/computer/textures/computer_printer_f.png b/mods/computers/textures/computers_printer_f.png similarity index 100% rename from mods/computer/textures/computer_printer_f.png rename to mods/computers/textures/computers_printer_f.png diff --git a/mods/computer/textures/computer_printer_inv.png b/mods/computers/textures/computers_printer_inv.png similarity index 100% rename from mods/computer/textures/computer_printer_inv.png rename to mods/computers/textures/computers_printer_inv.png diff --git a/mods/computer/textures/computer_printer_l.png b/mods/computers/textures/computers_printer_l.png similarity index 100% rename from mods/computer/textures/computer_printer_l.png rename to mods/computers/textures/computers_printer_l.png diff --git a/mods/computer/textures/computer_printer_r.png b/mods/computers/textures/computers_printer_r.png similarity index 100% rename from mods/computer/textures/computer_printer_r.png rename to mods/computers/textures/computers_printer_r.png diff --git a/mods/computer/textures/computer_printer_t.png b/mods/computers/textures/computers_printer_t.png similarity index 100% rename from mods/computer/textures/computer_printer_t.png rename to mods/computers/textures/computers_printer_t.png diff --git a/mods/computer/textures/computer_ps1_inv.png b/mods/computers/textures/computers_ps1_inv.png similarity index 100% rename from mods/computer/textures/computer_ps1_inv.png rename to mods/computers/textures/computers_ps1_inv.png diff --git a/mods/computer/textures/computer_ps2_inv.png b/mods/computers/textures/computers_ps2_inv.png similarity index 100% rename from mods/computer/textures/computer_ps2_inv.png rename to mods/computers/textures/computers_ps2_inv.png diff --git a/mods/computer/textures/computer_red.png b/mods/computers/textures/computers_red.png similarity index 100% rename from mods/computer/textures/computer_red.png rename to mods/computers/textures/computers_red.png diff --git a/mods/computer/textures/computer_router_b.png b/mods/computers/textures/computers_router_b.png similarity index 100% rename from mods/computer/textures/computer_router_b.png rename to mods/computers/textures/computers_router_b.png diff --git a/mods/computer/textures/computer_router_bt.png b/mods/computers/textures/computers_router_bt.png similarity index 100% rename from mods/computer/textures/computer_router_bt.png rename to mods/computers/textures/computers_router_bt.png diff --git a/mods/computer/textures/computer_router_f.png b/mods/computers/textures/computers_router_f.png similarity index 100% rename from mods/computer/textures/computer_router_f.png rename to mods/computers/textures/computers_router_f.png diff --git a/mods/computer/textures/computer_router_f_animated.png b/mods/computers/textures/computers_router_f_animated.png similarity index 100% rename from mods/computer/textures/computer_router_f_animated.png rename to mods/computers/textures/computers_router_f_animated.png diff --git a/mods/computer/textures/computer_router_inv.png b/mods/computers/textures/computers_router_inv.png similarity index 100% rename from mods/computer/textures/computer_router_inv.png rename to mods/computers/textures/computers_router_inv.png diff --git a/mods/computer/textures/computer_router_l.png b/mods/computers/textures/computers_router_l.png similarity index 100% rename from mods/computer/textures/computer_router_l.png rename to mods/computers/textures/computers_router_l.png diff --git a/mods/computer/textures/computer_router_r.png b/mods/computers/textures/computers_router_r.png similarity index 100% rename from mods/computer/textures/computer_router_r.png rename to mods/computers/textures/computers_router_r.png diff --git a/mods/computer/textures/computer_router_t.png b/mods/computers/textures/computers_router_t.png similarity index 100% rename from mods/computer/textures/computer_router_t.png rename to mods/computers/textures/computers_router_t.png diff --git a/mods/computer/textures/computer_server_bt.png b/mods/computers/textures/computers_server_bt.png similarity index 100% rename from mods/computer/textures/computer_server_bt.png rename to mods/computers/textures/computers_server_bt.png diff --git a/mods/computer/textures/computer_server_f_off.png b/mods/computers/textures/computers_server_f_off.png similarity index 100% rename from mods/computer/textures/computer_server_f_off.png rename to mods/computers/textures/computers_server_f_off.png diff --git a/mods/computer/textures/computer_server_f_on.png b/mods/computers/textures/computers_server_f_on.png similarity index 100% rename from mods/computer/textures/computer_server_f_on.png rename to mods/computers/textures/computers_server_f_on.png diff --git a/mods/computer/textures/computer_server_inv.png b/mods/computers/textures/computers_server_inv.png similarity index 100% rename from mods/computer/textures/computer_server_inv.png rename to mods/computers/textures/computers_server_inv.png diff --git a/mods/computer/textures/computer_server_l.png b/mods/computers/textures/computers_server_l.png similarity index 100% rename from mods/computer/textures/computer_server_l.png rename to mods/computers/textures/computers_server_l.png diff --git a/mods/computer/textures/computer_server_r.png b/mods/computers/textures/computers_server_r.png similarity index 100% rename from mods/computer/textures/computer_server_r.png rename to mods/computers/textures/computers_server_r.png diff --git a/mods/computer/textures/computer_server_t.png b/mods/computers/textures/computers_server_t.png similarity index 100% rename from mods/computer/textures/computer_server_t.png rename to mods/computers/textures/computers_server_t.png diff --git a/mods/computer/textures/computer_shefriendSOO_bk.png b/mods/computers/textures/computers_shefriendSOO_bk.png similarity index 100% rename from mods/computer/textures/computer_shefriendSOO_bk.png rename to mods/computers/textures/computers_shefriendSOO_bk.png diff --git a/mods/computer/textures/computer_shefriendSOO_bt.png b/mods/computers/textures/computers_shefriendSOO_bt.png similarity index 100% rename from mods/computer/textures/computer_shefriendSOO_bt.png rename to mods/computers/textures/computers_shefriendSOO_bt.png diff --git a/mods/computer/textures/computer_shefriendSOO_ft.png b/mods/computers/textures/computers_shefriendSOO_ft.png similarity index 100% rename from mods/computer/textures/computer_shefriendSOO_ft.png rename to mods/computers/textures/computers_shefriendSOO_ft.png diff --git a/mods/computer/textures/computer_shefriendSOO_ft_off.png b/mods/computers/textures/computers_shefriendSOO_ft_off.png similarity index 100% rename from mods/computer/textures/computer_shefriendSOO_ft_off.png rename to mods/computers/textures/computers_shefriendSOO_ft_off.png diff --git a/mods/computer/textures/computer_shefriendSOO_lt.png b/mods/computers/textures/computers_shefriendSOO_lt.png similarity index 100% rename from mods/computer/textures/computer_shefriendSOO_lt.png rename to mods/computers/textures/computers_shefriendSOO_lt.png diff --git a/mods/computer/textures/computer_shefriendSOO_rt.png b/mods/computers/textures/computers_shefriendSOO_rt.png similarity index 100% rename from mods/computer/textures/computer_shefriendSOO_rt.png rename to mods/computers/textures/computers_shefriendSOO_rt.png diff --git a/mods/computer/textures/computer_shefriendSOO_tp.png b/mods/computers/textures/computers_shefriendSOO_tp.png similarity index 100% rename from mods/computer/textures/computer_shefriendSOO_tp.png rename to mods/computers/textures/computers_shefriendSOO_tp.png diff --git a/mods/computer/textures/computer_slaystation2_bk.png b/mods/computers/textures/computers_slaystation2_bk.png similarity index 100% rename from mods/computer/textures/computer_slaystation2_bk.png rename to mods/computers/textures/computers_slaystation2_bk.png diff --git a/mods/computer/textures/computer_slaystation2_bt.png b/mods/computers/textures/computers_slaystation2_bt.png similarity index 100% rename from mods/computer/textures/computer_slaystation2_bt.png rename to mods/computers/textures/computers_slaystation2_bt.png diff --git a/mods/computer/textures/computer_slaystation2_ft.png b/mods/computers/textures/computers_slaystation2_ft.png similarity index 100% rename from mods/computer/textures/computer_slaystation2_ft.png rename to mods/computers/textures/computers_slaystation2_ft.png diff --git a/mods/computer/textures/computer_slaystation2_ft_off.png b/mods/computers/textures/computers_slaystation2_ft_off.png similarity index 100% rename from mods/computer/textures/computer_slaystation2_ft_off.png rename to mods/computers/textures/computers_slaystation2_ft_off.png diff --git a/mods/computer/textures/computer_slaystation2_lt.png b/mods/computers/textures/computers_slaystation2_lt.png similarity index 100% rename from mods/computer/textures/computer_slaystation2_lt.png rename to mods/computers/textures/computers_slaystation2_lt.png diff --git a/mods/computer/textures/computer_slaystation2_rt.png b/mods/computers/textures/computers_slaystation2_rt.png similarity index 100% rename from mods/computer/textures/computer_slaystation2_rt.png rename to mods/computers/textures/computers_slaystation2_rt.png diff --git a/mods/computer/textures/computer_slaystation2_tp.png b/mods/computers/textures/computers_slaystation2_tp.png similarity index 100% rename from mods/computer/textures/computer_slaystation2_tp.png rename to mods/computers/textures/computers_slaystation2_tp.png diff --git a/mods/computer/textures/computer_slaystation_bk.png b/mods/computers/textures/computers_slaystation_bk.png similarity index 100% rename from mods/computer/textures/computer_slaystation_bk.png rename to mods/computers/textures/computers_slaystation_bk.png diff --git a/mods/computer/textures/computer_slaystation_bt.png b/mods/computers/textures/computers_slaystation_bt.png similarity index 100% rename from mods/computer/textures/computer_slaystation_bt.png rename to mods/computers/textures/computers_slaystation_bt.png diff --git a/mods/computer/textures/computer_slaystation_ft.png b/mods/computers/textures/computers_slaystation_ft.png similarity index 100% rename from mods/computer/textures/computer_slaystation_ft.png rename to mods/computers/textures/computers_slaystation_ft.png diff --git a/mods/computer/textures/computer_slaystation_lt.png b/mods/computers/textures/computers_slaystation_lt.png similarity index 100% rename from mods/computer/textures/computer_slaystation_lt.png rename to mods/computers/textures/computers_slaystation_lt.png diff --git a/mods/computer/textures/computer_slaystation_rt.png b/mods/computers/textures/computers_slaystation_rt.png similarity index 100% rename from mods/computer/textures/computer_slaystation_rt.png rename to mods/computers/textures/computers_slaystation_rt.png diff --git a/mods/computer/textures/computer_slaystation_tp.png b/mods/computers/textures/computers_slaystation_tp.png similarity index 100% rename from mods/computer/textures/computer_slaystation_tp.png rename to mods/computers/textures/computers_slaystation_tp.png diff --git a/mods/computer/textures/computer_slaystation_tp_off.png b/mods/computers/textures/computers_slaystation_tp_off.png similarity index 100% rename from mods/computer/textures/computer_slaystation_tp_off.png rename to mods/computers/textures/computers_slaystation_tp_off.png diff --git a/mods/computer/textures/computer_specter_bk.png b/mods/computers/textures/computers_specter_bk.png similarity index 100% rename from mods/computer/textures/computer_specter_bk.png rename to mods/computers/textures/computers_specter_bk.png diff --git a/mods/computer/textures/computer_specter_bt.png b/mods/computers/textures/computers_specter_bt.png similarity index 100% rename from mods/computer/textures/computer_specter_bt.png rename to mods/computers/textures/computers_specter_bt.png diff --git a/mods/computer/textures/computer_specter_ft.png b/mods/computers/textures/computers_specter_ft.png similarity index 100% rename from mods/computer/textures/computer_specter_ft.png rename to mods/computers/textures/computers_specter_ft.png diff --git a/mods/computer/textures/computer_specter_inv.png b/mods/computers/textures/computers_specter_inv.png similarity index 100% rename from mods/computer/textures/computer_specter_inv.png rename to mods/computers/textures/computers_specter_inv.png diff --git a/mods/computer/textures/computer_specter_lt.png b/mods/computers/textures/computers_specter_lt.png similarity index 100% rename from mods/computer/textures/computer_specter_lt.png rename to mods/computers/textures/computers_specter_lt.png diff --git a/mods/computer/textures/computer_specter_rt.png b/mods/computers/textures/computers_specter_rt.png similarity index 100% rename from mods/computer/textures/computer_specter_rt.png rename to mods/computers/textures/computers_specter_rt.png diff --git a/mods/computer/textures/computer_specter_tp.png b/mods/computers/textures/computers_specter_tp.png similarity index 100% rename from mods/computer/textures/computer_specter_tp.png rename to mods/computers/textures/computers_specter_tp.png diff --git a/mods/computer/textures/computer_spectre_back.png b/mods/computers/textures/computers_spectre_back.png similarity index 100% rename from mods/computer/textures/computer_spectre_back.png rename to mods/computers/textures/computers_spectre_back.png diff --git a/mods/computer/textures/computer_spectre_bottom.png b/mods/computers/textures/computers_spectre_bottom.png similarity index 100% rename from mods/computer/textures/computer_spectre_bottom.png rename to mods/computers/textures/computers_spectre_bottom.png diff --git a/mods/computer/textures/computer_spectre_front.png b/mods/computers/textures/computers_spectre_front.png similarity index 100% rename from mods/computer/textures/computer_spectre_front.png rename to mods/computers/textures/computers_spectre_front.png diff --git a/mods/computer/textures/computer_spectre_left.png b/mods/computers/textures/computers_spectre_left.png similarity index 100% rename from mods/computer/textures/computer_spectre_left.png rename to mods/computers/textures/computers_spectre_left.png diff --git a/mods/computer/textures/computer_spectre_right.png b/mods/computers/textures/computers_spectre_right.png similarity index 100% rename from mods/computer/textures/computer_spectre_right.png rename to mods/computers/textures/computers_spectre_right.png diff --git a/mods/computer/textures/computer_spectre_top.png b/mods/computers/textures/computers_spectre_top.png similarity index 100% rename from mods/computer/textures/computer_spectre_top.png rename to mods/computers/textures/computers_spectre_top.png diff --git a/mods/computer/textures/tetris_arcade.png b/mods/computers/textures/computers_tetris_arcade.png similarity index 100% rename from mods/computer/textures/tetris_arcade.png rename to mods/computers/textures/computers_tetris_arcade.png diff --git a/mods/computer/textures/computer_tower.png b/mods/computers/textures/computers_tower.png similarity index 100% rename from mods/computer/textures/computer_tower.png rename to mods/computers/textures/computers_tower.png diff --git a/mods/computer/textures/computer_tower_inv.png b/mods/computers/textures/computers_tower_inv.png similarity index 100% rename from mods/computer/textures/computer_tower_inv.png rename to mods/computers/textures/computers_tower_inv.png diff --git a/mods/computer/textures/computer_wee_bk.png b/mods/computers/textures/computers_wee_bk.png similarity index 100% rename from mods/computer/textures/computer_wee_bk.png rename to mods/computers/textures/computers_wee_bk.png diff --git a/mods/computer/textures/computer_wee_bt.png b/mods/computers/textures/computers_wee_bt.png similarity index 100% rename from mods/computer/textures/computer_wee_bt.png rename to mods/computers/textures/computers_wee_bt.png diff --git a/mods/computer/textures/computer_wee_ft.png b/mods/computers/textures/computers_wee_ft.png similarity index 100% rename from mods/computer/textures/computer_wee_ft.png rename to mods/computers/textures/computers_wee_ft.png diff --git a/mods/computer/textures/computer_wee_ft_off.png b/mods/computers/textures/computers_wee_ft_off.png similarity index 100% rename from mods/computer/textures/computer_wee_ft_off.png rename to mods/computers/textures/computers_wee_ft_off.png diff --git a/mods/computer/textures/computer_wee_lt.png b/mods/computers/textures/computers_wee_lt.png similarity index 100% rename from mods/computer/textures/computer_wee_lt.png rename to mods/computers/textures/computers_wee_lt.png diff --git a/mods/computer/textures/computer_wee_rt.png b/mods/computers/textures/computers_wee_rt.png similarity index 100% rename from mods/computer/textures/computer_wee_rt.png rename to mods/computers/textures/computers_wee_rt.png diff --git a/mods/computer/textures/computer_wee_tp.png b/mods/computers/textures/computers_wee_tp.png similarity index 100% rename from mods/computer/textures/computer_wee_tp.png rename to mods/computers/textures/computers_wee_tp.png diff --git a/mods/computer/textures/computer_wii_inv.png b/mods/computers/textures/computers_wii_inv.png similarity index 100% rename from mods/computer/textures/computer_wii_inv.png rename to mods/computers/textures/computers_wii_inv.png diff --git a/mods/computer/textures/computer_yellow.png b/mods/computers/textures/computers_yellow.png similarity index 100% rename from mods/computer/textures/computer_yellow.png rename to mods/computers/textures/computers_yellow.png diff --git a/mods/dreambuilder_extras/customize-dreambuilder-game.sh b/mods/dreambuilder_extras/customize-dreambuilder-game.sh index 02947469..f3c24abd 100755 --- a/mods/dreambuilder_extras/customize-dreambuilder-game.sh +++ b/mods/dreambuilder_extras/customize-dreambuilder-game.sh @@ -151,6 +151,7 @@ my_mods/pipeworks \ RBAs_mods/unified_inventory" LINK_MODPACKS_LIST="$(ls -d my_mods/homedecor_modpack/*/) \ +$(ls -d my_mods/home_workshop_modpack/*/) \ $(ls -d my_mods/plantlife_modpack/*/) \ $(ls -d cheapies_mods/roads_modpack/*/) \ $(ls -d cool_trees_modpack/*/)" diff --git a/mods/home_workshop_common/init.lua b/mods/home_workshop_common/init.lua new file mode 100644 index 00000000..b58bce18 --- /dev/null +++ b/mods/home_workshop_common/init.lua @@ -0,0 +1,2 @@ +-- nothing to see here :P +-- this is just a stub to provide a few textures diff --git a/mods/home_workshop_common/textures/home_workshop_common_drawer_small.png b/mods/home_workshop_common/textures/home_workshop_common_drawer_small.png new file mode 100644 index 00000000..91cc300d Binary files /dev/null and b/mods/home_workshop_common/textures/home_workshop_common_drawer_small.png differ diff --git a/mods/home_workshop_common/textures/home_workshop_common_generic_metal.png b/mods/home_workshop_common/textures/home_workshop_common_generic_metal.png new file mode 100644 index 00000000..3a7c063e Binary files /dev/null and b/mods/home_workshop_common/textures/home_workshop_common_generic_metal.png differ diff --git a/mods/home_workshop_common/textures/home_workshop_common_generic_metal_bright.png b/mods/home_workshop_common/textures/home_workshop_common_generic_metal_bright.png new file mode 100644 index 00000000..da124520 Binary files /dev/null and b/mods/home_workshop_common/textures/home_workshop_common_generic_metal_bright.png differ diff --git a/mods/home_workshop_machines/init.lua b/mods/home_workshop_machines/init.lua new file mode 100644 index 00000000..30894406 --- /dev/null +++ b/mods/home_workshop_machines/init.lua @@ -0,0 +1,67 @@ +local S = minetest.get_translator("home_workshop_machines") + +-- "bedflinger" style 3D Printer (Prusa i3 or equivalent) + +local cbox = { + type = "fixed", + fixed = {-0.25, -0.25, -0.5, 0.3, 0.3, 0.25 } +} + +minetest.register_node("home_workshop_machines:3dprinter_bedflinger", { + description = S('3D Printer ("bedflinger" design)'), + inventory_image = "home_workshop_machines_3dprinter_bedflinger_inv.png", + tiles = { + { name = "home_workshop_machines_3dprinter.png", color = 0xffffffff }, + "home_workshop_machines_3dprinter_filament.png" + }, + paramtype = "light", + walkable = true, + groups = {snappy=3, ud_param2_colorable = 1}, + sound = default.node_sound_wood_defaults(), + drawtype = "mesh", + mesh = "home_workshop_machines_3dprinter_bedflinger.obj", + paramtype2 = "colorwallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + selection_box = cbox, + collision_box = cbox, + after_place_node = function(pos, placer, itemstack, pointed_thing) + unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) + end, + on_dig = unifieddyes.on_dig, + on_rotate = unifieddyes.fix_after_screwdriver_nsew, +}) + +-- COreXY style printer (Hypercube or similar) + +cbox = { + type = "fixed", + fixed = {-0.4375, -0.5, -0.5, 0.4375, 0.5, 0.375 } +} + +minetest.register_node("home_workshop_machines:3dprinter_corexy", { + description = S('3D Printer (CoreXY design)'), + tiles = { + { name = "home_workshop_machines_3dprinter.png", color = 0xffffffff }, + "home_workshop_machines_3dprinter_filament.png" + }, + paramtype = "light", + walkable = true, + groups = {snappy=3, ud_param2_colorable = 1}, + sound = default.node_sound_wood_defaults(), + drawtype = "mesh", + mesh = "home_workshop_machines_3dprinter_corexy.obj", + paramtype2 = "colorwallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + selection_box = cbox, + collision_box = cbox, + after_place_node = function(pos, placer, itemstack, pointed_thing) + unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) + end, + on_dig = unifieddyes.on_dig, + on_rotate = unifieddyes.fix_after_screwdriver_nsew, +}) + +minetest.register_alias("computer:3dprinter_bedflinger", "home_workshop_machines:3dprinter_bedflinger") +minetest.register_alias("computers:3dprinter_bedflinger", "home_workshop_machines:3dprinter_bedflinger") +minetest.register_alias("computer:3dprinter_corexy", "home_workshop_machines:3dprinter_corexy") +minetest.register_alias("computers:3dprinter_corexy", "home_workshop_machines:3dprinter_corexy") diff --git a/mods/home_workshop_machines/locale/home_workshop_machines.de.tr b/mods/home_workshop_machines/locale/home_workshop_machines.de.tr new file mode 100644 index 00000000..11ac392e --- /dev/null +++ b/mods/home_workshop_machines/locale/home_workshop_machines.de.tr @@ -0,0 +1,6 @@ +# textdomain: home_workshop_machines + +### init.lua ### + +3D Printer ("bedflinger" design)=3D Drucker ("Bettschubser") +3D Printer (CoreXY design)= diff --git a/mods/home_workshop_machines/locale/template.txt b/mods/home_workshop_machines/locale/template.txt new file mode 100644 index 00000000..cbf2dbf0 --- /dev/null +++ b/mods/home_workshop_machines/locale/template.txt @@ -0,0 +1,6 @@ +# textdomain: home_workshop_machines + +### init.lua ### + +3D Printer ("bedflinger" design)= +3D Printer (CoreXY design)= diff --git a/mods/home_workshop_machines/mod.conf b/mods/home_workshop_machines/mod.conf new file mode 100644 index 00000000..9371db0d --- /dev/null +++ b/mods/home_workshop_machines/mod.conf @@ -0,0 +1,3 @@ +name = home_workshop_machines +depends = default, unifieddyes +optional_depends = screwdriver diff --git a/mods/computer/models/computer_3dprinter_bedflinger.obj b/mods/home_workshop_machines/models/home_workshop_machines_3dprinter_bedflinger.obj similarity index 100% rename from mods/computer/models/computer_3dprinter_bedflinger.obj rename to mods/home_workshop_machines/models/home_workshop_machines_3dprinter_bedflinger.obj diff --git a/mods/computer/models/computer_3dprinter_corexy.obj b/mods/home_workshop_machines/models/home_workshop_machines_3dprinter_corexy.obj similarity index 100% rename from mods/computer/models/computer_3dprinter_corexy.obj rename to mods/home_workshop_machines/models/home_workshop_machines_3dprinter_corexy.obj diff --git a/mods/computer/textures/computer_3dprinter.png b/mods/home_workshop_machines/textures/home_workshop_machines_3dprinter.png similarity index 100% rename from mods/computer/textures/computer_3dprinter.png rename to mods/home_workshop_machines/textures/home_workshop_machines_3dprinter.png diff --git a/mods/computer/textures/computer_3dprinter_bedflinger_inv.png b/mods/home_workshop_machines/textures/home_workshop_machines_3dprinter_bedflinger_inv.png similarity index 100% rename from mods/computer/textures/computer_3dprinter_bedflinger_inv.png rename to mods/home_workshop_machines/textures/home_workshop_machines_3dprinter_bedflinger_inv.png diff --git a/mods/computer/textures/computer_3dprinter_filament.png b/mods/home_workshop_machines/textures/home_workshop_machines_3dprinter_filament.png similarity index 100% rename from mods/computer/textures/computer_3dprinter_filament.png rename to mods/home_workshop_machines/textures/home_workshop_machines_3dprinter_filament.png diff --git a/mods/home_workshop_misc/crafts.lua b/mods/home_workshop_misc/crafts.lua new file mode 100644 index 00000000..8e6523b0 --- /dev/null +++ b/mods/home_workshop_misc/crafts.lua @@ -0,0 +1,26 @@ +minetest.register_craft({ + output = "home_workshop_misc:tool_cabinet", + recipe = { + { "basic_materials:motor", "default:axe_steel", "default:pick_steel" }, + { "default:steel_ingot", "home_workshop_misc:drawer_small", "default:steel_ingot" }, + { "default:steel_ingot", "home_workshop_misc:drawer_small", "default:steel_ingot" } + }, +}) + +minetest.register_craft({ + output = "home_workshop_misc:beer_tap", + recipe = { + { "group:stick", "default:steel_ingot", "group:stick" }, + { "basic_materials:steel_bar", "default:steel_ingot", "basic_materials:steel_bar" }, + { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } + }, +}) + +minetest.register_craft({ + output = "homedecor:soda_machine", + recipe = { + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + {"default:steel_ingot", "dye:red", "default:steel_ingot"}, + {"default:steel_ingot", "default:copperblock", "default:steel_ingot"}, + }, +}) diff --git a/mods/home_workshop_misc/init.lua b/mods/home_workshop_misc/init.lua new file mode 100644 index 00000000..a0082155 --- /dev/null +++ b/mods/home_workshop_misc/init.lua @@ -0,0 +1,150 @@ +-- Miscellanous tools and mechanical contrivances + +local S = minetest.get_translator("home_workshop_misc") + +minetest.register_node("home_workshop_misc:tool_cabinet", { + description = S("Metal tool cabinet and work table"), + drawtype="mesh", + mesh = "home_workshop_misc_tool_cabinet.obj", + tiles = { + { name = "home_workshop_common_generic_metal.png", color = 0xffd00000 }, + "home_workshop_misc_tool_cabinet_drawers.png", + { name = "home_workshop_common_generic_metal.png", color = 0xff006000 }, + { name = "home_workshop_common_generic_metal.png", color = 0xffa0a0a0 }, + "home_workshop_common_generic_metal_bright.png", + "home_workshop_misc_tool_cabinet_misc.png", + }, + paramtype2="facedir", + inventory_image = "home_workshop_misc_tool_cabinet_inv.png", + on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + groups = { snappy=3 }, + expand = { top="placeholder" }, + inventory = { + size=24, + } +}) + +minetest.register_node("home_workshop_misc:beer_tap", { + description = S("Beer tap"), + drawtype = "mesh", + mesh = "home_workshop_misc_beer_taps.obj", + tiles = { + "home_workshop_common_generic_metal_bright.png", + { name = "home_workshop_common_generic_metal.png", color = 0xff303030 } + }, + inventory_image = "home_workshop_misc_beertap_inv.png", + paramtype2 = "facedir", + groups = { snappy=3 }, + walkable = false, + selection_box = { + type = "fixed", + fixed = { -0.25, -0.5, -0.4375, 0.25, 0.235, 0 } + }, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + local inv = clicker:get_inventory() + + local wieldname = itemstack:get_name() + if wieldname == "vessels:drinking_glass" then + if inv:room_for_item("main", "home_workshop_misc:beer_mug 1") then + itemstack:take_item() + clicker:set_wielded_item(itemstack) + inv:add_item("main", "home_workshop_misc:beer_mug 1") + minetest.chat_send_player(clicker:get_player_name(), + S("Ahh, a frosty cold beer - look in your inventory for it!")) + else + minetest.chat_send_player(clicker:get_player_name(), + S("No room in your inventory to add a beer mug!")) + end + end + end +}) + +local beer_cbox = { + type = "fixed", + fixed = { -5/32, -8/16, -9/32 , 7/32, -2/16, 1/32 } +} + +minetest.register_node("home_workshop_misc:beer_mug", { + description = S("Beer mug"), + drawtype = "mesh", + mesh = "home_workshop_misc_beer_mug.obj", + tiles = { "home_workshop_misc_beer_mug.png" }, + inventory_image = "home_workshop_misc_beer_mug_inv.png", + paramtype2 = "facedir", + groups = { snappy=3, oddly_breakable_by_hand=3 }, + walkable = false, + sounds = default.node_sound_glass_defaults(), + selection_box = beer_cbox, + on_use = function(itemstack, user, pointed_thing) + if not creative.is_enabled_for(user:get_player_name()) then + minetest.do_item_eat(2, "vessels:drinking_glass 1", itemstack, user, pointed_thing) + return itemstack + end + end +}) + +local svm_cbox = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5} +} + +minetest.register_node("home_workshop_misc:soda_machine", { + description = S("Soda vending machine"), + drawtype = "mesh", + mesh = "home_workshop_misc_soda_machine.obj", + tiles = {"home_workshop_misc_soda_machine.png"}, + paramtype2 = "facedir", + groups = {snappy=3}, + selection_box = svm_cbox, + collision_box = svm_cbox, + expand = { top="placeholder" }, + sounds = default.node_sound_wood_defaults(), + on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + local playername = clicker:get_player_name() + local wielditem = clicker:get_wielded_item() + local wieldname = wielditem:get_name() + local fdir_to_fwd = { {0, -1}, {-1, 0}, {0, 1}, {1, 0} } + local fdir = node.param2 + local pos_drop = { x=pos.x+fdir_to_fwd[fdir+1][1], y=pos.y, z=pos.z+fdir_to_fwd[fdir+1][2] } + if wieldname == "currency:minegeld_cent_25" then + minetest.spawn_item(pos_drop, "home_workshop_misc:soda_can") + minetest.sound_play("insert_coin", { + pos=pos, max_hear_distance = 5 + }) + if not creative.is_enabled_for(playername) then + wielditem:take_item() + clicker:set_wielded_item(wielditem) + return wielditem + end + else + minetest.chat_send_player(playername, S("Please insert a 25 Mg cent coin in the machine.")) + end + end +}) + +minetest.register_craftitem("home_workshop_misc:soda_can", { + description = S("Soda Can"), + inventory_image = "home_workshop_misc_soda_can.png", + on_use = minetest.item_eat(2), +}) + +if minetest.get_modpath("homedecor_common") then + minetest.register_alias("home_workshop_misc:drawer_small", "homedecor:drawer_small") +else + minetest.register_craftitem("home_workshop_misc:drawer_small", { + description = S("Small Wooden Drawer"), + inventory_image = "home_workshop_machines_drawer_small.png", + }) +end + +local MODPATH = minetest.get_modpath("home_workshop_misc") +dofile(MODPATH.."/crafts.lua") + +minetest.register_alias("homedecor:tool_cabinet_bottom", "home_workshop_misc:tool_cabinet") +minetest.register_alias("homedecor:tool_cabinet_top", "air") + +minetest.register_alias("homedecor:soda_machine", "home_workshop_misc:soda_machine") +minetest.register_alias("homedecor:beer_tap", "home_workshop_misc:beer_tap") +minetest.register_alias("homedecor:beer_mug", "home_workshop_misc:beer_mug") +minetest.register_alias("homedecor:coin", "currency:minegeld_cent_25") diff --git a/mods/home_workshop_misc/locale/home_workshop_misc_misc.de.tr b/mods/home_workshop_misc/locale/home_workshop_misc_misc.de.tr new file mode 100644 index 00000000..2ef8ad31 --- /dev/null +++ b/mods/home_workshop_misc/locale/home_workshop_misc_misc.de.tr @@ -0,0 +1,12 @@ +# textdomain: home_workshop_misc + +### init.lua ### + +Metal tool cabinet and work table=Metallwerkzeugschrank und Arbeitstisch +Ahh, a frosty cold beer - look in your inventory for it!=Ahh ein kühles Bier – sehen Sie in Ihrem Inventar nach! +Beer mug=Bierkrug +Beer tap=Bierzapfhahn +Soda Can=Limodose +Soda vending machine=Limoautomat +No room in your inventory to add a beer mug!=Kein Platz im Inventar für einen Bierkrug! +Please insert a 25 Mg cent coin in the machine.=Bitte Münze in Automaten einwerfen. diff --git a/mods/home_workshop_misc/locale/home_workshop_misc_misc.es.tr b/mods/home_workshop_misc/locale/home_workshop_misc_misc.es.tr new file mode 100644 index 00000000..ed1f8782 --- /dev/null +++ b/mods/home_workshop_misc/locale/home_workshop_misc_misc.es.tr @@ -0,0 +1,11 @@ +# textdomain: home_workshop_misc + +### init.lua ### +Metal tool cabinet and work table=Mesa de trabajo y gabinete en hierro +Ahh, a frosty cold beer - look in your inventory for it!=¡Ah, una cerveza fría! La encontrarás en tu inventario. +Beer mug=Jarra de cerveza +Beer tap=Grifo de cerveza +Soda Can=Lata de refresco +Soda vending machine=Máquina expendedora de refrescos +No room in your inventory to add a beer mug!=¡No hay lugar para tomar una jarra de cerveza! +Please insert a 25 Mg cent coin in the machine.=Por favor introduzca una moneda en la máquina. diff --git a/mods/home_workshop_misc/locale/home_workshop_misc_misc.fr.tr b/mods/home_workshop_misc/locale/home_workshop_misc_misc.fr.tr new file mode 100644 index 00000000..33267cd6 --- /dev/null +++ b/mods/home_workshop_misc/locale/home_workshop_misc_misc.fr.tr @@ -0,0 +1,11 @@ +# textdomain: home_workshop_misc + +### init.lua ### +Metal tool cabinet and work table=Établi pour le travail du métal +Ahh, a frosty cold beer - look in your inventory for it!=Ahh, une bière bien fraîche - regardez dans votre inventaire ! +Beer mug=Pinte de bière +Beer tap=Pompe à bière +No room in your inventory to add a beer mug!=Pas de place dans votre inventaire pour ajouter une pinte de bière ! +Please insert a 25 Mg cent coin in the machine.=Veuillez insérer une pièce dans la machine. +Soda Can=Canette de soda +Soda vending machine=Distributeur de boissons diff --git a/mods/home_workshop_misc/locale/home_workshop_misc_misc.ms.tr b/mods/home_workshop_misc/locale/home_workshop_misc_misc.ms.tr new file mode 100644 index 00000000..492c3335 --- /dev/null +++ b/mods/home_workshop_misc/locale/home_workshop_misc_misc.ms.tr @@ -0,0 +1,11 @@ +# textdomain: home_workshop_misc + +### init.lua ### +Metal tool cabinet and work table=Kabinet Alatan Logam dan Meja Kerja +Ahh, a frosty cold beer - look in your inventory for it!=Ahh, bir sejuk dingin - cari dalam inventori anda! +Beer mug=Kole Bir +Beer tap=Paip Bir +No room in your inventory to add a beer mug!=Tiada ruang dalam inventori anda untuk menambah kole bir! +Please insert a 25 Mg cent coin in the machine.=Sila masukkan duit syiling ke dalam mesin. +Soda Can=Tin Soda +Soda vending machine=Mesin Soda Layan Diri diff --git a/mods/home_workshop_misc/locale/home_workshop_misc_misc.pt.tr b/mods/home_workshop_misc/locale/home_workshop_misc_misc.pt.tr new file mode 100644 index 00000000..34fd8c03 --- /dev/null +++ b/mods/home_workshop_misc/locale/home_workshop_misc_misc.pt.tr @@ -0,0 +1,11 @@ +# textdomain: home_workshop_misc + +### init.lua ### +Metal tool cabinet and work table=Gabinete de ferramentas metálicas e mesa de trabalho +Ahh, a frosty cold beer - look in your inventory for it!=Ahh, uma cerveja bem gelada - procure por ela em seu inventário! +Beer mug=Caneca de cerveja +Beer tap=Torneira de cerveja +No room in your inventory to add a beer mug!=Sem espaço no inventário para colocar uma caneca de cerveja +Please insert a 25 Mg cent coin in the machine.=Por favor insira uma moeda na máquina. +Soda Can=Lata de Refrigerante +Soda vending machine=Máquina de refrigerante diff --git a/mods/home_workshop_misc/locale/home_workshop_misc_misc.pt_BR.tr b/mods/home_workshop_misc/locale/home_workshop_misc_misc.pt_BR.tr new file mode 100644 index 00000000..34fd8c03 --- /dev/null +++ b/mods/home_workshop_misc/locale/home_workshop_misc_misc.pt_BR.tr @@ -0,0 +1,11 @@ +# textdomain: home_workshop_misc + +### init.lua ### +Metal tool cabinet and work table=Gabinete de ferramentas metálicas e mesa de trabalho +Ahh, a frosty cold beer - look in your inventory for it!=Ahh, uma cerveja bem gelada - procure por ela em seu inventário! +Beer mug=Caneca de cerveja +Beer tap=Torneira de cerveja +No room in your inventory to add a beer mug!=Sem espaço no inventário para colocar uma caneca de cerveja +Please insert a 25 Mg cent coin in the machine.=Por favor insira uma moeda na máquina. +Soda Can=Lata de Refrigerante +Soda vending machine=Máquina de refrigerante diff --git a/mods/home_workshop_misc/locale/home_workshop_misc_misc.ru.tr b/mods/home_workshop_misc/locale/home_workshop_misc_misc.ru.tr new file mode 100644 index 00000000..afa8ee0e --- /dev/null +++ b/mods/home_workshop_misc/locale/home_workshop_misc_misc.ru.tr @@ -0,0 +1,11 @@ +# textdomain: home_workshop_misc + +### init.lua ### +Metal tool cabinet and work table=Шкаф с металлическим инструментом и рабочий стол +Ahh, a frosty cold beer - look in your inventory for it!=О, холодное пиво! Ищи его в инвентаре! +Beer mug=Пивная кружка +Beer tap=Пивной кран +No room in your inventory to add a beer mug!=В инвентаре нет места для пивной кружки! +Please insert a 25 Mg cent coin in the machine.=Вставьте монету в автомат. +Soda Can=Банка газировки +Soda vending machine=Автомат с газировкой diff --git a/mods/home_workshop_misc/locale/home_workshop_misc_misc.zh_CN.tr b/mods/home_workshop_misc/locale/home_workshop_misc_misc.zh_CN.tr new file mode 100644 index 00000000..bcae4100 --- /dev/null +++ b/mods/home_workshop_misc/locale/home_workshop_misc_misc.zh_CN.tr @@ -0,0 +1,12 @@ +# textdomain: home_workshop_misc + +### init.lua ### + +Metal tool cabinet and work table=金属工具柜及工作台 +Ahh, a frosty cold beer - look in your inventory for it!=啊，一杯冰凉的啤酒-看看你的库存吧！ +Beer mug=啤酒杯 +Beer tap=啤酒龙头 +No room in your inventory to add a beer mug!=你的库存里没有地方放啤酒杯！ +Please insert a 25 Mg cent coin in the machine.=请在机器里放一枚硬币。 +Soda Can=易拉罐 +Soda vending machine=汽水自动售货机 diff --git a/mods/home_workshop_misc/locale/template.txt b/mods/home_workshop_misc/locale/template.txt new file mode 100644 index 00000000..b6911dca --- /dev/null +++ b/mods/home_workshop_misc/locale/template.txt @@ -0,0 +1,12 @@ +# textdomain: home_workshop_misc + +### init.lua ### + +Metal tool cabinet and work table= +Ahh, a frosty cold beer - look in your inventory for it!= +Beer mug= +Beer tap= +No room in your inventory to add a beer mug!= +Please insert a 25 Mg cent coin in the machine.= +Soda Can= +Soda vending machine= diff --git a/mods/home_workshop_misc/mod.conf b/mods/home_workshop_misc/mod.conf new file mode 100644 index 00000000..9620e006 --- /dev/null +++ b/mods/home_workshop_misc/mod.conf @@ -0,0 +1,3 @@ +name = home_workshop_misc +depends = default, home_workshop_common +optional_depends = currency, screwdriver, homedecor_common diff --git a/mods/homedecor_gastronomy/models/homedecor_beer_mug.obj b/mods/home_workshop_misc/models/home_workshop_misc_beer_mug.obj similarity index 100% rename from mods/homedecor_gastronomy/models/homedecor_beer_mug.obj rename to mods/home_workshop_misc/models/home_workshop_misc_beer_mug.obj diff --git a/mods/homedecor_gastronomy/models/homedecor_beer_taps.obj b/mods/home_workshop_misc/models/home_workshop_misc_beer_taps.obj similarity index 100% rename from mods/homedecor_gastronomy/models/homedecor_beer_taps.obj rename to mods/home_workshop_misc/models/home_workshop_misc_beer_taps.obj diff --git a/mods/homedecor_gastronomy/models/homedecor_soda_machine.obj b/mods/home_workshop_misc/models/home_workshop_misc_soda_machine.obj similarity index 100% rename from mods/homedecor_gastronomy/models/homedecor_soda_machine.obj rename to mods/home_workshop_misc/models/home_workshop_misc_soda_machine.obj diff --git a/mods/homedecor_misc/models/homedecor_tool_cabinet.obj b/mods/home_workshop_misc/models/home_workshop_misc_tool_cabinet.obj similarity index 100% rename from mods/homedecor_misc/models/homedecor_tool_cabinet.obj rename to mods/home_workshop_misc/models/home_workshop_misc_tool_cabinet.obj diff --git a/mods/homedecor_gastronomy/textures/homedecor_beer_mug.png b/mods/home_workshop_misc/textures/home_workshop_misc_beer_mug.png similarity index 100% rename from mods/homedecor_gastronomy/textures/homedecor_beer_mug.png rename to mods/home_workshop_misc/textures/home_workshop_misc_beer_mug.png diff --git a/mods/homedecor_gastronomy/textures/homedecor_beer_mug_inv.png b/mods/home_workshop_misc/textures/home_workshop_misc_beer_mug_inv.png similarity index 100% rename from mods/homedecor_gastronomy/textures/homedecor_beer_mug_inv.png rename to mods/home_workshop_misc/textures/home_workshop_misc_beer_mug_inv.png diff --git a/mods/homedecor_gastronomy/textures/homedecor_beertap_inv.png b/mods/home_workshop_misc/textures/home_workshop_misc_beertap_inv.png similarity index 100% rename from mods/homedecor_gastronomy/textures/homedecor_beertap_inv.png rename to mods/home_workshop_misc/textures/home_workshop_misc_beertap_inv.png diff --git a/mods/homedecor_gastronomy/textures/homedecor_soda_can.png b/mods/home_workshop_misc/textures/home_workshop_misc_soda_can.png similarity index 100% rename from mods/homedecor_gastronomy/textures/homedecor_soda_can.png rename to mods/home_workshop_misc/textures/home_workshop_misc_soda_can.png diff --git a/mods/homedecor_gastronomy/textures/homedecor_soda_machine.png b/mods/home_workshop_misc/textures/home_workshop_misc_soda_machine.png similarity index 100% rename from mods/homedecor_gastronomy/textures/homedecor_soda_machine.png rename to mods/home_workshop_misc/textures/home_workshop_misc_soda_machine.png diff --git a/mods/homedecor_misc/textures/homedecor_tool_cabinet_drawers.png b/mods/home_workshop_misc/textures/home_workshop_misc_tool_cabinet_drawers.png similarity index 100% rename from mods/homedecor_misc/textures/homedecor_tool_cabinet_drawers.png rename to mods/home_workshop_misc/textures/home_workshop_misc_tool_cabinet_drawers.png diff --git a/mods/homedecor_misc/textures/homedecor_tool_cabinet_inv.png b/mods/home_workshop_misc/textures/home_workshop_misc_tool_cabinet_inv.png similarity index 100% rename from mods/homedecor_misc/textures/homedecor_tool_cabinet_inv.png rename to mods/home_workshop_misc/textures/home_workshop_misc_tool_cabinet_inv.png diff --git a/mods/homedecor_misc/textures/homedecor_tool_cabinet_misc.png b/mods/home_workshop_misc/textures/home_workshop_misc_tool_cabinet_misc.png similarity index 100% rename from mods/homedecor_misc/textures/homedecor_tool_cabinet_misc.png rename to mods/home_workshop_misc/textures/home_workshop_misc_tool_cabinet_misc.png diff --git a/mods/homedecor_gastronomy/init.lua b/mods/homedecor_gastronomy/init.lua index 9d92a169..4cc18b66 100644 --- a/mods/homedecor_gastronomy/init.lua +++ b/mods/homedecor_gastronomy/init.lua @@ -103,111 +103,6 @@ homedecor.register("wine_rack", { sounds = default.node_sound_defaults(), }) -homedecor.register("beer_tap", { - description = S("Beer tap"), - mesh = "homedecor_beer_taps.obj", - tiles = { - "homedecor_generic_metal_bright.png", - { name = "homedecor_generic_metal.png", color = homedecor.color_black } - }, - inventory_image = "homedecor_beertap_inv.png", - groups = { snappy=3 }, - walkable = false, - selection_box = { - type = "fixed", - fixed = { -0.25, -0.5, -0.4375, 0.25, 0.235, 0 } - }, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - local inv = clicker:get_inventory() - - local wieldname = itemstack:get_name() - if wieldname == "vessels:drinking_glass" then - if inv:room_for_item("main", "homedecor:beer_mug 1") then - itemstack:take_item() - clicker:set_wielded_item(itemstack) - inv:add_item("main", "homedecor:beer_mug 1") - minetest.chat_send_player(clicker:get_player_name(), - S("Ahh, a frosty cold beer - look in your inventory for it!")) - else - minetest.chat_send_player(clicker:get_player_name(), - S("No room in your inventory to add a beer mug!")) - end - end - end -}) - -minetest.register_craft({ - output = "homedecor:beer_tap", - recipe = { - { "group:stick","default:steel_ingot","group:stick" }, - { "homedecor:kitchen_faucet","default:steel_ingot","homedecor:kitchen_faucet" }, - { "default:steel_ingot","default:steel_ingot","default:steel_ingot" } - }, -}) - -local beer_cbox = { - type = "fixed", - fixed = { -5/32, -8/16, -9/32 , 7/32, -2/16, 1/32 } -} - -homedecor.register("beer_mug", { - description = S("Beer mug"), - drawtype = "mesh", - mesh = "homedecor_beer_mug.obj", - tiles = { "homedecor_beer_mug.png" }, - inventory_image = "homedecor_beer_mug_inv.png", - groups = { snappy=3, oddly_breakable_by_hand=3 }, - walkable = false, - sounds = default.node_sound_glass_defaults(), - selection_box = beer_cbox, - on_use = function(itemstack, user, pointed_thing) - if not creative.is_enabled_for(user:get_player_name()) then - minetest.do_item_eat(2, "vessels:drinking_glass 1", itemstack, user, pointed_thing) - return itemstack - end - end -}) - -local svm_cbox = { - type = "fixed", - fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5} -} - -homedecor.register("soda_machine", { - description = S("Soda vending machine"), - mesh = "homedecor_soda_machine.obj", - tiles = {"homedecor_soda_machine.png"}, - groups = {snappy=3}, - selection_box = svm_cbox, - collision_box = svm_cbox, - expand = { top="placeholder" }, - sounds = default.node_sound_wood_defaults(), - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - local playername = clicker:get_player_name() - local wielditem = clicker:get_wielded_item() - local wieldname = wielditem:get_name() - local fdir_to_fwd = { {0, -1}, {-1, 0}, {0, 1}, {1, 0} } - local fdir = node.param2 - local pos_drop = { x=pos.x+fdir_to_fwd[fdir+1][1], y=pos.y, z=pos.z+fdir_to_fwd[fdir+1][2] } - if wieldname == "currency:minegeld_cent_25" then - minetest.spawn_item(pos_drop, "homedecor:soda_can") - minetest.sound_play("insert_coin", { - pos=pos, max_hear_distance = 5 - }) - if not creative.is_enabled_for(playername) then - wielditem:take_item() - clicker:set_wielded_item(wielditem) - return wielditem - end - else - minetest.chat_send_player(playername, S("Please insert a coin in the machine.")) - end - end -}) - -minetest.register_alias("homedecor:coin", "currency:minegeld_cent_25") - -- coffee! -- coffee! -- coffee! @@ -326,12 +221,6 @@ minetest.register_abm({ -- crafting -minetest.register_craftitem(":homedecor:soda_can", { - description = S("Soda Can"), - inventory_image = "homedecor_soda_can.png", - on_use = minetest.item_eat(2), -}) - minetest.register_craft( { output = "homedecor:bottle_green", recipe = { @@ -363,14 +252,6 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "homedecor:beer_tap", - recipe = { - { "group:stick","default:steel_ingot","group:stick" }, - { "homedecor:kitchen_faucet","default:steel_ingot","homedecor:kitchen_faucet" }, - { "default:steel_ingot","default:steel_ingot","default:steel_ingot" } - }, -}) minetest.register_craft({ type = "shapeless", @@ -414,11 +295,3 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "homedecor:soda_machine", - recipe = { - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "dye:red", "default:steel_ingot"}, - {"default:steel_ingot", "default:copperblock", "default:steel_ingot"}, - }, -}) diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.de.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.de.tr index 5f898e24..2a00d01f 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.de.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.de.tr @@ -1,11 +1,7 @@ # textdomain: homedecor_gastronomy - ### init.lua ### -Ahh, a frosty cold beer - look in your inventory for it!=Ahh ein kühles Bier – sehen Sie in Ihrem Inventar nach! -Beer mug=Bierkrug -Beer tap=Bierzapfhahn Brown bottle=Braune Flasche Coffee Maker=Kaffeemaschine Cutlery set=Besteckset @@ -13,9 +9,5 @@ Four brown bottles=Vier braune Flaschen Four green bottles=Vier grüne Flaschen Four misc brown/green bottles=Vier gemischte braune/grüne Flaschen Green bottle=Grüne Flasche -No room in your inventory to add a beer mug!=Kein Platz im Inventar für einen Bierkrug! -Please insert a coin in the machine.=Bitte Münze in Automaten einwerfen. -Soda Can=Limodose -Soda vending machine=Limoautomat Toaster=Toaster Wine rack=Weinregal diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.es.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.es.tr index 13145440..1624badd 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.es.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.es.tr @@ -1,11 +1,7 @@ # textdomain: homedecor_gastronomy - ### init.lua ### -Ahh, a frosty cold beer - look in your inventory for it!=¡Ah, una cerveza fría! La encontrarás en tu inventario. -Beer mug=Jarra de cerveza -Beer tap=Grifo de cerveza Brown bottle=Botella marrón Coffee Maker=Cafetera Cutlery set=Cubertería @@ -13,9 +9,5 @@ Four brown bottles=Cuatro botellas marrones Four green bottles=Cuatro botellas verdes Four misc brown/green bottles=Cuatro botellas verdes/marrones Green bottle=Botella verde -No room in your inventory to add a beer mug!=¡No hay lugar para tomar una jarra de cerveza! -Please insert a coin in the machine.=Por favor introduzca una moneda en la máquina. -Soda Can=Lata de refresco -Soda vending machine=Máquina expendedora de refrescos Toaster=Tostador Wine rack=Estantería de vino diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.fr.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.fr.tr index 4d721142..af7a8146 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.fr.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.fr.tr @@ -1,11 +1,7 @@ # textdomain: homedecor_gastronomy - ### init.lua ### -Ahh, a frosty cold beer - look in your inventory for it!=Ahh, une bière bien fraîche - regardez dans votre inventaire ! -Beer mug=Pinte de bière -Beer tap=Pompe à bière Brown bottle=Bouteille marron Coffee Maker=Cafetière Cutlery set=Couverts @@ -13,9 +9,5 @@ Four brown bottles=Quatre bouteilles marrons Four green bottles=Quatre bouteilles vertes Four misc brown/green bottles=Quatre bouteilles marrons et vertes Green bottle=Bouteille verte -No room in your inventory to add a beer mug!=Pas de place dans votre inventaire pour ajouter une pinte de bière ! -Please insert a coin in the machine.=Veuillez insérer une pièce dans la machine. -Soda Can=Canette de soda -Soda vending machine=Distributeur de boissons Toaster=Grille-pain Wine rack=Casier à bouteilles diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.it.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.it.tr index 57c1c9eb..76cc2f2c 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.it.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.it.tr @@ -13,9 +13,5 @@ Four brown bottles= Four green bottles= Four misc brown/green bottles= Green bottle= -No room in your inventory to add a beer mug!= -Please insert a coin in the machine.= -Soda Can= -Soda vending machine= Toaster= Wine rack= diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.ms.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.ms.tr index ac687728..c9995578 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.ms.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.ms.tr @@ -1,11 +1,7 @@ # textdomain: homedecor_gastronomy - ### init.lua ### -Ahh, a frosty cold beer - look in your inventory for it!=Ahh, bir sejuk dingin - cari dalam inventori anda! -Beer mug=Kole Bir -Beer tap=Paip Bir Brown bottle=Botol Perang Coffee Maker=Alat Pembuat Kopi Cutlery set=Set Kutleri @@ -13,9 +9,5 @@ Four brown bottles=Empat Botol Perang Four green bottles=Empat Botol Hijau Four misc brown/green bottles=Empat Botol Pelbagai Warna Green bottle=Botol Hijau -No room in your inventory to add a beer mug!=Tiada ruang dalam inventori anda untuk menambah kole bir! -Please insert a coin in the machine.=Sila masukkan duit syiling ke dalam mesin. -Soda Can=Tin Soda -Soda vending machine=Mesin Soda Layan Diri Toaster=Pembakar Roti Wine rack=Rak Wain diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.pt.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.pt.tr index 4a7541a5..4329dfd1 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.pt.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.pt.tr @@ -1,11 +1,7 @@ # textdomain: homedecor_gastronomy - ### init.lua ### -Ahh, a frosty cold beer - look in your inventory for it!=Ahh, uma cerveja bem gelada - procure por ela em seu inventário! -Beer mug=Caneca de cerveja -Beer tap=Torneira de cerveja Brown bottle=Garrafa marrom Coffee Maker=Cafeteira Cutlery set=Conjunto de Talheres @@ -13,9 +9,5 @@ Four brown bottles=Quatro garrafas marrons Four green bottles=Quatro garrafas verdes Four misc brown/green bottles=Quatro garrafas mescladas verde/marrom Green bottle=Garrafa verde -No room in your inventory to add a beer mug!=Sem espaço no inventário para colocar uma caneca de cerveja -Please insert a coin in the machine.=Por favor insira uma moeda na máquina. -Soda Can=Lata de Refrigerante -Soda vending machine=Máquina de refrigerante Toaster=Torradeira Wine rack=Prateleira de Vinho diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.pt_BR.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.pt_BR.tr index 4a7541a5..4329dfd1 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.pt_BR.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.pt_BR.tr @@ -1,11 +1,7 @@ # textdomain: homedecor_gastronomy - ### init.lua ### -Ahh, a frosty cold beer - look in your inventory for it!=Ahh, uma cerveja bem gelada - procure por ela em seu inventário! -Beer mug=Caneca de cerveja -Beer tap=Torneira de cerveja Brown bottle=Garrafa marrom Coffee Maker=Cafeteira Cutlery set=Conjunto de Talheres @@ -13,9 +9,5 @@ Four brown bottles=Quatro garrafas marrons Four green bottles=Quatro garrafas verdes Four misc brown/green bottles=Quatro garrafas mescladas verde/marrom Green bottle=Garrafa verde -No room in your inventory to add a beer mug!=Sem espaço no inventário para colocar uma caneca de cerveja -Please insert a coin in the machine.=Por favor insira uma moeda na máquina. -Soda Can=Lata de Refrigerante -Soda vending machine=Máquina de refrigerante Toaster=Torradeira Wine rack=Prateleira de Vinho diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.ru.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.ru.tr index 05739f42..e7d34abb 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.ru.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.ru.tr @@ -1,11 +1,7 @@ # textdomain: homedecor_gastronomy - ### init.lua ### -Ahh, a frosty cold beer - look in your inventory for it!=О, холодное пиво! Ищи его в инвентаре! -Beer mug=Пивная кружка -Beer tap=Пивной кран Brown bottle=Коричневая бутылка Coffee Maker=Кофеварка Cutlery set=Набор столовых приборов @@ -13,9 +9,5 @@ Four brown bottles=Четыре коричневых бутылки Four green bottles=Четыре зелёных бутылки Four misc brown/green bottles=Четыре разные коричневые/зелёные Green bottle=Зелёная бутылка -No room in your inventory to add a beer mug!=В инвентаре нет места для пивной кружки! -Please insert a coin in the machine.=Вставьте монету в автомат. -Soda Can=Банка газировки -Soda vending machine=Автомат с газировкой Toaster=Тостер Wine rack=Винный шкаф diff --git a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.zh_CN.tr b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.zh_CN.tr index 81d50889..7f0fe40c 100644 --- a/mods/homedecor_gastronomy/locale/homedecor_gastronomy.zh_CN.tr +++ b/mods/homedecor_gastronomy/locale/homedecor_gastronomy.zh_CN.tr @@ -1,11 +1,7 @@ # textdomain: homedecor_gastronomy - ### init.lua ### -Ahh, a frosty cold beer - look in your inventory for it!=啊，一杯冰凉的啤酒-看看你的库存吧！ -Beer mug=啤酒杯 -Beer tap=啤酒龙头 Brown bottle=棕色瓶子 Coffee Maker=咖啡机 Cutlery set=餐具套装 @@ -13,9 +9,5 @@ Four brown bottles=四个棕色瓶子 Four green bottles=四个绿色瓶子 Four misc brown/green bottles=四个其他棕色/绿色瓶子 Green bottle=绿瓶 -No room in your inventory to add a beer mug!=你的库存里没有地方放啤酒杯！ -Please insert a coin in the machine.=请在机器里放一枚硬币。 -Soda Can=易拉罐 -Soda vending machine=汽水自动售货机 Toaster=烤面包机 Wine rack=酒架 diff --git a/mods/homedecor_gastronomy/locale/template.txt b/mods/homedecor_gastronomy/locale/template.txt index 57c1c9eb..76cc2f2c 100644 --- a/mods/homedecor_gastronomy/locale/template.txt +++ b/mods/homedecor_gastronomy/locale/template.txt @@ -13,9 +13,5 @@ Four brown bottles= Four green bottles= Four misc brown/green bottles= Green bottle= -No room in your inventory to add a beer mug!= -Please insert a coin in the machine.= -Soda Can= -Soda vending machine= Toaster= Wine rack= diff --git a/mods/homedecor_gastronomy/mod.conf b/mods/homedecor_gastronomy/mod.conf index d6eb82ba..b81ba2a7 100644 --- a/mods/homedecor_gastronomy/mod.conf +++ b/mods/homedecor_gastronomy/mod.conf @@ -1,4 +1,4 @@ name = homedecor_gastronomy description = Homedecor mod: gastronomy depends = homedecor_common, default, basic_materials, dye, creative -optional_depends = currency, bucket, screwdriver +optional_depends = bucket, screwdriver diff --git a/mods/homedecor_misc/init.lua b/mods/homedecor_misc/init.lua index 2427af79..dd9911a0 100644 --- a/mods/homedecor_misc/init.lua +++ b/mods/homedecor_misc/init.lua @@ -373,30 +373,6 @@ homedecor.register("skateboard", { on_place = minetest.rotate_node }) -homedecor.register("tool_cabinet", { - description = S("Metal tool cabinet and work table"), - mesh = "homedecor_tool_cabinet.obj", - tiles = { - { name = "homedecor_generic_metal.png", color = 0xffd00000 }, - "homedecor_tool_cabinet_drawers.png", - { name = "homedecor_generic_metal.png", color = 0xff006000 }, - { name = "homedecor_generic_metal.png", color = homedecor.color_med_grey }, - "homedecor_generic_metal_bright.png", - "homedecor_tool_cabinet_misc.png", - }, - inventory_image = "homedecor_tool_cabinet_inv.png", - on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil, - groups = { snappy=3 }, - selection_box = homedecor.nodebox.slab_y(2), - expand = { top="placeholder" }, - inventory = { - size=24, - } -}) - -minetest.register_alias("homedecor:tool_cabinet_bottom", "homedecor:tool_cabinet") -minetest.register_alias("homedecor:tool_cabinet_top", "air") - homedecor_misc.banister_materials = { { "wood", @@ -938,15 +914,6 @@ minetest.register_craft({ }, }) -minetest.register_craft({ - output = "homedecor:tool_cabinet", - recipe = { - { "basic_materials:motor", "default:axe_steel", "default:pick_steel" }, - { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" } - }, -}) - minetest.register_craft({ output = "homedecor:spiral_staircase", recipe = { diff --git a/mods/homedecor_misc/locale/homedecor_misc.de.tr b/mods/homedecor_misc/locale/homedecor_misc.de.tr index c3135dee..16258ebb 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.de.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.de.tr @@ -20,7 +20,6 @@ Japanese tatami=Japanische Tatami Japanese wall=Japanische Wand Japanese wall (bottom)=Japanische Wand (unten) Japanese wall (top)=Japanische Wand (oben) -Metal tool cabinet and work table=Metallwerkzeugschrank und Arbeitstisch Piano=Klavier Pool Table=Billardtisch Potted flower (@1)=Eingetopfte Blume (@1) diff --git a/mods/homedecor_misc/locale/homedecor_misc.es.tr b/mods/homedecor_misc/locale/homedecor_misc.es.tr index 0b0c1f14..7323ea1b 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.es.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.es.tr @@ -20,7 +20,6 @@ Japanese tatami=Tatami Japanese wall=Pared japonesa Japanese wall (bottom)=Pared japonesa (parte más baja) Japanese wall (top)=Pared japonesa (parte más alta) -Metal tool cabinet and work table=Mesa de trabajo y gabinete en hierro Piano=Piano Pool Table=Mesa de pool Potted flower (@1)=Flor en maceta (@1) diff --git a/mods/homedecor_misc/locale/homedecor_misc.fr.tr b/mods/homedecor_misc/locale/homedecor_misc.fr.tr index 6b11a7b8..10ef972f 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.fr.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.fr.tr @@ -20,7 +20,6 @@ Japanese tatami=Tatami Japanese wall=Mur japonais Japanese wall (bottom)=Mur japonais (bas) Japanese wall (top)=Mur japonais (haut) -Metal tool cabinet and work table=Établi pour le travail du métal Piano=Piano Pool Table=Billard Potted flower (@1)=Fleur en pot (@1) diff --git a/mods/homedecor_misc/locale/homedecor_misc.it.tr b/mods/homedecor_misc/locale/homedecor_misc.it.tr index 2c494a43..3cb27ad2 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.it.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.it.tr @@ -20,7 +20,6 @@ Japanese tatami= Japanese wall= Japanese wall (bottom)= Japanese wall (top)= -Metal tool cabinet and work table= Piano= Pool Table=Tavolo Potted flower (@1)= diff --git a/mods/homedecor_misc/locale/homedecor_misc.ms.tr b/mods/homedecor_misc/locale/homedecor_misc.ms.tr index 2f94a677..89330cd7 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.ms.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.ms.tr @@ -20,7 +20,6 @@ Japanese tatami=Tatami Jepun Japanese wall=Dinding Jepun Japanese wall (bottom)=Dinding Jepun (Bawah) Japanese wall (top)=Dinding Jepun (Atas) -Metal tool cabinet and work table=Kabinet Alatan Logam dan Meja Kerja Piano=Piano Pool Table=Meja Pool Potted flower (@1)=Pasu Berbunga (@1) diff --git a/mods/homedecor_misc/locale/homedecor_misc.pt.tr b/mods/homedecor_misc/locale/homedecor_misc.pt.tr index 66abfdae..f8dc9f01 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.pt.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.pt.tr @@ -20,7 +20,6 @@ Japanese tatami=Tatami Japonês Japanese wall=Divisória japonesa Japanese wall (bottom)=Divisória japonesa (inferior) Japanese wall (top)=Divisória japonesa (superior) -Metal tool cabinet and work table=Gabinete de ferramentas metálicas e mesa de trabalho Piano=Piano Pool Table=Mesa de Sinuca Potted flower (@1)=Vaso de Flor (@1) diff --git a/mods/homedecor_misc/locale/homedecor_misc.pt_BR.tr b/mods/homedecor_misc/locale/homedecor_misc.pt_BR.tr index 66abfdae..f8dc9f01 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.pt_BR.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.pt_BR.tr @@ -20,7 +20,6 @@ Japanese tatami=Tatami Japonês Japanese wall=Divisória japonesa Japanese wall (bottom)=Divisória japonesa (inferior) Japanese wall (top)=Divisória japonesa (superior) -Metal tool cabinet and work table=Gabinete de ferramentas metálicas e mesa de trabalho Piano=Piano Pool Table=Mesa de Sinuca Potted flower (@1)=Vaso de Flor (@1) diff --git a/mods/homedecor_misc/locale/homedecor_misc.ru.tr b/mods/homedecor_misc/locale/homedecor_misc.ru.tr index a970d4a8..cc4ecbc2 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.ru.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.ru.tr @@ -20,7 +20,6 @@ Japanese tatami=Японский татами Japanese wall=Японская стена Japanese wall (bottom)=Японская стена (низ) Japanese wall (top)=Японская стена (верх) -Metal tool cabinet and work table=Шкаф с металлическим инструментом и рабочий стол Piano=Пианино Pool Table=Бильярдный стол Potted flower (@1)=Цветок в горшке (@1) diff --git a/mods/homedecor_misc/locale/homedecor_misc.zh_CN.tr b/mods/homedecor_misc/locale/homedecor_misc.zh_CN.tr index 41c44fd0..d50f1af8 100644 --- a/mods/homedecor_misc/locale/homedecor_misc.zh_CN.tr +++ b/mods/homedecor_misc/locale/homedecor_misc.zh_CN.tr @@ -20,7 +20,6 @@ Japanese tatami=日本榻榻米 Japanese wall=日本墙 Japanese wall (bottom)=日本墙（下） Japanese wall (top)=日本墙（上） -Metal tool cabinet and work table=金属工具柜及工作台 Piano=钢琴 Pool Table=台球桌 Potted flower (@1)=盆花（@1） diff --git a/mods/homedecor_misc/locale/template.txt b/mods/homedecor_misc/locale/template.txt index d538ec9c..0adf1828 100644 --- a/mods/homedecor_misc/locale/template.txt +++ b/mods/homedecor_misc/locale/template.txt @@ -20,7 +20,6 @@ Japanese tatami= Japanese wall= Japanese wall (bottom)= Japanese wall (top)= -Metal tool cabinet and work table= Piano= Pool Table= Potted flower (@1)=