From 78ea9cd6e489b6887c3f2206b33b84295341749e Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 3 Jan 2020 00:13:05 -0400 Subject: [PATCH] 1.3.3 --- gradle.properties | 2 +- src/main/java/carpet/CarpetSettings.java | 2 +- ...yNetworkHandler_smoothClientAnimationsMixin.java | 13 ++++--------- src/main/resources/carpet.mixins.json | 3 ++- src/main/resources/fabric.mod.json | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index cc323cd9..c5676343 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.7.2+build.174 # Mod Properties - mod_version = 1.3.2+v191230 + mod_version = 1.3.3+v200103 maven_group = carpet archives_base_name = fabric-carpet diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 72ff6b53..87585be0 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -31,7 +31,7 @@ import static carpet.settings.RuleCategory.DISPENSER; public class CarpetSettings { - public static final String carpetVersion = "1.3.2+v191230"; + public static final String carpetVersion = "1.3.3+v200103"; public static final Logger LOG = LogManager.getLogger(); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java b/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java index 751fbbfa..43b44256 100644 --- a/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java +++ b/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java @@ -14,10 +14,8 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import org.spongepowered.asm.mixin.injection.struct.InjectionInfo; import java.util.Iterator; @@ -25,9 +23,8 @@ import java.util.Iterator; public class ClientPlayNetworkHandler_smoothClientAnimationsMixin { @Shadow private ClientWorld world; - - // as suggested by G4me4u - @Inject( method = "onChunkData", locals = LocalCapture.CAPTURE_FAILSOFT, require = 0, at = @At( + // fix as suggested by G4me4u + @Inject( method = "onChunkData", locals = LocalCapture.CAPTURE_FAILHARD, require = 0, at = @At( value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;getBlockEntity(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/entity/BlockEntity;", shift = At.Shift.AFTER @@ -35,19 +32,17 @@ public class ClientPlayNetworkHandler_smoothClientAnimationsMixin private void recreateMovingPistons(ChunkDataS2CPacket packet, CallbackInfo ci, Iterator var5, CompoundTag tag, BlockPos blockPos) { - if (CarpetSettings.smoothClientAnimations) //WIP + if (CarpetSettings.smoothClientAnimations) { BlockEntity blockEntity = world.getBlockEntity(blockPos); if (blockEntity == null && "minecraft:piston".equals(tag.getString("id"))) { BlockState blockState = world.getBlockState(blockPos); if (blockState.getBlock() == Blocks.MOVING_PISTON) { + tag.putFloat("progress", Math.min(tag.getFloat("progress") + 0.5F, 1.0F)); blockEntity = new PistonBlockEntity(); blockEntity.fromTag(tag); world.setBlockEntity(blockPos, blockEntity); - - // Probably not needed but it's done in - // other places so let's keep the standard. blockEntity.resetBlock(); } } diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 226622f8..53dbbe21 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -170,7 +170,8 @@ "ClientPlayerInteractionManager_ghostBlocksMixin", "BlockEntityRenderDispatcher_movableTEMixin", - "PistonBlockEntityRenderer_movableTEMixin" + "PistonBlockEntityRenderer_movableTEMixin", + "ClientPlayNetworkHandler_smoothClientAnimationsMixin" ], "server": [ "MinecraftDedicatedServerMixin" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8c6c93a3..efd9d097 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "carpet", - "version": "1.3.2", + "version": "1.3.3", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric",