FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-03 10:39:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shulker boxes accepting other shulkers when using a directionless InventoryStorage ()

Browse source 
* Fix shulker boxes accepting other shulkers

If a mod creates a directionless InventoryStorage, it only calls
Inventory.isValid and not SidedInventory.canInsert. However, shulker
boxes only override the latter, allowing shulkers to be inserted into
them.

* Check for insertion in inventorySlotWrapper instead

(cherry picked from commit c4b89cc4a6)
This commit is contained in:
Jonathan Coates 2022-11-20 13:19:18 +00:00 • committed by modmuss50
parent 33716ae262
commit 4226ecdc12
2 changed files with 29 additions and 1 deletions
fabric-transfer-api-v1/src
main/java/net/fabricmc/fabric/impl/transfer/item
InventorySlotWrapper.java
testmod/java/net/fabricmc/fabric/test/transfer/gametests
VanillaStorageTests.java

12
fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/item/InventorySlotWrapper.java
View file

@ -16,6 +16,7 @@
package net.fabricmc.fabric.impl.transfer.item;
import net.minecraft.block.entity.ShulkerBoxBlockEntity;
import net.minecraft.item.ItemStack;
import net.fabricmc.fabric.api.transfer.v1.item.base.SingleStackStorage;
@ -65,13 +66,22 @@ class InventorySlotWrapper extends SingleStackStorage {
@Override
public long insert(ItemVariant insertedVariant, long maxAmount, TransactionContext transaction) {
if (!storage.inventory.isValid(slot, ((ItemVariantImpl) insertedVariant).getCachedStack())) {
if (!canInsert(slot, ((ItemVariantImpl) insertedVariant).getCachedStack())) {
return 0;
} else {
return super.insert(insertedVariant, maxAmount, transaction);
}
}
private boolean canInsert(int slot, ItemStack stack) {
if (storage.inventory instanceof ShulkerBoxBlockEntity shulker) {
// Shulkers override canInsert but not isValid.
return shulker.canInsert(slot, stack, null);
} else {
return storage.inventory.isValid(slot, stack);
}
}
@Override
public int getCapacity(ItemVariant variant) {
return Math.min(storage.inventory.getMaxCountPerStack(), variant.getItem().getMaxCount());

18
fabric-transfer-api-v1/src/testmod/java/net/fabricmc/fabric/test/transfer/gametests/VanillaStorageTests.java
View file

@ -20,6 +20,7 @@ import net.minecraft.block.Blocks;
import net.minecraft.block.ComparatorBlock;
import net.minecraft.block.entity.ChestBlockEntity;
import net.minecraft.block.entity.FurnaceBlockEntity;
import net.minecraft.block.entity.ShulkerBoxBlockEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.test.GameTest;
@ -119,4 +120,21 @@ public class VanillaStorageTests {
context.complete();
}
/**
* Tests that shulker boxes cannot be inserted into other shulker boxes.
*/
@GameTest(templateName = FabricGameTest.EMPTY_STRUCTURE)
public void testShulkerNoInsert(TestContext context) {
BlockPos pos = new BlockPos(0, 2, 0);
context.setBlockState(pos, Blocks.SHULKER_BOX);
ShulkerBoxBlockEntity shulker = (ShulkerBoxBlockEntity) context.getBlockEntity(pos);
InventoryStorage storage = InventoryStorage.of(shulker, null);
if (storage.simulateInsert(ItemVariant.of(Items.SHULKER_BOX), 1, null) > 0) {
context.throwPositionedException("Expected shulker box to be rejected", pos);
}
context.complete();
}
}