From 3bf1df544842ac26c9e9e38b35a4c66807ef3a6c Mon Sep 17 00:00:00 2001 From: DekinDev Date: Wed, 31 Dec 2025 08:26:44 +0100 Subject: [PATCH] Port to Minecraft 1.21.11 --- build.gradle | 11 +++++++---- gradle.properties | 11 +++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../lizistired/cavedust/utils/ParticleSpawnUtil.java | 10 ++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 787dae4..35b8ddb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,12 @@ plugins { - id 'fabric-loom' version '1.11-SNAPSHOT' + id 'fabric-loom' version '1.14.7' id 'maven-publish' } -archivesBaseName = project.archives_base_name +base { + archivesName = project.archives_base_name +} + version = project.mod_version group = project.maven_group @@ -16,7 +19,7 @@ repositories { } } maven { - url = "https://maven.terraformersmc.com" + url = "https://maven.terraformersmc.com/releases" } maven { name = 'minelp' @@ -72,7 +75,7 @@ java { jar { from("LICENSE") { - rename { "${it}_${project.archivesBaseName}"} + rename { "${it}_${project.archives_base_name}" } } } diff --git a/gradle.properties b/gradle.properties index 907ef8e..075a674 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,9 +2,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties - # check these on https://fabricmc.net/develop - minecraft_version=1.21.9 - yarn_mappings=1.21.9+build.1 + minecraft_version=1.21.11 + yarn_mappings=1.21.11+build.3 loader_version=0.18.4 loom_version=1.14-SNAPSHOT @@ -14,6 +13,6 @@ org.gradle.jvmargs=-Xmx1G archives_base_name=cave_dust_reforged # Dependencies - fabric_version=0.134.1+1.21.9 - modmenu_version=16.0.0-rc.2 - kirin_version=1.21.1+1.21.7 \ No newline at end of file + fabric_version=0.140.2+1.21.11 + modmenu_version=17.0.0-beta.1 + kirin_version=1.21.4+1.21.11 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ca025c8..23449a2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java b/src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java index 5402222..2d93c7f 100644 --- a/src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java +++ b/src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java @@ -29,11 +29,11 @@ public class ParticleSpawnUtil { } // checks if the config is enabled, if the game isn't paused, if the world is valid, - // if the dimension is valid and if the player isn't in a lush caves biome + // only in overworld, and if the player isn't in a lush caves biome if (!config.getCaveDustEnabled() || client.isPaused() || client.world == null - || !client.world.getDimension().bedWorks() + || !client.world.getRegistryKey().equals(World.OVERWORLD) || client.player.isSubmergedInWater() || client.world.getBiome(client.player.getBlockPos()).matchesKey(LUSH_CAVES)) { @@ -45,7 +45,6 @@ public class ParticleSpawnUtil { World world = client.world; int seaLevel = world.getSeaLevel(); - // 1.21.10: usar world directamente if (!world.isSkyVisible(client.player.getBlockPos())) { if (client.player.getBlockPos().getY() + 2 < seaLevel) { timer = timer + 1; @@ -71,11 +70,11 @@ public class ParticleSpawnUtil { public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config, BlockPos pos) { // checks if the config is enabled, if the game isn't paused, if the world is valid, - // if the dimension is valid and if the particle position isn't in lush caves + // only in overworld, and if the particle position isn't in lush caves if (!config.getCaveDustEnabled() || client.isPaused() || client.world == null - || !client.world.getDimension().bedWorks() + || !client.world.getRegistryKey().equals(World.OVERWORLD) || (client.world.getBottomY() > pos.getY()) || client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES)) { @@ -99,7 +98,6 @@ public class ParticleSpawnUtil { World world = client.world; int seaLevel = world.getSeaLevel(); - // 1.21.10: usar world directamente if (!world.isSkyVisible(pos)) { if (pos.getY() + 2 < seaLevel) { timer = timer + 1;