Merge branch 'master' of yunohost:mtcontrib/homedecor_modpack into nalc-1.2-dev

computer/computers.lua

@@ -258,33 +258,6 @@ minetest.register_node("computer:tower", {
 
 minetest.register_alias("computer:tower_on", "computer:tower")
 
--- Printer/scaner combo
-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}
-		},
-	},
-})
-
 --Rack Server
 minetest.register_node("computer:server", {
 	drawtype = "nodebox",

computer/depends.txt

@@ -1,2 +1,4 @@
 default
 homedecor_common
+basic_materials
+unifieddyes

computer/init.lua

@@ -94,7 +94,7 @@ end
 
 local MODPATH = minetest.get_modpath("computer")
 dofile(MODPATH.."/computers.lua")
-dofile(MODPATH.."/miscitems.lua")
+dofile(MODPATH.."/printers.lua")
 dofile(MODPATH.."/recipes.lua")
 dofile(MODPATH.."/tetris.lua")
 

computer/miscitems.lua

@@ -1,68 +0,0 @@
--- Copyright (C) 2012-2013 Diego Martínez <kaeza@users.sf.net>
-
--- This file defines some items in order to not have to depend on other mods.
-
-local S = homedecor.gettext
-
-if (not minetest.get_modpath("homedecor")) then
-
-	minetest.register_craftitem(":basic_materials:plastic_sheet", {
-		description = S("Plastic sheet"),
-		inventory_image = "homedecor_plastic_sheeting.png",
-	})
-
-	minetest.register_craftitem(":homedecor:plastic_base", {
-		description = S("Unprocessed Plastic base"),
-		wield_image = "homedecor_plastic_base.png",
-		inventory_image = "homedecor_plastic_base_inv.png",
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = 'homedecor:plastic_base 6',
-		recipe = { "default:junglegrass",
-		   "default:junglegrass",
-		   "default:junglegrass"
-		}
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = 'homedecor:plastic_base 3',
-		recipe = { "default:dry_shrub",
-		   "default:dry_shrub",
-		   "default:dry_shrub"
-		},
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = 'homedecor:plastic_base 4',
-		recipe = { "default:leaves",
-			   "default:leaves",
-			   "default:leaves",
-			   "default:leaves",
-			   "default:leaves",
-			   "default:leaves"
-		}
-	})
-
-	minetest.register_craft({
-		type = "cooking",
-		output = "basic_materials:plastic_sheet",
-		recipe = "homedecor:plastic_base",
-	})
-
-	minetest.register_craft({
-		type = 'fuel',
-		recipe = 'homedecor:plastic_base',
-		burntime = 30,
-	})
-
-	minetest.register_craft({
-		type = 'fuel',
-		recipe = 'basic_materials:plastic_sheet',
-		burntime = 30,
-	})
-
-end -- not homedecor

computer/printers.lua

@@ -0,0 +1,61 @@
+-- Printers of some kind or another
+
+local S = homedecor.gettext
+
+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")'),
+	inventory_image = "computer_3dprinter_bedflinger_inv.png",
+	tiles = {
+		{ name = "computer_3dprinter_bedflinger.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,
+})
+