From 0bbd19dcedc0968ca2bf24a8f3923337142ef97c Mon Sep 17 00:00:00 2001 From: Wolfie <32025746+Wolfkid200444@users.noreply.github.com> Date: Wed, 1 May 2024 18:49:18 -0400 Subject: [PATCH] Updatte 1.18.2 --- .github/workflows/release.yml | 2 +- build.gradle | 19 +++++++++++-------- gradle.properties | 2 +- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cca47cd..7ac0c17 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: - '**/src/**' - '.github/**' branches: - - 1802 + - 1802-fabric jobs: build: diff --git a/build.gradle b/build.gradle index 1deaadb..e9658a0 100644 --- a/build.gradle +++ b/build.gradle @@ -49,18 +49,21 @@ dependencies { } -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" +processResources { + inputs.property "version", project.version + filteringCharset "UTF-8" - // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too - // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. - // We'll use that if it's available, but otherwise we'll use the older option. - def targetVersion = 8 - if (JavaVersion.current().isJava9Compatible()) { - options.release = targetVersion + filesMatching("fabric.mod.json") { + expand "version": project.version } } +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" + options.release = 17 +} + + jar { from("LICENSE") { rename { "${it}_${archivesBaseName}+${version}" } diff --git a/gradle.properties b/gradle.properties index aa66dfe..84f1608 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2048M minecraft_version=1.18.2 archives_base_name=EmoteTweaks -mod_version=2.0.1 +mod_version=2.0.2 maven_group=dev.bsmp.emoteTweaks fabric_loader_version=0.15.6 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index bd5a9e3..5657241 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,7 +27,7 @@ "depends": { "fabricloader": ">=0.14.9", "fabric": "*", - "minecraft": "1.19.4", + "minecraft": "1.18.2", "emotecraft": "2.2.7-b.build.50", "voicechat": ">=1.18.2-2.3.10" }