remove errant core file

(water is now blue like it used to be)

.luacheckrc

@@ -4,9 +4,7 @@ allow_defined_top = true
 read_globals = {
 	"DIR_DELIM",
 	"minetest", "core",
-	"unpack",
 	"dump",
-	table = { fields = { "copy", "getn" } },
 	"vector", "nodeupdate",
 	"VoxelManip", "VoxelArea",
 	"PseudoRandom", "ItemStack",
@@ -19,7 +17,6 @@ read_globals = {
 	"mesecon",
 	"unifieddyes",
 	"creative",
-	"homedecor_i18n",
 }
 
 globals = {

LICENSE

@@ -1,15 +1,17 @@
-License for code: LGPL 3.0
-License for media and all other assets:  CC-by-SA 4.0
+For the Lua code:  LGPL 3.0 or higher
+For all models, all textures, and all sounds:  CC-by-SA 3.0 or higher
+For everything else: WTFPL
 
-These licenses apply to all modules and components in this modpack,
-unless otherwise stated.
+Exceptions to the above:
 
-###############################################################################
+Fancy mesh fire model and texture by NathanS (CC-0).
+
+===============================================================================
 
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -172,432 +174,26 @@ apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
 
-###############################################################################
+===============================================================================
 
-Attribution-ShareAlike 4.0 International
+This work is licensed under the Creative Commons Attribution-ShareAlike 
+4.0 International License. To view a copy of this license, visit 
+http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to 
+Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
 
-=======================================================================
+===============================================================================
 
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
 
-Using Creative Commons Public Licenses
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
 
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
 
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-	wiki.creativecommons.org/Considerations_for_licensors
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More considerations
-     for the public: 
-	wiki.creativecommons.org/Considerations_for_licensees
+  0. You just DO WHAT THE FUCK YOU WANT TO.
 
-=======================================================================
-
-Creative Commons Attribution-ShareAlike 4.0 International Public
-License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-ShareAlike 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. BY-SA Compatible License means a license listed at
-     creativecommons.org/compatiblelicenses, approved by Creative
-     Commons as essentially the equivalent of this Public License.
-
-  d. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  e. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  f. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  g. License Elements means the license attributes listed in the name
-     of a Creative Commons Public License. The License Elements of this
-     Public License are Attribution and ShareAlike.
-
-  h. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  i. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  j. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  k. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  l. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  m. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. Additional offer from the Licensor -- Adapted Material.
-               Every recipient of Adapted Material from You
-               automatically receives an offer from the Licensor to
-               exercise the Licensed Rights in the Adapted Material
-               under the conditions of the Adapter's License You apply.
-
-            c. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-  b. ShareAlike.
-
-     In addition to the conditions in Section 3(a), if You Share
-     Adapted Material You produce, the following conditions also apply.
-
-       1. The Adapter's License You apply must be a Creative Commons
-          license with the same License Elements, this version or
-          later, or a BY-SA Compatible License.
-
-       2. You must include the text of, or the URI or hyperlink to, the
-          Adapter's License You apply. You may satisfy this condition
-          in any reasonable manner based on the medium, means, and
-          context in which You Share Adapted Material.
-
-       3. You may not offer or impose any additional or different terms
-          or conditions on, or apply any Effective Technological
-          Measures to, Adapted Material that restrict exercise of the
-          rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material,
-
-     including for purposes of Section 3(b); and
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.

building_blocks/alias.lua

@@ -1,61 +0,0 @@
-local S = homedecor_i18n.gettext
-
-if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
-	minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")
-	minetest.register_alias("building_blocks:stair_tar", "stairs:stair_Tar")
-	minetest.register_alias("building_blocks:slab_marble", "stairs:slab_Marble")
-	minetest.register_alias("building_blocks:stair_marble", "stairs:stair_Marble")
-end
-
-if minetest.get_modpath("moreblocks") then
-	stairsplus:register_alias_all("building_blocks", "tar", "building_blocks", "Tar")
-	stairsplus:register_alias_all("building_blocks", "marble", "building_blocks", "Marble")
-	for _, i in ipairs(stairsplus.shapes_list) do
-		local class = i[1]
-		local cut = i[2]
-		minetest.unregister_item("moreblocks:"..class.."tar"..cut)
-		minetest.register_alias("moreblocks:"..class.."tar"..cut, "building_blocks:"..class.."tar"..cut)
-	end
-	minetest.unregister_item("moreblocks:tar")
-	minetest.register_alias("moreblocks:tar", "building_blocks:Tar")
-	stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar")
-
-	if minetest.get_modpath("gloopblocks") then
-		minetest.register_alias("building_blocks:gravel_spread", "gloopblocks:slab_gravel_1")
-	end
-end
-
-minetest.register_alias("adobe", "building_blocks:Adobe")
-minetest.register_alias("fakegrass", "building_blocks:fakegrass")
-minetest.register_alias("hardwood", "building_blocks:hardwood")
-minetest.register_alias("tar_knife", "building_blocks:knife")
-minetest.register_alias("marble", "building_blocks:Marble")
-minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing")
-minetest.register_alias("sticks", "building_blocks:sticks")
-minetest.register_alias("building_blocks:faggot", "building_blocks:sticks")
-minetest.register_alias("tar", "building_blocks:Tar")
-
-if not minetest.get_modpath("technic") then
-	minetest.register_node( ":technic:granite", {
-		    description = S("Granite"),
-		    tiles = { "technic_granite.png" },
-		    is_ground_content = true,
-		    groups = {cracky=1},
-		    sounds = default.node_sound_stone_defaults(),
-	})
-	minetest.register_craft({
-		output = "technic:granite 9",
-		recipe = {
-			{ "group:tar_block", "group:marble", "group:tar_block" },
-			{ "group:marble", "group:tar_block", "group:marble" },
-			{ "group:tar_block", "group:marble", "group:tar_block" }
-		},
-	})
-	if minetest.get_modpath("moreblocks") then
-		stairsplus:register_all("technic", "granite", "technic:granite", {
-				description=S("Granite"),
-				groups={cracky=1, not_in_creative_inventory=1},
-				tiles={"technic_granite.png"},
-		})
-	end
-end

building_blocks/depends.txt

@@ -1,5 +1,3 @@
 default
 homedecor_i18n
 moreblocks?
-gloopblocks?
-stairs?

building_blocks/init.lua

@@ -1,7 +1,633 @@
-local S = homedecor_i18n.gettext
-local modpath = minetest.get_modpath("building_blocks")
 
-dofile(modpath.."/alias.lua")
-dofile(modpath.."/node_stairs.lua")
-dofile(modpath.."/others.lua")
-dofile(modpath.."/recipes.lua")
+local S = homedecor_i18n.gettext
+
+minetest.register_node("building_blocks:Adobe", {
+	tiles = {"building_blocks_Adobe.png"},
+	description = S("Adobe"),
+	is_ground_content = true,
+	groups = {crumbly=3},
+	sounds = default.node_sound_stone_defaults(),
+})
+minetest.register_node("building_blocks:Roofing", {
+	tiles = {"building_blocks_Roofing.png"},
+	is_ground_content = true,
+	description = S("Roof block"),
+	groups = {snappy=3},
+})
+minetest.register_craft({
+	output = 'building_blocks:terrycloth_towel 2',
+	recipe = {
+		{"farming:string", "farming:string", "farming:string"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:Tarmac_spread 4',
+	recipe = {
+		{"group:tar_block", "group:tar_block"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:gravel_spread 4',
+	recipe = {
+		{"default:gravel", "default:gravel", "default:gravel"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:brobble_spread 4',
+	recipe = {
+		{"default:brick", "default:cobble", "default:brick"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:Fireplace 1',
+	recipe = {
+		{"default:steel_ingot", "building_blocks:sticks", "default:steel_ingot"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:Adobe 3',
+	recipe = {
+		{"default:sand"},
+		{"default:clay"},
+		{"group:stick"},
+	}
+})
+
+minetest.register_craft({
+	output = 'building_blocks:Roofing 10',
+	recipe = {
+		{"building_blocks:Adobe", "building_blocks:Adobe"},
+		{"building_blocks:Adobe", "building_blocks:Adobe"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:BWtile 10',
+	recipe = {
+		{"group:marble", "group:tar_block"},
+		{"group:tar_block", "group:marble"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:grate 1',
+	recipe = {
+		{"default:steel_ingot", "default:steel_ingot"},
+		{"default:glass", "default:glass"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:woodglass 1',
+	recipe = {
+		{"default:wood"},
+		{"default:glass"},
+	}
+})
+minetest.register_craft({
+	output = 'building_blocks:hardwood 2',
+	recipe = {
+		{"default:wood", "default:junglewood"},
+		{"default:junglewood", "default:wood"},
+	}
+})
+
+minetest.register_craft({
+	output = 'building_blocks:hardwood 2',
+	recipe = {
+		{"default:junglewood", "default:wood"},
+		{"default:wood", "default:junglewood"},
+	}
+})
+if minetest.get_modpath("moreblocks") then
+	minetest.register_craft({
+		output = 'building_blocks:sticks 2',
+		recipe = {
+			{'group:stick', ''           , 'group:stick'},
+			{'group:stick', 'group:stick', 'group:stick'},
+			{'group:stick', 'group:stick', 'group:stick'},
+		}
+	})
+else
+	minetest.register_craft({
+		output = 'building_blocks:sticks',
+		recipe = {
+			{'group:stick', 'group:stick'},
+			{'group:stick', 'group:stick'},
+		}
+	})
+end
+
+minetest.register_craft({
+	output = 'default:stick 4',
+	recipe = {
+		{'building_blocks:sticks'},
+	}
+})
+
+minetest.register_craft({
+	output = 'building_blocks:fakegrass 2',
+	recipe = {
+		{'default:leaves'},
+		{"default:dirt"},
+	}
+})
+
+minetest.register_craft({
+	output = 'building_blocks:tar_base 4',
+	recipe = {
+		{"default:coal_lump", "default:gravel"},
+		{"default:gravel", "default:coal_lump"}
+	}
+})
+
+minetest.register_craft({
+	output = 'building_blocks:tar_base 4',
+	recipe = {
+		{"default:gravel", "default:coal_lump"},
+		{"default:coal_lump", "default:gravel"}
+	}
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "building_blocks:smoothglass",
+	recipe = "default:glass"
+})
+minetest.register_node("building_blocks:smoothglass", {
+	drawtype = "glasslike",
+	description = S("Streak Free Glass"),
+	tiles = {"building_blocks_sglass.png"},
+	inventory_image = minetest.inventorycube("building_blocks_sglass.png"),
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
+	sounds = default.node_sound_glass_defaults(),
+})
+minetest.register_node("building_blocks:grate", {
+	drawtype = "glasslike",
+	description = S("Grate"),
+	tiles = {"building_blocks_grate.png"},
+	inventory_image = minetest.inventorycube("building_blocks_grate.png"),
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {cracky=1},
+})
+
+minetest.register_node("building_blocks:Fireplace", {
+	description = S("Fireplace"),
+	tiles = {
+		"building_blocks_cast_iron.png",
+		"building_blocks_cast_iron.png",
+		"building_blocks_cast_iron.png",
+		"building_blocks_cast_iron_fireplace.png"
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	light_source = default.LIGHT_MAX,
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {cracky=2},
+})
+
+minetest.register_node("building_blocks:woodglass", {
+	drawtype = "glasslike",
+	description = S("Wood Framed Glass"),
+	tiles = {"building_blocks_wglass.png"},
+	inventory_image = minetest.inventorycube("building_blocks_wglass.png"),
+	paramtype = "light",
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
+	sounds = default.node_sound_glass_defaults(),
+})
+minetest.register_node("building_blocks:terrycloth_towel", {
+	drawtype = "raillike",
+	description = S("Terrycloth towel"),
+	tiles = {"building_blocks_towel.png"},
+	inventory_image = "building_blocks_towel_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {crumbly=3},
+})
+minetest.register_node("building_blocks:Tarmac_spread", {
+	drawtype = "raillike",
+	description = S("Tarmac Spread"),
+	tiles = {"building_blocks_tar.png"},
+	inventory_image = "building_blocks_tar_spread_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {cracky=3},
+	sounds = default.node_sound_dirt_defaults(),
+})
+minetest.register_node("building_blocks:BWtile", {
+	drawtype = "raillike",
+	description = S("Chess board tiling"),
+	tiles = {"building_blocks_BWtile.png"},
+	inventory_image = "building_blocks_bwtile_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {crumbly=3},
+})
+minetest.register_node("building_blocks:brobble_spread", {
+	drawtype = "raillike",
+	-- Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
+	-- Translate however you see fit.
+	description = S("Brobble Spread"),
+	tiles = {"building_blocks_brobble.png"},
+	inventory_image = "building_blocks_brobble_spread_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {crumbly=3},
+})
+minetest.register_node("building_blocks:gravel_spread", {
+	drawtype = "raillike",
+	description = S("Gravel Spread"),
+	tiles = {"default_gravel.png"},
+	inventory_image = "building_blocks_gravel_spread_inv.png",
+	paramtype = "light",
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+                -- but how to specify the dimensions for curved and sideways rails?
+                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
+	},
+	sunlight_propagates = true,
+	is_ground_content = true,
+	groups = {crumbly=2},
+	sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_gravel_footstep", gain=0.5},
+		dug = {name="default_gravel_footstep", gain=1.0},
+	}),
+})
+minetest.register_node("building_blocks:hardwood", {
+	tiles = {"building_blocks_hardwood.png"},
+	is_ground_content = true,
+	description = S("Hardwood"),
+	groups = {choppy=1,flammable=1},
+	sounds = default.node_sound_wood_defaults(),
+})
+
+if minetest.get_modpath("moreblocks") then
+
+	stairsplus:register_all(
+		"building_blocks",
+		"marble",
+		"building_blocks:Marble",
+		{
+			description = "Marble",
+			tiles = {"building_blocks_marble.png"},
+			groups = {cracky=3},
+			sounds = default.node_sound_stone_defaults(),
+		}
+	)
+	stairsplus:register_all(
+		"building_blocks",
+		"hardwood",
+		"building_blocks:hardwood",
+		{
+			description = "Hardwood",
+			tiles = {"building_blocks_hardwood.png"},
+			groups = {choppy=1,flammable=1},
+			sounds = default.node_sound_wood_defaults(),
+		}
+	)
+	stairsplus:register_all(
+		"building_blocks",
+		"fakegrass",
+		"building_blocks:fakegrass",
+		{
+			description = "Grass",
+			tiles = {"default_grass.png"},
+			groups = {crumbly=3},
+			sounds = default.node_sound_dirt_defaults({
+				footstep = {name="default_grass_footstep", gain=0.4},
+			}),
+		}
+	)
+
+	for _, i in ipairs(stairsplus.shapes_list) do
+		local class = i[1]
+		local cut = i[2]
+		minetest.unregister_item("moreblocks:"..class.."tar"..cut)
+		minetest.register_alias("moreblocks:"..class.."tar"..cut, "building_blocks:"..class.."tar"..cut)
+
+	end
+	minetest.unregister_item("moreblocks:tar")
+	minetest.register_alias("moreblocks:tar", "building_blocks:Tar")
+
+	stairsplus:register_all(
+		"building_blocks",
+		"tar",
+		"building_blocks:Tar",
+		{
+			description = "Tar",
+			tiles = {"building_blocks_tar.png"},
+			groups = {crumbly=1},
+			sounds = default.node_sound_stone_defaults(),
+		}
+	)
+
+	stairsplus:register_all(
+		"building_blocks",
+		"grate",
+		"building_blocks:grate",
+		{
+			description = "Grate",
+			tiles = {"building_blocks_grate.png"},
+			groups = {cracky=1},
+			sounds = default.node_sound_stone_defaults(),
+		}
+	)
+	stairsplus:register_all(
+		"building_blocks",
+		"Adobe",
+		"building_blocks:Adobe",
+		{
+			description = "Adobe",
+			tiles = {"building_blocks_Adobe.png"},
+			groups = {crumbly=3},
+			sounds = default.node_sound_stone_defaults(),
+		}
+	)
+	stairsplus:register_all(
+		"building_blocks",
+		"Roofing",
+		"building_blocks:Roofing",
+		{
+			description = "Roofing",
+			tiles = {"building_blocks_Roofing.png"},
+			groups = {snappy=3},
+			sounds = default.node_sound_stone_defaults(),
+		}
+	)
+else
+	bb_stairs = {}
+
+	-- Node will be called stairs:stair_<subname>
+	function bb_stairs.register_stair(subname, recipeitem, groups, images, description)
+		minetest.register_node("building_blocks:stair_" .. subname, {
+			description = description,
+			drawtype = "nodebox",
+			tiles = images,
+			paramtype = "light",
+			paramtype2 = "facedir",
+			is_ground_content = true,
+			groups = groups,
+			node_box = {
+				type = "fixed",
+				fixed = {
+					{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+					{-0.5, 0, 0, 0.5, 0.5, 0.5},
+				},
+			},
+		})
+
+		minetest.register_craft({
+			output = 'building_blocks:stair_' .. subname .. ' 4',
+			recipe = {
+				{recipeitem, "", ""},
+				{recipeitem, recipeitem, ""},
+				{recipeitem, recipeitem, recipeitem},
+			},
+		})
+
+		-- Flipped recipe for the silly minecrafters
+		minetest.register_craft({
+			output = 'building_blocks:stair_' .. subname .. ' 4',
+			recipe = {
+				{"", "", recipeitem},
+				{"", recipeitem, recipeitem},
+				{recipeitem, recipeitem, recipeitem},
+			},
+		})
+	end
+
+	-- Node will be called stairs:slab_<subname>
+	function bb_stairs.register_slab(subname, recipeitem, groups, images, description)
+		minetest.register_node("building_blocks:slab_" .. subname, {
+			description = description,
+			drawtype = "nodebox",
+			tiles = images,
+			paramtype = "light",
+			is_ground_content = true,
+			groups = groups,
+			node_box = {
+				type = "fixed",
+				fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+			},
+			selection_box = {
+				type = "fixed",
+				fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5},
+			},
+		})
+
+		minetest.register_craft({
+			output = 'building_blocks:slab_' .. subname .. ' 3',
+			recipe = {
+				{recipeitem, recipeitem, recipeitem},
+			},
+		})
+	end
+
+	-- Nodes will be called stairs:{stair,slab}_<subname>
+	function bb_stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab)
+		bb_stairs.register_stair(subname, recipeitem, groups, images, desc_stair)
+		bb_stairs.register_slab(subname, recipeitem, groups, images, desc_slab)
+	end
+	bb_stairs.register_stair_and_slab("marble","building_blocks:Marble",
+		{cracky=3},
+		{"building_blocks_marble.png"},
+		S("Marble stair"),
+		S("Marble slab")
+	)
+	bb_stairs.register_stair_and_slab("hardwood","building_blocks:hardwood",
+		{choppy=1,flammable=1},
+		{"building_blocks_hardwood.png"},
+		S("Hardwood stair"),
+		S("Hardwood slab")
+	)
+	bb_stairs.register_stair_and_slab("fakegrass","building_blocks:fakegrass",
+		{crumbly=3},
+		{"default_grass.png"},
+		S("Grass stair"),
+		S("Grass slab")
+	)
+	bb_stairs.register_stair_and_slab("tar","building_blocks:Tar",
+		{crumbly=1},
+		{"building_blocks_tar.png"},
+		S("Tar stair"),
+		S("Tar slab")
+	)
+	bb_stairs.register_stair_and_slab("grate","building_blocks:grate",
+		{cracky=1},
+		{"building_blocks_grate.png"},
+		S("Grate Stair"),
+		S("Grate Slab")
+	)
+	bb_stairs.register_stair_and_slab("Adobe", "building_blocks:Adobe",
+		{crumbly=3},
+		{"building_blocks_Adobe.png"},
+		S("Adobe stair"),
+		S("Adobe slab")
+	)
+	bb_stairs.register_stair_and_slab("Roofing", "building_blocks:Roofing",
+		{snappy=3},
+		{"building_blocks_Roofing.png"},
+		S("Roofing stair"),
+		S("Roofing slab")
+	)
+end
+
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "building_blocks:hardwood",
+	burntime = 28,
+})
+
+minetest.register_node("building_blocks:fakegrass", {
+	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+	description = S("Fake Grass"),
+	is_ground_content = true,
+	groups = {crumbly=3},
+		sounds = default.node_sound_dirt_defaults({
+		footstep = {name="default_grass_footstep", gain=0.4},
+	}),
+})
+
+minetest.register_craftitem("building_blocks:sticks", {
+	description = S("Small bundle of sticks"),
+	image = "building_blocks_sticks.png",
+	on_place_on_ground = minetest.craftitem_place_item,
+})
+
+minetest.register_craftitem("building_blocks:tar_base", {
+	description = S("Tar base"),
+	image = "building_blocks_tar_base.png",
+})
+
+--Tar
+minetest.register_craft({
+	output = 'building_blocks:knife 1',
+	recipe = {
+		{"group:tar_block"},
+		{"group:stick"},
+	}
+})
+
+minetest.register_alias("tar", "building_blocks:Tar")
+minetest.register_alias("fakegrass", "building_blocks:fakegrass")
+minetest.register_alias("tar_knife", "building_blocks:knife")
+minetest.register_alias("adobe", "building_blocks:Adobe")
+minetest.register_alias("building_blocks_roofing", "building_blocks:Roofing")
+minetest.register_alias("hardwood", "building_blocks:hardwood")
+minetest.register_alias("sticks", "building_blocks:sticks")
+minetest.register_alias("building_blocks:faggot", "building_blocks:sticks")
+minetest.register_alias("marble", "building_blocks:Marble")
+
+minetest.register_node("building_blocks:Tar", {
+	description = S("Tar"),
+	tiles = {"building_blocks_tar.png"},
+	is_ground_content = true,
+	groups = {crumbly=1, tar_block = 1},
+	sounds = default.node_sound_stone_defaults(),
+})
+minetest.register_node("building_blocks:Marble", {
+	description = S("Marble"),
+	tiles = {"building_blocks_marble.png"},
+	is_ground_content = true,
+	groups = {cracky=3, marble = 1},
+	sounds = default.node_sound_stone_defaults(),
+})
+minetest.register_craft({
+	type = "fuel",
+	recipe = "building_blocks:sticks",
+	burntime = 5,
+})
+minetest.register_craft({
+	type = "fuel",
+	recipe = "building_blocks:Tar",
+	burntime = 40,
+})
+
+minetest.register_craft({
+	type = "cooking",
+	output = "building_blocks:Tar",
+	recipe = "building_blocks:tar_base",
+})
+
+minetest.register_tool("building_blocks:knife", {
+	description = S("Tar Knife"),
+	inventory_image = "building_blocks_knife.png",
+	tool_capabilities = {
+		max_drop_level=0,
+		groupcaps={
+			choppy={times={[2]=7.50, [3]=2.80}, uses=100, maxlevel=1},
+			fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
+		}
+	},
+})
+
+minetest.register_craft({
+	output = "building_blocks:Marble 9",
+	recipe = {
+		{"default:clay", "group:tar_block", "default:clay"},
+		{"group:tar_block","default:clay", "group:tar_block"},
+		{"default:clay", "group:tar_block","default:clay"},
+	}
+})
+
+if not minetest.get_modpath("technic") then
+	minetest.register_node( ":technic:granite", {
+		    description = S("Granite"),
+		    tiles = { "technic_granite.png" },
+		    is_ground_content = true,
+		    groups = {cracky=1},
+		    sounds = default.node_sound_stone_defaults(),
+	})
+
+	minetest.register_craft({
+		output = "technic:granite 9",
+		recipe = {
+			{ "group:tar_block", "group:marble", "group:tar_block" },
+			{ "group:marble", "group:tar_block", "group:marble" },
+			{ "group:tar_block", "group:marble", "group:tar_block" }
+		},
+	})
+
+	if minetest.get_modpath("moreblocks") then
+		stairsplus:register_all("technic", "granite", "technic:granite", {
+				description=S("Granite"),
+				groups={cracky=1, not_in_creative_inventory=1},
+				tiles={"technic_granite.png"},
+		})
+	end
+end

building_blocks/node_stairs.lua

@@ -1,230 +0,0 @@
-local S = homedecor_i18n.gettext
-
-local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
-
-local function building_blocks_stairs(nodename, def)
-	minetest.register_node(nodename, def)
-	if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
-		local mod, name = nodename:match("(.*):(.*)")
-		minetest.register_alias(mod .. ":slab_" .. name, "stairs:slab_" .. name)
-		minetest.register_alias(mod .. ":stair_" .. name, "stairs:stair_" .. name)
-		local stairs_groups = {}
-		for _, groupname in ipairs(stairs_groups_names) do
-			stairs_groups[groupname] = def.groups[groupname]
-		end
-
-		if minetest.get_modpath("moreblocks") then
-			stairsplus:register_all(
-				mod,
-				name,
-				nodename,
-				{
-					description = def.description,
-					tiles = def.tiles,
-					groups = stairs_groups,
-					sounds = def.sounds,
-				}
-			)
-		else
-			stairs.register_stair_and_slab(name,nodename,
-				stairs_groups,
-				def.tiles,
-				("%s Stair"):format(def.description),
-				("%s Slab"):format(def.description),
-				def.sounds
-			)
-		end	
-	end
-end
-
-building_blocks_stairs("building_blocks:grate", {
-	drawtype = "glasslike",
-	description = S("Grate"),
-	tiles = {"building_blocks_grate.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults(),
-})
-building_blocks_stairs("building_blocks:smoothglass", {
-	drawtype = "glasslike",
-	description = S("Streak Free Glass"),
-	tiles = {"building_blocks_sglass.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
-	sounds = default.node_sound_glass_defaults(),
-})
-building_blocks_stairs("building_blocks:woodglass", {
-	drawtype = "glasslike",
-	description = S("Wood Framed Glass"),
-	tiles = {"building_blocks_wglass.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
-	sounds = default.node_sound_glass_defaults(),
-})
-
-building_blocks_stairs("building_blocks:Adobe", {
-	tiles = {"building_blocks_Adobe.png"},
-	description = S("Adobe"),
-	is_ground_content = true,
-	groups = {crumbly=3},
-	sounds = default.node_sound_stone_defaults(),
-})
-building_blocks_stairs("building_blocks:fakegrass", {
-	tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
-	description = S("Fake Grass"),
-	is_ground_content = true,
-	groups = {crumbly=3},
-	sounds = default.node_sound_dirt_defaults({
-		footstep = {name="default_grass_footstep", gain=0.4},
-	}),
-})
-building_blocks_stairs("building_blocks:hardwood", {
-	tiles = {"building_blocks_hardwood.png"},
-	is_ground_content = true,
-	description = S("Hardwood"),
-	groups = {choppy=1,flammable=1},
-	sounds = default.node_sound_wood_defaults(),
-})
-building_blocks_stairs("building_blocks:Roofing", {
-	tiles = {"building_blocks_Roofing.png"},
-	is_ground_content = true,
-	description = S("Roof block"),
-	groups = {snappy=3},
-	sounds = default.node_sound_stone_defaults(),
-})
-building_blocks_stairs("building_blocks:Tar", {
-	description = S("Tar"),
-	tiles = {"building_blocks_tar.png"},
-	is_ground_content = true,
-	groups = {crumbly=1, tar_block = 1},
-	sounds = default.node_sound_stone_defaults(),
-})
-building_blocks_stairs("building_blocks:Marble", {
-	description = S("Marble"),
-	tiles = {"building_blocks_marble.png"},
-	is_ground_content = true,
-	groups = {cracky=3, marble = 1},
-	sounds = default.node_sound_stone_defaults(),
-})
-
-minetest.register_node("building_blocks:brobble_spread", {
-	drawtype = "raillike",
-	-- Translators: "Brobble" is a portmanteau of "Brick" and "Cobble".
-	-- Translate however you see fit.
-	description = S("Brobble Spread"),
-	tiles = {"building_blocks_brobble.png"},
-	inventory_image = "building_blocks_brobble_spread_inv.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {crumbly=3},
-})
-
-if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then
-	minetest.register_node("building_blocks:gravel_spread", {
-		drawtype = "raillike",
-		description = S("Gravel Spread"),
-		tiles = {"default_gravel.png"},
-		inventory_image = "building_blocks_gravel_spread_inv.png",
-		paramtype = "light",
-		walkable = false,
-		selection_box = {
-			type = "fixed",
-					-- but how to specify the dimensions for curved and sideways rails?
-					fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-		},
-		sunlight_propagates = true,
-		is_ground_content = true,
-		groups = {crumbly=2},
-		sounds = default.node_sound_dirt_defaults({
-			footstep = {name="default_gravel_footstep", gain=0.5},
-			dug = {name="default_gravel_footstep", gain=1.0},
-		}),
-	})
-end
-
-minetest.register_node("building_blocks:Tarmac_spread", {
-	drawtype = "raillike",
-	description = S("Tarmac Spread"),
-	tiles = {"building_blocks_tar.png"},
-	inventory_image = "building_blocks_tar_spread_inv.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_dirt_defaults(),
-})
-minetest.register_node("building_blocks:terrycloth_towel", {
-	drawtype = "raillike",
-	description = S("Terrycloth towel"),
-	tiles = {"building_blocks_towel.png"},
-	inventory_image = "building_blocks_towel_inv.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-                -- but how to specify the dimensions for curved and sideways rails?
-                fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {crumbly=3},
-})
-
-minetest.register_node("building_blocks:BWtile", {
-	drawtype = "nodebox",
-	description = S("Chess board tiling"),
-	tiles = {
-		"building_blocks_BWtile.png",
-		"building_blocks_BWtile.png^[transformR90",
-		"building_blocks_BWtile.png^[transformR90",
-		"building_blocks_BWtile.png^[transformR90",
-		"building_blocks_BWtile.png",
-		"building_blocks_BWtile.png"
-	},
-	inventory_image = "building_blocks_bwtile_inv.png",
-	paramtype = "light",
-	walkable = false,
-	node_box = {
-		type = "fixed",
-		fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-	},
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {crumbly=3},
-})
-
-minetest.register_node("building_blocks:Fireplace", {
-	description = S("Fireplace"),
-	tiles = {
-		"building_blocks_cast_iron.png",
-		"building_blocks_cast_iron.png",
-		"building_blocks_cast_iron.png",
-		"building_blocks_cast_iron_fireplace.png"
-	},
-	paramtype = "light",
-	paramtype2 = "facedir",
-	light_source = default.LIGHT_MAX,
-	sunlight_propagates = true,
-	is_ground_content = true,
-	groups = {cracky=2},
-	sounds = default.node_sound_stone_defaults(),
-})

building_blocks/others.lua

@@ -1,23 +0,0 @@
-local S = homedecor_i18n.gettext
-
-minetest.register_craftitem("building_blocks:sticks", {
-	description = S("Small bundle of sticks"),
-	image = "building_blocks_sticks.png",
-	on_place_on_ground = minetest.craftitem_place_item,
-})
-minetest.register_craftitem("building_blocks:tar_base", {
-	description = S("Tar base"),
-	image = "building_blocks_tar_base.png",
-})
-
-minetest.register_tool("building_blocks:knife", {
-	description = S("Tar Knife"),
-	inventory_image = "building_blocks_knife.png",
-	tool_capabilities = {
-		max_drop_level=0,
-		groupcaps={
-			choppy={times={[2]=7.50, [3]=2.80}, uses=100, maxlevel=1},
-			fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
-		}
-	},
-})

building_blocks/recipes.lua

@@ -1,174 +0,0 @@
-local S = homedecor_i18n.gettext
-
-if minetest.get_modpath("moreblocks") then
-	minetest.register_craft({
-		output = 'building_blocks:sticks 2',
-		recipe = {
-			{'group:stick', ''           , 'group:stick'},
-			{'group:stick', 'group:stick', 'group:stick'},
-			{'group:stick', 'group:stick', 'group:stick'},
-		}
-	})
-else
-	minetest.register_craft({
-		output = 'building_blocks:sticks',
-		recipe = {
-			{'group:stick', 'group:stick'},
-			{'group:stick', 'group:stick'},
-		}
-	})
-end
-
-minetest.register_craft({
-	output = 'building_blocks:Adobe 3',
-	recipe = {
-		{"default:sand"},
-		{"default:clay"},
-		{"group:stick"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:brobble_spread 4',
-	recipe = {
-		{"default:brick", "default:cobble", "default:brick"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:BWtile 10',
-	recipe = {
-		{"group:marble", "group:tar_block"},
-		{"group:tar_block", "group:marble"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:fakegrass 2',
-	recipe = {
-		{'default:leaves'},
-		{"default:dirt"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:Fireplace 1',
-	recipe = {
-		{"default:steel_ingot", "building_blocks:sticks", "default:steel_ingot"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:grate 1',
-	recipe = {
-		{"default:steel_ingot", "default:steel_ingot"},
-		{"default:glass", "default:glass"},
-	}
-})
-
-if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then
-	minetest.register_craft({
-		output = 'building_blocks:gravel_spread 4',
-		recipe = {
-			{"default:gravel", "default:gravel", "default:gravel"},
-		}
-	})
-end
-
-minetest.register_craft({
-	output = 'building_blocks:hardwood 2',
-	recipe = {
-		{"default:wood", "default:junglewood"},
-		{"default:junglewood", "default:wood"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:hardwood 2',
-	recipe = {
-		{"default:junglewood", "default:wood"},
-		{"default:wood", "default:junglewood"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:knife 1',
-	recipe = {
-		{"group:tar_block"},
-		{"group:stick"},
-	}
-})
-minetest.register_craft({
-	output = "building_blocks:Marble 9",
-	recipe = {
-		{"default:clay", "group:tar_block", "default:clay"},
-		{"group:tar_block","default:clay", "group:tar_block"},
-		{"default:clay", "group:tar_block","default:clay"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:Roofing 10',
-	recipe = {
-		{"building_blocks:Adobe", "building_blocks:Adobe"},
-		{"building_blocks:Adobe", "building_blocks:Adobe"},
-	}
-})
-minetest.register_craft({
-	output = 'default:stick 4',
-	recipe = {
-		{'building_blocks:sticks'},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:tar_base 4',
-	recipe = {
-		{"default:coal_lump", "default:gravel"},
-		{"default:gravel", "default:coal_lump"}
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:tar_base 4',
-	recipe = {
-		{"default:gravel", "default:coal_lump"},
-		{"default:coal_lump", "default:gravel"}
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:Tarmac_spread 4',
-	recipe = {
-		{"group:tar_block", "group:tar_block"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:terrycloth_towel 2',
-	recipe = {
-		{"farming:string", "farming:string", "farming:string"},
-	}
-})
-minetest.register_craft({
-	output = 'building_blocks:woodglass 1',
-	recipe = {
-		{"default:wood"},
-		{"default:glass"},
-	}
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "building_blocks:smoothglass",
-	recipe = "default:glass"
-})
-minetest.register_craft({
-	type = "cooking",
-	output = "building_blocks:Tar",
-	recipe = "building_blocks:tar_base",
-})
-
-minetest.register_craft({
-	type = "fuel",
-	recipe = "building_blocks:hardwood",
-	burntime = 28,
-})
-minetest.register_craft({
-	type = "fuel",
-	recipe = "building_blocks:sticks",
-	burntime = 5,
-})
-minetest.register_craft({
-	type = "fuel",
-	recipe = "building_blocks:Tar",
-	burntime = 40,
-})

chains/depends.txt

@@ -0,0 +1,2 @@
+default
+homedecor

chains/init.lua

@@ -0,0 +1,179 @@
+
+local S = homedecor_i18n.gettext
+
+local chains_sbox = {
+	type = "fixed",
+	fixed = { -0.1, -0.625, -0.1, 0.1, 0.5, 0.1 }
+}
+
+local topchains_sbox = {
+	type = "fixed",
+	fixed = {
+		{ -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 },
+		{ -0.1, -0.625, -0.1, 0.1, 0.4, 0.1 }
+	}
+}
+
+minetest.register_node("chains:chain", {
+	description = S("Hanging chain (wrought iron)"),
+	drawtype = "mesh",
+	mesh = "chains.obj",
+	tiles = {"chains_wrought_iron.png"},
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	paramtype = "light",
+	inventory_image = "chain_wrought_iron_inv.png",
+	groups = {cracky=3},
+	selection_box = chains_sbox,
+})
+
+minetest.register_node("chains:chain_brass", {
+	description = S("Hanging chain (brass)"),
+	drawtype = "mesh",
+	mesh = "chains.obj",
+	tiles = {"chains_brass.png"},
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	paramtype = "light",
+	inventory_image = "chain_brass_inv.png",
+	groups = {cracky=3},
+	selection_box = chains_sbox,
+})
+
+minetest.register_node("chains:chain_top", {
+	description = S("Hanging chain (ceiling mount, wrought iron)"),
+	drawtype = "mesh",
+	mesh = "top_chains.obj",
+	tiles = {"chains_wrought_iron.png"},
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	paramtype = "light",
+	inventory_image = "top_chain_wrought_iron_inv.png",
+	groups = {cracky=3},
+	selection_box = topchains_sbox,
+})
+
+minetest.register_node("chains:chain_top_brass", {
+	description = S("Hanging chain (ceiling mount, brass)"),
+	drawtype = "mesh",
+	mesh = "top_chains.obj",
+	tiles = {"chains_brass.png"},
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	paramtype = "light",
+	inventory_image = "top_chain_brass_inv.png",
+	groups = {cracky=3},
+	selection_box = topchains_sbox,
+})
+
+minetest.register_node("chains:chandelier", {
+	description = S("Chandelier (wrought iron)"),
+	paramtype = "light",
+	light_source = default.LIGHT_MAX-2,
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	tiles = {
+		"chains_wrought_iron.png",
+		"chains_candle.png",
+		{
+			name="chains_candle_flame.png",
+			animation={
+				type="vertical_frames",
+				aspect_w=16,
+				aspect_h=16,
+				length=3.0
+			}
+		}
+	},
+	drawtype = "mesh",
+	mesh = "chains_chandelier.obj",
+	groups = {cracky=3},
+	sounds =  default.node_sound_stone_defaults(),
+})
+
+minetest.register_node("chains:chandelier_brass", {
+	description = S("Chandelier (brass)"),
+	paramtype = "light",
+	light_source = default.LIGHT_MAX-2,
+	walkable = false,
+	climbable = true,
+	sunlight_propagates = true,
+	tiles = {
+		"chains_brass.png",
+		"chains_candle.png",
+		{
+			name="chains_candle_flame.png",
+			animation={
+				type="vertical_frames",
+				aspect_w=16,
+				aspect_h=16,
+				length=3.0
+			}
+		}
+	},
+	drawtype = "mesh",
+	mesh = "chains_chandelier.obj",
+	groups = {cracky=3},
+	sounds =  default.node_sound_stone_defaults(),
+})
+
+-- crafts
+
+minetest.register_craft({
+	output = 'chains:chain 2',
+	recipe = {
+		{'glooptest:chainlink'},
+		{'glooptest:chainlink'},
+		{'glooptest:chainlink'},
+	}
+})
+
+minetest.register_craft({
+	output = 'chains:chain_top',
+	recipe = {
+		{'default:steel_ingot'},
+		{'glooptest:chainlink'},
+	},
+})
+
+minetest.register_craft({
+	output = 'chains:chandelier',
+	recipe = {
+		{'', 'glooptest:chainlink', ''},
+		{'default:torch', 'glooptest:chainlink', 'default:torch'},
+		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
+	}
+})
+
+-- brass versions
+
+minetest.register_craft({
+	output = 'chains:chain_brass 2',
+	recipe = {
+		{'homedecor:chainlink_brass'},
+		{'homedecor:chainlink_brass'},
+		{'homedecor:chainlink_brass'},
+	}
+})
+
+minetest.register_craft({
+	output = 'chains:chain_top_brass',
+	recipe = {
+		{'technic:brass_ingot'},
+		{'homedecor:chainlink_brass'},
+	},
+})
+
+minetest.register_craft({
+	output = 'chains:chandelier_brass',
+	recipe = {
+		{'', 'homedecor:chainlink_brass', ''},
+		{'default:torch', 'homedecor:chainlink_brass', 'default:torch'},
+		{'technic:brass_ingot', 'technic:brass_ingot', 'technic:brass_ingot'},
+	}
+})

chains/models/chains.obj

@@ -0,0 +1,881 @@
+# Blender v2.73 (sub 0) OBJ File: 'chains.blend'
+# www.blender.org
+o Torus.016_Torus
+v 0.000000 -0.429978 0.000002
+v 0.000000 -0.401109 0.055211
+v -0.014044 -0.391975 0.048870
+v -0.014044 -0.423304 0.000002
+v -0.009826 -0.379748 0.040970
+v -0.009826 -0.406012 0.000002
+v 0.009826 -0.379748 0.040970
+v 0.009826 -0.406012 0.000002
+v 0.014044 -0.391975 0.048870
+v 0.014044 -0.423304 0.000002
+v 0.000000 -0.316336 0.080195
+v -0.014044 -0.316336 0.069112
+v -0.009826 -0.316336 0.057941
+v 0.009826 -0.316336 0.057941
+v 0.014044 -0.316336 0.069112
+v 0.000000 -0.231564 0.055211
+v -0.014044 -0.240700 0.048870
+v -0.009826 -0.252925 0.040970
+v 0.009826 -0.252925 0.040970
+v 0.014044 -0.240700 0.048870
+v 0.000000 -0.202695 0.000002
+v -0.014044 -0.209368 0.000002
+v -0.009826 -0.226661 0.000002
+v 0.009826 -0.226661 0.000002
+v 0.014044 -0.209368 0.000002
+v 0.000000 -0.231564 -0.055206
+v -0.014044 -0.240700 -0.048868
+v -0.009826 -0.252925 -0.040967
+v 0.009826 -0.252925 -0.040967
+v 0.014044 -0.240700 -0.048865
+v 0.000000 -0.316336 -0.080190
+v -0.014044 -0.316336 -0.069108
+v -0.009826 -0.316336 -0.057936
+v 0.009826 -0.316336 -0.057936
+v 0.014044 -0.316336 -0.069108
+v 0.000000 -0.400361 -0.055206
+v -0.014044 -0.391975 -0.048868
+v -0.009826 -0.379748 -0.040967
+v 0.009826 -0.379748 -0.040967
+v 0.014044 -0.391975 -0.048868
+v 0.000000 -0.262249 0.000002
+v -0.061672 -0.233381 0.000002
+v -0.054590 -0.224245 -0.012569
+v 0.000000 -0.255577 -0.012569
+v -0.045765 -0.212018 -0.008794
+v 0.000000 -0.238285 -0.008794
+v -0.045765 -0.212018 0.008798
+v 0.000000 -0.238285 0.008798
+v -0.054590 -0.224245 0.012574
+v 0.000000 -0.255577 0.012574
+v -0.089582 -0.148609 0.000002
+v -0.077200 -0.148609 -0.012569
+v -0.064722 -0.148609 -0.008794
+v -0.064722 -0.148609 0.008799
+v -0.077200 -0.148609 0.012574
+v -0.061672 -0.063837 0.000002
+v -0.054590 -0.072971 -0.012569
+v -0.045765 -0.085198 -0.008794
+v -0.045765 -0.085198 0.008799
+v -0.054590 -0.072971 0.012574
+v 0.000000 -0.034967 0.000002
+v 0.000000 -0.041641 -0.012569
+v 0.000000 -0.058933 -0.008794
+v 0.000000 -0.058933 0.008799
+v 0.000000 -0.041641 0.012574
+v 0.061672 -0.063837 0.000002
+v 0.054590 -0.072971 -0.012569
+v 0.045765 -0.085198 -0.008794
+v 0.045765 -0.085198 0.008799
+v 0.054590 -0.072971 0.012574
+v 0.089582 -0.148609 0.000002
+v 0.077200 -0.148609 -0.012569
+v 0.064722 -0.148609 -0.008794
+v 0.064722 -0.148609 0.008799
+v 0.077200 -0.148609 0.012574
+v 0.061672 -0.232631 0.000002
+v 0.054590 -0.224245 -0.012569
+v 0.045765 -0.212018 -0.008794
+v 0.045765 -0.212018 0.008798
+v 0.054590 -0.224245 0.012574
+v 0.000000 0.073316 0.000002
+v 0.061672 0.102183 0.000002
+v 0.054590 0.111319 0.012574
+v 0.000000 0.079988 0.012574
+v 0.045765 0.123546 0.008799
+v 0.000000 0.097280 0.008799
+v 0.045765 0.123546 -0.008794
+v 0.000000 0.097280 -0.008794
+v 0.054590 0.111319 -0.012569
+v 0.000000 0.079988 -0.012569
+v 0.089582 0.186956 0.000002
+v 0.077200 0.186956 0.012574
+v 0.064722 0.186956 0.008799
+v 0.064722 0.186956 -0.008794
+v 0.077200 0.186956 -0.012569
+v 0.061672 0.271728 0.000002
+v 0.054590 0.262594 0.012574
+v 0.045765 0.250367 0.008799
+v 0.045765 0.250367 -0.008794
+v 0.054590 0.262594 -0.012569
+v 0.000000 0.300597 0.000002
+v 0.000000 0.293923 0.012574
+v 0.000000 0.276631 0.008799
+v 0.000000 0.276631 -0.008794
+v 0.000000 0.293923 -0.012569
+v -0.061672 0.271728 0.000002
+v -0.054590 0.262594 0.012574
+v -0.045765 0.250367 0.008799
+v -0.045765 0.250367 -0.008794
+v -0.054590 0.262594 -0.012569
+v -0.089582 0.186956 0.000002
+v -0.077200 0.186956 0.012574
+v -0.064722 0.186956 0.008799
+v -0.064722 0.186956 -0.008794
+v -0.077200 0.186956 -0.012569
+v -0.061672 0.102931 0.000002
+v -0.054590 0.111319 0.012574
+v -0.045765 0.123546 0.008799
+v -0.045765 0.123546 -0.008794
+v -0.054590 0.111319 -0.012569
+v 0.000000 -0.095037 0.000002
+v 0.000000 -0.066168 -0.055206
+v 0.014044 -0.057034 -0.048868
+v 0.014044 -0.088363 0.000002
+v 0.009826 -0.044807 -0.040967
+v 0.009826 -0.071071 0.000002
+v -0.009826 -0.044807 -0.040967
+v -0.009826 -0.071071 0.000002
+v -0.014044 -0.057034 -0.048868
+v -0.014044 -0.088363 0.000002
+v 0.000000 0.018605 -0.080190
+v 0.014044 0.018605 -0.069108
+v 0.009826 0.018605 -0.057936
+v -0.009826 0.018605 -0.057936
+v -0.014044 0.018605 -0.069108
+v 0.000000 0.103377 -0.055206
+v 0.014044 0.094243 -0.048868
+v 0.009826 0.082016 -0.040967
+v -0.009826 0.082016 -0.040967
+v -0.014044 0.094243 -0.048868
+v 0.000000 0.132246 0.000002
+v 0.014044 0.125572 0.000002
+v 0.009826 0.108280 0.000002
+v -0.009826 0.108280 0.000002
+v -0.014044 0.125572 0.000002
+v 0.000000 0.103377 0.055211
+v 0.014044 0.094243 0.048870
+v 0.009826 0.082016 0.040970
+v -0.009826 0.082016 0.040970
+v -0.014044 0.094243 0.048870
+v 0.000000 0.018605 0.080195
+v 0.014044 0.018605 0.069112
+v 0.009826 0.018605 0.057941
+v -0.009826 0.018605 0.057941
+v -0.014044 0.018605 0.069112
+v 0.000000 -0.065420 0.055211
+v 0.014044 -0.057032 0.048870
+v 0.009826 -0.044807 0.040970
+v -0.009826 -0.044807 0.040970
+v -0.014044 -0.057032 0.048870
+v 0.000000 -0.598329 0.000002
+v 0.061672 -0.569460 0.000002
+v 0.054590 -0.560326 0.012574
+v 0.000000 -0.591655 0.012574
+v 0.045765 -0.548099 0.008798
+v 0.000000 -0.574363 0.008798
+v 0.045765 -0.548099 -0.008794
+v 0.000000 -0.574363 -0.008794
+v 0.054590 -0.560326 -0.012569
+v 0.000000 -0.591655 -0.012569
+v 0.089582 -0.484687 0.000002
+v 0.077200 -0.484687 0.012574
+v 0.064722 -0.484687 0.008798
+v 0.064722 -0.484687 -0.008794
+v 0.077200 -0.484687 -0.012569
+v 0.061672 -0.399915 0.000002
+v 0.054590 -0.409051 0.012574
+v 0.045765 -0.421278 0.008798
+v 0.045765 -0.421278 -0.008794
+v 0.054590 -0.409051 -0.012569
+v 0.000000 -0.371048 0.000002
+v 0.000000 -0.377719 0.012574
+v 0.000000 -0.395012 0.008798
+v 0.000000 -0.395012 -0.008794
+v 0.000000 -0.377719 -0.012569
+v -0.061672 -0.399915 0.000002
+v -0.054590 -0.409051 0.012574
+v -0.045765 -0.421278 0.008798
+v -0.045765 -0.421278 -0.008794
+v -0.054590 -0.409051 -0.012569
+v -0.089582 -0.484687 0.000002
+v -0.077200 -0.484687 0.012574
+v -0.064722 -0.484687 0.008798
+v -0.064722 -0.484687 -0.008794
+v -0.077200 -0.484687 -0.012569
+v -0.061672 -0.568712 0.000002
+v -0.054590 -0.560326 0.012574
+v -0.045765 -0.548099 0.008798
+v -0.045765 -0.548099 -0.008794
+v -0.054590 -0.560326 -0.012569
+v 0.000000 0.241043 0.000002
+v 0.000000 0.269910 0.055211
+v -0.014044 0.279047 0.048870
+v -0.014044 0.247717 0.000002
+v -0.009826 0.291274 0.040970
+v -0.009826 0.265007 0.000002
+v 0.009826 0.291274 0.040970
+v 0.009826 0.265007 0.000002
+v 0.014044 0.279047 0.048870
+v 0.014044 0.247717 0.000002
+v 0.000000 0.354683 0.080195
+v -0.014044 0.354683 0.069112
+v -0.009826 0.354683 0.057941
+v 0.009826 0.354683 0.057941
+v 0.014044 0.354683 0.069112
+v 0.000000 0.439455 0.055211
+v -0.014044 0.430321 0.048870
+v -0.009826 0.418094 0.040970
+v 0.009826 0.418094 0.040970
+v 0.014044 0.430321 0.048870
+v 0.000000 0.468325 0.000002
+v -0.014044 0.461651 0.000002
+v -0.009826 0.444361 0.000002
+v 0.009826 0.444361 0.000002
+v 0.014044 0.461651 0.000002
+v 0.000000 0.439455 -0.055206
+v -0.014044 0.430321 -0.048868
+v -0.009826 0.418094 -0.040967
+v 0.009826 0.418094 -0.040967
+v 0.014044 0.430321 -0.048868
+v 0.000000 0.354683 -0.080190
+v -0.014044 0.354683 -0.069108
+v -0.009826 0.354683 -0.057936
+v 0.009826 0.354683 -0.057936
+v 0.014044 0.354683 -0.069108
+v 0.000000 0.270661 -0.055206
+v -0.014044 0.279047 -0.048868
+v -0.009826 0.291274 -0.040967
+v 0.009826 0.291274 -0.040967
+v 0.014044 0.279047 -0.048868
+vt 0.187500 0.125000
+vt 0.250000 0.125000
+vt 0.250000 0.187500
+vt 0.187500 0.187500
+vt 0.250000 0.250000
+vt 0.187500 0.250000
+vt 0.250000 0.312500
+vt 0.187500 0.312500
+vt 0.250000 0.375000
+vt 0.187500 0.375000
+vt 0.187500 0.062500
+vt 0.250000 0.062500
+vt 0.312500 0.125000
+vt 0.312500 0.187500
+vt 0.312500 0.250000
+vt 0.312500 0.312500
+vt 0.312500 0.375000
+vt 0.312500 0.062500
+vt 0.375000 0.125000
+vt 0.375000 0.187500
+vt 0.375000 0.250000
+vt 0.375000 0.312500
+vt 0.375000 0.375000
+vt 0.375000 0.062500
+vt 0.437500 0.125000
+vt 0.437500 0.187500
+vt 0.437500 0.250000
+vt 0.437500 0.312500
+vt 0.437500 0.375000
+vt 0.437500 0.062500
+vt 0.500000 0.125000
+vt 0.500000 0.187500
+vt 0.500000 0.250000
+vt 0.500000 0.312500
+vt 0.500000 0.375000
+vt 0.500000 0.062500
+vt -0.000000 0.125000
+vt 0.062500 0.125000
+vt 0.062500 0.187500
+vt -0.000000 0.187500
+vt 0.062500 0.250000
+vt -0.000000 0.250000
+vt 0.062500 0.312500
+vt -0.000000 0.312500
+vt 0.062500 0.375000
+vt -0.000000 0.375000
+vt -0.000000 0.062500
+vt 0.062500 0.062500
+vt 0.125000 0.125000
+vt 0.125000 0.187500
+vt 0.125000 0.250000
+vt 0.125000 0.312500
+vt 0.125000 0.375000
+vt 0.125000 0.062500
+vt 0.750000 0.625000
+vt 0.812500 0.625000
+vt 0.812500 0.687500
+vt 0.750000 0.687500
+vt 0.750000 0.375000
+vt 0.812500 0.375000
+vt 0.812500 0.437500
+vt 0.750000 0.437500
+vt 0.812500 0.500000
+vt 0.750000 0.500000
+vt 0.812500 0.562500
+vt 0.750000 0.562500
+vt 0.875000 0.625000
+vt 0.875000 0.687500
+vt 0.875000 0.375000
+vt 0.875000 0.437500
+vt 0.875000 0.500000
+vt 0.875000 0.562500
+vt 0.937500 0.625000
+vt 0.937500 0.687500
+vt 0.937500 0.375000
+vt 0.937500 0.437500
+vt 0.937500 0.500000
+vt 0.937500 0.562500
+vt 1.000000 0.625000
+vt 1.000000 0.687500
+vt 1.000000 0.375000
+vt 1.000000 0.437500
+vt 1.000000 0.500000
+vt 1.000000 0.562500
+vt 0.500000 0.625000
+vt 0.562500 0.625000
+vt 0.562500 0.687500
+vt 0.500000 0.687500
+vt 0.562500 0.375000
+vt 0.562500 0.437500
+vt 0.500000 0.437500
+vt 0.562500 0.500000
+vt 0.500000 0.500000
+vt 0.562500 0.562500
+vt 0.500000 0.562500
+vt 0.625000 0.625000
+vt 0.625000 0.687500
+vt 0.625000 0.375000
+vt 0.625000 0.437500
+vt 0.625000 0.500000
+vt 0.625000 0.562500
+vt 0.687500 0.625000
+vt 0.687500 0.687500
+vt 0.687500 0.375000
+vt 0.687500 0.437500
+vt 0.687500 0.500000
+vt 0.687500 0.562500
+vt 0.250000 0.625000
+vt 0.312500 0.625000
+vt 0.312500 0.687500
+vt 0.250000 0.687500
+vt 0.312500 0.437500
+vt 0.250000 0.437500
+vt 0.312500 0.500000
+vt 0.250000 0.500000
+vt 0.312500 0.562500
+vt 0.250000 0.562500
+vt 0.375000 0.625000
+vt 0.375000 0.687500
+vt 0.375000 0.437500
+vt 0.375000 0.500000
+vt 0.375000 0.562500
+vt 0.437500 0.625000
+vt 0.437500 0.687500
+vt 0.437500 0.437500
+vt 0.437500 0.500000
+vt 0.437500 0.562500
+vt -0.000000 0.625000
+vt 0.062500 0.625000
+vt 0.062500 0.687500
+vt -0.000000 0.687500
+vt 0.062500 0.437500
+vt -0.000000 0.437500
+vt 0.062500 0.500000
+vt -0.000000 0.500000
+vt 0.062500 0.562500
+vt -0.000000 0.562500
+vt 0.125000 0.625000
+vt 0.125000 0.687500
+vt 0.125000 0.437500
+vt 0.125000 0.500000
+vt 0.125000 0.562500
+vt 0.187500 0.625000
+vt 0.187500 0.687500
+vt 0.187500 0.437500
+vt 0.187500 0.500000
+vt 0.187500 0.562500
+vt 0.687500 0.750000
+vt 0.750000 0.750000
+vt 0.750000 0.812500
+vt 0.687500 0.812500
+vt 0.750000 0.875000
+vt 0.687500 0.875000
+vt 0.750000 0.937500
+vt 0.687500 0.937500
+vt 0.750000 1.000000
+vt 0.687500 1.000000
+vt 0.812500 0.750000
+vt 0.812500 0.812500
+vt 0.812500 0.875000
+vt 0.812500 0.937500
+vt 0.812500 1.000000
+vt 0.875000 0.750000
+vt 0.875000 0.812500
+vt 0.875000 0.875000
+vt 0.875000 0.937500
+vt 0.875000 1.000000
+vt 0.937500 0.750000
+vt 0.937500 0.812500
+vt 0.937500 0.875000
+vt 0.937500 0.937500
+vt 0.937500 1.000000
+vt 1.000000 0.750000
+vt 1.000000 0.812500
+vt 1.000000 0.875000
+vt 1.000000 0.937500
+vt 1.000000 1.000000
+vt 0.500000 0.750000
+vt 0.562500 0.750000
+vt 0.562500 0.812500
+vt 0.500000 0.812500
+vt 0.562500 0.875000
+vt 0.500000 0.875000
+vt 0.562500 0.937500
+vt 0.500000 0.937500
+vt 0.562500 1.000000
+vt 0.500000 1.000000
+vt 0.625000 0.750000
+vt 0.625000 0.812500
+vt 0.625000 0.875000
+vt 0.625000 0.937500
+vt 0.625000 1.000000
+vt 0.750000 0.312500
+vt 0.812500 0.312500
+vt 0.750000 0.062500
+vt 0.812500 0.062500
+vt 0.812500 0.125000
+vt 0.750000 0.125000
+vt 0.812500 0.187500
+vt 0.750000 0.187500
+vt 0.812500 0.250000
+vt 0.750000 0.250000
+vt 0.875000 0.312500
+vt 0.875000 0.062500
+vt 0.875000 0.125000
+vt 0.875000 0.187500
+vt 0.875000 0.250000
+vt 0.937500 0.312500
+vt 0.937500 0.062500
+vt 0.937500 0.125000
+vt 0.937500 0.187500
+vt 0.937500 0.250000
+vt 1.000000 0.312500
+vt 1.000000 0.062500
+vt 1.000000 0.125000
+vt 1.000000 0.187500
+vt 1.000000 0.250000
+vt 0.562500 0.312500
+vt 0.562500 0.062500
+vt 0.562500 0.125000
+vt 0.562500 0.187500
+vt 0.562500 0.250000
+vt 0.625000 0.312500
+vt 0.625000 0.062500
+vt 0.625000 0.125000
+vt 0.625000 0.187500
+vt 0.625000 0.250000
+vt 0.687500 0.312500
+vt 0.687500 0.062500
+vt 0.687500 0.125000
+vt 0.687500 0.187500
+vt 0.687500 0.250000
+vt 0.250000 0.937500
+vt 0.312500 0.937500
+vt 0.312500 1.000000
+vt 0.250000 1.000000
+vt 0.312500 0.750000
+vt 0.250000 0.750000
+vt 0.312500 0.812500
+vt 0.250000 0.812500
+vt 0.312500 0.875000
+vt 0.250000 0.875000
+vt 0.375000 0.937500
+vt 0.375000 1.000000
+vt 0.375000 0.750000
+vt 0.375000 0.812500
+vt 0.375000 0.875000
+vt 0.437500 0.937500
+vt 0.437500 1.000000
+vt 0.437500 0.750000
+vt 0.437500 0.812500
+vt 0.437500 0.875000
+vt 0.000000 0.937500
+vt 0.062500 0.937500
+vt 0.062500 1.000000
+vt 0.000000 1.000000
+vt 0.062500 0.750000
+vt 0.000000 0.750000
+vt 0.062500 0.812500
+vt 0.000000 0.812500
+vt 0.062500 0.875000
+vt 0.000000 0.875000
+vt 0.125000 0.937500
+vt 0.125000 1.000000
+vt 0.125000 0.750000
+vt 0.125000 0.812500
+vt 0.125000 0.875000
+vt 0.187500 0.937500
+vt 0.187500 1.000000
+vt 0.187500 0.750000
+vt 0.187500 0.812500
+vt 0.187500 0.875000
+vn 0.000000 -1.000000 -0.004800
+vn 0.000000 -0.657400 0.753500
+vn -0.898300 -0.248500 0.362300
+vn -0.863600 -0.504100 -0.003400
+vn -0.661500 0.421500 -0.620200
+vn -0.746000 0.665900 0.000000
+vn 0.661500 0.421500 -0.620200
+vn 0.746000 0.665900 0.000000
+vn 0.898300 -0.248500 0.362300
+vn 0.863600 -0.504100 -0.003400
+vn 0.000000 0.000000 1.000000
+vn -0.925200 0.000000 0.379500
+vn -0.617100 0.000000 -0.786900
+vn 0.617100 0.000000 -0.786900
+vn 0.925200 0.000000 0.379500
+vn 0.000000 0.657400 0.753500
+vn -0.898300 0.248400 0.362300
+vn -0.661500 -0.421500 -0.620200
+vn 0.661500 -0.421500 -0.620200
+vn 0.898300 0.248400 0.362300
+vn 0.000000 1.000000 0.000000
+vn -0.866100 0.499800 0.000000
+vn -0.746000 -0.665900 0.000000
+vn 0.746000 -0.665900 0.000000
+vn 0.866100 0.499800 0.000000
+vn 0.000000 0.657400 -0.753500
+vn -0.898300 0.248400 -0.362400
+vn -0.661600 -0.421500 0.620200
+vn 0.661500 -0.421500 0.620200
+vn 0.898300 0.248400 -0.362300
+vn 0.000000 -0.000900 -1.000000
+vn -0.924600 -0.000600 -0.380700
+vn -0.617100 0.000000 0.786900
+vn 0.617100 0.000000 0.786900
+vn 0.924700 -0.000600 -0.380700
+vn 0.000000 -0.650300 -0.759600
+vn -0.895600 -0.254600 -0.364800
+vn -0.661600 0.421500 0.620200
+vn 0.661600 0.421500 0.620200
+vn 0.895600 -0.254600 -0.364800
+vn 0.004900 -1.000000 0.000000
+vn -0.729700 -0.683800 0.000000
+vn -0.324500 -0.256300 -0.910500
+vn 0.003300 -0.475500 -0.879700
+vn 0.578700 0.436200 -0.689100
+vn 0.000000 0.666600 -0.745400
+vn 0.578700 0.436200 0.689100
+vn 0.000000 0.666600 0.745400
+vn -0.324500 -0.256300 0.910500
+vn 0.003300 -0.475500 0.879700
+vn -1.000000 0.000000 0.000000
+vn -0.359600 0.000000 -0.933100
+vn 0.756400 0.000000 -0.654100
+vn 0.756400 0.000000 0.654100
+vn -0.359600 0.000000 0.933100
+vn -0.729700 0.683700 0.000000
+vn -0.324500 0.256300 -0.910500
+vn 0.578700 -0.436200 -0.689100
+vn 0.578700 -0.436200 0.689100
+vn -0.324500 0.256300 0.910500
+vn 0.000000 0.470900 -0.882200
+vn 0.000000 -0.666600 -0.745400
+vn 0.000000 -0.666600 0.745400
+vn 0.000000 0.470900 0.882200
+vn 0.729700 0.683700 0.000000
+vn 0.324500 0.256300 -0.910500
+vn -0.578700 -0.436200 -0.689100
+vn -0.578700 -0.436200 0.689100
+vn 0.324500 0.256300 0.910500
+vn 1.000000 -0.001100 0.000000
+vn 0.361000 -0.000700 -0.932600
+vn -0.756400 0.000000 -0.654100
+vn -0.756400 0.000000 0.654100
+vn 0.361000 -0.000700 0.932600
+vn 0.736100 -0.676800 0.000000
+vn 0.327100 -0.263100 -0.907600
+vn -0.578700 0.436200 -0.689100
+vn -0.578700 0.436200 0.689100
+vn 0.327100 -0.263100 0.907600
+vn -0.004900 -1.000000 0.000000
+vn 0.729700 -0.683800 0.000000
+vn 0.324500 -0.256300 0.910500
+vn -0.003300 -0.475400 0.879700
+vn 0.324500 -0.256300 -0.910500
+vn -0.003300 -0.475400 -0.879700
+vn 1.000000 0.000000 0.000000
+vn 0.359600 0.000000 0.933100
+vn 0.359600 0.000000 -0.933100
+vn -1.000000 -0.001100 0.000000
+vn -0.361000 -0.000700 0.932600
+vn -0.361000 -0.000700 -0.932600
+vn -0.736100 -0.676800 0.000000
+vn -0.327100 -0.263100 0.907600
+vn -0.327100 -0.263100 -0.907600
+vn 0.000000 -1.000000 0.004800
+vn 0.000000 -0.657400 -0.753500
+vn 0.898300 -0.248500 -0.362400
+vn 0.863600 -0.504100 0.003400
+vn -0.898300 -0.248500 -0.362400
+vn -0.863600 -0.504100 0.003400
+vn 0.000000 0.000000 -1.000000
+vn 0.925200 0.000000 -0.379500
+vn -0.925200 0.000000 -0.379500
+vn 0.898300 0.248500 -0.362400
+vn 0.661600 -0.421500 0.620200
+vn -0.898300 0.248500 -0.362400
+vn 0.898300 0.248500 0.362300
+vn -0.898300 0.248500 0.362300
+vn 0.000000 -0.000900 1.000000
+vn 0.924700 -0.000600 0.380700
+vn -0.924700 -0.000600 0.380700
+vn 0.000000 -0.650300 0.759600
+vn 0.895600 -0.254600 0.364700
+vn -0.895600 -0.254600 0.364700
+vn 0.729700 -0.683700 0.000000
+vn 0.729700 0.683800 0.000000
+vn -0.729700 0.683800 0.000000
+vn -0.898300 -0.248400 0.362300
+vn -0.863600 -0.504100 -0.003500
+vn 0.898300 -0.248400 0.362300
+vn 0.863600 -0.504100 -0.003500
+vn -0.661500 -0.421500 0.620200
+vn 0.924600 -0.000600 -0.380700
+vn -0.661500 0.421500 0.620200
+vn 0.661500 0.421500 0.620200
+s 1
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 4/4/4 3/3/3 5/5/5 6/6/6
+f 6/6/6 5/5/5 7/7/7 8/8/8
+f 8/8/8 7/7/7 9/9/9 10/10/10
+f 1/1/1 10/11/10 9/12/9 2/2/2
+f 2/2/2 11/13/11 12/14/12 3/3/3
+f 3/3/3 12/14/12 13/15/13 5/5/5
+f 5/5/5 13/15/13 14/16/14 7/7/7
+f 7/7/7 14/16/14 15/17/15 9/9/9
+f 9/12/9 15/18/15 11/13/11 2/2/2
+f 11/13/11 16/19/16 17/20/17 12/14/12
+f 12/14/12 17/20/17 18/21/18 13/15/13
+f 13/15/13 18/21/18 19/22/19 14/16/14
+f 14/16/14 19/22/19 20/23/20 15/17/15
+f 15/18/15 20/24/20 16/19/16 11/13/11
+f 16/19/16 21/25/21 22/26/22 17/20/17
+f 17/20/17 22/26/22 23/27/23 18/21/18
+f 18/21/18 23/27/23 24/28/24 19/22/19
+f 19/22/19 24/28/24 25/29/25 20/23/20
+f 20/24/20 25/30/25 21/25/21 16/19/16
+f 21/25/21 26/31/26 27/32/27 22/26/22
+f 22/26/22 27/32/27 28/33/28 23/27/23
+f 23/27/23 28/33/28 29/34/29 24/28/24
+f 24/28/24 29/34/29 30/35/30 25/29/25
+f 25/30/25 30/36/30 26/31/26 21/25/21
+f 26/37/26 31/38/31 32/39/32 27/40/27
+f 27/40/27 32/39/32 33/41/33 28/42/28
+f 28/42/28 33/41/33 34/43/34 29/44/29
+f 29/44/29 34/43/34 35/45/35 30/46/30
+f 30/47/30 35/48/35 31/38/31 26/37/26
+f 31/38/31 36/49/36 37/50/37 32/39/32
+f 32/39/32 37/50/37 38/51/38 33/41/33
+f 33/41/33 38/51/38 39/52/39 34/43/34
+f 34/43/34 39/52/39 40/53/40 35/45/35
+f 35/48/35 40/54/40 36/49/36 31/38/31
+f 36/49/36 1/1/1 4/4/4 37/50/37
+f 37/50/37 4/4/4 6/6/6 38/51/38
+f 38/51/38 6/6/6 8/8/8 39/52/39
+f 39/52/39 8/8/8 10/10/10 40/53/40
+f 1/1/1 36/49/36 40/54/40 10/11/10
+f 41/55/41 42/56/42 43/57/43 44/58/44
+f 44/59/44 43/60/43 45/61/45 46/62/46
+f 46/62/46 45/61/45 47/63/47 48/64/48
+f 48/64/48 47/63/47 49/65/49 50/66/50
+f 41/55/41 50/66/50 49/65/49 42/56/42
+f 42/56/42 51/67/51 52/68/52 43/57/43
+f 43/60/43 52/69/52 53/70/53 45/61/45
+f 45/61/45 53/70/53 54/71/54 47/63/47
+f 47/63/47 54/71/54 55/72/55 49/65/49
+f 49/65/49 55/72/55 51/67/51 42/56/42
+f 51/67/51 56/73/56 57/74/57 52/68/52
+f 52/69/52 57/75/57 58/76/58 53/70/53
+f 53/70/53 58/76/58 59/77/59 54/71/54
+f 54/71/54 59/77/59 60/78/60 55/72/55
+f 55/72/55 60/78/60 56/73/56 51/67/51
+f 56/73/56 61/79/21 62/80/61 57/74/57
+f 57/75/57 62/81/61 63/82/62 58/76/58
+f 58/76/58 63/82/62 64/83/63 59/77/59
+f 59/77/59 64/83/63 65/84/64 60/78/60
+f 60/78/60 65/84/64 61/79/21 56/73/56
+f 61/85/21 66/86/65 67/87/66 62/88/61
+f 62/35/61 67/89/66 68/90/67 63/91/62
+f 63/91/62 68/90/67 69/92/68 64/93/63
+f 64/93/63 69/92/68 70/94/69 65/95/64
+f 65/95/64 70/94/69 66/86/65 61/85/21
+f 66/86/65 71/96/70 72/97/71 67/87/66
+f 67/89/66 72/98/71 73/99/72 68/90/67
+f 68/90/67 73/99/72 74/100/73 69/92/68
+f 69/92/68 74/100/73 75/101/74 70/94/69
+f 70/94/69 75/101/74 71/96/70 66/86/65
+f 71/96/70 76/102/75 77/103/76 72/97/71
+f 72/98/71 77/104/76 78/105/77 73/99/72
+f 73/99/72 78/105/77 79/106/78 74/100/73
+f 74/100/73 79/106/78 80/107/79 75/101/74
+f 75/101/74 80/107/79 76/102/75 71/96/70
+f 76/102/75 41/55/41 44/58/44 77/103/76
+f 77/104/76 44/59/44 46/62/46 78/105/77
+f 78/105/77 46/62/46 48/64/48 79/106/78
+f 79/106/78 48/64/48 50/66/50 80/107/79
+f 41/55/41 76/102/75 80/107/79 50/66/50
+f 81/108/80 82/109/81 83/110/82 84/111/83
+f 84/9/83 83/17/82 85/112/78 86/113/48
+f 86/113/48 85/112/78 87/114/77 88/115/46
+f 88/115/46 87/114/77 89/116/84 90/117/85
+f 81/108/80 90/117/85 89/116/84 82/109/81
+f 82/109/81 91/118/86 92/119/87 83/110/82
+f 83/17/82 92/23/87 93/120/73 85/112/78
+f 85/112/78 93/120/73 94/121/72 87/114/77
+f 87/114/77 94/121/72 95/122/88 89/116/84
+f 89/116/84 95/122/88 91/118/86 82/109/81
+f 91/118/86 96/123/65 97/124/69 92/119/87
+f 92/23/87 97/29/69 98/125/68 93/120/73
+f 93/120/73 98/125/68 99/126/67 94/121/72
+f 94/121/72 99/126/67 100/127/66 95/122/88
+f 95/122/88 100/127/66 96/123/65 91/118/86
+f 96/123/65 101/85/21 102/88/64 97/124/69
+f 97/29/69 102/35/64 103/91/63 98/125/68
+f 98/125/68 103/91/63 104/93/62 99/126/67
+f 99/126/67 104/93/62 105/95/61 100/127/66
+f 100/127/66 105/95/61 101/85/21 96/123/65
+f 101/128/21 106/129/56 107/130/60 102/131/64
+f 102/46/64 107/45/60 108/132/59 103/133/63
+f 103/133/63 108/132/59 109/134/58 104/135/62
+f 104/135/62 109/134/58 110/136/57 105/137/61
+f 105/137/61 110/136/57 106/129/56 101/128/21
+f 106/129/56 111/138/89 112/139/90 107/130/60
+f 107/45/60 112/53/90 113/140/54 108/132/59
+f 108/132/59 113/140/54 114/141/53 109/134/58
+f 109/134/58 114/141/53 115/142/91 110/136/57
+f 110/136/57 115/142/91 111/138/89 106/129/56
+f 111/138/89 116/143/92 117/144/93 112/139/90
+f 112/53/90 117/10/93 118/145/47 113/140/54
+f 113/140/54 118/145/47 119/146/45 114/141/53
+f 114/141/53 119/146/45 120/147/94 115/142/91
+f 115/142/91 120/147/94 116/143/92 111/138/89
+f 116/143/92 81/108/80 84/111/83 117/144/93
+f 117/10/93 84/9/83 86/113/48 118/145/47
+f 118/145/47 86/113/48 88/115/46 119/146/45
+f 119/146/45 88/115/46 90/117/85 120/147/94
+f 81/108/80 116/143/92 120/147/94 90/117/85
+f 121/148/95 122/149/96 123/150/97 124/151/98
+f 124/151/98 123/150/97 125/152/39 126/153/8
+f 126/153/8 125/152/39 127/154/38 128/155/6
+f 128/155/6 127/154/38 129/156/99 130/157/100
+f 121/148/95 130/103/100 129/58/99 122/149/96
+f 122/149/96 131/158/101 132/159/102 123/150/97
+f 123/150/97 132/159/102 133/160/34 125/152/39
+f 125/152/39 133/160/34 134/161/33 127/154/38
+f 127/154/38 134/161/33 135/162/103 129/156/99
+f 129/58/99 135/57/103 131/158/101 122/149/96
+f 131/158/101 136/163/26 137/164/104 132/159/102
+f 132/159/102 137/164/104 138/165/105 133/160/34
+f 133/160/34 138/165/105 139/166/28 134/161/33
+f 134/161/33 139/166/28 140/167/106 135/162/103
+f 135/57/103 140/68/106 136/163/26 131/158/101
+f 136/163/26 141/168/21 142/169/25 137/164/104
+f 137/164/104 142/169/25 143/170/24 138/165/105
+f 138/165/105 143/170/24 144/171/23 139/166/28
+f 139/166/28 144/171/23 145/172/22 140/167/106
+f 140/68/106 145/74/22 141/168/21 136/163/26
+f 141/168/21 146/173/16 147/174/107 142/169/25
+f 142/169/25 147/174/107 148/175/19 143/170/24
+f 143/170/24 148/175/19 149/176/18 144/171/23
+f 144/171/23 149/176/18 150/177/108 145/172/22
+f 145/74/22 150/80/108 146/173/16 141/168/21
+f 146/178/16 151/179/109 152/180/110 147/181/107
+f 147/181/107 152/180/110 153/182/14 148/183/19
+f 148/183/19 153/182/14 154/184/13 149/185/18
+f 149/185/18 154/184/13 155/186/111 150/187/108
+f 150/88/108 155/87/111 151/179/109 146/178/16
+f 151/179/109 156/188/112 157/189/113 152/180/110
+f 152/180/110 157/189/113 158/190/7 153/182/14
+f 153/182/14 158/190/7 159/191/5 154/184/13
+f 154/184/13 159/191/5 160/192/114 155/186/111
+f 155/87/111 160/97/114 156/188/112 151/179/109
+f 156/188/112 121/148/95 124/151/98 157/189/113
+f 157/189/113 124/151/98 126/153/8 158/190/7
+f 158/190/7 126/153/8 128/155/6 159/191/5
+f 159/191/5 128/155/6 130/157/100 160/192/114
+f 121/148/95 156/188/112 160/97/114 130/103/100
+f 161/193/80 162/194/115 163/60/82 164/59/83
+f 164/195/83 163/196/82 165/197/78 166/198/48
+f 166/198/48 165/197/78 167/199/77 168/200/46
+f 168/200/46 167/199/77 169/201/84 170/202/85
+f 161/193/80 170/202/85 169/201/84 162/194/115
+f 162/194/115 171/203/86 172/69/87 163/60/82
+f 163/196/82 172/204/87 173/205/73 165/197/78
+f 165/197/78 173/205/73 174/206/72 167/199/77
+f 167/199/77 174/206/72 175/207/88 169/201/84
+f 169/201/84 175/207/88 171/203/86 162/194/115
+f 171/203/86 176/208/116 177/75/69 172/69/87
+f 172/204/87 177/209/69 178/210/68 173/205/73
+f 173/205/73 178/210/68 179/211/67 174/206/72
+f 174/206/72 179/211/67 180/212/66 175/207/88
+f 175/207/88 180/212/66 176/208/116 171/203/86
+f 176/208/116 181/213/21 182/81/64 177/75/69
+f 177/209/69 182/214/64 183/215/63 178/210/68
+f 178/210/68 183/215/63 184/216/62 179/211/67
+f 179/211/67 184/216/62 185/217/61 180/212/66
+f 180/212/66 185/217/61 181/213/21 176/208/116
+f 181/34/21 186/218/117 187/89/60 182/35/64
+f 182/36/64 187/219/60 188/220/59 183/31/63
+f 183/31/63 188/220/59 189/221/58 184/32/62
+f 184/32/62 189/221/58 190/222/57 185/33/61
+f 185/33/61 190/222/57 186/218/117 181/34/21
+f 186/218/117 191/223/89 192/98/90 187/89/60
+f 187/219/60 192/224/90 193/225/54 188/220/59
+f 188/220/59 193/225/54 194/226/53 189/221/58
+f 189/221/58 194/226/53 195/227/91 190/222/57
+f 190/222/57 195/227/91 191/223/89 186/218/117
+f 191/223/89 196/228/92 197/104/93 192/98/90
+f 192/224/90 197/229/93 198/230/47 193/225/54
+f 193/225/54 198/230/47 199/231/45 194/226/53
+f 194/226/53 199/231/45 200/232/94 195/227/91
+f 195/227/91 200/232/94 196/228/92 191/223/89
+f 196/228/92 161/193/80 164/59/83 197/104/93
+f 197/229/93 164/195/83 166/198/48 198/230/47
+f 198/230/47 166/198/48 168/200/46 199/231/45
+f 199/231/45 168/200/46 170/202/85 200/232/94
+f 161/193/80 196/228/92 200/232/94 170/202/85
+f 201/233/1 202/234/2 203/235/118 204/236/119
+f 204/111/119 203/110/118 205/237/5 206/238/6
+f 206/238/6 205/237/5 207/239/7 208/240/8
+f 208/240/8 207/239/7 209/241/120 210/242/121
+f 201/233/1 210/242/121 209/241/120 202/234/2
+f 202/234/2 211/243/11 212/244/12 203/235/118
+f 203/110/118 212/119/12 213/245/13 205/237/5
+f 205/237/5 213/245/13 214/246/14 207/239/7
+f 207/239/7 214/246/14 215/247/15 209/241/120
+f 209/241/120 215/247/15 211/243/11 202/234/2
+f 211/243/11 216/248/16 217/249/108 212/244/12
+f 212/119/12 217/124/108 218/250/18 213/245/13
+f 213/245/13 218/250/18 219/251/19 214/246/14
+f 214/246/14 219/251/19 220/252/107 215/247/15
+f 215/247/15 220/252/107 216/248/16 211/243/11
+f 216/248/16 221/185/21 222/187/22 217/249/108
+f 217/124/108 222/88/22 223/178/23 218/250/18
+f 218/250/18 223/178/23 224/181/24 219/251/19
+f 219/251/19 224/181/24 225/183/25 220/252/107
+f 220/252/107 225/183/25 221/185/21 216/248/16
+f 221/253/21 226/254/26 227/255/106 222/256/22
+f 222/131/22 227/130/106 228/257/122 223/258/23
+f 223/258/23 228/257/122 229/259/29 224/260/24
+f 224/260/24 229/259/29 230/261/104 225/262/25
+f 225/262/25 230/261/104 226/254/26 221/253/21
+f 226/254/26 231/263/31 232/264/32 227/255/106
+f 227/130/106 232/139/32 233/265/33 228/257/122
+f 228/257/122 233/265/33 234/266/34 229/259/29
+f 229/259/29 234/266/34 235/267/123 230/261/104
+f 230/261/104 235/267/123 231/263/31 226/254/26
+f 231/263/31 236/268/36 237/269/37 232/264/32
+f 232/139/32 237/144/37 238/270/124 233/265/33
+f 233/265/33 238/270/124 239/271/125 234/266/34
+f 234/266/34 239/271/125 240/272/40 235/267/123
+f 235/267/123 240/272/40 236/268/36 231/263/31
+f 236/268/36 201/233/1 204/236/119 237/269/37
+f 237/144/37 204/111/119 206/238/6 238/270/124
+f 238/270/124 206/238/6 208/240/8 239/271/125
+f 239/271/125 208/240/8 210/242/121 240/272/40
+f 201/233/1 236/268/36 240/272/40 210/242/121

computer/README.txt

@@ -33,6 +33,10 @@ computer:admiral128
 
 There's also a `computer:computer' alias to `computer:babytower'.
 
+License:
+Sourcecode: WTFPL (see below)
+Graphics: WTFPL (see below)
+
 Thanks to all the people in the forums and the #minetest IRC channel for
  their support and suggestions; in no particular order:
   OldCoder, Josh, tonyka, VanessaE, davidpace, Jordach, and all the other
@@ -41,3 +45,17 @@ Thanks to all the people in the forums and the #minetest IRC channel for
 
 See also:
 http://minetest.net/
+
+         DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2012 Diego Martínez <lkaezadl3@gmail.com>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO. 

computer/locale/es.txt

@@ -0,0 +1,6 @@
+
+# Language: Español
+# Author: Diego Martínez <lkaezadl3@gmail.com>
+
+Plastic sheet = Placa de Plastico
+Unprocessed Plastic base = Base de Plastico No Procesada

computer/miscitems.lua

@@ -1,4 +1,6 @@
+
 -- Copyright (C) 2012-2013 Diego Martínez <kaeza@users.sf.net>
+-- License is WTFPL (see README.txt).
 
 -- This file defines some items in order to not have to depend on other mods.
 
@@ -6,7 +8,7 @@ local S = homedecor_i18n.gettext
 
 if (not minetest.get_modpath("homedecor")) then
 
-	minetest.register_craftitem(":basic_materials:plastic_sheet", {
+	minetest.register_craftitem(":homedecor:plastic_sheeting", {
 		description = S("Plastic sheet"),
 		inventory_image = "homedecor_plastic_sheeting.png",
 	})
@@ -49,7 +51,7 @@ if (not minetest.get_modpath("homedecor")) then
 
 	minetest.register_craft({
 		type = "cooking",
-		output = "basic_materials:plastic_sheet",
+		output = "homedecor:plastic_sheeting",
 		recipe = "homedecor:plastic_base",
 	})
 
@@ -61,7 +63,7 @@ if (not minetest.get_modpath("homedecor")) then
 
 	minetest.register_craft({
 		type = 'fuel',
-		recipe = 'basic_materials:plastic_sheet',
+		recipe = 'homedecor:plastic_sheeting',
 		burntime = 30,
 	})
 

computer/recipes.lua

@@ -1,52 +1,54 @@
+
 -- Copyright (C) 2012-2013 Diego Martínez <kaeza@users.sf.net>
+-- License is WTFPL (see README.txt).
 
 minetest.register_craft({
 	output = "computer: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", "group:wood", "basic_materials:plastic_sheet" }
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "group:wood", "homedecor:plastic_sheeting" }
 	}
 })
 
 minetest.register_craft({
 	output = "computer:slaystation",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "group:wood", "basic_materials:plastic_sheet" }
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "group:wood", "homedecor:plastic_sheeting" }
 	}
 })
 
 minetest.register_craft({
 	output = "computer:vanio",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "", "" },
+		{ "homedecor:plastic_sheeting", "", "" },
 		{ "default:glass", "", "" },
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
 	}
 })
 
 minetest.register_craft({
 	output = "computer:specter",
 	recipe = {
-		{ "", "", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		{ "", "", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }
 	}
 })
 
 minetest.register_craft({
 	output = "computer: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" }
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }
 	}
 })
 
 minetest.register_craft({
 	output = "computer:admiral64",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
 		{ "group:wood", "group:wood", "group:wood" }
 	}
 })
@@ -54,7 +56,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "computer:admiral128",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
 		{ "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }
 	}
 })
@@ -62,16 +64,16 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "computer: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" }
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "default:copper_ingot", "homedecor:plastic_sheeting" }
 	}
 })
 
 minetest.register_craft({
 	output = "computer:piepad",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
-		{ "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" }
+		{ "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" }
 	}
 })
 
@@ -80,9 +82,9 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "computer: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" }
+		{ "homedecor:plastic_sheeting", "default:glass","" },
+		{ "homedecor:plastic_sheeting", "default:glass","" },
+		{ "homedecor:plastic_sheeting", "default:mese_crystal_fragment", "homedecor:plastic_sheeting" }
 	}
 })
 
@@ -90,35 +92,35 @@ minetest.register_craft({
 	output = "computer: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"  }
+		{ "default:steel_ingot" ,"homedecor:plastic_sheeting", "homedecor:plastic_sheeting" },
+		{ "default:mese_crystal_fragment","homedecor:plastic_sheeting", "homedecor:plastic_sheeting"  }
 	}
 })
 
 minetest.register_craft({
 	output = "computer: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" }
+		{ "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }
 	}
 })
 
 minetest.register_craft({
 	output = "computer: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" }
+		{ "homedecor:plastic_sheeting", "default:steel_ingot","" },
+		{ "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "default:coal_lump", "homedecor:plastic_sheeting" }
 	}
 })
 
 minetest.register_craft({
 	output = "computer: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", }
+		{ "homedecor:plastic_sheeting", "default:steel_ingot","" },
+		{ "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" },
+		{ "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting", }
 	}
 })
 
@@ -134,8 +136,8 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "computer:tetris_arcade",
 	recipe = {
-		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal", "basic_materials:plastic_sheet", },
+		{ "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting", },
 		{ "dye:black", "default:glass", "dye:black" },
-		{ "basic_materials:plastic_sheet", "basic_materials:energy_crystal", "basic_materials:plastic_sheet" }
+		{ "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" }
 	}
 })

computer/tetris.lua

@@ -33,10 +33,10 @@ local colors = { "computer_cyan.png", "computer_magenta.png", "computer_red.png"
 
 local background = "image[0,0;3.55,6.66;computer_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[3.6,4.5;0.6,0.6;rotateleft;L]"
 	.."button[4.2,4.5;0.6,0.6;down;v]"
 	.."button[4.2,5.3;0.6,0.6;drop;V]"
-	.."button[4.8,4.5;0.6,0.6;rotateright;"..minetest.formspec_escape(S("R")).."]"
+	.."button[4.8,4.5;0.6,0.6;rotateright;R]"
 	.."button[5.4,4.5;0.6,0.6;right;>]"
 	.."button[3.5,3;2,2;new;"..minetest.formspec_escape(S("New Game")).."]"
 
@@ -231,7 +231,7 @@ local function step(pos, fields)
 	local scr = { formsize, background,
 		t.boardstring, t.previewstring,
 		draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy),
-		"label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "), 
+		"label[3.8,0.1;Next...]label[3.8,2.7;Score: ",
 		t.score, close, buttons }
 
 

fake_fire/init.lua

@@ -16,8 +16,8 @@ local function start_smoke(pos, node, clicker, chimney)
 			end, s_handle)
 		end
 		minetest.delete_particlespawner(id)
-		this_spawner_meta:set_int("smoky", 0)
-		this_spawner_meta:set_int("sound", 0)
+		this_spawner_meta:set_int("smoky", nil)
+		this_spawner_meta:set_int("sound", nil)
 		return
 	end
 
@@ -34,7 +34,7 @@ local function start_smoke(pos, node, clicker, chimney)
 		})
 		if chimney == 1 then
 			this_spawner_meta:set_int("smoky", id)
-			this_spawner_meta:set_int("sound", 0)
+			this_spawner_meta:set_int("sound", nil)
 		else
 			s_handle = minetest.sound_play("fire_small", {
 				pos = pos,
@@ -62,13 +62,21 @@ local function stop_smoke(pos)
 		end, s_handle)
 	end
 
-	this_spawner_meta:set_int("smoky", 0)
-	this_spawner_meta:set_int("sound", 0)
+	this_spawner_meta:set_int("smoky", nil)
+	this_spawner_meta:set_int("sound", nil)
 end
 
-minetest.register_node("fake_fire:ice_fire", {
-	inventory_image = "ice_fire_inv.png",
-	description = S("Ice fire"),
+-- FLAME TYPES
+local flame_types = {
+	{ "fake",  S("Fake fire") },
+	{ "ice",   S("Ice fire")  },
+}
+
+for _, f in ipairs(flame_types) do
+	local name, desc = unpack(f)
+	minetest.register_node("fake_fire:"..name.."_fire", {
+		inventory_image = name.."_fire_inv.png",
+		description = desc,
 		drawtype = "plantlike",
 		paramtype = "light",
 		paramtype2 = "facedir",
@@ -79,7 +87,7 @@ minetest.register_node("fake_fire:ice_fire", {
 		light_source = 14,
 		waving = 1,
 		tiles = {
-		{name="ice_fire_animated.png", animation={type="vertical_frames",
+			{name=name.."_fire_animated.png", animation={type="vertical_frames",
 			aspect_w=16, aspect_h=16, length=1.5}},
 		},
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
@@ -93,9 +101,8 @@ minetest.register_node("fake_fire:ice_fire", {
 			})
 		end,
 		drop = ""
-})
-
-minetest.register_alias("fake_fire:fake_fire", "fire:permanent_flame")
+	})
+end
 
 minetest.register_node("fake_fire:fancy_fire", {
 		inventory_image = "fancy_fire_inv.png",
@@ -183,18 +190,43 @@ for _, mat in ipairs(materials) do
 	})
 end
 
-minetest.register_alias("fake_fire:flint_and_steel", "fire:flint_and_steel")
-
-minetest.override_item("default:ice", {
-	on_ignite = function(pos, igniter)
-		local flame_pos = {x = pos.x, y = pos.y + 1, z = pos.z}
-		if minetest.get_node(flame_pos).name == "air" then
-			minetest.set_node(flame_pos, {name = "fake_fire:ice_fire"})
+-- FLINT and STEEL
+minetest.register_tool("fake_fire:flint_and_steel", {
+	description = S("Flint and steel"),
+	inventory_image = "flint_and_steel.png",
+	liquids_pointable = false,
+	stack_max = 1,
+	tool_capabilities = {
+		full_punch_interval = 1.0,
+		max_drop_level=0,
+		groupcaps={flamable = {uses=65, maxlevel=1}}
+	},
+	on_use = function(itemstack, user, pointed_thing)
+		if pointed_thing.type == "node" and minetest.get_node(pointed_thing.above).name == "air" then
+			if not minetest.is_protected(pointed_thing.above, user:get_player_name()) then
+				if string.find(minetest.get_node(pointed_thing.under).name, "ice") then
+					minetest.set_node(pointed_thing.above, {name="fake_fire:ice_fire"})
+				else
+					minetest.set_node(pointed_thing.above, {name="fake_fire:fake_fire"})
 				end
+			else
+				minetest.chat_send_player(user:get_player_name(), S("This area is protected!"))
+			end
+		else
+			return
+		end
+
+		itemstack:add_wear(65535/65)
+		return itemstack
 	end
 })
 
 -- CRAFTS
+minetest.register_craft({
+	type = "shapeless",
+	output = 'fake_fire:flint_and_steel',
+	recipe = {"default:obsidian_shard", "default:steel_ingot"}
+})
 
 minetest.register_craft({
 	type = "shapeless",

homedecor/bathroom_furniture.lua

@@ -12,9 +12,12 @@ minetest.register_node("homedecor:bathroom_tiles_dark", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:bathroom_tiles_medium", {
@@ -28,9 +31,12 @@ minetest.register_node("homedecor:bathroom_tiles_medium", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:bathroom_tiles_light", {
@@ -44,9 +50,12 @@ minetest.register_node("homedecor:bathroom_tiles_light", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	groups = {cracky=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_stone_defaults(),
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 local tr_cbox = {
@@ -164,3 +173,21 @@ minetest.register_lbm({
 		meta:set_string("palette", "ext")
 	end
 })
+
+minetest.register_lbm({
+	name = "homedecor:recolor_bathroom_tiles",
+	label = "Convert bathroom tiles to use UD extended palette",
+	run_at_every_load = false,
+	nodenames = {
+		"homedecor:bathroom_tiles_light",
+		"homedecor:bathroom_tiles_medium",
+		"homedecor:bathroom_tiles_dark",
+	},
+	action = function(pos, node)
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("palette") ~= "ext" then
+			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
+			meta:set_string("palette", "ext")
+		end
+	end
+})

homedecor/bedroom.lua

@@ -52,11 +52,13 @@ homedecor.register("bed_regular", {
 	on_rotate = screwdriver.disallow,
 	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)
 		if not placer:get_player_control().sneak then
 			return homedecor.bed_expansion(pos, placer, itemstack, pointed_thing)
 		end
 	end,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		homedecor.unextend_bed(pos)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
@@ -64,9 +66,11 @@ homedecor.register("bed_regular", {
 		if itemname == "homedecor:bed_regular" then
 			homedecor.bed_expansion(pos, clicker, itemstack, pointed_thing, true)
 			return itemstack
---		else
---			homedecor.beds_on_rightclick(pos, node, clicker)
---			return itemstack
+		else
+--			if minetest.get_modpath("beds") then
+--				beds.on_rightclick(pos, clicker)
+--			end
+			return itemstack
 		end
 	end
 })
@@ -89,11 +93,16 @@ homedecor.register("bed_extended", {
 	sounds = default.node_sound_wood_defaults(),
 	expand = { forward = "air" },
 	on_rotate = screwdriver.disallow,
+	after_place_node = unifieddyes.recolor_on_place,
 	after_dig_node = function(pos, oldnode, oldmetadata, digger)
+		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		homedecor.unextend_bed(pos)
 	end,
 --	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
---		homedecor.beds_on_rightclick(pos, node, clicker)
+--		local itemname = itemstack:get_name()
+--		if minetest.get_modpath("beds") then
+--			beds.on_rightclick(pos, clicker)
+--		end
 --		return itemstack
 --	end,
 	drop = "homedecor:bed_regular"
@@ -120,8 +129,10 @@ homedecor.register("bed_kingsize", {
 	on_rotate = screwdriver.disallow,
 	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 = function(pos, oldnode, oldmetadata, digger)
+		unifieddyes.after_dig_node(pos, oldnode, oldmetadata, digger)
 		local inv = digger:get_inventory()
 		if digger:get_player_control().sneak and inv:room_for_item("main", "homedecor:bed_regular 2") then
 			inv:remove_item("main", "homedecor:bed_kingsize 1")
@@ -129,9 +140,12 @@ homedecor.register("bed_kingsize", {
 		end
 	end,
 --	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
---		homedecor.beds_on_rightclick(pos, node, clicker)
+--		local itemname = itemstack:get_name()
+--		if minetest.get_modpath("beds") then
+--			beds.on_rightclick(pos, clicker)
+--		end
 --		return itemstack
---	end,
+--	end
 })
 
 for _, w in pairs({ N_("mahogany"), N_("oak") }) do

homedecor/books.lua

@@ -89,7 +89,7 @@ for _, c in ipairs(bookcolors) do
 			if data.title and data.title ~= "" then
 				meta:set_string("infotext", data.title)
 			end
-			if not creative.is_enabled_for(plname) then
+			if not homedecor.expect_infinite_stacks then
 				itemstack:take_item()
 			end
 			return itemstack
@@ -156,20 +156,13 @@ for _, c in ipairs(bookcolors) do
 end
 
 minetest.register_on_player_receive_fields(function(player, form_name, fields)
-	if form_name ~= BOOK_FORMNAME then
-		return false
+	if form_name ~= BOOK_FORMNAME or not fields.save then
+		return
 	end
 	local player_name = player:get_player_name()
 	local pos = player_current_book[player_name]
-	if not pos then
-		return true
-	end
+	if not pos then return end
 	local meta = minetest.get_meta(pos)
-	local owner = meta:get_string("owner")
-	if owner ~= "" and player_name ~= owner or not fields.save then
-		player_current_book[player_name] = nil
-		return true
-	end
 	meta:set_string("title", fields.title or "")
 	meta:set_string("text", fields.text or "")
 	meta:set_string("owner", player_name)
@@ -178,9 +171,6 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
 	end
 	minetest.log("action", S("@1 has written in a book (title: \"@2\"): \"@3\" at location @4",
 			player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:getpos())))
-
-	player_current_book[player_name] = nil
-	return true
 end)
 
 minetest.register_alias("homedecor:book", "homedecor:book_grey")

homedecor/climate-control.lua

@@ -25,6 +25,7 @@ minetest.register_entity("homedecor:mesh_desk_fan", {
 })
 
 local add_mesh_desk_fan_entity = function(pos)
+	print("in add_mesh_desk_fan_entity()")
 	local param2 = minetest.get_node(pos).param2
 	local entity = minetest.add_entity(pos, "homedecor:mesh_desk_fan")
 	if param2 == 0 then

homedecor/copyright.txt

@@ -4,13 +4,15 @@ Some code copied and modified from the game's default mods (especially
 doors) and ironzorg's flowers mod.
 
 Licenses: 
-* Door open/close sound by Slanesh on freesound.org
+* For the lua code, LGPL. 
+* For the door open/close sound, CC-By-SA 3.0 by Slanesh on freesound.org
 	http://freesound.org/people/Slanesh/sounds/31768/
-* Gate open/close by j1987 on freesound.org
+* For the gate open/close sound, CC0, by j1987 on freesound.org
 	http://freesound.org/people/j1987/sounds/106116/
-* Doorbell sound by guitarguy1985 on freesound.org
+* For the doorbell sound, CC0 by guitarguy1985 on freesound.org
 	http://freesound.org/people/guitarguy1985/sounds/69384/
-* Book soundn by mckinneysound's on http://www.freesfx.co.uk/
+* For the book sound, Public Domain by mckinneysound's on http://www.freesfx.co.uk/
 	http://www.freesfx.co.uk/sfx/book?p=3
-* Phone ringing sound by andyt's on http://www.freesfx.co.uk/
+* For the phone ring, Public Domain by andyt's on http://www.freesfx.co.uk/
 	http://www.freesfx.co.uk/sfx/phone?p=5
+* For all images and everything else, WTFPL.

homedecor/depends.txt

@@ -1,9 +1,6 @@
 default
-basic_materials
 unifieddyes
 homedecor_i18n
-creative
-currency
 building_blocks?
 signs_lib?
 moreblocks?
@@ -14,6 +11,3 @@ bucket?
 beds?
 flowers?
 3d_armor?
-skinsdb?
-mesecons?
-darkage?

homedecor/doors_and_gates.lua

@@ -4,8 +4,6 @@ local S = homedecor_i18n.gettext
 
 local function N_(x) return x end
 
-local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
-
 -- doors
 
 local function isSolid(pos, adjust)
@@ -142,6 +140,11 @@ local door_model_list = {
 		usealpha = true
 	},
 
+	{	name = "glass",
+		description = N_("Glass Office Door (@1 opening)"),
+		mesh = "homedecor_door_plain.obj"
+	},
+
 	{	name = "wood_glass_oak",
 		description = N_("Glass and Wood, Oak-colored (@1 opening)"),
 		mesh = "homedecor_door_wood_glass.obj",
@@ -261,7 +264,6 @@ for i, side in ipairs(sides) do
 			drop = "homedecor:door_"..doorname.."_left",
 		    mesecons = {
 		        effector = {
-					rules = m_rules,
 		            action_on = function(pos,node)
 		                local isClosed = getClosed(pos)
 		                if isClosed then
@@ -403,7 +405,6 @@ for i, g in ipairs(gate_list) do
 		end,
         mesecons = {
             effector = {
-				rules = m_rules,
                 action_on = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "closed") end
             }
         }
@@ -432,7 +433,6 @@ for i, g in ipairs(gate_list) do
         return itemstack
 	end
     def.mesecons.effector = {
-		rules = m_rules,
         action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end
     }
 
@@ -657,6 +657,3 @@ minetest.register_alias("homedecor:jpn_door_bottom", "homedecor:door_japanese_cl
 
 minetest.register_alias("homedecor:jpn_door_top_open", "air")
 minetest.register_alias("homedecor:jpn_door_bottom_open", "homedecor:door_japanese_open")
-
-minetest.register_alias("homedecor:door_glass_right", "doors:door_glass_b")
-minetest.register_alias("homedecor:door_glass_left", "doors:door_glass_a")

homedecor/electronics.lua

@@ -141,3 +141,17 @@ homedecor.register("telephone", {
 	walkable = false,
 	sounds = default.node_sound_wood_defaults(),
 })
+
+minetest.register_abm({
+	nodenames = "homedecor:telephone",
+	label = "sfx",
+	interval = 30,
+	chance = 15,
+	action = function(pos, node)
+		minetest.sound_play("homedecor_telephone_ringing", {
+			pos = pos,
+			gain = 1.0,
+			max_hear_distance = 5
+		})
+	end
+})

homedecor/exterior.lua

@@ -118,7 +118,7 @@ minetest.register_alias("homedecor:deckchair_head", "air")
 homedecor.register("deckchair_striped_blue", {
 	mesh = "homedecor_deckchair.obj",
 	tiles = {"homedecor_deckchair_striped_blue.png"},
-	description = S("Deck Chair (blue striped)"),
+	description = S("Deck Chair"),
 	groups = { snappy = 3 },
 	expand = { forward="placeholder" },
 	sounds = default.node_sound_wood_defaults(),
@@ -251,7 +251,6 @@ homedecor.register("swing", {
 		place_on = "bottom"
 	},
 	on_place = function(itemstack, placer, pointed_thing)
-		local placer_name = placer:get_player_name() or ""
 		local isceiling, pos = homedecor.find_ceiling(itemstack, placer, pointed_thing)
 		if isceiling then
 			local height = 0
@@ -264,7 +263,7 @@ homedecor.register("swing", {
 
 				if not testreg or not testreg.buildable_to then
 					if i < 1 then
-						minetest.chat_send_player(placer_name, "No room under there to hang a swing.")
+						minetest.chat_send_player(placer:get_player_name(), "No room under there to hang a swing.")
 						return itemstack
 					else
 						break
@@ -280,11 +279,11 @@ homedecor.register("swing", {
 
 			minetest.set_node({ x=pos.x, y=pos.y-height, z=pos.z }, { name = "homedecor:swing", param2 = fdir })
 
-			if not creative.is_enabled_for(placer_name) then
+			if not homedecor.expect_infinite_stacks then
 				itemstack:take_item()
 			end
 		else
-			minetest.chat_send_player(placer_name, "You have to point at the bottom side of an overhanging object to place a swing.")
+			minetest.chat_send_player(placer:get_player_name(), "You have to point at the bottom side of an overhanging object to place a swing.")
 		end
 		return itemstack
 	end,
@@ -368,7 +367,7 @@ local shrub_cbox = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
 
 for _, color in ipairs(homedecor.shrub_colors) do
 	minetest.register_node("homedecor:shrubbery_large_"..color, {
-		description = S("Shrubbery (large, @1)", S(color)),
+		description = S("Shrubbery (@1)", S(color)),
 		drawtype = "mesh",
 		mesh = "homedecor_cube.obj",
 		tiles = {"homedecor_shrubbery_"..color..".png"},

homedecor/furniture.lua

@@ -83,7 +83,9 @@ homedecor.register("kitchen_chair_padded", {
 	sounds = default.node_sound_wood_defaults(),
 	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,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		pos.y = pos.y+0 -- where do I put my ass ?
@@ -108,7 +110,9 @@ homedecor.register("armchair", {
 	node_box = ac_cbox,
 	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,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 })
 
@@ -231,6 +235,8 @@ minetest.register_lbm({
 		local param2 = paletteidx + new_fdir
 		local newname = "homedecor:armchair"
 
+		print(name, dump(a), dump(b), dump(color).."("..dump(paletteidx)..")", dump(param2))
+
 		if node.name == "homedecor:chair" then
 			newname = "homedecor:kitchen_chair_wood"
 		elseif string.find(node.name, "homedecor:chair_") then

homedecor/furniture_recipes.lua

@@ -2,7 +2,7 @@
 minetest.register_craft({
 	output = "homedecor:table",
 	recipe = {
-		{ "default:wood","default:wood", "default:wood" },
+		{ "group:wood","group:wood", "group:wood" },
 		{ "group:stick", "", "group:stick" },
 	},
 })
@@ -70,17 +70,6 @@ minetest.register_craft({
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:armchair",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:armchair",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	type = "shapeless",
 	output = "homedecor:kitchen_chair_padded",
@@ -90,17 +79,6 @@ minetest.register_craft({
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:kitchen_chair_padded",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "homedecor:kitchen_chair_padded",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "homedecor:kitchen_chair_wood",
@@ -128,17 +106,6 @@ minetest.register_craft({
 	},
 })
 
-unifieddyes.register_color_craft({
-	output = "homedecor:standing_lamp_off",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:standing_lamp_off",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	type = "fuel",
 	recipe = "homedecor:table_lamp_off",
@@ -164,34 +131,14 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "homedecor:table_lamp_off",
+	output = "homedecor:standing_lamp_off",
 	recipe = {
-		{ "wool:white", "default:torch", "wool:white"},
-		{ "", "group:stick", ""},
-		{ "", "moreblocks:slab_wood", "" },
+		{ "homedecor:table_lamp_off"},
+		{ "group:stick"},
+		{ "group:stick"},
 	},
 })
 
-minetest.register_craft({
-	output = "homedecor:table_lamp_off",
-	recipe = {
-		{ "cottages:wool", "default:torch", "cottages:wool"},
-		{ "", "group:stick", ""},
-		{ "", "moreblocks:slab_wood", "" },
-	},
-})
-
-unifieddyes.register_color_craft({
-	output = "homedecor:table_lamp_off",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "homedecor:table_lamp_off",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 minetest.register_craft({
 	output = "homedecor:toilet",
 	recipe = {
@@ -205,7 +152,6 @@ minetest.register_craft({
 	output = "homedecor:sink",
 	recipe = {
 		{ "group:marble","bucket:bucket_empty", "group:marble" },
-		{ "", "group:marble", "" }
 	},
 })
 
@@ -226,7 +172,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "homedecor:shower_tray",
 	recipe = {
-		{ "group:marble","bucket:bucket_empty", "group:marble" },
+		{ "group:marble","bucket:bucket_water", "group:marble" },
 	},
 })
 

homedecor/gastronomy.lua

@@ -213,26 +213,20 @@ homedecor.register("soda_machine", {
 	sounds = default.node_sound_wood_defaults(),
 	on_rotate = screwdriver.rotate_simple,
 	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
+		if wieldname == "homedecor:coin" then
+			wielditem:take_item()
+			clicker:set_wielded_item(wielditem)
 			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."))
+			minetest.chat_send_player(clicker:get_player_name(), S("Please insert a coin in the machine."))
 		end
 	end
 })
-
-minetest.register_alias("homedecor:coin", "currency:minegeld_cent_25")

homedecor/handlers/expansion.lua

@@ -104,7 +104,7 @@ local function stack(itemstack, placer, fdir, pos, def, pos2, node1, node2, poin
 			ctrl_node_def.after_place_node(pos, placer, itemstack, pointed_thing)
 		end
 
-		if not creative.is_enabled_for(placer_name) then
+		if not homedecor.expect_infinite_stacks then
 			itemstack:take_item()
 		end
 	end
@@ -211,21 +211,22 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks
 	local rightnode = minetest.get_node(rightpos)
 
 	local inv = placer:get_inventory()
+	local lastdye = unifieddyes.last_used_dye[placer_name]
 
 	if leftnode.name == "homedecor:bed_regular" then
 		local newname = string.gsub(thisnode.name, "_regular", "_kingsize")
-		local meta = minetest.get_meta(pos)
-		local leftmeta = minetest.get_meta(leftpos)
-
+		local meta = minetest.get_meta(leftpos)
 		minetest.set_node(pos, {name = "air"})
-		minetest.swap_node(leftpos, { name = newname, param2 = param2})
+		minetest.set_node(leftpos, { name = newname, param2 = param2})
+		meta:set_string("dye", lastdye)
+		inv:add_item("main", lastdye)
 	elseif rightnode.name == "homedecor:bed_regular" then
 		local newname = string.gsub(thisnode.name, "_regular", "_kingsize")
-		local meta = minetest.get_meta(pos)
-		local rightmeta = minetest.get_meta(rightpos)
-
+		local meta = minetest.get_meta(rightpos)
 		minetest.set_node(rightpos, {name = "air"})
-		minetest.swap_node(pos, { name = newname, param2 = param2})
+		minetest.set_node(pos, { name = newname, param2 = param2})
+		meta:set_string("dye", lastdye)
+		inv:add_item("main", lastdye)
 	end
 
 	local toppos = {x=pos.x, y=pos.y+1.0, z=pos.z}
@@ -234,7 +235,14 @@ function homedecor.bed_expansion(pos, placer, itemstack, pointed_thing, trybunks
 	if trybunks and is_buildable_to(placer_name, toppos, topposfwd) then
 		local newname = string.gsub(thisnode.name, "_regular", "_extended")
 		local newparam2 = param2 % 8
-		minetest.swap_node(toppos, { name = thisnode.name, param2 = param2})
+		if inv:contains_item("main", lastdye) then
+			minetest.set_node(toppos, { name = thisnode.name, param2 = param2})
+			if lastdye then inv:remove_item("main", lastdye.." 1") end
+		else
+			minetest.set_node(toppos, { name = thisnode.name, param2 = newparam2})
+			minetest.chat_send_player(placer_name, "Ran out of "..lastdye..", using neutral color.")
+			unifieddyes.last_used_dye[placer_name] = nil
+		end
 		minetest.swap_node(pos, { name = newname, param2 = param2})
 		itemstack:take_item()
 	end
@@ -257,8 +265,6 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
 	if not pos then return itemstack end
 
 	local fdir = minetest.dir_to_facedir(placer:get_look_dir())
-	local meta = itemstack:get_meta()
-	local pindex = meta:get_int("palette_index")
 
 	local abovepos  = { x=pos.x, y=pos.y+1, z=pos.z }
 	local abovenode = minetest.get_node(abovepos)
@@ -362,6 +368,14 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
 		fdir = right_fwd_node.param2
 		pos = fwd_pos
 		new_place_name = string.gsub(right_fwd_node.name, "_diagonal_.-$", "_horizontal")
+
+	-- try to follow a horizontal with another of the same
+	elseif left_node and string.find(left_node.name, "homedecor:banister_.*_horizontal") then
+		fdir = left_node.param2
+		new_place_name = left_node.name
+	elseif right_node and string.find(right_node.name, "homedecor:banister_.*_horizontal") then
+		fdir = right_node.param2
+		new_place_name = right_node.name
 	end
 
 	-- manually invert left-right orientation
@@ -373,7 +387,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
 		end
 	end
 
-	minetest.set_node(pos, {name = new_place_name, param2 = fdir+pindex})
+	minetest.set_node(pos, {name = new_place_name, param2 = fdir})
 	itemstack:take_item()
 	return itemstack
 end

homedecor/handlers/init.lua

@@ -19,6 +19,4 @@ dofile(handlerpath.."registration.lua")
 -- some nodes have particle spawners
 dofile(handlerpath.."water_particles.lua")
 
-
-dofile(handlerpath.."mt_game_beds_functions.lua")
 dofile(handlerpath.."sit.lua")

homedecor/handlers/inventory.lua

@@ -182,7 +182,7 @@ function homedecor.handle_inventory(name, def, original_def)
 		minetest.register_craft({
 			type = "shapeless",
 			output = "homedecor:" .. locked_name,
-			recipe = { "homedecor:" .. name, "basic_materials:padlock" }
+			recipe = { "homedecor:" .. name, "default:steel_ingot" }
 		})
 	end
 

homedecor/handlers/mt_game_beds_functions.lua

@@ -1,175 +0,0 @@
--- This file is a partial copy of functions.lua from minetest_game's beds mod
--- with changes needed for homedecor's beds.
-
-local pi = math.pi
-local is_sp = minetest.is_singleplayer()
-local enable_respawn = minetest.settings:get_bool("enable_bed_respawn")
-if enable_respawn == nil then
-	enable_respawn = true
-end
-
--- Helper functions
-
-local function get_look_yaw(pos)
-	local n = minetest.get_node(pos)
-	local fdir = n.param2 % 4
-	if fdir == 0 then
-		return pi / 2, fdir
-	elseif fdir == 1 then
-		return -pi / 2, fdir
-	elseif fdir == 3 then
-		return pi, fdir
-	else
-		return 0, fdir
-	end
-end
-
-local function is_night_skip_enabled()
-	local enable_night_skip = minetest.settings:get_bool("enable_bed_night_skip")
-	if enable_night_skip == nil then
-		enable_night_skip = true
-	end
-	return enable_night_skip
-end
-
-local function check_in_beds(players)
-	local in_bed = beds.player
-	if not players then
-		players = minetest.get_connected_players()
-	end
-
-	for n, player in ipairs(players) do
-		local name = player:get_player_name()
-		if not in_bed[name] then
-			return false
-		end
-	end
-
-	return #players > 0
-end
-
-local function get_player_in_bed()
-	local player_in_bed = 0
-	for k,v in pairs(beds.player) do
-		player_in_bed = player_in_bed + 1
-	end
-	return player_in_bed
-end
-
-local function lay_down(player, pos, bed_pos, state, skip)
-	local name = player:get_player_name()
-	local hud_flags = player:hud_get_flags()
-
-	if not player or not name then
-		return
-	end
-
-	-- stand up
-	if state ~= nil and not state then
-		local p = beds.pos[name] or nil
-		if beds.player[name] ~= nil then
-			beds.player[name] = nil
-		end
-		-- skip here to prevent sending player specific changes (used for leaving players)
-		if skip then
-			return
-		end
-		if p then
-			player:setpos(p)
-		end
-
-		-- physics, eye_offset, etc
-		player:set_eye_offset({x = 0, y = 0, z = 0}, {x = 0, y = 0, z = 0})
-		player:set_look_horizontal(math.random(1, 180) / 100)
-		default.player_attached[name] = false
-		player:set_physics_override(1, 1, 1)
-		hud_flags.wielditem = true
-		default.player_set_animation(player, "stand" , 30)
-
-	-- lay down
-	else
-		beds.player[name] = 1
-		beds.pos[name] = pos
-		-- physics, eye_offset, etc
-		player:set_eye_offset({x = 0, y = -13, z = 0}, {x = 0, y = 0, z = 0})
-		local yaw, fdir = get_look_yaw(bed_pos)
-		player:set_look_horizontal(yaw)
-		local offsets = {
-			[0] = {0.5,     0},
-			[1] = {-0.5,    0},
-			[2] = {0,    -0.5},
-			[3] = {0,     0.5}
-		}
-		local p = {x = bed_pos.x + offsets[fdir][1], y = bed_pos.y, z = bed_pos.z + offsets[fdir][2]}
-		player:set_physics_override(0, 0, 0)
-		player:setpos(p)
-		default.player_attached[name] = true
-		hud_flags.wielditem = false
-		default.player_set_animation(player, "lay" , 0)
-	end
-
-	player:hud_set_flags(hud_flags)
-end
-
-local function update_formspecs(finished)
-	local ges = #minetest.get_connected_players()
-	local player_in_bed = get_player_in_bed()
-	local form_n
-	local is_majority = (ges / 2) < player_in_bed
-
-	if finished then
-		form_n = beds.formspec .. "label[2.7,11; Good morning.]"
-	else
-		form_n = beds.formspec .. "label[2.2,11;" .. tostring(player_in_bed) ..
-			" of " .. tostring(ges) .. " players are in bed]"
-		if is_majority and is_night_skip_enabled() then
-			form_n = form_n .. "button_exit[2,8;4,0.75;force;Force night skip]"
-		end
-	end
-
-	for name,_ in pairs(beds.player) do
-		minetest.show_formspec(name, "beds_form", form_n)
-	end
-end
-
-
--- Public functions
-
-function homedecor.beds_on_rightclick(pos, node, player)
-	local name = player:get_player_name()
-	local ppos = player:getpos()
-	local tod = minetest.get_timeofday()
-
-	if tod > 0.2 and tod < 0.805 then
-		if beds.player[name] then
-			lay_down(player, nil, nil, false)
-		end
-		minetest.chat_send_player(name, "You can only sleep at night.")
-		return
-	end
-
-	-- move to bed
-	if not beds.player[name] then
-		lay_down(player, ppos, pos)
-		beds.set_spawns() -- save respawn positions when entering bed
-	else
-		lay_down(player, nil, nil, false)
-	end
-
-	if not is_sp then
-		update_formspecs(false)
-	end
-
-	-- skip the night and let all players stand up
-	if check_in_beds() then
-		minetest.after(2, function()
-			if not is_sp then
-				update_formspecs(is_night_skip_enabled())
-			end
-			if is_night_skip_enabled() then
-				beds.skip_night()
-				beds.kick_players()
-			end
-		end)
-	end
-end

homedecor/handlers/water_particles.lua

@@ -30,8 +30,8 @@ function homedecor.start_particle_spawner(pos, node, particledef, soundname)
 			end, s_handle)
 		end
 		minetest.delete_particlespawner(id)
-		this_spawner_meta:set_int("active", 0)
-		this_spawner_meta:set_int("sound", 0)
+		this_spawner_meta:set_int("active", nil)
+		this_spawner_meta:set_int("sound", nil)
 		return
 	end
 
@@ -109,6 +109,6 @@ function homedecor.stop_particle_spawner(pos)
 		end, s_handle)
 	end
 
-	this_spawner_meta:set_int("active", 0)
-	this_spawner_meta:set_int("sound", 0)
+	this_spawner_meta:set_int("active", nil)
+	this_spawner_meta:set_int("sound", nil)
 end

homedecor/init.lua

@@ -11,8 +11,12 @@ local modpath = minetest.get_modpath("homedecor")
 
 local S = homedecor_i18n.gettext
 
-homedecor = {}
-homedecor.modpath = modpath
+homedecor = {
+	modpath = modpath,
+
+	-- infinite stacks
+	expect_infinite_stacks = minetest.settings:get_bool("creative_mode") and not minetest.get_modpath("unified_inventory")
+}
 
 -- Determine if the item being pointed at is the underside of a node (e.g a ceiling)
 function homedecor.find_ceiling(itemstack, placer, pointed_thing)
@@ -119,6 +123,4 @@ dofile(modpath.."/wardrobe.lua")
 
 dofile(modpath.."/crafts.lua")
 
-if minetest.settings:get_bool("log_mod") then
-	minetest.log("action", "[HomeDecor] " .. S("Loaded!"))
-end
+print("[HomeDecor] " .. S("Loaded!"))

homedecor/lighting.lua

@@ -46,7 +46,9 @@ minetest.register_node("homedecor:glowlight_half", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:glowlight_quarter", {
@@ -84,7 +86,9 @@ minetest.register_node("homedecor:glowlight_quarter", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 minetest.register_node("homedecor:glowlight_small_cube", {
@@ -122,7 +126,9 @@ minetest.register_node("homedecor:glowlight_small_cube", {
 	sounds = default.node_sound_glass_defaults(),
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 homedecor.register("plasma_lamp", {
@@ -360,20 +366,13 @@ homedecor.register("ceiling_lantern", {
 	walkable = false
 })
 
-local sm_light = default.LIGHT_MAX-2
-
-if minetest.get_modpath("darkage") then
-	minetest.register_alias("homedecor:lattice_lantern_large", "darkage:lamp")
-	sm_light = default.LIGHT_MAX-5
-else
-	homedecor.register("lattice_lantern_large", {
+homedecor.register("lattice_lantern_large", {
 	description = S("Lattice lantern (large)"),
 	tiles = { 'homedecor_lattice_lantern_large.png' },
 	groups = { snappy = 3 },
 	light_source = default.LIGHT_MAX,
 	sounds = default.node_sound_glass_defaults(),
-	})
-end
+})
 
 homedecor.register("lattice_lantern_small", {
 	description = S("Lattice lantern (small)"),
@@ -391,7 +390,7 @@ homedecor.register("lattice_lantern_small", {
 		fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 }
 	},
 	groups = { snappy = 3 },
-	light_source = sm_light,
+	light_source = default.LIGHT_MAX-1,
 	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
@@ -450,6 +449,7 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
+		place_param2 = 240,
 		walkable = false,
 		light_source = light,
 		selection_box = tlamp_cbox,
@@ -457,17 +457,14 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1,
 			not_in_creative_inventory=((light ~= nil) and 1) or nil,
 		},
+		drop = "homedecor:table_lamp_off",
 		on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 			node.name = "homedecor:table_lamp_"..repl[suffix]
 			minetest.set_node(pos, node)
 		end,
 		on_construct = unifieddyes.on_construct,
-		drop = {
-			items = {
-				{items = {"homedecor:table_lamp_off"}, inherit_color = true },
-			}
-		}
-
+		after_place_node = unifieddyes.recolor_on_place,
+		after_dig_node = unifieddyes.after_dig_node
 	})
 
 	homedecor.register("standing_lamp_"..suffix, {
@@ -483,6 +480,7 @@ local function reg_lamp(suffix, nxt, light, brightness)
 		paramtype = "light",
 		paramtype2 = "color",
 		palette = "unifieddyes_palette_extended.png",
+		place_param2 = 240,
 		walkable = false,
 		light_source = light,
 		groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1,
@@ -496,12 +494,9 @@ local function reg_lamp(suffix, nxt, light, brightness)
 			minetest.set_node(pos, node)
 		end,
 		on_construct = unifieddyes.on_construct,
-		--expand = { top="air" },
-		drop = {
-			items = {
-				{items = {"homedecor:standing_lamp_off"}, inherit_color = true },
-			}
-		}
+		after_place_node = unifieddyes.recolor_on_place,
+		after_dig_node = unifieddyes.after_dig_node,
+		expand = { top="air" },
 	})
 
 	-- for old maps that had the original 3dforniture mod
@@ -540,7 +535,9 @@ homedecor.register("desk_lamp", {
 	groups = {snappy=3, ud_param2_colorable = 1},
 	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,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew
 })
 
@@ -743,140 +740,27 @@ minetest.register_lbm({
 	end
 })
 
-local chains_sbox = {
-	type = "fixed",
-	fixed = { -0.1, -0.5, -0.1, 0.1, 0.5, 0.1 }
-}
-
-local topchains_sbox = {
-	type = "fixed",
-	fixed = {
-		{ -0.25, 0.35, -0.25, 0.25, 0.5, 0.25 },
-		{ -0.1, -0.5, -0.1, 0.1, 0.4, 0.1 }
-	}
-}
-
-minetest.register_node("homedecor:chain_steel_top", {
-	description = S("Hanging chain (ceiling mount, steel)"),
-	drawtype = "mesh",
-	mesh = "homedecor_chains_top.obj",
-	tiles = {"basic_materials_chain_steel.png"},
-	walkable = false,
-	climbable = true,
-	sunlight_propagates = true,
-	paramtype = "light",
-	inventory_image = "basic_materials_chain_steel_inv.png",
-	groups = {cracky=3},
-	selection_box = topchains_sbox,
-})
-
-minetest.register_node("homedecor:chain_brass_top", {
-	description = S("Hanging chain (ceiling mount, brass)"),
-	drawtype = "mesh",
-	mesh = "homedecor_chains_top.obj",
-	tiles = {"basic_materials_chain_brass.png"},
-	walkable = false,
-	climbable = true,
-	sunlight_propagates = true,
-	paramtype = "light",
-	inventory_image = "basic_materials_chain_brass_inv.png",
-	groups = {cracky=3},
-	selection_box = topchains_sbox,
-})
-
-minetest.register_node("homedecor:chandelier_steel", {
-	description = S("Chandelier (steel)"),
-	paramtype = "light",
-	light_source = 12,
-	walkable = false,
-	climbable = true,
-	sunlight_propagates = true,
-	tiles = {
-		"basic_materials_chain_steel.png",
-		"homedecor_candle_flat.png",
-		{
-			name="homedecor_candle_flame.png",
-			animation={
-				type="vertical_frames",
-				aspect_w=16,
-				aspect_h=16,
-				length=3.0
-			}
-		}
+minetest.register_lbm({
+	name = "homedecor:recolor_lighting",
+	label = "Convert some kinds of lights to use UD extended palette",
+	run_at_every_load = false,
+	nodenames = {
+		"homedecor:table_lamp_off",
+		"homedecor:table_lamp_low",
+		"homedecor:table_lamp_med",
+		"homedecor:table_lamp_hi",
+		"homedecor:table_lamp_max",
+		"homedecor:standing_lamp_off",
+		"homedecor:standing_lamp_low",
+		"homedecor:standing_lamp_med",
+		"homedecor:standing_lamp_hi",
+		"homedecor:standing_lamp_max",
 	},
-	drawtype = "mesh",
-	mesh = "homedecor_chandelier.obj",
-	groups = {cracky=3},
-	sounds =  default.node_sound_stone_defaults(),
+	action = function(pos, node)
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("palette") ~= "ext" then
+			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
+			meta:set_string("palette", "ext")
+		end
+	end
 })
-
-minetest.register_node("homedecor:chandelier_brass", {
-	description = S("Chandelier (brass)"),
-	paramtype = "light",
-	light_source = 12,
-	walkable = false,
-	climbable = true,
-	sunlight_propagates = true,
-	tiles = {
-		"basic_materials_chain_brass.png",
-		"homedecor_candle_flat.png",
-		{
-			name="homedecor_candle_flame.png",
-			animation={
-				type="vertical_frames",
-				aspect_w=16,
-				aspect_h=16,
-				length=3.0
-			}
-		}
-	},
-	drawtype = "mesh",
-	mesh = "homedecor_chandelier.obj",
-	groups = {cracky=3},
-	sounds =  default.node_sound_stone_defaults(),
-})
-
--- crafts
-
-minetest.register_craft({
-	output = 'homedecor:chain_steel_top',
-	recipe = {
-		{'default:steel_ingot'},
-		{'basic_materials:chainlink_steel'},
-	},
-})
-
-minetest.register_craft({
-	output = 'homedecor:chandelier_steel',
-	recipe = {
-		{'', 'basic_materials:chainlink_steel', ''},
-		{'default:torch', 'basic_materials:chainlink_steel', 'default:torch'},
-		{'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'},
-	}
-})
-
--- brass versions
-
-minetest.register_craft({
-	output = 'homedecor:chain_brass_top',
-	recipe = {
-		{'basic_materials:brass_ingot'},
-		{'basic_materials:chainlink_brass'},
-	},
-})
-
-minetest.register_craft({
-	output = 'homedecor:chandelier_brass',
-	recipe = {
-		{'', 'basic_materials:chainlink_brass', ''},
-		{'default:torch', 'basic_materials:chainlink_brass', 'default:torch'},
-		{'basic_materials:brass_ingot', 'basic_materials:brass_ingot', 'basic_materials:brass_ingot'},
-	}
-})
-
-minetest.register_alias("chains:chain_top",        "homedecor:chain_steel_top")
-minetest.register_alias("chains:chain_top_brass",  "homedecor:chain_brass_top")
-
-minetest.register_alias("chains:chandelier_steel", "homedecor:chandelier_steel")
-minetest.register_alias("chains:chandelier_brass", "homedecor:chandelier_brass")
-

homedecor/misc-nodes.lua

@@ -396,7 +396,7 @@ local n = { 1, 2 }
 
 for _, i in ipairs(n) do
 	homedecor.register("picture_frame"..i, {
-		description = S("Picture Frame "..i),
+		description = S("Picture Frame"),
 		mesh = "homedecor_picture_frame.obj",
 		tiles = {
 			"homedecor_picture_frame_image"..i..".png",
@@ -483,19 +483,23 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 		local name, matdesc, tile1, tile2 = unpack(mat)
 		local nodename = "banister_"..name.."_"..side
 
+		local groups = { snappy = 3, not_in_creative_inventory = 1 }
 		local cbox = {
 			type = "fixed",
 			fixed = { -9/16, -3/16, 5/16, 9/16, 24/16, 8/16 }
 		}
 
 		if side == "horizontal" then
+			groups = { snappy = 3 }
 			cbox = {
 				type = "fixed",
 				fixed = { -8/16, -8/16, 5/16, 8/16, 8/16, 8/16 }
 			}
+		else
+			minetest.register_alias(string.gsub("homedecor:"..nodename, "diagonal_", ""), "homedecor:"..nodename)
 		end
 
-		local def = {
+		homedecor.register(nodename, {
 			description = S("Banister for Stairs (@1, @2)", matdesc, sidedesc),
 			mesh = "homedecor_banister_"..side..".obj",
 			tiles = {
@@ -503,37 +507,12 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
 				tile2,
 			},
 			inventory_image = "homedecor_banister_"..name.."_inv.png",
+			groups = groups,
 			selection_box = cbox,
 			collision_box = cbox,
-			groups = { snappy = 3},
 			on_place = homedecor.place_banister,
 			drop = "homedecor:banister_"..name.."_horizontal",
-		}
-
-		if side ~= "horizontal" then
-			def.groups.not_in_creative_inventory = 1 
-		end
-
-		if name == "wood" then
-			def.palette = "unifieddyes_palette_greys.png"
-			def.airbrush_replacement_node = "homedecor:banister_wood_"..side.."_grey"
-			def.groups.ud_param2_colorable = 1
-			def.paramtype2 = "colorfacedir"
-		end
-		homedecor.register(nodename, def)
-
-		if name == "wood" then
-			local nn = "homedecor:"..nodename
-			local def2 = table.copy(minetest.registered_items[nn])
-			def2.tiles = {
-				homedecor.white_wood,
-				homedecor.white_wood
-			}
-			def2.inventory_image = "homedecor_banister_wood_colored_inv.png"
-			def2.groups.not_in_creative_inventory = 1 
-
-			unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal")
-		end
+		})
 	end
 end
 

homedecor/shutters.lua

@@ -34,14 +34,16 @@ homedecor.register("shutter", {
 	wield_image = inv,
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
-	airbrush_replacement_node = "homedecor:shutter_colored",
+	ud_replacement_node = "homedecor:shutter_colored",
 	groups = { snappy = 3, ud_param2_colorable = 1 },
 	sounds = default.node_sound_wood_defaults(),
 	selection_box = shutter_cbox,
 	node_box = shutter_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node
 })
 
 homedecor.register("shutter_colored", {
@@ -58,7 +60,10 @@ homedecor.register("shutter_colored", {
 	node_box = shutter_cbox,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
+	drop = "homedecor:shutter"
 })
 
 minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")

homedecor/wardrobe.lua

@@ -6,75 +6,6 @@ local wd_cbox = {
 	fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 }
 }
 
--- cache set_textures function (fallback to old version)
--- default.player_set_textures is deprecated and will be removed in future
-local set_player_textures =
-	minetest.get_modpath("player_api") and player_api.set_textures
-	or default.player_set_textures
-
-local armor_mod_path = minetest.get_modpath("3d_armor")
-
-local skinslist = {"male1", "male2", "male3", "male4", "male5"}
-local default_skin = "character.png"
-
-local skinsdb_mod_path = minetest.get_modpath("skinsdb")
-if skinsdb_mod_path then
-	for _, shrt in ipairs(skinslist) do
-		for _, prefix in ipairs({"", "fe"}) do
-			local skin_name = prefix..shrt
-			local skin_obj = skins.new("homedecor_clothes_"..skin_name..".png") -- Texture PNG file as key to be compatible in set_player_skin
-			skin_obj:set_preview("homedecor_clothes_"..skin_name.."_preview.png")
-			skin_obj:set_texture("homedecor_clothes_"..skin_name..".png")
-			skin_obj:set_meta("name", "Wardrobe "..skin_name)
-			skin_obj:set_meta("author", 'Calinou and Jordach')
-			skin_obj:set_meta("license", 'CC-by-SA-4.0')
-			local file = io.open(homedecor.modpath.."/textures/homedecor_clothes_"..skin_name..".png", "r")
-			skin_obj:set_meta("format", skins.get_skin_format(file))
-			file:close()
-			skin_obj:set_meta("in_inventory_list", false)
-		end
-	end
-end
-
-function homedecor.get_player_skin(player)
-	local skin = player:get_attribute("homedecor:player_skin")
-	if not skin or skin == "" then
-		return default_skin, true
-	end
-	return skin, false
-end
-
-function homedecor.set_player_skin(player, skin, save)
-	skin = skin or default_skin
-	if skinsdb_mod_path then
-		skins.set_player_skin(player, skin)
-	elseif armor_mod_path then -- if 3D_armor's installed, let it set the skin
-		armor.textures[player:get_player_name()].skin = skin
-		armor:update_player_visuals(player)
-	else
-		set_player_textures(player, { skin })
-	end
-
-	if save then
-		if skin == default_skin then
-			skin = "default"
-			player:set_attribute("homedecor:player_skin", "")
-		else
-			player:set_attribute("homedecor:player_skin", skin)
-		end
-		if save == "player" then -- if player action
-			minetest.log("verbose",
-				S("player @1 sets skin to @2", player:get_player_name(), skin) ..
-				(armor_mod_path and ' [3d_armor]' or '')
-			)
-		end
-	end
-end
-
-function homedecor.unset_player_skin(player)
-	homedecor.set_player_skin(player, nil, true)
-end
-
 homedecor.register("wardrobe", {
 	mesh = "homedecor_bedroom_wardrobe.obj",
 	tiles = {
@@ -96,16 +27,16 @@ homedecor.register("wardrobe", {
 	},
 	on_construct = function(pos)
 		local meta = minetest.get_meta(pos)
+		local skins = {"male1", "male2", "male3", "male4", "male5"}
 		-- textures made by the Minetest community (mostly Calinou and Jordach)
 		local clothes_strings = ""
 		for i = 1,5 do
 			clothes_strings = clothes_strings..
-			  "image_button_exit["..(i-1)..".5,0;1.1,2;homedecor_clothes_"..skinslist[i].."_preview.png;"..skinslist[i]..";]"..
-			  "image_button_exit["..(i-1)..".5,2;1.1,2;homedecor_clothes_fe"..skinslist[i].."_preview.png;fe"..skinslist[i]..";]"
+			  "image_button_exit["..(i-1)..".5,0;1.1,2;homedecor_clothes_"..skins[i].."_preview.png;"..skins[i]..";]"..
+			  "image_button_exit["..(i-1)..".5,2;1.1,2;homedecor_clothes_fe"..skins[i].."_preview.png;fe"..skins[i]..";]"
 		end
 		meta:set_string("formspec", "size[5.5,8.5]"..default.gui_bg..default.gui_bg_img..default.gui_slots..
 			"vertlabel[0,0.5;"..minetest.formspec_escape(S("Clothes")).."]"..
-			"button_exit[0,3.29;0.6,0.6;default;x]"..
 			clothes_strings..
 			"vertlabel[0,5.2;"..minetest.formspec_escape(S("Storage")).."]"..
 			"list[current_name;main;0.5,4.5;5,2;]"..
@@ -113,17 +44,26 @@ homedecor.register("wardrobe", {
 			"listring[]")
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
-		if fields.default then
-			homedecor.set_player_skin(sender, nil, "player")
-			return
-		end
+		local skins = {"male1", "male2", "male3", "male4", "male5"}
+		local playerName = sender:get_player_name()
+		local armor_mod = minetest.get_modpath("3d_armor")
 
 		for i = 1,5 do
-			if fields[skinslist[i]] then
-				homedecor.set_player_skin(sender, "homedecor_clothes_"..skinslist[i]..".png", "player")
+			if fields[skins[i]] then
+				if armor_mod then -- if 3D_armor's installed, let it set the skin
+					armor.textures[playerName].skin = "homedecor_clothes_"..skins[i]..".png"
+					armor:update_player_visuals(sender)
 					break
-			elseif fields["fe"..skinslist[i]] then
-				homedecor.set_player_skin(sender, "homedecor_clothes_fe"..skinslist[i]..".png", "player")
+				end
+				default.player_set_textures(sender, { "homedecor_clothes_"..skins[i]..".png" })
+				break
+			elseif fields["fe"..skins[i]] then
+				if armor_mod then
+					armor.textures[playerName].skin = "homedecor_clothes_fe"..skins[i]..".png"
+					armor:update_player_visuals(sender)
+					break
+				end
+				default.player_set_textures(sender, { skin = "homedecor_clothes_fe"..skins[i]..".png" })
 				break
 			end
 		end
@@ -132,14 +72,3 @@ homedecor.register("wardrobe", {
 
 minetest.register_alias("homedecor:wardrobe_bottom", "homedecor:wardrobe")
 minetest.register_alias("homedecor:wardrobe_top", "air")
-
-minetest.register_on_joinplayer(function(player)
-	local skin = player:get_attribute("homedecor:player_skin")
-
-	if skin and skin ~= "" then
-		-- setting player skin on connect has no effect, so delay skin change
-		minetest.after(1, function(player, skin)
-			homedecor.set_player_skin(player, skin)
-		end, player, skin)
-	end
-end)

homedecor/window_treatments.lua

@@ -112,8 +112,10 @@ minetest.register_node("homedecor:curtain_closed", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	selection_box = { type = "wallmounted" },
+	after_dig_node = unifieddyes.after_dig_node,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z})
@@ -127,7 +129,7 @@ minetest.register_node("homedecor:curtain_closed", {
 })
 
 minetest.register_node("homedecor:curtain_open", {
-	description = S("Curtains (open)"),
+	description = S("Curtains"),
 	tiles = { "homedecor_curtain_open.png" },
 	inventory_image = "homedecor_curtain_open.png",
 	drawtype = 'signlike',
@@ -139,8 +141,10 @@ minetest.register_node("homedecor:curtain_open", {
 	paramtype2 = "colorwallmounted",
 	palette = "unifieddyes_palette_colorwallmounted.png",
 	selection_box = { type = "wallmounted" },
+	after_dig_node = unifieddyes.after_dig_node,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 	end,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		local topnode = minetest.get_node({x=pos.x, y=pos.y+1.0, z=pos.z})

homedecor_3d_extras/copyright.txt

@@ -0,0 +1,12 @@
+Most code and all textures by Vanessa Ezekowitz.
+
+Some code copied and modified from the game's default mods (especially 
+doors) and ironzorg's flowers mod.
+
+Licenses: 
+* For the lua code, LGPL. 
+* For the door open/close sound, CC-By-SA 3.0 by Slanesh on freesound.org
+	http://freesound.org/people/Slanesh/sounds/31768/
+* For the gate open/close sound, CC0, by j1987 on freesound.org
+	http://freesound.org/people/j1987/sounds/106116/
+* For all images and everything else, WTFPL.

homedecor_i18n/tools/updatepo.sh

@@ -7,8 +7,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")/..";
 
 # Extract translatable strings.
 xgettext --from-code=UTF-8 \
-		--language=Lua \
-		--sort-by-file \
 		--keyword=S \
 		--keyword=NS:1,2 \
 		--keyword=N_ \

itemframes/init.lua

@@ -32,25 +32,6 @@ minetest.register_entity("itemframes:item",{
 		if self.nodename == "itemframes:pedestal" then
 			self.object:set_properties({automatic_rotate = 1})
 		end
-		if self.texture ~= nil and self.nodename ~= nil then
-			local entity_pos = vector.round(self.object:get_pos())
-			local objs = minetest.get_objects_inside_radius(entity_pos, 0.5)
-			for _, obj in ipairs(objs) do
-				if obj ~= self.object and
-				   obj:get_luaentity() and
-				   obj:get_luaentity().name == "itemframes:item" and
-				   obj:get_luaentity().nodename == self.nodename and
-				   obj:get_properties() and
-				   obj:get_properties().textures and
-				   obj:get_properties().textures[1] == self.texture then
-					minetest.log("action","[itemframes] Removing extra " ..
-						self.texture .. " found in " .. self.nodename .. " at " ..
-						minetest.pos_to_string(entity_pos))
-					self.object:remove()
-					break
-				end
-			end
-		end
 	end,
 	get_staticdata = function(self)
 		if self.nodename ~= nil and self.texture ~= nil then
@@ -138,7 +119,7 @@ minetest.register_node("itemframes:frame",{
 	sunlight_propagates = true,
 	groups = {choppy = 2, dig_immediate = 2},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_defaults(),
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
@@ -201,7 +182,7 @@ minetest.register_node("itemframes:pedestal",{
 	tiles = {"itemframes_pedestal.png"},
 	paramtype = "light",
 	groups = {cracky = 3},
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_defaults(),
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
@@ -247,32 +228,25 @@ minetest.register_node("itemframes:pedestal",{
 
 -- automatically restore entities lost from frames/pedestals
 -- due to /clearobjects or similar
-minetest.register_lbm({
-	label = "Maintain itemframe and pedestal entities",
-	name = "itemframes:maintain_entities",
+
+minetest.register_abm({
 	nodenames = {"itemframes:frame", "itemframes:pedestal"},
-	run_at_every_load = true,
-	action = function(pos, node)
-		minetest.after(0,
-			function(pos, node)
-				local meta = minetest.get_meta(pos)
-				local itemstring = meta:get_string("item")
-				if itemstring ~= "" then
-					local entity_pos = pos
-					if node.name == "itemframes:pedestal" then
-						entity_pos = {x=pos.x,y=pos.y+1,z=pos.z}
+	interval = 15,
+	chance = 1,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local num
+
+		if node.name == "itemframes:frame" then
+			num = #minetest.get_objects_inside_radius(pos, 0.5)
+		elseif node.name == "itemframes:pedestal" then
+			pos.y = pos.y + 1
+			num = #minetest.get_objects_inside_radius(pos, 0.5)
+			pos.y = pos.y - 1
 		end
-					local objs = minetest.get_objects_inside_radius(entity_pos, 0.5)
-					if #objs == 0 then
-						minetest.log("action","[itemframes] Replacing missing " ..
-							itemstring .. " in " .. node.name .. " at " ..
-							minetest.pos_to_string(pos))
+
+		if num > 0 then return end
 		update_item(pos, node)
 	end
-				end
-			end,
-		pos, node)
-	end
 })
 
 -- crafts

lavalamp/README.txt

@@ -20,5 +20,23 @@ Recipe:
 
 Mod dependencies: wool, bucket
 
+License:
+Sourcecode: WTFPL (see below)
+Graphics: WTFPL (see below)
+
 See also:
 http://minetest.net/
+
+         DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.

lavalamp/init.lua

@@ -28,6 +28,7 @@ minetest.register_node("lavalamp:lavalamp", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	sunlight_propagates = true,
 	walkable = false,
 	light_source = 14,
@@ -38,6 +39,8 @@ minetest.register_node("lavalamp:lavalamp", {
 	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1},
 	sounds = default.node_sound_glass_defaults(),
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		node.name = "lavalamp:lavalamp_off"
 		minetest.swap_node(pos, node)
@@ -56,6 +59,7 @@ minetest.register_node("lavalamp:lavalamp_off", {
 	paramtype = "light",
 	paramtype2 = "color",
 	palette = "unifieddyes_palette_extended.png",
+	place_param2 = 240,
 	sunlight_propagates = true,
 	walkable = false,
 	selection_box = {
@@ -66,16 +70,13 @@ minetest.register_node("lavalamp:lavalamp_off", {
 	sounds = default.node_sound_glass_defaults(),
 	drop = "lavalamp:lavalamp",
 	on_construct = unifieddyes.on_construct,
+	after_place_node = unifieddyes.recolor_on_place,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		node.name = "lavalamp:lavalamp"
 		minetest.swap_node(pos, node)
 		return itemstack
 	end,
-	drop = {
-		items = {
-			{items = {"lavalamp:lavalamp"}, inherit_color = true },
-		}
-	}
 })
 
 minetest.register_craft({
@@ -87,17 +88,6 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "lavalamp:lavalamp",
-	palette = "extended",
-	type = "shapeless",
-	neutral_node = "lavalamp:lavalamp",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- convert to param2 coloring
 
 local colors = {
@@ -146,3 +136,20 @@ minetest.register_lbm({
 
 	end
 })
+
+minetest.register_lbm({
+	name = "lavalamp:recolor",
+	label = "Convert 89-color lamps to use UD extended palette",
+	run_at_every_load = false,
+	nodenames = {
+		"lavalamp:lavalamp",
+		"lavalamp:lavalamp_off"
+	},
+	action = function(pos, node)
+		local meta = minetest.get_meta(pos)
+		if meta:get_string("palette") ~= "ext" then
+			minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
+			meta:set_string("palette", "ext")
+		end
+	end
+})

lrfurn/README.txt

@@ -63,5 +63,23 @@ Recipes:
 
 Mod dependencies: default, wool
 
+License:
+Sourcecode: WTFPL (see below)
+Graphics: WTFPL (see below)
+
 See also:
 http://minetest.net/
+
+         DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.

lrfurn/armchairs.lua

@@ -25,7 +25,9 @@ minetest.register_node("lrfurn:armchair", {
 	node_box = armchair_cbox,
 	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,
 	on_rotate = unifieddyes.fix_after_screwdriver_nsew,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
@@ -56,23 +58,13 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "lrfurn:armchair",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "lrfurn:armchair",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- convert old static nodes to param2 color
 
 lrfurn.old_static_armchairs = {}
 
 for _, color in ipairs(lrfurn.colors) do
 	table.insert(lrfurn.old_static_armchairs, "lrfurn:armchair_"..color)
+	print("lrfurn:armchair_"..color)
 end
 
 minetest.register_lbm({

lrfurn/coffeetable.lua

@@ -47,15 +47,6 @@ minetest.register_node("lrfurn:coffeetable", {
 	end,
 })
 
-minetest.register_craft({
-	output = "lrfurn:coffeetable",
-	type = "shapeless",
-	recipe = {
-		"lrfurn:endtable",
-		"lrfurn:endtable"
-	}
-})
-
 minetest.register_craft({
 	output = "lrfurn:coffeetable",
 	recipe = {

lrfurn/init.lua

@@ -1,4 +1,3 @@
-local S = homedecor_i18n.gettext
 
 lrfurn = {}
 screwdriver = screwdriver or {}
@@ -39,9 +38,9 @@ function lrfurn.check_right(pos, fdir, long, placer)
 		return false
 	elseif minetest.is_protected(pos2, placer:get_player_name()) then
 		if not long then
-			minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where other end goes!"))
+			minetest.chat_send_player(placer:get_player_name(), "Someone else owns the spot where other end goes!")
 		else
-			minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the middle or far end goes!"))
+			minetest.chat_send_player(placer:get_player_name(), "Someone else owns the spot where the middle or far end goes!")
 		end
 		return false
 	end
@@ -51,7 +50,7 @@ function lrfurn.check_right(pos, fdir, long, placer)
 		if node3 and node3.name ~= "air" then
 			return false
 		elseif minetest.is_protected(pos3, placer:get_player_name()) then
-			minetest.chat_send_player(placer:get_player_name(), S("Someone else owns the spot where the other end goes!"))
+			minetest.chat_send_player(placer:get_player_name(), "Someone else owns the spot where the other end goes!")
 			return false
 		end
 	end
@@ -61,11 +60,10 @@ end
 
 function lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
 	local node = minetest.get_node(pos)
-	local colorbits = node.param2 - (node.param2 % 8)
 	local yaw = placer:get_look_yaw()
 	local dir = minetest.yaw_to_dir(yaw-1.5)
 	local fdir = minetest.dir_to_wallmounted(dir)
-	minetest.swap_node(pos, { name = node.name, param2 = fdir+colorbits })
+	minetest.swap_node(pos, { name = node.name, param2 = fdir })
 end
 
 dofile(minetest.get_modpath("lrfurn").."/longsofas.lua")

lrfurn/longsofas.lua

@@ -26,6 +26,7 @@ minetest.register_node("lrfurn:longsofa", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 		local playername = placer:get_player_name()
 		if minetest.is_protected(pos, placer:get_player_name()) then return true end
 
@@ -41,6 +42,7 @@ minetest.register_node("lrfurn:longsofa", {
 		end
 		return itemstack
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
 			return itemstack
@@ -70,17 +72,6 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "lrfurn:longsofa",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "lrfurn:longsofa",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- convert old static nodes to param2 colorization
 
 lrfurn.old_static_longsofas = {}

lrfurn/sofas.lua

@@ -26,6 +26,7 @@ minetest.register_node("lrfurn:sofa", {
 	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack, pointed_thing)
 		lrfurn.fix_sofa_rotation_nsew(pos, placer, itemstack, pointed_thing)
+		unifieddyes.recolor_on_place(pos, placer, itemstack, pointed_thing)
 		local playername = placer:get_player_name()
 		if minetest.is_protected(pos, placer:get_player_name()) then return true end
 
@@ -41,6 +42,7 @@ minetest.register_node("lrfurn:sofa", {
 		end
 		return itemstack
 	end,
+	after_dig_node = unifieddyes.after_dig_node,
 	on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
 		if not clicker:is_player() then
 			return itemstack
@@ -70,17 +72,6 @@ minetest.register_craft({
 	}
 })
 
-unifieddyes.register_color_craft({
-	output = "lrfurn:sofa",
-	palette = "wallmounted",
-	type = "shapeless",
-	neutral_node = "lrfurn:sofa",
-	recipe = {
-		"NEUTRAL_NODE",
-		"MAIN_DYE"
-	}
-})
-
 -- convert old static nodes to param2 color
 
 lrfurn.old_static_sofas = {}

plasmascreen/README.md

@@ -12,3 +12,5 @@ the mod may occasionally refuse to place it (or it just appears for a moment).
 Just move over a bit, so that your target position is more directly in front
 of you.
 
+Code, textures and model are WTFPL.
+