dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dupes with FilterSlots (#2567)

Browse Source
This commit is contained in:
Darkere
2020-06-10 23:07:41 +02:00
committed by GitHub
parent 09d76e6200
commit 8a68ea56ce
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FilterSlot.java
View File

@@ -1,6 +1,7 @@
package com.refinedmods.refinedstorage.container.slot.filter; package com.refinedmods.refinedstorage.container.slot.filter;
import com.refinedmods.refinedstorage.container.slot.BaseSlot; import com.refinedmods.refinedstorage.container.slot.BaseSlot;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
@@ -46,6 +47,11 @@ public class FilterSlot extends BaseSlot {
super.putStack(stack); super.putStack(stack);
} }
@Override
public boolean canTakeStack(PlayerEntity playerIn) {
return false;
}
public boolean isSizeAllowed() { public boolean isSizeAllowed() {
return (flags & FILTER_ALLOW_SIZE) == FILTER_ALLOW_SIZE; return (flags & FILTER_ALLOW_SIZE) == FILTER_ALLOW_SIZE;
} }

6
src/main/java/com/refinedmods/refinedstorage/container/slot/filter/FluidFilterSlot.java
View File

@@ -3,6 +3,7 @@ package com.refinedmods.refinedstorage.container.slot.filter;
import com.refinedmods.refinedstorage.container.slot.BaseSlot; import com.refinedmods.refinedstorage.container.slot.BaseSlot;
import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory; import com.refinedmods.refinedstorage.inventory.fluid.FluidInventory;
import com.refinedmods.refinedstorage.util.StackUtils; import com.refinedmods.refinedstorage.util.StackUtils;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.ItemStackHandler;
@@ -35,6 +36,11 @@ public class FluidFilterSlot extends BaseSlot {
fluidInventory.setFluid(getSlotIndex(), StackUtils.getFluid(stack, true).getValue()); fluidInventory.setFluid(getSlotIndex(), StackUtils.getFluid(stack, true).getValue());
} }
@Override
public boolean canTakeStack(PlayerEntity playerIn) {
return false;
}
public boolean isSizeAllowed() { public boolean isSizeAllowed() {
return (flags & FILTER_ALLOW_SIZE) == FILTER_ALLOW_SIZE; return (flags & FILTER_ALLOW_SIZE) == FILTER_ALLOW_SIZE;
} }