cha0s/FunctionalStorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14 from Ars2014/main

Browse Source 
Fix Compacting Drawers
This commit is contained in:
Buuz135 2022-01-26 15:40:00 +01:00 committed by GitHub
commit 80a9ccafea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/buuz135/functionalstorage/block/CompactingDrawerBlock.java
View File

@ -2,6 +2,7 @@ package com.buuz135.functionalstorage.block;
import com.buuz135.functionalstorage.FunctionalStorage;
import com.buuz135.functionalstorage.block.tile.CompactingDrawerTile;
import com.buuz135.functionalstorage.block.tile.ControllableDrawerTile;
import com.buuz135.functionalstorage.block.tile.DrawerControllerTile;
import com.buuz135.functionalstorage.block.tile.DrawerTile;
import com.buuz135.functionalstorage.item.LinkingToolItem;
@ -169,8 +170,8 @@ public class CompactingDrawerBlock extends RotatableBlock<CompactingDrawerTile>
NonNullList<ItemStack> stacks = NonNullList.create();
ItemStack stack = new ItemStack(this);
BlockEntity drawerTile = builder.getOptionalParameter(LootContextParams.BLOCK_ENTITY);
if (drawerTile instanceof DrawerTile) {
if (!((DrawerTile) drawerTile).isEverythingEmpty()) {
if (drawerTile instanceof ControllableDrawerTile) {
if (!((ControllableDrawerTile<?>) drawerTile).isEverythingEmpty()) {
stack.getOrCreateTag().put("Tile", drawerTile.saveWithoutMetadata());
}
}
@ -188,9 +189,9 @@ public class CompactingDrawerBlock extends RotatableBlock<CompactingDrawerTile>
super.setPlacedBy(level, pos, p_49849_, p_49850_, stack);
if (stack.hasTag()) {
BlockEntity entity = level.getBlockEntity(pos);
if (entity instanceof DrawerTile && stack.getTag().contains("Tile")) {
if (entity instanceof ControllableDrawerTile && stack.getTag().contains("Tile")) {
entity.load(stack.getTag().getCompound("Tile"));
((DrawerTile) entity).markForUpdate();
((ControllableDrawerTile<?>) entity).markForUpdate();
}
}
}

2
src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java
View File

@ -129,7 +129,7 @@ public abstract class CompactingInventoryHandler implements IItemHandler, INBTSe
@Override
public boolean isItemValid(int slot, @Nonnull ItemStack stack) {
return isSetup() && slot < 3 && stack.isEmpty();
return isSetup() && slot < 3 && !stack.isEmpty();
}
private boolean isValid(int slot, @Nonnull ItemStack stack){