From 0a2175c2e1f0d1387cae28ffeed307155d102b01 Mon Sep 17 00:00:00 2001 From: Username404 Date: Thu, 21 Apr 2022 15:42:43 +0200 Subject: [PATCH] Use 22w16b versions of dependencies Signed-off-by: Username404 --- build.gradle.kts | 2 +- common/build.gradle.kts | 2 +- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 10 +++++----- settings.gradle.kts | 1 - 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2d547c6..640b786 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ subprojects { apply(plugin = "org.jetbrains.kotlin.plugin.serialization") extensions.configure("loom") { mappingsDep = layered { - officialMojangMappings().parchment("org.parchmentmc.data:parchment-${rootProject.architectury.minecraft}:2022.02.13") + officialMojangMappings().parchment("org.parchmentmc.data:parchment-1.18.2:2022.03.13") } silentMojangMappingsLicense() val refmap = "snowygui-${project.name}-refmap.json" diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 7014a1f..b4f2f7e 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,4 +1,4 @@ -architectury { common(); injectInjectables = false } +architectury { common(false); injectInjectables = false } dependencies { modImplementation("net.fabricmc:fabric-loader:${rootProject.property("fabric_loader_version")}") modImplementation("me.shedaniel.cloth:cloth-config:${rootProject.property("clothconfig_version")}") { diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 6c039ea..20d3900 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -37,7 +37,7 @@ "fabric-language-kotlin": ">=${fabric_kotlin}", "fabric-resource-loader-v0": "*", "fabric-rendering-v1": "*", - "minecraft": ">=${minecraft_version}" + "minecraft": ">=1.19-alpha.22.16.b" }, "recommends": { "cloth-config2": ">=${clothconfig}" diff --git a/gradle.properties b/gradle.properties index 6bc3dd2..fcb0966 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ org.gradle.parallel=true org.gradle.unsafe.configuration-cache=on org.gradle.vfs.watch=true -minecraft=1.18.1 +minecraft=22w16b forge_version=39.1 kotlinforforge=3.1.0 kotlinVer=1.6.0 @@ -15,8 +15,8 @@ kotlin_coroutines_version=1.5.0 serializationVer=1.2.1 fabric_loader_version=0.11.7 fabric_language_kotlin=1.7.0+kotlin.1.6.0 -fabric_resource_loader_version=0.4.14+713c266865 -fabric_rendering_api_version=1.10.6+713c266865 -fabric_api_base_version=0.3.0+a02b4463d5 -clothconfig_version=6.2.57 +fabric_resource_loader_version=0.4.24+ec94c6f6e0 +fabric_rendering_api_version=1.10.9+ec94c6f6e0 +fabric_api_base_version=0.4.5+ec94c6f6e0 +clothconfig_version=7.0.60 modmenu_version=3.0.1 diff --git a/settings.gradle.kts b/settings.gradle.kts index 458a50e..34046b8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,7 +11,6 @@ pluginManagement { include("common") include("fabric") -include("forge") rootProject.name = "SnowyGUI"