diff options
author | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2018-10-31 13:38:52 -0400 |
---|---|---|
committer | Vanessa Dannenberg <vanessa.e.dannenberg@gmail.com> | 2018-10-31 13:38:52 -0400 |
commit | 869b40a24d4c0e89b05ae70173c1b7ffd397f9b1 (patch) | |
tree | fbd58d1df4384ebae9fb03fac5d9ec6b01bd0967 | |
parent | f23603a325cfad46e16550521d4409300af40b49 (diff) | |
download | dreambuilder_modpack-869b40a24d4c0e89b05ae70173c1b7ffd397f9b1.tar dreambuilder_modpack-869b40a24d4c0e89b05ae70173c1b7ffd397f9b1.tar.gz dreambuilder_modpack-869b40a24d4c0e89b05ae70173c1b7ffd397f9b1.tar.bz2 dreambuilder_modpack-869b40a24d4c0e89b05ae70173c1b7ffd397f9b1.tar.xz dreambuilder_modpack-869b40a24d4c0e89b05ae70173c1b7ffd397f9b1.zip |
add basic_materials mod
update homedecor, pipeworks, gloopblocks, signs_lib, stainedglass
also updated technic, roads, glooptest, framedglass
(they're my forks actually, just until some pending PRs are merged)
make default locked chests use basic_materials padlock
123 files changed, 1690 insertions, 1210 deletions
diff --git a/basic_materials/LICENSE b/basic_materials/LICENSE new file mode 100644 index 0000000..8755372 --- /dev/null +++ b/basic_materials/LICENSE @@ -0,0 +1,488 @@ +License for code: CC0 +License for media and all else: CC-by-SA + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Creative Commons Legal Code + +Attribution-ShareAlike 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR + DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may be + recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + b. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(f) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined below) for the purposes of this + License. + c. "Creative Commons Compatible License" means a license that is listed + at https://creativecommons.org/compatiblelicenses that has been + approved by Creative Commons as being essentially equivalent to this + License, including, at a minimum, because that license: (i) contains + terms that have the same purpose, meaning and effect as the License + Elements of this License; and, (ii) explicitly permits the relicensing + of adaptations of works made available under that license under this + License or a Creative Commons jurisdiction license with the same + License Elements as this License. + d. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + e. "License Elements" means the following high-level license attributes + as selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. + f. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + g. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + h. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, + pamphlet and other writing; a lecture, address, sermon or other work + of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which are + assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or + lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by + a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. + i. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + j. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a + place individually chosen by them; to perform the Work to the public + by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to + broadcast and rebroadcast the Work by any means including signs, + sounds or images. + k. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + b. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to + clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The + original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + d. to Distribute and Publicly Perform Adaptations. + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor + reserves the exclusive right to collect such royalties for any + exercise by You of the rights granted under this License; + ii. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; and, + iii. Voluntary License Schemes. The Licensor waives the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise + by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now +known or hereafter devised. The above rights include the right to make +such modifications as are technically necessary to exercise the rights in +other media and formats. Subject to Section 8(f), all rights not expressly +granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this + License. If You create a Collection, upon notice from any Licensor You + must, to the extent practicable, remove from the Collection any credit + as required by Section 4(c), as requested. If You create an + Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by + Section 4(c), as requested. + b. You may Distribute or Publicly Perform an Adaptation only under the + terms of: (i) this License; (ii) a later version of this License with + the same License Elements as this License; (iii) a Creative Commons + jurisdiction license (either this or a later license version) that + contains the same License Elements as this License (e.g., + Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible + License. If you license the Adaptation under one of the licenses + mentioned in (iv), you must comply with the terms of that license. If + you license the Adaptation under the terms of any of the licenses + mentioned in (i), (ii) or (iii) (the "Applicable License"), you must + comply with the terms of the Applicable License generally and the + following provisions: (I) You must include a copy of, or the URI for, + the Applicable License with every copy of each Adaptation You + Distribute or Publicly Perform; (II) You may not offer or impose any + terms on the Adaptation that restrict the terms of the Applicable + License or the ability of the recipient of the Adaptation to exercise + the rights granted to that recipient under the terms of the Applicable + License; (III) You must keep intact all notices that refer to the + Applicable License and to the disclaimer of warranties with every copy + of the Work as included in the Adaptation You Distribute or Publicly + Perform; (IV) when You Distribute or Publicly Perform the Adaptation, + You may not impose any effective technological measures on the + Adaptation that restrict the ability of a recipient of the Adaptation + from You to exercise the rights granted to that recipient under the + terms of the Applicable License. This Section 4(b) applies to the + Adaptation as incorporated in a Collection, but this does not require + the Collection apart from the Adaptation itself to be made subject to + the terms of the Applicable License. + c. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party + or parties; (ii) the title of the Work if supplied; (iii) to the + extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and (iv) , consistent with Ssection 3(b), in the case of an + Adaptation, a credit identifying the use of the Work in the Adaptation + (e.g., "French translation of the Work by Original Author," or + "Screenplay based on original Work by Original Author"). The credit + required by this Section 4(c) may be implemented in any reasonable + manner; provided, however, that in the case of a Adaptation or + Collection, at a minimum such credit will appear, if a credit for all + contributing authors of the Adaptation or Collection appears, then as + part of these credits and in a manner at least as prominent as the + credits for the other contributing authors. For the avoidance of + doubt, You may only use the credit required by this Section for the + purpose of attribution in the manner set out above and, by exercising + Your rights under this License, You may not implicitly or explicitly + assert or imply any connection with, sponsorship or endorsement by the + Original Author, Licensor and/or Attribution Parties, as appropriate, + of You or Your use of the Work, without the separate, express prior + written permission of the Original Author, Licensor and/or Attribution + Parties. + d. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF +LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, +WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION +OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR +ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES +ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + b. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + e. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 + and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant + jurisdiction in which the License terms are sought to be enforced + according to the corresponding provisions of the implementation of + those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such + additional rights are deemed to be included in the License; this + License is not intended to restrict the license of any rights under + applicable law. + + +Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the + Work is licensed under the CCPL, Creative Commons does not authorize + the use by either party of the trademark "Creative Commons" or any + related trademark or logo of Creative Commons without the prior + written consent of Creative Commons. Any permitted use will be in + compliance with Creative Commons' then-current trademark usage + guidelines, as may be published on its website or otherwise made + available upon request from time to time. For the avoidance of doubt, + this trademark restriction does not form part of the License. + + Creative Commons may be contacted at https://creativecommons.org/. diff --git a/basic_materials/depends.txt b/basic_materials/depends.txt new file mode 100644 index 0000000..4ad96d5 --- /dev/null +++ b/basic_materials/depends.txt @@ -0,0 +1 @@ +default diff --git a/basic_materials/electrical-electronic.lua b/basic_materials/electrical-electronic.lua new file mode 100644 index 0000000..96eb142 --- /dev/null +++ b/basic_materials/electrical-electronic.lua @@ -0,0 +1,78 @@ +-- items + +minetest.register_craftitem("basic_materials:silicon", { + description = "Silicon lump", + inventory_image = "basic_materials_silicon.png", +}) + +minetest.register_craftitem("basic_materials:ic", { + description = "Simple Integrated Circuit", + inventory_image = "basic_materials_ic.png", +}) + +minetest.register_craftitem("basic_materials:motor", { + description = "Simple Motor", + inventory_image = "basic_materials_motor.png", +}) + +minetest.register_craftitem("basic_materials:heating_element", { + description = "Heating element", + inventory_image = "basic_materials_heating_element.png", +}) + +minetest.register_craftitem("basic_materials:energy_crystal_simple", { + description = "Simple energy crystal", + inventory_image = "basic_materials_energy_crystal.png", +}) + +-- crafts + +minetest.register_craft( { + output = "mesecons_materials:silicon 4", + recipe = { + { "default:sand", "default:sand" }, + { "default:sand", "default:steel_ingot" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:ic 4", + recipe = { + { "mesecons_materials:silicon", "mesecons_materials:silicon" }, + { "mesecons_materials:silicon", "default:copper_ingot" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:motor 2", + recipe = { + { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" }, + { "default:copper_ingot", "default:steel_ingot", "default:steel_ingot" }, + { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" } + }, +}) + +minetest.register_craft( { + output = "basic_materials:heating_element 2", + recipe = { + { "default:copper_ingot", "default:mese_crystal_fragment", "default:copper_ingot" } + }, +}) + +minetest.register_craft({ + --type = "shapeless", + output = "basic_materials:energy_crystal_simple 2", + recipe = { + { "default:mese_crystal_fragment", "default:torch", "default:mese_crystal_fragment" }, + { "default:diamond", "default:gold_ingot", "default:diamond" } + }, +}) + +-- aliases + +minetest.register_alias("homedecor:ic", "basic_materials:ic") +minetest.register_alias("homedecor:motor", "basic_materials:motor") +minetest.register_alias("homedecor:heating_element", "basic_materials:heating_element") +minetest.register_alias("homedecor:power_crystal", "basic_materials:energy_crystal_simple") + +minetest.register_alias_force("mesecons_materials:silicon", "basic_materials:silicon") diff --git a/basic_materials/init.lua b/basic_materials/init.lua new file mode 100644 index 0000000..32873a1 --- /dev/null +++ b/basic_materials/init.lua @@ -0,0 +1,14 @@ +-- Basic materials mod +-- by Vanessa Dannenberg + +-- This mod supplies all those little random craft items that everyone always +-- seems to need, such as metal bars (ala rebar), plastic, wire, and so on. + +local modpath = minetest.get_modpath("basic_materials") + +basic_materials = {} + +dofile(modpath.."/metals.lua") +dofile(modpath.."/plastics.lua") +dofile(modpath.."/electrical-electronic.lua") +dofile(modpath.."/misc.lua") diff --git a/basic_materials/metals.lua b/basic_materials/metals.lua new file mode 100644 index 0000000..7cece00 --- /dev/null +++ b/basic_materials/metals.lua @@ -0,0 +1,281 @@ +-- items + +minetest.register_craftitem("basic_materials:steel_wire", { + description = "Spool of steel wire", + inventory_image = "basic_materials_steel_wire.png" +}) + +minetest.register_craftitem("basic_materials:copper_wire", { + description = "Spool of copper wire", + inventory_image = "basic_materials_copper_wire.png" +}) + +minetest.register_craftitem("basic_materials:silver_wire", { + description = "Spool of copper wire", + inventory_image = "basic_materials_silver_wire.png" +}) + +minetest.register_craftitem("basic_materials:gold_wire", { + description = "Spool of copper wire", + inventory_image = "basic_materials_gold_wire.png" +}) + +minetest.register_craftitem("basic_materials:steel_strip", { + description = "Steel Strip", + inventory_image = "basic_materials_steel_strip.png" +}) + +minetest.register_craftitem("basic_materials:copper_strip", { + description = "Copper Strip", + inventory_image = "basic_materials_copper_strip.png" +}) + +minetest.register_craftitem("basic_materials:steel_bar", { + description = "Steel Bar", + inventory_image = "basic_materials_steel_bar.png", +}) + +minetest.register_craftitem("basic_materials:chainlink_brass", { + description = "Chainlinks (brass)", + inventory_image = "basic_materials_chainlink_brass.png" +}) + +minetest.register_craftitem("basic_materials:chainlink_steel", { + description = "Chainlinks (steel)", + inventory_image = "basic_materials_chainlink_steel.png" +}) + +minetest.register_craftitem("basic_materials:brass_ingot", { + description = "Brass Ingot", + inventory_image = "basic_materials_brass_ingot.png", +}) + +minetest.register_craftitem("basic_materials:brass_block", { + description = "Brass Block", + inventory_image = "basic_materials_brass_block.png", +}) + +minetest.register_craftitem("basic_materials:gear_steel", { + description = "Steel gear", + inventory_image = "basic_materials_gear_steel.png" +}) + +minetest.register_craftitem("basic_materials:padlock", { + description = "Padlock", + inventory_image = "basic_materials_padlock.png" +}) + +-- nodes + +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("basic_materials:chain_steel", { + description = "Chain (steel, hanging)", + drawtype = "mesh", + mesh = "basic_materials_chains.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 = chains_sbox, +}) + +minetest.register_node("basic_materials:chain_brass", { + description = "Chain (brass, hanging)", + drawtype = "mesh", + mesh = "basic_materials_chains.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 = chains_sbox, +}) + +-- crafts + +minetest.register_craft( { + output = "basic_materials:copper_wire 2", + type = "shapeless", + recipe = { + "default:copper_ingot", + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, +}) + +minetest.register_craft( { + output = "basic_materials:silver_wire 2", + type = "shapeless", + recipe = { + "moreores:silver_ingot", + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, +}) + +minetest.register_craft( { + output = "basic_materials:gold_wire 2", + type = "shapeless", + recipe = { + "default:gold_ingot", + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, +}) + +minetest.register_craft( { + output = "basic_materials:steel_wire 2", + type = "shapeless", + recipe = { + "default:steel_ingot", + "basic_materials:empty_spool", + "basic_materials:empty_spool", + }, +}) + +minetest.register_craft( { + output = "basic_materials:steel_strip 12", + recipe = { + { "", "default:steel_ingot", "" }, + { "default:steel_ingot", "", "" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:copper_strip 12", + recipe = { + { "", "default:copper_ingot", "" }, + { "default:copper_ingot", "", "" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:steel_bar 6", + recipe = { + { "", "", "default:steel_ingot" }, + { "", "default:steel_ingot", "" }, + { "default:steel_ingot", "", "" }, + }, +}) + +minetest.register_craft( { + output = "basic_materials:padlock 2", + recipe = { + { "basic_materials:steel_bar" }, + { "default:steel_ingot" }, + { "default:steel_ingot" }, + }, +}) + +minetest.register_craft({ + output = "basic_materials:chainlink_steel 12", + recipe = { + {"", "default:steel_ingot", "default:steel_ingot"}, + { "default:steel_ingot", "", "default:steel_ingot" }, + { "default:steel_ingot", "default:steel_ingot", "" }, + }, +}) + +minetest.register_craft({ + output = "basic_materials:chainlink_brass 12", + recipe = { + {"", "basic_materials:brass_ingot", "basic_materials:brass_ingot"}, + { "basic_materials:brass_ingot", "", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "" }, + }, +}) + +minetest.register_craft({ + output = 'basic_materials:chain_steel 2', + recipe = { + {"basic_materials:chainlink_steel"}, + {"basic_materials:chainlink_steel"}, + {"basic_materials:chainlink_steel"} + } +}) + +minetest.register_craft({ + output = 'basic_materials:chain_brass 2', + recipe = { + {"basic_materials:chainlink_brass"}, + {"basic_materials:chainlink_brass"}, + {"basic_materials:chainlink_brass"} + } +}) + +minetest.register_craft( { + output = "basic_materials:gear_steel 6", + recipe = { + { "", "default:steel_ingot", "" }, + { "default:steel_ingot","basic_materials:chainlink_steel", "default:steel_ingot" }, + { "", "default:steel_ingot", "" } + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:brass_ingot 3", + recipe = { + "default:steel_ingot", + "default:copper_ingot", + "default:gold_ingot", + }, +}) + +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:brass_ingot 9", + recipe = { "basic_materials:brass_block" }, +}) + +minetest.register_craft( { + output = "basic_materials:brass_block", + recipe = { + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + }, +}) + +-- aliases + +minetest.register_alias("homedecor:copper_wire", "basic_materials:copper_wire") +minetest.register_alias("technic:fine_copper_wire", "basic_materials:copper_wire") +minetest.register_alias("technic:fine_silver_wire", "basic_materials:silver_wire") +minetest.register_alias("technic:fine_gold_wire", "basic_materialsgold_wire") + +minetest.register_alias("homedecor:steel_wire", "basic_materials:steel_wire") + +minetest.register_alias("homedecor:brass_ingot", "basic_materials:brass_ingot") +minetest.register_alias("technic:brass_ingot", "basic_materials:brass_ingot") +minetest.register_alias("technic:brass_block", "basic_materials:brass_block") + +minetest.register_alias("homedecor:copper_strip", "basic_materials:copper_strip") +minetest.register_alias("homedecor:steel_strip", "basic_materials:steel_strip") + +minetest.register_alias_force("glooptest:chainlink", "basic_materials:chainlink_steel") +minetest.register_alias_force("homedecor:chainlink_steel", "basic_materials:chainlink_steel") +minetest.register_alias("homedecor:chainlink_brass", "basic_materials:chainlink_brass") +minetest.register_alias("chains:chain", "basic_materials:chain_steel") +minetest.register_alias("chains:chain_brass", "basic_materials:chain_brass") + +minetest.register_alias("pipeworks:gear", "basic_materials:gear_steel") + +minetest.register_alias("technic:rebar", "basic_materials:steel_bar") diff --git a/basic_materials/misc.lua b/basic_materials/misc.lua new file mode 100644 index 0000000..bb9c76b --- /dev/null +++ b/basic_materials/misc.lua @@ -0,0 +1,115 @@ +--items + +minetest.register_craftitem("basic_materials:oil_extract", { + description = "Oil extract", + inventory_image = "basic_materials_oil_extract.png", +}) + +minetest.register_craftitem("basic_materials:paraffin", { + description = "Unprocessed paraffin", + inventory_image = "basic_materials_paraffin.png", +}) + +minetest.register_craftitem("basic_materials:terracotta_base", { + description = "Uncooked Terracotta Base", + inventory_image = "basic_materials_terracotta_base.png", +}) + +minetest.register_craftitem("basic_materials:wet_cement", { + description = "Wet Cement", + inventory_image = "basic_materials_wet_cement.png", +}) + +-- nodes + +minetest.register_node("basic_materials:cement_block", { + description = "Cement", + tiles = {"basic_materials_cement_block.png"}, + is_ground_content = true, + groups = {cracky=2}, + sounds = default.node_sound_stone_defaults(), +}) + +-- crafts + +minetest.register_craft({ + type = "shapeless", + output = "basic_materials:oil_extract 3", + recipe = { + "group:leaves", + "group:leaves", + "group:leaves", + "group:leaves", + "group:leaves", + "group:leaves" + } +}) + +minetest.register_craft({ + type = "cooking", + output = "basic_materials:paraffin", + recipe = "basic_materials:oil_extract", +}) + +minetest.register_craft({ + type = "fuel", + recipe = "basic_materials:oil_extract", + burntime = 30, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "basic_materials:paraffin", + burntime = 30, +}) + +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:terracotta_base 8", + recipe = { + "default:dirt", + "default:clay_lump", + "bucket:bucket_water" + }, + replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, }, +}) + +minetest.register_craft({ + type = "shapeless", + output = "basic_materials:wet_cement 2", + recipe = { + "bucket:bucket_water", + "default:clay_lump", + "default:gravel", + }, + replacements = {{'bucket:bucket_water', 'bucket:bucket_empty'},}, +}) + +minetest.register_craft({ + type = "cooking", + output = "basic_materials:cement_block", + recipe = "basic_materials:wet_cement", + cooktime = 8 +}) + +minetest.register_craft( { + type = "shapeless", + output = "basic_materials:terracotta_base 8", + recipe = { + "default:dirt", + "default:clay_lump", + "bucket:bucket_water" + }, + replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, }, +}) + +-- aliases + +minetest.register_alias("homedecor:oil_extract", "basic_materials:oil_extract") +minetest.register_alias("homedecor:paraffin", "basic_materials:paraffin") +minetest.register_alias("homedecor:plastic_base", "basic_materials:paraffin") +minetest.register_alias("homedecor:terracotta_base", "basic_materials:terracotta_base") +minetest.register_alias("homedecor:power_crystal", "basic_materials:energy_crystal") + +minetest.register_alias("gloopblocks:wet_cement", "basic_materials:wet_cement") +minetest.register_alias("gloopblocks:cement", "basic_materials:cement_block") diff --git a/chains/models/chains.obj b/basic_materials/models/basic_materials_chains.obj index 78724c9..78724c9 100644 --- a/chains/models/chains.obj +++ b/basic_materials/models/basic_materials_chains.obj diff --git a/basic_materials/plastics.lua b/basic_materials/plastics.lua new file mode 100644 index 0000000..953023e --- /dev/null +++ b/basic_materials/plastics.lua @@ -0,0 +1,52 @@ +-- items + +minetest.register_craftitem("basic_materials:plastic_sheet", { + description = "Plastic sheet", + inventory_image = "basic_materials_plastic_sheet.png", +}) + +minetest.register_craftitem("basic_materials:plastic_strip", { + description = "Plastic strips", + inventory_image = "basic_materials_plastic_strip.png", +}) + +minetest.register_craftitem("basic_materials:empty_spool", { + description = "Empty wire spool", + inventory_image = "basic_materials_empty_spool.png" +}) + +-- crafts + +minetest.register_craft({ + type = "cooking", + output = "basic_materials:plastic_sheet", + recipe = "basic_materials:paraffin", +}) + +minetest.register_craft({ + type = "fuel", + recipe = "basic_materials:plastic_sheet", + burntime = 30, +}) + +minetest.register_craft( { + output = "basic_materials:plastic_strip 9", + recipe = { + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } + }, +}) + +minetest.register_craft( { + output = "basic_materials:empty_spool 3", + 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" } + }, +}) + +-- aliases + +minetest.register_alias("homedecor:plastic_sheeting", "basic_materials:plastic_sheet") +minetest.register_alias("homedecor:plastic_strips", "basic_materials:plastic_strip") +minetest.register_alias("homedecor:empty_spool", "basic_materials:empty_spool") diff --git a/basic_materials/textures/basic_materials_brass_block.png b/basic_materials/textures/basic_materials_brass_block.png Binary files differnew file mode 100644 index 0000000..c937800 --- /dev/null +++ b/basic_materials/textures/basic_materials_brass_block.png diff --git a/basic_materials/textures/basic_materials_brass_ingot.png b/basic_materials/textures/basic_materials_brass_ingot.png Binary files differnew file mode 100644 index 0000000..0bd030a --- /dev/null +++ b/basic_materials/textures/basic_materials_brass_ingot.png diff --git a/gloopblocks/textures/gloopblocks_cement.png b/basic_materials/textures/basic_materials_cement_block.png Binary files differindex c4c6a11..c4c6a11 100644 --- a/gloopblocks/textures/gloopblocks_cement.png +++ b/basic_materials/textures/basic_materials_cement_block.png diff --git a/chains/textures/chains_brass.png b/basic_materials/textures/basic_materials_chain_brass.png Binary files differindex e2fb20d..e2fb20d 100644 --- a/chains/textures/chains_brass.png +++ b/basic_materials/textures/basic_materials_chain_brass.png diff --git a/chains/textures/chain_brass_inv.png b/basic_materials/textures/basic_materials_chain_brass_inv.png Binary files differindex 8c2d554..8c2d554 100644 --- a/chains/textures/chain_brass_inv.png +++ b/basic_materials/textures/basic_materials_chain_brass_inv.png diff --git a/chains/textures/chains_wrought_iron.png b/basic_materials/textures/basic_materials_chain_steel.png Binary files differindex 29af8db..29af8db 100644 --- a/chains/textures/chains_wrought_iron.png +++ b/basic_materials/textures/basic_materials_chain_steel.png diff --git a/chains/textures/chain_wrought_iron_inv.png b/basic_materials/textures/basic_materials_chain_steel_inv.png Binary files differindex c552f7b..c552f7b 100644 --- a/chains/textures/chain_wrought_iron_inv.png +++ b/basic_materials/textures/basic_materials_chain_steel_inv.png diff --git a/homedecor/textures/homedecor_chainlink_brass.png b/basic_materials/textures/basic_materials_chainlink_brass.png Binary files differindex 9a1ad87..9a1ad87 100644 --- a/homedecor/textures/homedecor_chainlink_brass.png +++ b/basic_materials/textures/basic_materials_chainlink_brass.png diff --git a/homedecor/textures/homedecor_chainlink_steel.png b/basic_materials/textures/basic_materials_chainlink_steel.png Binary files differindex d7132c3..d7132c3 100644 --- a/homedecor/textures/homedecor_chainlink_steel.png +++ b/basic_materials/textures/basic_materials_chainlink_steel.png diff --git a/homedecor/textures/homedecor_copper_strip.png b/basic_materials/textures/basic_materials_copper_strip.png Binary files differindex 22e572a..22e572a 100644 --- a/homedecor/textures/homedecor_copper_strip.png +++ b/basic_materials/textures/basic_materials_copper_strip.png diff --git a/basic_materials/textures/basic_materials_copper_wire.png b/basic_materials/textures/basic_materials_copper_wire.png Binary files differnew file mode 100644 index 0000000..9df9f36 --- /dev/null +++ b/basic_materials/textures/basic_materials_copper_wire.png diff --git a/homedecor/textures/homedecor_empty_spool.png b/basic_materials/textures/basic_materials_empty_spool.png Binary files differindex 017a94f..017a94f 100644 --- a/homedecor/textures/homedecor_empty_spool.png +++ b/basic_materials/textures/basic_materials_empty_spool.png diff --git a/homedecor/textures/homedecor_power_crystal.png b/basic_materials/textures/basic_materials_energy_crystal.png Binary files differindex f1c28e8..f1c28e8 100644 --- a/homedecor/textures/homedecor_power_crystal.png +++ b/basic_materials/textures/basic_materials_energy_crystal.png diff --git a/pipeworks/textures/pipeworks_gear.png b/basic_materials/textures/basic_materials_gear_steel.png Binary files differindex 584f9a5..584f9a5 100644 --- a/pipeworks/textures/pipeworks_gear.png +++ b/basic_materials/textures/basic_materials_gear_steel.png diff --git a/basic_materials/textures/basic_materials_gold_wire.png b/basic_materials/textures/basic_materials_gold_wire.png Binary files differnew file mode 100644 index 0000000..781de7b --- /dev/null +++ b/basic_materials/textures/basic_materials_gold_wire.png diff --git a/homedecor/textures/homedecor_heating_element.png b/basic_materials/textures/basic_materials_heating_element.png Binary files differindex 42e00b7..42e00b7 100644 --- a/homedecor/textures/homedecor_heating_element.png +++ b/basic_materials/textures/basic_materials_heating_element.png diff --git a/homedecor/textures/homedecor_ic.png b/basic_materials/textures/basic_materials_ic.png Binary files differindex 4c88894..4c88894 100644 --- a/homedecor/textures/homedecor_ic.png +++ b/basic_materials/textures/basic_materials_ic.png diff --git a/homedecor/textures/homedecor_motor.png b/basic_materials/textures/basic_materials_motor.png Binary files differindex f19ec0a..f19ec0a 100644 --- a/homedecor/textures/homedecor_motor.png +++ b/basic_materials/textures/basic_materials_motor.png diff --git a/homedecor/textures/homedecor_oil_extract.png b/basic_materials/textures/basic_materials_oil_extract.png Binary files differindex e34623d..e34623d 100644 --- a/homedecor/textures/homedecor_oil_extract.png +++ b/basic_materials/textures/basic_materials_oil_extract.png diff --git a/basic_materials/textures/basic_materials_padlock.png b/basic_materials/textures/basic_materials_padlock.png Binary files differnew file mode 100644 index 0000000..b05b7ef --- /dev/null +++ b/basic_materials/textures/basic_materials_padlock.png diff --git a/homedecor/textures/homedecor_paraffin.png b/basic_materials/textures/basic_materials_paraffin.png Binary files differindex 77d2bbd..77d2bbd 100644 --- a/homedecor/textures/homedecor_paraffin.png +++ b/basic_materials/textures/basic_materials_paraffin.png diff --git a/homedecor/textures/homedecor_plastic_sheeting.png b/basic_materials/textures/basic_materials_plastic_sheet.png Binary files differindex 034dcc2..034dcc2 100644 --- a/homedecor/textures/homedecor_plastic_sheeting.png +++ b/basic_materials/textures/basic_materials_plastic_sheet.png diff --git a/basic_materials/textures/basic_materials_plastic_strip.png b/basic_materials/textures/basic_materials_plastic_strip.png Binary files differnew file mode 100644 index 0000000..1318dfc --- /dev/null +++ b/basic_materials/textures/basic_materials_plastic_strip.png diff --git a/homedecor/textures/homedecor_silicon.png b/basic_materials/textures/basic_materials_silicon.png Binary files differindex 847b366..847b366 100644 --- a/homedecor/textures/homedecor_silicon.png +++ b/basic_materials/textures/basic_materials_silicon.png diff --git a/basic_materials/textures/basic_materials_silver_wire.png b/basic_materials/textures/basic_materials_silver_wire.png Binary files differnew file mode 100644 index 0000000..a38a45e --- /dev/null +++ b/basic_materials/textures/basic_materials_silver_wire.png diff --git a/basic_materials/textures/basic_materials_steel_bar.png b/basic_materials/textures/basic_materials_steel_bar.png Binary files differnew file mode 100644 index 0000000..0673b6e --- /dev/null +++ b/basic_materials/textures/basic_materials_steel_bar.png diff --git a/homedecor/textures/homedecor_steel_strip.png b/basic_materials/textures/basic_materials_steel_strip.png Binary files differindex 6384dc8..6384dc8 100644 --- a/homedecor/textures/homedecor_steel_strip.png +++ b/basic_materials/textures/basic_materials_steel_strip.png diff --git a/basic_materials/textures/basic_materials_steel_wire.png b/basic_materials/textures/basic_materials_steel_wire.png Binary files differnew file mode 100644 index 0000000..0c96c8f --- /dev/null +++ b/basic_materials/textures/basic_materials_steel_wire.png diff --git a/homedecor/textures/homedecor_terracotta_base.png b/basic_materials/textures/basic_materials_terracotta_base.png Binary files differindex 9f04aad..9f04aad 100644 --- a/homedecor/textures/homedecor_terracotta_base.png +++ b/basic_materials/textures/basic_materials_terracotta_base.png diff --git a/gloopblocks/textures/gloopblocks_wet_cement.png b/basic_materials/textures/basic_materials_wet_cement.png Binary files differindex 6a7fbf1..6a7fbf1 100644 --- a/gloopblocks/textures/gloopblocks_wet_cement.png +++ b/basic_materials/textures/basic_materials_wet_cement.png diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index 3ce0cd4..8d6520b 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -19,6 +19,10 @@ if minetest.get_modpath("moreblocks") then 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") diff --git a/building_blocks/depends.txt b/building_blocks/depends.txt index f5cd549..641d412 100644 --- a/building_blocks/depends.txt +++ b/building_blocks/depends.txt @@ -1,4 +1,5 @@ default homedecor_i18n moreblocks? +gloopblocks? stairs? diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index 9781293..b0fecb4 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -131,26 +131,30 @@ minetest.register_node("building_blocks:brobble_spread", { 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}, - }), -}) + +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"), diff --git a/building_blocks/recipes.lua b/building_blocks/recipes.lua index e8f810f..42ac0a8 100644 --- a/building_blocks/recipes.lua +++ b/building_blocks/recipes.lua @@ -60,12 +60,16 @@ minetest.register_craft({ {"default:glass", "default:glass"}, } }) -minetest.register_craft({ - output = 'building_blocks:gravel_spread 4', - recipe = { - {"default:gravel", "default:gravel", "default:gravel"}, - } -}) + +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 = { @@ -167,4 +171,4 @@ minetest.register_craft({ type = "fuel", recipe = "building_blocks:Tar", burntime = 40, -})
\ No newline at end of file +}) diff --git a/chains/depends.txt b/chains/depends.txt deleted file mode 100644 index 7b3e79f..0000000 --- a/chains/depends.txt +++ /dev/null @@ -1,2 +0,0 @@ -default -homedecor diff --git a/chains/init.lua b/chains/init.lua deleted file mode 100644 index e7d2255..0000000 --- a/chains/init.lua +++ /dev/null @@ -1,179 +0,0 @@ - -local S = homedecor_i18n.gettext - -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("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 = 12, - 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 = 12, - 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'}, - } -}) diff --git a/chains/textures/chains_candle_flame.png b/chains/textures/chains_candle_flame.png Binary files differdeleted file mode 100644 index a34b9a5..0000000 --- a/chains/textures/chains_candle_flame.png +++ /dev/null diff --git a/computer/miscitems.lua b/computer/miscitems.lua index 5f63c7d..a750378 100644 --- a/computer/miscitems.lua +++ b/computer/miscitems.lua @@ -8,7 +8,7 @@ local S = homedecor_i18n.gettext if (not minetest.get_modpath("homedecor")) then - minetest.register_craftitem(":homedecor:plastic_sheeting", { + minetest.register_craftitem(":basic_materials:plastic_sheet", { description = S("Plastic sheet"), inventory_image = "homedecor_plastic_sheeting.png", }) @@ -51,7 +51,7 @@ if (not minetest.get_modpath("homedecor")) then minetest.register_craft({ type = "cooking", - output = "homedecor:plastic_sheeting", + output = "basic_materials:plastic_sheet", recipe = "homedecor:plastic_base", }) @@ -63,7 +63,7 @@ if (not minetest.get_modpath("homedecor")) then minetest.register_craft({ type = 'fuel', - recipe = 'homedecor:plastic_sheeting', + recipe = 'basic_materials:plastic_sheet', burntime = 30, }) diff --git a/computer/recipes.lua b/computer/recipes.lua index 51337ad..d562425 100644 --- a/computer/recipes.lua +++ b/computer/recipes.lua @@ -5,50 +5,50 @@ minetest.register_craft({ output = "computer:shefriendSOO", recipe = { - { "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" } + { "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" } } }) minetest.register_craft({ output = "computer:slaystation", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "group:wood", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "group:wood", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:vanio", recipe = { - { "homedecor:plastic_sheeting", "", "" }, + { "basic_materials:plastic_sheet", "", "" }, { "default:glass", "", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:specter", recipe = { - { "", "", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "", "", "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" } } }) minetest.register_craft({ output = "computer:slaystation2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:admiral64", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "group:wood", "group:wood", "group:wood" } } }) @@ -56,7 +56,7 @@ minetest.register_craft({ minetest.register_craft({ output = "computer:admiral128", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } } }) @@ -64,16 +64,16 @@ minetest.register_craft({ minetest.register_craft({ output = "computer:wee", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:copper_ingot", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:copper_ingot", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:piepad", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" } } }) @@ -82,9 +82,9 @@ minetest.register_craft({ minetest.register_craft({ output = "computer:monitor", recipe = { - { "homedecor:plastic_sheeting", "default:glass","" }, - { "homedecor:plastic_sheeting", "default:glass","" }, - { "homedecor:plastic_sheeting", "default:mese_crystal_fragment", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "default:glass","" }, + { "basic_materials:plastic_sheet", "default:glass","" }, + { "basic_materials:plastic_sheet", "default:mese_crystal_fragment", "basic_materials:plastic_sheet" } } }) @@ -92,35 +92,35 @@ minetest.register_craft({ output = "computer:router", recipe = { { "default:steel_ingot","","" }, - { "default:steel_ingot" ,"homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "default:mese_crystal_fragment","homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "default:steel_ingot" ,"basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "default:mese_crystal_fragment","basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } } }) minetest.register_craft({ output = "computer:tower", recipe = { - { "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" } + { "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" } } }) minetest.register_craft({ output = "computer:printer", recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot","" }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:coal_lump", "homedecor:plastic_sheeting" } + { "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" } } }) minetest.register_craft({ output = "computer:printer", recipe = { - { "homedecor:plastic_sheeting", "default:steel_ingot","" }, - { "homedecor:plastic_sheeting", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting", } + { "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", } } }) @@ -136,8 +136,8 @@ minetest.register_craft({ minetest.register_craft({ output = "computer:tetris_arcade", recipe = { - { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting", }, + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal", "basic_materials:plastic_sheet", }, { "dye:black", "default:glass", "dye:black" }, - { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal", "basic_materials:plastic_sheet" } } }) diff --git a/concrete/depends.txt b/concrete/depends.txt index c48fe0d..269e83a 100644 --- a/concrete/depends.txt +++ b/concrete/depends.txt @@ -1,3 +1,4 @@ default +basic_materials intllib? diff --git a/concrete/init.lua b/concrete/init.lua index ca04733..89a3cf1 100644 --- a/concrete/init.lua +++ b/concrete/init.lua @@ -24,20 +24,11 @@ else end minetest.register_craft({ - output = 'technic:rebar 6', - recipe = { - {'','', steel_ingot}, - {'',steel_ingot,''}, - {steel_ingot, '', ''}, - } -}) - -minetest.register_craft({ output = 'technic:concrete 5', recipe = { - {'default:stone','technic:rebar','default:stone'}, - {'technic:rebar','default:stone','technic:rebar'}, - {'default:stone','technic:rebar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'basic_materials:steel_bar','default:stone','basic_materials:steel_bar'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, } }) @@ -51,9 +42,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:concrete_post 12', recipe = { - {'default:stone','technic:rebar','default:stone'}, - {'default:stone','technic:rebar','default:stone'}, - {'default:stone','technic:rebar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, + {'default:stone','basic_materials:steel_bar','default:stone'}, } }) @@ -66,11 +57,6 @@ minetest.register_craft({ } }) -minetest.register_craftitem(":technic:rebar", { - description = S("Rebar"), - inventory_image = "technic_rebar.png", -}) - minetest.register_node(":technic:concrete", { description = S("Concrete Block"), tiles = {"technic_concrete_block.png",}, diff --git a/concrete/textures/technic_rebar.png b/concrete/textures/technic_rebar.png Binary files differdeleted file mode 100644 index 16d1fc5..0000000 --- a/concrete/textures/technic_rebar.png +++ /dev/null diff --git a/dreambuilder_mp_extras/depends.txt b/dreambuilder_mp_extras/depends.txt index 4ad96d5..635f0ae 100644 --- a/dreambuilder_mp_extras/depends.txt +++ b/dreambuilder_mp_extras/depends.txt @@ -1 +1,3 @@ default +technic +basic_materials diff --git a/dreambuilder_mp_extras/init.lua b/dreambuilder_mp_extras/init.lua index e2ee62f..46ae07c 100644 --- a/dreambuilder_mp_extras/init.lua +++ b/dreambuilder_mp_extras/init.lua @@ -36,3 +36,56 @@ minetest.override_item("default:apple", { mesh = "default_apple.obj", tiles = {"default_apple_3d.png"} }) + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:steel_ingot", + } +}) + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:gold_ingot", + } +}) + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:bronze_ingot", + } +}) + +minetest.clear_craft({ + type = "shapeless", + recipe = { + "default:chest", + "default:copper_ingot", + } +}) + +minetest.clear_craft({output = "default:chest_locked"}) + +minetest.register_craft({ + output = "default:chest_locked", + recipe = { + { "group:wood", "group:wood", "group:wood" }, + { "group:wood", "basic_materials:padlock", "group:wood" }, + { "group:wood", "group:wood", "group:wood" } + } +}) + +minetest.register_craft({ + output = "default:chest_locked", + type = "shapeless", + recipe = { + "default:chest", + "basic_materials:padlock" + } +}) + diff --git a/extranodes/depends.txt b/extranodes/depends.txt index 4dcb99e..0279a18 100644 --- a/extranodes/depends.txt +++ b/extranodes/depends.txt @@ -1,5 +1,6 @@ default technic_worldgen +basic_materials concrete unifieddyes? intllib? diff --git a/extranodes/init.lua b/extranodes/init.lua index 1f65c29..8734476 100644 --- a/extranodes/init.lua +++ b/extranodes/init.lua @@ -57,10 +57,10 @@ if minetest.get_modpath("moreblocks") then tiles={"technic_stainless_steel_block.png"}, }) - stairsplus:register_all("technic", "brass_block", "technic:brass_block", { + stairsplus:register_all("technic", "brass_block", "basic_materials:brass_block", { description=S("Brass Block"), groups={cracky=1, not_in_creative_inventory=1}, - tiles={"technic_brass_block.png"}, + tiles={"basic_materials_brass_block.png"}, }) function register_technic_stairs_alias(modname, origname, newmod, newname) diff --git a/framedglass/depends.txt b/framedglass/depends.txt index 765575d..9db6e0e 100644 --- a/framedglass/depends.txt +++ b/framedglass/depends.txt @@ -1,2 +1,3 @@ default -dye? +unifieddyes +dye diff --git a/framedglass/init.lua b/framedglass/init.lua index d42a07b..4d36165 100644 --- a/framedglass/init.lua +++ b/framedglass/init.lua @@ -1,4 +1,4 @@ --- Minetest 0.4.7 mod: framedglass +-- Minetest 0.4.17 mod: framedglass framedglass = {} @@ -68,147 +68,86 @@ minetest.register_node("framedglass:wooden_framed_obsidian_glass", { sounds = default.node_sound_glass_defaults(), }) --- helper functions copied partly from Unified Dyes - -local creative_mode = minetest.setting_getbool("creative_mode") - -local function select_node(pointed_thing) - local pos = pointed_thing.under - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] - - if not def or not def.buildable_to then - pos = pointed_thing.above - node = minetest.get_node_or_nil(pos) - def = node and minetest.registered_nodes[node.name] - end - return def and pos, def -end - -local function is_buildable_to(placer_name, ...) - for _, pos in ipairs({...}) do - local node = minetest.get_node_or_nil(pos) - local def = node and minetest.registered_nodes[node.name] - if not (def and def.buildable_to) or minetest.is_protected(pos, placer_name) then - return false - end - end - return true -end - -function framedglass.color_on_punch(pos, node, puncher, pointed_thing) - local itemstack = puncher:get_wielded_item() - local itemname = itemstack:get_name() - - if not string.find(itemname, "dye:") - and not string.find(itemname, "unifieddyes:") then - return itemstack - end - - local a,b = string.find(node.name, "_glass") - local oldcolor = string.sub(node.name, b + 1) - local newcolor = string.sub(itemname, string.find(itemname, ":") + 1) - - local oldcolor2 = string.gsub(oldcolor, "darkgreen", "dark_green") - local oldcolor2 = string.gsub(oldcolor2, "darkgrey", "dark_grey") - - local newcolor2 = string.gsub(newcolor, "dark_green", "darkgreen") - local newcolor2 = string.gsub(newcolor2, "dark_grey", "darkgrey") - - if oldcolor == newcolor2 then - minetest.chat_send_player(puncher:get_player_name(), "That node is already "..newcolor.."." ) - return itemstack - end - - if not (newcolor == "dark_grey" - or newcolor == "dark_green" - or minetest.registered_nodes["framedglass:steel_framed_obsidian_glass"..newcolor]) then - minetest.chat_send_player(puncher:get_player_name(), "Framed glass doesn't support "..newcolor.."." ) - return itemstack - end - - local inv = puncher:get_inventory() - local prevdye = "dye:"..oldcolor2 - - if not (inv:contains_item("main", prevdye) and creative_mode) and minetest.registered_items[prevdye] then - if inv:room_for_item("main", prevdye) then - inv:add_item("main", prevdye) - else - minetest.add_item(pos, prevdye) - end - end - - minetest.set_node(pos, { name = "framedglass:steel_framed_obsidian_glass"..newcolor2 }) - itemstack:take_item() - return itemstack -end - -local return_dye_after_dig = function(pos, oldnode, oldmetadata, digger) - - local a,b = string.find(oldnode.name, "_glass") - local oldcolor = string.sub(oldnode.name, b + 1) - local oldcolor2 = string.gsub(oldcolor, "darkgreen", "dark_green") - local oldcolor2 = string.gsub(oldcolor2, "darkgrey", "dark_grey") - - local prevdye = "dye:"..oldcolor2 - - local inv = digger:get_inventory() - - if prevdye and not (inv:contains_item("main", prevdye) and creative_mode) and minetest.registered_items[prevdye] then - if inv:room_for_item("main", prevdye) then - inv:add_item("main", prevdye) - else - minetest.add_item(pos, prevdye) - end - end -end - minetest.register_node("framedglass:steel_framed_obsidian_glass", { description = "Steel-framed Obsidian Glass", drawtype = "glasslike_framed", tiles = {"framedglass_steel_frame.png","framedglass_glass_face_clean.png"}, paramtype = "light", sunlight_propagates = true, - groups = {cracky=3,oddly_breakable_by_hand=3}, + palette = "unifieddyes_palette_extended.png", + airbrush_replacement_node = "framedglass:steel_framed_obsidian_glass_tinted", + groups = {cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, + sounds = default.node_sound_glass_defaults(), +}) + +minetest.register_node("framedglass:steel_framed_obsidian_glass_tinted", { + description = "Steel-framed Obsidian Glass", + drawtype = "glasslike_framed", + tiles = { + { name = "framedglass_steel_frame.png", color = "white" }, + "framedglass_whiteglass.png", + }, + palette = "unifieddyes_palette_extended.png", + inventory_image = minetest.inventorycube("framedglass_glass_face_inv_static.png"), + paramtype = "light", + paramtype2 = "color", + sunlight_propagates = true, + is_ground_content = true, + use_texture_alpha = true, + groups = {cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1, not_in_creative_inventory = 1}, sounds = default.node_sound_glass_defaults(), - on_punch = framedglass.color_on_punch, - after_dig_node = return_dye_after_dig }) -function add_coloured_framedglass(name, desc, color) - minetest.register_node( "framedglass:steel_framed_obsidian_glass"..name, { - description = "Steel-framed "..desc.." Obsidian Glass", - tiles = { - "framedglass_steel_frame.png", - { name = "framedglass_whiteglass.png", color = color } - }, - drawtype = "glasslike_framed", - paramtype = "light", - sunlight_propagates = true, - is_ground_content = true, - use_texture_alpha = true, - groups = {cracky=3, not_in_creative_inventory=1}, - sounds = default.node_sound_glass_defaults(), - on_punch = framedglass.color_on_punch, - after_dig_node = return_dye_after_dig, - drop = "framedglass:steel_framed_obsidian_glass" - }) +-- crafts! + +unifieddyes.register_color_craft({ + output = "framedglass:steel_framed_obsidian_glass_tinted", + type = "shapeless", + palette = "extended", + neutral_node = "framedglass:steel_framed_obsidian_glass", + recipe = { + "NEUTRAL_NODE", + "MAIN_DYE" + } +}) + +-- Convert old nodes + +local static_colors = { + red = 4*24 , + orange = 4*24 + 2 , + yellow = 4*24 + 4 , + green = 4*24 + 8 , + cyan = 4*24 + 12 , + blue = 4*24 + 16 , + violet = 4*24 + 18 , + magenta = 4*24 + 20 , + darkgreen = 8*24 + 8 , + pink = 23 , + brown = 8*24 + 2 , + white = 10*24 , + grey = 10*24 + 7 , + darkgrey = 10*24 + 11 , + black = 10*24 + 15 +} + +local old_nodes = {} +for k, v in pairs(static_colors) do + table.insert(old_nodes, "framedglass:steel_framed_obsidian_glass"..k) end -add_coloured_framedglass ("red", "Red", 0xffff0000) -add_coloured_framedglass ("orange", "Orange", 0xfffe7f00) -add_coloured_framedglass ("yellow", "Yellow", 0xffffff01) -add_coloured_framedglass ("green", "Green", 0xff0cff00) -add_coloured_framedglass ("cyan", "Cyan", 0xff7affff) -add_coloured_framedglass ("blue", "Blue", 0xff1600ff) -add_coloured_framedglass ("violet", "Violet", 0xff7d00ff) -add_coloured_framedglass ("magenta", "Magenta", 0xfffd05ff) - -add_coloured_framedglass ("darkgreen", "Dark Green", 0xff144f00) -add_coloured_framedglass ("pink", "Pink", 0xffffa4a4) -add_coloured_framedglass ("brown", "Brown", 0xff542a00) - -add_coloured_framedglass ("white", "White", 0xffffffff) -add_coloured_framedglass ("grey", "Grey", 0xff7f817e) -add_coloured_framedglass ("darkgrey", "Dark Grey", 0xff3f403e) -add_coloured_framedglass ("black", "Black", 0xff000000) +minetest.register_lbm({ + label = "Convert old framedglass static-colored nodes", + name = "framedglass:convert_static", + run_at_every_load = false, + nodenames = old_nodes, + action = function(pos, node) + local oldcolor = string.sub(node.name, 40) + if oldcolor then + minetest.swap_node(pos, {name = "framedglass:steel_framed_obsidian_glass_tinted", + param2 = static_colors[oldcolor] }) + else + minetest.swap_node(pos, {name = "framedglass:steel_framed_obsidian_glass", param2 = 0 }) + end + end +}) diff --git a/framedglass/textures/framedglass_glass_face_inv_static.png b/framedglass/textures/framedglass_glass_face_inv_static.png Binary files differnew file mode 100644 index 0000000..ff43048 --- /dev/null +++ b/framedglass/textures/framedglass_glass_face_inv_static.png diff --git a/gloopblocks/crafts.lua b/gloopblocks/crafts.lua index cacea22..634ea9b 100644 --- a/gloopblocks/crafts.lua +++ b/gloopblocks/crafts.lua @@ -41,31 +41,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - type = "shapeless", - output = "gloopblocks:wet_cement", - recipe = { - "bucket:bucket_water", - "default:gravel", - }, - replacements = {{'bucket:bucket_water', 'bucket:bucket_empty'},}, -}) - -minetest.register_craft({ - type = "cooking", - output = "gloopblocks:cement", - recipe = "gloopblocks:wet_cement", - cooktime = 8 -}) - -minetest.register_craft({ - output = "default:gravel", - recipe = { - {"gloopblocks:cement"}, - }, -}) - - if minetest.get_modpath("glooptest") then minetest.register_craft({ @@ -194,24 +169,6 @@ minetest.register_craft({ } }) -if minetest.get_modpath("building_blocks") then - minetest.register_craft({ - output = "default:wood 4", - recipe = { - {"building_blocks:sticks", "building_blocks:sticks"}, - {"building_blocks:sticks", "building_blocks:sticks"}, - } - }) -else - minetest.register_craft({ - output = "default:wood", - recipe = { - {"default:stick", "default:stick"}, - {"default:stick", "default:stick"}, - } - }) -end - minetest.register_craft({ output = "gloopblocks:pavement 5", recipe = { diff --git a/gloopblocks/depends.txt b/gloopblocks/depends.txt index 6b7584f..a9d85c2 100644 --- a/gloopblocks/depends.txt +++ b/gloopblocks/depends.txt @@ -1,9 +1,9 @@ default +basic_materials moreblocks? stairs? glooptest? gloopores? -building_blocks? intllib? wool? xdecor? diff --git a/gloopblocks/init.lua b/gloopblocks/init.lua index c759119..a20b833 100644 --- a/gloopblocks/init.lua +++ b/gloopblocks/init.lua @@ -45,14 +45,6 @@ if not minetest.setting_getbool("pbj_pup_alias_nyancat") then end
end
-minetest.register_node("gloopblocks:cement", {
- description = S("Cement"),
- tiles = {"gloopblocks_cement.png"},
- is_ground_content = true,
- groups = {cracky=2},
- sounds = default.node_sound_stone_defaults(),
-})
-
minetest.register_node("gloopblocks:evil_block", {
description = S("Evil Block"),
tiles = {"gloopblocks_evil_block.png"},
@@ -167,6 +159,7 @@ if not minetest.get_modpath("usesdirt") then local dirt_stone_tex = "default_stone.png^(default_dirt.png^[mask:gloopblocks_dirt_stone_mask.png)"
local dirt_ladder_tex = "(default_dirt.png^[mask:gloopblocks_ladder_mask.png)^gloopblocks_ladder_overlay.png"
+ local dirt_brick_ladder_tex = "(("..dirt_brick_tex..")^[mask:gloopblocks_ladder_mask.png)^gloopblocks_ladder_overlay.png"
local dirt_cobble_ladder_tex = "(("..dirt_cobble_tex..")^[mask:gloopblocks_ladder_mask.png)^gloopblocks_ladder_overlay.png"
local dirt_stone_ladder_tex = "(("..dirt_stone_tex..")^[mask:gloopblocks_ladder_mask.png)^gloopblocks_ladder_overlay.png"
@@ -176,6 +169,45 @@ if not minetest.get_modpath("usesdirt") then groups = {snappy=2,choppy=1,oddly_breakable_by_hand=2},
})
+ minetest.register_node(":usesdirt:dirt_brick_ladder", {
+ description = "Dirt Brick Ladder",
+ drawtype = "signlike",
+ tiles = { dirt_brick_ladder_tex },
+ inventory_image = dirt_brick_ladder_tex,
+ wield_image = dirt_brick_ladder_tex,
+ paramtype = "light",
+ paramtype2 = "wallmounted",
+ is_ground_content = true,
+ walkable = false,
+ climbable = true,
+ selection_box = {
+ type = "wallmounted",
+ --wall_top = = <default>
+ --wall_bottom = = <default>
+ --wall_side = = <default>
+ },
+ groups = {cracky=3, stone=2},
+ legacy_wallmounted = true,
+ })
+ minetest.register_craft({
+ output = 'usesdirt:dirt_brick_ladder 3',
+ recipe = {
+ {'usesdirt:dirt_brick', '', 'usesdirt:dirt_brick'},
+ {'usesdirt:dirt_brick', 'usesdirt:dirt_brick','usesdirt:dirt_brick'},
+ {'usesdirt:dirt_brick','','usesdirt:dirt_brick'},
+ }
+ })
+
+ default.register_fence(":usesdirt:dirt_brick_fence", {
+ description = "Dirt Brick Fence",
+ texture = dirt_brick_tex,
+ inventory_image = "default_fence_overlay.png^("..dirt_brick_tex..")^default_fence_overlay.png^[makealpha:255,126,126",
+ wield_image = "default_fence_overlay.png^("..dirt_brick_tex..")^default_fence_overlay.png^[makealpha:255,126,126",
+ material = "usesdirt:dirt_brick",
+ groups = {cracky=3, stone=2},
+ sounds = default.node_sound_stone_defaults()
+ })
+
if minetest.get_modpath("moreblocks") then
minetest.register_craft({
output = 'usesdirt:dirt_brick 24',
@@ -196,7 +228,7 @@ if not minetest.get_modpath("usesdirt") then end
minetest.register_node(":usesdirt:dirt_ladder", {
- description = "Ladder",
+ description = "Dirt Ladder",
drawtype = "signlike",
tiles = { dirt_ladder_tex },
inventory_image = dirt_ladder_tex,
@@ -252,7 +284,7 @@ if not minetest.get_modpath("usesdirt") then })
minetest.register_node(":usesdirt:dirt_cobble_stone_ladder", {
- description = "Ladder",
+ description = "Dirt Cobble Stone Ladder",
drawtype = "signlike",
tiles = { dirt_cobble_ladder_tex },
inventory_image = dirt_cobble_ladder_tex,
@@ -300,7 +332,7 @@ if not minetest.get_modpath("usesdirt") then })
minetest.register_node(":usesdirt:dirt_stone_ladder", {
- description = "Ladder",
+ description = "Dirt Stone Ladder",
drawtype = "signlike",
tiles = { dirt_stone_ladder_tex },
inventory_image = dirt_stone_ladder_tex,
@@ -329,8 +361,8 @@ if not minetest.get_modpath("usesdirt") then })
default.register_fence(":usesdirt:dirt_stone_fence", {
- description = "Dirt Cobble Stone Fence",
- texture = dirt_cobble_tex,
+ description = "Dirt Stone Fence",
+ texture = dirt_stone_tex,
inventory_image = "default_fence_overlay.png^("..dirt_stone_tex..")^default_fence_overlay.png^[makealpha:255,126,126",
wield_image = "default_fence_overlay.png^("..dirt_stone_tex..")^default_fence_overlay.png^[makealpha:255,126,126",
material = "usesdirt:dirt_stone",
@@ -360,35 +392,7 @@ if minetest.setting_getbool("gloopblocks_mossy_conversion") ~= false then end
end
end
---[[
-if minetest.get_modpath("xdecor") then
- xdecor.worktable_nodes.gloopblocks = {
- "oerkki_block", "stone_brick_mossy", "stone_mossy", "cobble_road",
- "cobble_road_mossy", "cement", "pavement","rainbow_block",
- "evil_block", "basalt", "pumice"
- }
- if minetest.setting_getbool("gloopblocks_mossy_conversion") then
- local subnames = {
- "", "_nanoslab", "_micropanel", "_microslab", "_thinstair", "_cube",
- "_panel", "_slab", "_doublepanel", "_halfstair", "_outerstair",
- "_stair", "_innerstair"
- }
- for _, subname in ipairs(subnames) do
- gloopblocks_register_mossy_conversion({
- -- Cobble --> Mossy Cobble
- { "default:cobble"..subname, "default:mossycobble"..subname },
- -- Cobble Road --> Mossy Cobble Road
- { "gloopblocks:cobble_road"..subname, "gloopblocks:cobble_road_mossy"..subname },
- -- Stone Brick --> Stone Brick Mossy
- { "default:stonebrick"..subname, "gloopblocks:stone_brick_mossy"..subname},
- -- Stone --> Mossy Stone
- { "default:stone"..subname, "gloopblocks:stone_mossy"..subname}
- })
- end
- end
-end
---]]
if minetest.get_modpath("moreblocks") then
stairsplus:register_all("gloopblocks", "oerkki_block", "gloopblocks:oerkki_block", {
@@ -438,9 +442,9 @@ if minetest.get_modpath("moreblocks") then sunlight_propagates = true,
})
- stairsplus:register_all("gloopblocks", "cement", "gloopblocks:cement", {
+ stairsplus:register_all("gloopblocks", "cement", "basic_materials:cement_block", {
description = S("Cement"),
- tiles = {"gloopblocks_cement.png"},
+ tiles = {"basic_materials_cement_block.png"},
groups = {cracky=2, not_in_creative_inventory=1},
sounds = default.node_sound_stone_defaults(),
sunlight_propagates = true,
@@ -826,11 +830,6 @@ minetest.register_tool("gloopblocks:sword_evil", { -- Other items
-minetest.register_craftitem("gloopblocks:wet_cement", {
- description = S("Wet Cement"),
- inventory_image = "gloopblocks_wet_cement.png",
-})
-
minetest.register_craftitem("gloopblocks:evil_stick", {
description = S("Evil Stick"),
inventory_image = "gloopblocks_evil_stick.png",
diff --git a/glooptest/depends.txt b/glooptest/depends.txt index 331d858..b6b8c61 100644 --- a/glooptest/depends.txt +++ b/glooptest/depends.txt @@ -1 +1,2 @@ -default
\ No newline at end of file +default +basic_materials diff --git a/glooptest/parts_module/init.lua b/glooptest/parts_module/init.lua index b1a9202..fe3f9b1 100644 --- a/glooptest/parts_module/init.lua +++ b/glooptest/parts_module/init.lua @@ -1,20 +1,6 @@ glooptest.parts_module = {} glooptest.debug("MESSAGE","Loading Parts Module Now!") -minetest.register_craftitem("glooptest:chainlink", { - description = "Chainlink", - inventory_image = "glooptest_chainlink.png" -}) - -minetest.register_craft({ - output = "glooptest:chainlink 8", - recipe = { - {"", "default:steel_ingot", ""}, - {"default:steel_ingot", "", "default:steel_ingot"}, - {"", "default:steel_ingot", ""} - } -}) - minetest.register_node("glooptest:crystal_glass", { description = "Crystal Glass", drawtype = "allfaces", @@ -171,4 +157,4 @@ if LOAD_ORE_MODULE == true then {"glooptest:crystal_glass", "glooptest:crystal_glass", "glooptest:crystal_glass"} } }) -end
\ No newline at end of file +end diff --git a/homedecor/bedroom.lua b/homedecor/bedroom.lua index ddb7f99..7059809 100644 --- a/homedecor/bedroom.lua +++ b/homedecor/bedroom.lua @@ -64,9 +64,9 @@ 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 +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack end end }) @@ -92,10 +92,10 @@ homedecor.register("bed_extended", { after_dig_node = function(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) - return itemstack - end, +-- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack +-- end, drop = "homedecor:bed_regular" }) @@ -128,10 +128,10 @@ homedecor.register("bed_kingsize", { inv:add_item("main", "homedecor:bed_regular 2") end end, - on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - homedecor.beds_on_rightclick(pos, node, clicker) - return itemstack - end, +-- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) +-- homedecor.beds_on_rightclick(pos, node, clicker) +-- return itemstack +-- end, }) for _, w in pairs({ N_("mahogany"), N_("oak") }) do diff --git a/homedecor/crafts.lua b/homedecor/crafts.lua index f924981..98f2470 100644 --- a/homedecor/crafts.lua +++ b/homedecor/crafts.lua @@ -6,63 +6,16 @@ local S = homedecor_i18n.gettext -- misc craftitems -minetest.register_craftitem("homedecor:terracotta_base", { - description = S("Uncooked Terracotta Base"), - inventory_image = "homedecor_terracotta_base.png", -}) - minetest.register_craftitem("homedecor:roof_tile_terracotta", { description = S("Terracotta Roof Tile"), inventory_image = "homedecor_roof_tile_terracotta.png", }) -minetest.register_craftitem("homedecor:oil_extract", { - description = S("Oil extract"), - inventory_image = "homedecor_oil_extract.png", -}) - -minetest.register_craftitem("homedecor:paraffin", { - description = S("Unprocessed paraffin"), - inventory_image = "homedecor_paraffin.png", -}) - -minetest.register_alias("homedecor:plastic_base", "homedecor:paraffin") - -minetest.register_craftitem("homedecor:plastic_sheeting", { - description = S("Plastic sheet"), - inventory_image = "homedecor_plastic_sheeting.png", -}) - -minetest.register_craftitem("homedecor:plastic_strips", { - description = S("Plastic strips"), - inventory_image = "homedecor_plastic_strips.png", -}) - minetest.register_craftitem("homedecor:drawer_small", { description = S("Small Wooden Drawer"), inventory_image = "homedecor_drawer_small.png", }) -minetest.register_craftitem("homedecor:ic", { - description = S("Simple Integrated Circuit"), - inventory_image = "homedecor_ic.png", -}) - -minetest.register_craftitem("homedecor:heating_element", { - description = S("Heating element"), - inventory_image = "homedecor_heating_element.png", -}) - -minetest.register_craftitem("homedecor:motor", { - description = S("Motor"), - inventory_image = "homedecor_motor.png", -}) - -minetest.register_craftitem("homedecor:power_crystal", { - description = S("Power Crystal"), - inventory_image = "homedecor_power_crystal.png", -}) - minetest.register_craftitem("homedecor:blank_canvas", { description = S("Blank Canvas"), inventory_image = "homedecor_blank_canvas.png" @@ -78,21 +31,6 @@ minetest.register_craftitem("homedecor:dvd_player", { inventory_image = "homedecor_dvd_player.png" }) -minetest.register_craftitem("homedecor:empty_spool", { - description = S("Empty wire spool"), - inventory_image = "homedecor_empty_spool.png" -}) - -minetest.register_craftitem("homedecor:copper_wire", { - description = S("Spool of copper wire"), - inventory_image = "homedecor_copper_wire.png" -}) - -minetest.register_craftitem("homedecor:steel_wire", { - description = S("Spool of steel wire"), - inventory_image = "homedecor_steel_wire.png" -}) - minetest.register_craftitem("homedecor:speaker_driver", { description = S("Speaker driver"), inventory_image = "homedecor_speaker_driver_inv.png" @@ -103,26 +41,6 @@ minetest.register_craftitem("homedecor:fan_blades", { inventory_image = "homedecor_fan_blades.png" }) -minetest.register_craftitem("homedecor:copper_strip", { - description = S("Copper Strip"), - inventory_image = "homedecor_copper_strip.png" -}) - -minetest.register_craftitem("homedecor:steel_strip", { - description = S("Steel Strip"), - inventory_image = "homedecor_steel_strip.png" -}) - -minetest.register_craftitem(":glooptest:chainlink", { - description = S("Steel chainlink"), - inventory_image = "homedecor_chainlink_steel.png" -}) - -minetest.register_craftitem("homedecor:chainlink_brass", { - description = S("Brass chainlink"), - inventory_image = "homedecor_chainlink_brass.png" -}) - minetest.register_craftitem("homedecor:soda_can", { description = S("Soda Can"), inventory_image = "homedecor_soda_can.png", @@ -134,165 +52,21 @@ minetest.register_craftitem("homedecor:coin", { inventory_image = "homedecor_coin.png", }) --- alternate crafting if mesecons is/isn't installed - -if not minetest.get_modpath("mesecons") then - - minetest.register_craftitem(":mesecons_materials:silicon", { - description = S("Silicon lump"), - inventory_image = "homedecor_silicon.png", - }) - - minetest.register_craft( { - output = "mesecons_materials:silicon 4", - recipe = { - { "default:sand", "default:sand" }, - { "default:sand", "default:steel_ingot" }, - }, - }) - -end - --- alternate crafting if technic is/isn't installed -if not minetest.get_modpath("technic") then - minetest.register_craftitem(":technic:brass_ingot", { - description = S("Brass Ingot"), - inventory_image = "homedecor_brass_ingot.png", - }) - - if minetest.get_modpath("moreores") then - minetest.register_craft( { - type = "shapeless", - output = "technic:brass_ingot 2", - recipe = { - "moreores:silver_ingot", - "default:copper_ingot", - }, - }) - else - minetest.register_craft( { - type = "shapeless", - output = "technic:brass_ingot 3", - recipe = { - "default:steel_ingot", - "default:copper_ingot", - "default:gold_ingot", - }, - }) - end -end - -minetest.register_alias("homedecor:brass_ingot", "technic:brass_ingot") - -- the actual crafts minetest.register_craft( { - output = "homedecor:copper_strip 12", - recipe = { - { "", "default:copper_ingot", "" }, - { "default:copper_ingot", "", "" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:steel_strip 12", - recipe = { - { "", "default:steel_ingot", "" }, - { "default:steel_ingot", "", "" }, - }, -}) - -minetest.register_craft( { output = "homedecor:fan_blades 2", recipe = { - { "", "homedecor:plastic_sheeting", "" }, + { "", "basic_materials:plastic_sheet", "" }, { "", "default:steel_ingot", "" }, - { "homedecor:plastic_sheeting", "", "homedecor:plastic_sheeting" } - }, -}) - -minetest.register_craft( { - output = "homedecor:empty_spool 3", - recipe = { - { "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 = "homedecor:steel_wire 2", - type = "shapeless", - recipe = { - "default:steel_ingot", - "homedecor:empty_spool", - "homedecor:empty_spool", - }, -}) - -minetest.register_craft( { - output = "homedecor:copper_wire 2", - type = "shapeless", - recipe = { - "default:copper_ingot", - "homedecor:empty_spool", - "homedecor:empty_spool", - }, -}) - -minetest.register_craft( { - output = "homedecor:plastic_strips 3", - recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } - }, -}) - -minetest.register_craft( { - output = "homedecor:heating_element 2", - recipe = { - { "default:copper_ingot", "default:mese_crystal_fragment", "default:copper_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:motor 2", - recipe = { - { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" }, - { "default:copper_ingot", "default:steel_ingot", "default:steel_ingot" }, - { "default:mese_crystal_fragment", "homedecor:copper_wire", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" } }, }) minetest.register_craft({ - --type = "shapeless", - output = "homedecor:power_crystal 2", - recipe = { - { "default:mese_crystal_fragment", "default:torch", "default:mese_crystal_fragment" }, - { "default:diamond", "default:gold_ingot", "default:diamond" } - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:power_crystal", - burntime = 50, -}) - -minetest.register_craft( { - type = "shapeless", - output = "homedecor:terracotta_base 8", - recipe = { - "default:dirt", - "default:clay_lump", - "bucket:bucket_water" - }, - replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, }, -}) - -minetest.register_craft({ type = "cooking", output = "homedecor:roof_tile_terracotta", - recipe = "homedecor:terracotta_base", + recipe = "basic_materials:terracotta_base", }) minetest.register_craft( { @@ -320,55 +94,12 @@ minetest.register_craft( { -- -minetest.register_craft({ - type = "shapeless", - output = "homedecor:oil_extract 4", - recipe = { - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves" - } -}) - -minetest.register_craft({ - type = "cooking", - output = "homedecor:paraffin", - recipe = "homedecor:oil_extract", -}) - -minetest.register_craft({ - type = "cooking", - output = "homedecor:plastic_sheeting", - recipe = "homedecor:paraffin", -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:oil_extract", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:paraffin", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:plastic_sheeting", - burntime = 30, -}) - minetest.register_craft( { output = "homedecor:flower_pot_green", recipe = { { "", "dye:dark_green", "" }, - { "homedecor:plastic_sheeting", "default:dirt", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, }, }) @@ -376,8 +107,8 @@ minetest.register_craft( { output = "homedecor:flower_pot_black", recipe = { { "dye:black", "dye:black", "dye:black" }, - { "homedecor:plastic_sheeting", "default:dirt", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "default:dirt", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, }, }) @@ -387,8 +118,8 @@ minetest.register_craft( { output = "homedecor:projection_screen 3", recipe = { { "", "default:glass", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, }, }) @@ -421,10 +152,6 @@ minetest.register_craft( { }, }) - --- ======================================================= --- Items/recipes not requiring smelting of anything new - minetest.register_craft( { output = "homedecor:glass_table_small_round_b 15", recipe = { @@ -500,7 +227,7 @@ minetest.register_craft( { recipe = { { "building_blocks:gravel_spread", "dye:black", "building_blocks:gravel_spread" }, { "group:sand", "dye:black", "group:sand" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, }, }) @@ -677,9 +404,9 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:table_legs_brass 3", recipe = { - { "", "technic:brass_ingot", "" }, - { "", "technic:brass_ingot", "" }, - { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" } + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" } }, }) @@ -703,9 +430,9 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:pole_brass 4", recipe = { - { "", "technic:brass_ingot", "" }, - { "", "technic:brass_ingot", "" }, - { "", "technic:brass_ingot", "" } + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" }, + { "", "basic_materials:brass_ingot", "" } }, }) @@ -721,37 +448,37 @@ minetest.register_craft( { -- Home electronics minetest.register_craft( { - output = "homedecor:ic 4", + output = "basic_materials:ic 4", recipe = { - { "mesecons_materials:silicon", "mesecons_materials:silicon" }, - { "mesecons_materials:silicon", "default:copper_ingot" }, + { "basic_materials:silicon", "basic_materials:silicon" }, + { "basic_materials:silicon", "default:copper_ingot" }, }, }) minetest.register_craft( { output = "homedecor:television", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "moreblocks:glow_glass", "homedecor:plastic_sheeting" }, - { "homedecor:ic", "homedecor:ic", "homedecor:ic" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "moreblocks:glow_glass", "basic_materials:plastic_sheet" }, + { "basic_materials:ic", "basic_materials:ic", "basic_materials:ic" }, }, }) minetest.register_craft( { output = "homedecor:television", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting" }, - { "homedecor:ic", "homedecor:power_crystal", "homedecor:ic" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet" }, + { "basic_materials:ic", "basic_materials:energy_crystal_simple", "basic_materials:ic" }, }, }) minetest.register_craft( { output = "homedecor:stereo", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:ic", "homedecor:plastic_sheeting" }, - { "default:steel_ingot", "homedecor:ic", "default:steel_ingot" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "basic_materials:ic", "default:steel_ingot" }, }, }) @@ -835,7 +562,7 @@ minetest.register_craft( { output = "homedecor:speaker_driver 2", recipe = { { "", "default:steel_ingot", "" }, - { "default:paper", "homedecor:copper_wire", "default:iron_lump" }, + { "default:paper", "basic_materials:copper_wire", "default:iron_lump" }, { "", "default:steel_ingot", "" }, }, }) @@ -1017,18 +744,18 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:oven_steel", recipe = { - {"homedecor:heating_element", "default:steel_ingot", "homedecor:heating_element", }, + {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, {"default:steel_ingot", "moreblocks:iron_glass", "default:steel_ingot", }, - {"default:steel_ingot", "homedecor:heating_element", "default:steel_ingot", }, + {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, } }) minetest.register_craft({ output = "homedecor:oven_steel", recipe = { - {"homedecor:heating_element", "default:steel_ingot", "homedecor:heating_element", }, + {"basic_materials:heating_element", "default:steel_ingot", "basic_materials:heating_element", }, {"default:steel_ingot", "default:glass", "default:steel_ingot", }, - {"default:steel_ingot", "homedecor:heating_element", "default:steel_ingot", }, + {"default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot", }, } }) @@ -1046,8 +773,8 @@ minetest.register_craft({ output = "homedecor:microwave_oven 2", recipe = { {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "moreblocks:iron_glass", "homedecor:ic", }, - {"default:steel_ingot", "default:copper_ingot", "homedecor:power_crystal", }, + {"default:steel_ingot", "moreblocks:iron_glass", "basic_materials:ic", }, + {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, } }) @@ -1055,8 +782,8 @@ minetest.register_craft({ output = "homedecor:microwave_oven 2", recipe = { {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot", }, - {"default:steel_ingot", "default:glass", "homedecor:ic", }, - {"default:steel_ingot", "default:copper_ingot", "homedecor:power_crystal", }, + {"default:steel_ingot", "default:glass", "basic_materials:ic", }, + {"default:steel_ingot", "default:copper_ingot", "basic_materials:energy_crystal_simple", }, } }) @@ -1152,7 +879,7 @@ minetest.register_craft({ output = "homedecor:candle_thin 4", recipe = { {"farming:string" }, - {"homedecor:paraffin" } + {"basic_materials:paraffin" } } }) @@ -1160,8 +887,8 @@ minetest.register_craft({ output = "homedecor:candle 2", recipe = { {"farming:string" }, - {"homedecor:paraffin" }, - {"homedecor:paraffin" } + {"basic_materials:paraffin" }, + {"basic_materials:paraffin" } } }) @@ -1188,7 +915,7 @@ minetest.register_craft({ recipe = { {""}, {"homedecor:candle_thin"}, - {"technic:brass_ingot"}, + {"basic_materials:brass_ingot"}, } }) @@ -1197,7 +924,7 @@ minetest.register_craft({ recipe = { { "", "vessels:glass_bottle", "" }, { "", "farming:string", "" }, - { "default:steel_ingot", "homedecor:oil_extract", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:oil_extract", "default:steel_ingot" } } }) @@ -1206,7 +933,7 @@ minetest.register_craft({ recipe = { { "", "vessels:glass_bottle", "" }, { "", "farming:string", "" }, - { "default:iron_lump", "homedecor:oil_extract", "default:iron_lump" } + { "default:iron_lump", "basic_materials:oil_extract", "default:iron_lump" } } }) @@ -1251,7 +978,7 @@ else recipe = { { "dye:black", "dye:yellow", "dye:black" }, { "group:stick", "building_blocks:woodglass", "group:stick" }, - { "group:stick", "homedecor:power_crystal", "group:stick" } + { "group:stick", "basic_materials:energy_crystal_simple", "group:stick" } }, }) @@ -1283,7 +1010,7 @@ end minetest.register_craft({ output = "homedecor:glowlight_half 6", recipe = { - { "default:glass", "homedecor:power_crystal", "default:glass", }, + { "default:glass", "basic_materials:energy_crystal_simple", "default:glass", }, } }) @@ -1345,7 +1072,7 @@ minetest.register_craft({ recipe = { { "dye:white" }, { "default:glass" }, - { "homedecor:power_crystal" }, + { "basic_materials:energy_crystal_simple" }, } }) @@ -1381,7 +1108,7 @@ minetest.register_craft({ output = "homedecor:plasma_lamp", recipe = { {"", "default:glass", ""}, - {"default:glass", "homedecor:power_crystal", "default:glass"}, + {"default:glass", "basic_materials:energy_crystal_simple", "default:glass"}, {"", "default:glass", ""} } }) @@ -1391,7 +1118,7 @@ minetest.register_craft({ recipe = { {"", "default:glass", ""}, {"default:glass", "default:copper_ingot", "default:glass"}, - {"homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting"} + {"basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet"} } }) @@ -1401,8 +1128,8 @@ minetest.register_craft({ minetest.register_craft( { output = "homedecor:fence_brass 6", recipe = { - { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" }, - { "technic:brass_ingot", "technic:brass_ingot", "technic:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, + { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" }, }, }) @@ -1533,9 +1260,9 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:fence_barbed_wire 6", recipe = { - { "group:stick", "homedecor:steel_wire", "group:stick" }, + { "group:stick", "basic_materials:steel_wire", "group:stick" }, { "group:stick", "", "group:stick" }, - { "group:stick", "homedecor:steel_wire", "group:stick" } + { "group:stick", "basic_materials:steel_wire", "group:stick" } }, }) @@ -1558,8 +1285,8 @@ minetest.register_craft( { output = "homedecor:fence_chainlink 9", recipe = { { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, - { "homedecor:steel_wire", "homedecor:steel_wire", "default:steel_ingot" }, - { "homedecor:steel_wire", "homedecor:steel_wire", "default:steel_ingot" } + { "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" }, + { "basic_materials:steel_wire", "basic_materials:steel_wire", "default:steel_ingot" } }, }) @@ -1723,17 +1450,6 @@ minetest.register_craft( { }, }) --- Solid glass with metal handle - -minetest.register_craft( { - output = "homedecor:door_glass_left 2", - recipe = { - { "default:glass", "default:glass" }, - { "default:glass", "default:steel_ingot" }, - { "default:glass", "default:glass" }, - }, -}) - -- Closet doors -- oak @@ -1787,7 +1503,7 @@ minetest.register_craft( { output = "homedecor:door_bedroom_left", recipe = { { "dye:white", "dye:white", "" }, - { "homedecor:door_wood_plain_left", "technic:brass_ingot", "" }, + { "homedecor:door_wood_plain_left", "basic_materials:brass_ingot", "" }, { "", "", "" }, }, }) @@ -1798,7 +1514,7 @@ minetest.register_craft( { output = "homedecor:door_woodglass_left", recipe = { { "group:wood", "default:glass", "" }, - { "group:wood", "default:glass", "technic:brass_ingot" }, + { "group:wood", "default:glass", "basic_materials:brass_ingot" }, { "group:wood", "group:wood", "" }, }, }) @@ -1819,16 +1535,16 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:washing_machine", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:ic" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:motor", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" } }, }) minetest.register_craft( { output = "homedecor:washing_machine", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:ic" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, { "default:steel_ingot", "bucket:bucket_water", "default:steel_ingot" }, { "default:steel_ingot", "technic:motor", "default:steel_ingot" } }, @@ -1837,18 +1553,18 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:dryer", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:ic" }, - { "default:steel_ingot", "bucket:bucket_empty", "homedecor:motor" }, - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, + { "default:steel_ingot", "bucket:bucket_empty", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) minetest.register_craft( { output = "homedecor:dryer", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:ic" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:ic" }, { "default:steel_ingot", "bucket:bucket_empty", "technic:motor" }, - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) @@ -1866,18 +1582,18 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:dishwasher", recipe = { - { "homedecor:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, - { "default:steel_ingot", "homedecor:shower_head", "homedecor:motor" }, - { "default:steel_ingot", "homedecor:heating_element", "bucket:bucket_water" } + { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, + { "default:steel_ingot", "homedecor:shower_head", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } }, }) minetest.register_craft( { output = "homedecor:dishwasher", recipe = { - { "homedecor:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, + { "basic_materials:ic", "homedecor:fence_chainlink", "default:steel_ingot", }, { "default:steel_ingot", "homedecor:shower_head", "technic:motor" }, - { "default:steel_ingot", "homedecor:heating_element", "bucket:bucket_water" } + { "default:steel_ingot", "basic_materials:heating_element", "bucket:bucket_water" } }, }) @@ -2051,7 +1767,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:fishtank", recipe = { - { "homedecor:plastic_sheeting", "homedecor:glowlight_small_cube", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "homedecor:glowlight_small_cube", "basic_materials:plastic_sheet" }, { "default:glass", "bucket:bucket_water", "default:glass" }, { "default:glass", "building_blocks:gravel_spread", "default:glass" }, }, @@ -2131,9 +1847,9 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:analog_clock_plastic 2", recipe = { - { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:ic", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "dye:black", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "dye:black", "basic_materials:plastic_sheet" }, }, }) @@ -2141,7 +1857,7 @@ minetest.register_craft({ output = "homedecor:analog_clock_wood 2", recipe = { { "group:stick", "dye:black", "group:stick" }, - { "group:stick", "homedecor:ic", "group:stick" }, + { "group:stick", "basic_materials:ic", "group:stick" }, { "group:stick", "dye:black", "group:stick" }, }, }) @@ -2149,18 +1865,18 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:digital_clock 2", recipe = { - { "homedecor:plastic_sheeting", "default:paper", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:ic", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "default:paper", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:ic", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }, }, }) minetest.register_craft({ output = "homedecor:alarm_clock", recipe = { - { "homedecor:plastic_sheeting", "homedecor:speaker_driver", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:digital_clock", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:power_crystal", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "homedecor:speaker_driver", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "homedecor:digital_clock", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:energy_crystal_simple", "basic_materials:plastic_sheet" }, }, }) @@ -2168,8 +1884,8 @@ minetest.register_craft({ output = "homedecor:air_conditioner", recipe = { { "default:steel_ingot", "building_blocks:grate", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:fan_blades", "homedecor:motor" }, - { "default:steel_ingot", "homedecor:motor", "default:steel_ingot" }, + { "default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor" }, + { "default:steel_ingot", "basic_materials:motor", "default:steel_ingot" }, }, }) @@ -2185,7 +1901,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:ceiling_fan", recipe = { - { "homedecor:motor" }, + { "basic_materials:motor" }, { "homedecor:fan_blades" }, { "homedecor:glowlight_small_cube" } } @@ -2259,27 +1975,27 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:vcr 2", recipe = { - { "homedecor:ic", "default:steel_ingot", "homedecor:plastic_sheeting" }, + { "basic_materials:ic", "default:steel_ingot", "basic_materials:plastic_sheet" }, { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, - { "homedecor:plastic_sheeting", "", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }, }, }) minetest.register_craft({ output = "homedecor:dvd_player 2", recipe = { - { "", "homedecor:plastic_sheeting", "" }, - { "default:obsidian_glass", "homedecor:motor", "homedecor:motor" }, - { "default:mese_crystal_fragment", "homedecor:ic", "homedecor:power_crystal" }, + { "", "basic_materials:plastic_sheet", "" }, + { "default:obsidian_glass", "basic_materials:motor", "basic_materials:motor" }, + { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, }, }) minetest.register_craft({ output = "homedecor:dvd_player 2", recipe = { - { "", "homedecor:plastic_sheeting", "" }, + { "", "basic_materials:plastic_sheet", "" }, { "default:obsidian_glass", "technic:motor", "technic:motor" }, - { "default:mese_crystal_fragment", "homedecor:ic", "homedecor:power_crystal" }, + { "default:mese_crystal_fragment", "basic_materials:ic", "basic_materials:energy_crystal_simple" }, }, }) @@ -2295,18 +2011,18 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:blinds_thin", recipe = { - { "group:stick", "homedecor:plastic_sheeting", "group:stick" }, - { "farming:string", "homedecor:plastic_strips", "" }, - { "", "homedecor:plastic_strips", "" }, + { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, + { "farming:string", "basic_materials:plastic_strip", "" }, + { "", "basic_materials:plastic_strip", "" }, }, }) minetest.register_craft({ output = "homedecor:blinds_thick", recipe = { - { "group:stick", "homedecor:plastic_sheeting", "group:stick" }, - { "farming:string", "homedecor:plastic_strips", "homedecor:plastic_strips" }, - { "", "homedecor:plastic_strips", "homedecor:plastic_strips" }, + { "group:stick", "basic_materials:plastic_sheet", "group:stick" }, + { "farming:string", "basic_materials:plastic_strip", "basic_materials:plastic_strip" }, + { "", "basic_materials:plastic_strip", "basic_materials:plastic_strip" }, }, }) @@ -2322,7 +2038,7 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:desk_fan", recipe = { - {"default:steel_ingot", "homedecor:fan_blades", "homedecor:motor"}, + {"default:steel_ingot", "homedecor:fan_blades", "basic_materials:motor"}, {"", "default:steel_ingot", ""} }, }) @@ -2330,18 +2046,18 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:space_heater", recipe = { - {"homedecor:plastic_sheeting", "homedecor:heating_element", "homedecor:plastic_sheeting"}, - {"homedecor:plastic_sheeting", "homedecor:fan_blades", "homedecor:motor"}, - {"homedecor:plastic_sheeting", "homedecor:heating_element", "homedecor:plastic_sheeting"} + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "homedecor:fan_blades", "basic_materials:motor"}, + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"} }, }) minetest.register_craft( { output = "homedecor:radiator", recipe = { - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" }, - { "homedecor:ic", "homedecor:heating_element", "" }, - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }, + { "basic_materials:ic", "basic_materials:heating_element", "" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) @@ -2409,18 +2125,18 @@ unifieddyes.register_color_craft({ minetest.register_craft( { output = "homedecor:power_outlet", recipe = { - {"homedecor:plastic_sheeting", "homedecor:copper_strip"}, - {"homedecor:plastic_sheeting", ""}, - {"homedecor:plastic_sheeting", "homedecor:copper_strip"} + {"basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"basic_materials:plastic_sheet", ""}, + {"basic_materials:plastic_sheet", "basic_materials:copper_strip"} }, }) minetest.register_craft( { output = "homedecor:light_switch", recipe = { - {"", "homedecor:plastic_sheeting", "homedecor:copper_strip"}, - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:copper_strip"}, - {"", "homedecor:plastic_sheeting", "homedecor:copper_strip"} + {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:copper_strip"}, + {"", "basic_materials:plastic_sheet", "basic_materials:copper_strip"} }, }) @@ -2504,7 +2220,7 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:trash_can 3", recipe = { - { "homedecor:steel_wire", "", "homedecor:steel_wire" }, + { "basic_materials:steel_wire", "", "basic_materials:steel_wire" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } }, }) @@ -2512,8 +2228,8 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:telephone", recipe = { - { "homedecor:speaker_driver", "homedecor:copper_wire", "homedecor:speaker_driver" }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }, + { "homedecor:speaker_driver", "basic_materials:copper_wire", "homedecor:speaker_driver" }, + { "basic_materials:plastic_sheet", "default:steel_ingot", "basic_materials:plastic_sheet" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" } }, }) @@ -2555,7 +2271,7 @@ minetest.register_craft( { minetest.register_craft( { output = "homedecor:doorbell", recipe = { - { "homedecor:light_switch", "homedecor:power_crystal", "homedecor:speaker_driver" } + { "homedecor:light_switch", "basic_materials:energy_crystal_simple", "homedecor:speaker_driver" } }, }) @@ -2600,7 +2316,7 @@ minetest.register_craft( { output = "homedecor:cutlery_set", recipe = { { "", "vessels:drinking_glass", "" }, - { "homedecor:steel_strip", "building_blocks:slab_marble", "homedecor:steel_strip" }, + { "basic_materials:steel_strip", "building_blocks:slab_marble", "basic_materials:steel_strip" }, }, }) @@ -2608,7 +2324,7 @@ minetest.register_craft( { output = "homedecor:cutlery_set", recipe = { { "", "vessels:drinking_glass", "" }, - { "homedecor:steel_strip", "building_blocks:micro_marble_1", "homedecor:steel_strip" }, + { "basic_materials:steel_strip", "building_blocks:micro_marble_1", "basic_materials:steel_strip" }, }, }) @@ -2692,71 +2408,38 @@ minetest.register_craft( { }, }) -if not minetest.get_modpath("glooptest") then - - minetest.register_craft({ - output = "glooptest:chainlink 12", - recipe = { - {"", "default:steel_ingot", "default:steel_ingot"}, - { "default:steel_ingot", "", "default:steel_ingot" }, - { "default:steel_ingot", "default:steel_ingot", "" }, - }, - }) - -end - -minetest.register_alias("homedecor:chainlink_steel", "glooptest:chainlink") - -minetest.register_craft({ - output = "homedecor:chains 4", - recipe = { - { "default:steel_ingot", "", "default:steel_ingot"}, - { "glooptest:chainlink", "", "glooptest:chainlink" }, - { "glooptest:chainlink", "", "glooptest:chainlink" }, - }, -}) - -minetest.register_craft({ - output = "homedecor:chainlink_brass 12", - recipe = { - {"", "technic:brass_ingot", "technic:brass_ingot"}, - { "technic:brass_ingot", "", "technic:brass_ingot" }, - { "technic:brass_ingot", "technic:brass_ingot", "" }, - }, -}) - minetest.register_craft({ output = "homedecor:coffee_maker", recipe = { - {"homedecor:plastic_sheeting", "bucket:bucket_water", "homedecor:plastic_sheeting"}, - {"homedecor:plastic_sheeting", "default:glass", "homedecor:plastic_sheeting"}, - {"homedecor:plastic_sheeting", "homedecor:heating_element", "homedecor:plastic_sheeting"} + {"basic_materials:plastic_sheet", "bucket:bucket_water", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "default:glass", "basic_materials:plastic_sheet"}, + {"basic_materials:plastic_sheet", "basic_materials:heating_element", "basic_materials:plastic_sheet"} }, }) minetest.register_craft({ output = "homedecor:dartboard", recipe = { - {"dye:black", "homedecor:plastic_sheeting", "dye:white"}, - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, - {"dye:dark_green", "homedecor:plastic_sheeting", "dye:red"} + {"dye:black", "basic_materials:plastic_sheet", "dye:white"}, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}, + {"dye:dark_green", "basic_materials:plastic_sheet", "dye:red"} }, }) minetest.register_craft({ output = "homedecor:piano", recipe = { - { "", "homedecor:steel_wire", "building_blocks:hardwood" }, - { "homedecor:plastic_strips", "homedecor:steel_wire", "building_blocks:hardwood" }, - { "technic:brass_ingot", "default:steelblock", "building_blocks:hardwood" } + { "", "basic_materials:steel_wire", "building_blocks:hardwood" }, + { "basic_materials:plastic_strip", "basic_materials:steel_wire", "building_blocks:hardwood" }, + { "basic_materials:brass_ingot", "default:steelblock", "building_blocks:hardwood" } }, }) minetest.register_craft({ output = "homedecor:toaster", recipe = { - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" }, - { "default:steel_ingot", "homedecor:heating_element", "default:steel_ingot" } + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" }, + { "default:steel_ingot", "basic_materials:heating_element", "default:steel_ingot" } }, }) @@ -2791,7 +2474,7 @@ minetest.register_craft({ output = "homedecor:office_chair_upscale", recipe = { { "dye:black", "building_blocks:sticks", "group:wool" }, - { "homedecor:plastic_sheeting", "group:wool", "default:steel_ingot" }, + { "basic_materials:plastic_sheet", "group:wool", "default:steel_ingot" }, { "building_blocks:sticks", "homedecor:pole_wrought_iron", "building_blocks:sticks" } }, }) @@ -2816,8 +2499,8 @@ minetest.register_craft({ output = "homedecor:grandfather_clock", recipe = { { "building_blocks:slab_hardwood","homedecor:analog_clock_wood","building_blocks:slab_hardwood" }, - { "building_blocks:slab_hardwood","technic:brass_ingot","building_blocks:slab_hardwood" }, - { "building_blocks:slab_hardwood","technic:brass_ingot","building_blocks:slab_hardwood" } + { "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" }, + { "building_blocks:slab_hardwood","basic_materials:brass_ingot","building_blocks:slab_hardwood" } }, }) @@ -2842,7 +2525,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:copper_pans", recipe = { - { "homedecor:copper_strip","","homedecor:copper_strip" }, + { "basic_materials:copper_strip","","basic_materials:copper_strip" }, { "default:copper_ingot","","default:copper_ingot" }, { "default:copper_ingot","","default:copper_ingot" } }, @@ -3033,8 +2716,8 @@ minetest.register_craft({ output = "homedecor:desk_lamp 2", recipe = { { "", "default:steel_ingot", "homedecor:glowlight_small_cube" }, - { "", "homedecor:steel_strip", "" }, - { "homedecor:plastic_sheeting", "homedecor:copper_wire", "homedecor:plastic_sheeting" }, + { "", "basic_materials:steel_strip", "" }, + { "basic_materials:plastic_sheet", "basic_materials:copper_wire", "basic_materials:plastic_sheet" }, }, }) @@ -3079,8 +2762,8 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:desk_globe", recipe = { - { "group:stick", "homedecor:plastic_sheeting", "dye:green" }, - { "group:stick", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "group:stick", "basic_materials:plastic_sheet", "dye:green" }, + { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "group:stick", "stairs:slab_wood", "dye:blue" } }, }) @@ -3088,8 +2771,8 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:desk_globe", recipe = { - { "group:stick", "homedecor:plastic_sheeting", "dye:green" }, - { "group:stick", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "group:stick", "basic_materials:plastic_sheet", "dye:green" }, + { "group:stick", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "group:stick", "moreblocks:slab_wood", "dye:blue" } }, }) @@ -3097,7 +2780,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:tool_cabinet", recipe = { - { "homedecor:motor", "default:axe_steel", "default:pick_steel" }, + { "basic_materials:motor", "default:axe_steel", "default:pick_steel" }, { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" }, { "default:steel_ingot", "homedecor:drawer_small", "default:steel_ingot" } }, @@ -3107,25 +2790,25 @@ minetest.register_craft({ output = "homedecor:bathroom_set", recipe = { { "", "homedecor:glass_table_small_round", "" }, - { "homedecor:plastic_sheeting", "homedecor:glass_table_small_round", "homedecor:plastic_sheeting" }, - { "group:stick", "homedecor:plastic_sheeting", "group:stick" } + { "basic_materials:plastic_sheet", "homedecor:glass_table_small_round", "basic_materials:plastic_sheet" }, + { "group:stick", "basic_materials:plastic_sheet", "group:stick" } }, }) minetest.register_craft({ output = "homedecor:trash_can_green", recipe = { - { "homedecor:plastic_sheeting", "", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "dye:green", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "dye:green", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) minetest.register_craft({ output = "homedecor:ceiling_lamp", recipe = { - { "", "technic:brass_ingot", ""}, - { "", "homedecor:chainlink_brass", ""}, + { "", "basic_materials:brass_ingot", ""}, + { "", "basic_materials:chainlink_brass", ""}, { "default:glass", "homedecor:glowlight_small_cube", "default:glass"} }, }) @@ -3133,7 +2816,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:ceiling_lamp", recipe = { - { "", "chains:chain_top_brass", ""}, + { "", "basic_materials:chain_steel_top_brass", ""}, { "default:glass", "homedecor:glowlight_small_cube", "default:glass"} }, }) @@ -3351,5 +3034,5 @@ unifieddyes.register_color_craft({ }) if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then - technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} }) + technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"basic_materials:oil_extract 2","dye:yellow 1"} }) end diff --git a/homedecor/depends.txt b/homedecor/depends.txt index baaeb85..29ab645 100644 --- a/homedecor/depends.txt +++ b/homedecor/depends.txt @@ -1,4 +1,5 @@ default +basic_materials unifieddyes homedecor_i18n creative diff --git a/homedecor/doors_and_gates.lua b/homedecor/doors_and_gates.lua index 34ba017..afcc7ff 100644 --- a/homedecor/doors_and_gates.lua +++ b/homedecor/doors_and_gates.lua @@ -142,11 +142,6 @@ 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", @@ -662,3 +657,6 @@ 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") diff --git a/homedecor/electronics.lua b/homedecor/electronics.lua index 633adc1..cfcc6fc 100644 --- a/homedecor/electronics.lua +++ b/homedecor/electronics.lua @@ -141,17 +141,3 @@ 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 -}) diff --git a/homedecor/furniture_recipes.lua b/homedecor/furniture_recipes.lua index a995242..aeceeef 100644 --- a/homedecor/furniture_recipes.lua +++ b/homedecor/furniture_recipes.lua @@ -2,7 +2,7 @@ minetest.register_craft({ output = "homedecor:table", recipe = { - { "group:wood","group:wood", "group:wood" }, + { "default:wood","default:wood", "default:wood" }, { "group:stick", "", "group:stick" }, }, }) @@ -205,6 +205,7 @@ minetest.register_craft({ output = "homedecor:sink", recipe = { { "group:marble","bucket:bucket_empty", "group:marble" }, + { "", "group:marble", "" } }, }) @@ -225,7 +226,7 @@ minetest.register_craft({ minetest.register_craft({ output = "homedecor:shower_tray", recipe = { - { "group:marble","bucket:bucket_water", "group:marble" }, + { "group:marble","bucket:bucket_empty", "group:marble" }, }, }) diff --git a/homedecor/handlers/inventory.lua b/homedecor/handlers/inventory.lua index 62269e6..dd09133 100644 --- a/homedecor/handlers/inventory.lua +++ b/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, "default:steel_ingot" } + recipe = { "homedecor:" .. name, "basic_materials:padlock" } }) end diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index ddd0e44..67c54d6 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -742,3 +742,141 @@ minetest.register_lbm({ meta:set_string("dye", "unifieddyes:"..color) 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 + } + } + }, + drawtype = "mesh", + mesh = "homedecor_chandelier.obj", + groups = {cracky=3}, + sounds = default.node_sound_stone_defaults(), +}) + +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") + diff --git a/chains/models/top_chains.obj b/homedecor/models/homedecor_chains_top.obj index 9e4f3f7..9e4f3f7 100644 --- a/chains/models/top_chains.obj +++ b/homedecor/models/homedecor_chains_top.obj diff --git a/chains/models/chains_chandelier.obj b/homedecor/models/homedecor_chandelier.obj index 83c609d..83c609d 100644 --- a/chains/models/chains_chandelier.obj +++ b/homedecor/models/homedecor_chandelier.obj diff --git a/homedecor/sounds/homedecor_telephone_ringing.ogg b/homedecor/sounds/homedecor_telephone_ringing.ogg Binary files differdeleted file mode 100644 index 8272ab1..0000000 --- a/homedecor/sounds/homedecor_telephone_ringing.ogg +++ /dev/null diff --git a/homedecor/textures/homedecor_brass_ingot.png b/homedecor/textures/homedecor_brass_ingot.png Binary files differdeleted file mode 100644 index c2e06ff..0000000 --- a/homedecor/textures/homedecor_brass_ingot.png +++ /dev/null diff --git a/chains/textures/chains_candle.png b/homedecor/textures/homedecor_candle_flat.png Binary files differindex d709a8c..d709a8c 100644 --- a/chains/textures/chains_candle.png +++ b/homedecor/textures/homedecor_candle_flat.png diff --git a/homedecor/textures/homedecor_copper_wire.png b/homedecor/textures/homedecor_copper_wire.png Binary files differdeleted file mode 100644 index 676e98f..0000000 --- a/homedecor/textures/homedecor_copper_wire.png +++ /dev/null diff --git a/homedecor/textures/homedecor_plastic_strips.png b/homedecor/textures/homedecor_plastic_strips.png Binary files differdeleted file mode 100644 index 6ec83a8..0000000 --- a/homedecor/textures/homedecor_plastic_strips.png +++ /dev/null diff --git a/homedecor/textures/homedecor_steel_wire.png b/homedecor/textures/homedecor_steel_wire.png Binary files differdeleted file mode 100644 index 44f8240..0000000 --- a/homedecor/textures/homedecor_steel_wire.png +++ /dev/null diff --git a/chains/textures/top_chain_brass_inv.png b/homedecor/textures/top_chain_brass_inv.png Binary files differindex dc8183c..dc8183c 100644 --- a/chains/textures/top_chain_brass_inv.png +++ b/homedecor/textures/top_chain_brass_inv.png diff --git a/chains/textures/top_chain_wrought_iron_inv.png b/homedecor/textures/top_chain_wrought_iron_inv.png Binary files differindex cddf6c9..cddf6c9 100644 --- a/chains/textures/top_chain_wrought_iron_inv.png +++ b/homedecor/textures/top_chain_wrought_iron_inv.png diff --git a/labels/init.lua b/labels/init.lua index 29e12a7..e8d0624 100644 --- a/labels/init.lua +++ b/labels/init.lua @@ -188,7 +188,7 @@ minetest.register_craft({ minetest.register_craft({ output = "streets:printer", - recipe = {{"","homedecor:plastic_sheeting","homedecor:power_crystal"}, + recipe = {{"","homedecor:plastic_sheeting","basic_materials:energy_crystal_simple"}, {"homedecor:motor","default:steel_ingot","group:wool"}, {"","homedecor:plastic_sheeting","homedecor:motor"}} }) diff --git a/lrfurn/coffeetable.lua b/lrfurn/coffeetable.lua index f9246b8..827657a 100644 --- a/lrfurn/coffeetable.lua +++ b/lrfurn/coffeetable.lua @@ -49,6 +49,15 @@ minetest.register_node("lrfurn:coffeetable", { minetest.register_craft({ output = "lrfurn:coffeetable", + type = "shapeless", + recipe = { + "lrfurn:endtable", + "lrfurn:endtable" + } +}) + +minetest.register_craft({ + output = "lrfurn:coffeetable", recipe = { {"", "", "", }, {"stairs:slab_wood", "stairs:slab_wood", "stairs:slab_wood", }, diff --git a/pipeworks/autocrafter.lua b/pipeworks/autocrafter.lua index 7ddc312..5d554c1 100644 --- a/pipeworks/autocrafter.lua +++ b/pipeworks/autocrafter.lua @@ -407,7 +407,7 @@ minetest.register_craft( { output = "pipeworks:autocrafter 2", recipe = { { "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" }, - { "homedecor:plastic_sheeting", "default:steel_ingot", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheeting", "default:steel_ingot", "basic_materials:plastic_sheeting" }, { "default:steel_ingot", "default:mese_crystal", "default:steel_ingot" } }, }) diff --git a/pipeworks/crafts.lua b/pipeworks/crafts.lua index 2ee5710..9c02da8 100644 --- a/pipeworks/crafts.lua +++ b/pipeworks/crafts.lua @@ -85,88 +85,3 @@ minetest.register_craft( { { "pipeworks:pipe_1_empty" } }, }) - - --- Crafting recipes for pneumatic tubes - --- If homedecor is not installed, we need to register its crafting chain for --- plastic sheeting so that pipeworks remains compatible with it. - -if minetest.get_modpath("homedecor") == nil then - - minetest.register_craftitem(":homedecor:oil_extract", { - description = "Oil extract", - inventory_image = "homedecor_oil_extract.png", - }) - - minetest.register_craftitem(":homedecor:paraffin", { - description = "Unprocessed paraffin", - inventory_image = "homedecor_paraffin.png", - }) - - minetest.register_alias("homedecor:plastic_base", "homedecor:paraffin") - - minetest.register_craftitem(":homedecor:plastic_sheeting", { - description = "Plastic sheet", - inventory_image = "homedecor_plastic_sheeting.png", - }) - - minetest.register_craft({ - type = "shapeless", - output = "homedecor:oil_extract 4", - recipe = { - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves", - "group:leaves" - } - }) - - minetest.register_craft({ - type = "cooking", - output = "homedecor:paraffin", - recipe = "homedecor:oil_extract", - }) - - minetest.register_craft({ - type = "cooking", - output = "homedecor:plastic_sheeting", - recipe = "homedecor:paraffin", - }) - - minetest.register_craft({ - type = "fuel", - recipe = "homedecor:oil_extract", - burntime = 30, - }) - - minetest.register_craft({ - type = "fuel", - recipe = "homedecor:paraffin", - burntime = 30, - }) - - minetest.register_craft({ - type = "fuel", - recipe = "homedecor:plastic_sheeting", - burntime = 30, - }) -end - --- crafting items for creating node breakers -minetest.register_craftitem("pipeworks:gear", { - description = "Gear", - inventory_image = "pipeworks_gear.png", -}) - -minetest.register_craft( { - output = "pipeworks:gear 6", - recipe = { - { "", "default:steel_ingot", "" }, - { "default:steel_ingot","default:stone", "default:steel_ingot" }, - { "", "default:steel_ingot", "" } - }, -}) - diff --git a/pipeworks/depends.txt b/pipeworks/depends.txt index 0cb7406..97c9e30 100644 --- a/pipeworks/depends.txt +++ b/pipeworks/depends.txt @@ -1,4 +1,5 @@ default +basic_materials mesecons mesecons_mvps digilines? diff --git a/pipeworks/filter-injector.lua b/pipeworks/filter-injector.lua index cf1fc74..29fc1d3 100644 --- a/pipeworks/filter-injector.lua +++ b/pipeworks/filter-injector.lua @@ -473,18 +473,18 @@ end minetest.register_craft( { output = "pipeworks:filter 2", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" }, - { "group:stick", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "group:stick", "default:mese_crystal", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" } }, }) minetest.register_craft( { output = "pipeworks:mese_filter 2", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" }, - { "group:stick", "default:mese", "homedecor:plastic_sheeting" }, - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "group:stick", "default:mese", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" } }, }) @@ -492,9 +492,9 @@ if minetest.get_modpath("digilines") then minetest.register_craft( { output = "pipeworks:digiline_filter 2", recipe = { - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" }, - { "group:stick", "digilines:wire_std_00000000", "homedecor:plastic_sheeting" }, - { "default:steel_ingot", "default:steel_ingot", "homedecor:plastic_sheeting" } + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" }, + { "group:stick", "digilines:wire_std_00000000", "basic_materials:plastic_sheet" }, + { "default:steel_ingot", "default:steel_ingot", "basic_materials:plastic_sheet" } }, }) end diff --git a/pipeworks/routing_tubes.lua b/pipeworks/routing_tubes.lua index e2f1af4..45fcea8 100644 --- a/pipeworks/routing_tubes.lua +++ b/pipeworks/routing_tubes.lua @@ -4,9 +4,9 @@ pipeworks.register_tube("pipeworks:tube", "Pneumatic tube segment") minetest.register_craft( { output = "pipeworks:tube_1 6", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "", "", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) @@ -82,9 +82,9 @@ if pipeworks.enable_priority_tube then minetest.register_craft( { output = "pipeworks:priority_tube_1 6", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:gold_ingot", "", "default:gold_ingot" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end @@ -107,9 +107,9 @@ if pipeworks.enable_accelerator_tube then minetest.register_craft( { output = "pipeworks:accelerator_tube_1 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:mese_crystal_fragment", "default:steel_ingot", "default:mese_crystal_fragment" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end @@ -166,9 +166,9 @@ if pipeworks.enable_one_way_tube then minetest.register_craft({ output = "pipeworks:one_way_tube 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, - { "group:stick", "default:mese_crystal", "homedecor:plastic_sheeting" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, + { "group:stick", "default:mese_crystal", "basic_materials:plastic_sheet" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end diff --git a/pipeworks/signal_tubes.lua b/pipeworks/signal_tubes.lua index b955a16..7048ebb 100644 --- a/pipeworks/signal_tubes.lua +++ b/pipeworks/signal_tubes.lua @@ -60,9 +60,9 @@ if pipeworks.enable_detector_tube then minetest.register_craft( { output = "pipeworks:detector_tube_off_1 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "mesecons:mesecon", "mesecons_materials:silicon", "mesecons:mesecon" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end @@ -110,9 +110,9 @@ if digiline_enabled and pipeworks.enable_digiline_detector_tube then minetest.register_craft( { output = "pipeworks:digiline_detector_tube_1 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "digilines:wire_std_00000000", "mesecons_materials:silicon", "digilines:wire_std_00000000" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) end diff --git a/pipeworks/sorting_tubes.lua b/pipeworks/sorting_tubes.lua index e7e918d..76eec32 100644 --- a/pipeworks/sorting_tubes.lua +++ b/pipeworks/sorting_tubes.lua @@ -153,9 +153,9 @@ if pipeworks.enable_mese_tube then minetest.register_craft( { output = "pipeworks:mese_tube_000000 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "", "default:mese_crystal", "" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) diff --git a/pipeworks/teleport_tube.lua b/pipeworks/teleport_tube.lua index d707717..f4bad74 100644 --- a/pipeworks/teleport_tube.lua +++ b/pipeworks/teleport_tube.lua @@ -242,9 +242,9 @@ pipeworks.register_tube("pipeworks:teleport_tube", { minetest.register_craft( { output = "pipeworks:teleport_tube_1 2", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:desert_stone", "default:mese", "default:desert_stone" }, - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) diff --git a/pipeworks/trashcan.lua b/pipeworks/trashcan.lua index 8db9edf..f6dff50 100644 --- a/pipeworks/trashcan.lua +++ b/pipeworks/trashcan.lua @@ -43,7 +43,7 @@ minetest.register_node("pipeworks:trashcan", { minetest.register_craft({ output = "pipeworks:trashcan", recipe = { - { "homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + { "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, { "default:steel_ingot", "", "default:steel_ingot" }, { "default:steel_ingot", "default:steel_ingot", "default:steel_ingot" }, }, diff --git a/pipeworks/vacuum_tubes.lua b/pipeworks/vacuum_tubes.lua index d616835..c1e9fe0 100644 --- a/pipeworks/vacuum_tubes.lua +++ b/pipeworks/vacuum_tubes.lua @@ -12,9 +12,9 @@ if pipeworks.enable_sand_tube then minetest.register_craft( { output = "pipeworks:sand_tube_1 2", recipe = { - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"}, {"group:sand", "group:sand", "group:sand"}, - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"} + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet"} }, }) @@ -63,9 +63,9 @@ if pipeworks.enable_mese_sand_tube then minetest.register_craft( { output = "pipeworks:mese_sand_tube_1 2", recipe = { - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" }, + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }, {"group:sand", "default:mese_crystal", "group:sand" }, - {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting" } + {"basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" } }, }) diff --git a/signs_lib/depends.txt b/signs_lib/depends.txt index 7f4e061..6937007 100644 --- a/signs_lib/depends.txt +++ b/signs_lib/depends.txt @@ -1,4 +1,5 @@ default +basic_materials intllib? screwdriver? keyword_interact? diff --git a/signs_lib/init.lua b/signs_lib/init.lua index eb78b67..8e0d047 100644 --- a/signs_lib/init.lua +++ b/signs_lib/init.lua @@ -1098,7 +1098,7 @@ minetest.register_craft({ output = "locked_sign:sign_wall_locked", recipe = { {default_sign}, - {"default:steel_ingot"}, + {"basic_materials:padlock"}, }, }) diff --git a/stained_glass/init.lua b/stained_glass/init.lua index 9c0f7fc..c71b651 100644 --- a/stained_glass/init.lua +++ b/stained_glass/init.lua @@ -63,6 +63,7 @@ minetest.register_node("stained_glass:stained_glass", { minetest.override_item("moreblocks:super_glow_glass", { palette = "unifieddyes_palette_extended.png", + airbrush_replacement_node = "stained_glass:stained_glass", groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3, ud_param2_colorable = 1}, }) @@ -87,6 +88,7 @@ minetest.register_node("stained_glass:stained_trap_glass", { minetest.override_item("moreblocks:trap_super_glow_glass", { palette = "unifieddyes_palette_extended.png", + airbrush_replacement_node = "stained_glass:stained_trap_glass", groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, }) diff --git a/technic/crafts.lua b/technic/crafts.lua index 5d3ae04..7d51f29 100644 --- a/technic/crafts.lua +++ b/technic/crafts.lua @@ -38,6 +38,12 @@ if pipeworks.enable_teleport_tube then }) end +-- basic materials' brass ingot + +minetest.clear_craft({ + output = "basic_materials:brass_ingot", +}) + -- tubes crafting recipes minetest.register_craft({ @@ -71,44 +77,17 @@ minetest.register_craft({ output = 'technic:red_energy_crystal', recipe = { {'moreores:silver_ingot', 'technic:battery', 'dye:red'}, - {'technic:battery', 'default:diamondblock', 'technic:battery'}, + {'technic:battery', 'basic_materials:energy_crystal_simple', 'technic:battery'}, {'dye:red', 'technic:battery', 'moreores:silver_ingot'}, } }) minetest.register_craft({ - output = 'technic:fine_copper_wire 2', - recipe = { - {'', 'default:copper_ingot', ''}, - {'', 'default:copper_ingot', ''}, - {'', 'default:copper_ingot', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:fine_gold_wire 2', - recipe = { - {'', 'default:gold_ingot', ''}, - {'', 'default:gold_ingot', ''}, - {'', 'default:gold_ingot', ''}, - } -}) - -minetest.register_craft({ - output = 'technic:fine_silver_wire 2', - recipe = { - {'', 'moreores:silver_ingot', ''}, - {'', 'moreores:silver_ingot', ''}, - {'', 'moreores:silver_ingot', ''}, - } -}) - -minetest.register_craft({ output = 'technic:copper_coil 1', recipe = { - {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, {'technic:wrought_iron_ingot', '', 'technic:wrought_iron_ingot'}, - {'technic:fine_copper_wire', 'technic:wrought_iron_ingot', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:wrought_iron_ingot', 'basic_materials:copper_wire'}, } }) @@ -153,10 +132,11 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:control_logic_unit', recipe = { - {'', 'technic:fine_gold_wire', ''}, + {'', 'basic_materials:gold_wire', ''}, {'default:copper_ingot', 'technic:silicon_wafer', 'default:copper_ingot'}, {'', 'technic:chromium_ingot', ''}, - } + }, + replacements = { {"basic_materials:gold_wire", "basic_materials:empty_spool"}, }, }) minetest.register_craft({ @@ -179,7 +159,7 @@ minetest.register_craft({ output = "technic:machine_casing", recipe = { { "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, - { "technic:cast_iron_ingot", "technic:brass_ingot", "technic:cast_iron_ingot" }, + { "technic:cast_iron_ingot", "basic_materials:brass_ingot", "technic:cast_iron_ingot" }, { "technic:cast_iron_ingot", "technic:cast_iron_ingot", "technic:cast_iron_ingot" }, }, }) diff --git a/technic/depends.txt b/technic/depends.txt index 6b28f9f..1b76ab3 100644 --- a/technic/depends.txt +++ b/technic/depends.txt @@ -1,6 +1,7 @@ default pipeworks technic_worldgen +basic_materials bucket? screwdriver? mesecons? diff --git a/technic/items.lua b/technic/items.lua index a0edb96..d527c8b 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -69,22 +69,6 @@ minetest.register_tool("technic:red_energy_crystal", { } }) - -minetest.register_craftitem("technic:fine_copper_wire", { - description = S("Fine Copper Wire"), - inventory_image = "technic_fine_copper_wire.png", -}) - -minetest.register_craftitem("technic:fine_gold_wire", { - description = S("Fine Gold Wire"), - inventory_image = "technic_fine_gold_wire.png", -}) - -minetest.register_craftitem("technic:fine_silver_wire", { - description = S("Fine Silver Wire"), - inventory_image = "technic_fine_silver_wire.png", -}) - minetest.register_craftitem("technic:copper_coil", { description = S("Copper Coil"), inventory_image = "technic_copper_coil.png", diff --git a/technic/machines/LV/compressor.lua b/technic/machines/LV/compressor.lua index 67b9f79..c1a1d73 100644 --- a/technic/machines/LV/compressor.lua +++ b/technic/machines/LV/compressor.lua @@ -6,7 +6,7 @@ minetest.register_craft({ recipe = { {'default:stone', 'technic:motor', 'default:stone'}, {'mesecons:piston', 'technic:machine_casing', 'mesecons:piston'}, - {'technic:fine_silver_wire', 'technic:lv_cable', 'technic:fine_silver_wire'}, + {'basic_materials:silver_wire', 'technic:lv_cable', 'basic_materials:silver_wire'}, } }) diff --git a/technic/machines/LV/geothermal.lua b/technic/machines/LV/geothermal.lua index 27f4abc..1699a52 100644 --- a/technic/machines/LV/geothermal.lua +++ b/technic/machines/LV/geothermal.lua @@ -11,7 +11,7 @@ minetest.register_craft({ output = 'technic:geothermal', recipe = { {'technic:granite', 'default:diamond', 'technic:granite'}, - {'technic:fine_copper_wire', 'technic:machine_casing', 'technic:fine_copper_wire'}, + {'basic_materials:copper_wire', 'technic:machine_casing', 'basic_materials:copper_wire'}, {'technic:granite', 'technic:lv_cable', 'technic:granite'}, } }) diff --git a/technic/machines/LV/solar_panel.lua b/technic/machines/LV/solar_panel.lua index c072b13..6143fa9 100644 --- a/technic/machines/LV/solar_panel.lua +++ b/technic/machines/LV/solar_panel.lua @@ -9,9 +9,9 @@ minetest.register_craft({ output = 'technic:solar_panel', recipe = { {'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer', 'technic:doped_silicon_wafer'}, - {'technic:fine_silver_wire', 'technic:lv_cable', 'mesecons_materials:glue'}, - - } + {'basic_materials:silver_wire', 'technic:lv_cable', 'mesecons_materials:glue'}, + }, + replacements = { {"basic_materials:silver_wire", "basic_materials:empty_spool"}, }, }) diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua index d5c60a3..ab07d58 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -979,7 +979,7 @@ minetest.register_craft({ output = 'technic:frame_111111', recipe = { { '', 'default:stick', '' }, - { 'default:stick', 'technic:brass_ingot', 'default:stick' }, + { 'default:stick', 'basic_materials:brass_ingot', 'default:stick' }, { '', 'default:stick', '' }, } }) @@ -996,9 +996,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:template 10', recipe = { - { '', 'technic:brass_ingot', '' }, - { 'technic:brass_ingot', 'default:mese_crystal', 'technic:brass_ingot' }, - { '', 'technic:brass_ingot', '' }, + { '', 'basic_materials:brass_ingot', '' }, + { 'basic_materials:brass_ingot', 'default:mese_crystal', 'basic_materials:brass_ingot' }, + { '', 'basic_materials:brass_ingot', '' }, } }) diff --git a/technic/machines/register/alloy_recipes.lua b/technic/machines/register/alloy_recipes.lua index 3aeacd5..8731b8e 100644 --- a/technic/machines/register/alloy_recipes.lua +++ b/technic/machines/register/alloy_recipes.lua @@ -21,7 +21,7 @@ local recipes = { {"technic:carbon_steel_dust 3", "technic:chromium_dust", "technic:stainless_steel_dust 4"}, {"technic:carbon_steel_ingot 3", "technic:chromium_ingot", "technic:stainless_steel_ingot 4"}, {"technic:copper_dust 2", "technic:zinc_dust", "technic:brass_dust 3"}, - {"default:copper_ingot 2", "technic:zinc_ingot", "technic:brass_ingot 3"}, + {"default:copper_ingot 2", "technic:zinc_ingot", "basic_materials:brass_ingot 3"}, {"default:sand 2", "technic:coal_dust 2", "technic:silicon_wafer"}, {"technic:silicon_wafer", "technic:gold_dust", "technic:doped_silicon_wafer"}, -- from https://en.wikipedia.org/wiki/Carbon_black diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 8c8e178..da90aad 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -93,7 +93,7 @@ local function register_dust(name, ingot) end -- Sorted alphibeticaly -register_dust("Brass", "technic:brass_ingot") +register_dust("Brass", "basic_materials:brass_ingot") register_dust("Bronze", "default:bronze_ingot") register_dust("Carbon Steel", "technic:carbon_steel_ingot") register_dust("Cast Iron", "technic:cast_iron_ingot") diff --git a/technic/machines/supply_converter.lua b/technic/machines/supply_converter.lua index 9202c4a..6c520ca 100644 --- a/technic/machines/supply_converter.lua +++ b/technic/machines/supply_converter.lua @@ -201,7 +201,7 @@ minetest.register_node("technic:supply_converter", { minetest.register_craft({ output = 'technic:supply_converter 1', recipe = { - {'technic:fine_gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, + {'basic_materials:gold_wire', 'technic:rubber', 'technic:doped_silicon_wafer'}, {'technic:mv_transformer', 'technic:machine_casing', 'technic:lv_transformer'}, {'technic:mv_cable', 'technic:rubber', 'technic:lv_cable'}, } diff --git a/technic/radiation.lua b/technic/radiation.lua index a4c49c6..6e518d8 100644 --- a/technic/radiation.lua +++ b/technic/radiation.lua @@ -146,7 +146,7 @@ local rad_resistance_node = { ["moreores:mithril_block"] = 26, ["moreores:silver_block"] = 53, ["snow:snow_brick"] = 2.8, - ["technic:brass_block"] = 43, + ["basic_materials:brass_block"] = 43, ["technic:carbon_steel_block"] = 40, ["technic:cast_iron_block"] = 40, ["technic:chernobylite_block"] = 40, diff --git a/technic/textures/technic_fine_copper_wire.png b/technic/textures/technic_fine_copper_wire.png Binary files differdeleted file mode 100644 index 3e663bb..0000000 --- a/technic/textures/technic_fine_copper_wire.png +++ /dev/null diff --git a/technic/textures/technic_fine_gold_wire.png b/technic/textures/technic_fine_gold_wire.png Binary files differdeleted file mode 100644 index 54a7a52..0000000 --- a/technic/textures/technic_fine_gold_wire.png +++ /dev/null diff --git a/technic/textures/technic_fine_silver_wire.png b/technic/textures/technic_fine_silver_wire.png Binary files differdeleted file mode 100644 index f40a52b..0000000 --- a/technic/textures/technic_fine_silver_wire.png +++ /dev/null diff --git a/technic/tools/chainsaw.lua b/technic/tools/chainsaw.lua index 3653d2d..75e028c 100644 --- a/technic/tools/chainsaw.lua +++ b/technic/tools/chainsaw.lua @@ -363,7 +363,7 @@ minetest.register_craft({ output = "technic:chainsaw", recipe = { {"technic:stainless_steel_ingot", trigger, "technic:battery"}, - {"technic:fine_copper_wire", "technic:motor", "technic:battery"}, + {"basic_materials:copper_wire", "technic:motor", "technic:battery"}, {"", "", "technic:stainless_steel_ingot"}, } }) diff --git a/technic/tools/mining_lasers.lua b/technic/tools/mining_lasers.lua index 6015e5a..ba5a726 100644 --- a/technic/tools/mining_lasers.lua +++ b/technic/tools/mining_lasers.lua @@ -11,8 +11,8 @@ local S = technic.getter minetest.register_craft({ output = "technic:laser_mk1", recipe = { - {"default:diamond", "technic:brass_ingot", "default:obsidian_glass"}, - {"", "technic:brass_ingot", "technic:red_energy_crystal"}, + {"default:diamond", "basic_materials:brass_ingot", "default:obsidian_glass"}, + {"", "basic_materials:brass_ingot", "technic:red_energy_crystal"}, {"", "", "default:copper_ingot"}, } }) diff --git a/technic/tools/prospector.lua b/technic/tools/prospector.lua index b28f1d8..9a918a2 100644 --- a/technic/tools/prospector.lua +++ b/technic/tools/prospector.lua @@ -122,7 +122,7 @@ minetest.register_craft({ output = "technic:prospector", recipe = { {"moreores:pick_silver", "moreores:mithril_block", "pipeworks:teleport_tube_1"}, - {"technic:brass_ingot", "technic:control_logic_unit", "technic:brass_ingot"}, + {"basic_materials:brass_ingot", "technic:control_logic_unit", "basic_materials:brass_ingot"}, {"", "technic:blue_energy_crystal", ""}, } }) diff --git a/technic_chests/copper_chest.lua b/technic_chests/copper_chest.lua index d40284b..fda1db0 100644 --- a/technic_chests/copper_chest.lua +++ b/technic_chests/copper_chest.lua @@ -19,7 +19,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:copper_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:copper_chest'}, } }) diff --git a/technic_chests/depends.txt b/technic_chests/depends.txt index b9ca665..42876b0 100644 --- a/technic_chests/depends.txt +++ b/technic_chests/depends.txt @@ -1,4 +1,5 @@ default +basic_materials moreores? pipeworks? intllib? diff --git a/technic_chests/gold_chest.lua b/technic_chests/gold_chest.lua index c66b2f6..7a50b70 100644 --- a/technic_chests/gold_chest.lua +++ b/technic_chests/gold_chest.lua @@ -30,7 +30,7 @@ end minetest.register_craft({ output = 'technic:gold_locked_chest', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:gold_chest'}, } }) diff --git a/technic_chests/iron_chest.lua b/technic_chests/iron_chest.lua index 90434bb..237067b 100644 --- a/technic_chests/iron_chest.lua +++ b/technic_chests/iron_chest.lua @@ -26,7 +26,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'technic:iron_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:iron_chest'}, } }) diff --git a/technic_chests/mithril_chest.lua b/technic_chests/mithril_chest.lua index 909ff9e..05cbc40 100644 --- a/technic_chests/mithril_chest.lua +++ b/technic_chests/mithril_chest.lua @@ -21,7 +21,7 @@ end minetest.register_craft({ output = 'technic:mithril_locked_chest 1', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:mithril_chest'}, } }) diff --git a/technic_chests/silver_chest.lua b/technic_chests/silver_chest.lua index c615304..4de196d 100644 --- a/technic_chests/silver_chest.lua +++ b/technic_chests/silver_chest.lua @@ -21,7 +21,7 @@ end minetest.register_craft({ output = 'technic:silver_locked_chest', recipe = { - {'default:steel_ingot'}, + {'basic_materials:padlock'}, {'technic:silver_chest'}, } }) diff --git a/technic_worldgen/crafts.lua b/technic_worldgen/crafts.lua index fba9df9..0590e70 100644 --- a/technic_worldgen/crafts.lua +++ b/technic_worldgen/crafts.lua @@ -48,11 +48,6 @@ minetest.register_craftitem(":technic:sulfur_lump", { inventory_image = "technic_sulfur_lump.png", }) -minetest.register_craftitem(":technic:brass_ingot", { - description = S("Brass Ingot"), - inventory_image = "technic_brass_ingot.png", -}) - minetest.register_alias("technic:wrought_iron_ingot", "default:steel_ingot") minetest.override_item("default:steel_ingot", { @@ -97,7 +92,6 @@ register_block("technic:uranium_block", "technic:uranium_ingot") register_block("technic:chromium_block", "technic:chromium_ingot") register_block("technic:zinc_block", "technic:zinc_ingot") register_block("technic:lead_block", "technic:lead_ingot") -register_block("technic:brass_block", "technic:brass_ingot") register_block("technic:cast_iron_block", "technic:cast_iron_ingot") register_block("technic:carbon_steel_block", "technic:carbon_steel_ingot") register_block("technic:stainless_steel_block", "technic:stainless_steel_ingot") diff --git a/technic_worldgen/depends.txt b/technic_worldgen/depends.txt index ac858d0..6a92b7d 100644 --- a/technic_worldgen/depends.txt +++ b/technic_worldgen/depends.txt @@ -1,3 +1,9 @@ default +basic_materials intllib? mg? +doors? +farming? +glooptest? +mesecons_doors? +vessels? diff --git a/technic_worldgen/nodes.lua b/technic_worldgen/nodes.lua index f3a88e4..14b4eba 100644 --- a/technic_worldgen/nodes.lua +++ b/technic_worldgen/nodes.lua @@ -133,14 +133,6 @@ minetest.register_node(":technic:stainless_steel_block", { sounds = default.node_sound_stone_defaults() }) -minetest.register_node(":technic:brass_block", { - description = S("Brass Block"), - tiles = { "technic_brass_block.png" }, - is_ground_content = true, - groups = {cracky=1, level=2}, - sounds = default.node_sound_stone_defaults() -}) - minetest.register_craft({ output = 'technic:marble_bricks 4', recipe = { diff --git a/technic_worldgen/textures/technic_brass_block.png b/technic_worldgen/textures/technic_brass_block.png Binary files differdeleted file mode 100644 index bc6fe78..0000000 --- a/technic_worldgen/textures/technic_brass_block.png +++ /dev/null diff --git a/technic_worldgen/textures/technic_brass_ingot.png b/technic_worldgen/textures/technic_brass_ingot.png Binary files differdeleted file mode 100644 index 06056e7..0000000 --- a/technic_worldgen/textures/technic_brass_ingot.png +++ /dev/null |