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

Remove filter in filter functionality on the container side.

Browse Source
This commit is contained in:
raoulvdberge
2018-07-02 23:29:18 +02:00
parent d49ac4b9c9
commit 1b3a36978e
2 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.container; package com.raoulvdberge.refinedstorage.container;
import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.container.slot.*; import com.raoulvdberge.refinedstorage.container.slot.*;
import com.raoulvdberge.refinedstorage.tile.TileBase; import com.raoulvdberge.refinedstorage.tile.TileBase;
@@ -78,10 +77,6 @@ public abstract class ContainerBase extends Container {
} }
if (slot instanceof SlotFilter) { if (slot instanceof SlotFilter) {
if (slot.getStack().getItem() == RSItems.FILTER) {
return super.slotClick(id, dragType, clickType, player);
}
if (((SlotFilter) slot).allowsSize()) { if (((SlotFilter) slot).allowsSize()) {
if (clickType == ClickType.QUICK_MOVE) { if (clickType == ClickType.QUICK_MOVE) {
slot.putStack(ItemStack.EMPTY); slot.putStack(ItemStack.EMPTY);
@@ -101,10 +96,6 @@ public abstract class ContainerBase extends Container {
} else if (player.inventory.getItemStack().isEmpty()) { } else if (player.inventory.getItemStack().isEmpty()) {
slot.putStack(ItemStack.EMPTY); slot.putStack(ItemStack.EMPTY);
} else if (slot.isItemValid(player.inventory.getItemStack())) { } else if (slot.isItemValid(player.inventory.getItemStack())) {
if (player.inventory.getItemStack().getItem() == RSItems.FILTER) {
return super.slotClick(id, dragType, clickType, player);
}
slot.putStack(player.inventory.getItemStack().copy()); slot.putStack(player.inventory.getItemStack().copy());
} }
@@ -143,10 +134,6 @@ public abstract class ContainerBase extends Container {
slot.putStack(ItemHandlerHelper.copyStackWithSize(stack, 1)); slot.putStack(ItemHandlerHelper.copyStackWithSize(stack, 1));
slot.onSlotChanged(); slot.onSlotChanged();
if (stack.getItem() == RSItems.FILTER) {
stack.setCount(0);
}
return ItemStack.EMPTY; return ItemStack.EMPTY;
} }
} }

7
src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilter.java
View File

@@ -1,8 +1,6 @@
package com.raoulvdberge.refinedstorage.container.slot; package com.raoulvdberge.refinedstorage.container.slot;
import com.raoulvdberge.refinedstorage.RSItems;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.item.*; import net.minecraft.item.*;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -30,11 +28,6 @@ public class SlotFilter extends SlotItemHandler {
this(handler, id, x, y, 0); this(handler, id, x, y, 0);
} }
@Override
public boolean canTakeStack(EntityPlayer player) {
return getStack().getItem() == RSItems.FILTER;
}
@Override @Override
public boolean isItemValid(@Nonnull ItemStack stack) { public boolean isItemValid(@Nonnull ItemStack stack) {
if (super.isItemValid(stack)) { if (super.isItemValid(stack)) {