From 7252c637b9b12425dd572124528ede4b2dda73fc Mon Sep 17 00:00:00 2001 From: Username404 Date: Fri, 25 Mar 2022 15:17:17 +0100 Subject: [PATCH] Update to minecraft 1.18.1 Signed-off-by: Username404 --- build.gradle.kts | 4 ++-- common/build.gradle.kts | 2 +- .../fr/username404/snowygui/forge/ForgeInit.kt | 2 +- .../fr/username404/snowygui/forge/ZoomHandler.kt | 2 +- gradle.properties | 14 +++++++------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index f2ccdf2..ce00a5e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,7 @@ group = "fr.username404" version = "0.3.4" val groupAndName = "${rootProject.group}.${rootProject.name.toLowerCase()}" -val javaVer: String = "16" +val javaVer: String = "17" val sourceJavaVer: String = javaVer val kotlinVer: String by rootProject val kotlinSplitVersion = kotlinVer.split('.') @@ -58,7 +58,7 @@ subprojects { apply(plugin = "org.jetbrains.kotlin.plugin.serialization") extensions.configure("loom") { mappingsDep = layered { - officialMojangMappings().parchment("org.parchmentmc.data:parchment-${rootProject.architectury.minecraft}:2021.10.24") + officialMojangMappings().parchment("org.parchmentmc.data:parchment-${rootProject.architectury.minecraft}:2022.02.13") } silentMojangMappingsLicense() val refmap = "snowygui-${project.name}-refmap.json" diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 8a721e1..7014a1f 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -1,7 +1,7 @@ architectury { common(); injectInjectables = false } dependencies { modImplementation("net.fabricmc:fabric-loader:${rootProject.property("fabric_loader_version")}") - implementation("me.shedaniel.cloth:cloth-config:${rootProject.property("clothconfig_version")}") { + modImplementation("me.shedaniel.cloth:cloth-config:${rootProject.property("clothconfig_version")}") { exclude(module = "fabric-api") } } diff --git a/forge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt b/forge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt index c932b59..89380ea 100644 --- a/forge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt +++ b/forge/src/main/kotlin/fr/username404/snowygui/forge/ForgeInit.kt @@ -7,7 +7,7 @@ import fr.username404.snowygui.gui.feature.ButtonImpl import net.minecraftforge.fml.ModList import net.minecraftforge.fml.common.Mod import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent -import net.minecraftforge.fmlclient.ConfigGuiHandler +import net.minecraftforge.client.ConfigGuiHandler import net.minecraftforge.forgespi.language.ModFileScanData import org.objectweb.asm.Type import thedarkcolour.kotlinforforge.forge.FORGE_BUS diff --git a/forge/src/main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt b/forge/src/main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt index 4037576..ec7326a 100644 --- a/forge/src/main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt +++ b/forge/src/main/kotlin/fr/username404/snowygui/forge/ZoomHandler.kt @@ -6,7 +6,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent object ZoomHandler { @SubscribeEvent - fun onFOVEvent(event: EntityViewRenderEvent.FOVModifier) { + fun onFOVEvent(event: EntityViewRenderEvent.FieldOfView) { if (Zoom.toggled) event.fov = Zoom.getNewZoom(event.fov) } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 357f9e5..6bc3dd2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,16 +7,16 @@ org.gradle.parallel=true org.gradle.unsafe.configuration-cache=on org.gradle.vfs.watch=true -minecraft=1.17.1 -forge_version=37.1 -kotlinforforge=2.0.1 +minecraft=1.18.1 +forge_version=39.1 +kotlinforforge=3.1.0 kotlinVer=1.6.0 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.7+b7ab6121d5 -fabric_rendering_api_version=1.6.0+a02b4463d5 +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=4.11.19 -modmenu_version=2.0.2 +clothconfig_version=6.2.57 +modmenu_version=3.0.1