From 8061ee64d88daafde4647ebc902b5503fcf8c517 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 26 Mar 2025 14:14:28 +0100 Subject: [PATCH] port: Spring to Life (1.21.5) --- build.gradle | 6 +++--- gradle.properties | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- .../eu/midnightdust/puddles/block/PuddleBlock.java | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 7b0bd9f..43e9e7a 100755 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' id "me.shedaniel.unified-publishing" version "0.1.+" } @@ -130,7 +130,7 @@ unifiedPublishing { curseforge { token = CURSEFORGE_TOKEN id = rootProject.curseforge_id - gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions + gameVersions.addAll "Java 21", project.minecraft_version } } @@ -140,7 +140,7 @@ unifiedPublishing { token = MODRINTH_TOKEN id = rootProject.modrinth_id version = "$project.version" - gameVersions.addAll project.minecraft_version, project.supported_versions + gameVersions.addAll project.minecraft_version } } } diff --git a/gradle.properties b/gradle.properties index 5f95576..f7a28f8 100755 --- a/gradle.properties +++ b/gradle.properties @@ -3,13 +3,13 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.21.4 + minecraft_version=1.21.5 supported_versions= - yarn_mappings=1.21.4+build.8 + yarn_mappings=1.21.5+build.1 loader_version=0.16.10 # Mod Properties - mod_version = 2.0.1 + mod_version = 2.0.2 maven_group = eu.midnightdust archives_base_name = puddles release_type=release @@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx1G modrinth_id=535D1YoA # Dependencies - fabric_version=0.115.0+1.21.4 - midnightlib_version=1.6.7-fabric - polymer_version=0.11.3+1.21.4 + fabric_version=0.119.5+1.21.5 + midnightlib_version=1.6.10+1.21.4-fabric + polymer_version=0.12.1+1.21.5-rc2 server_translation_version=2.4.0+1.21.2-rc1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..37f853b 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/eu/midnightdust/puddles/block/PuddleBlock.java b/src/main/java/eu/midnightdust/puddles/block/PuddleBlock.java index c919f16..9e02bae 100755 --- a/src/main/java/eu/midnightdust/puddles/block/PuddleBlock.java +++ b/src/main/java/eu/midnightdust/puddles/block/PuddleBlock.java @@ -116,7 +116,7 @@ public class PuddleBlock extends Block implements PolymerBlock, BlockWithElement // Check if there are puddles on the sides of the block above for (i = 2; i < 6; ++i) { BlockPos pos1 = pos.up(); - if (world.getBlockState(pos1.offset(Direction.byId(i))).getBlock() instanceof PuddleBlock) { + if (world.getBlockState(pos1.offset(Direction.byIndex(i))).getBlock() instanceof PuddleBlock) { // When sides of the block above have a puddle, don't place the puddle return false; } @@ -124,7 +124,7 @@ public class PuddleBlock extends Block implements PolymerBlock, BlockWithElement // Check if there are puddles on the sides of the block below for (i = 2; i < 6; ++i) { BlockPos pos1 = pos.down(); - if (world.getBlockState(pos1.offset(Direction.byId(i))).getBlock() instanceof PuddleBlock) { + if (world.getBlockState(pos1.offset(Direction.byIndex(i))).getBlock() instanceof PuddleBlock) { // When sides of the block below have a puddle, don't place the puddle return false; }