diff --git a/gradle.properties b/gradle.properties index 410e908..d591494 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,18 +4,18 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.2 -yarn_mappings=1.21.2+build.1 -loader_version=0.16.7 +minecraft_version=1.21 +yarn_mappings=1.21+build.9 +loader_version=0.16.2 # Mod Properties -mod_version=0.3.0+mc1.21.2 +mod_version=0.3.0+mc1.21.0 maven_group=tobinio.bettersnowcoverage archives_base_name=better-snow-coverage # Dependencies -fabric_version=0.106.1+1.21.2 -yacl_version=3.6.1+1.21.2-fabric -modmenu_version=12.0.0-beta.1 +fabric_version=0.102.0+1.21 +yacl_version=3.5.0+1.21-fabric +modmenu_version=11.0.1 -sodium_version=mc1.21.2-0.6.0-beta.3-fabric \ No newline at end of file +sodium_version=mc1.21-0.6.0-beta.1-fabric \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..a441313 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.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/tobinio/bettersnowcoverage/config/Config.java b/src/main/java/tobinio/bettersnowcoverage/config/Config.java index e840430..fa88c46 100644 --- a/src/main/java/tobinio/bettersnowcoverage/config/Config.java +++ b/src/main/java/tobinio/bettersnowcoverage/config/Config.java @@ -67,7 +67,7 @@ public class Config { continue; } - var block = Registries.BLOCK.getOptionalValue(identifier); + var block = Registries.BLOCK.getOrEmpty(identifier); if (block.isPresent()) { blocks.add(block.get()); -- 2.51.2 From 0dd46f496165ad179cc893e2eeb5857511f81add Mon Sep 17 00:00:00 2001 From: tobinio Date: Fri, 31 Jan 2025 17:35:42 +0100 Subject: [PATCH 2/5] revert loom bump --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fff9261..8e88607 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.8-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' } -- 2.51.2 From 3cb334faf3690165e0aa39c678b16d19b3cf72fc Mon Sep 17 00:00:00 2001 From: tobinio Date: Fri, 31 Jan 2025 17:41:43 +0100 Subject: [PATCH 3/5] bump yacl version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d591494..09b1134 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ archives_base_name=better-snow-coverage # Dependencies fabric_version=0.102.0+1.21 -yacl_version=3.5.0+1.21-fabric +yacl_version=3.6.1+1.21-fabric modmenu_version=11.0.1 sodium_version=mc1.21-0.6.0-beta.1-fabric \ No newline at end of file -- 2.51.2 From f166cc1c2a9e331290d909fd6e1bb079143006d2 Mon Sep 17 00:00:00 2001 From: tobinio Date: Mon, 2 Jun 2025 10:21:37 +0200 Subject: [PATCH 4/5] use save world access - #14 --- .../bettersnowcoverage/BetterSnowChecker.java | 20 ++++++------------- .../mixin/SectionBuilderMixin.java | 6 +++--- .../sodium/ChunkBuilderMeshingTaskMixin.java | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/java/tobinio/bettersnowcoverage/BetterSnowChecker.java b/src/main/java/tobinio/bettersnowcoverage/BetterSnowChecker.java index c7ccb6a..5927cbb 100644 --- a/src/main/java/tobinio/bettersnowcoverage/BetterSnowChecker.java +++ b/src/main/java/tobinio/bettersnowcoverage/BetterSnowChecker.java @@ -1,13 +1,12 @@ package tobinio.bettersnowcoverage; import net.minecraft.block.*; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.world.ClientWorld; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.TagKey; import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.world.BlockView; import tobinio.bettersnowcoverage.config.Config; import java.util.ArrayList; @@ -31,15 +30,8 @@ public class BetterSnowChecker { NONE, WITH_LAYER, WITHOUT_LAYER, } - public static SnowState shouldHaveSnow(BlockPos pos) { - ClientWorld world = MinecraftClient.getInstance().world; - - if (world == null) { - BetterSnowCoverage.LOGGER.warn("no player found"); - return SnowState.NONE; - } - - var state = world.getBlockState(pos); + public static SnowState shouldHaveSnowAboveBlock(BlockView world, BlockPos pos) { + var state = world.getBlockState(pos.up()); if (state.isSideSolidFullSquare(world, pos, @@ -51,7 +43,7 @@ public class BetterSnowChecker { return SnowState.NONE; } - if (hasSnowNeighbor(pos, world)) { + if (hasSnowNeighbor(world, pos)) { if (isExcludedBlock(state)) { return SnowState.WITHOUT_LAYER; } @@ -78,7 +70,7 @@ public class BetterSnowChecker { return false; } - private static boolean hasSnowNeighbor(BlockPos pos, ClientWorld world) { + private static boolean hasSnowNeighbor(BlockView world, BlockPos pos) { var directionCheckers = new ArrayList(); directionCheckers.add(new DirectionChecker(Direction.NORTH, pos.down())); directionCheckers.add(new DirectionChecker(Direction.EAST, pos.down())); @@ -134,7 +126,7 @@ public class BetterSnowChecker { this.lastPos = pos; } - public Optional next(ClientWorld world, Config config) { + public Optional next(BlockView world, Config config) { lastPos = lastPos.add(direction.getOffsetX(), 0, direction.getOffsetZ()); var maxDepth = config.maxVerticalDistance; diff --git a/src/main/java/tobinio/bettersnowcoverage/mixin/SectionBuilderMixin.java b/src/main/java/tobinio/bettersnowcoverage/mixin/SectionBuilderMixin.java index 8379e3b..dc396df 100644 --- a/src/main/java/tobinio/bettersnowcoverage/mixin/SectionBuilderMixin.java +++ b/src/main/java/tobinio/bettersnowcoverage/mixin/SectionBuilderMixin.java @@ -39,7 +39,7 @@ public class SectionBuilderMixin { @Local BlockState blockState, @Local (ordinal = 2) BlockPos blockPos, @Local MatrixStack matrixStack, @Local BufferBuilder bufferBuilder, @Local Random random) { - var snowState = BetterSnowChecker.shouldHaveSnow(blockPos.up()); + var snowState = BetterSnowChecker.shouldHaveSnowAboveBlock(renderRegion ,blockPos.up()); if (snowState == BetterSnowChecker.SnowState.WITH_LAYER) { matrixStack.push(); @@ -50,8 +50,8 @@ public class SectionBuilderMixin { } @ModifyVariable (method = "build", at = @At ("STORE"), ordinal = 0) - private BlockState betterSnowCoverage$setGrassState(BlockState state, @Local (ordinal = 2) BlockPos blockPos) { - var snowState = BetterSnowChecker.shouldHaveSnow(blockPos.up()); + private BlockState betterSnowCoverage$setGrassState(BlockState state, @Local (ordinal = 2) BlockPos blockPos, @Local (argsOnly = true) ChunkRendererRegion renderRegion) { + var snowState = BetterSnowChecker.shouldHaveSnowAboveBlock(renderRegion, blockPos.up()); if (snowState != BetterSnowChecker.SnowState.NONE) { return BetterSnowChecker.getSnowState(state); diff --git a/src/main/java/tobinio/bettersnowcoverage/mixin/sodium/ChunkBuilderMeshingTaskMixin.java b/src/main/java/tobinio/bettersnowcoverage/mixin/sodium/ChunkBuilderMeshingTaskMixin.java index 09fa565..4cc7f29 100644 --- a/src/main/java/tobinio/bettersnowcoverage/mixin/sodium/ChunkBuilderMeshingTaskMixin.java +++ b/src/main/java/tobinio/bettersnowcoverage/mixin/sodium/ChunkBuilderMeshingTaskMixin.java @@ -30,7 +30,7 @@ public class ChunkBuilderMeshingTaskMixin { CallbackInfoReturnable cir, @Local BlockRenderCache cache, @Local LevelSlice slice, @Local (ordinal = 0) BlockPos.Mutable pos, @Local (ordinal = 1) BlockPos.Mutable modelOffset, @Local LocalRef blockState) { - BetterSnowChecker.SnowState snowState = BetterSnowChecker.shouldHaveSnow(pos.up()); + BetterSnowChecker.SnowState snowState = BetterSnowChecker.shouldHaveSnowAboveBlock(slice, pos); if (snowState != BetterSnowChecker.SnowState.NONE) { blockState.set(BetterSnowChecker.getSnowState(blockState.get())); -- 2.51.2 From e7fe562f41ba0399da8d70388d389383a7d02209 Mon Sep 17 00:00:00 2001 From: tobinio Date: Mon, 2 Jun 2025 10:22:39 +0200 Subject: [PATCH 5/5] bump to 0.3.1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 09b1134..5e88c91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.21+build.9 loader_version=0.16.2 # Mod Properties -mod_version=0.3.0+mc1.21.0 +mod_version=0.3.1+mc1.21.0 maven_group=tobinio.bettersnowcoverage archives_base_name=better-snow-coverage