From 6f63e9dc0ef7f37af3980ecd7691e91ec0cea914 Mon Sep 17 00:00:00 2001 From: FirstMegaGame4 <84094287+FirstMegaGame4@users.noreply.github.com> Date: Sun, 16 Jun 2024 01:01:57 +0200 Subject: [PATCH] Version Bump --- build.gradle | 36 +++++++++++++++++++++++++++ gradle.properties | 10 ++++---- settings.gradle | 15 +++++++++++ src/main/resources/fabric.mod.json | 40 ------------------------------ 4 files changed, 56 insertions(+), 45 deletions(-) delete mode 100644 src/main/resources/fabric.mod.json diff --git a/build.gradle b/build.gradle index bfa5fe4..d33511f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,8 @@ +import com.mmodding.gradle.api.EnvironmentTarget + plugins { id 'fabric-loom' version '1.6-SNAPSHOT' + id 'com.mmodding.gradle' version '0.0.8' id 'maven-publish' } @@ -37,6 +40,39 @@ loom { accessWidenerPath = file("src/main/resources/env_json.accesswidener") } +mmodding { + configureFabricModJson { + namespace = "env_json" + name = "env.json" + description = "env.json is a Minecraft Library introducing a new sub json file extension format, with the goal of redirecting minecraft resources to other ones based on the environment context." + addAuthor("MModding Team") + addContributor("FirstMegaGame4") + withContact { + it.homepage = "https://modrinth.com/mod/env.json" + it.sources = "https://github.com/MModding/env.json" + it.issues = "https://github.com/MModding/env.json/issues" + } + license = "Code: PolyForm-Shield-1.0.0\\nAssets: All Rights Reserved" + icon = "assets/env_json/icon.png" + environment = EnvironmentTarget.ANY + withEntrypoints { + it.init("com.mmodding.env.json.impl.EnvJsonInitializer") + } + accessWidener = "env_json.accesswidener" + addMixin("env_json.mixins.json") + withDependencies { + it.fabricLoaderVersion = ">=" + project.loader_version + it.minecraftVersion = ">=1.20.5 <=" + project.minecraft_version + it.javaVersion = ">=" + 21 + it.fabricApiVersion = "*" + } + withSuggestions { + it.addDependency("env_driven_assets", "*") + it.addDependency("env_driven_data", "*") + } + } +} + processResources { inputs.property "version", project.version diff --git a/gradle.properties b/gradle.properties index f4491b9..b5350ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.6 -yarn_mappings=1.20.6+build.1 -loader_version=0.15.1 +minecraft_version=1.21 +yarn_mappings=1.21+build.2 +loader_version=0.15.11 # Mod Properties -mod_version=0.4.1-beta +mod_version=0.4.2-beta maven_group=com.mmodding.env.json archives_base_name=env_json # Dependencies -fabric_version=0.97.8+1.20.6 \ No newline at end of file +fabric_version=0.100.1+1.21 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 75c4d72..176ca4a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,20 @@ pluginManagement { + resolutionStrategy { + eachPlugin { + if (requested.id.toString() == "com.mmodding.gradle") { + useModule("com.mmodding:mmodding-gradle:${requested.version}") + } + } + } repositories { + maven { + name "JitPack" + url "https://jitpack.io" + } + maven { + name "QuiltMC" + url "https://maven.quiltmc.org/repository/release" + } maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json deleted file mode 100644 index ad9907e..0000000 --- a/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "schemaVersion": 1, - "id": "env_json", - "version": "${version}", - "name": "env.json", - "description": "env.json is a Minecraft Library introducing a new sub json file extension format, with the goal of redirecting minecraft resources to other ones based on the environment context.", - "authors": [ - "MModding Team" - ], - "contributors": [ - "FirstMegaGame4" - ], - "contact": { - "homepage": "https://modrinth.com/mod/env.json", - "sources": "https://github.com/MModding/env.json", - "issues": "https://github.com/MModding/env.json/issues" - }, - "license": "Code: PolyForm-Shield-1.0.0\\nAssets: All Rights Reserved", - "icon": "assets/env_json/icon.png", - "environment": "*", - "entrypoints": { - "main": [ - "com.mmodding.env.json.impl.EnvJsonInitializer" - ] - }, - "accessWidener": "env_json.accesswidener", - "mixins": [ - "env_json.mixins.json" - ], - "depends": { - "fabricloader": ">=0.15.1", - "minecraft": ">=1.20.5 <=1.20.6", - "java": ">=21", - "fabric-api": "*" - }, - "suggests": { - "env_driven_assets": "*", - "env_driven_data": "*" - } -}