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

Some more fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-11 00:03:11 +02:00
parent 86c15b2e4f
commit 786cdb7553
43 changed files with 59 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/api/RefinedStorageAPI.java
View File

@@ -4,7 +4,7 @@ import refinedstorage.api.solderer.ISoldererRegistry;
public final class RefinedStorageAPI {
/**
* The solderer registry, set in pre-initialization.
* The solderer registry, set in pre-initialization
*/
public static ISoldererRegistry SOLDERER_REGISTRY;
}

2
src/main/java/refinedstorage/api/network/INetworkMaster.java
View File

@@ -7,7 +7,7 @@ import net.minecraft.util.math.BlockPos;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.IGroupedItemStorage;
import javax.annotation.Nonnull;

6
src/main/java/refinedstorage/api/network/INetworkNodeGraph.java
View File

@@ -1,7 +1,7 @@
package refinedstorage.api.network;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.WorldProvider;
import net.minecraft.world.World;
import java.util.List;
import java.util.Set;
@@ -24,9 +24,7 @@ public interface INetworkNodeGraph {
List<INetworkNode> all();
/**
* These hashes are calculated like this: 31 * {@link BlockPos#hashCode()} + {@link WorldProvider#getDimension()}
*
* @return A set of hashes of all connected nodes
* @return A set of hashes of all connected nodes, see {@link NetworkUtils#getNodeHashCode(World, INetworkNode)}
*/
Set<Integer> allHashes();

9
src/main/java/refinedstorage/api/network/NetworkUtils.java
View File

@@ -1,8 +1,9 @@
package refinedstorage.api.network;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
/**
* Utilities for network manipulation.
@@ -27,4 +28,10 @@ public final class NetworkUtils {
public static int getItemStackHashCode(ItemStack stack) {
return stack.getItem().hashCode() * (stack.getItemDamage() + 1) * (stack.hasTagCompound() ? stack.getTagCompound().hashCode() : 1);
}
public static int getNodeHashCode(World world, INetworkNode node) {
int result = node.getPosition().hashCode();
result = 31 * result + world.provider.getDimension();
return result;
}
}

2
src/main/java/refinedstorage/api/network/grid/IItemGridHandler.java
View File

@@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack;
import javax.annotation.Nullable;
/**
* Defines the behavior of grids.
* Defines the behavior of item grids.
*/
public interface IItemGridHandler {
/**

4
src/main/java/refinedstorage/api/storage/item/CompareUtils.java → src/main/java/refinedstorage/api/storage/CompareUtils.java
View File

@@ -1,11 +1,11 @@
package refinedstorage.api.storage.item;
package refinedstorage.api.storage;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import org.apache.commons.lang3.ArrayUtils;
/**
* Utilities for comparing {@link ItemStack}.
* Utilities for comparing.
*/
public final class CompareUtils {
public static final int COMPARE_DAMAGE = 1;

6
src/main/java/refinedstorage/api/storage/item/IGroupedItemStorage.java
View File

@@ -2,6 +2,7 @@ package refinedstorage.api.storage.item;
import net.minecraft.item.ItemStack;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.IStorageProvider;
import javax.annotation.Nonnull;
@@ -18,8 +19,7 @@ import java.util.List;
*/
public interface IGroupedItemStorage {
/**
* Rebuilds the storages and items for a network. Typically called when a {@link IStorageProvider} is
* added or removed from the network.
* Rebuilds the global item list. Typically called when a {@link IStorageProvider} is added or removed from the network.
*/
void rebuild();
@@ -70,7 +70,7 @@ public interface IGroupedItemStorage {
Collection<ItemStack> getStacks();
/**
* @return The storages connected to this network
* @return The item storages connected to this network
*/
List<IItemStorage> getStorages();
}

1
src/main/java/refinedstorage/api/storage/item/IItemStorage.java
View File

@@ -1,6 +1,7 @@
package refinedstorage.api.storage.item;
import net.minecraft.item.ItemStack;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.IStorageProvider;
import javax.annotation.Nonnull;

2
src/main/java/refinedstorage/apiimpl/autocrafting/CraftingTaskScheduler.java
View File

@@ -5,7 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
public class CraftingTaskScheduler {
private static final String NBT_SCHEDULED = "CraftingTaskScheduled";

2
src/main/java/refinedstorage/apiimpl/autocrafting/ProcessingCraftingTask.java
View File

@@ -9,7 +9,7 @@ import refinedstorage.api.autocrafting.ICraftingPatternContainer;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
public class ProcessingCraftingTask implements ICraftingTask {
public static final int ID = 1;

2
src/main/java/refinedstorage/apiimpl/network/ItemGridHandler.java
View File

@@ -9,7 +9,7 @@ import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.network.grid.GridExtractFlags;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
public class ItemGridHandler implements IItemGridHandler {
public static final int MAX_CRAFTING_PER_REQUEST = 500;

13
src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java
View File

@@ -7,6 +7,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
import refinedstorage.api.network.INetworkNode;
import refinedstorage.api.network.INetworkNodeGraph;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.tile.TileController;
import refinedstorage.tile.TileNetworkTransmitter;
@@ -22,12 +23,6 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
this.controller = controller;
}
private int hashNode(World world, INetworkNode node) {
int result = node.getPosition().hashCode();
result = 31 * result + world.provider.getDimension();
return result;
}
@Override
public void rebuild(BlockPos start, boolean notify) {
if (!controller.canRun()) {
@@ -71,7 +66,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
INetworkNode node = (INetworkNode) tile;
newNodes.add(node);
newNodeHashes.add(hashNode(world, node));
newNodeHashes.add(NetworkUtils.getNodeHashCode(world, node));
if (tile instanceof TileNetworkTransmitter) {
final TileNetworkTransmitter transmitter = (TileNetworkTransmitter) tile;
@@ -120,7 +115,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
boolean changed = false;
for (INetworkNode newNode : nodes) {
if (!oldNodeHashes.contains(hashNode(newNode.getNodeWorld(), newNode))) {
if (!oldNodeHashes.contains(NetworkUtils.getNodeHashCode(newNode.getNodeWorld(), newNode))) {
newNode.onConnected(controller);
changed = true;
@@ -128,7 +123,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
}
for (INetworkNode oldNode : oldNodes) {
if (!nodeHashes.contains(hashNode(oldNode.getNodeWorld(), oldNode))) {
if (!nodeHashes.contains(NetworkUtils.getNodeHashCode(oldNode.getNodeWorld(), oldNode))) {
oldNode.onDisconnected(controller);
changed = true;

2
src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java
View File

@@ -3,7 +3,7 @@ package refinedstorage.apiimpl.solderer;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.api.solderer.ISoldererRecipe;
import refinedstorage.api.solderer.ISoldererRegistry;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;

2
src/main/java/refinedstorage/apiimpl/storage/item/GroupedItemStorage.java
View File

@@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack;
import refinedstorage.api.autocrafting.ICraftingPattern;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.IStorageProvider;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.item.IGroupedItemStorage;
import refinedstorage.api.storage.item.IItemStorage;

2
src/main/java/refinedstorage/apiimpl/storage/item/ItemStorageNBT.java
View File

@@ -6,7 +6,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.IItemStorage;
import javax.annotation.Nullable;

2
src/main/java/refinedstorage/container/ContainerBase.java
View File

@@ -6,7 +6,7 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.slot.SlotDisabled;
import refinedstorage.container.slot.SlotSpecimen;
import refinedstorage.container.slot.SlotSpecimenLegacy;

4
src/main/java/refinedstorage/container/ContainerGrid.java
View File

@@ -104,8 +104,8 @@ public class ContainerGrid extends ContainerBase {
if (slot.getHasStack()) {
if (slot == craftingResultSlot) {
((TileGrid) grid).onCraftedShift(this, player);
} else if (grid.getGridHandler() != null && slot != patternResultSlot && !(slot instanceof SlotSpecimenLegacy)) {
slot.putStack(grid.getGridHandler().onInsert(slot.getStack()));
} else if (grid.getHandler() != null && slot != patternResultSlot && !(slot instanceof SlotSpecimenLegacy)) {
slot.putStack(grid.getHandler().onInsert(slot.getStack()));
detectAndSendChanges();
}

2
src/main/java/refinedstorage/gui/GuiConstructor.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.ContainerConstructor;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;

2
src/main/java/refinedstorage/gui/GuiDestructor.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.ContainerDestructor;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonMode;

2
src/main/java/refinedstorage/gui/GuiDetector.java
View File

@@ -2,7 +2,7 @@ package refinedstorage.gui;
import com.google.common.primitives.Ints;
import net.minecraft.client.gui.GuiTextField;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.ContainerDetector;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonDetectorMode;

2
src/main/java/refinedstorage/gui/GuiExporter.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.ContainerExporter;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;

2
src/main/java/refinedstorage/gui/GuiGridFilter.java
View File

@@ -3,7 +3,7 @@ package refinedstorage.gui;
import net.minecraft.client.gui.GuiButton;
import net.minecraftforge.fml.client.config.GuiCheckBox;
import refinedstorage.RefinedStorage;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.ContainerGridFilter;
import refinedstorage.item.ItemGridFilter;
import refinedstorage.network.MessageGridFilterUpdate;

2
src/main/java/refinedstorage/gui/GuiImporter.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.ContainerImporter;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonMode;

2
src/main/java/refinedstorage/gui/GuiInterface.java
View File

@@ -1,6 +1,6 @@
package refinedstorage.gui;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.ContainerInterface;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonRedstoneMode;

2
src/main/java/refinedstorage/gui/GuiStorage.java
View File

@@ -2,7 +2,7 @@ package refinedstorage.gui;
import com.google.common.primitives.Ints;
import net.minecraft.client.gui.GuiTextField;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.container.ContainerStorage;
import refinedstorage.gui.sidebutton.SideButtonCompare;
import refinedstorage.gui.sidebutton.SideButtonMode;

2
src/main/java/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -14,7 +14,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.common.FMLCommonHandler;
import refinedstorage.RefinedStorage;
import refinedstorage.api.network.grid.GridExtractFlags;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.block.EnumGridType;
import refinedstorage.container.ContainerGrid;
import refinedstorage.gui.GuiBase;

2
src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
View File

@@ -1,7 +1,7 @@
package refinedstorage.gui.sidebutton;
import net.minecraft.util.text.TextFormatting;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.gui.GuiBase;
import refinedstorage.tile.data.TileDataManager;
import refinedstorage.tile.data.TileDataParameter;

2
src/main/java/refinedstorage/item/ItemGridFilter.java
View File

@@ -10,7 +10,7 @@ import net.minecraft.world.World;
import refinedstorage.RefinedStorage;
import refinedstorage.RefinedStorageGui;
import refinedstorage.RefinedStorageItems;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.inventory.ItemHandlerGridFilter;
import java.util.List;

2
src/main/java/refinedstorage/item/ItemPattern.java
View File

@@ -13,7 +13,7 @@ import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import refinedstorage.RefinedStorageItems;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import java.util.HashSet;
import java.util.List;

2
src/main/java/refinedstorage/network/MessageGridCraftingStart.java
View File

@@ -36,7 +36,7 @@ public class MessageGridCraftingStart extends MessageHandlerPlayerToServer<Messa
Container container = player.openContainer;
if (container instanceof ContainerGrid) {
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getHandler();
if (handler != null) {
handler.onCraftingRequested(message.id, message.quantity);

2
src/main/java/refinedstorage/network/MessageGridInsertHeld.java
View File

@@ -32,7 +32,7 @@ public class MessageGridInsertHeld extends MessageHandlerPlayerToServer<MessageG
Container container = player.openContainer;
if (container instanceof ContainerGrid) {
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getHandler();
if (handler != null) {
handler.onInsertHeldItem(message.single, player);

2
src/main/java/refinedstorage/network/MessageGridPull.java
View File

@@ -36,7 +36,7 @@ public class MessageGridPull extends MessageHandlerPlayerToServer<MessageGridPul
Container container = player.openContainer;
if (container instanceof ContainerGrid) {
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getGridHandler();
IItemGridHandler handler = ((ContainerGrid) container).getGrid().getHandler();
if (handler != null) {
handler.onExtract(message.id, message.flags, player);

2
src/main/java/refinedstorage/tile/ClientNode.java
View File

@@ -1,7 +1,7 @@
package refinedstorage.tile;
import net.minecraft.item.ItemStack;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
public class ClientNode {
private ItemStack stack;

2
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -22,7 +22,7 @@ import refinedstorage.api.autocrafting.ICraftingPatternContainer;
import refinedstorage.api.autocrafting.ICraftingTask;
import refinedstorage.api.network.*;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.IGroupedItemStorage;
import refinedstorage.api.storage.item.IItemStorage;
import refinedstorage.apiimpl.autocrafting.BasicCraftingTask;

2
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -11,7 +11,7 @@ import refinedstorage.RefinedStorage;
import refinedstorage.api.RefinedStorageAPI;
import refinedstorage.api.network.INetworkMaster;
import refinedstorage.api.solderer.ISoldererRecipe;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.inventory.ItemHandlerBasic;
import refinedstorage.inventory.ItemHandlerSolderer;
import refinedstorage.inventory.ItemHandlerUpgrade;

2
src/main/java/refinedstorage/tile/config/IFilterable.java
View File

@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.network.datasync.DataSerializers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.items.IItemHandler;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.tile.data.ITileDataConsumer;
import refinedstorage.tile.data.ITileDataProducer;
import refinedstorage.tile.data.TileDataParameter;

2
src/main/java/refinedstorage/tile/externalstorage/ItemStorageDSU.java
View File

@@ -3,7 +3,7 @@ package refinedstorage.tile.externalstorage;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemHandlerHelper;
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.tile.config.IFilterable;
import javax.annotation.Nonnull;

2
src/main/java/refinedstorage/tile/externalstorage/ItemStorageDrawer.java
View File

@@ -4,7 +4,7 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer;
import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.tile.config.IFilterable;
import java.util.Collections;

2
src/main/java/refinedstorage/tile/externalstorage/ItemStorageExternal.java
View File

@@ -1,7 +1,7 @@
package refinedstorage.tile.externalstorage;
import net.minecraft.item.ItemStack;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.api.storage.item.IItemStorage;
import java.util.List;

2
src/main/java/refinedstorage/tile/externalstorage/ItemStorageItemHandler.java
View File

@@ -3,7 +3,7 @@ package refinedstorage.tile.externalstorage;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.tile.config.IFilterable;
import java.util.ArrayList;

2
src/main/java/refinedstorage/tile/grid/IGrid.java
View File

@@ -14,7 +14,7 @@ public interface IGrid {
BlockPos getNetworkPosition();
IItemGridHandler getGridHandler();
IItemGridHandler getHandler();
int getViewType();

4
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -17,7 +17,7 @@ import refinedstorage.RefinedStorageBlocks;
import refinedstorage.RefinedStorageItems;
import refinedstorage.api.network.NetworkUtils;
import refinedstorage.api.network.grid.IItemGridHandler;
import refinedstorage.api.storage.item.CompareUtils;
import refinedstorage.api.storage.CompareUtils;
import refinedstorage.block.BlockGrid;
import refinedstorage.block.EnumGridType;
import refinedstorage.container.ContainerGrid;
@@ -195,7 +195,7 @@ public class TileGrid extends TileNode implements IGrid {
}
@Override
public IItemGridHandler getGridHandler() {
public IItemGridHandler getHandler() {
return isConnected() ? network.getItemGridHandler() : null;
}

2
src/main/java/refinedstorage/tile/grid/WirelessGrid.java
View File

@@ -84,7 +84,7 @@ public class WirelessGrid implements IGrid {
}
@Override
public IItemGridHandler getGridHandler() {
public IItemGridHandler getHandler() {
TileController controller = getController();
return controller != null ? controller.getItemGridHandler() : null;