From d7e1affd083f78758c57115dea211676339b89f2 Mon Sep 17 00:00:00 2001 From: nikita51bot Date: Thu, 9 Jan 2025 01:30:02 +0300 Subject: [PATCH] Update implements to 1.21.5 --- build.gradle | 29 +++++++++++---------- gradle.properties | 2 +- src/main/resources/aws/25w02a.accesswidener | 2 ++ versions/25w02a/gradle.properties | 16 ++++++++++++ 4 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/aws/25w02a.accesswidener create mode 100644 versions/25w02a/gradle.properties diff --git a/build.gradle b/build.gradle index e431bcc..85dd854 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,7 @@ dependencies { modImplementation "com.terraformersmc:modmenu:${prop("dep.modmenu")}" // YACL - if (stonecutter.compare("1.20.1", mcVersion) != 1) { + if (true) { def minecraftVersionsWithOldYACLMaven = Set.of("1.19.4", "1.20", "1.20.2", "1.20.3") def yaclVersion = prop("dep.yacl") if (minecraftVersionsWithOldYACLMaven.contains(mcVersion)) { @@ -106,7 +106,7 @@ dependencies { // Cloth Config def clothConfigVersion = findProperty("dep.cloth-config") - modApi("me.shedaniel.cloth:cloth-config-fabric:${stonecutter.compare("1.19", mcVersion) == 1 ? clothConfigVersion : substringBefore(clothConfigVersion, "+")}") { + modApi("me.shedaniel.cloth:cloth-config-fabric:${false ? clothConfigVersion : substringBefore(clothConfigVersion, "+")}") { exclude(group: "net.fabricmc.fabric-api") } @@ -126,7 +126,7 @@ dependencies { } } - if (!(stonecutter.compare("1.20.5", mcVersion) == 0)) { + if (!(false)) { // Replay Mod modImplementation("maven.modrinth:replaymod:${findProperty("dep.replaymod")}") } @@ -183,7 +183,7 @@ processResources { props.put("minecraft", mcVersion.toString()) props.put("java", javaVersionAsInt.toString()) // props.put("fabric_api", substringBefore(prop("build.fabric_api").toString(), "+")) - props.put("fabric_api_id", stonecutter.compare("1.19.1", mcVersion) >= 0 ? "fabric" : "fabric-api") + props.put("fabric_api_id", false ? "fabric" : "fabric-api") props.each { key, value -> inputs.property key, value @@ -520,16 +520,17 @@ UUID getUUID(Object uuid) { @SuppressWarnings('GrMethodMayBeStatic') // Method cannot be static int getJavaVersionAsInteger(String minecraftVersion) { - return stonecutter.compare("1.20.5", minecraftVersion) == 1 ? - stonecutter.compare("1.18", minecraftVersion) == 1 ? - stonecutter.compare("1.16.5", minecraftVersion) == 1 ? - 8 - : - 16 - : - 17 - : - 21 + return 21 +// return stonecutter.compare("1.20.5", minecraftVersion) == 1 ? +// stonecutter.compare("1.18", minecraftVersion) == 1 ? +// stonecutter.compare("1.16.5", minecraftVersion) == 1 ? +// 8 +// : +// 16 +// : +// 17 +// : +// 21 } Properties getPersonalProperties() { diff --git a/gradle.properties b/gradle.properties index a3901a5..93bfa0d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ lombok_version = 1.18.32 # Multi-Versions Properties # Verified version: 1.20 1.20.1 1.20.2 1.20.3 1.20.4 1.20.5 1.20.6 1.21 -multi_versions = 1.16.5 1.17 1.17.1 1.18 1.18.1 1.18.2 1.19 1.19.1 1.19.2 1.19.3 1.19.4 1.20 1.20.1 1.20.2 1.20.3 1.20.4 1.20.5 1.20.6 1.21 1.21.1 1.21.2 1.21.3 1.21.4 +multi_versions = 1.21.3 1.21.4 25w02a # Build Dependencies build.yarn = [VERSIONED] diff --git a/src/main/resources/aws/25w02a.accesswidener b/src/main/resources/aws/25w02a.accesswidener new file mode 100644 index 0000000..4074b72 --- /dev/null +++ b/src/main/resources/aws/25w02a.accesswidener @@ -0,0 +1,2 @@ +accessWidener v2 named +# 25w02a AW diff --git a/versions/25w02a/gradle.properties b/versions/25w02a/gradle.properties new file mode 100644 index 0000000..ea8dfc5 --- /dev/null +++ b/versions/25w02a/gradle.properties @@ -0,0 +1,16 @@ +# Versioned Properties + +# Fabric Properties, check https://fabricmc.net/develop/ +build.yarn=25w02a+build.2 +build.fabric_api=0.114.1+1.21.5 + +# Additional Dependencies Properties +# cloth-config, check https://modrinth.com/mod/cloth-config/versions?g=25w02a +dep.cloth-config=16.0.141+fabric +# modmenu, check https://modrinth.com/mod/modmenu/versions?g=1.21.4 +dep.modmenu=13.0.0-beta.1 +# yacl, check https://modrinth.com/mod/yacl/versions?g=1.21.4 +dep.yacl=3.6.1+1.21.2-fabric +# replaymod, check https://modrinth.com/mod/replaymod/versions?g=1.21.4 +dep.replaymod=1.21.2-2.6.20 +dep.geckolib=unknown \ No newline at end of file