Merge branch 'master' into 1.17

# Conflicts:
#	src/main/resources/carpet.mixins.json

src/main/java/carpet/CarpetSettings.java

@@ -10,6 +10,8 @@ import carpet.utils.Messenger;
 import carpet.utils.SpawnChunks;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.dedicated.DedicatedServer;
@@ -828,6 +830,11 @@ public class CarpetSettings
             category = {CREATIVE, CLIENT}
     )
     public static boolean creativeNoClip = false;
+    public static boolean isCreativeFlying(Entity entity)
+    {
+        // #todo replace after merger to 1.17
+        return CarpetSettings.creativeNoClip && entity instanceof PlayerEntity && (((PlayerEntity) entity).isCreative()) && ((PlayerEntity) entity).abilities.flying;
+    }
 
 
     @Rule(

src/main/java/carpet/helpers/TickSpeed.java

@@ -108,9 +108,13 @@ public class TickSpeed
         {
             tick_warp_callback = null;
             if (source != tick_warp_sender) tick_warp_sender = null;
-            finish_time_warp();
-            tick_warp_sender = null;
-            return Messenger.c("gi Warp interrupted");
+            if (time_bias > 0)
+            {
+                finish_time_warp();
+                tick_warp_sender = null;
+                return Messenger.c("gi Warp interrupted");
+            }
+            return Messenger.c("ri No warp in progress");
         }
         if (time_bias > 0)
         {

src/main/java/carpet/mixins/EndGatewayBlockEntity_creativeNoClipMixin.java

@@ -0,0 +1,19 @@
+package carpet.mixins;
+
+import carpet.CarpetSettings;
+import net.minecraft.block.entity.EndGatewayBlockEntity;
+import net.minecraft.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(EndGatewayBlockEntity.class)
+public class EndGatewayBlockEntity_creativeNoClipMixin
+{
+    @Inject(method = "method_30276", cancellable = true, at = @At("HEAD"))
+    private static void checkFlyingCreative(Entity entity, CallbackInfoReturnable<Boolean> cir)
+    {
+        if (CarpetSettings.isCreativeFlying(entity)) cir.setReturnValue(false);
+    }
+}

src/main/java/carpet/script/utils/EquipmentInventory.java

@@ -48,7 +48,7 @@ public class EquipmentInventory implements Inventory
         catch (IndexOutOfBoundsException ignored)
         {
             //going out of the index should be really exceptional
-            return null;
+            return ItemStack.EMPTY;
         }
         return mob.getEquippedStack(slotSlot);
     }
@@ -64,11 +64,9 @@ public class EquipmentInventory implements Inventory
         catch (IndexOutOfBoundsException ignored)
         {
             //going out of the index should be really exceptional
-            return null;
+            return ItemStack.EMPTY;
         }
-        ItemStack stack = mob.getEquippedStack(slotSlot);
-        stack.decrement(amount);
-        return stack;
+        return mob.getEquippedStack(slotSlot).split(amount);
     }
 
     @Override
@@ -82,7 +80,7 @@ public class EquipmentInventory implements Inventory
         catch (IndexOutOfBoundsException ignored)
         {
             //going out of the index should be really exceptional
-            return null;
+            return ItemStack.EMPTY;
         }
         ItemStack previous = mob.getEquippedStack(slotSlot);
         mob.equipStack(slotSlot, ItemStack.EMPTY);

src/main/resources/carpet.mixins.json

@@ -210,6 +210,7 @@
     "BlockItem_creativeNoClipMixin",
     "WallStandingBlockItem_creativeNoClipMixin",
     "ShulkerBoxBlockEntity_creativeNoClipMixin",
+    "EndGatewayBlockEntity_creativeNoClipMixin",
     "LivingEntity_creativeFlyMixin",
 
     "VeryBiasedToBottomHeightProvider_cleanLogsMixin",