fix: emptyShulkerBoxStack

src/main/java/com/github/zly2006/carpetslsaddition/mixin/player/AccessorPlayerAbilities.java

@@ -1,38 +0,0 @@
-package com.github.zly2006.carpetslsaddition.mixin.player;
-
-import net.minecraft.entity.player.PlayerAbilities;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(PlayerAbilities.class)
-public interface AccessorPlayerAbilities {
-    @Accessor("flySpeed")
-    void setFlyingSpeed(float speed);
-    @Accessor("walkSpeed")
-    void setWalkingSpeed(float speed);
-    @Accessor("flying")
-    void setFlying(boolean flying);
-    @Accessor("invulnerable")
-    void setInvulnerable(boolean invulnerable);
-    @Accessor("allowFlying")
-    void setAllowFlying(boolean allowFlying);
-    @Accessor("creativeMode")
-    void setCreativeMode(boolean creativeMode);
-    @Accessor("allowModifyWorld")
-    void setAllowModifyWorld(boolean allowModifyWorld);
-
-    @Accessor("flySpeed")
-    float getFlyingSpeed();
-    @Accessor("walkSpeed")
-    float getWalkingSpeed();
-    @Accessor("flying")
-    boolean isFlying();
-    @Accessor("invulnerable")
-    boolean isInvulnerable();
-    @Accessor("allowFlying")
-    boolean isAllowFlying();
-    @Accessor("creativeMode")
-    boolean isCreativeMode();
-    @Accessor("allowModifyWorld")
-    boolean isAllowModifyWorld();
-}

src/main/java/com/github/zly2006/carpetslsaddition/mixin/player/MixinPlayerInventory.java

@@ -0,0 +1,28 @@
+package com.github.zly2006.carpetslsaddition.mixin.player;
+
+import com.github.zly2006.carpetslsaddition.SLSCarpetSettings;
+import net.minecraft.entity.player.PlayerAbilities;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.util.Nameable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(PlayerInventory.class)
+public abstract class MixinPlayerInventory implements Inventory, Nameable {
+    @Redirect(
+            method = "insertStack(ILnet/minecraft/item/ItemStack;)Z",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/entity/player/PlayerEntity;isInCreativeMode()Z"
+            )
+    )
+    private boolean insertStack(PlayerEntity instance) {
+        if (SLSCarpetSettings.creativeNoInfinitePickup) {
+            return false;
+        }
+        return instance.isInCreativeMode();
+    }
+}

src/main/java/com/github/zly2006/carpetslsaddition/mixin/screen/MixinSlot.java

@@ -1,21 +0,0 @@
-package com.github.zly2006.carpetslsaddition.mixin.screen;
-
-import com.github.zly2006.carpetslsaddition.util.ShulkerBoxItemUtil;
-import me.fallenbreath.conditionalmixin.api.annotation.Condition;
-import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
-import net.minecraft.item.ItemStack;
-import net.minecraft.screen.slot.Slot;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-@Restriction(
-        conflict = @Condition("pca")
-)
-@Mixin(Slot.class)
-public class MixinSlot {
-    @Redirect(method = "getMaxItemCount(Lnet/minecraft/item/ItemStack;)I", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getMaxCount()I", ordinal = 0))
-    private int getMaxItemCount(ItemStack itemStack) {
-        return ShulkerBoxItemUtil.getMaxCount(itemStack);
-    }
-}

src/main/java/com/github/zly2006/carpetslsaddition/mixin/shulker/MixinItemStack.java

@@ -0,0 +1,23 @@
+package com.github.zly2006.carpetslsaddition.mixin.shulker;
+
+import com.github.zly2006.carpetslsaddition.SLSCarpetSettings;
+import com.github.zly2006.carpetslsaddition.util.ShulkerBoxItemUtil;
+import net.minecraft.item.ItemStack;
+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(ItemStack.class)
+public class MixinItemStack {
+    @Inject(
+            method = "getMaxCount",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void getMaxCount(CallbackInfoReturnable<Integer> cir) {
+        if (SLSCarpetSettings.emptyShulkerBoxStack && ShulkerBoxItemUtil.isEmptyShulkerBoxItem((ItemStack) (Object) this)) {
+            cir.setReturnValue(ShulkerBoxItemUtil.SHULKERBOX_MAX_STACK_AMOUNT);
+        }
+    }
+}

src/main/java/com/github/zly2006/carpetslsaddition/mixin/shulker/MixinScreenHandler.java

@@ -0,0 +1,26 @@
+package com.github.zly2006.carpetslsaddition.mixin.shulker;
+
+import com.github.zly2006.carpetslsaddition.util.ShulkerBoxItemUtil;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import net.minecraft.item.ItemStack;
+import net.minecraft.screen.ScreenHandler;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(ScreenHandler.class)
+public abstract class MixinScreenHandler {
+    @WrapOperation(
+            method = "internalOnSlotClick",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/item/ItemStack;areItemsAndComponentsEqual(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Z"
+            )
+    )
+    private boolean checkEqual(ItemStack stack, ItemStack otherStack, Operation<Boolean> original) {
+        if (ShulkerBoxItemUtil.shulkerBoxEqual(stack, otherStack)) {
+            return true;
+        }
+        return original.call(stack, otherStack);
+    }
+}

src/main/java/com/github/zly2006/carpetslsaddition/mixin/shulker/MixinSlot.java

@@ -0,0 +1,33 @@
+package com.github.zly2006.carpetslsaddition.mixin.shulker;
+
+import com.github.zly2006.carpetslsaddition.SLSCarpetSettings;
+import com.github.zly2006.carpetslsaddition.util.ShulkerBoxItemUtil;
+import me.fallenbreath.conditionalmixin.api.annotation.Condition;
+import me.fallenbreath.conditionalmixin.api.annotation.Restriction;
+import net.minecraft.item.ItemStack;
+import net.minecraft.screen.slot.Slot;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Restriction(
+        conflict = @Condition("pca")
+)
+@Mixin(Slot.class)
+public class MixinSlot {
+    @Redirect(
+            method = "getMaxItemCount(Lnet/minecraft/item/ItemStack;)I",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/item/ItemStack;getMaxCount()I",
+                    ordinal = 0
+            )
+    )
+    private int getMaxItemCount(ItemStack itemStack) {
+        if (SLSCarpetSettings.emptyShulkerBoxStack && ShulkerBoxItemUtil.isEmptyShulkerBoxItem(itemStack)) {
+            return ShulkerBoxItemUtil.SHULKERBOX_MAX_STACK_AMOUNT;
+        } else {
+            return itemStack.getMaxCount();
+        }
+    }
+}