diff --git a/build.gradle b/build.gradle index 1d3009f..f0a61dc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index 8109330..765db37 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21 -yarn_mappings=1.21+build.9 -loader_version=0.16.2 +minecraft_version=1.21.2 +yarn_mappings=1.21.2+build.1 +loader_version=0.16.7 # Mod Properties -mod_version=0.2.1+mc1.21.0 +mod_version=0.2.1+mc1.21.2 maven_group=tobinio.denseflowers archives_base_name=dense-flowers # Dependencies -fabric_version=0.102.0+1.21 -sodium_version=mc1.21-0.6.0-beta.1-fabric \ No newline at end of file +fabric_version=0.106.1+1.21.2 +sodium_version=mc1.21.2-0.6.0-beta.3-fabric \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a441313..9355b41 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/tobinio/denseflowers/OffsetGenerator.java b/src/main/java/tobinio/denseflowers/OffsetGenerator.java index 1ab74b1..c627c6a 100644 --- a/src/main/java/tobinio/denseflowers/OffsetGenerator.java +++ b/src/main/java/tobinio/denseflowers/OffsetGenerator.java @@ -1,7 +1,6 @@ package tobinio.denseflowers; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.block.FlowerBlock; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -20,7 +19,7 @@ import java.util.List; public class OffsetGenerator { public static List getFlowerOffsets(BlockState blockState, BlockView world, BlockPos flowerPos) { - var baseLocation = blockState.getModelOffset(world, flowerPos); + var baseLocation = blockState.getModelOffset(flowerPos); AbstractBlockAccessor flower = (AbstractBlockAccessor) blockState.getBlock(); var allLocations = new ArrayList(); @@ -30,7 +29,7 @@ public class OffsetGenerator { outer: for (int i = 0; i < getNumberOfSurroundingFlowers(world, flowerPos); i++) { - var newLocation = blockState.getModelOffset(world, flowerPos.add((i + 1) * 5, 0, (i + 1) * 3)) + var newLocation = blockState.getModelOffset(flowerPos.add((i + 1) * 5, 0, (i + 1) * 3)) .multiply(0.45 / flower.callGetMaxHorizontalModelOffset()); diff --git a/src/main/java/tobinio/denseflowers/mixin/SectionBuilderMixin.java b/src/main/java/tobinio/denseflowers/mixin/SectionBuilderMixin.java index 4a278c4..e7414b1 100644 --- a/src/main/java/tobinio/denseflowers/mixin/SectionBuilderMixin.java +++ b/src/main/java/tobinio/denseflowers/mixin/SectionBuilderMixin.java @@ -41,7 +41,7 @@ public class SectionBuilderMixin { if (blockState.getBlock() instanceof FlowerBlock) { matrixStack.push(); - var realOffset = blockState.getModelOffset(renderRegion, blockPos); + var realOffset = blockState.getModelOffset(blockPos); matrixStack.translate(-realOffset.getX(), -realOffset.getY(), -realOffset.getZ()); for (Vec3d flowerOffset : OffsetGenerator.getFlowerOffsets(blockState, renderRegion, blockPos)) {