diff --git a/.gitignore b/.gitignore index 33e619c..9623115 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,22 @@ build/ out/ classes/ +legacy/.gradle/ +legacy/build/ +legacy/out/ +legacy/classes/ + +MC1.20.6/.gradle/ +MC1.20.6/build/ +MC1.20.6/out/ +MC1.20.6/classes/ + +MC1.20.6/run/ + + # Quilt Loom -remappedSrc/ -run/ +legacy/remappedSrc/ +legacy/run/ # Eclipse *.launch diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..7b6bec5 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,841 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/MC1.20.6/build.gradle.kts b/MC1.20.6/build.gradle.kts new file mode 100644 index 0000000..7d6ef3c --- /dev/null +++ b/MC1.20.6/build.gradle.kts @@ -0,0 +1,77 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + java + id("org.jetbrains.kotlin.jvm") version "2.1.0" + id("fabric-loom") version "1.9-SNAPSHOT" + id("maven-publish") +} + +version = project.property("mod_version") as String +group = project.property("maven_group") as String +/* +base { + archivesName.set(project.property("archives_base_name") as String) +}*/ + +val targetJavaVersion = 21 +java { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft("com.mojang:minecraft:1.20.6") + mappings("net.fabricmc:yarn:${project.property("yarn_mappings")}:v2") + modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}") + modImplementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}") + modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") +} + +tasks.processResources { + inputs.property("version", project.version) + inputs.property("minecraft_version", "1.20.6") + inputs.property("loader_version", project.property("loader_version")) + filteringCharset = "UTF-8" + + filesMatching("fabric.mod.json") { + expand( + "version" to project.version, + "minecraft_version" to "1.20.6", + "loader_version" to project.property("loader_version"), + "kotlin_loader_version" to project.property("kotlin_loader_version"), + ) + } +} + +tasks.withType().configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + options.encoding = "UTF-8" + options.release.set(targetJavaVersion) +} + +tasks.withType().configureEach { + compilerOptions.jvmTarget.set(JvmTarget.fromTarget(targetJavaVersion.toString())) +} + +tasks.jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName}" } + } +} diff --git a/MC1.20.6/gradle.properties b/MC1.20.6/gradle.properties new file mode 100644 index 0000000..811eb32 --- /dev/null +++ b/MC1.20.6/gradle.properties @@ -0,0 +1,18 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://modmuss50.me/fabric.html + minecraft_version=1.20.6 + yarn_mappings=1.20.6+build.3 + loader_version=0.16.9 + kotlin_loader_version=1.13.0+kotlin.2.1.0 + +# Mod Properties + mod_version = 0.0.1-DEV + maven_group = observer.nelle + archives_base_name = roses_mod + +# Dependencies + # check this on https://modmuss50.me/fabric.html + fabric_version=0.100.8+1.20.6 diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesBlocks.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesBlocks.kt new file mode 100644 index 0000000..1960bbb --- /dev/null +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesBlocks.kt @@ -0,0 +1,50 @@ +@file:Suppress( + "ktlint:standard:class-naming", + "ktlint:standard:filename", + "ktlint:standard:no-wildcard-imports", + "ktlint:standard:package-name", +) + +package observer.nelle.roses_mod + +import net.minecraft.block.AbstractBlock +import net.minecraft.block.Block +import net.minecraft.block.Blocks +import net.minecraft.block.FlowerBlock +import net.minecraft.entity.effect.StatusEffects +import net.minecraft.item.BlockItem +import net.minecraft.item.Item +import net.minecraft.registry.Registries +import net.minecraft.registry.Registry +import net.minecraft.util.Identifier + +class RosesBlocks { + val roseFlower: Block? = + register( + FlowerBlock( + StatusEffects.INSTANT_DAMAGE, + 6F, + AbstractBlock.Settings.copy(Blocks.POPPY), + ), + "rose_flower", + true, + ) + + fun register( + block: Block?, + name: String?, + shouldRegisterItem: Boolean, + ): Block? { + // Register the block and its item. + val id: Identifier? = Identifier.of(MOD_ID, name) + + // Sometimes, you may not want to register an item for the block. + // Eg: if it's a technical block like `minecraft:air` or `minecraft:end_gateway` + if (shouldRegisterItem) { + val blockItem = BlockItem(block, Item.Settings()) + Registry.register(Registries.ITEM, id, blockItem) + } + + return Registry.register(Registries.BLOCK, id, block) + } +} diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesMod.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesMod.kt new file mode 100644 index 0000000..97d2584 --- /dev/null +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesMod.kt @@ -0,0 +1,30 @@ +@file:Suppress( + "ktlint:standard:class-naming", + "ktlint:standard:filename", + "ktlint:standard:no-wildcard-imports", + "ktlint:standard:package-name", +) + +package observer.nelle.roses_mod + +import net.fabricmc.api.ModInitializer +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +val LOGGER: Logger = LoggerFactory.getLogger("roses") +const val MOD_ID = "roses_mod" + +class roses_mod : ModInitializer { + override fun onInitialize() { + LOGGER.info("just like old times?") + + /* TODO: + * - blocks/items + * - register worldgen + * - biome modification + * - creative tabs + * */ + + RosesBlocks() + } +} diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/RosesModClient.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/RosesModClient.kt new file mode 100644 index 0000000..b1f5a13 --- /dev/null +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/RosesModClient.kt @@ -0,0 +1,14 @@ +@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") + +package observer.nelle.roses_mod.client + +import net.fabricmc.api.ClientModInitializer +import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap +import net.minecraft.client.render.RenderLayer +import observer.nelle.roses_mod.RosesBlocks + +class RosesModClient : ClientModInitializer { + override fun onInitializeClient() { + BlockRenderLayerMap.INSTANCE.putBlock(RosesBlocks().roseFlower, RenderLayer.getCutout()) + } +} diff --git a/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json b/MC1.20.6/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json similarity index 100% rename from src/main/resources/assets/roses_mod/blockstates/cyan_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json diff --git a/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json b/MC1.20.6/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json similarity index 100% rename from src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json diff --git a/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json b/MC1.20.6/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json similarity index 100% rename from src/main/resources/assets/roses_mod/blockstates/potted_cyan.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json diff --git a/src/main/resources/assets/roses_mod/blockstates/potted_rose.json b/MC1.20.6/src/main/resources/assets/roses_mod/blockstates/potted_rose.json similarity index 100% rename from src/main/resources/assets/roses_mod/blockstates/potted_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/potted_rose.json diff --git a/src/main/resources/assets/roses_mod/blockstates/rose_flower.json b/MC1.20.6/src/main/resources/assets/roses_mod/blockstates/rose_flower.json similarity index 100% rename from src/main/resources/assets/roses_mod/blockstates/rose_flower.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/rose_flower.json diff --git a/src/main/resources/assets/roses_mod/icon.png b/MC1.20.6/src/main/resources/assets/roses_mod/icon.png similarity index 100% rename from src/main/resources/assets/roses_mod/icon.png rename to MC1.20.6/src/main/resources/assets/roses_mod/icon.png diff --git a/src/main/resources/assets/roses_mod/lang/en_us.json b/MC1.20.6/src/main/resources/assets/roses_mod/lang/en_us.json similarity index 100% rename from src/main/resources/assets/roses_mod/lang/en_us.json rename to MC1.20.6/src/main/resources/assets/roses_mod/lang/en_us.json diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/block/cyan_rose.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/block/cyan_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/block/cyan_rose.json diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json diff --git a/src/main/resources/assets/roses_mod/models/block/potted_cyan.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/block/potted_cyan.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/block/potted_cyan.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/block/potted_cyan.json diff --git a/src/main/resources/assets/roses_mod/models/block/potted_rose.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/block/potted_rose.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/block/potted_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/block/potted_rose.json diff --git a/src/main/resources/assets/roses_mod/models/block/rose_flower.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/block/rose_flower.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/block/rose_flower.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/block/rose_flower.json diff --git a/src/main/resources/assets/roses_mod/models/item/cyan_rose.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/item/cyan_rose.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/item/cyan_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/item/cyan_rose.json diff --git a/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json diff --git a/src/main/resources/assets/roses_mod/models/item/rose_flower.json b/MC1.20.6/src/main/resources/assets/roses_mod/models/item/rose_flower.json similarity index 100% rename from src/main/resources/assets/roses_mod/models/item/rose_flower.json rename to MC1.20.6/src/main/resources/assets/roses_mod/models/item/rose_flower.json diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png b/MC1.20.6/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png similarity index 100% rename from src/main/resources/assets/roses_mod/textures/block/cyan_rose.png rename to MC1.20.6/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png b/MC1.20.6/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png similarity index 100% rename from src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png rename to MC1.20.6/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png b/MC1.20.6/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png similarity index 100% rename from src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png rename to MC1.20.6/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png diff --git a/src/main/resources/assets/roses_mod/textures/block/rose_flower.png b/MC1.20.6/src/main/resources/assets/roses_mod/textures/block/rose_flower.png similarity index 100% rename from src/main/resources/assets/roses_mod/textures/block/rose_flower.png rename to MC1.20.6/src/main/resources/assets/roses_mod/textures/block/rose_flower.png diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..4fb9c11 --- /dev/null +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -0,0 +1,37 @@ +{ + "schemaVersion": 1, + "id": "roses_mod", + "version": "${version}", + + "name": "Roses Mod", + "description": "Reinstates the classic roses to Minecraft.", + "authors": [ + "nellePoint" + ], + "contact": { + "homepage": "https://modrinth.com/mod/roses-mod", + "issues": "https://git.nullafati.xyz/limepotato/roses-mod/issues", + "sources": "https://git.nullafati.xyz/limepotato/roses-mod" + }, + + "license": "LGPL-3.0", + "icon": "assets/roses_mod/icon.png", + + "environment": "*", + "entrypoints": { + "client": [ + "observer.nelle.roses_mod.client.RosesModClient" + ], + "main": ["observer.nelle.roses_mod.roses_mod"] + }, + + "mixins": [ + ], + + "depends": { + "fabricloader": ">=${loader_version}", + "fabric-language-kotlin": ">=${kotlin_loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +} diff --git a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/MC1.20.6/src/main/resources/ignore/data/minecraft/tags/blocks/flower_pots.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/flower_pots.json rename to MC1.20.6/src/main/resources/ignore/data/minecraft/tags/blocks/flower_pots.json diff --git a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/MC1.20.6/src/main/resources/ignore/data/minecraft/tags/blocks/small_flowers.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/small_flowers.json rename to MC1.20.6/src/main/resources/ignore/data/minecraft/tags/blocks/small_flowers.json diff --git a/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/MC1.20.6/src/main/resources/ignore/data/minecraft/tags/blocks/tall_flowers.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/tall_flowers.json rename to MC1.20.6/src/main/resources/ignore/data/minecraft/tags/blocks/tall_flowers.json diff --git a/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/loot_tables/blocks/cyan_rose.json similarity index 100% rename from src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/loot_tables/blocks/cyan_rose.json diff --git a/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json similarity index 100% rename from src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json diff --git a/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/loot_tables/blocks/rose_flower.json similarity index 100% rename from src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/loot_tables/blocks/rose_flower.json diff --git a/src/main/resources/data/roses_mod/recipes/cyan_dye.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/recipes/cyan_dye.json similarity index 100% rename from src/main/resources/data/roses_mod/recipes/cyan_dye.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/recipes/cyan_dye.json diff --git a/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/recipes/cyan_rose_bush.json similarity index 100% rename from src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/recipes/cyan_rose_bush.json diff --git a/src/main/resources/data/roses_mod/recipes/red_dye.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/recipes/red_dye.json similarity index 100% rename from src/main/resources/data/roses_mod/recipes/red_dye.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/recipes/red_dye.json diff --git a/src/main/resources/data/roses_mod/recipes/rose_bush.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/recipes/rose_bush.json similarity index 100% rename from src/main/resources/data/roses_mod/recipes/rose_bush.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/recipes/rose_bush.json diff --git a/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json similarity index 100% rename from src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json diff --git a/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json similarity index 100% rename from src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json diff --git a/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/configured_feature/rose_flower.json similarity index 100% rename from src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/configured_feature/rose_flower.json diff --git a/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json similarity index 100% rename from src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json diff --git a/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json similarity index 100% rename from src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json diff --git a/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json b/MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/placed_feature/rose_flower.json similarity index 100% rename from src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json rename to MC1.20.6/src/main/resources/ignore/data/roses_mod/worldgen/placed_feature/rose_flower.json diff --git a/README.md b/README.md index 15958bd..d600412 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,23 @@ -# Roses Mod -## ![GitHub](https://img.shields.io/github/license/LimePotato/roses-mod) -Since 3.0.0 I've been doing SemVer Correctly lol. +# roses_mod -## Requires [Quilt Standard Libraries/Quilted Fabric API!](https://modrinth.com/mod/qsl) +This project uses [Gradle](https://gradle.org/). +To build and run the application, use the *Gradle* tool window by clicking the Gradle icon in the right-hand toolbar, +or run it directly from the terminal: -This mod brings back the classic roses and other classic flowers to minecraft, without replacing any newer flower types. +* Run `./gradlew run` to build and run the application. +* Run `./gradlew build` to only build the application. +* Run `./gradlew check` to run all checks, including tests. +* Run `./gradlew clean` to clean all build outputs. -Features: -- Roses and Potted Roses -- Rose Bushes drop roses -- 2x2 Roses in a crafting table will output a rose bush -- Cyan Flowers -- Bees can pollinate all flowers +Note the usage of the Gradle Wrapper (`./gradlew`). +This is the suggested way to use Gradle in production projects. -[Licensed under CC BY-NC-SA 4.0](./LICENSE) +[Learn more about the Gradle Wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html). + +[Learn more about Gradle tasks](https://docs.gradle.org/current/userguide/command_line_interface.html#common_tasks). + +This project follows the suggested multi-module setup and consists of the `app` and `utils` subprojects. +The shared build logic was extracted to a convention plugin located in `buildSrc`. + +This project uses a version catalog (see `gradle/libs.versions.toml`) to declare and version dependencies +and both a build cache and a configuration cache (see `gradle.properties`). \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6570383..05eb8b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,9 @@ -# Gradle Properties +# Enable the build cache to save time by reusing outputs produced by other successful builds. +# https://docs.gradle.org/current/userguide/build_cache.html +org.gradle.caching=true +# Enable the configuration cache to reuse the build configuration and enable parallel task execution. +# (Note that some plugins may not yet be compatible with the configuration cache.) +# https://docs.gradle.org/current/userguide/configuration_cache.html +org.gradle.configuration-cache=false + org.gradle.jvmargs = -Xmx1G -org.gradle.parallel = true - -# Mod Properties -version = 1.1.0 -maven_group = observer.nelle -archives_base_name = roses_mod - -# Modrinth Metadata -modrinth_slug= roses-mod -modrinth_id= Hxo4BmMk -modrinth_game_versions= 1.20.6 -modrinth_mod_loaders= quilt - -# Dependencies are managed at gradle/libs.versions.toml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8c755f6..bb3073f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,24 +1,24 @@ +# Version catalog is a central place for you to declare and version dependencies +# https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + [versions] -# The latest versions are available at https://quiltmc.org/en/usage/latest-versionsminecraft -minecraft = "1.20.6" -quilt_mappings = "1.20.6+build.6" - -quilt_loom = "1.7.4" -quilt_loader = "0.26.3" - -quilted_fabric_api = "10.0.0-alpha.3+0.100.4-1.20.6" +kotlin = "2.0.21" +kotlinxDatetime = "0.6.1" +kotlinxSerializationJSON = "1.7.2" +kotlinxCoroutines = "1.8.1" [libraries] -minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } -quilt_mappings = { module = "org.quiltmc:quilt-mappings", version.ref = "quilt_mappings" } -quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" } +kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +kotlinxDatetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" } +kotlinxSerialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJSON" } +kotlinxCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } -quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" } -quilted_fabric_api_deprecated = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated", version.ref = "quilted_fabric_api" } -# If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example". +# Libraries can be bundled together for easier import [bundles] -quilted_fabric_api = ["quilted_fabric_api", "quilted_fabric_api_deprecated"] +kotlinxEcosystem = ["kotlinxDatetime", "kotlinxSerialization", "kotlinxCoroutines"] + [plugins] -quilt_loom = { id = "org.quiltmc.loom", version = "1.2.+" } +kotlinPluginSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 943f0cb..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..2a54bcd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +#Wed Dec 18 18:56:42 MST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip -networkTimeout=10000 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,11 +80,11 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,16 +143,12 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -209,12 +205,6 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,8 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/build.gradle b/legacy/build.gradle similarity index 75% rename from build.gradle rename to legacy/build.gradle index 4a990b3..f64bf6c 100644 --- a/build.gradle +++ b/legacy/build.gradle @@ -1,7 +1,7 @@ plugins { id "com.modrinth.minotaur" version "2.+" id 'maven-publish' - alias libs.plugins.quilt.loom + id "org.quiltmc.loom" version "1.2.+" } archivesBaseName = project.archives_base_name @@ -19,21 +19,11 @@ repositories { // All the dependencies are declared at gradle/libs.version.toml and referenced with "libs." // See https://docs.gradle.org/current/userguide/platforms.html for information on how version catalogs work. dependencies { - minecraft libs.minecraft - mappings variantOf(libs.quilt.mappings) { classifier 'intermediary-v2' } - // Replace the above line with the block below if you want to use Mojang mappings as your primary mappings, falling back on QM for parameters and Javadocs - /* - mappings loom.layered { - mappings "org.quiltmc:quilt-mappings:${libs.versions.quilt.mappings.get()}:intermediary-v2" - officialMojangMappings() - } - */ - modImplementation libs.quilt.loader - - // QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps. - // Quilted Fabric API will automatically pull in the correct QSL version. - modImplementation libs.quilted.fabric.api - // modImplementation libs.bundles.quilted.fabric.api // If you wish to use Fabric API's deprecated modules, you can replace the above line with this one + minecraft("com.mojang:minecraft:1.20.6") + mappings("org.quiltmc:quilt-mappings:1.20.6+build.6:intermediary-v2") + modImplementation("org.quiltmc:quilt-loader:0.26.3") + modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:10.0.0-alpha.3+0.100.4-1.20.6") + // modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api-deprecated:quilted-fabric-api:10.0.0-alpha.3+0.100.4-1.20.6") // If you wish to use Fabric API's deprecated modules, you can replace the above line with this one } processResources { @@ -47,13 +37,13 @@ processResources { tasks.withType(JavaCompile).configureEach { it.options.encoding = 'UTF-8' // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 + it.options.release = 21 } java { // Still required by IDEs such as Eclipse and Visual Studio Code - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task if it is present. // If you remove this line, sources will not be generated. @@ -72,7 +62,7 @@ jar { } //modrinth -import com.modrinth.minotaur.dependencies.ModDependency + tasks.modrinth.dependsOn(tasks.modrinthSyncBody) modrinth { @@ -91,7 +81,7 @@ modrinth { required.project "qsl" // Creates a new required dependency on Fabric API optional.project "modmenu"//, "mc1.19.3-0.4.8" // Creates a new optional dependency on this specific version of Sodium } - syncBodyFrom = rootProject.file("README.md").text + syncBodyFrom = file("../README.md").text } diff --git a/legacy/gradle.properties b/legacy/gradle.properties new file mode 100644 index 0000000..6570383 --- /dev/null +++ b/legacy/gradle.properties @@ -0,0 +1,16 @@ +# Gradle Properties +org.gradle.jvmargs = -Xmx1G +org.gradle.parallel = true + +# Mod Properties +version = 1.1.0 +maven_group = observer.nelle +archives_base_name = roses_mod + +# Modrinth Metadata +modrinth_slug= roses-mod +modrinth_id= Hxo4BmMk +modrinth_game_versions= 1.20.6 +modrinth_mod_loaders= quilt + +# Dependencies are managed at gradle/libs.versions.toml diff --git a/settings.gradle b/legacy/settings.gradle similarity index 100% rename from settings.gradle rename to legacy/settings.gradle diff --git a/src/main/java/observer/nelle/roses_mod/RosesMod.java b/legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java similarity index 56% rename from src/main/java/observer/nelle/roses_mod/RosesMod.java rename to legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java index 87dd475..3b5ce9e 100644 --- a/src/main/java/observer/nelle/roses_mod/RosesMod.java +++ b/legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java @@ -1,29 +1,23 @@ package observer.nelle.roses_mod; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.biome.v1.BiomeModifications; +import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; import net.minecraft.item.ItemGroups; import net.minecraft.item.Items; -import net.minecraft.loot.LootPool; -import net.minecraft.loot.entry.ItemEntry; -import net.minecraft.loot.provider.number.ConstantLootNumberProvider; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; import net.minecraft.world.gen.GenerationStep; -import org.quiltmc.loader.api.ModContainer; -import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; -import org.quiltmc.qsl.block.extensions.api.QuiltBlockSettings; -import org.quiltmc.qsl.item.setting.api.QuiltItemSettings; -import org.quiltmc.qsl.worldgen.biome.api.BiomeModifications; -import org.quiltmc.qsl.worldgen.biome.api.BiomeSelectors; +import observer.nelle.roses_mod.world.gen.ModFlowerGeneration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import observer.nelle.roses_mod.world.gen.ModFlowerGeneration; - import static observer.nelle.roses_mod.world.gen.ModFlowerGeneration.*; @@ -32,17 +26,16 @@ public class RosesMod implements ModInitializer { public static final Logger LOGGER = LoggerFactory.getLogger("Roses Mod"); //ROSE - public static final Block ROSE_FLOWER = new FlowerBlock(StatusEffects.INSTANT_DAMAGE, 6, QuiltBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); - public static final Block POTTED_ROSE = new FlowerPotBlock(ROSE_FLOWER, QuiltBlockSettings.copyOf(Blocks.POTTED_POPPY)); + public static final Block ROSE_FLOWER = new FlowerBlock(StatusEffects.INSTANT_DAMAGE, 6, FabricBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); + public static final Block POTTED_ROSE = new FlowerPotBlock(ROSE_FLOWER, FabricBlockSettings.copyOf(Blocks.POTTED_POPPY)); //Cyan Rose - public static final Block CYAN_ROSE = new FlowerBlock(StatusEffects.INSTANT_HEALTH, 6, QuiltBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); - public static final Block POTTED_CYAN = new FlowerPotBlock(CYAN_ROSE, QuiltBlockSettings.copyOf(Blocks.POTTED_POPPY)); + public static final Block CYAN_ROSE = new FlowerBlock(StatusEffects.INSTANT_HEALTH, 6, FabricBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); + public static final Block POTTED_CYAN = new FlowerPotBlock(CYAN_ROSE, FabricBlockSettings.copyOf(Blocks.POTTED_POPPY)); //Cyan Rose Bush - public static final Block CYAN_ROSE_BUSH = new TallPlantBlock(QuiltBlockSettings.copyOf(Blocks.LARGE_FERN)); - + public static final Block CYAN_ROSE_BUSH = new TallPlantBlock(FabricBlockSettings.copyOf(Blocks.LARGE_FERN)); @Override - public void onInitialize(ModContainer mod) { + public void onInitialize() { //REGISTER WORLDGEN ModFlowerGeneration.generateFlowers(); @@ -54,18 +47,18 @@ public class RosesMod implements ModInitializer { //REGISTER BLOCKS AND BLOCK ITEMS //ROSE FLOWER - Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "rose_flower"), ROSE_FLOWER); - Registry.register(Registries.ITEM, new Identifier(MOD_ID, "rose_flower"), new BlockItem(ROSE_FLOWER, new QuiltItemSettings())); - //POTTED ROSE FLOWER - Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "potted_rose"), POTTED_ROSE); + Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "rose_flower"), ROSE_FLOWER); + Registry.register(Registries.ITEM, new Identifier(MOD_ID, "rose_flower"), new BlockItem(ROSE_FLOWER, new Item.Settings())); + //POTTED ROSE FLOWER + Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "potted_rose"), POTTED_ROSE); //CYAN ROSE - Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "cyan_rose"), CYAN_ROSE); - Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose"), new BlockItem(CYAN_ROSE, new QuiltItemSettings())); - //POTTED CYAN ROSE - Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "potted_cyan"), POTTED_CYAN); + Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "cyan_rose"), CYAN_ROSE); + Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose"), new BlockItem(CYAN_ROSE, new Item.Settings())); + //POTTED CYAN ROSE + Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "potted_cyan"), POTTED_CYAN); //CYAN ROSE BUSH - Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "cyan_rose_bush"), CYAN_ROSE_BUSH); - Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose_bush"), new BlockItem(CYAN_ROSE_BUSH, new QuiltItemSettings())); + Registry.register(Registries.BLOCK, new Identifier(MOD_ID, "cyan_rose_bush"), CYAN_ROSE_BUSH); + Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose_bush"), new BlockItem(CYAN_ROSE_BUSH, new Item.Settings())); //CREATIVE TABS @@ -74,19 +67,19 @@ public class RosesMod implements ModInitializer { ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.ROSE_BUSH, CYAN_ROSE_BUSH)); + /* TODO: Uncomment and update //LOOT TABLES - final Identifier ROSE_BUSH_LOOT_TABLE_ID = Blocks.ROSE_BUSH.getLootTableId(); + final RegistryKey ROSE_BUSH_LOOT_TABLE_ID = Blocks.ROSE_BUSH.getLootTableId(); LootTableEvents.MODIFY.register((resourceManager, lootManager, id, tableBuilder, source) -> { if (source.isBuiltin() && ROSE_BUSH_LOOT_TABLE_ID.equals(id)) { LootPool.Builder poolBuilder = LootPool.builder().rolls(ConstantLootNumberProvider.create(3)).with(ItemEntry.builder(RosesMod.ROSE_FLOWER)); tableBuilder.pool(poolBuilder); } - }); + });*/ //INIT LOGGER.info("Let that prickly nostalgia in."); } - } diff --git a/src/main/java/observer/nelle/roses_mod/RosesModClient.java b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java similarity index 63% rename from src/main/java/observer/nelle/roses_mod/RosesModClient.java rename to legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java index 0ade281..0714f52 100644 --- a/src/main/java/observer/nelle/roses_mod/RosesModClient.java +++ b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java @@ -1,15 +1,11 @@ package observer.nelle.roses_mod; - -import org.quiltmc.qsl.block.extensions.api.client.*; -import net.minecraft.client.render.RenderLayer; -import org.quiltmc.loader.api.ModContainer; -import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer; +import net.fabricmc.api.ClientModInitializer; public class RosesModClient implements ClientModInitializer { - public void onInitializeClient(ModContainer mod) { - //ROSE FLOWER + public void onInitializeClient() {//ROSE FLOWER + /* BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_ROSE); BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.ROSE_FLOWER); @@ -19,5 +15,7 @@ public class RosesModClient implements ClientModInitializer { //CYAN ROSE BUSH BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE_BUSH); - } + + */} + } diff --git a/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java b/legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java similarity index 100% rename from src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java rename to legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java diff --git a/LICENSE b/legacy/src/main/resources/LICENSE similarity index 100% rename from LICENSE rename to legacy/src/main/resources/LICENSE diff --git a/legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json b/legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json new file mode 100644 index 0000000..6be127f --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/cyan_rose"} + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json b/legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json new file mode 100644 index 0000000..eaf06c4 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "roses_mod:block/cyan_rose_bush_bottom" + }, + "half=upper": { + "model": "roses_mod:block/cyan_rose_bush_top" + } + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json b/legacy/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json new file mode 100644 index 0000000..dedd97a --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_cyan"} + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/blockstates/potted_rose.json b/legacy/src/main/resources/assets/roses_mod/blockstates/potted_rose.json new file mode 100644 index 0000000..4f5619d --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/blockstates/potted_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_rose"} + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/blockstates/rose_flower.json b/legacy/src/main/resources/assets/roses_mod/blockstates/rose_flower.json new file mode 100644 index 0000000..66aeb91 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/blockstates/rose_flower.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/rose_flower"} + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/icon.png b/legacy/src/main/resources/assets/roses_mod/icon.png new file mode 100644 index 0000000..38fcde9 Binary files /dev/null and b/legacy/src/main/resources/assets/roses_mod/icon.png differ diff --git a/legacy/src/main/resources/assets/roses_mod/lang/en_us.json b/legacy/src/main/resources/assets/roses_mod/lang/en_us.json new file mode 100644 index 0000000..3c022ca --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/lang/en_us.json @@ -0,0 +1,7 @@ +{ + "block.roses_mod.rose_flower": "Rose", + "block.roses_mod.potted_rose": "Potted Rose", + "block.roses_mod.cyan_rose": "Cyan Rose", + "block.roses_mod.potted_cyan": "Potted Cyan Rose", + "block.roses_mod.cyan_rose_bush": "Cyan Rose Bush" +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose.json b/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose.json new file mode 100644 index 0000000..4b02866 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json b/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json new file mode 100644 index 0000000..95d7c86 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose_bush_bottom" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json b/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json new file mode 100644 index 0000000..24e8cb0 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose_bush_top" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/block/potted_cyan.json b/legacy/src/main/resources/assets/roses_mod/models/block/potted_cyan.json new file mode 100644 index 0000000..8626450 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/block/potted_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "roses_mod:block/cyan_rose" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/block/potted_rose.json b/legacy/src/main/resources/assets/roses_mod/models/block/potted_rose.json new file mode 100644 index 0000000..fe3887b --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/block/potted_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "roses_mod:block/rose_flower" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/block/rose_flower.json b/legacy/src/main/resources/assets/roses_mod/models/block/rose_flower.json new file mode 100644 index 0000000..ba4e661 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/block/rose_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/rose_flower" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose.json b/legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose.json new file mode 100644 index 0000000..90d07d1 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "roses_mod:block/cyan_rose" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json b/legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json new file mode 100644 index 0000000..423fb79 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "roses_mod:block/cyan_rose_bush_top" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/models/item/rose_flower.json b/legacy/src/main/resources/assets/roses_mod/models/item/rose_flower.json new file mode 100644 index 0000000..11dc496 --- /dev/null +++ b/legacy/src/main/resources/assets/roses_mod/models/item/rose_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "roses_mod:block/rose_flower" + } +} diff --git a/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png b/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png new file mode 100644 index 0000000..b466404 Binary files /dev/null and b/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png differ diff --git a/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png b/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png new file mode 100644 index 0000000..882a660 Binary files /dev/null and b/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png differ diff --git a/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png b/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png new file mode 100644 index 0000000..cfe9caa Binary files /dev/null and b/legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png differ diff --git a/legacy/src/main/resources/assets/roses_mod/textures/block/rose_flower.png b/legacy/src/main/resources/assets/roses_mod/textures/block/rose_flower.png new file mode 100644 index 0000000..51d9847 Binary files /dev/null and b/legacy/src/main/resources/assets/roses_mod/textures/block/rose_flower.png differ diff --git a/legacy/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/legacy/src/main/resources/data/minecraft/tags/blocks/flower_pots.json new file mode 100644 index 0000000..6ca60b7 --- /dev/null +++ b/legacy/src/main/resources/data/minecraft/tags/blocks/flower_pots.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "roses_mod:potted_rose", + "roses_mod:cyan_rose" + ] +} diff --git a/legacy/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/legacy/src/main/resources/data/minecraft/tags/blocks/small_flowers.json new file mode 100644 index 0000000..fdecf80 --- /dev/null +++ b/legacy/src/main/resources/data/minecraft/tags/blocks/small_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "roses_mod:rose_flower", + "roses_mod:cyan_rose" + ] +} diff --git a/legacy/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/legacy/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/legacy/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "roses_mod:cyan_rose_bush" + ] +} diff --git a/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json b/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json new file mode 100644 index 0000000..308ea91 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:cyan_rose" + } + ] + } + ] +} diff --git a/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json new file mode 100644 index 0000000..9e19db2 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:cyan_rose" + } + ] + } + ] +} diff --git a/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json b/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json new file mode 100644 index 0000000..e015922 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:rose_flower" + } + ] + } + ] +} diff --git a/legacy/src/main/resources/data/roses_mod/recipes/cyan_dye.json b/legacy/src/main/resources/data/roses_mod/recipes/cyan_dye.json new file mode 100644 index 0000000..6994a61 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/recipes/cyan_dye.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + [ + { + "item": "roses_mod:cyan_rose_bush" + }, + { + "item": "roses_mod:cyan_rose" + } + ] + ], + "result": { + "item": "minecraft:cyan_dye", + "count": 2 + } +} diff --git a/legacy/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json b/legacy/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json new file mode 100644 index 0000000..20a5789 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " WW", + " WW" + ], + "key": { + "W": { + "item": "roses_mod:cyan_rose" + } + }, + "result": { + "item": "roses_mod:cyan_rose_bush", + "count": 1 + } +} diff --git a/legacy/src/main/resources/data/roses_mod/recipes/red_dye.json b/legacy/src/main/resources/data/roses_mod/recipes/red_dye.json new file mode 100644 index 0000000..38111c3 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/recipes/red_dye.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + [ + { + "item": "roses_mod:rose_flower" + } + ] + ], + "result": { + "item": "minecraft:red_dye", + "count": 1 + } +} diff --git a/legacy/src/main/resources/data/roses_mod/recipes/rose_bush.json b/legacy/src/main/resources/data/roses_mod/recipes/rose_bush.json new file mode 100644 index 0000000..e02ef06 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/recipes/rose_bush.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " WW", + " WW" + ], + "key": { + "W": { + "item": "roses_mod:rose_flower" + } + }, + "result": { + "item": "minecraft:rose_bush", + "count": 1 + } +} diff --git a/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json b/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json new file mode 100644 index 0000000..bd23660 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:random_patch", + "config": { + "tries": 1, + "xz_spread": 7, + "y_spread": 3, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "roses_mod:cyan_rose_bush", + "Properties": { + "half": "lower" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + } + } +} diff --git a/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json b/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json new file mode 100644 index 0000000..4a7ecb1 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:flower", + "config": { + "tries": 2, + "xz_spread": 2, + "y_spread": 1, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 2, + "data": { + "Name": "roses_mod:cyan_rose_flower" + } + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + } + } +} diff --git a/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json b/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json new file mode 100644 index 0000000..eee2d69 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:flower", + "config": { + "tries": 6, + "xz_spread": 5, + "y_spread": 5, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 5, + "data": { + "Name": "roses_mod:rose_flower" + } + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + } + } +} diff --git a/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json b/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json new file mode 100644 index 0000000..4449e17 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json @@ -0,0 +1,19 @@ +{ + "feature": "roses_mod:cyan_rose_bush", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json b/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json new file mode 100644 index 0000000..5aa23d1 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json @@ -0,0 +1,19 @@ +{ + "feature": "roses_mod:cyan_rose_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json b/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json new file mode 100644 index 0000000..8d06035 --- /dev/null +++ b/legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json @@ -0,0 +1,19 @@ +{ + "feature": "roses_mod:rose_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/src/main/resources/quilt.mod.json b/legacy/src/main/resources/quilt.mod.json similarity index 97% rename from src/main/resources/quilt.mod.json rename to legacy/src/main/resources/quilt.mod.json index 2aff202..d3c15ff 100644 --- a/src/main/resources/quilt.mod.json +++ b/legacy/src/main/resources/quilt.mod.json @@ -34,7 +34,7 @@ }, { "id": "minecraft", - "versions": "1.20.6" + "versions": "1.20" } ] }, diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..3594bfb --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,38 @@ +// The settings file is the entry point of every Gradle build. +// Its primary purpose is to define the subprojects. +// It is also used for some aspects of project-wide configuration, like managing plugins, dependencies, etc. +// https://docs.gradle.org/current/userguide/settings_file_basics.html +rootProject.name = "roses_mod" + +dependencyResolutionManagement { + // Use Maven Central as the default repository (where Gradle will download dependencies) in all subprojects. + @Suppress("UnstableApiUsage") + repositories { + mavenCentral() + } +} + +pluginManagement { + repositories { + maven("https://maven.fabricmc.net/") { + name = "Fabric" + } + maven("https://maven.quiltmc.org/repository/release") { + name = "Quilt" + } + gradlePluginPortal() + } +} + +plugins { + // Use the Foojay Toolchains plugin to automatically download JDKs required by subprojects. + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + +// Include the `app` and `utils` subprojects in the build. +// If there are changes in only one of the projects, Gradle will rebuild only the one that has changed. +// Learn more about structuring projects with Gradle - https://docs.gradle.org/8.7/userguide/multi_project_builds.html +// include(":app") +// include(":utils") +include(":MC1.20.6") +include("legacy") diff --git a/src/main/resources/LICENSE b/src/main/resources/LICENSE deleted file mode 100644 index e016fe8..0000000 --- a/src/main/resources/LICENSE +++ /dev/null @@ -1,438 +0,0 @@ -Attribution-NonCommercial-ShareAlike 4.0 International - -======================================================================= - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - -======================================================================= - -Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International -Public License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution-NonCommercial-ShareAlike 4.0 International Public License -("Public License"). To the extent this Public License may be -interpreted as a contract, You are granted the Licensed Rights in -consideration of Your acceptance of these terms and conditions, and the -Licensor grants You such rights in consideration of benefits the -Licensor receives from making the Licensed Material available under -these terms and conditions. - - -Section 1 -- Definitions. - -a. Adapted Material means material subject to Copyright and Similar -Rights that is derived from or based upon the Licensed Material -and in which the Licensed Material is translated, altered, -arranged, transformed, or otherwise modified in a manner requiring -permission under the Copyright and Similar Rights held by the -Licensor. For purposes of this Public License, where the Licensed -Material is a musical work, performance, or sound recording, -Adapted Material is always produced where the Licensed Material is -synched in timed relation with a moving image. - -b. Adapter's License means the license You apply to Your Copyright -and Similar Rights in Your contributions to Adapted Material in -accordance with the terms and conditions of this Public License. - -c. BY-NC-SA Compatible License means a license listed at -creativecommons.org/compatiblelicenses, approved by Creative -Commons as essentially the equivalent of this Public License. - -d. Copyright and Similar Rights means copyright and/or similar rights -closely related to copyright including, without limitation, -performance, broadcast, sound recording, and Sui Generis Database -Rights, without regard to how the rights are labeled or -categorized. For purposes of this Public License, the rights -specified in Section 2(b)(1)-(2) are not Copyright and Similar -Rights. - -e. Effective Technological Measures means those measures that, in the -absence of proper authority, may not be circumvented under laws -fulfilling obligations under Article 11 of the WIPO Copyright -Treaty adopted on December 20, 1996, and/or similar international -agreements. - -f. Exceptions and Limitations means fair use, fair dealing, and/or -any other exception or limitation to Copyright and Similar Rights -that applies to Your use of the Licensed Material. - -g. License Elements means the license attributes listed in the name -of a Creative Commons Public License. The License Elements of this -Public License are Attribution, NonCommercial, and ShareAlike. - -h. Licensed Material means the artistic or literary work, database, -or other material to which the Licensor applied this Public -License. - -i. Licensed Rights means the rights granted to You subject to the -terms and conditions of this Public License, which are limited to -all Copyright and Similar Rights that apply to Your use of the -Licensed Material and that the Licensor has authority to license. - -j. Licensor means the individual(s) or entity(ies) granting rights -under this Public License. - -k. NonCommercial means not primarily intended for or directed towards -commercial advantage or monetary compensation. For purposes of -this Public License, the exchange of the Licensed Material for -other material subject to Copyright and Similar Rights by digital -file-sharing or similar means is NonCommercial provided there is -no payment of monetary compensation in connection with the -exchange. - -l. Share means to provide material to the public by any means or -process that requires permission under the Licensed Rights, such -as reproduction, public display, public performance, distribution, -dissemination, communication, or importation, and to make material -available to the public including in ways that members of the -public may access the material from a place and at a time -individually chosen by them. - -m. Sui Generis Database Rights means rights other than copyright -resulting from Directive 96/9/EC of the European Parliament and of -the Council of 11 March 1996 on the legal protection of databases, -as amended and/or succeeded, as well as other essentially -equivalent rights anywhere in the world. - -n. You means the individual or entity exercising the Licensed Rights -under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - -a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part, for NonCommercial purposes only; and - - b. produce, reproduce, and Share Adapted Material for - NonCommercial purposes only. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. Additional offer from the Licensor -- Adapted Material. - Every recipient of Adapted Material from You - automatically receives an offer from the Licensor to - exercise the Licensed Rights in the Adapted Material - under the conditions of the Adapter's License You apply. - - c. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - -b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties, including when - the Licensed Material is used other than for NonCommercial - purposes. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - -a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - -b. ShareAlike. - - In addition to the conditions in Section 3(a), if You Share - Adapted Material You produce, the following conditions also apply. - - 1. The Adapter's License You apply must be a Creative Commons - license with the same License Elements, this version or - later, or a BY-NC-SA Compatible License. - - 2. You must include the text of, or the URI or hyperlink to, the - Adapter's License You apply. You may satisfy this condition - in any reasonable manner based on the medium, means, and - context in which You Share Adapted Material. - - 3. You may not offer or impose any additional or different terms - or conditions on, or apply any Effective Technological - Measures to, Adapted Material that restrict exercise of the - rights granted under the Adapter's License You apply. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - -a. for the avoidance of doubt, Section 2(a)(1) grants You the right -to extract, reuse, reproduce, and Share all or a substantial -portion of the contents of the database for NonCommercial purposes -only; - -b. if You include all or a substantial portion of the database -contents in a database in which You have Sui Generis Database -Rights, then the database in which You have Sui Generis Database -Rights (but not its individual contents) is Adapted Material, -including for purposes of Section 3(b); and - -c. You must comply with the conditions in Section 3(a) if You Share -all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - -a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE -EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS -AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF -ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, -IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, -WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, -ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT -KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT -ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - -b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE -TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, -NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, -INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, -COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR -USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN -ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR -DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR -IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - -c. The disclaimer of warranties and limitation of liability provided -above shall be interpreted in a manner that, to the extent -possible, most closely approximates an absolute disclaimer and -waiver of all liability. - - -Section 6 -- Term and Termination. - -a. This Public License applies for the term of the Copyright and -Similar Rights licensed here. However, if You fail to comply with -this Public License, then Your rights under this Public License -terminate automatically. - -b. Where Your right to use the Licensed Material has terminated under -Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - -c. For the avoidance of doubt, the Licensor may also offer the -Licensed Material under separate terms or conditions or stop -distributing the Licensed Material at any time; however, doing so -will not terminate this Public License. - -d. Sections 1, 5, 6, 7, and 8 survive termination of this Public -License. - - -Section 7 -- Other Terms and Conditions. - -a. The Licensor shall not be bound by any additional or different -terms or conditions communicated by You unless expressly agreed. - -b. Any arrangements, understandings, or agreements regarding the -Licensed Material not stated herein are separate from and -independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - -a. For the avoidance of doubt, this Public License does not, and -shall not be interpreted to, reduce, limit, restrict, or impose -conditions on any use of the Licensed Material that could lawfully -be made without permission under this Public License. - -b. To the extent possible, if any provision of this Public License is -deemed unenforceable, it shall be automatically reformed to the -minimum extent necessary to make it enforceable. If the provision -cannot be reformed, it shall be severed from this Public License -without affecting the enforceability of the remaining terms and -conditions. - -c. No term or condition of this Public License will be waived and no -failure to comply consented to unless expressly agreed to by the -Licensor. - -d. Nothing in this Public License constitutes or may be interpreted -as a limitation upon, or waiver of, any privileges and immunities -that apply to the Licensor or You, including from the legal -processes of any jurisdiction or authority. - -======================================================================= - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -Creative Commons may be contacted at creativecommons.org. -