diff --git a/gradle.properties b/gradle.properties index 7d06300..b07c48a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties minecraft_version=1.16.3 yarn_mappings=1.16.3+build.47 -loader_version=0.10.3+build.211 +loader_version=0.10.6+build.214 # Mod Properties mod_version=1.0.0 maven_group=cc.flogi.dev archives_base_name=smooth-chunks # Dependencies -fabric_version=0.24.1+build.412-1.16 +fabric_version=0.25.0+build.415-1.16 diff --git a/src/main/java/cc/flogi/dev/smoothchunks/client/handler/ChunkAnimationHandler.java b/src/main/java/cc/flogi/dev/smoothchunks/client/handler/ChunkAnimationHandler.java index c35a18d..b86d4d8 100644 --- a/src/main/java/cc/flogi/dev/smoothchunks/client/handler/ChunkAnimationHandler.java +++ b/src/main/java/cc/flogi/dev/smoothchunks/client/handler/ChunkAnimationHandler.java @@ -31,16 +31,16 @@ public final class ChunkAnimationHandler { if (SmoothChunksClient.get().getConfig().getLoadAnimation() == LoadAnimation.INWARD && MinecraftClient.getInstance().getCameraEntity() != null) { - BlockPos dif = chunk.getOrigin().subtract(MinecraftClient.getInstance().getCameraEntity().getBlockPos()); + BlockPos delta = chunk.getOrigin().subtract(MinecraftClient.getInstance().getCameraEntity().getBlockPos()); - int difX = Math.abs(dif.getX()); - int difZ = Math.abs(dif.getZ()); + int dX = Math.abs(delta.getX()); + int dZ = Math.abs(delta.getZ()); - if (difX > difZ) { - if (dif.getX() > 0) direction = Direction.WEST; + if (dX > dZ) { + if (delta.getX() > 0) direction = Direction.WEST; else direction = Direction.EAST; } else { - if (dif.getZ() > 0) direction = Direction.NORTH; + if (delta.getZ() > 0) direction = Direction.NORTH; else direction = Direction.SOUTH; } } @@ -81,6 +81,7 @@ public final class ChunkAnimationHandler { stack.translate(dirVec.getX() * mod, 0, dirVec.getZ() * mod); break; case SCALE: + //TODO Find a way to scale centered at the middle of the chunk rather than the origin. stack.scale((float) completion, (float) completion, (float) completion); break; } diff --git a/src/main/java/cc/flogi/dev/smoothchunks/mixin/ChunkBuilderMixin.java b/src/main/java/cc/flogi/dev/smoothchunks/mixin/ChunkBuilderMixin.java index 53e4d64..cbc7d09 100644 --- a/src/main/java/cc/flogi/dev/smoothchunks/mixin/ChunkBuilderMixin.java +++ b/src/main/java/cc/flogi/dev/smoothchunks/mixin/ChunkBuilderMixin.java @@ -28,7 +28,7 @@ public abstract class ChunkBuilderMixin { target = "Ljava/util/Set;forEach(Ljava/util/function/Consumer;)V" ) ) - public void onSetOrigin(BlockBufferBuilderStorage buffers, CallbackInfoReturnable cir) { + public void onChunkUploads(BlockBufferBuilderStorage buffers, CallbackInfoReturnable cir) { ChunkAnimationHandler.get().addChunk(field_20839); } } diff --git a/src/main/java/cc/flogi/dev/smoothchunks/util/UtilEasing.java b/src/main/java/cc/flogi/dev/smoothchunks/util/UtilEasing.java index 951cf0a..e7af524 100644 --- a/src/main/java/cc/flogi/dev/smoothchunks/util/UtilEasing.java +++ b/src/main/java/cc/flogi/dev/smoothchunks/util/UtilEasing.java @@ -5,7 +5,7 @@ package cc.flogi.dev.smoothchunks.util; * * Created on 10/24/2020 */ -public class UtilEasing { +public final class UtilEasing { private static final double PI = Math.PI; public static double easeInOutSine(double completion) {