From 4565da18a6ff6be6dfa00b65795762182032f2fd Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:02:51 -0700 Subject: [PATCH 01/18] switch to a multi-module layout project --- .gitignore | 2 +- LICENSE | 438 ------------------ README.md | 31 +- build.gradle | 113 ----- gradle.properties | 23 +- gradle/libs.versions.toml | 32 +- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 18 +- gradlew.bat | 15 +- settings.gradle | 14 - .../observer/nelle/roses_mod/RosesMod.java | 92 ---- .../nelle/roses_mod/RosesModClient.java | 23 - .../world/gen/ModFlowerGeneration.java | 18 - src/main/resources/LICENSE | 438 ------------------ .../roses_mod/blockstates/cyan_rose.json | 5 - .../roses_mod/blockstates/cyan_rose_bush.json | 10 - .../roses_mod/blockstates/potted_cyan.json | 5 - .../roses_mod/blockstates/potted_rose.json | 5 - .../roses_mod/blockstates/rose_flower.json | 5 - src/main/resources/assets/roses_mod/icon.png | Bin 7582 -> 0 bytes .../assets/roses_mod/lang/en_us.json | 7 - .../roses_mod/models/block/cyan_rose.json | 6 - .../models/block/cyan_rose_bush_bottom.json | 6 - .../models/block/cyan_rose_bush_top.json | 6 - .../roses_mod/models/block/potted_cyan.json | 6 - .../roses_mod/models/block/potted_rose.json | 6 - .../roses_mod/models/block/rose_flower.json | 6 - .../roses_mod/models/item/cyan_rose.json | 6 - .../roses_mod/models/item/cyan_rose_bush.json | 6 - .../roses_mod/models/item/rose_flower.json | 6 - .../roses_mod/textures/block/cyan_rose.png | Bin 237 -> 0 bytes .../textures/block/cyan_rose_bush_bottom.png | Bin 6255 -> 0 bytes .../textures/block/cyan_rose_bush_top.png | Bin 5841 -> 0 bytes .../roses_mod/textures/block/rose_flower.png | Bin 248 -> 0 bytes .../minecraft/tags/blocks/flower_pots.json | 7 - .../minecraft/tags/blocks/small_flowers.json | 7 - .../minecraft/tags/blocks/tall_flowers.json | 6 - .../loot_tables/blocks/cyan_rose.json | 14 - .../loot_tables/blocks/cyan_rose_bush.json | 14 - .../loot_tables/blocks/rose_flower.json | 14 - .../data/roses_mod/recipes/cyan_dye.json | 17 - .../roses_mod/recipes/cyan_rose_bush.json | 17 - .../data/roses_mod/recipes/red_dye.json | 14 - .../data/roses_mod/recipes/rose_bush.json | 17 - .../configured_feature/cyan_rose_bush.json | 33 -- .../configured_feature/cyan_rose_flower.json | 35 -- .../configured_feature/rose_flower.json | 35 -- .../placed_feature/cyan_rose_bush.json | 19 - .../placed_feature/cyan_rose_flower.json | 19 - .../worldgen/placed_feature/rose_flower.json | 19 - src/main/resources/quilt.mod.json | 46 -- 52 files changed, 56 insertions(+), 1629 deletions(-) delete mode 100644 LICENSE delete mode 100644 build.gradle delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 settings.gradle delete mode 100644 src/main/java/observer/nelle/roses_mod/RosesMod.java delete mode 100644 src/main/java/observer/nelle/roses_mod/RosesModClient.java delete mode 100644 src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java delete mode 100644 src/main/resources/LICENSE delete mode 100644 src/main/resources/assets/roses_mod/blockstates/cyan_rose.json delete mode 100644 src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json delete mode 100644 src/main/resources/assets/roses_mod/blockstates/potted_cyan.json delete mode 100644 src/main/resources/assets/roses_mod/blockstates/potted_rose.json delete mode 100644 src/main/resources/assets/roses_mod/blockstates/rose_flower.json delete mode 100644 src/main/resources/assets/roses_mod/icon.png delete mode 100644 src/main/resources/assets/roses_mod/lang/en_us.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/cyan_rose.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/potted_cyan.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/potted_rose.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/rose_flower.json delete mode 100644 src/main/resources/assets/roses_mod/models/item/cyan_rose.json delete mode 100644 src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json delete mode 100644 src/main/resources/assets/roses_mod/models/item/rose_flower.json delete mode 100644 src/main/resources/assets/roses_mod/textures/block/cyan_rose.png delete mode 100644 src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png delete mode 100644 src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png delete mode 100644 src/main/resources/assets/roses_mod/textures/block/rose_flower.png delete mode 100644 src/main/resources/data/minecraft/tags/blocks/flower_pots.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/small_flowers.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/tall_flowers.json delete mode 100644 src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json delete mode 100644 src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json delete mode 100644 src/main/resources/data/roses_mod/recipes/cyan_dye.json delete mode 100644 src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/recipes/red_dye.json delete mode 100644 src/main/resources/data/roses_mod/recipes/rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json delete mode 100644 src/main/resources/quilt.mod.json diff --git a/.gitignore b/.gitignore index 33e619c..d781bc1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ classes/ # Quilt Loom remappedSrc/ -run/ +legacy/run/ # Eclipse *.launch diff --git a/LICENSE b/LICENSE deleted file mode 100644 index e016fe8..0000000 --- a/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. - 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/build.gradle b/build.gradle deleted file mode 100644 index 4a990b3..0000000 --- a/build.gradle +++ /dev/null @@ -1,113 +0,0 @@ -plugins { - id "com.modrinth.minotaur" version "2.+" - id 'maven-publish' - alias libs.plugins.quilt.loom -} - -archivesBaseName = project.archives_base_name -version = "${project.version}" -group = project.maven_group - -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. -} - -// 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 -} - -processResources { - inputs.property 'version', version - - filesMatching('quilt.mod.json') { - expand "version": version - } -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = 'UTF-8' - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 -} - -java { - // Still required by IDEs such as Eclipse and Visual Studio Code - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - - // 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() - - // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. - // Uncomment this line to generate them. - // withJavadocJar() -} - -// If you plan to use a different file for the license, don't forget to change the file name here! -jar { - from('LICENSE') { - rename { "${it}_${archivesBaseName}" } - } -} - -//modrinth -import com.modrinth.minotaur.dependencies.ModDependency -tasks.modrinth.dependsOn(tasks.modrinthSyncBody) - -modrinth { - token = System.getenv("MODRINTH_TOKEN") // Please use an environment variable for this! The default is `$MODRINTH_TOKEN`. - projectId = "roses-quilt" // The ID of your Modrinth project. Slugs will not work. - versionNumber = version // The (preferably SemVer) version of the mod. If not specified, it'll use the `version` declaration - versionType = "release" // This is the default -- can also be `beta` or `alpha` - uploadFile = remapJar // Tells Minotaur to use the remapped jar - gameVersions = ["1.20", "1.20.1"] // An array of game versions the version supports - loaders = ["quilt"] // Self-explanatory. - changelog = "changed log! (wait about a minute, and refresh, it will be here)" - dependencies { // A special DSL for creating dependencies - // scope.type - // The scope can be `required`, `optional`, `incompatible`, or `embedded` - // The type can either be `project` or `version` - 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 -} - - -// Configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} 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 943f0cbfa754578e88a3dae77fce6e3dea56edbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61574 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 ScNgau(U?ep-K_E5zy1%ZQTdPn 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/settings.gradle b/settings.gradle deleted file mode 100644 index d969e34..0000000 --- a/settings.gradle +++ /dev/null @@ -1,14 +0,0 @@ -pluginManagement { - repositories { - maven { - name = 'Quilt' - url = 'https://maven.quiltmc.org/repository/release' - } - // Currently needed for Intermediary and other temporary dependencies - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } -} diff --git a/src/main/java/observer/nelle/roses_mod/RosesMod.java b/src/main/java/observer/nelle/roses_mod/RosesMod.java deleted file mode 100644 index 87dd475..0000000 --- a/src/main/java/observer/nelle/roses_mod/RosesMod.java +++ /dev/null @@ -1,92 +0,0 @@ -package observer.nelle.roses_mod; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.fabricmc.fabric.api.loot.v2.LootTableEvents; -import net.minecraft.block.*; -import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.item.BlockItem; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import observer.nelle.roses_mod.world.gen.ModFlowerGeneration; - - -import static observer.nelle.roses_mod.world.gen.ModFlowerGeneration.*; - -public class RosesMod implements ModInitializer { - public static final String MOD_ID = "roses_mod"; - 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)); - //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)); - //Cyan Rose Bush - public static final Block CYAN_ROSE_BUSH = new TallPlantBlock(QuiltBlockSettings.copyOf(Blocks.LARGE_FERN)); - - - @Override - public void onInitialize(ModContainer mod) { - //REGISTER WORLDGEN - ModFlowerGeneration.generateFlowers(); - - //BIOME MOD - BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, ROSE_FLOWER_PLACED_KEY); - BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, CYAN_ROSE_FLOWER_PLACED_KEY); - BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, CYAN_ROSE_BUSH_PLACED_KEY); - - //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); - //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); - //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())); - - //CREATIVE TABS - - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.POPPY, ROSE_FLOWER)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.BLUE_ORCHID, CYAN_ROSE)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.ROSE_BUSH, CYAN_ROSE_BUSH)); - - - //LOOT TABLES - final Identifier 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/src/main/java/observer/nelle/roses_mod/RosesModClient.java deleted file mode 100644 index 0ade281..0000000 --- a/src/main/java/observer/nelle/roses_mod/RosesModClient.java +++ /dev/null @@ -1,23 +0,0 @@ -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; - -public class RosesModClient implements ClientModInitializer { - public void onInitializeClient(ModContainer mod) { - //ROSE FLOWER - BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_ROSE); - BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.ROSE_FLOWER); - - //CYAN ROSE - BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_CYAN); - BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE); - - //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/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java deleted file mode 100644 index 6ab9102..0000000 --- a/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java +++ /dev/null @@ -1,18 +0,0 @@ -package observer.nelle.roses_mod.world.gen; - -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.util.Identifier; -import net.minecraft.world.gen.feature.PlacedFeature; -import observer.nelle.roses_mod.RosesMod; - -public class ModFlowerGeneration { - - public static final RegistryKey ROSE_FLOWER_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","rose_flower")); - public static final RegistryKey CYAN_ROSE_FLOWER_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","cyan_rose_flower")); - public static final RegistryKey CYAN_ROSE_BUSH_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","cyan_rose_bush")); - - public static void generateFlowers() { - RosesMod.LOGGER.debug("Registering Features..."); - } -} 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. - diff --git a/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json b/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json deleted file mode 100644 index 6be127f..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "roses_mod:block/cyan_rose"} - } -} diff --git a/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json b/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json deleted file mode 100644 index eaf06c4..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "half=lower": { - "model": "roses_mod:block/cyan_rose_bush_bottom" - }, - "half=upper": { - "model": "roses_mod:block/cyan_rose_bush_top" - } - } -} diff --git a/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json b/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json deleted file mode 100644 index dedd97a..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "roses_mod:block/potted_cyan"} - } -} diff --git a/src/main/resources/assets/roses_mod/blockstates/potted_rose.json b/src/main/resources/assets/roses_mod/blockstates/potted_rose.json deleted file mode 100644 index 4f5619d..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/potted_rose.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "roses_mod:block/potted_rose"} - } -} diff --git a/src/main/resources/assets/roses_mod/blockstates/rose_flower.json b/src/main/resources/assets/roses_mod/blockstates/rose_flower.json deleted file mode 100644 index 66aeb91..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/rose_flower.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "roses_mod:block/rose_flower"} - } -} diff --git a/src/main/resources/assets/roses_mod/icon.png b/src/main/resources/assets/roses_mod/icon.png deleted file mode 100644 index 38fcde9d5e8f820e0566f7e40ab124bc87a091a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7582 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 diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png deleted file mode 100644 index 882a660bb3e08bb8ee18ab4fc359fd2dbe0123e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6255 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 diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png deleted file mode 100644 index cfe9caace8c1ee8d02304238510b49d79ae43146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5841 zcmeHKdpMNa8XvipNCQX673v=3-_ruCHIy&8T)gXFtz*dY*IsYv%c8zHhDH`&;k(Tkm?;w^Ci5 z?N`gG$-!W-)f5LCH|SqMbS;;Gezm3+0T@iWINHNU;08p(xjYVo84AJ$QCtuX3YiQT zO!%61&#==1Q+f9QRr42 z?sBAO#gu&eO`3`%*ot>a`<_cW+#EnDV)Av9imqk&$hVIkURf`+!TY{ zr3p-IJP7#tgt$v2CCg_uXamHJyB2F)qE@aiH66n zpa2)$`72DWVwQ}C@ADP)8yZ-Jd|$ItGjI2@{^doEu6BAW;-l&Z<1sC(q>HRMfla8f zXQBVZX6Cu1NUT-sD;W|@hBpQ(c}pY!(NW1MO&7ru{hv1GY;i7-PLOz!X0?sAd2jj! z!CtKH7TDQLsWgG^n2nVECfM(o{ARwyGUa8)DmQ=BU8eq|mS8~~ig7Wr9!Zj-m|hmVXXArkPS+qmq=}x8)jw>)xmlcDs3Y zg@z^+s~Y;@h?kCEWF(L6KaZEUFL*EGv1gle*n0 zud2T!aoeNW4w}o(`ZwlVsiKn)A=T=>MroFDCD=!Z|)Cx zjjnlRX?w?MJU+GGyWgU)o1t2&N8K!U#(j;|G|&*jxP9qC9P?46QX^~8CC#p~cj#{A z^!Upmor)o~;=Fi|rwhh2hPIrDBSVrymq$t%E6jL9)bm zI`m_|l+74szotki^NbHE<_203YN*TGZ_A)lu3XBsAk6u! zONkAEV}wmRbjODqm?&Yz-BIV@d9Su=>ZkX8cVk)u%0IA&3uk^%FkW;$8&X-l+RLOv zBBipnKS;hJ{R?BEiXQt@0imQe4{94C2R8}Z zAGhCpKh~ndG|MQC%Q$v9sj7>7*36SJ_+i$NZ`nFK>pg!rRbHMk*^w5DwtbYn-@o^d zZfCUOykFPk?0JU?v+PqU2hL1}wZEELFVD*JZSQ$e#Fmxo?8!RtA$IiL4a(Czw-H9U z)y0PHqjG=DqC%{$4%wSdKX|jO#CR@0nm9Ort9^D%_RiI@1)0)BpJHlyTLlazk;JsN zcBNQbf2!9|l|CMqNp`s5s+{EFzCGPT<4^eTp~AZ04cWs!=Un&66?z5VZyG(lr=$1> zN?4e3z)JZALodyM#^Y&RIZYAEhNw5-gS4I3c;JUbz|&nuhB2wc`7 zXlpG#Ohq+rk_jBLUM}GXN8vA7=uw!$?jCZu`=e&z(a6D*#DevXGH-2$rOv6Ze}B3 z;tvn}xw}(m7gxQeW@7j68@aWTt1Rz>))Bgv$U+~ff%fsd*Vj6b9gSmm%J~PoWZ~N{ zZ5xEi{(McCTG>M$(0rcX*GSHPHxE1ij@QV)c4i~Au?m^c2I}MFNTP9AD1gqPf+!)2 z3vIA4n7O5p3(!J90h|g3G1+9q%lbwHoJl7myopX2C$2RZ%yfw6f$q`H9<=BXnkgM& zX(4AWBtZl$PyoP%tWY+eBqSrmyd>ye)Qm>J#SlRV8R6sP3b*F)KsW(KKw*%!LS_UG zVIc=M=g}D?HygW;6wnhH5iAgJNoaIrWF#sQkK*ux&{$JbQ#1yL#^I0<0?ChJ3jiUK z&DRl8EOFR?d>W6*6)-t$xQG*=a>4~<1On=ZfAWvTb#nSl&*pzr0n!641h{A{3WH{` z&|g~c1-20o$w!C&)`IT=y@#OPKt3m&M+0pmK(;{VOA0#evpqMQ7b*^iPD6vCAPa)> zp;5744QWqta{X)}k|2o5;)<;xvA;qJn2f)~`pP#^k2st!9f8b0^L~Z?6uTGEDECEX-VlYNXERlvm5==~p5CwFH18D??kujDCP_bW7xbT=z zRsx}4dL^QwLsSd~6@t_0NP;nyiX@mC;gJB{1cwCh43L4RVd->JBQX`7MzZ7ZSO7Gg zOcoFXqPgrKafe87l9elkjKHCm92d8^h5`ZxWI#qZGTGt6zn~sW7U(VjL~3Gu%)M^$55ttDZ%05ML_~+OCj)q2#_xJ6XIIxq6Gu&AP}k^ zAJg?yJM(W+!NeFxFvgkUkRV8evI)xokW>>K6^S958WR{MAb>G8{hFQ6VF)4t9%vN= z=?G~BrKeacxW0Iz48BH327{tmfCNKgu#iZf1S5PD4E-@+w5Vo$ir5_eADWnp0bdju z$Zn|(Dqc`6M1L-ZA2kz|o&V$K<6Qh7M}Vlm5Asd=ewXXJT;HU?H-W!r*LS(TNr7(y zf6uP}nOt&z9j8Dx^cEBe9hUSHkJvy5Eg9-|dmGrI=v#30OcvC#g6rVRhrw1Vi7p9P z?r{~UQC2{4vXy-*v0R#D)RnX14s@K(q1ae?n6y?)o)YbA-A`( z2^osVwyZrSP|&`dpRdv1U*6%lHcftO?jvNPJ44o6@`rs}k4o)W=G0WELhb8Vb#at5 zzBqWM<%s;%7jGvTJ~Y%PE~>tx+DJd8!-z2NEwvS-@e%12m-`Cq8gws(__B`rRdD0^F7uA^ zn$wwZt8mbH!Dl?;5Zr3hgjod5u6Si(avOfP=l)BhzLaAxWP+ZOW#>9(&10%=-&`nx zLER_vXH}}zBasg-R6;&&yNgkq&a`Uxec$`O`RNTM)tDr1l-&VUVBP78CqKsa!U}wM zQ)a4WXP@TmY$FX$<;CQp_Ng@&y}P;=89g;rtD|9$$a0`kn)eJVkl&X{0Hrwey^9G~XI@?ri-IeffT0bts diff --git a/src/main/resources/assets/roses_mod/textures/block/rose_flower.png b/src/main/resources/assets/roses_mod/textures/block/rose_flower.png deleted file mode 100644 index 51d9847ccf92bf06ddceea8e8f0593a9e7a382c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmV{JvIDdY^=~bK(-`M#6&;Ij`!GW2D;l+O@1_{Q04En!+V5rAx zzy($gu+1Q#&cwzr>-RT?{C|J2s>SPq!~gy;-1zq!Y>)#pGx06}X#lyxwebhT?>h_( zALikXZoKIr%GLD$vfZcgs=+A<(!AU8G{fsE{D}>(=>ka%|5;TS@ESreDT}o+{CC}N y#;|nvDbivA6p$cqY?D1rejtJj0eJ&oEC2wZ(LWK4E050r0000=0.26.3" - }, - { - "id": "quilted_fabric_api", - "versions": ">=10.0.0-alpha.3+0.100.4-1.20.6" - }, - { - "id": "minecraft", - "versions": "1.20.6" - } - ] - }, - "modmenu:api": true, - "modmenu": { - "update_checker": true - } -} - -- 2.47.0 From 61a5ad240490cbabf4ee4d7732fe585e978b8824 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:02:51 -0700 Subject: [PATCH 02/18] gitignore? --- .gitignore | 2 +- LICENSE | 438 ------------------ MC1.20.6/.gitignore | 35 ++ README.md | 31 +- build.gradle | 113 ----- gradle.properties | 23 +- gradle/libs.versions.toml | 32 +- gradle/wrapper/gradle-wrapper.jar | Bin 61574 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 18 +- gradlew.bat | 15 +- legacy/.gitignore | 35 ++ settings.gradle | 14 - .../observer/nelle/roses_mod/RosesMod.java | 92 ---- .../nelle/roses_mod/RosesModClient.java | 23 - .../world/gen/ModFlowerGeneration.java | 18 - src/main/resources/LICENSE | 438 ------------------ .../roses_mod/blockstates/cyan_rose.json | 5 - .../roses_mod/blockstates/cyan_rose_bush.json | 10 - .../roses_mod/blockstates/potted_cyan.json | 5 - .../roses_mod/blockstates/potted_rose.json | 5 - .../roses_mod/blockstates/rose_flower.json | 5 - src/main/resources/assets/roses_mod/icon.png | Bin 7582 -> 0 bytes .../assets/roses_mod/lang/en_us.json | 7 - .../roses_mod/models/block/cyan_rose.json | 6 - .../models/block/cyan_rose_bush_bottom.json | 6 - .../models/block/cyan_rose_bush_top.json | 6 - .../roses_mod/models/block/potted_cyan.json | 6 - .../roses_mod/models/block/potted_rose.json | 6 - .../roses_mod/models/block/rose_flower.json | 6 - .../roses_mod/models/item/cyan_rose.json | 6 - .../roses_mod/models/item/cyan_rose_bush.json | 6 - .../roses_mod/models/item/rose_flower.json | 6 - .../roses_mod/textures/block/cyan_rose.png | Bin 237 -> 0 bytes .../textures/block/cyan_rose_bush_bottom.png | Bin 6255 -> 0 bytes .../textures/block/cyan_rose_bush_top.png | Bin 5841 -> 0 bytes .../roses_mod/textures/block/rose_flower.png | Bin 248 -> 0 bytes .../minecraft/tags/blocks/flower_pots.json | 7 - .../minecraft/tags/blocks/small_flowers.json | 7 - .../minecraft/tags/blocks/tall_flowers.json | 6 - .../loot_tables/blocks/cyan_rose.json | 14 - .../loot_tables/blocks/cyan_rose_bush.json | 14 - .../loot_tables/blocks/rose_flower.json | 14 - .../data/roses_mod/recipes/cyan_dye.json | 17 - .../roses_mod/recipes/cyan_rose_bush.json | 17 - .../data/roses_mod/recipes/red_dye.json | 14 - .../data/roses_mod/recipes/rose_bush.json | 17 - .../configured_feature/cyan_rose_bush.json | 33 -- .../configured_feature/cyan_rose_flower.json | 35 -- .../configured_feature/rose_flower.json | 35 -- .../placed_feature/cyan_rose_bush.json | 19 - .../placed_feature/cyan_rose_flower.json | 19 - .../worldgen/placed_feature/rose_flower.json | 19 - src/main/resources/quilt.mod.json | 46 -- 54 files changed, 126 insertions(+), 1629 deletions(-) delete mode 100644 LICENSE create mode 100644 MC1.20.6/.gitignore delete mode 100644 build.gradle delete mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 legacy/.gitignore delete mode 100644 settings.gradle delete mode 100644 src/main/java/observer/nelle/roses_mod/RosesMod.java delete mode 100644 src/main/java/observer/nelle/roses_mod/RosesModClient.java delete mode 100644 src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java delete mode 100644 src/main/resources/LICENSE delete mode 100644 src/main/resources/assets/roses_mod/blockstates/cyan_rose.json delete mode 100644 src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json delete mode 100644 src/main/resources/assets/roses_mod/blockstates/potted_cyan.json delete mode 100644 src/main/resources/assets/roses_mod/blockstates/potted_rose.json delete mode 100644 src/main/resources/assets/roses_mod/blockstates/rose_flower.json delete mode 100644 src/main/resources/assets/roses_mod/icon.png delete mode 100644 src/main/resources/assets/roses_mod/lang/en_us.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/cyan_rose.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/potted_cyan.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/potted_rose.json delete mode 100644 src/main/resources/assets/roses_mod/models/block/rose_flower.json delete mode 100644 src/main/resources/assets/roses_mod/models/item/cyan_rose.json delete mode 100644 src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json delete mode 100644 src/main/resources/assets/roses_mod/models/item/rose_flower.json delete mode 100644 src/main/resources/assets/roses_mod/textures/block/cyan_rose.png delete mode 100644 src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png delete mode 100644 src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png delete mode 100644 src/main/resources/assets/roses_mod/textures/block/rose_flower.png delete mode 100644 src/main/resources/data/minecraft/tags/blocks/flower_pots.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/small_flowers.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/tall_flowers.json delete mode 100644 src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json delete mode 100644 src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json delete mode 100644 src/main/resources/data/roses_mod/recipes/cyan_dye.json delete mode 100644 src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/recipes/red_dye.json delete mode 100644 src/main/resources/data/roses_mod/recipes/rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json delete mode 100644 src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json delete mode 100644 src/main/resources/quilt.mod.json diff --git a/.gitignore b/.gitignore index 33e619c..d781bc1 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ classes/ # Quilt Loom remappedSrc/ -run/ +legacy/run/ # Eclipse *.launch diff --git a/LICENSE b/LICENSE deleted file mode 100644 index e016fe8..0000000 --- a/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. - diff --git a/MC1.20.6/.gitignore b/MC1.20.6/.gitignore new file mode 100644 index 0000000..d781bc1 --- /dev/null +++ b/MC1.20.6/.gitignore @@ -0,0 +1,35 @@ +# Gradle +.gradle/ +build/ +out/ +classes/ + +# Quilt Loom +remappedSrc/ +legacy/run/ + +# Eclipse +*.launch + +# IntelliJ Idea +.idea/ +*.iml +*.ipr +*.iws + +# Fleet +.fleet/ + +# Visual Studio Code +.settings/ +.vscode/ +bin/ +.classpath +.project + +# Eclipse JDT LS +workspace/ + +# macOS +*.DS_Store +/.directory 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/build.gradle b/build.gradle deleted file mode 100644 index 4a990b3..0000000 --- a/build.gradle +++ /dev/null @@ -1,113 +0,0 @@ -plugins { - id "com.modrinth.minotaur" version "2.+" - id 'maven-publish' - alias libs.plugins.quilt.loom -} - -archivesBaseName = project.archives_base_name -version = "${project.version}" -group = project.maven_group - -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. -} - -// 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 -} - -processResources { - inputs.property 'version', version - - filesMatching('quilt.mod.json') { - expand "version": version - } -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = 'UTF-8' - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 -} - -java { - // Still required by IDEs such as Eclipse and Visual Studio Code - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - - // 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() - - // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. - // Uncomment this line to generate them. - // withJavadocJar() -} - -// If you plan to use a different file for the license, don't forget to change the file name here! -jar { - from('LICENSE') { - rename { "${it}_${archivesBaseName}" } - } -} - -//modrinth -import com.modrinth.minotaur.dependencies.ModDependency -tasks.modrinth.dependsOn(tasks.modrinthSyncBody) - -modrinth { - token = System.getenv("MODRINTH_TOKEN") // Please use an environment variable for this! The default is `$MODRINTH_TOKEN`. - projectId = "roses-quilt" // The ID of your Modrinth project. Slugs will not work. - versionNumber = version // The (preferably SemVer) version of the mod. If not specified, it'll use the `version` declaration - versionType = "release" // This is the default -- can also be `beta` or `alpha` - uploadFile = remapJar // Tells Minotaur to use the remapped jar - gameVersions = ["1.20", "1.20.1"] // An array of game versions the version supports - loaders = ["quilt"] // Self-explanatory. - changelog = "changed log! (wait about a minute, and refresh, it will be here)" - dependencies { // A special DSL for creating dependencies - // scope.type - // The scope can be `required`, `optional`, `incompatible`, or `embedded` - // The type can either be `project` or `version` - 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 -} - - -// Configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} 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 943f0cbfa754578e88a3dae77fce6e3dea56edbf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61574 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 ScNgau(U?ep-K_E5zy1%ZQTdPn 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/legacy/.gitignore b/legacy/.gitignore new file mode 100644 index 0000000..d781bc1 --- /dev/null +++ b/legacy/.gitignore @@ -0,0 +1,35 @@ +# Gradle +.gradle/ +build/ +out/ +classes/ + +# Quilt Loom +remappedSrc/ +legacy/run/ + +# Eclipse +*.launch + +# IntelliJ Idea +.idea/ +*.iml +*.ipr +*.iws + +# Fleet +.fleet/ + +# Visual Studio Code +.settings/ +.vscode/ +bin/ +.classpath +.project + +# Eclipse JDT LS +workspace/ + +# macOS +*.DS_Store +/.directory diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index d969e34..0000000 --- a/settings.gradle +++ /dev/null @@ -1,14 +0,0 @@ -pluginManagement { - repositories { - maven { - name = 'Quilt' - url = 'https://maven.quiltmc.org/repository/release' - } - // Currently needed for Intermediary and other temporary dependencies - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } -} diff --git a/src/main/java/observer/nelle/roses_mod/RosesMod.java b/src/main/java/observer/nelle/roses_mod/RosesMod.java deleted file mode 100644 index 87dd475..0000000 --- a/src/main/java/observer/nelle/roses_mod/RosesMod.java +++ /dev/null @@ -1,92 +0,0 @@ -package observer.nelle.roses_mod; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.fabricmc.fabric.api.loot.v2.LootTableEvents; -import net.minecraft.block.*; -import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.item.BlockItem; -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 org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import observer.nelle.roses_mod.world.gen.ModFlowerGeneration; - - -import static observer.nelle.roses_mod.world.gen.ModFlowerGeneration.*; - -public class RosesMod implements ModInitializer { - public static final String MOD_ID = "roses_mod"; - 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)); - //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)); - //Cyan Rose Bush - public static final Block CYAN_ROSE_BUSH = new TallPlantBlock(QuiltBlockSettings.copyOf(Blocks.LARGE_FERN)); - - - @Override - public void onInitialize(ModContainer mod) { - //REGISTER WORLDGEN - ModFlowerGeneration.generateFlowers(); - - //BIOME MOD - BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, ROSE_FLOWER_PLACED_KEY); - BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, CYAN_ROSE_FLOWER_PLACED_KEY); - BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, CYAN_ROSE_BUSH_PLACED_KEY); - - //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); - //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); - //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())); - - //CREATIVE TABS - - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.POPPY, ROSE_FLOWER)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.BLUE_ORCHID, CYAN_ROSE)); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.ROSE_BUSH, CYAN_ROSE_BUSH)); - - - //LOOT TABLES - final Identifier 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/src/main/java/observer/nelle/roses_mod/RosesModClient.java deleted file mode 100644 index 0ade281..0000000 --- a/src/main/java/observer/nelle/roses_mod/RosesModClient.java +++ /dev/null @@ -1,23 +0,0 @@ -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; - -public class RosesModClient implements ClientModInitializer { - public void onInitializeClient(ModContainer mod) { - //ROSE FLOWER - BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_ROSE); - BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.ROSE_FLOWER); - - //CYAN ROSE - BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_CYAN); - BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE); - - //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/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java deleted file mode 100644 index 6ab9102..0000000 --- a/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java +++ /dev/null @@ -1,18 +0,0 @@ -package observer.nelle.roses_mod.world.gen; - -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.util.Identifier; -import net.minecraft.world.gen.feature.PlacedFeature; -import observer.nelle.roses_mod.RosesMod; - -public class ModFlowerGeneration { - - public static final RegistryKey ROSE_FLOWER_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","rose_flower")); - public static final RegistryKey CYAN_ROSE_FLOWER_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","cyan_rose_flower")); - public static final RegistryKey CYAN_ROSE_BUSH_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","cyan_rose_bush")); - - public static void generateFlowers() { - RosesMod.LOGGER.debug("Registering Features..."); - } -} 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. - diff --git a/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json b/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json deleted file mode 100644 index 6be127f..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "roses_mod:block/cyan_rose"} - } -} diff --git a/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json b/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json deleted file mode 100644 index eaf06c4..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "half=lower": { - "model": "roses_mod:block/cyan_rose_bush_bottom" - }, - "half=upper": { - "model": "roses_mod:block/cyan_rose_bush_top" - } - } -} diff --git a/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json b/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json deleted file mode 100644 index dedd97a..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "roses_mod:block/potted_cyan"} - } -} diff --git a/src/main/resources/assets/roses_mod/blockstates/potted_rose.json b/src/main/resources/assets/roses_mod/blockstates/potted_rose.json deleted file mode 100644 index 4f5619d..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/potted_rose.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "roses_mod:block/potted_rose"} - } -} diff --git a/src/main/resources/assets/roses_mod/blockstates/rose_flower.json b/src/main/resources/assets/roses_mod/blockstates/rose_flower.json deleted file mode 100644 index 66aeb91..0000000 --- a/src/main/resources/assets/roses_mod/blockstates/rose_flower.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "roses_mod:block/rose_flower"} - } -} diff --git a/src/main/resources/assets/roses_mod/icon.png b/src/main/resources/assets/roses_mod/icon.png deleted file mode 100644 index 38fcde9d5e8f820e0566f7e40ab124bc87a091a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7582 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 diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png deleted file mode 100644 index 882a660bb3e08bb8ee18ab4fc359fd2dbe0123e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6255 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 diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png deleted file mode 100644 index cfe9caace8c1ee8d02304238510b49d79ae43146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5841 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 diff --git a/src/main/resources/assets/roses_mod/textures/block/rose_flower.png b/src/main/resources/assets/roses_mod/textures/block/rose_flower.png deleted file mode 100644 index 51d9847ccf92bf06ddceea8e8f0593a9e7a382c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmV{JvIDdY^=~bK(-`M#6&;Ij`!GW2D;l+O@1_{Q04En!+V5rAx zzy($gu+1Q#&cwzr>-RT?{C|J2s>SPq!~gy;-1zq!Y>)#pGx06}X#lyxwebhT?>h_( zALikXZoKIr%GLD$vfZcgs=+A<(!AU8G{fsE{D}>(=>ka%|5;TS@ESreDT}o+{CC}N y#;|nvDbivA6p$cqY?D1rejtJj0eJ&oEC2wZ(LWK4E050r0000=0.26.3" - }, - { - "id": "quilted_fabric_api", - "versions": ">=10.0.0-alpha.3+0.100.4-1.20.6" - }, - { - "id": "minecraft", - "versions": "1.20.6" - } - ] - }, - "modmenu:api": true, - "modmenu": { - "update_checker": true - } -} - -- 2.47.0 From 009796193f851694ab51a9d86de5abe6c11b6f40 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:05:50 -0700 Subject: [PATCH 03/18] fix gitignore --- .gitignore | 15 ++++++++++++++- MC1.20.6/.gitignore | 35 ----------------------------------- legacy/.gitignore | 35 ----------------------------------- 3 files changed, 14 insertions(+), 71 deletions(-) delete mode 100644 MC1.20.6/.gitignore delete mode 100644 legacy/.gitignore diff --git a/.gitignore b/.gitignore index d781bc1..9623115 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,21 @@ 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/ +legacy/remappedSrc/ legacy/run/ # Eclipse diff --git a/MC1.20.6/.gitignore b/MC1.20.6/.gitignore deleted file mode 100644 index d781bc1..0000000 --- a/MC1.20.6/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -# Gradle -.gradle/ -build/ -out/ -classes/ - -# Quilt Loom -remappedSrc/ -legacy/run/ - -# Eclipse -*.launch - -# IntelliJ Idea -.idea/ -*.iml -*.ipr -*.iws - -# Fleet -.fleet/ - -# Visual Studio Code -.settings/ -.vscode/ -bin/ -.classpath -.project - -# Eclipse JDT LS -workspace/ - -# macOS -*.DS_Store -/.directory diff --git a/legacy/.gitignore b/legacy/.gitignore deleted file mode 100644 index d781bc1..0000000 --- a/legacy/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -# Gradle -.gradle/ -build/ -out/ -classes/ - -# Quilt Loom -remappedSrc/ -legacy/run/ - -# Eclipse -*.launch - -# IntelliJ Idea -.idea/ -*.iml -*.ipr -*.iws - -# Fleet -.fleet/ - -# Visual Studio Code -.settings/ -.vscode/ -bin/ -.classpath -.project - -# Eclipse JDT LS -workspace/ - -# macOS -*.DS_Store -/.directory -- 2.47.0 From 4a74fda4d93662af4b6da9177b84e3ada6612eae Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:07:01 -0700 Subject: [PATCH 04/18] multi-module based project --- MC1.20.6/build.gradle.kts | 78 ++++ MC1.20.6/gradle.properties | 18 + .../nelle/roses_mod/client/roses_modClient.kt | 9 + .../observer/nelle/roses_mod/roses_mod.kt | 16 + MC1.20.6/src/main/resources/fabric.mod.json | 30 ++ .../src/main/resources/roses_mod.mixins.json | 13 + legacy/build.gradle | 103 ++++ legacy/gradle.properties | 16 + legacy/settings.gradle | 14 + .../observer/nelle/roses_mod/RosesMod.java | 85 ++++ .../nelle/roses_mod/RosesModClient.java | 21 + .../world/gen/ModFlowerGeneration.java | 18 + legacy/src/main/resources/LICENSE | 438 ++++++++++++++++++ .../roses_mod/blockstates/cyan_rose.json | 5 + .../roses_mod/blockstates/cyan_rose_bush.json | 10 + .../roses_mod/blockstates/potted_cyan.json | 5 + .../roses_mod/blockstates/potted_rose.json | 5 + .../roses_mod/blockstates/rose_flower.json | 5 + .../main/resources/assets/roses_mod/icon.png | Bin 0 -> 7582 bytes .../assets/roses_mod/lang/en_us.json | 7 + .../roses_mod/models/block/cyan_rose.json | 6 + .../models/block/cyan_rose_bush_bottom.json | 6 + .../models/block/cyan_rose_bush_top.json | 6 + .../roses_mod/models/block/potted_cyan.json | 6 + .../roses_mod/models/block/potted_rose.json | 6 + .../roses_mod/models/block/rose_flower.json | 6 + .../roses_mod/models/item/cyan_rose.json | 6 + .../roses_mod/models/item/cyan_rose_bush.json | 6 + .../roses_mod/models/item/rose_flower.json | 6 + .../roses_mod/textures/block/cyan_rose.png | Bin 0 -> 237 bytes .../textures/block/cyan_rose_bush_bottom.png | Bin 0 -> 6255 bytes .../textures/block/cyan_rose_bush_top.png | Bin 0 -> 5841 bytes .../roses_mod/textures/block/rose_flower.png | Bin 0 -> 248 bytes .../minecraft/tags/blocks/flower_pots.json | 7 + .../minecraft/tags/blocks/small_flowers.json | 7 + .../minecraft/tags/blocks/tall_flowers.json | 6 + .../loot_tables/blocks/cyan_rose.json | 14 + .../loot_tables/blocks/cyan_rose_bush.json | 14 + .../loot_tables/blocks/rose_flower.json | 14 + .../data/roses_mod/recipes/cyan_dye.json | 17 + .../roses_mod/recipes/cyan_rose_bush.json | 17 + .../data/roses_mod/recipes/red_dye.json | 14 + .../data/roses_mod/recipes/rose_bush.json | 17 + .../configured_feature/cyan_rose_bush.json | 33 ++ .../configured_feature/cyan_rose_flower.json | 35 ++ .../configured_feature/rose_flower.json | 35 ++ .../placed_feature/cyan_rose_bush.json | 19 + .../placed_feature/cyan_rose_flower.json | 19 + .../worldgen/placed_feature/rose_flower.json | 19 + legacy/src/main/resources/quilt.mod.json | 46 ++ settings.gradle.kts | 39 ++ 51 files changed, 1322 insertions(+) create mode 100644 MC1.20.6/build.gradle.kts create mode 100644 MC1.20.6/gradle.properties create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt create mode 100644 MC1.20.6/src/main/resources/fabric.mod.json create mode 100644 MC1.20.6/src/main/resources/roses_mod.mixins.json create mode 100644 legacy/build.gradle create mode 100644 legacy/gradle.properties create mode 100644 legacy/settings.gradle create mode 100644 legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java create mode 100644 legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java create mode 100644 legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java create mode 100644 legacy/src/main/resources/LICENSE create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/potted_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/rose_flower.json create mode 100644 legacy/src/main/resources/assets/roses_mod/icon.png create mode 100644 legacy/src/main/resources/assets/roses_mod/lang/en_us.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/potted_cyan.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/potted_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/rose_flower.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/item/rose_flower.json create mode 100644 legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png create mode 100644 legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png create mode 100644 legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png create mode 100644 legacy/src/main/resources/assets/roses_mod/textures/block/rose_flower.png create mode 100644 legacy/src/main/resources/data/minecraft/tags/blocks/flower_pots.json create mode 100644 legacy/src/main/resources/data/minecraft/tags/blocks/small_flowers.json create mode 100644 legacy/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json create mode 100644 legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json create mode 100644 legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json create mode 100644 legacy/src/main/resources/data/roses_mod/recipes/cyan_dye.json create mode 100644 legacy/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/recipes/red_dye.json create mode 100644 legacy/src/main/resources/data/roses_mod/recipes/rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json create mode 100644 legacy/src/main/resources/quilt.mod.json create mode 100644 settings.gradle.kts diff --git a/MC1.20.6/build.gradle.kts b/MC1.20.6/build.gradle.kts new file mode 100644 index 0000000..914c06e --- /dev/null +++ b/MC1.20.6/build.gradle.kts @@ -0,0 +1,78 @@ +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/client/roses_modClient.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt new file mode 100644 index 0000000..d77d34c --- /dev/null +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt @@ -0,0 +1,9 @@ +package observer.nelle.roses_mod.client + +import net.fabricmc.api.ClientModInitializer + +class roses_modClient : ClientModInitializer { + + override fun onInitializeClient() { + } +} diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt new file mode 100644 index 0000000..d08d260 --- /dev/null +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt @@ -0,0 +1,16 @@ +@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") + +package observer.nelle.roses_mod + +import net.fabricmc.api.ModInitializer +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +val LOGGER: Logger = LoggerFactory.getLogger("roses") +val MOD_ID = "roses_mod" + +class roses_mod : ModInitializer { + override fun onInitialize() { + LOGGER.info("just like old times?") + } +} 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..12c38da --- /dev/null +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -0,0 +1,30 @@ +{ + "schemaVersion": 1, + "id": "roses_mod", + "version": "${version}", + + "name": "roses", + "description": "", + "authors": [], + "contact": {}, + + "license": "AGPL-3.0", + "icon": "assets/roses_mod/icon.png", + + "environment": "*", + "entrypoints": { + "client": ["observer.nelle.roses_mod.client.roses_modClient"], + "main": ["observer.nelle.roses_mod.roses_mod"] + }, + + "mixins": [ + "roses_mod.mixins.json" + ], + + "depends": { + "fabricloader": ">=${loader_version}", + "fabric-language-kotlin": ">=${kotlin_loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod.mixins.json b/MC1.20.6/src/main/resources/roses_mod.mixins.json new file mode 100644 index 0000000..9bb0d36 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "observer.nelle.roses_mod.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/legacy/build.gradle b/legacy/build.gradle new file mode 100644 index 0000000..f64bf6c --- /dev/null +++ b/legacy/build.gradle @@ -0,0 +1,103 @@ +plugins { + id "com.modrinth.minotaur" version "2.+" + id 'maven-publish' + id "org.quiltmc.loom" version "1.2.+" +} + +archivesBaseName = project.archives_base_name +version = "${project.version}" +group = project.maven_group + +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. +} + +// 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("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 { + inputs.property 'version', version + + filesMatching('quilt.mod.json') { + expand "version": version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 21 +} + +java { + // Still required by IDEs such as Eclipse and Visual Studio Code + 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. + withSourcesJar() + + // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. + // Uncomment this line to generate them. + // withJavadocJar() +} + +// If you plan to use a different file for the license, don't forget to change the file name here! +jar { + from('LICENSE') { + rename { "${it}_${archivesBaseName}" } + } +} + +//modrinth + +tasks.modrinth.dependsOn(tasks.modrinthSyncBody) + +modrinth { + token = System.getenv("MODRINTH_TOKEN") // Please use an environment variable for this! The default is `$MODRINTH_TOKEN`. + projectId = "roses-quilt" // The ID of your Modrinth project. Slugs will not work. + versionNumber = version // The (preferably SemVer) version of the mod. If not specified, it'll use the `version` declaration + versionType = "release" // This is the default -- can also be `beta` or `alpha` + uploadFile = remapJar // Tells Minotaur to use the remapped jar + gameVersions = ["1.20", "1.20.1"] // An array of game versions the version supports + loaders = ["quilt"] // Self-explanatory. + changelog = "changed log! (wait about a minute, and refresh, it will be here)" + dependencies { // A special DSL for creating dependencies + // scope.type + // The scope can be `required`, `optional`, `incompatible`, or `embedded` + // The type can either be `project` or `version` + 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 = file("../README.md").text +} + + +// Configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} 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/legacy/settings.gradle b/legacy/settings.gradle new file mode 100644 index 0000000..d969e34 --- /dev/null +++ b/legacy/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { + name = 'Quilt' + url = 'https://maven.quiltmc.org/repository/release' + } + // Currently needed for Intermediary and other temporary dependencies + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java b/legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java new file mode 100644 index 0000000..3b5ce9e --- /dev/null +++ b/legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java @@ -0,0 +1,85 @@ +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.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.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.world.gen.GenerationStep; +import observer.nelle.roses_mod.world.gen.ModFlowerGeneration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static observer.nelle.roses_mod.world.gen.ModFlowerGeneration.*; + +public class RosesMod implements ModInitializer { + public static final String MOD_ID = "roses_mod"; + public static final Logger LOGGER = LoggerFactory.getLogger("Roses Mod"); + + //ROSE + 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, 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(FabricBlockSettings.copyOf(Blocks.LARGE_FERN)); + + @Override + public void onInitialize() { + //REGISTER WORLDGEN + ModFlowerGeneration.generateFlowers(); + + //BIOME MOD + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, ROSE_FLOWER_PLACED_KEY); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, CYAN_ROSE_FLOWER_PLACED_KEY); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, CYAN_ROSE_BUSH_PLACED_KEY); + + //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 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 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 Item.Settings())); + + //CREATIVE TABS + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.POPPY, ROSE_FLOWER)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.BLUE_ORCHID, CYAN_ROSE)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.ROSE_BUSH, CYAN_ROSE_BUSH)); + + + /* TODO: Uncomment and update + //LOOT TABLES + 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/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java new file mode 100644 index 0000000..85231cb --- /dev/null +++ b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java @@ -0,0 +1,21 @@ +package observer.nelle.roses_mod; + + +import net.fabricmc.api.ClientModInitializer; + +public class RosesModClient implements ClientModInitializer { + public void onInitializeClient() { + /* TODO: Uncomment and update + //ROSE FLOWER + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_ROSE); + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.ROSE_FLOWER); + + //CYAN ROSE + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_CYAN); + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE); + + //CYAN ROSE BUSH + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE_BUSH); + */ + } +} diff --git a/legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java b/legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java new file mode 100644 index 0000000..6ab9102 --- /dev/null +++ b/legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java @@ -0,0 +1,18 @@ +package observer.nelle.roses_mod.world.gen; + +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.world.gen.feature.PlacedFeature; +import observer.nelle.roses_mod.RosesMod; + +public class ModFlowerGeneration { + + public static final RegistryKey ROSE_FLOWER_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","rose_flower")); + public static final RegistryKey CYAN_ROSE_FLOWER_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","cyan_rose_flower")); + public static final RegistryKey CYAN_ROSE_BUSH_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","cyan_rose_bush")); + + public static void generateFlowers() { + RosesMod.LOGGER.debug("Registering Features..."); + } +} diff --git a/legacy/src/main/resources/LICENSE b/legacy/src/main/resources/LICENSE new file mode 100644 index 0000000..e016fe8 --- /dev/null +++ b/legacy/src/main/resources/LICENSE @@ -0,0 +1,438 @@ +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. + 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 0000000000000000000000000000000000000000..38fcde9d5e8f820e0566f7e40ab124bc87a091a5 GIT binary patch literal 7582 zcmeHKdpuNY_un%{X55mFoo3m=8f~fd11}Aw-jKL;}vr8Xyu# zRx~1!Mj)XH1RBAbMj}FRX!CA0XeOBR9-OfJFaCnt&&QuvN^0`11NLb=7Z)E-7ZAzZ+kXa{9X)YqPXR&1AG za9nY5*em@+o#q|T6jSaC@o|Q3?&Ftp9M5;T#s4x~04P|ww8~y9_{yD z+Iw!f5!cky#L+yL@O%vCU zJ;j>tJ5?D4i=sdDB)_U#Q$eu#-7NhPy*-1Uyd8ESI6t7OZ-6Bi~D(l^&G z>4Ma@$l`XLZg=Q<*wQJl4-Xt0gFYOMmd-r5>lmoxI3B}a;_vN6V+r{t5+*v1A0-ge;v6taTpAcF#CQx^X(EYq!1#k|a}h>!(AGF>90BVV$BQLl z9M#eG(QGcw*VX+a1h{j+td&SaG(27^mExpUIAL@+o=Bxq@dOf{M8X0KtTiM5wP56{BNv3#jZ34R^Hw; zS0O7#v8bo314iL5jV)yH*fiykN}!O)EP^$b#3k8ct!-FrER{vI!G=-D9L0}Hu_b*4 zWk4TPP7;l zoB~tXNR=8ki{=gxnV@iZd}cTYFA{_+6^gXbKrnzZMSPon1C%~FivDPvL;T+ICK9=hzIqzST z0*B4DC37hhtd$MP3Tw^faIjP|nS|w7vzTNXTPDehO8ypIEaXb0%xI2tIN%X*13JXX>}^cyzCmy=t4WPOp>eI^v_u=0mtaC*=P0{CawNfx%+}W?z(^l!o3& zD9S+LNGx4lKko&>$4hI2g%ACzny7CP4JDax-kpo-DwPL69A;O^581z~ALxFZXntsJ zmPgO&m!gvg65noadYc(DTqpNVemGX%msC?QR?cEwtxMF({yo?DzF=qNRe4{**q$MF zi|0gMdbdG&vSsQ}*p8v9Q(et9cCjVM4!7IMWa6ZRn8H5 zg302mXHRu?)D%4S%dC7nYk||#AV2O&!9<)id2OA;y>n+LBi(HjZbKs!F({i*&P~ z_pU=#7}4`bv@=PMH>{nt<=*g&(1ok(;`{X}aV9Z=%R5&UcKV#&N7`Ib2a`g_d zcBH7mg48-u8~RFy<@F);jU8QyV-=;Ng{SeBn3F5uh;2Gq&^F{AXI+1HI^6%t%HqFK z^2$pxjkzEp>rVLSz{GFu1*rOw%d1_U8h4MP8RJi$E>FKcF`m$#5wN-+T2!!dA3YeZ zOAmf+JqvCEL!mGIN=U6m%uA_##3LgX0nJZKneZ5t2NZL;B?_4aG&*}55HCRbUu-Mv z)IkD`2`(MgYKn%n>MyS_(E*x8LF&_smgesZ|K(*EK7kxEcKMLogdmyG`=ljLW98QI z(hJ7PA2vm_Z?#Kl{`JV;wH_T_v@ncdcfk0iCYc<@Av zH_Cpz-O1(6m|U$}JG_|@rI(9ZA@b9g66PG|b16r|B|I-HVQnTuqb_k`b>Yx3GihP*jVJGu8tWI;F~ zDSo{?#@-6o4{;lgyXQ}Vq4GCdSKIsLo4S zq7oU1IEM6q{C@t~#OFA@{5CMkTu`V#RyWpuzD&d6@$2ii!=6rzT|5-NAooXJKXf7} z+RQC9Cj~*cJrS1mhvHLLRBtlms>RAGG=eFud z|8ht56;5$@#s=x|t&Y(L509voYyWIUaF)%MA?CRuTLCq#h5>Id1ZO}^%28x$AfP62 zZsd;$GeFJsEIkvSVo>{}T!1lTL^-55lKe#cEQR5_*WO1xWM+r+JeDi=)~C%N&) zINy%hbcRD_0Zp>#U@2l~37WUD|JC9e1FQJTO56$|ZY9os-HWqTYjPlW*wpvxxkHPbq7 zX2LYIo;PRCaB<4Dlyq%QoCibocr;J1n;H0O?8F$U%{1+K#ryX2^~Fv3#)H2O{X^A% z3HhF&qG(hjAwom^(wiSrvrY8@?4-eipEauZH&!>ieH6gH-4E?FKFcjXt3i$#SXy~t z{lWV;Ttls-kgf1iZlBZGvqSzrEi>15x&r6F7nu|08>#cnU?+`Uuq;1h7Z#1`s-9Ez zcZ`U%9JhHN^rP?8Yask5M{nCyKU)-3G0>~?$CHIUSQ)9jeB_sPZ4qJMQMuJQ&pP~d zp>5kEMFS4(crYVb@Yu7sq;eCOx(Q`N&kq9q!Nb5Vgx?adIj}b2hP+hAzpxC^e4#P4 zBG1*nd5^PC#GH+YGJ#}Nj-qC_x7bo7`>A&81JaJ2J7wTq7mC&+jCAvpDe9bpCMotQ?XWx%b*>Qh1J_brbj02g$I--OD?wLNfHa9p0Tg_e`pG7=;dWv^Gn> zVIWfTNz%N^4Sk(?jWX^?1iNFD3pw{%p5K#QaM~v$4KBF9a*ARijp<$NGPO8A) zfjz$EvRUD&YU+-sgq4+T}d9k zb@X;<+7&~?qK1_k)hZTF=Vm0oBL?xO=*l7nJ!xl0_7DVB(@^;jI@Wx6dIfi2*HWl6 zt$~g-0zOdA$8VdH_;z_g(T;~Jr?{c~N8HjEPF$!}X>@Y$Lt@8QHAIp?&0MoEh-_>K z*}m$cu55ifUCNXiH@=t?B9yG}0@=t~ybt@{{!v-Yijg_8XNv?4h$hwAs@&ei{B+gQ ze@q)aFt$9&ASKa1AiWiIOy7)%Ou92DJ?9G~2K+cEy4J(@=lW!UtooE`X450UdqQQ= z5K<33YW4IiT}-nA>2MG12?w|;*yF0IH+)b>XJq{w82W#Bb^2f4s{X%JjlMk-j#bUu Ub+7c@QG7Icx-D}pT@NS%G}%0G|+7AZ@$zxq1C;n?ovY3H^?=T269?xHq0u*%fba4#P2wvOc$;Y6;!Q9&Q?Z3X+MAyfWdUJie zr04(EbYXJpSd=`On_zopr0Ol=Aw*UYD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..882a660bb3e08bb8ee18ab4fc359fd2dbe0123e3 GIT binary patch literal 6255 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cfe9caace8c1ee8d02304238510b49d79ae43146 GIT binary patch literal 5841 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..51d9847ccf92bf06ddceea8e8f0593a9e7a382c0 GIT binary patch literal 248 zcmV{JvIDdY^=~bK(-`M#6&;Ij`!GW2D;l+O@1_{Q04En!+V5rAx zzy($gu+1Q#&cwzr>-RT?{C|J2s>SPq!~gy;-1zq!Y>)#pGx06}X#lyxwebhT?>h_( zALikXZoKIr%GLD$vfZcgs=+A<(!AU8G{fsE{D}>(=>ka%|5;TS@ESreDT}o+{CC}N y#;|nvDbivA6p$cqY?D1rejtJj0eJ&oEC2wZ(LWK4E050r0000=0.26.3" + }, + { + "id": "quilted_fabric_api", + "versions": ">=10.0.0-alpha.3+0.100.4-1.20.6" + }, + { + "id": "minecraft", + "versions": "1.20" + } + ] + }, + "modmenu:api": true, + "modmenu": { + "update_checker": true + } +} + diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..073f82f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,39 @@ +// 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 + +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") + +rootProject.name = "roses_mod" +include("legacy") -- 2.47.0 From 24a7a36851bc40c177ce48df29f758b232e3278a Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:26:28 -0700 Subject: [PATCH 05/18] move resources over --- .../nelle/roses_mod/client/roses_modClient.kt | 3 +- .../minecraft/tags/blocks/flower_pots.json | 7 ++++ .../minecraft/tags/blocks/small_flowers.json | 7 ++++ .../minecraft/tags/blocks/tall_flowers.json | 6 +++ .../loot_tables/blocks/cyan_rose.json | 14 +++++++ .../loot_tables/blocks/cyan_rose_bush.json | 14 +++++++ .../loot_tables/blocks/rose_flower.json | 14 +++++++ .../data/roses_mod/recipes/cyan_dye.json | 17 +++++++++ .../roses_mod/recipes/cyan_rose_bush.json | 17 +++++++++ .../data/roses_mod/recipes/red_dye.json | 14 +++++++ .../data/roses_mod/recipes/rose_bush.json | 17 +++++++++ .../configured_feature/cyan_rose_bush.json | 33 +++++++++++++++++ .../configured_feature/cyan_rose_flower.json | 35 ++++++++++++++++++ .../configured_feature/rose_flower.json | 35 ++++++++++++++++++ .../placed_feature/cyan_rose_bush.json | 19 ++++++++++ .../placed_feature/cyan_rose_flower.json | 19 ++++++++++ .../worldgen/placed_feature/rose_flower.json | 19 ++++++++++ MC1.20.6/src/main/resources/fabric.mod.json | 1 - .../src/main/resources/roses_mod.mixins.json | 13 ------- .../roses_mod/blockstates/cyan_rose.json | 5 +++ .../roses_mod/blockstates/cyan_rose_bush.json | 10 +++++ .../roses_mod/blockstates/potted_cyan.json | 5 +++ .../roses_mod/blockstates/potted_rose.json | 5 +++ .../roses_mod/blockstates/rose_flower.json | 5 +++ .../src/main/resources/roses_mod/icon.png | Bin 0 -> 7582 bytes .../main/resources/roses_mod/lang/en_us.json | 7 ++++ .../roses_mod/models/block/cyan_rose.json | 6 +++ .../models/block/cyan_rose_bush_bottom.json | 6 +++ .../models/block/cyan_rose_bush_top.json | 6 +++ .../roses_mod/models/block/potted_cyan.json | 6 +++ .../roses_mod/models/block/potted_rose.json | 6 +++ .../roses_mod/models/block/rose_flower.json | 6 +++ .../roses_mod/models/item/cyan_rose.json | 6 +++ .../roses_mod/models/item/cyan_rose_bush.json | 6 +++ .../roses_mod/models/item/rose_flower.json | 6 +++ .../roses_mod/textures/block/cyan_rose.png | Bin 0 -> 237 bytes .../textures/block/cyan_rose_bush_bottom.png | Bin 0 -> 6255 bytes .../textures/block/cyan_rose_bush_top.png | Bin 0 -> 5841 bytes .../roses_mod/textures/block/rose_flower.png | Bin 0 -> 248 bytes settings.gradle.kts | 3 +- 40 files changed, 381 insertions(+), 17 deletions(-) create mode 100644 MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json create mode 100644 MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json create mode 100644 MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json delete mode 100644 MC1.20.6/src/main/resources/roses_mod.mixins.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/icon.png create mode 100644 MC1.20.6/src/main/resources/roses_mod/lang/en_us.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_bottom.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_top.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/potted_cyan.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/potted_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/item/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose.png create mode 100644 MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png create mode 100644 MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png create mode 100644 MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt index d77d34c..b7e1283 100644 --- a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt @@ -1,9 +1,10 @@ +@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") + package observer.nelle.roses_mod.client import net.fabricmc.api.ClientModInitializer class roses_modClient : ClientModInitializer { - override fun onInitializeClient() { } } diff --git a/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json new file mode 100644 index 0000000..6ca60b7 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json new file mode 100644 index 0000000..fdecf80 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json new file mode 100644 index 0000000..308ea91 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json new file mode 100644 index 0000000..9e19db2 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json new file mode 100644 index 0000000..e015922 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json new file mode 100644 index 0000000..6994a61 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json new file mode 100644 index 0000000..20a5789 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json new file mode 100644 index 0000000..38111c3 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json new file mode 100644 index 0000000..e02ef06 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json new file mode 100644 index 0000000..bd23660 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json new file mode 100644 index 0000000..4a7ecb1 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json new file mode 100644 index 0000000..eee2d69 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json new file mode 100644 index 0000000..4449e17 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json new file mode 100644 index 0000000..5aa23d1 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json new file mode 100644 index 0000000..8d06035 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index 12c38da..d3d81b0 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -18,7 +18,6 @@ }, "mixins": [ - "roses_mod.mixins.json" ], "depends": { diff --git a/MC1.20.6/src/main/resources/roses_mod.mixins.json b/MC1.20.6/src/main/resources/roses_mod.mixins.json deleted file mode 100644 index 9bb0d36..0000000 --- a/MC1.20.6/src/main/resources/roses_mod.mixins.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "observer.nelle.roses_mod.mixin", - "compatibilityLevel": "JAVA_21", - "mixins": [ - ], - "client": [ - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json new file mode 100644 index 0000000..6be127f --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/cyan_rose"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json new file mode 100644 index 0000000..eaf06c4 --- /dev/null +++ b/MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json new file mode 100644 index 0000000..dedd97a --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_cyan"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json new file mode 100644 index 0000000..4f5619d --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_rose"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json new file mode 100644 index 0000000..66aeb91 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/rose_flower"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/icon.png b/MC1.20.6/src/main/resources/roses_mod/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..38fcde9d5e8f820e0566f7e40ab124bc87a091a5 GIT binary patch literal 7582 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 literal 0 HcmV?d00001 diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..882a660bb3e08bb8ee18ab4fc359fd2dbe0123e3 GIT binary patch literal 6255 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 literal 0 HcmV?d00001 diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe9caace8c1ee8d02304238510b49d79ae43146 GIT binary patch literal 5841 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 literal 0 HcmV?d00001 diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png new file mode 100644 index 0000000000000000000000000000000000000000..51d9847ccf92bf06ddceea8e8f0593a9e7a382c0 GIT binary patch literal 248 zcmV{JvIDdY^=~bK(-`M#6&;Ij`!GW2D;l+O@1_{Q04En!+V5rAx zzy($gu+1Q#&cwzr>-RT?{C|J2s>SPq!~gy;-1zq!Y>)#pGx06}X#lyxwebhT?>h_( zALikXZoKIr%GLD$vfZcgs=+A<(!AU8G{fsE{D}>(=>ka%|5;TS@ESreDT}o+{CC}N y#;|nvDbivA6p$cqY?D1rejtJj0eJ&oEC2wZ(LWK4E050r0000 Date: Wed, 18 Dec 2024 21:29:56 -0700 Subject: [PATCH 06/18] ah i see --- MC1.20.6/src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index d3d81b0..18ffb87 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ "contact": {}, "license": "AGPL-3.0", - "icon": "assets/roses_mod/icon.png", + "icon": "roses_mod/icon.png", "environment": "*", "entrypoints": { -- 2.47.0 From 1f5e429697516092c8b72655d6f1ddf894b2baea Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:43:08 -0700 Subject: [PATCH 07/18] convert mod.json --- MC1.20.6/src/main/resources/fabric.mod.json | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index 18ffb87..147795d 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -3,12 +3,14 @@ "id": "roses_mod", "version": "${version}", - "name": "roses", - "description": "", - "authors": [], + "name": "Roses Mod", + "description": "Reinstates the classic roses to Minecraft.", + "authors": [ + "nellePoint" + ], "contact": {}, - "license": "AGPL-3.0", + "license": "LGPL-3.0", "icon": "roses_mod/icon.png", "environment": "*", @@ -25,5 +27,10 @@ "fabric-language-kotlin": ">=${kotlin_loader_version}", "fabric": "*", "minecraft": "${minecraft_version}" + }, + + "modmenu:api": true, + "modmenu": { + "update_checker": true } } -- 2.47.0 From 5b38b5a146822366f64decb066b60462db9e2f89 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:43:21 -0700 Subject: [PATCH 08/18] license to LGPL-3.0 --- LICENSE.txt | 841 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 841 insertions(+) create mode 100644 LICENSE.txt 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 +. + -- 2.47.0 From b62f49fd93d6964b5486bf2100fe4144ff0eb568 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:44:50 -0700 Subject: [PATCH 09/18] add contact --- MC1.20.6/src/main/resources/fabric.mod.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index 147795d..b2d3e8f 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -8,7 +8,11 @@ "authors": [ "nellePoint" ], - "contact": {}, + "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": "roses_mod/icon.png", -- 2.47.0 From 663b47a4b40ca10d41f1233f68c5654027316f93 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 23:02:14 -0700 Subject: [PATCH 10/18] =?UTF-8?q?WE=20HAVE=20ROSES=20=EF=BC=BC(=E2=89=A7?= =?UTF-8?q?=E2=96=BD=E2=89=A6)=EF=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MC1.20.6/build.gradle.kts | 1 - .../observer/nelle/roses_mod/RosesBlocks.kt | 50 ++++++++++++++++++ .../observer/nelle/roses_mod/RosesMod.kt | 30 +++++++++++ .../nelle/roses_mod/client/RosesModClient.kt | 14 +++++ .../nelle/roses_mod/client/roses_modClient.kt | 10 ---- .../observer/nelle/roses_mod/roses_mod.kt | 16 ------ .../roses_mod/blockstates/cyan_rose.json | 0 .../roses_mod/blockstates/cyan_rose_bush.json | 0 .../roses_mod/blockstates/potted_cyan.json | 0 .../roses_mod/blockstates/potted_rose.json | 0 .../roses_mod/blockstates/rose_flower.json | 0 .../resources/{ => assets}/roses_mod/icon.png | Bin .../{ => assets}/roses_mod/lang/en_us.json | 0 .../roses_mod/models/block/cyan_rose.json | 0 .../models/block/cyan_rose_bush_bottom.json | 0 .../models/block/cyan_rose_bush_top.json | 0 .../roses_mod/models/block/potted_cyan.json | 0 .../roses_mod/models/block/potted_rose.json | 0 .../roses_mod/models/block/rose_flower.json | 0 .../roses_mod/models/item/cyan_rose.json | 0 .../roses_mod/models/item/cyan_rose_bush.json | 0 .../roses_mod/models/item/rose_flower.json | 0 .../roses_mod/textures/block/cyan_rose.png | Bin .../textures/block/cyan_rose_bush_bottom.png | Bin .../textures/block/cyan_rose_bush_top.png | Bin .../roses_mod/textures/block/rose_flower.png | Bin MC1.20.6/src/main/resources/fabric.mod.json | 11 ++-- .../minecraft/tags/blocks/flower_pots.json | 0 .../minecraft/tags/blocks/small_flowers.json | 0 .../minecraft/tags/blocks/tall_flowers.json | 0 .../loot_tables/blocks/cyan_rose.json | 0 .../loot_tables/blocks/cyan_rose_bush.json | 0 .../loot_tables/blocks/rose_flower.json | 0 .../data/roses_mod/recipes/cyan_dye.json | 0 .../roses_mod/recipes/cyan_rose_bush.json | 0 .../data/roses_mod/recipes/red_dye.json | 0 .../data/roses_mod/recipes/rose_bush.json | 0 .../configured_feature/cyan_rose_bush.json | 0 .../configured_feature/cyan_rose_flower.json | 0 .../configured_feature/rose_flower.json | 0 .../placed_feature/cyan_rose_bush.json | 0 .../placed_feature/cyan_rose_flower.json | 0 .../worldgen/placed_feature/rose_flower.json | 0 .../nelle/roses_mod/RosesModClient.java | 10 ++-- 44 files changed, 103 insertions(+), 39 deletions(-) create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesBlocks.kt create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesMod.kt create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/RosesModClient.kt delete mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt delete mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/cyan_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/potted_cyan.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/potted_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/icon.png (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/lang/en_us.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/cyan_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/cyan_rose_bush_bottom.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/cyan_rose_bush_top.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/potted_cyan.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/potted_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/item/cyan_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/item/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/item/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/textures/block/cyan_rose.png (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/textures/block/cyan_rose_bush_bottom.png (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/textures/block/cyan_rose_bush_top.png (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/textures/block/rose_flower.png (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/minecraft/tags/blocks/flower_pots.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/minecraft/tags/blocks/small_flowers.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/minecraft/tags/blocks/tall_flowers.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/loot_tables/blocks/cyan_rose.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/loot_tables/blocks/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/recipes/cyan_dye.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/recipes/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/recipes/red_dye.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/recipes/rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/configured_feature/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/placed_feature/rose_flower.json (100%) diff --git a/MC1.20.6/build.gradle.kts b/MC1.20.6/build.gradle.kts index 914c06e..7d6ef3c 100644 --- a/MC1.20.6/build.gradle.kts +++ b/MC1.20.6/build.gradle.kts @@ -38,7 +38,6 @@ dependencies { 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")}") } 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/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt deleted file mode 100644 index b7e1283..0000000 --- a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") - -package observer.nelle.roses_mod.client - -import net.fabricmc.api.ClientModInitializer - -class roses_modClient : ClientModInitializer { - override fun onInitializeClient() { - } -} diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt deleted file mode 100644 index d08d260..0000000 --- a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt +++ /dev/null @@ -1,16 +0,0 @@ -@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") - -package observer.nelle.roses_mod - -import net.fabricmc.api.ModInitializer -import org.slf4j.Logger -import org.slf4j.LoggerFactory - -val LOGGER: Logger = LoggerFactory.getLogger("roses") -val MOD_ID = "roses_mod" - -class roses_mod : ModInitializer { - override fun onInitialize() { - LOGGER.info("just like old times?") - } -} diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/potted_rose.json diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/rose_flower.json diff --git a/MC1.20.6/src/main/resources/roses_mod/icon.png b/MC1.20.6/src/main/resources/assets/roses_mod/icon.png similarity index 100% rename from MC1.20.6/src/main/resources/roses_mod/icon.png rename to MC1.20.6/src/main/resources/assets/roses_mod/icon.png diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/lang/en_us.json rename to MC1.20.6/src/main/resources/assets/roses_mod/lang/en_us.json diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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 index b2d3e8f..4fb9c11 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -15,11 +15,13 @@ }, "license": "LGPL-3.0", - "icon": "roses_mod/icon.png", + "icon": "assets/roses_mod/icon.png", "environment": "*", "entrypoints": { - "client": ["observer.nelle.roses_mod.client.roses_modClient"], + "client": [ + "observer.nelle.roses_mod.client.RosesModClient" + ], "main": ["observer.nelle.roses_mod.roses_mod"] }, @@ -31,10 +33,5 @@ "fabric-language-kotlin": ">=${kotlin_loader_version}", "fabric": "*", "minecraft": "${minecraft_version}" - }, - - "modmenu:api": true, - "modmenu": { - "update_checker": true } } diff --git a/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java index 85231cb..0714f52 100644 --- a/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java +++ b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java @@ -4,9 +4,8 @@ package observer.nelle.roses_mod; import net.fabricmc.api.ClientModInitializer; public class RosesModClient implements ClientModInitializer { - public void onInitializeClient() { - /* TODO: Uncomment and update - //ROSE FLOWER + public void onInitializeClient() {//ROSE FLOWER + /* BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_ROSE); BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.ROSE_FLOWER); @@ -16,6 +15,7 @@ public class RosesModClient implements ClientModInitializer { //CYAN ROSE BUSH BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE_BUSH); - */ - } + + */} + } -- 2.47.0 From 1e0b7dde158ed0f2c65130b5b270dc97ca070b71 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:05:50 -0700 Subject: [PATCH 11/18] fix gitignore --- .gitignore | 15 ++++++++++++++- MC1.20.6/.gitignore | 35 ----------------------------------- legacy/.gitignore | 35 ----------------------------------- 3 files changed, 14 insertions(+), 71 deletions(-) delete mode 100644 MC1.20.6/.gitignore delete mode 100644 legacy/.gitignore diff --git a/.gitignore b/.gitignore index d781bc1..9623115 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,21 @@ 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/ +legacy/remappedSrc/ legacy/run/ # Eclipse diff --git a/MC1.20.6/.gitignore b/MC1.20.6/.gitignore deleted file mode 100644 index d781bc1..0000000 --- a/MC1.20.6/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -# Gradle -.gradle/ -build/ -out/ -classes/ - -# Quilt Loom -remappedSrc/ -legacy/run/ - -# Eclipse -*.launch - -# IntelliJ Idea -.idea/ -*.iml -*.ipr -*.iws - -# Fleet -.fleet/ - -# Visual Studio Code -.settings/ -.vscode/ -bin/ -.classpath -.project - -# Eclipse JDT LS -workspace/ - -# macOS -*.DS_Store -/.directory diff --git a/legacy/.gitignore b/legacy/.gitignore deleted file mode 100644 index d781bc1..0000000 --- a/legacy/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -# Gradle -.gradle/ -build/ -out/ -classes/ - -# Quilt Loom -remappedSrc/ -legacy/run/ - -# Eclipse -*.launch - -# IntelliJ Idea -.idea/ -*.iml -*.ipr -*.iws - -# Fleet -.fleet/ - -# Visual Studio Code -.settings/ -.vscode/ -bin/ -.classpath -.project - -# Eclipse JDT LS -workspace/ - -# macOS -*.DS_Store -/.directory -- 2.47.0 From 369009f68389ee6bce06a34dd614a9049f8a8446 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:07:01 -0700 Subject: [PATCH 12/18] multi-module based project --- MC1.20.6/build.gradle.kts | 78 ++++ MC1.20.6/gradle.properties | 18 + .../nelle/roses_mod/client/roses_modClient.kt | 9 + .../observer/nelle/roses_mod/roses_mod.kt | 16 + MC1.20.6/src/main/resources/fabric.mod.json | 30 ++ .../src/main/resources/roses_mod.mixins.json | 13 + legacy/build.gradle | 103 ++++ legacy/gradle.properties | 16 + legacy/settings.gradle | 14 + .../observer/nelle/roses_mod/RosesMod.java | 85 ++++ .../nelle/roses_mod/RosesModClient.java | 21 + .../world/gen/ModFlowerGeneration.java | 18 + legacy/src/main/resources/LICENSE | 438 ++++++++++++++++++ .../roses_mod/blockstates/cyan_rose.json | 5 + .../roses_mod/blockstates/cyan_rose_bush.json | 10 + .../roses_mod/blockstates/potted_cyan.json | 5 + .../roses_mod/blockstates/potted_rose.json | 5 + .../roses_mod/blockstates/rose_flower.json | 5 + .../main/resources/assets/roses_mod/icon.png | Bin 0 -> 7582 bytes .../assets/roses_mod/lang/en_us.json | 7 + .../roses_mod/models/block/cyan_rose.json | 6 + .../models/block/cyan_rose_bush_bottom.json | 6 + .../models/block/cyan_rose_bush_top.json | 6 + .../roses_mod/models/block/potted_cyan.json | 6 + .../roses_mod/models/block/potted_rose.json | 6 + .../roses_mod/models/block/rose_flower.json | 6 + .../roses_mod/models/item/cyan_rose.json | 6 + .../roses_mod/models/item/cyan_rose_bush.json | 6 + .../roses_mod/models/item/rose_flower.json | 6 + .../roses_mod/textures/block/cyan_rose.png | Bin 0 -> 237 bytes .../textures/block/cyan_rose_bush_bottom.png | Bin 0 -> 6255 bytes .../textures/block/cyan_rose_bush_top.png | Bin 0 -> 5841 bytes .../roses_mod/textures/block/rose_flower.png | Bin 0 -> 248 bytes .../minecraft/tags/blocks/flower_pots.json | 7 + .../minecraft/tags/blocks/small_flowers.json | 7 + .../minecraft/tags/blocks/tall_flowers.json | 6 + .../loot_tables/blocks/cyan_rose.json | 14 + .../loot_tables/blocks/cyan_rose_bush.json | 14 + .../loot_tables/blocks/rose_flower.json | 14 + .../data/roses_mod/recipes/cyan_dye.json | 17 + .../roses_mod/recipes/cyan_rose_bush.json | 17 + .../data/roses_mod/recipes/red_dye.json | 14 + .../data/roses_mod/recipes/rose_bush.json | 17 + .../configured_feature/cyan_rose_bush.json | 33 ++ .../configured_feature/cyan_rose_flower.json | 35 ++ .../configured_feature/rose_flower.json | 35 ++ .../placed_feature/cyan_rose_bush.json | 19 + .../placed_feature/cyan_rose_flower.json | 19 + .../worldgen/placed_feature/rose_flower.json | 19 + legacy/src/main/resources/quilt.mod.json | 46 ++ settings.gradle.kts | 39 ++ 51 files changed, 1322 insertions(+) create mode 100644 MC1.20.6/build.gradle.kts create mode 100644 MC1.20.6/gradle.properties create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt create mode 100644 MC1.20.6/src/main/resources/fabric.mod.json create mode 100644 MC1.20.6/src/main/resources/roses_mod.mixins.json create mode 100644 legacy/build.gradle create mode 100644 legacy/gradle.properties create mode 100644 legacy/settings.gradle create mode 100644 legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java create mode 100644 legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java create mode 100644 legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java create mode 100644 legacy/src/main/resources/LICENSE create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/potted_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/blockstates/rose_flower.json create mode 100644 legacy/src/main/resources/assets/roses_mod/icon.png create mode 100644 legacy/src/main/resources/assets/roses_mod/lang/en_us.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/potted_cyan.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/potted_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/block/rose_flower.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/assets/roses_mod/models/item/rose_flower.json create mode 100644 legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png create mode 100644 legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png create mode 100644 legacy/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png create mode 100644 legacy/src/main/resources/assets/roses_mod/textures/block/rose_flower.png create mode 100644 legacy/src/main/resources/data/minecraft/tags/blocks/flower_pots.json create mode 100644 legacy/src/main/resources/data/minecraft/tags/blocks/small_flowers.json create mode 100644 legacy/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json create mode 100644 legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json create mode 100644 legacy/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json create mode 100644 legacy/src/main/resources/data/roses_mod/recipes/cyan_dye.json create mode 100644 legacy/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/recipes/red_dye.json create mode 100644 legacy/src/main/resources/data/roses_mod/recipes/rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json create mode 100644 legacy/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json create mode 100644 legacy/src/main/resources/quilt.mod.json create mode 100644 settings.gradle.kts diff --git a/MC1.20.6/build.gradle.kts b/MC1.20.6/build.gradle.kts new file mode 100644 index 0000000..914c06e --- /dev/null +++ b/MC1.20.6/build.gradle.kts @@ -0,0 +1,78 @@ +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/client/roses_modClient.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt new file mode 100644 index 0000000..d77d34c --- /dev/null +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt @@ -0,0 +1,9 @@ +package observer.nelle.roses_mod.client + +import net.fabricmc.api.ClientModInitializer + +class roses_modClient : ClientModInitializer { + + override fun onInitializeClient() { + } +} diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt new file mode 100644 index 0000000..d08d260 --- /dev/null +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt @@ -0,0 +1,16 @@ +@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") + +package observer.nelle.roses_mod + +import net.fabricmc.api.ModInitializer +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +val LOGGER: Logger = LoggerFactory.getLogger("roses") +val MOD_ID = "roses_mod" + +class roses_mod : ModInitializer { + override fun onInitialize() { + LOGGER.info("just like old times?") + } +} 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..12c38da --- /dev/null +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -0,0 +1,30 @@ +{ + "schemaVersion": 1, + "id": "roses_mod", + "version": "${version}", + + "name": "roses", + "description": "", + "authors": [], + "contact": {}, + + "license": "AGPL-3.0", + "icon": "assets/roses_mod/icon.png", + + "environment": "*", + "entrypoints": { + "client": ["observer.nelle.roses_mod.client.roses_modClient"], + "main": ["observer.nelle.roses_mod.roses_mod"] + }, + + "mixins": [ + "roses_mod.mixins.json" + ], + + "depends": { + "fabricloader": ">=${loader_version}", + "fabric-language-kotlin": ">=${kotlin_loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod.mixins.json b/MC1.20.6/src/main/resources/roses_mod.mixins.json new file mode 100644 index 0000000..9bb0d36 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod.mixins.json @@ -0,0 +1,13 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "observer.nelle.roses_mod.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/legacy/build.gradle b/legacy/build.gradle new file mode 100644 index 0000000..f64bf6c --- /dev/null +++ b/legacy/build.gradle @@ -0,0 +1,103 @@ +plugins { + id "com.modrinth.minotaur" version "2.+" + id 'maven-publish' + id "org.quiltmc.loom" version "1.2.+" +} + +archivesBaseName = project.archives_base_name +version = "${project.version}" +group = project.maven_group + +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. +} + +// 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("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 { + inputs.property 'version', version + + filesMatching('quilt.mod.json') { + expand "version": version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.encoding = 'UTF-8' + // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. + it.options.release = 21 +} + +java { + // Still required by IDEs such as Eclipse and Visual Studio Code + 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. + withSourcesJar() + + // If this mod is going to be a library, then it should also generate Javadocs in order to aid with development. + // Uncomment this line to generate them. + // withJavadocJar() +} + +// If you plan to use a different file for the license, don't forget to change the file name here! +jar { + from('LICENSE') { + rename { "${it}_${archivesBaseName}" } + } +} + +//modrinth + +tasks.modrinth.dependsOn(tasks.modrinthSyncBody) + +modrinth { + token = System.getenv("MODRINTH_TOKEN") // Please use an environment variable for this! The default is `$MODRINTH_TOKEN`. + projectId = "roses-quilt" // The ID of your Modrinth project. Slugs will not work. + versionNumber = version // The (preferably SemVer) version of the mod. If not specified, it'll use the `version` declaration + versionType = "release" // This is the default -- can also be `beta` or `alpha` + uploadFile = remapJar // Tells Minotaur to use the remapped jar + gameVersions = ["1.20", "1.20.1"] // An array of game versions the version supports + loaders = ["quilt"] // Self-explanatory. + changelog = "changed log! (wait about a minute, and refresh, it will be here)" + dependencies { // A special DSL for creating dependencies + // scope.type + // The scope can be `required`, `optional`, `incompatible`, or `embedded` + // The type can either be `project` or `version` + 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 = file("../README.md").text +} + + +// Configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} 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/legacy/settings.gradle b/legacy/settings.gradle new file mode 100644 index 0000000..d969e34 --- /dev/null +++ b/legacy/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { + name = 'Quilt' + url = 'https://maven.quiltmc.org/repository/release' + } + // Currently needed for Intermediary and other temporary dependencies + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java b/legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java new file mode 100644 index 0000000..3b5ce9e --- /dev/null +++ b/legacy/src/main/java/observer/nelle/roses_mod/RosesMod.java @@ -0,0 +1,85 @@ +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.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.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.world.gen.GenerationStep; +import observer.nelle.roses_mod.world.gen.ModFlowerGeneration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static observer.nelle.roses_mod.world.gen.ModFlowerGeneration.*; + +public class RosesMod implements ModInitializer { + public static final String MOD_ID = "roses_mod"; + public static final Logger LOGGER = LoggerFactory.getLogger("Roses Mod"); + + //ROSE + 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, 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(FabricBlockSettings.copyOf(Blocks.LARGE_FERN)); + + @Override + public void onInitialize() { + //REGISTER WORLDGEN + ModFlowerGeneration.generateFlowers(); + + //BIOME MOD + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, ROSE_FLOWER_PLACED_KEY); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, CYAN_ROSE_FLOWER_PLACED_KEY); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.VEGETAL_DECORATION, CYAN_ROSE_BUSH_PLACED_KEY); + + //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 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 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 Item.Settings())); + + //CREATIVE TABS + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.POPPY, ROSE_FLOWER)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.BLUE_ORCHID, CYAN_ROSE)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> content.addAfter(Items.ROSE_BUSH, CYAN_ROSE_BUSH)); + + + /* TODO: Uncomment and update + //LOOT TABLES + 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/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java new file mode 100644 index 0000000..85231cb --- /dev/null +++ b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java @@ -0,0 +1,21 @@ +package observer.nelle.roses_mod; + + +import net.fabricmc.api.ClientModInitializer; + +public class RosesModClient implements ClientModInitializer { + public void onInitializeClient() { + /* TODO: Uncomment and update + //ROSE FLOWER + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_ROSE); + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.ROSE_FLOWER); + + //CYAN ROSE + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_CYAN); + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE); + + //CYAN ROSE BUSH + BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE_BUSH); + */ + } +} diff --git a/legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java b/legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java new file mode 100644 index 0000000..6ab9102 --- /dev/null +++ b/legacy/src/main/java/observer/nelle/roses_mod/world/gen/ModFlowerGeneration.java @@ -0,0 +1,18 @@ +package observer.nelle.roses_mod.world.gen; + +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.world.gen.feature.PlacedFeature; +import observer.nelle.roses_mod.RosesMod; + +public class ModFlowerGeneration { + + public static final RegistryKey ROSE_FLOWER_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","rose_flower")); + public static final RegistryKey CYAN_ROSE_FLOWER_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","cyan_rose_flower")); + public static final RegistryKey CYAN_ROSE_BUSH_PLACED_KEY = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier("roses_mod","cyan_rose_bush")); + + public static void generateFlowers() { + RosesMod.LOGGER.debug("Registering Features..."); + } +} diff --git a/legacy/src/main/resources/LICENSE b/legacy/src/main/resources/LICENSE new file mode 100644 index 0000000..e016fe8 --- /dev/null +++ b/legacy/src/main/resources/LICENSE @@ -0,0 +1,438 @@ +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. + 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 0000000000000000000000000000000000000000..38fcde9d5e8f820e0566f7e40ab124bc87a091a5 GIT binary patch literal 7582 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..882a660bb3e08bb8ee18ab4fc359fd2dbe0123e3 GIT binary patch literal 6255 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cfe9caace8c1ee8d02304238510b49d79ae43146 GIT binary patch literal 5841 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..51d9847ccf92bf06ddceea8e8f0593a9e7a382c0 GIT binary patch literal 248 zcmV{JvIDdY^=~bK(-`M#6&;Ij`!GW2D;l+O@1_{Q04En!+V5rAx zzy($gu+1Q#&cwzr>-RT?{C|J2s>SPq!~gy;-1zq!Y>)#pGx06}X#lyxwebhT?>h_( zALikXZoKIr%GLD$vfZcgs=+A<(!AU8G{fsE{D}>(=>ka%|5;TS@ESreDT}o+{CC}N y#;|nvDbivA6p$cqY?D1rejtJj0eJ&oEC2wZ(LWK4E050r0000=0.26.3" + }, + { + "id": "quilted_fabric_api", + "versions": ">=10.0.0-alpha.3+0.100.4-1.20.6" + }, + { + "id": "minecraft", + "versions": "1.20" + } + ] + }, + "modmenu:api": true, + "modmenu": { + "update_checker": true + } +} + diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..073f82f --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,39 @@ +// 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 + +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") + +rootProject.name = "roses_mod" +include("legacy") -- 2.47.0 From 0ad5d0090a463dc2e632ef09d665ee60ba5be326 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:26:28 -0700 Subject: [PATCH 13/18] move resources over --- .../nelle/roses_mod/client/roses_modClient.kt | 3 +- .../minecraft/tags/blocks/flower_pots.json | 7 ++++ .../minecraft/tags/blocks/small_flowers.json | 7 ++++ .../minecraft/tags/blocks/tall_flowers.json | 6 +++ .../loot_tables/blocks/cyan_rose.json | 14 +++++++ .../loot_tables/blocks/cyan_rose_bush.json | 14 +++++++ .../loot_tables/blocks/rose_flower.json | 14 +++++++ .../data/roses_mod/recipes/cyan_dye.json | 17 +++++++++ .../roses_mod/recipes/cyan_rose_bush.json | 17 +++++++++ .../data/roses_mod/recipes/red_dye.json | 14 +++++++ .../data/roses_mod/recipes/rose_bush.json | 17 +++++++++ .../configured_feature/cyan_rose_bush.json | 33 +++++++++++++++++ .../configured_feature/cyan_rose_flower.json | 35 ++++++++++++++++++ .../configured_feature/rose_flower.json | 35 ++++++++++++++++++ .../placed_feature/cyan_rose_bush.json | 19 ++++++++++ .../placed_feature/cyan_rose_flower.json | 19 ++++++++++ .../worldgen/placed_feature/rose_flower.json | 19 ++++++++++ MC1.20.6/src/main/resources/fabric.mod.json | 1 - .../src/main/resources/roses_mod.mixins.json | 13 ------- .../roses_mod/blockstates/cyan_rose.json | 5 +++ .../roses_mod/blockstates/cyan_rose_bush.json | 10 +++++ .../roses_mod/blockstates/potted_cyan.json | 5 +++ .../roses_mod/blockstates/potted_rose.json | 5 +++ .../roses_mod/blockstates/rose_flower.json | 5 +++ .../src/main/resources/roses_mod/icon.png | Bin 0 -> 7582 bytes .../main/resources/roses_mod/lang/en_us.json | 7 ++++ .../roses_mod/models/block/cyan_rose.json | 6 +++ .../models/block/cyan_rose_bush_bottom.json | 6 +++ .../models/block/cyan_rose_bush_top.json | 6 +++ .../roses_mod/models/block/potted_cyan.json | 6 +++ .../roses_mod/models/block/potted_rose.json | 6 +++ .../roses_mod/models/block/rose_flower.json | 6 +++ .../roses_mod/models/item/cyan_rose.json | 6 +++ .../roses_mod/models/item/cyan_rose_bush.json | 6 +++ .../roses_mod/models/item/rose_flower.json | 6 +++ .../roses_mod/textures/block/cyan_rose.png | Bin 0 -> 237 bytes .../textures/block/cyan_rose_bush_bottom.png | Bin 0 -> 6255 bytes .../textures/block/cyan_rose_bush_top.png | Bin 0 -> 5841 bytes .../roses_mod/textures/block/rose_flower.png | Bin 0 -> 248 bytes settings.gradle.kts | 3 +- 40 files changed, 381 insertions(+), 17 deletions(-) create mode 100644 MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json create mode 100644 MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json create mode 100644 MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json create mode 100644 MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json delete mode 100644 MC1.20.6/src/main/resources/roses_mod.mixins.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/icon.png create mode 100644 MC1.20.6/src/main/resources/roses_mod/lang/en_us.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_bottom.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_top.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/potted_cyan.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/potted_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/block/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose_bush.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/models/item/rose_flower.json create mode 100644 MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose.png create mode 100644 MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png create mode 100644 MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png create mode 100644 MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt index d77d34c..b7e1283 100644 --- a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt @@ -1,9 +1,10 @@ +@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") + package observer.nelle.roses_mod.client import net.fabricmc.api.ClientModInitializer class roses_modClient : ClientModInitializer { - override fun onInitializeClient() { } } diff --git a/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json new file mode 100644 index 0000000..6ca60b7 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json new file mode 100644 index 0000000..fdecf80 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json new file mode 100644 index 0000000..308ea91 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json new file mode 100644 index 0000000..9e19db2 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json new file mode 100644 index 0000000..e015922 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json new file mode 100644 index 0000000..6994a61 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json new file mode 100644 index 0000000..20a5789 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json new file mode 100644 index 0000000..38111c3 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json new file mode 100644 index 0000000..e02ef06 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json new file mode 100644 index 0000000..bd23660 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json new file mode 100644 index 0000000..4a7ecb1 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json new file mode 100644 index 0000000..eee2d69 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json new file mode 100644 index 0000000..4449e17 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json new file mode 100644 index 0000000..5aa23d1 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json new file mode 100644 index 0000000..8d06035 --- /dev/null +++ b/MC1.20.6/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/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index 12c38da..d3d81b0 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -18,7 +18,6 @@ }, "mixins": [ - "roses_mod.mixins.json" ], "depends": { diff --git a/MC1.20.6/src/main/resources/roses_mod.mixins.json b/MC1.20.6/src/main/resources/roses_mod.mixins.json deleted file mode 100644 index 9bb0d36..0000000 --- a/MC1.20.6/src/main/resources/roses_mod.mixins.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "observer.nelle.roses_mod.mixin", - "compatibilityLevel": "JAVA_21", - "mixins": [ - ], - "client": [ - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json new file mode 100644 index 0000000..6be127f --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/cyan_rose"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json new file mode 100644 index 0000000..eaf06c4 --- /dev/null +++ b/MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json new file mode 100644 index 0000000..dedd97a --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_cyan"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json new file mode 100644 index 0000000..4f5619d --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_rose"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json new file mode 100644 index 0000000..66aeb91 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/rose_flower"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/icon.png b/MC1.20.6/src/main/resources/roses_mod/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..38fcde9d5e8f820e0566f7e40ab124bc87a091a5 GIT binary patch literal 7582 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 literal 0 HcmV?d00001 diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..882a660bb3e08bb8ee18ab4fc359fd2dbe0123e3 GIT binary patch literal 6255 zcmeHKc{G&m`yWfPQ-~~?ChCpGEN0BYkcMU?OV*OgEYC2EnK3gMTdP8{wDSsiD@%$* zB9$bv)2fI{B0`G_#oO;0?dSJB=XW~i_x-P#^K94hxv%SUUHARmPlBs6MMY6p5dwjz zI8g1}z^l6Cke36`hU1@U5QyCINRRa*H(EH9FW|A*8~`ec-~&)V%w|C#;;vKcHnvu^n@5NbXC8I6-m3|if9U*X?8qB`%ZC}pP5D#WWS?+KWw_DB(U-OA z#jA2DrM=}jWhx5As$Ft#6`S{*e1na>?ftNgDw=7D#$TzL`LJlm=J7O2T2<NZgWR;{{iMASKX%gprUzL?`S+ZY%FN=rPf3X)%|I;{LWpXN(g`_xpXb7#_IL|XjK zOup&)OE9g!&z3(aIuvi)38f^VRfZ`W3a;DV>_Jx02bu&JlL|*)wWU3m*?ieJC(Y>l zyTX=5Pp!IH*61Z{$xW-Aw+CILW8m;Q?&8!PwfZ#29Sy^~wWjG=ezi%BkD}>1Iyoh_ z@8@0{oVmQTSXyqzF2ZcTtY0&Foz=`=JM`_8oc2HFEG0^-tkC?ITM6*VR@8`>iJT||5J zn>Jq_@11LSz1&_L-3?x}I3J^D)_fhTN$r_L}AX zE$KAEvzPm%2-;?DzHf44=O-TV5ZHh8@QzWzdYvs8sCUwRcVhQ~jPkpJykw8zqECw= zN4nhGWeO~ADC4H(m#7-B`x7rXz3iTud*&7^NiBEanz&@oeH|AK%<~&AZ7X&3D1KJX zim4q|gwi!_ZM$no0}IK&W>{K+r%x_gbm=BGVkjqh{?^Ct!mk# zq^g%(nLN>+W&FOJbEC^GTsB}qRl^$99)tkvHf&80?rYIa+%;ZUdhQ~Xy@}%S>bw`A^AY+1KXj4|wAda-$+xeon;c;n=xqrt*^Qfw6Pj{8 zU<+qv?1&FPB!X=2ILGrXT%O;A99V4Eq^ku+S&=bf4Rcukt#<~D*52dKckjz z-g`6rizb9RCLMnjH52m3=BgeJGa{ue+K*k#eHX8*8}RJpy8MPkr?G)O^_Zx=@qtES+TXP5eHaMfyUgyUS8w%vP zoO#H-qoe$S?a5`pxmDAL%MI}!|5VcYtaP+^qkGuDC*cK)YYcjv9%H3b(L=?T+l?+mRnGr}VXkUbl6eYR(zl z_^{hTi(gUo2z%#oCYgLZT|V&D-3O&JZHHW6!A@xhj-7edpZ)jM(F~jJ0UZDFwPfS0 z2+dTZ9YyY)o;-Zj?E(>XKfg_B^QtmNl*jSXVoK>z@m2PK@z#dRXK!)xwPQG29ybjZ zg_4_mgDw^D^1|ljJy%L@5jjqqAGo-(rE-r<8EkhDW2E)p^6a?RE!6>1s8*K+TJXoc9-{~`n;wVO>QyE>4`-`-W=8|qlheiF6T zRdctCyJMn<{s^=$HRn=*_Tj$ug|4xRIbH$xYWh!Y>o{rb5E7#4tEBqx3NHiSW1*pZ zE!i4Fb#Luu_S(zeTs_$Vt5-^y2(D)*?Ee(`NtKNP+g&JYnd;shMpRROwX^>6nI{1DA}%yX-GDlR@>Ts ze}%J4rNdJrb#cjP3JO}GRF+Xb6T|5q)wuRq*>`BuwzG3uwjSsm3B0w$kFQrzF&5ag zh+iqAY;zAFhZ)(xbJolDw!g@Dd#wZBQ9aOhR+xNeF4VDf&11;ixNG8s^PQw#gW=5X zYEtIZ45WBUP%XTcw+P%+h}q!gVZGB@B7+xfMq~2mfSEX$4{k0X5GxxopT-CRL{K{5 z&*qX~ud1qHP&ShU^Ts+Mo%m!RfK81Q0Pc~_9*oE!27w8)u~xJa6G4DrKtzLzgE?Fw zQA~o(;u67oi5LNc&YFmVNU-%zu23>h06;Nj7&9c?Ud#?d!>kpdRstrA=w`S2D+KsN zf(3{~d?Er79v*HMZf?dC_#;pR0s(yK0 z=mGA*5N?2w7b;)?_F({5wB%<9CgZz5KUBb(O^3-q0309~G!=rQqJ9~Y;^5@^-9tiw zKRcK|>jjeii=~Lo`a#w&u}L(u>HHiB=>8q|7wd1i&l-bPPEJHS9wSr|o`W3;CK;c| z2U&6z(zxCq!_SJF5?M3A% zj=?}N&EX7!1p|)3nq%Mu3JVvwG%j< zm^2a1jwS*?P$b%%h(r;QI1eB3c?7uv+jEvH z=wGviTK=nbcmN=&0!SDfi2_ObMi}lZVTi8@BP46aw~Vb2|BDl=S%aSz8PM;G3|zdx zwGi=rG5pFI81H}c_q7)P%^{%BKZE=hzklfZL)ULH@LR@zy6X>Jzs10B8UN|7|2Mi6 ze|$~>TyPf@4t^|!TzuIIerUCdY{w ztIYEvYNM-Lq6a@6hjVQ<9opf$dgnyLz9TI+QX$Iy=(Cqenw#j*qx-MiGr*!x)OF1y znv3V%{6MvimRVW5*R8_l3}heI&oNGl&q&tgd8esFE0J~k?FNi5G{WJUF4QZmGT=xzJGwu(%K#5kZg7Z z60l>&6s7BR=$3aOJ-<0-GC`B&g6JL4b*{5d+4DL@ZQXVcQ!1=3DGE_?U@4?8tB+TN zwHH;#EbhPiW~<>kc*~6U3`N1y^bX$r@-8$m!h#SV+wXE`*ap^?eZW$um<(XVIz76Iw@9Pf*Bst)p%Q5k8qXpNLP! z#A7<=q(Mm!{h27THCA`O&TgoxzeYRpj5*gDtnCH+}VEDc|IhxH(*}+%+ifY rVG~-bS!J@`FIfJik2&w>T-b(@nZE>G5e2pw1ma-tY*)0(Z|DC2Q+wZ) literal 0 HcmV?d00001 diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe9caace8c1ee8d02304238510b49d79ae43146 GIT binary patch literal 5841 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 literal 0 HcmV?d00001 diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png new file mode 100644 index 0000000000000000000000000000000000000000..51d9847ccf92bf06ddceea8e8f0593a9e7a382c0 GIT binary patch literal 248 zcmV{JvIDdY^=~bK(-`M#6&;Ij`!GW2D;l+O@1_{Q04En!+V5rAx zzy($gu+1Q#&cwzr>-RT?{C|J2s>SPq!~gy;-1zq!Y>)#pGx06}X#lyxwebhT?>h_( zALikXZoKIr%GLD$vfZcgs=+A<(!AU8G{fsE{D}>(=>ka%|5;TS@ESreDT}o+{CC}N y#;|nvDbivA6p$cqY?D1rejtJj0eJ&oEC2wZ(LWK4E050r0000 Date: Wed, 18 Dec 2024 21:29:56 -0700 Subject: [PATCH 14/18] ah i see --- MC1.20.6/src/main/resources/fabric.mod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index d3d81b0..18ffb87 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -9,7 +9,7 @@ "contact": {}, "license": "AGPL-3.0", - "icon": "assets/roses_mod/icon.png", + "icon": "roses_mod/icon.png", "environment": "*", "entrypoints": { -- 2.47.0 From 34f4705b2735d6bb5f0af3587d2d6695c1ee50ed Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:43:08 -0700 Subject: [PATCH 15/18] convert mod.json --- MC1.20.6/src/main/resources/fabric.mod.json | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index 18ffb87..147795d 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -3,12 +3,14 @@ "id": "roses_mod", "version": "${version}", - "name": "roses", - "description": "", - "authors": [], + "name": "Roses Mod", + "description": "Reinstates the classic roses to Minecraft.", + "authors": [ + "nellePoint" + ], "contact": {}, - "license": "AGPL-3.0", + "license": "LGPL-3.0", "icon": "roses_mod/icon.png", "environment": "*", @@ -25,5 +27,10 @@ "fabric-language-kotlin": ">=${kotlin_loader_version}", "fabric": "*", "minecraft": "${minecraft_version}" + }, + + "modmenu:api": true, + "modmenu": { + "update_checker": true } } -- 2.47.0 From a01450f84e40609840d821d67355c75a64706cc3 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:43:21 -0700 Subject: [PATCH 16/18] license to LGPL-3.0 --- LICENSE.txt | 841 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 841 insertions(+) create mode 100644 LICENSE.txt 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 +. + -- 2.47.0 From 311da5a8977d811e1a5e7604c4ccd6222a683991 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 21:44:50 -0700 Subject: [PATCH 17/18] add contact --- MC1.20.6/src/main/resources/fabric.mod.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index 147795d..b2d3e8f 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -8,7 +8,11 @@ "authors": [ "nellePoint" ], - "contact": {}, + "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": "roses_mod/icon.png", -- 2.47.0 From ea886c471c32747c66ddf508c77fc23b5cdb6507 Mon Sep 17 00:00:00 2001 From: nelle Date: Wed, 18 Dec 2024 23:02:14 -0700 Subject: [PATCH 18/18] =?UTF-8?q?WE=20HAVE=20ROSES=20=EF=BC=BC(=E2=89=A7?= =?UTF-8?q?=E2=96=BD=E2=89=A6)=EF=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MC1.20.6/build.gradle.kts | 1 - .../observer/nelle/roses_mod/RosesBlocks.kt | 50 ++++++++++++++++++ .../observer/nelle/roses_mod/RosesMod.kt | 30 +++++++++++ .../nelle/roses_mod/client/RosesModClient.kt | 14 +++++ .../nelle/roses_mod/client/roses_modClient.kt | 10 ---- .../observer/nelle/roses_mod/roses_mod.kt | 16 ------ .../roses_mod/blockstates/cyan_rose.json | 0 .../roses_mod/blockstates/cyan_rose_bush.json | 0 .../roses_mod/blockstates/potted_cyan.json | 0 .../roses_mod/blockstates/potted_rose.json | 0 .../roses_mod/blockstates/rose_flower.json | 0 .../resources/{ => assets}/roses_mod/icon.png | Bin .../{ => assets}/roses_mod/lang/en_us.json | 0 .../roses_mod/models/block/cyan_rose.json | 0 .../models/block/cyan_rose_bush_bottom.json | 0 .../models/block/cyan_rose_bush_top.json | 0 .../roses_mod/models/block/potted_cyan.json | 0 .../roses_mod/models/block/potted_rose.json | 0 .../roses_mod/models/block/rose_flower.json | 0 .../roses_mod/models/item/cyan_rose.json | 0 .../roses_mod/models/item/cyan_rose_bush.json | 0 .../roses_mod/models/item/rose_flower.json | 0 .../roses_mod/textures/block/cyan_rose.png | Bin .../textures/block/cyan_rose_bush_bottom.png | Bin .../textures/block/cyan_rose_bush_top.png | Bin .../roses_mod/textures/block/rose_flower.png | Bin MC1.20.6/src/main/resources/fabric.mod.json | 11 ++-- .../minecraft/tags/blocks/flower_pots.json | 0 .../minecraft/tags/blocks/small_flowers.json | 0 .../minecraft/tags/blocks/tall_flowers.json | 0 .../loot_tables/blocks/cyan_rose.json | 0 .../loot_tables/blocks/cyan_rose_bush.json | 0 .../loot_tables/blocks/rose_flower.json | 0 .../data/roses_mod/recipes/cyan_dye.json | 0 .../roses_mod/recipes/cyan_rose_bush.json | 0 .../data/roses_mod/recipes/red_dye.json | 0 .../data/roses_mod/recipes/rose_bush.json | 0 .../configured_feature/cyan_rose_bush.json | 0 .../configured_feature/cyan_rose_flower.json | 0 .../configured_feature/rose_flower.json | 0 .../placed_feature/cyan_rose_bush.json | 0 .../placed_feature/cyan_rose_flower.json | 0 .../worldgen/placed_feature/rose_flower.json | 0 .../nelle/roses_mod/RosesModClient.java | 10 ++-- 44 files changed, 103 insertions(+), 39 deletions(-) create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesBlocks.kt create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/RosesMod.kt create mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/RosesModClient.kt delete mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt delete mode 100644 MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/cyan_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/potted_cyan.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/potted_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/blockstates/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/icon.png (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/lang/en_us.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/cyan_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/cyan_rose_bush_bottom.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/cyan_rose_bush_top.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/potted_cyan.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/potted_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/block/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/item/cyan_rose.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/item/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/models/item/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/textures/block/cyan_rose.png (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/textures/block/cyan_rose_bush_bottom.png (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/textures/block/cyan_rose_bush_top.png (100%) rename MC1.20.6/src/main/resources/{ => assets}/roses_mod/textures/block/rose_flower.png (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/minecraft/tags/blocks/flower_pots.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/minecraft/tags/blocks/small_flowers.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/minecraft/tags/blocks/tall_flowers.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/loot_tables/blocks/cyan_rose.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/loot_tables/blocks/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/recipes/cyan_dye.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/recipes/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/recipes/red_dye.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/recipes/rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/configured_feature/rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json (100%) rename MC1.20.6/src/main/resources/{ => ignore}/data/roses_mod/worldgen/placed_feature/rose_flower.json (100%) diff --git a/MC1.20.6/build.gradle.kts b/MC1.20.6/build.gradle.kts index 914c06e..7d6ef3c 100644 --- a/MC1.20.6/build.gradle.kts +++ b/MC1.20.6/build.gradle.kts @@ -38,7 +38,6 @@ dependencies { 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")}") } 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/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt deleted file mode 100644 index b7e1283..0000000 --- a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") - -package observer.nelle.roses_mod.client - -import net.fabricmc.api.ClientModInitializer - -class roses_modClient : ClientModInitializer { - override fun onInitializeClient() { - } -} diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt deleted file mode 100644 index d08d260..0000000 --- a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/roses_mod.kt +++ /dev/null @@ -1,16 +0,0 @@ -@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") - -package observer.nelle.roses_mod - -import net.fabricmc.api.ModInitializer -import org.slf4j.Logger -import org.slf4j.LoggerFactory - -val LOGGER: Logger = LoggerFactory.getLogger("roses") -val MOD_ID = "roses_mod" - -class roses_mod : ModInitializer { - override fun onInitialize() { - LOGGER.info("just like old times?") - } -} diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/potted_rose.json diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json rename to MC1.20.6/src/main/resources/assets/roses_mod/blockstates/rose_flower.json diff --git a/MC1.20.6/src/main/resources/roses_mod/icon.png b/MC1.20.6/src/main/resources/assets/roses_mod/icon.png similarity index 100% rename from MC1.20.6/src/main/resources/roses_mod/icon.png rename to MC1.20.6/src/main/resources/assets/roses_mod/icon.png diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/roses_mod/lang/en_us.json rename to MC1.20.6/src/main/resources/assets/roses_mod/lang/en_us.json diff --git a/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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/MC1.20.6/src/main/resources/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 MC1.20.6/src/main/resources/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 index b2d3e8f..4fb9c11 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -15,11 +15,13 @@ }, "license": "LGPL-3.0", - "icon": "roses_mod/icon.png", + "icon": "assets/roses_mod/icon.png", "environment": "*", "entrypoints": { - "client": ["observer.nelle.roses_mod.client.roses_modClient"], + "client": [ + "observer.nelle.roses_mod.client.RosesModClient" + ], "main": ["observer.nelle.roses_mod.roses_mod"] }, @@ -31,10 +33,5 @@ "fabric-language-kotlin": ">=${kotlin_loader_version}", "fabric": "*", "minecraft": "${minecraft_version}" - }, - - "modmenu:api": true, - "modmenu": { - "update_checker": true } } diff --git a/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/MC1.20.6/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 MC1.20.6/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/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java index 85231cb..0714f52 100644 --- a/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java +++ b/legacy/src/main/java/observer/nelle/roses_mod/RosesModClient.java @@ -4,9 +4,8 @@ package observer.nelle.roses_mod; import net.fabricmc.api.ClientModInitializer; public class RosesModClient implements ClientModInitializer { - public void onInitializeClient() { - /* TODO: Uncomment and update - //ROSE FLOWER + public void onInitializeClient() {//ROSE FLOWER + /* BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.POTTED_ROSE); BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.ROSE_FLOWER); @@ -16,6 +15,7 @@ public class RosesModClient implements ClientModInitializer { //CYAN ROSE BUSH BlockRenderLayerMap.put(RenderLayer.getCutout(), RosesMod.CYAN_ROSE_BUSH); - */ - } + + */} + } -- 2.47.0