From 181bfb34bf6e269ebcfbb57ccf34f355959a3f5e Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 9 Jul 2021 02:22:53 -0300 Subject: [PATCH] tweaked stackable shulkerboxes for 1.17 fixes #989 --- src/main/java/carpet/CarpetSettings.java | 2 +- src/main/java/carpet/mixins/Slot_stackableSBoxesMixin.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/CarpetSettings.java b/src/main/java/carpet/CarpetSettings.java index 4581448d..0af1cea0 100644 --- a/src/main/java/carpet/CarpetSettings.java +++ b/src/main/java/carpet/CarpetSettings.java @@ -192,7 +192,7 @@ public class CarpetSettings @Rule( desc = "Empty shulker boxes can stack to 64 when dropped on the ground", - extra = "To move them around between inventories, use shift click to move entire stacks", + extra = ".. or when manipulated inside the inventories", category = {SURVIVAL, FEATURE} ) public static boolean stackableShulkerBoxes = false; diff --git a/src/main/java/carpet/mixins/Slot_stackableSBoxesMixin.java b/src/main/java/carpet/mixins/Slot_stackableSBoxesMixin.java index 80fd8b79..557ea506 100644 --- a/src/main/java/carpet/mixins/Slot_stackableSBoxesMixin.java +++ b/src/main/java/carpet/mixins/Slot_stackableSBoxesMixin.java @@ -1,6 +1,7 @@ package carpet.mixins; import carpet.CarpetSettings; +import carpet.helpers.InventoryHelper; import net.minecraft.block.ShulkerBoxBlock; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; @@ -17,7 +18,11 @@ public class Slot_stackableSBoxesMixin { )) private int getMaxCountForSboxes(Slot slot, ItemStack stack) { - if (CarpetSettings.stackableShulkerBoxes && stack.getItem() instanceof BlockItem && ((BlockItem)stack.getItem()).getBlock() instanceof ShulkerBoxBlock) + if (CarpetSettings.stackableShulkerBoxes && + stack.getItem() instanceof BlockItem && + ((BlockItem)stack.getItem()).getBlock() instanceof ShulkerBoxBlock && + !InventoryHelper.shulkerBoxHasItems(stack) + ) { return CarpetSettings.SHULKER_STACK_SIZE; }