Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java

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;

src/main/java/carpet/mixins/ClientPlayNetworkHandler_smoothClientAnimationsMixin.java

@@ -1,53 +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();
-                }
-            }
-        }
-    }*/
-}

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))