From 390dbe17253112259ce91fd782be25be57fd75a9 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 6 Nov 2020 00:11:13 -0400 Subject: [PATCH 1/3] fixed NPE in resetting entity event --- src/main/java/carpet/script/argument/FunctionArgument.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/carpet/script/argument/FunctionArgument.java b/src/main/java/carpet/script/argument/FunctionArgument.java index 451b7d72..c34fdec2 100644 --- a/src/main/java/carpet/script/argument/FunctionArgument.java +++ b/src/main/java/carpet/script/argument/FunctionArgument.java @@ -8,6 +8,7 @@ import carpet.script.value.FunctionValue; import carpet.script.value.Value; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class FunctionArgument extends Argument @@ -46,7 +47,7 @@ public class FunctionArgument extends Argument Value functionValue = params.get(offset).evalValue(c); if (functionValue.isNull()) { - if (allowNone) return new FunctionArgument(null, offset+1, null); + if (allowNone) return new FunctionArgument(null, offset+1, Collections.emptyList()); throw new InternalExpressionException("function argument cannot be null"); } if (!(functionValue instanceof FunctionValue)) From dcb048c986d266c16026d50974be8ca36892762d Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 6 Nov 2020 00:22:55 -0400 Subject: [PATCH 2/3] that has been fixed already --- ...rkHandler_smoothClientAnimationsMixin.java | 52 ------------------- src/main/resources/carpet.mixins.json | 1 - 2 files changed, 53 deletions(-) delete mode 100644 src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java diff --git a/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java b/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java deleted file mode 100644 index 1a5f06e6..00000000 --- a/src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java +++ /dev/null @@ -1,52 +0,0 @@ -package carpet.mixins; - -import carpet.CarpetSettings; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.block.entity.PistonBlockEntity; -import net.minecraft.client.network.ClientPlayNetworkHandler; -import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; -import net.minecraft.client.world.ClientWorld; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.util.math.BlockPos; -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.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -import java.util.Iterator; - -@Mixin(ClientPlayNetworkHandler.class) -public class ClientPlayNetworkHandler_smoothClientAnimationsMixin -{ - @Shadow private ClientWorld world; - // 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 - )) - private void recreateMovingPistons(ChunkDataS2CPacket packet, CallbackInfo ci, - //int i, int j, BiomeArray biomeArray, WorldChunk worldChunk, - Iterator var5, CompoundTag tag, BlockPos blockPos) - { - 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(blockState, tag); - world.setBlockEntity(blockPos, blockEntity); - blockEntity.resetBlock(); - } - } - } - } -} diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index edd05eeb..4d5cfb6a 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -194,7 +194,6 @@ "InGameHudMixin", "PlayerListHudMixin", "PistonBlockEntityRenderer_movableTEMixin", - "ClientPlayNetworkHandler_smoothClientAnimationsMixin", "ClientPlayerEntity_clientCommandMixin", "WorldRenderer_fogOffMixin", "WorldRenderer_creativeNoClipMixin", From 116b2caa410f239571dfc2a6e2f79cfa996f6bd8 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 6 Nov 2020 00:24:24 -0400 Subject: [PATCH 3/3] 1.4.16 --- gradle.properties | 2 +- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index f7d835ba..b0d3267f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.10.6+build.214 # Mod Properties - mod_version = 1.4.15+v201102 + mod_version = 1.4.16+v201105 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 07d9fc18..ec152130 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -36,7 +36,7 @@ import static carpet.settings.RuleCategory.CLIENT; @SuppressWarnings("CanBeFinal") public class CarpetSettings { - public static final String carpetVersion = "1.4.15+v201102"; + public static final String carpetVersion = "1.4.16+v201105"; public static final Logger LOG = LogManager.getLogger("carpet"); public static boolean skipGenerationChecks = false; public static boolean impendingFillSkipUpdates = false; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index a025852d..88372662 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.4.15", + "version": "1.4.16", "name": "Carpet Mod in Fabric", "description": "Carpet made out of fabric",