remove default checks from before loading craft files (#19 )

improve game agnostic ism (#18 )
* start work on xcompating this * make items digable in farlands * remove reduntant if check * use xcompat for copperblock and remove checks that prevent issues on non mtg before * computers crafting * last two crafts
2024-04-21 22:30:48 -04:00 · 2024-04-14 06:23:58 -04:00 · 2024-02-29 18:48:45 -05:00 · 2023-12-17 15:58:10 +01:00 · 2023-12-16 14:47:22 -05:00 · 2023-03-10 21:30:49 +01:00
56 changed files with 482 additions and 411 deletions
--- a/.github/workflows/luacheck.yml
+++ b/.github/workflows/luacheck.yml
@ -0,0 +1,18 @@
+
+name: luacheck
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: apt
+      run: sudo apt-get install -y luarocks
+    - name: luacheck install
+      run: luarocks install --local luacheck
+    - name: luacheck run
+      run: $HOME/.luarocks/bin/luacheck ./
--- a/.luacheckrc
+++ b/.luacheckrc
@ -0,0 +1,25 @@
+unused_args = false
+allow_defined_top = true
+
+exclude_files = {".luacheckrc"}
+
+globals = {
+    "minetest", "core",
+
+    --mod provided
+    "home_vending_machines",
+}
+
+read_globals = {
+    string = {fields = {"split"}},
+    table = {fields = {"copy", "getn"}},
+
+    --luac
+    "math", "table",
+
+    -- Builtin
+    "vector", "ItemStack", "dump", "DIR_DELIM", "VoxelArea", "Settings", "PcgRandom", "VoxelManip", "PseudoRandom",
+
+    --mod produced
+    "default", "screwdriver", "unifieddyes", "computers", "farming", "xcompat",
+}
--- a/computers/.luacheckrc
+++ b/computers/.luacheckrc
@ -1,21 +0,0 @@
-unused_args = false
-allow_defined_top = true
-max_comment_line_length = 999
-
-read_globals = {
-	"DIR_DELIM",
-	"minetest", "core",
-	"unpack",
-	"dump",
-	table = { fields = { "copy", "getn" } },
-	"vector", "nodeupdate",
-	"VoxelManip", "VoxelArea",
-	"PseudoRandom", "ItemStack",
-	"default",
-	"unifieddyes",
-	"screwdriver",
-}
-
-globals = {
-}
-
--- a/computers/README.txt
+++ b/computers/README.txt
@ -1,6 +1,7 @@

 Decorative Computers Mod for Minetest
-by Diego Martínez <kaeza@users.sf.net>
+by Diego Martínez <kaeza@users.sf.net> and contributors
+license [MIT](https://spdx.org/licenses/MIT.html)

 How to install:
 Unzip the archive an place it in minetest-base-directory/mods/minetest/
@ -46,4 +47,4 @@ Thanks to all the people in the forums and the #minetest IRC channel for
  was you ;) ). 

 See also:
-http://minetest.net/
+http://minetest.net/
--- a/computers/aliases.lua
+++ b/computers/aliases.lua
@ -3,6 +3,7 @@ minetest.register_alias("computer:shefriendSOO_off",     "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:slaystation_off",      "computers:slaystation_off")
 minetest.register_alias("computer:slaystation2",         "computers:slaystation2")
 minetest.register_alias("computer:slaystation2_off",     "computers:slaystation2_off")
 minetest.register_alias("computer:specter",              "computers:specter")
--- a/computers/computers.lua
+++ b/computers/computers.lua
@ -21,8 +21,10 @@ minetest.register_node("computers:vanio", {
 	tiles = {"computers_laptop.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	light_source = 4,
 	groups = {snappy=3},
+	is_ground_content = false,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
@ -41,7 +43,9 @@ minetest.register_node("computers:vanio_off", {
 	tiles = {"computers_laptop.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	groups = {snappy=3, not_in_creative_inventory=1},
+	is_ground_content = false,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
@ -79,8 +83,9 @@ minetest.register_node("computers:piepad", {
 	light_source = 8,
 	walkable = false,
 	groups = {oddly_breakable_by_hand=2},
+	is_ground_content = false,
 	selection_box = {type = "wallmounted"},
-	sounds = default.node_sound_wood_defaults()
+	sounds = xcompat.sounds.node_sound_wood_defaults()
 })

 -- Commodore 64 lookalike
@ -116,11 +121,14 @@ minetest.register_node("computers:monitor", {
 	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"},
+	tiles = {
+		"computers_black.png", "computers_monitor_plastic.png", "computers_black.png", "computers_monitor_plastic.png"
+	},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	walkable = false,
 	groups = {snappy=3},
+	is_ground_content = false,
 	selection_box = mo_sbox,
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computers:monitor_on"
@ -132,12 +140,18 @@ minetest.register_node("computers:monitor", {
 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"},
+	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},
+	is_ground_content = false,
 	selection_box = mo_sbox,
 	drop = "computers:monitor",
 	on_rightclick = function(pos, node, clicker, itemstack)
@ -164,9 +178,11 @@ minetest.register_node("computers:router", {
 	}, --"computers_router_f.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	walkable = false,
 	groups = {snappy=3},
-	sound = default.node_sound_wood_defaults(),
+	is_ground_content = false,
+	sound = xcompat.sounds.node_sound_wood_defaults(),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
@ -194,7 +210,8 @@ minetest.register_node("computers:tower", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3},
-	sound = default.node_sound_wood_defaults(),
+	is_ground_content = false,
+	sound = xcompat.sounds.node_sound_wood_defaults(),
 	selection_box = pct_cbox,
 	collision_box = pct_cbox
 })
@ -214,7 +231,9 @@ minetest.register_node("computers:server", {
 	inventory_image = "computers_server_inv.png",
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	groups = {snappy=3},
+	is_ground_content = false,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}
@ -223,7 +242,7 @@ minetest.register_node("computers:server", {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}
 	},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = xcompat.sounds.node_sound_wood_defaults(),
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computers:server_on"
 		minetest.set_node(pos, node)
@ -253,7 +272,9 @@ minetest.register_node("computers:server_on", {
 	inventory_image = "computers_server_inv.png",
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	groups = {snappy=3,not_in_creative_inventory=1},
+	is_ground_content = false,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}
@ -262,7 +283,7 @@ minetest.register_node("computers:server_on", {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}
 	},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = xcompat.sounds.node_sound_wood_defaults(),
 	drop = 'computers:server',
 	on_rightclick = function(pos, node, clicker, itemstack)
 		node.name = "computers:server"
@ -280,9 +301,11 @@ minetest.register_node("computers:printer", {
 			"computers_printer_r.png","computers_printer_b.png","computers_printer_f.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	walkable = true,
 	groups = {snappy=3},
-	sound = default.node_sound_wood_defaults(),
+	is_ground_content = false,
+	sound = xcompat.sounds.node_sound_wood_defaults(),
 	drawtype = "nodebox",
 	node_box = {
 		type = "fixed",
--- a/computers/gaming.lua
+++ b/computers/gaming.lua
@ -298,8 +298,7 @@ local function step(pos, fields)
 		t.score, close, buttons }


-		meta:set_string("formspec", concat(scr)
-			..default.gui_bg..default.gui_bg_img..default.gui_slots)
+		meta:set_string("formspec", concat(scr))
 		meta:set_string("tetris", minetest.serialize(t))
 	end

@ -314,6 +313,7 @@ minetest.register_node("computers:tetris_arcade", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {snappy=3},
+	is_ground_content = false,
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil,
 	selection_box = {
 		type = "fixed",
@ -326,8 +326,7 @@ minetest.register_node("computers:tetris_arcade", {
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec", formsize
-			.."button[2,2.5;2,2;new;"..minetest.formspec_escape(S("New Game")).."]"
-			..default.gui_bg..default.gui_bg_img..default.gui_slots)
+			.."button[2,2.5;2,2;new;"..minetest.formspec_escape(S("New Game")).."]")
 	end,
 	on_timer = function(pos)
 		return step(pos, nil)
--- a/computers/init.lua
+++ b/computers/init.lua
@ -11,9 +11,11 @@ computers.register = function (name, def)
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
+		use_texture_alpha = "clip",
 		description = cdef.description,
 		inventory_image = cdef.inventory_image,
 		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
+		is_ground_content = false,
 		tiles = {
 			TEXPFX.."tp.png",
 			TEXPFX.."bt.png",
@ -37,7 +39,9 @@ computers.register = function (name, def)
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
+		use_texture_alpha = "clip",
 		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, not_in_creative_inventory=1},
+		is_ground_content = false,
 		tiles = {
 			(TEXPFX.."tp"..(cdef.tiles_off.top    and "_off" or "")..".png"),
 			(TEXPFX.."bt"..(cdef.tiles_off.bottom and "_off" or "")..".png"),
@ -93,6 +97,9 @@ end

 local MODPATH = minetest.get_modpath("computers")
 dofile(MODPATH.."/computers.lua")
-dofile(MODPATH.."/recipes.lua")
 dofile(MODPATH.."/gaming.lua")
 dofile(MODPATH.."/aliases.lua")
+
+if minetest.get_modpath("basic_materials") then
+	dofile(MODPATH.."/recipes.lua")
+end
--- a/computers/locale/computers.de.tr
+++ b/computers/locale/computers.de.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=Admiral 128
+SheFriendSOO=Freundin S00
+Pony Vanio=Pony Oiva
+SX Specter=Z Inspektor
+Snapple Piepad=Apfel-Ei-Pat
 Admiral64=Admiral 64
-Computer Tower=Computerturm
-HUEG Box=YBOX
+Admiral128=Admiral 128
 Monitor and keyboard=Bildschirm und Tastatur
-Nientiendo Wee=Tinnendo iiW
+WIFI Router=WiFi-Router
+Computer Tower=Computerturm
+Rack Server=Serverschrank
 Not enough vertical space to place a server!=Es gibt nicht genug vertikalen Platz, um einen Server zu platzieren!
+Printer-Scanner Combo=Multifunktionsdrucker
 Pony SlayStation=Pony Slaystation
 Pony SlayStation 2=Pony Slaystation 2
-Pony Vanio=Pony Oiva
-Rack Server=Serverschrank
-SX Specter=Z Inspektor
-SheFriendSOO=Freundin S00
-Snapple Piepad=Apfel-Ei-Pat
-WIFI Router=WiFi-Router
-Printer-Scanner Combo=Multifunktionsdrucker
-
-### tetris.lua ###
-
+Nientiendo Wee=Tinnendo iiW
+HUEG Box=YBOX
 L=L
+R=R
 New Game=Neues Spiel
 Next...=Nächster…
-No room for place the Arcade!=Kein Platz, um den Arkadeautomaten zu platzieren!
-R=R
 Score: =Punktzahl: 
 Tetris Arcade=Tetris-Arkadeautomat
+No room for place the Arcade!=Kein Platz, um den Arkadeautomaten zu platzieren!
--- a/computers/locale/computers.es.tr
+++ b/computers/locale/computers.es.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=Torre de ordenador
-HUEG Box=
+Admiral128=
 Monitor and keyboard=Monitor y teclado
-Nientiendo Wee=
+WIFI Router=Enrutador WIFI
+Computer Tower=Torre de ordenador
+Rack Server=Servidor en rack
 Not enough vertical space to place a server!=¡No hay suficiente espacio para colocar un servidor!
+Printer-Scanner Combo=Impresora y escáner combinados
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=Servidor en rack
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=Enrutador WIFI
-Printer-Scanner Combo=Impresora y escáner combinados
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=
+R=
 New Game=Juego Nuevo
 Next...=
-No room for place the Arcade!=¡No hay lugar para colocar el arcade!
-R=
 Score: =
 Tetris Arcade=Arcade Tetris
+No room for place the Arcade!=¡No hay lugar para colocar el arcade!
--- a/computers/locale/computers.fr.tr
+++ b/computers/locale/computers.fr.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=Ordinateur (tour)
-HUEG Box=
+Admiral128=
 Monitor and keyboard=Écran et clavier
-Nientiendo Wee=
+WIFI Router=Routeur WiFi
+Computer Tower=Ordinateur (tour)
+Rack Server=Serveur en rack
 Not enough vertical space to place a server!=Pas assez d'espace vertical pour placer un serveur !
+Printer-Scanner Combo=Imprimante multi-fonction
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=Serveur en rack
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=Routeur WiFi
-Printer-Scanner Combo=Imprimante multi-fonction
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=G
+R=D
 New Game=Nouveau Jeu
 Next...=Suivant…
-No room for place the Arcade!=Pas assez de place pour placer la borne d'arcade !
-R=D
 Score: =Score : 
 Tetris Arcade=Borne Tetris
+No room for place the Arcade!=Pas assez de place pour placer la borne d'arcade !
--- a/computers/locale/computers.it.tr
+++ b/computers/locale/computers.it.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=
-HUEG Box=
+Admiral128=
 Monitor and keyboard=
-Nientiendo Wee=
+WIFI Router=
+Computer Tower=
+Rack Server=
 Not enough vertical space to place a server!=Non c'è abbastanza spazio verticale per mettere un frigorifero!
+Printer-Scanner Combo=
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=
-Printer-Scanner Combo=
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=
+R=
 New Game=
 Next...=
-No room for place the Arcade!=
-R=
 Score: =
 Tetris Arcade=
+No room for place the Arcade!=
--- a/computers/locale/computers.ms.tr
+++ b/computers/locale/computers.ms.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=Sistem Unit
-HUEG Box=
+Admiral128=
 Monitor and keyboard=Monitor dan Papan Kekunci
-Nientiendo Wee=
+WIFI Router=Penghala WIFI
+Computer Tower=Sistem Unit
+Rack Server=Rak Pelayan
 Not enough vertical space to place a server!=Tidak cukup ruang menegak untuk letak rak pelayan!
+Printer-Scanner Combo=Pencetak Semua Dalam Satu
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=Rak Pelayan
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=Penghala WIFI
-Printer-Scanner Combo=Pencetak Semua Dalam Satu
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=
+R=
 New Game=Main Baru
 Next...=Seterusnya...
-No room for place the Arcade!=Tiada ruang untuk letak Arked!
-R=
 Score: =Markah:
 Tetris Arcade=Arked Tetris
+No room for place the Arcade!=Tiada ruang untuk letak Arked!
--- a/computers/locale/computers.pt.tr
+++ b/computers/locale/computers.pt.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=Gabinete do Computador
-HUEG Box=
+Admiral128=
 Monitor and keyboard=Tela e teclado
-Nientiendo Wee=
+WIFI Router=Roteador WIFI
+Computer Tower=Gabinete do Computador
+Rack Server=Rack para Servidor
 Not enough vertical space to place a server!=Sem espaço vertical suficiente para colocar um servidor.
+Printer-Scanner Combo=Tudo em Um Impressora-Scaner
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=Rack para Servidor
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=Roteador WIFI
-Printer-Scanner Combo=Tudo em Um Impressora-Scaner
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=
+R=
 New Game=Novo Jogo
 Next...=
-No room for place the Arcade!=Sem espaço para colocar o Fliperama!
-R=
 Score: =
 Tetris Arcade=Fliperama Tetris
+No room for place the Arcade!=Sem espaço para colocar o Fliperama!
--- a/computers/locale/computers.pt_BR.tr
+++ b/computers/locale/computers.pt_BR.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=Gabinete do Computador
-HUEG Box=
+Admiral128=
 Monitor and keyboard=Tela e teclado
-Nientiendo Wee=
+WIFI Router=Roteador WIFI
+Computer Tower=Gabinete do Computador
+Rack Server=Rack para Servidor
 Not enough vertical space to place a server!=Sem espaço vertical suficiente para colocar um servidor.
+Printer-Scanner Combo=Tudo em Um Impressora-Scaner
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=Rack para Servidor
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=Roteador WIFI
-Printer-Scanner Combo=Tudo em Um Impressora-Scaner
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=
+R=
 New Game=Novo Jogo
 Next...=
-No room for place the Arcade!=Sem espaço para colocar o Fliperama!
-R=
 Score: =
 Tetris Arcade=Fliperama Tetris
+No room for place the Arcade!=Sem espaço para colocar o Fliperama!
--- a/computers/locale/computers.ru.tr
+++ b/computers/locale/computers.ru.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=Системный блок
-HUEG Box=
+Admiral128=
 Monitor and keyboard=Монитор и клавиатура
-Nientiendo Wee=
+WIFI Router=WIFI-роутер
+Computer Tower=Системный блок
+Rack Server=Стоечный сервер
 Not enough vertical space to place a server!=Недостаточно вертикального пространства для размещения сервера!
+Printer-Scanner Combo=МФУ
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=Стоечный сервер
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=WIFI-роутер
-Printer-Scanner Combo=МФУ
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=
+R=
 New Game=Новая игра
 Next...=Далее...
-No room for place the Arcade!=Недостаточно места для размещения игрового автомата!
-R=
 Score: =Счёт: 
 Tetris Arcade=Игровой автомат Тетрис
+No room for place the Arcade!=Недостаточно места для размещения игрового автомата!
--- a/computers/locale/computers.zh_CN.tr
+++ b/computers/locale/computers.zh_CN.tr
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=计算机箱
-HUEG Box=
+Admiral128=
 Monitor and keyboard=显示器和键盘
-Nientiendo Wee=
+WIFI Router=无线路由器
+Computer Tower=计算机箱
+Rack Server=机架式服务器
 Not enough vertical space to place a server!=高度不足，无法放置服务器！
+Printer-Scanner Combo=打印扫描一体机
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=机架式服务器
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=无线路由器
-Printer-Scanner Combo=打印扫描一体机
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=
+R=
 New Game=新游戏
 Next...=下一个。。。
-No room for place the Arcade!=没有地方放游戏机！
-R=
 Score: =分数：
 Tetris Arcade=俄罗斯方块游戏机
+No room for place the Arcade!=没有地方放游戏机！
--- a/computers/locale/template.txt
+++ b/computers/locale/template.txt
@ -1,31 +1,24 @@
 # textdomain: computers
-
-
-### computers.lua ###
-
-Admiral128=
+SheFriendSOO=
+Pony Vanio=
+SX Specter=
+Snapple Piepad=
 Admiral64=
-Computer Tower=
-HUEG Box=
+Admiral128=
 Monitor and keyboard=
-Nientiendo Wee=
+WIFI Router=
+Computer Tower=
+Rack Server=
 Not enough vertical space to place a server!=
+Printer-Scanner Combo=
 Pony SlayStation=
 Pony SlayStation 2=
-Pony Vanio=
-Rack Server=
-SX Specter=
-SheFriendSOO=
-Snapple Piepad=
-WIFI Router=
-Printer-Scanner Combo=
-
-### tetris.lua ###
-
+Nientiendo Wee=
+HUEG Box=
 L=
+R=
 New Game=
 Next...=
-No room for place the Arcade!=
-R=
 Score: =
 Tetris Arcade=
+No room for place the Arcade!=
--- a/computers/mod.conf
+++ b/computers/mod.conf
@ -1,3 +1,3 @@
 name = computers
-depends = default, basic_materials
-optional_depends = screwdriver
+depends = xcompat
+optional_depends = screwdriver, default, basic_materials
--- a/computers/recipes.lua
+++ b/computers/recipes.lua
@ -1,10 +1,11 @@
 -- Copyright (C) 2012-2013 Diego Martínez <kaeza@users.sf.net>
+local materials = xcompat.materials

 minetest.register_craft({
 	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" },
+		{ "basic_materials:plastic_sheet", materials.glass, "basic_materials:plastic_sheet" },
 		{ "basic_materials:plastic_sheet", "group:wood", "basic_materials:plastic_sheet" }
 	}
 })
@ -21,7 +22,7 @@ minetest.register_craft({
 	output = "computers:vanio",
 	recipe = {
 		{ "basic_materials:plastic_sheet", "", "" },
-		{ "default:glass", "", "" },
+		{ materials.glass, "", "" },
 		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
 	}
 })
@ -39,7 +40,7 @@ minetest.register_craft({
 	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" }
+		{ "basic_materials:plastic_sheet", materials.steel_ingot, "basic_materials:plastic_sheet" }
 	}
 })

@ -55,7 +56,7 @@ minetest.register_craft({
 	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" }
+		{ materials.steel_ingot, materials.steel_ingot, materials.steel_ingot }
 	}
 })

@ -63,7 +64,7 @@ minetest.register_craft({
 	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" }
+		{ "basic_materials:plastic_sheet", materials.copper_ingot, "basic_materials:plastic_sheet" }
 	}
 })

@ -71,7 +72,7 @@ minetest.register_craft({
 	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" }
+		{ "basic_materials:plastic_sheet", materials.glass, "basic_materials:plastic_sheet" }
 	}
 })

@ -80,45 +81,45 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "computers:monitor",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "default:glass","" },
-		{ "basic_materials:plastic_sheet", "default:glass","" },
-		{ "basic_materials:plastic_sheet", "default:mese_crystal_fragment", "basic_materials:plastic_sheet" }
+		{ "basic_materials:plastic_sheet", materials.glass,"" },
+		{ "basic_materials:plastic_sheet", materials.glass,"" },
+		{ "basic_materials:plastic_sheet", materials.mese_crystal_fragment, "basic_materials:plastic_sheet" }
 	}
 })

 minetest.register_craft({
 	output = "computers:router",
 	recipe = {
-		{ "default:steel_ingot","","" },
-		{ "default:steel_ingot" ,"basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "default:mese_crystal_fragment","basic_materials:plastic_sheet", "basic_materials:plastic_sheet"  }
+		{ materials.steel_ingot,"","" },
+		{ materials.steel_ingot ,"basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ materials.mese_crystal_fragment,"basic_materials:plastic_sheet", "basic_materials:plastic_sheet"  }
 	}
 })

 minetest.register_craft({
 	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" },
-		{ "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" }
+		{ "basic_materials:plastic_sheet", materials.steel_ingot, "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", materials.mese_crystal, "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", materials.steel_ingot, "basic_materials:plastic_sheet" }
 	}
 })

 minetest.register_craft({
 	output = "computers:printer",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "default:steel_ingot","" },
-		{ "basic_materials:plastic_sheet", "default:mese_crystal", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "default:coal_lump", "basic_materials:plastic_sheet" }
+		{ "basic_materials:plastic_sheet", materials.steel_ingot,"" },
+		{ "basic_materials:plastic_sheet", materials.mese_crystal, "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", materials.coal_lump, "basic_materials:plastic_sheet" }
 	}
 })

 minetest.register_craft({
 	output = "computers:printer",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "default:steel_ingot","" },
-		{ "basic_materials:plastic_sheet", "default:mese_crystal", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet", }
+		{ "basic_materials:plastic_sheet", materials.steel_ingot,"" },
+		{ "basic_materials:plastic_sheet", materials.mese_crystal, "basic_materials:plastic_sheet" },
+		{ "basic_materials:plastic_sheet", materials.dye_black, "basic_materials:plastic_sheet", }
 	}
 })

@ -135,7 +136,7 @@ minetest.register_craft({
 	output = "computers:tetris_arcade",
 	recipe = {
 		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet", },
-		{ "dye:black", "default:glass", "dye:black" },
+		{ materials.dye_black, materials.glass, materials.dye_black },
 		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }
 	}
 })
--- a/home_vending_machines/api.lua
+++ b/home_vending_machines/api.lua
@ -0,0 +1,61 @@
+local registered_currency = {}
+
+function home_vending_machines.register_currency(name, worth)
+    registered_currency[name] = worth
+end
+
+local function reg_simple(name, def)
+    minetest.register_node(":" .. name, {
+        description = def.description,
+        drawtype = "mesh",
+        mesh = "home_vending_machines_machine.obj",
+        tiles = def.tiles,
+        paramtype = "light",
+        paramtype2 = "facedir",
+        groups = def.groups or {snappy=3, dig_tree=2},
+        is_ground_content = false,
+        selection_box = {
+            type = "fixed",
+            fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5}
+        },
+        collision_box = {
+            type = "fixed",
+            fixed = {-0.5, -0.5, -0.5, 0.5, 1.5, 0.5}
+        },
+        sounds = def.sounds,
+        on_rotate = function(pos, node, user, mode, new_param2)
+            if minetest.get_modpath("screwdriver") then
+                return screwdriver.rotate_simple(pos, node, user, mode, new_param2)
+            end
+        end,
+        on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+            if not itemstack then return end
+            local pname = clicker:get_player_name()
+            local iname = itemstack:get_name()
+            local dpos = vector.add((vector.multiply(minetest.facedir_to_dir(node.param2), -1)), pos)
+
+            if registered_currency[iname] and registered_currency[iname] == 1 then
+                local item = def._vmachine.item
+                if type(item) == "table" then
+                    item = item[math.random(#item)]
+                end
+
+                minetest.add_item(dpos, item)
+
+                if not minetest.is_creative_enabled(pname) then
+                    itemstack:take_item()
+                    return itemstack
+                end
+            else
+                minetest.chat_send_player(pname, "Please insert valid currency.")
+            end
+        end
+    })
+end
+
+function home_vending_machines.register_machine(type, name, def)
+    if type == "simple" then
+        reg_simple(name, def)
+    end
+    --TODO: add more complex machine type with formspec and selections
+end
--- a/home_vending_machines/crafts.lua
+++ b/home_vending_machines/crafts.lua
@ -0,0 +1,26 @@
+local materials = xcompat.materials
+
+minetest.register_craft({
+    output = "home_workshop_misc:soda_machine",
+    recipe = {
+        {materials.steel_ingot, materials.steel_ingot, materials.steel_ingot},
+        {materials.steel_ingot, materials.dye_red, materials.steel_ingot},
+        {materials.steel_ingot, materials.copper_block, materials.steel_ingot},
+    },
+})
+minetest.register_craft({
+    output = "home_vending_machines:drink_machine",
+    recipe = {
+        {materials.steel_ingot, "group:vessel", materials.steel_ingot},
+        {materials.steel_ingot, materials.steel_ingot, materials.steel_ingot},
+        {materials.steel_ingot, materials.copper_block, materials.steel_ingot},
+    },
+})
+minetest.register_craft({
+    output = "home_vending_machines:sweet_machine",
+    recipe = {
+        {materials.steel_ingot, "group:food_sugar",    materials.steel_ingot},
+        {materials.steel_ingot, materials.steel_ingot, materials.steel_ingot},
+        {materials.steel_ingot, materials.copper_block, materials.steel_ingot},
+    },
+})
--- a/home_vending_machines/init.lua
+++ b/home_vending_machines/init.lua
@ -0,0 +1,9 @@
+local modpath = minetest.get_modpath("home_vending_machines")
+home_vending_machines = {}
+
+dofile(modpath .. "/api.lua")
+dofile(modpath .. "/machines.lua")
+dofile(modpath .. "/items.lua")
+dofile(modpath .. "/crafts.lua")
+
+home_vending_machines.init = true
--- a/home_vending_machines/items.lua
+++ b/home_vending_machines/items.lua
@ -0,0 +1,12 @@
+local function reg_item(name, evalue)
+    minetest.register_craftitem("home_vending_machines:" .. name, {
+        description = string.gsub(name, "_", " "),
+        inventory_image = "home_vending_machines_" .. name .. ".png",
+        on_use = minetest.item_eat(evalue),
+    })
+end
+
+reg_item("soda_can", 2)
+minetest.register_alias("home_workshop_misc:soda_can", "home_vending_machines:soda_can")
+
+reg_item("water_bottle", 3)
--- a/home_vending_machines/machines.lua
+++ b/home_vending_machines/machines.lua
@ -0,0 +1,29 @@
+home_vending_machines.register_currency("default:gold_ingot", 1)
+home_vending_machines.register_currency("currency:minegeld_cent_25", 1)
+
+home_vending_machines.register_machine("simple", "home_workshop_misc:soda_machine", {
+    description = "Soda vending machine",
+    tiles = {"home_vending_machines_soda_machine.png"},
+    sounds = nil,
+    _vmachine = {
+        item = "home_vending_machines:soda_can"
+    }
+})
+
+home_vending_machines.register_machine("simple", "home_vending_machines:drink_machine", {
+    description = "Drinks vending machine",
+    tiles = {"home_vending_machines_drink_machine.png"},
+    sounds = nil,
+    _vmachine = {
+        item = {"home_vending_machines:soda_can", "home_vending_machines:water_bottle"}
+    }
+})
+
+home_vending_machines.register_machine("simple", "home_vending_machines:sweet_machine", {
+    description = "Sweets vending machine",
+    tiles = {"home_vending_machines_sweet_machine.png"},
+    sounds = nil,
+    _vmachine = {
+        item = "home_vending_machines:soda_can"
+    }
+})
--- a/home_vending_machines/mod.conf
+++ b/home_vending_machines/mod.conf
@ -0,0 +1,3 @@
+name = home_vending_machines
+depends = xcompat
+optional_depends = screwdriver, default, dye, vessels, farming
--- a/home_vending_machines/models/home_vending_machines_machine.obj
+++ b/home_vending_machines/models/home_vending_machines_machine.obj
--- a/home_vending_machines/readme.txt
+++ b/home_vending_machines/readme.txt
@ -0,0 +1,11 @@
+code wsor MIT
+
+VanessaE (cc-by-sa 4.0):
+home_vending_machines_machine.obj
+home_vending_machines_soda_can.png
+home_vending_machines_soda_machine.png
+
+Andrey01 (CC BY-SA 3.0):
+home_vending_machines_drimk_machine.png
+home_vending_machines_sweet_machine.png
+home_vending_machines_water_bottle.png
--- a/home_vending_machines/textures/items/home_vending_machines_soda_can.png
+++ b/home_vending_machines/textures/items/home_vending_machines_soda_can.png
--- a/home_vending_machines/textures/items/home_vending_machines_water_bottle.png
+++ b/home_vending_machines/textures/items/home_vending_machines_water_bottle.png
--- a/home_vending_machines/textures/machines/home_vending_machines_drink_machine.png
+++ b/home_vending_machines/textures/machines/home_vending_machines_drink_machine.png
--- a/home_vending_machines/textures/machines/home_vending_machines_soda_machine.png
+++ b/home_vending_machines/textures/machines/home_vending_machines_soda_machine.png
--- a/home_vending_machines/textures/machines/home_vending_machines_sweet_machine.png
+++ b/home_vending_machines/textures/machines/home_vending_machines_sweet_machine.png
--- a/home_workshop_common/init.lua
+++ b/home_workshop_common/init.lua
@ -1,2 +0,0 @@
-- nothing to see here :P
-- this is just a stub to provide a few textures
--- a/home_workshop_machines/init.lua
+++ b/home_workshop_machines/init.lua
@ -1,4 +1,5 @@
 local S = minetest.get_translator("home_workshop_machines")
+local materials = xcompat.materials

 -- "bedflinger" style 3D Printer (Prusa i3 or equivalent)

@ -16,8 +17,9 @@ minetest.register_node("home_workshop_machines:3dprinter_bedflinger", {
 	},
 	paramtype = "light",
 	walkable = true,
-	groups = {snappy=3, ud_param2_colorable = 1},
-	sound = default.node_sound_wood_defaults(),
+	groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2},
+	is_ground_content = false,
+	sound = xcompat.sounds.node_sound_wood_defaults(),
 	drawtype = "mesh",
 	mesh = "home_workshop_machines_3dprinter_bedflinger.obj",
 	paramtype2 = "colorwallmounted",
@ -46,8 +48,9 @@ minetest.register_node("home_workshop_machines:3dprinter_corexy", {
 	},
 	paramtype = "light",
 	walkable = true,
-	groups = {snappy=3, ud_param2_colorable = 1},
-	sound = default.node_sound_wood_defaults(),
+	groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2},
+	is_ground_content = false,
+	sound = xcompat.sounds.node_sound_wood_defaults(),
 	drawtype = "mesh",
 	mesh = "home_workshop_machines_3dprinter_corexy.obj",
 	paramtype2 = "colorwallmounted",
@ -61,6 +64,26 @@ minetest.register_node("home_workshop_machines:3dprinter_corexy", {
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 })

+if minetest.get_modpath("basic_materials") then
+	minetest.register_craft({
+		output = "home_workshop_machines:3dprinter_bedflinger",
+		recipe = {
+			{"basic_materials:plastic_sheet", materials.dye_white, "basic_materials:plastic_sheet"},
+			{"basic_materials:motor", "basic_materials:heating_element", "basic_materials:motor"},
+			{materials.steel_ingot, materials.steel_ingot, materials.steel_ingot},
+		},
+	})
+
+	minetest.register_craft({
+		output = "home_workshop_machines:3dprinter_corexy",
+		recipe = {
+			{materials.steel_ingot, "basic_materials:motor", "basic_materials:plastic_sheet"},
+			{materials.glass, "basic_materials:heating_element", materials.glass},
+			{materials.steel_ingot, "basic_materials:motor", materials.steel_ingot},
+		},
+	})
+end
+
 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")
--- a/home_workshop_machines/locale/home_workshop_machines.de.tr
+++ b/home_workshop_machines/locale/home_workshop_machines.de.tr
@ -1,6 +1,3 @@
 # textdomain: home_workshop_machines
-
-### init.lua ###
-
 3D Printer ("bedflinger" design)=3D Drucker ("Bettschubser")
 3D Printer (CoreXY design)=
--- a/home_workshop_machines/locale/template.txt
+++ b/home_workshop_machines/locale/template.txt
@ -1,6 +1,3 @@
 # textdomain: home_workshop_machines
-
-### init.lua ###
-
 3D Printer ("bedflinger" design)=
 3D Printer (CoreXY design)=
--- a/home_workshop_machines/mod.conf
+++ b/home_workshop_machines/mod.conf
@ -1,3 +1,3 @@
 name = home_workshop_machines
-depends = default, unifieddyes
-optional_depends = screwdriver
+depends = unifieddyes, xcompat
+optional_depends = default, screwdriver, dye, basic_materials
--- a/home_workshop_misc/crafts.lua
+++ b/home_workshop_misc/crafts.lua
@ -1,26 +1,19 @@
+local materials = xcompat.materials
+
 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" }
+		{ "basic_materials:motor", materials.axe_steel,               materials.pick_steel },
+		{ materials.steel_ingot,   "home_workshop_misc:drawer_small", materials.steel_ingot },
+		{ materials.steel_ingot,   "home_workshop_misc:drawer_small", materials.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" }
+		{ "group:stick",               materials.steel_ingot, "group:stick" },
+		{ "basic_materials:steel_bar", materials.steel_ingot, "basic_materials:steel_bar" },
+		{ materials.steel_ingot,       materials.steel_ingot, materials.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"},
-	},
-})
+})
--- a/home_workshop_misc/init.lua
+++ b/home_workshop_misc/init.lua
@ -14,10 +14,12 @@ minetest.register_node("home_workshop_misc:tool_cabinet", {
 		"home_workshop_common_generic_metal_bright.png",
 		"home_workshop_misc_tool_cabinet_misc.png",
 	},
+	paramtype = "light",
 	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 },
+	groups = { snappy=3, dig_tree=2 },
+	is_ground_content = false,
 	expand = { top="placeholder" },
 	inventory = {
 		size=24,
@ -33,8 +35,10 @@ minetest.register_node("home_workshop_misc:beer_tap", {
 		{ name = "home_workshop_common_generic_metal.png", color = 0xff303030 }
 	},
 	inventory_image = "home_workshop_misc_beertap_inv.png",
+	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = { snappy=3 },
+	groups = { snappy=3, dig_tree=2 },
+	is_ground_content = false,
 	walkable = false,
 	selection_box = {
 		type = "fixed",
@ -42,13 +46,14 @@ minetest.register_node("home_workshop_misc:beer_tap", {
 	},
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local inv = clicker:get_inventory()
+		if not itemstack then return end

 		local wieldname = itemstack:get_name()
 		if wieldname == "vessels:drinking_glass" then
 			if inv:room_for_item("main", "home_workshop_misc:beer_mug 1") then
+				inv:add_item("main", "home_workshop_misc:beer_mug 1")
 				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
@ -70,76 +75,34 @@ minetest.register_node("home_workshop_misc:beer_mug", {
 	mesh = "home_workshop_misc_beer_mug.obj",
 	tiles = { "home_workshop_misc_beer_mug.png" },
 	inventory_image = "home_workshop_misc_beer_mug_inv.png",
+	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = { snappy=3, oddly_breakable_by_hand=3 },
+	is_ground_content = false,
 	walkable = false,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = xcompat.sounds.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
+		if not minetest.is_creative_enabled(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",
+			inventory_image = "home_workshop_common_drawer_small.png",
 	})
 end

 local MODPATH = minetest.get_modpath("home_workshop_misc")
-dofile(MODPATH.."/crafts.lua")
+if minetest.get_modpath("basic_materials") then
+	dofile(MODPATH.."/crafts.lua")
+end

 minetest.register_alias("homedecor:tool_cabinet",        "home_workshop_misc:tool_cabinet")
 minetest.register_alias("homedecor:tool_cabinet_bottom", "home_workshop_misc:tool_cabinet")
--- a/home_workshop_misc/locale/home_workshop_misc_misc.de.tr
+++ b/home_workshop_misc/locale/home_workshop_misc_misc.de.tr
@ -1,12 +1,7 @@
 # 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
+Ahh, a frosty cold beer - look in your inventory for it!=Ahh ein kühles Bier – sehen Sie in Ihrem Inventar nach!
 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.
+Beer mug=Bierkrug
+Small Wooden Drawer=
--- a/home_workshop_misc/locale/home_workshop_misc_misc.es.tr
+++ b/home_workshop_misc/locale/home_workshop_misc_misc.es.tr
@ -1,11 +1,7 @@
 # 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
+Ahh, a frosty cold beer - look in your inventory for it!=¡Ah, una cerveza fría! La encontrarás en tu inventario.
 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.
+Beer mug=Jarra de cerveza
+Small Wooden Drawer=
--- a/home_workshop_misc/locale/home_workshop_misc_misc.fr.tr
+++ b/home_workshop_misc/locale/home_workshop_misc_misc.fr.tr
@ -1,11 +1,7 @@
 # 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
+Ahh, a frosty cold beer - look in your inventory for it!=Ahh, une bière bien fraîche - regardez dans votre inventaire !
 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
+Beer mug=Pinte de bière
+Small Wooden Drawer=
--- a/home_workshop_misc/locale/home_workshop_misc_misc.ms.tr
+++ b/home_workshop_misc/locale/home_workshop_misc_misc.ms.tr
@ -1,11 +1,7 @@
 # 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
+Ahh, a frosty cold beer - look in your inventory for it!=Ahh, bir sejuk dingin - cari dalam inventori anda!
 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
+Beer mug=Kole Bir
+Small Wooden Drawer=
--- a/home_workshop_misc/locale/home_workshop_misc_misc.pt.tr
+++ b/home_workshop_misc/locale/home_workshop_misc_misc.pt.tr
@ -1,11 +1,7 @@
 # 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
+Ahh, a frosty cold beer - look in your inventory for it!=Ahh, uma cerveja bem gelada - procure por ela em seu inventário!
 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
+Beer mug=Caneca de cerveja
+Small Wooden Drawer=
--- a/home_workshop_misc/locale/home_workshop_misc_misc.pt_BR.tr
+++ b/home_workshop_misc/locale/home_workshop_misc_misc.pt_BR.tr
@ -1,11 +1,7 @@
 # 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
+Ahh, a frosty cold beer - look in your inventory for it!=Ahh, uma cerveja bem gelada - procure por ela em seu inventário!
 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
+Beer mug=Caneca de cerveja
+Small Wooden Drawer=
--- a/home_workshop_misc/locale/home_workshop_misc_misc.ru.tr
+++ b/home_workshop_misc/locale/home_workshop_misc_misc.ru.tr
@ -1,11 +1,7 @@
 # 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=Пивной кран
+Ahh, a frosty cold beer - look in your inventory for it!=О, холодное пиво! Ищи его в инвентаре!
 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=Автомат с газировкой
+Beer mug=Пивная кружка
+Small Wooden Drawer=
--- a/home_workshop_misc/locale/home_workshop_misc_misc.zh_CN.tr
+++ b/home_workshop_misc/locale/home_workshop_misc_misc.zh_CN.tr
@ -1,12 +1,7 @@
 # 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=啤酒龙头
+Ahh, a frosty cold beer - look in your inventory for it!=啊，一杯冰凉的啤酒-看看你的库存吧！
 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=汽水自动售货机
+Beer mug=啤酒杯
+Small Wooden Drawer=
--- a/home_workshop_misc/locale/template.txt
+++ b/home_workshop_misc/locale/template.txt
@ -1,12 +1,7 @@
 # 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=
+Ahh, a frosty cold beer - look in your inventory for it!=
 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=
+Beer mug=
+Small Wooden Drawer=
--- a/home_workshop_misc/mod.conf
+++ b/home_workshop_misc/mod.conf
@ -1,3 +1,3 @@
 name = home_workshop_misc
-depends = default, home_workshop_common
-optional_depends = currency, screwdriver, homedecor_common
+depends = xcompat
+optional_depends = currency, screwdriver, homedecor_common, default
--- a/home_workshop_misc/textures/home_workshop_common/home_workshop_common_drawer_small.png
+++ b/home_workshop_misc/textures/home_workshop_common/home_workshop_common_drawer_small.png
--- a/home_workshop_misc/textures/home_workshop_common/home_workshop_common_generic_metal.png
+++ b/home_workshop_misc/textures/home_workshop_common/home_workshop_common_generic_metal.png
--- a/home_workshop_misc/textures/home_workshop_common/home_workshop_common_generic_metal_bright.png
+++ b/home_workshop_misc/textures/home_workshop_common/home_workshop_common_generic_metal_bright.png
--- a/license.txt
+++ b/license.txt
@ -0,0 +1,2 @@
+LGPL-3.0 for code,
+CC-BY-SA-4.0 for media.
--- a/modpack.conf
+++ b/modpack.conf
@ -0,0 +1,2 @@
+name = home_workshop_modpack
+min_minetest_version = 5.4.0
--- a/modpack.txt
+++ b/modpack.txt
Author	SHA1	Message	Date
wsor4035	c3f11977c7	remove default checks from before loading craft files (#19 )	2024-04-21 22:30:48 -04:00
wsor4035	640bc42ae5	improve game agnostic ism (#18 ) * start work on xcompating this * make items digable in farlands * remove reduntant if check * use xcompat for copperblock and remove checks that prevent issues on non mtg before * computers crafting * last two crafts	2024-04-14 06:23:58 -04:00
Luke aka SwissalpS	4b5e58331c	nodes that aren't ground content (#16 )	2024-02-29 18:48:45 -05:00
Niklp	8102117572	Cleanup translation files (#15 )	2023-12-17 15:58:10 +01:00
Niklp	94836144db	Fix use_texture_alpha warnings in Minetest 5.9 (#14 )	2023-12-16 14:47:22 -05:00
Niklp	1fd279435c	fix crash due nil itemstack (#13 ) * fix crashes due nil itemstacks	2023-03-10 21:30:49 +01:00
Olivier Dragon	40b911e184	Prevent warning for accessing missing global (#11 )	2022-07-26 22:53:26 -04:00
Niklp	0724b0dda9	fix and add crafting recipes (#10 ) * fix and add crafting recipes * Update home_vending_machines/crafts.lua Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com> * fix luacheck warning Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com>	2022-06-29 14:02:38 +02:00
wsor4035	eacbe80fae	Merge pull request #6 from mt-mods/vending_crafts add crafts for vending machines	2022-02-02 15:46:23 -05:00
wsor4035	b3ca88e58d	Merge pull request #8 from mt-mods/SwissalpS-patch-1 fix single glass bug	2022-02-02 15:46:12 -05:00
Luke aka SwissalpS	b5ec85d037	fix single glass bug weirdly this is all it takes to fix https://github.com/mt-mods/home_workshop_modpack/issues/7 closes: https://github.com/mt-mods/home_workshop_modpack/issues/7	2022-02-02 17:48:35 +01:00
unknown	0af4ae2eb2	add crafts for vending machines	2022-02-02 06:33:58 -05:00
wsor4035	2058c58738	Merge pull request #3 from mt-mods/mtg_removal mtg dep removal	2021-12-26 13:00:07 -05:00
unknown	1ce0533672	make OgelGames happy	2021-12-26 12:22:40 -05:00
unknown	6f9a27ff05	relicense WFTPL -> MIT	2021-12-26 10:26:34 -05:00
unknown	c350f40405	finish default dep removal	2021-12-25 22:01:50 -05:00
unknown	35a3be337d	mrg dep removal pass 1	2021-12-04 23:51:15 -05:00
unknown	0664552799	small fixes	2021-11-28 22:09:13 -05:00
wsor4035	7043a7d15d	Merge pull request #1 from mt-mods/vending_machines add ending machines and code cleanup	2021-11-28 14:33:22 -05:00
unknown	2e2d904261	small fixes	2021-11-28 14:32:38 -05:00
unknown	daf04bd400	add ending machines and code cleanup	2021-11-28 11:40:59 -05:00
unknown	427b6b1f3f	make luacheck happy	2021-11-28 01:31:53 -05:00
unknown	92ee7e419e	add luacheck, fix errors, add github actions	2021-11-28 01:28:44 -05:00
unknown	0a43ffe46a	add documentation	2021-11-28 01:20:41 -05:00
Vanessa Dannenberg	eca7c55028	Merge branch 'master' into 'master' Fix missing paramtype for mesh nodes See merge request VanessaE/home_workshop_modpack!1	2021-05-19 11:22:10 +00:00
OgelGames	7e517d8386	fix missing paramtype for mesh nodes	2021-05-19 20:50:05 +10:00
Vanessa Dannenberg	03325e886a	Fix missing "slaystation_off" alias	2021-04-15 06:48:28 -04:00