use Unified Dyes on_dig where needed - requires Unified Dyes commit 9ff40a7f or later

* switch to colored itemstacks
with full crafting recipes
(requires Unified Dyes commit 2a816534 or later)

* allow crafting from cottages:wool also

README.md

@@ -1,13 +1,9 @@
-=-=-=-=-=-=-=-=-=-=
+## Tapestries Mod
 
-Tapestries Mod
-by: Philipbenr And DanDuncombe
+By: Philipbenr, DanDuncombe, VanessaE, FaceDeer
 
 =-=-=-=-=-=-=-=-=-=
 
 Licence: MIT
 
-see: LICENSE
-
-
 This mod contains tapestries of three different lengths, and a wooden crosspiece to hang them from. The tapestries can be dyed any color once hung.

init.lua

@@ -69,27 +69,15 @@ minetest.register_node("castle_tapestries:tapestry", {
 	paramtype = "light",
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
-	walkable = false,
 	selection_box = {
 		type = "wallmounted",
 		wall_side = {-0.5,-0.5,0.4375,0.5,1.5,0.5},
 	},
-	after_place_node = function(pos, placer, itemstack, pointed_thing)
-		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
-	end,
-	after_dig_node = unifieddyes.after_dig_node,
+	after_place_node = unifieddyes.fix_rotation_nsew,
+	on_dig = unifieddyes.on_dig,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew
 })
 
--- Crafting from wool and a stick
-
-minetest.register_craft({
-	type = "shapeless",
-	output = 'castle_tapestries:tapestry',
-	recipe = {'wool:white', 'default:stick'},
-})
-
 -- Long tapestry
 
 minetest.register_node("castle_tapestries:tapestry_long", {
@@ -103,27 +91,15 @@ minetest.register_node("castle_tapestries:tapestry_long", {
 	paramtype = "light",
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
-	walkable = false,
 	selection_box = {
 		type = "wallmounted",
 		wall_side = {-0.5,-0.5,0.4375,0.5,2.5,0.5},
 	},
-	after_place_node = function(pos, placer, itemstack, pointed_thing)
-		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
-	end,
-	after_dig_node = unifieddyes.after_dig_node,
+	after_place_node = unifieddyes.fix_rotation_nsew,
+	on_dig = unifieddyes.on_dig,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew
 })
 
--- Crafting from normal tapestry and wool
-
-minetest.register_craft({
-	type = "shapeless",
-	output = 'castle_tapestries:tapestry_long',
-	recipe = {'wool:white', 'castle_tapestries:tapestry'},
-})
-
 -- Very long tapestry
 
 minetest.register_node("castle_tapestries:tapestry_very_long", {
@@ -137,20 +113,40 @@ minetest.register_node("castle_tapestries:tapestry_very_long", {
 	paramtype = "light",
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
-	walkable = false,
 	selection_box = {
 		type = "wallmounted",
 		wall_side = {-0.5,-0.5,0.4375,0.5,3.5,0.5},
 	},
-	after_place_node = function(pos, placer, itemstack, pointed_thing)
-		unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
-		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
-	end,
-	after_dig_node = unifieddyes.after_dig_node,
+	after_place_node = unifieddyes.fix_rotation_nsew,
+	on_dig = unifieddyes.on_dig,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew
 })
 
--- Crafting from long tapestry and wool
+-- Crafting
+
+minetest.register_craft({
+	type = "shapeless",
+	output = 'castle_tapestries:tapestry',
+	recipe = {'wool:white', 'default:stick'},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = 'castle_tapestries:tapestry',
+	recipe = {'cottages:wool', 'default:stick'},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = 'castle_tapestries:tapestry_long',
+	recipe = {'wool:white', 'castle_tapestries:tapestry'},
+})
+
+minetest.register_craft({
+	type = "shapeless",
+	output = 'castle_tapestries:tapestry_long',
+	recipe = {'cottages:wool', 'castle_tapestries:tapestry'},
+})
 
 minetest.register_craft({
 	type = "shapeless",
@@ -158,6 +154,46 @@ minetest.register_craft({
 	recipe = {'wool:white', 'castle_tapestries:tapestry_long'},
 })
 
+minetest.register_craft({
+	type = "shapeless",
+	output = 'castle_tapestries:tapestry_very_long',
+	recipe = {'cottages:wool', 'castle_tapestries:tapestry_long'},
+})
+
+
+unifieddyes.register_color_craft({
+	output = "castle_tapestries:tapestry",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "castle_tapestries:tapestry",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE",
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "castle_tapestries:tapestry_long",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "castle_tapestries:tapestry_long",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE",
+	}
+})
+
+unifieddyes.register_color_craft({
+	output = "castle_tapestries:tapestry_very_long",
+	palette = "wallmounted",
+	type = "shapeless",
+	neutral_node = "castle_tapestries:tapestry_very_long",
+	recipe = {
+		"NEUTRAL_NODE",
+		"MAIN_DYE",
+	}
+})
+
 -- Convert static tapestries to param2 color
 
 local old_static_tapestries = {}

locale/it.po

@@ -0,0 +1,35 @@
+# ITALIAN LOCALE FILE FOR THE CASTLE TAPESTRIES MODULE
+# Copyright (C) 2017 Philipbenr And DanDuncombe
+# This file is distributed under the same license as the CASTLE TAPESTRIES package.
+# Hamlet <h4mlet@riseup.net>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Castle Tapestries\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-02-25 14:32-0700\n"
+"PO-Revision-Date: 2017-09-20 00:41+0100\n"
+"Last-Translator: Hamlet <h4mlet@riseup.net>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: it\n"
+"X-Generator: Poedit 1.6.10\n"
+
+#: init.lua:14
+msgid "Tapestry Top"
+msgstr "Cima dell'arazzo"
+
+#: init.lua:64
+msgid "Tapestry"
+msgstr "Arazzo"
+
+#: init.lua:94
+msgid "Tapestry (Long)"
+msgstr "Arazzo (lungo)"
+
+#: init.lua:124
+msgid "Tapestry (Very Long)"
+msgstr "Arazzo (molto lungo)"