From 0e94527df3d7dfa56da23fbbd533da7a01d3021a Mon Sep 17 00:00:00 2001 From: senseiwells Date: Tue, 3 Dec 2024 18:02:36 +0000 Subject: [PATCH] Start updating to 1.21.4 --- gradle/wrapper/gradle-wrapper.properties | 2 +- libs.versions.toml | 25 ++++++++++--------- .../features/HighlightLiquids.kt | 5 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1adfb49..e48eca57 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs.versions.toml b/libs.versions.toml index 8ada7b5f..93c99859 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -1,16 +1,17 @@ [versions] -fabric-loom = "1.8-SNAPSHOT" -mod-publish = "0.7.4" -minecraft = "1.21.3" -fabric-loader = "0.16.7" -parchment = "1.21:2024.07.28" -fabric-api = "0.106.1+1.21.3" -fabric-kotlin = "1.11.0+kotlin.2.0.0" -mod-menu = "12.0.0-beta.1" -keybinds = "0.1.11+1.21.3" -yacl = "3.6.1+1.21.2-fabric" -carpet = "1.4.158" -chunk-debug = "2.1.1+1.21.3" +minecraft = "1.21.4" +fabric-loader = "0.16.9" +fabric-api = "0.110.5+1.21.4" +parchment = "1.21:2024.07.28" +fabric-kotlin = "1.11.0+kotlin.2.0.0" +mod-menu = "12.0.0-beta.1" +keybinds = "0.1.11+1.21.4" +yacl = "3.6.1+1.21.2-fabric" +carpet = "1.4.160" +chunk-debug = "2.1.3+1.21.4" + +fabric-loom = "1.9-SNAPSHOT" +mod-publish = "0.7.0" [libraries] minecraft = { module = "com.mojang:minecraft" , version.ref = "minecraft" } diff --git a/src/main/kotlin/me/senseiwells/essential_client/features/HighlightLiquids.kt b/src/main/kotlin/me/senseiwells/essential_client/features/HighlightLiquids.kt index cf4efa1c..d4a0649d 100644 --- a/src/main/kotlin/me/senseiwells/essential_client/features/HighlightLiquids.kt +++ b/src/main/kotlin/me/senseiwells/essential_client/features/HighlightLiquids.kt @@ -4,16 +4,17 @@ import me.senseiwells.essential_client.EssentialClient import net.fabricmc.fabric.api.resource.ResourceManagerHelper import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener import net.minecraft.client.model.geom.builders.UVPair +import net.minecraft.client.renderer.texture.TextureAtlas import net.minecraft.client.renderer.texture.TextureAtlasSprite import net.minecraft.client.resources.model.Material import net.minecraft.resources.ResourceLocation import net.minecraft.server.packs.PackType import net.minecraft.server.packs.resources.ResourceManager -import net.minecraft.world.inventory.InventoryMenu import org.jetbrains.annotations.ApiStatus.Internal object HighlightLiquids: SimpleSynchronousResourceReloadListener { - private val highlight = Material(InventoryMenu.BLOCK_ATLAS, EssentialClient.id("block/liquid_highlight")) + @Suppress("DEPRECATION") + private val highlight = Material(TextureAtlas.LOCATION_BLOCKS, EssentialClient.id("block/liquid_highlight")) private lateinit var sprite: TextureAtlasSprite