diff --git a/MC1.20.6/build.gradle.kts b/MC1.20.6/build.gradle.kts index 0e8cbe0..949fc51 100644 --- a/MC1.20.6/build.gradle.kts +++ b/MC1.20.6/build.gradle.kts @@ -5,6 +5,7 @@ plugins { java id("org.jetbrains.kotlin.jvm") version "2.1.0" id("fabric-loom") version "1.9-SNAPSHOT" + id("com.modrinth.minotaur") version "2.+" id("maven-publish") } @@ -41,16 +42,33 @@ dependencies { modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") } +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("Hxo4BmMk") + versionNumber.set(project.property("mod_version").toString()) + versionType.set("release") + uploadFile.set(tasks.jar) + gameVersions.addAll("1.20.5", "1.20.6", "1.21", "1.21.1") + loaders.addAll("fabric", "quilt") + dependencies { + // The scope can be `required`, `optional`, `incompatible`, or `embedded` + // The type can either be `project` or `version` + required.project("fabric-api") + required.project("fabric-language-kotlin") + } + syncBodyFrom = rootProject.file("README.md").readText() +} + tasks.processResources { - inputs.property("version", project.version) - inputs.property("minecraft_version", "1.20.6") + inputs.property("version", project.property("mod_version")) + inputs.property("minecraft_version", project.property("minecraft_version")) 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", + "version" to project.property("mod_version"), + "minecraft_version" to project.property("minecraft_version"), "loader_version" to project.property("loader_version"), "kotlin_loader_version" to project.property("kotlin_loader_version"), ) diff --git a/MC1.20.6/gradle.properties b/MC1.20.6/gradle.properties index 811eb32..6afcf74 100644 --- a/MC1.20.6/gradle.properties +++ b/MC1.20.6/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G kotlin_loader_version=1.13.0+kotlin.2.1.0 # Mod Properties - mod_version = 0.0.1-DEV + mod_version = 1.0.0 maven_group = observer.nelle archives_base_name = roses_mod diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index c83e240..1274ad7 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -37,6 +37,6 @@ "fabricloader": ">=${loader_version}", "fabric-language-kotlin": ">=${kotlin_loader_version}", "fabric": "*", - "minecraft": "${minecraft_version}" + "minecraft": "1.20.5-1.21.1" } } diff --git a/README.md b/README.md index 37c8109..7309cd8 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,17 @@ # Roses Mod -## NOTE: all previous versions of minecraft probably have strange bugs in them, due to how i originally built the mod, i am currently rewriting the mod and going to publish builds for each version + +> **Note** +> The mod has been rewritten, previous versions have some bugs and not all bug fixes or features have been backported, +> I will be backporting the mod after this rewrite back as far as I can while being sane. +> +> It's also now based on fabric instead of quilt, as the kotlin support is more frequent. This mod brings back the classic roses and other classic flowers to minecraft, without replacing any newer flower types. Features: - Roses and Potted Roses +- Cyan Flowers (Potted Cyan Flowers) - Rose Bushes drop roses - 2x2 Roses in a crafting table will output a rose bush -- Cyan Flowers - Bees can pollinate all flowers diff --git a/settings.gradle.kts b/settings.gradle.kts index c188975..6e73589 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,7 +32,5 @@ plugins { // Include the `app` and `utils` subprojects in the build. // If there are changes in only one of the projects, Gradle will rebuild only the one that has changed. // Learn more about structuring projects with Gradle - https://docs.gradle.org/8.7/userguide/multi_project_builds.html -// include(":app") -// include(":utils") include(":MC1.20.6") -include("legacy") +include(":legacy")