diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java index 9ccd26152..c6cbca398 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IFluidGridHandler.java @@ -36,16 +36,6 @@ public interface IFluidGridHandler { */ void onInsertHeldContainer(ServerPlayerEntity player); - /** - * Called when the player shift clicks a container into the grid. - * - * @param player the player - * @param container the container - * @return the remainder container - */ - @Nonnull - ItemStack onShiftClick(ServerPlayerEntity player, ItemStack container); - /** * Called when a player requests the crafting preview window to be opened. * diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java index c6f8fa2bd..d77f5c0e2 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/network/grid/handler/IItemGridHandler.java @@ -42,17 +42,6 @@ public interface IItemGridHandler { */ void onInsertHeldItem(ServerPlayerEntity player, boolean single); - /** - * Called when the player shift clicks an item into the grid. - * - * @param player the player - * @param stack the stack - * @return the remainder, or an empty stack if there is no remainder - */ - // TODO Maybe remove? - @Nonnull - ItemStack onShiftClick(ServerPlayerEntity player, ItemStack stack); - /** * Called when a player requests the crafting preview window to be opened. * diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java index 35929dc37..1ac173d06 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java @@ -107,12 +107,6 @@ public class FluidGridHandler implements IFluidGridHandler { player.updateHeldItem(); } - @Override - @Nonnull - public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack container) { - return onInsert(player, container); - } - @Override public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) { if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 888ce3c9b..2c6ae4080 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -136,11 +136,6 @@ public class ItemGridHandler implements IItemGridHandler { network.insertItem(stack, size, Action.PERFORM); stack.shrink(size); - - // TODO Is this still needed? - if (stack.isEmpty()) { - player.inventory.setItemStack(ItemStack.EMPTY); - } } } else { player.inventory.setItemStack(network.insertItem(stack, size, Action.PERFORM)); @@ -151,12 +146,6 @@ public class ItemGridHandler implements IItemGridHandler { // TODO network.getNetworkItemHandler().drainEnergy(player, RS.INSTANCE.config.wirelessGridInsertUsage); } - @Override - @Nonnull - public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack stack) { - return onInsert(player, stack); - } - @Override public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) { if (!network.getSecurityManager().hasPermission(Permission.AUTOCRAFTING, player)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java index 42990464a..028390d24 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java @@ -94,12 +94,6 @@ public class PortableFluidGridHandler implements IFluidGridHandler { player.updateHeldItem(); } - @Override - @Nonnull - public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack container) { - return onInsert(player, container); - } - @Override public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) { // NO OP diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java index 1dcac233c..8bb4d4429 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java @@ -137,11 +137,6 @@ public class PortableItemGridHandler implements IItemGridHandler { portableGrid.getItemStorage().insert(stack, size, Action.PERFORM); stack.shrink(size); - - // TODO ??? - if (stack.isEmpty()) { - player.inventory.setItemStack(ItemStack.EMPTY); - } } } else { player.inventory.setItemStack(portableGrid.getItemStorage().insert(stack, size, Action.PERFORM)); @@ -152,12 +147,6 @@ public class PortableItemGridHandler implements IItemGridHandler { portableGrid.drainEnergy(RS.INSTANCE.config.portableGridInsertUsage); } - @Override - @Nonnull - public ItemStack onShiftClick(ServerPlayerEntity player, ItemStack stack) { - return onInsert(player, stack); - } - @Override public void onCraftingPreviewRequested(ServerPlayerEntity player, UUID id, int quantity, boolean noPreview) { // NO OP diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java index d7e61ed3f..e35301e18 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java @@ -575,11 +575,6 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I return processingMatrixFluids; } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public void read(CompoundNBT tag) { super.read(tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java index 2096928fb..4fe6224da 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -123,11 +123,6 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor { throttlingDisabled = true; } - // @TODO: DELETE. - public boolean hasConnectivityState() { - return true; - } - @Override public void update() { ++ticks; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java index d53369d89..385daa0ad 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java @@ -354,11 +354,6 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, return upgrades; } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public int getType() { return world.isRemote ? TileConstructor.TYPE.getValue() : type; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java index 402a85a87..6142675d2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java @@ -374,11 +374,6 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC return new CombinedInvWrapper(patternsInventory, upgrades); } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override @Nullable public ICraftingPatternContainer getRootContainer() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java index d02417bf1..010c314f7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java @@ -78,11 +78,6 @@ public class NetworkNodeCrafterManager extends NetworkNode { this.searchBoxMode = searchBoxMode; } - @Override - public boolean hasConnectivityState() { - return true; - } - public boolean isActive() { return world.getBlockState(pos).get(NodeBlock.CONNECTED); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java index ca95af587..083068546 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java @@ -44,11 +44,6 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting return ID; } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public String getGuiTitle() { return "gui.refinedstorage:crafting_monitor"; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java index 24c99c60a..808239c6e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java @@ -291,11 +291,6 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I return itemFilters; } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public IItemHandler getDrops() { return upgrades; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java index 1c7b0612d..81e55f0a8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java @@ -260,9 +260,4 @@ public class NetworkNodeFluidInterface extends NetworkNode { public IItemHandler getDrops() { return new CombinedInvWrapper(in, upgrades); } - - @Override - public boolean hasConnectivityState() { - return true; - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java index fd6af02f8..f261e1048 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java @@ -226,9 +226,4 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable { public IItemHandler getDrops() { return new CombinedInvWrapper(importItems, exportItems, upgrades); } - - @Override - public boolean hasConnectivityState() { - return true; - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkReceiver.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkReceiver.java index 2c4e54955..11e4d1cf4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkReceiver.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkReceiver.java @@ -17,11 +17,6 @@ public class NetworkNodeNetworkReceiver extends NetworkNode { return RS.INSTANCE.config.networkReceiverUsage; } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public ResourceLocation getId() { return ID; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java index 4d9bac315..7f4c845ff 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java @@ -106,11 +106,6 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { return canUpdate() && receiver != null; } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public boolean shouldRebuildGraphOnChange() { return true; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java index 821a30fb8..88475471b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java @@ -61,11 +61,6 @@ public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReade return world.getBlockState(pos).get(NodeBlock.CONNECTED); } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public void read(CompoundNBT tag) { super.read(tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java index fe76d25ac..6aa30774d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java @@ -43,11 +43,6 @@ public class NetworkNodeRelay extends NetworkNode { return canUpdate(); } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public boolean shouldRebuildGraphOnChange() { return true; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java index 335b46605..4f0da02d1 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java @@ -10,6 +10,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.security.SecurityCard; import com.raoulvdberge.refinedstorage.inventory.item.BaseItemHandler; import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic; import com.raoulvdberge.refinedstorage.inventory.listener.NetworkNodeListener; +import com.raoulvdberge.refinedstorage.item.SecurityCardItem; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -80,8 +81,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity ItemStack stack = cardsInv.getStackInSlot(i); if (!stack.isEmpty()) { - UUID uuid = null;/*TODO ItemSecurityCard.getOwner(stack)*/ - ; + UUID uuid = SecurityCardItem.getOwner(stack); if (uuid == null) { this.globalCard = createCard(stack, null); @@ -98,7 +98,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity SecurityCard card = new SecurityCard(uuid); for (Permission permission : Permission.values()) { - card.getPermissions().put(permission, /*TODO ItemSecurityCard.hasPermission(stack, permission)*/false); + card.getPermissions().put(permission, SecurityCardItem.hasPermission(stack, permission)); } return card; @@ -146,7 +146,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity ItemStack card = getEditCard().getStackInSlot(0); if (!card.isEmpty()) { - // TODO ItemSecurityCard.setPermission(card, permission, state); + SecurityCardItem.setPermission(card, permission, state); } } @@ -165,9 +165,4 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity public IItemHandler getDrops() { return new CombinedInvWrapper(cardsInv, editCard); } - - @Override - public boolean hasConnectivityState() { - return true; - } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java index a04f47f1f..ec6e331ce 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java @@ -204,11 +204,6 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl return itemFilter; } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public void setRedstoneMode(RedstoneMode mode) { // NO OP diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java index cd25025eb..990e77b7c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java @@ -80,11 +80,6 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire return direction != null && Direction.DOWN.equals(direction); } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public void visit(Operator operator) { operator.apply(world, pos.offset(Direction.DOWN), Direction.UP); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java index 59a3e70a3..6aaf54273 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java @@ -93,11 +93,6 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade return world.getBlockState(pos).get(NodeBlock.CONNECTED); } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public void read(CompoundNBT tag) { super.read(tag); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java index efdca6c10..8e82b9936 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java @@ -127,11 +127,6 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab return RS.INSTANCE.config.diskManipulatorUsage + upgrades.getEnergyUsage(); } - @Override - public boolean hasConnectivityState() { - return true; - } - @Override public void update() { super.update(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java b/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java index c49a66a91..e1c95a10a 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/GridContainer.java @@ -87,13 +87,13 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene IFluidGridHandler fluidHandler = grid.getFluidHandler(); if (fluidHandler != null) { - slot.putStack(fluidHandler.onShiftClick((ServerPlayerEntity) getPlayer(), stack)); + slot.putStack(fluidHandler.onInsert((ServerPlayerEntity) getPlayer(), stack)); } } else { IItemGridHandler itemHandler = grid.getItemHandler(); if (itemHandler != null) { - slot.putStack(itemHandler.onShiftClick((ServerPlayerEntity) getPlayer(), stack)); + slot.putStack(itemHandler.onInsert((ServerPlayerEntity) getPlayer(), stack)); } else if (slot instanceof CraftingGridSlot && mergeItemStack(stack, 14, 14 + (9 * 4), false)) { slot.onSlotChanged(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java index 8a9c3eefb..b5b11eb64 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/widget/sidebutton/CrafterManagerSearchBoxModeSideButton.java @@ -1,6 +1,7 @@ package com.raoulvdberge.refinedstorage.screen.widget.sidebutton; import com.raoulvdberge.refinedstorage.api.network.grid.IGrid; +import com.raoulvdberge.refinedstorage.integration.jei.JeiIntegration; import com.raoulvdberge.refinedstorage.screen.GuiCrafterManager; import com.raoulvdberge.refinedstorage.tile.TileCrafterManager; import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; @@ -31,11 +32,11 @@ public class CrafterManagerSearchBoxModeSideButton extends SideButton { if (mode == IGrid.SEARCH_BOX_MODE_NORMAL) { mode = IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED; } else if (mode == IGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED) { - //TODO if (IntegrationJEI.isLoaded()) { - // mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED; - //} else { - mode = IGrid.SEARCH_BOX_MODE_NORMAL; - //} + if (JeiIntegration.isLoaded()) { + mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED; + } else { + mode = IGrid.SEARCH_BOX_MODE_NORMAL; + } } else if (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED) { mode = IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED; } else if (mode == IGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/GridTile.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/GridTile.java index e7967b546..400a07c05 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/GridTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/GridTile.java @@ -10,10 +10,16 @@ import com.raoulvdberge.refinedstorage.tile.config.IType; import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import com.raoulvdberge.refinedstorage.util.GridUtils; import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public class GridTile extends NetworkNodeTile { public static final TileDataParameter VIEW_TYPE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getViewType(), (t, v) -> { @@ -75,6 +81,8 @@ public class GridTile extends NetworkNodeTile { private final GridType type; + private LazyOptional diskCapability = LazyOptional.of(() -> getNode().getPatterns()); + public GridTile(GridType type) { super(GridUtils.getTileEntityType(type)); @@ -98,18 +106,13 @@ public class GridTile extends NetworkNodeTile { return new GridNetworkNode(world, pos, type); } - /* TODO + @Nonnull @Override - public boolean hasCapability(@Nonnull Capability capability, @Nullable Direction side) { - return (getNode().getGridType() == GridType.PATTERN && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) || super.hasCapability(capability, side); - } - - @Override - public T getCapability(@Nonnull Capability capability, @Nullable Direction side) { - if (getNode().getGridType() == GridType.PATTERN && capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { - return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getPatterns()); + public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction direction) { + if (cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && type == GridType.PATTERN) { + return diskCapability.cast(); } - return super.getCapability(capability, side); - }*/ + return super.getCapability(cap, direction); + } }