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 943f0cb..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37aef8d..2a54bcd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ +#Wed Dec 18 18:56:42 MST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip -networkTimeout=10000 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,11 +80,11 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,16 +143,12 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -209,12 +205,6 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,8 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/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 38fcde9..0000000 Binary files a/src/main/resources/assets/roses_mod/icon.png and /dev/null differ diff --git a/src/main/resources/assets/roses_mod/lang/en_us.json b/src/main/resources/assets/roses_mod/lang/en_us.json deleted file mode 100644 index 3c022ca..0000000 --- a/src/main/resources/assets/roses_mod/lang/en_us.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "block.roses_mod.rose_flower": "Rose", - "block.roses_mod.potted_rose": "Potted Rose", - "block.roses_mod.cyan_rose": "Cyan Rose", - "block.roses_mod.potted_cyan": "Potted Cyan Rose", - "block.roses_mod.cyan_rose_bush": "Cyan Rose Bush" -} diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose.json b/src/main/resources/assets/roses_mod/models/block/cyan_rose.json deleted file mode 100644 index 4b02866..0000000 --- a/src/main/resources/assets/roses_mod/models/block/cyan_rose.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "roses_mod:block/cyan_rose" - } -} diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json deleted file mode 100644 index 95d7c86..0000000 --- a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "roses_mod:block/cyan_rose_bush_bottom" - } -} diff --git a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json b/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json deleted file mode 100644 index 24e8cb0..0000000 --- a/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "roses_mod:block/cyan_rose_bush_top" - } -} diff --git a/src/main/resources/assets/roses_mod/models/block/potted_cyan.json b/src/main/resources/assets/roses_mod/models/block/potted_cyan.json deleted file mode 100644 index 8626450..0000000 --- a/src/main/resources/assets/roses_mod/models/block/potted_cyan.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "roses_mod:block/cyan_rose" - } -} diff --git a/src/main/resources/assets/roses_mod/models/block/potted_rose.json b/src/main/resources/assets/roses_mod/models/block/potted_rose.json deleted file mode 100644 index fe3887b..0000000 --- a/src/main/resources/assets/roses_mod/models/block/potted_rose.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/flower_pot_cross", - "textures": { - "plant": "roses_mod:block/rose_flower" - } -} diff --git a/src/main/resources/assets/roses_mod/models/block/rose_flower.json b/src/main/resources/assets/roses_mod/models/block/rose_flower.json deleted file mode 100644 index ba4e661..0000000 --- a/src/main/resources/assets/roses_mod/models/block/rose_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cross", - "textures": { - "cross": "roses_mod:block/rose_flower" - } -} diff --git a/src/main/resources/assets/roses_mod/models/item/cyan_rose.json b/src/main/resources/assets/roses_mod/models/item/cyan_rose.json deleted file mode 100644 index 90d07d1..0000000 --- a/src/main/resources/assets/roses_mod/models/item/cyan_rose.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "roses_mod:block/cyan_rose" - } -} diff --git a/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json b/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json deleted file mode 100644 index 423fb79..0000000 --- a/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "roses_mod:block/cyan_rose_bush_top" - } -} diff --git a/src/main/resources/assets/roses_mod/models/item/rose_flower.json b/src/main/resources/assets/roses_mod/models/item/rose_flower.json deleted file mode 100644 index 11dc496..0000000 --- a/src/main/resources/assets/roses_mod/models/item/rose_flower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "roses_mod:block/rose_flower" - } -} diff --git a/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png b/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png deleted file mode 100644 index b466404..0000000 Binary files a/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png and /dev/null differ 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 882a660..0000000 Binary files a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png and /dev/null differ 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 cfe9caa..0000000 Binary files a/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png and /dev/null differ 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 51d9847..0000000 Binary files a/src/main/resources/assets/roses_mod/textures/block/rose_flower.png and /dev/null differ diff --git a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/src/main/resources/data/minecraft/tags/blocks/flower_pots.json deleted file mode 100644 index 6ca60b7..0000000 --- a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "roses_mod:potted_rose", - "roses_mod:cyan_rose" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/src/main/resources/data/minecraft/tags/blocks/small_flowers.json deleted file mode 100644 index fdecf80..0000000 --- a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "roses_mod:rose_flower", - "roses_mod:cyan_rose" - ] -} diff --git a/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json deleted file mode 100644 index ad83bf8..0000000 --- a/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "roses_mod:cyan_rose_bush" - ] -} diff --git a/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json b/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json deleted file mode 100644 index 308ea91..0000000 --- a/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "roses_mod:cyan_rose" - } - ] - } - ] -} diff --git a/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json deleted file mode 100644 index 9e19db2..0000000 --- a/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 2, - "entries": [ - { - "type": "minecraft:item", - "name": "roses_mod:cyan_rose" - } - ] - } - ] -} diff --git a/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json b/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json deleted file mode 100644 index e015922..0000000 --- a/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "roses_mod:rose_flower" - } - ] - } - ] -} diff --git a/src/main/resources/data/roses_mod/recipes/cyan_dye.json b/src/main/resources/data/roses_mod/recipes/cyan_dye.json deleted file mode 100644 index 6994a61..0000000 --- a/src/main/resources/data/roses_mod/recipes/cyan_dye.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json b/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json deleted file mode 100644 index 20a5789..0000000 --- a/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "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/src/main/resources/data/roses_mod/recipes/red_dye.json b/src/main/resources/data/roses_mod/recipes/red_dye.json deleted file mode 100644 index 38111c3..0000000 --- a/src/main/resources/data/roses_mod/recipes/red_dye.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - [ - { - "item": "roses_mod:rose_flower" - } - ] - ], - "result": { - "item": "minecraft:red_dye", - "count": 1 - } -} diff --git a/src/main/resources/data/roses_mod/recipes/rose_bush.json b/src/main/resources/data/roses_mod/recipes/rose_bush.json deleted file mode 100644 index e02ef06..0000000 --- a/src/main/resources/data/roses_mod/recipes/rose_bush.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " ", - " WW", - " WW" - ], - "key": { - "W": { - "item": "roses_mod:rose_flower" - } - }, - "result": { - "item": "minecraft:rose_bush", - "count": 1 - } -} diff --git a/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json b/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json deleted file mode 100644 index bd23660..0000000 --- a/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "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/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json b/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json deleted file mode 100644 index 4a7ecb1..0000000 --- a/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "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/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json b/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json deleted file mode 100644 index eee2d69..0000000 --- a/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "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/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json b/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json deleted file mode 100644 index 4449e17..0000000 --- a/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "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/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json b/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json deleted file mode 100644 index 5aa23d1..0000000 --- a/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "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/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json b/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json deleted file mode 100644 index 8d06035..0000000 --- a/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "roses_mod:rose_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 1 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json deleted file mode 100644 index 2aff202..0000000 --- a/src/main/resources/quilt.mod.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "schema_version": 1, - "quilt_loader": { - "group": "observer.nelle", - "id": "roses_mod", - "version": "${version}", - "metadata": { - "name": "Roses Mod", - "description": "Reinstates the glorious roses to Minecraft.", - "contributors": { - "LimePotato": "Developer" - }, - "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": "Unlicense", - "icon": "assets/roses_mod/icon.png" - }, - "intermediate_mappings": "net.fabricmc:intermediary", - "entrypoints": { - "init": "observer.nelle.roses_mod.RosesMod", - "client_init": "observer.nelle.roses_mod.RosesModClient" - }, - "depends": [ - { - "id": "quilt_loader", - "versions": ">=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 - } -} -