icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify stackableShulkerBoxes rule

Browse Source
This commit is contained in:
gnembon committed 2024-02-29 11:11:18 +01:00
1 parent 4e57eecf2d
commit a0bd6e22ac
6 files changed
+29 -190
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/AbstractContainerMenu_stackableSBoxesMixin.java
-33
View File
@@ -1,33 +0,0 @@
package carpet.mixins;
import carpet.CarpetSettings;
import carpet.helpers.InventoryHelper;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.ShulkerBoxBlock;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(AbstractContainerMenu.class)
public class AbstractContainerMenu_stackableSBoxesMixin
{
@Redirect(method = "doClick", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/world/inventory/Slot;getMaxStackSize(Lnet/minecraft/world/item/ItemStack;)I"
))
private int getMaxCountForSboxesInScreenHander(Slot slot, ItemStack stack)
{
if (CarpetSettings.shulkerBoxStackSize > 1 &&
stack.getItem() instanceof BlockItem &&
((BlockItem)stack.getItem()).getBlock() instanceof ShulkerBoxBlock &&
!InventoryHelper.shulkerBoxHasItems(stack)
)
{
return CarpetSettings.shulkerBoxStackSize;
}
return slot.getMaxStackSize(stack);
}
}
src/main/java/carpet/mixins/ItemEntityMixin.java
-75
View File
@@ -1,24 +1,15 @@
package carpet.mixins;
import carpet.CarpetSettings;
import carpet.helpers.InventoryHelper;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LightningBolt;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.ShulkerBoxBlock;
import carpet.fakes.ItemEntityInterface;
import java.util.Objects;
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.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ItemEntity.class)
public abstract class ItemEntityMixin extends Entity implements ItemEntityInterface
@@ -45,70 +36,4 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf
public int getPickupDelayCM() {
return this.pickupDelay;
}
@Inject(method="<init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/item/ItemStack;)V", at = @At("RETURN"))
private void removeEmptyShulkerBoxTags(Level worldIn, double x, double y, double z, ItemStack stack, CallbackInfo ci)
{
if (CarpetSettings.shulkerBoxStackSize > 1
&& stack.getItem() instanceof BlockItem bi
&& bi.getBlock() instanceof ShulkerBoxBlock)
{
InventoryHelper.cleanUpShulkerBoxTag(stack);
}
}
@Redirect(
method = "isMergable()Z",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/world/item/ItemStack;getMaxStackSize()I"
)
)
private int getItemStackMaxAmount(ItemStack stack) {
if (CarpetSettings.shulkerBoxStackSize > 1 && stack.getItem() instanceof BlockItem && ((BlockItem)stack.getItem()).getBlock() instanceof ShulkerBoxBlock)
return CarpetSettings.shulkerBoxStackSize;
return stack.getMaxStackSize();
}
@Inject(
method = "tryToMerge(Lnet/minecraft/world/entity/item/ItemEntity;)V",
at = @At("HEAD"),
cancellable = true
)
private void tryStackShulkerBoxes(ItemEntity other, CallbackInfo ci)
{
ItemEntity self = (ItemEntity)(Object)this;
ItemStack selfStack = self.getItem();
if (CarpetSettings.shulkerBoxStackSize == 1 || !(selfStack.getItem() instanceof BlockItem bi) || !(bi.getBlock() instanceof ShulkerBoxBlock)) {
return;
}
ItemStack otherStack = other.getItem();
if (selfStack.getItem() == otherStack.getItem()
&& !InventoryHelper.shulkerBoxHasItems(selfStack)
&& !InventoryHelper.shulkerBoxHasItems(otherStack)
&& Objects.equals(selfStack.getTag(), otherStack.getTag()) // empty block entity tags are cleaned up when spawning
&& selfStack.getCount() != CarpetSettings.shulkerBoxStackSize)
{
int amount = Math.min(otherStack.getCount(), CarpetSettings.shulkerBoxStackSize - selfStack.getCount());
selfStack.grow(amount);
self.setItem(selfStack);
this.pickupDelay = Math.max(((ItemEntityInterface)other).getPickupDelayCM(), this.pickupDelay);
this.age = Math.min(other.getAge(), this.age);
otherStack.shrink(amount);
if (otherStack.isEmpty())
{
other.discard();
}
else
{
other.setItem(otherStack);
}
ci.cancel();
}
}
}
src/main/java/carpet/mixins/ItemStack_stackableShulkerBoxesMixin.java
+28
View File
@@ -0,0 +1,28 @@
package carpet.mixins;
import carpet.CarpetSettings;
import net.minecraft.core.component.DataComponents;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.component.ItemContainerContents;
import net.minecraft.world.level.block.ShulkerBoxBlock;
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 ItemStack_stackableShulkerBoxesMixin
{
@Inject(method = "getMaxStackSize", at = @At("HEAD"), cancellable = true)
private void getCMMAxStackSize(CallbackInfoReturnable<Integer> cir)
{
if (CarpetSettings.shulkerBoxStackSize > 1
&& ((ItemStack)((Object)this)).getItem() instanceof BlockItem blockItem
&& blockItem.getBlock() instanceof ShulkerBoxBlock
&& ((ItemStack) ((Object) this)).getOrDefault(DataComponents.CONTAINER, ItemContainerContents.EMPTY).stream().findAny().isEmpty()
) {
cir.setReturnValue(CarpetSettings.shulkerBoxStackSize);
}
}
}
src/main/java/carpet/mixins/Slot_stackableSBoxesMixin.java
-31
View File
@@ -1,31 +0,0 @@
package carpet.mixins;
import carpet.CarpetSettings;
import carpet.helpers.InventoryHelper;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.ShulkerBoxBlock;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(Slot.class)
public class Slot_stackableSBoxesMixin {
@Redirect(method = "safeInsert(Lnet/minecraft/world/item/ItemStack;I)Lnet/minecraft/world/item/ItemStack;", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/world/inventory/Slot;getMaxStackSize(Lnet/minecraft/world/item/ItemStack;)I"
))
private int getMaxCountForSboxesInSlot(Slot slot, ItemStack stack)
{
if (CarpetSettings.shulkerBoxStackSize > 1 &&
stack.getItem() instanceof BlockItem &&
((BlockItem)stack.getItem()).getBlock() instanceof ShulkerBoxBlock &&
!InventoryHelper.shulkerBoxHasItems(stack)
)
{
return CarpetSettings.shulkerBoxStackSize;
}
return slot.getMaxStackSize(stack);
}
}