Fix item pkg

src/main/java/com/raoulvdberge/refinedstorage/RS.java

@@ -1,8 +1,6 @@
 package com.raoulvdberge.refinedstorage;
 
-import com.raoulvdberge.refinedstorage.item.ItemCover;
 import com.raoulvdberge.refinedstorage.proxy.ProxyCommon;
-import net.minecraft.block.Blocks;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.Mod;
@@ -28,7 +26,7 @@ public final class RS {
         public ItemStack createIcon() {
             ItemStack stack = new ItemStack(RSItems.COVER);
 
-            ItemCover.setItem(stack, new ItemStack(Blocks.STONE));
+            // TODO ItemCover.setItem(stack, new ItemStack(Blocks.STONE));
 
             return stack;
         }

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java

@@ -5,7 +5,6 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContaine
 import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory;
-import com.raoulvdberge.refinedstorage.item.ItemPattern;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.inventory.container.Container;
@@ -35,12 +34,12 @@ public class CraftingPattern implements ICraftingPattern {
     public CraftingPattern(World world, ICraftingPatternContainer container, ItemStack stack) {
         this.container = container;
         this.stack = stack;
-        this.processing = ItemPattern.isProcessing(stack);
+        // TODO  this.processing = ItemPattern.isProcessing(stack);
-        this.oredict = ItemPattern.isOredict(stack);
+        // TODO this.oredict = ItemPattern.isOredict(stack);
 
         if (processing) {
             for (int i = 0; i < 9; ++i) {
-                ItemStack input = ItemPattern.getInputSlot(stack, i);
+                ItemStack input = ItemStack.EMPTY;// TODO ItemPattern.getInputSlot(stack, i);
 
                 if (input == null) {
                     inputs.add(NonNullList.create());
@@ -72,7 +71,7 @@ public class CraftingPattern implements ICraftingPattern {
                     inputs.add(NonNullList.from(ItemStack.EMPTY, input));
                 }
 
-                ItemStack output = ItemPattern.getOutputSlot(stack, i);
+                /*ItemStack output = ItemPattern.getOutputSlot(stack, i);
                 if (output != null) {
                     this.valid = true; // As soon as we have one output, we are valid.
 
@@ -91,19 +90,19 @@ public class CraftingPattern implements ICraftingPattern {
                     this.valid = true;
 
                     fluidOutputs.add(fluidOutput);
-                }
+                }*/
             }
         } else {
             CraftingInventory inv = new CraftingInventoryDummy();
 
             for (int i = 0; i < 9; ++i) {
-                ItemStack input = ItemPattern.getInputSlot(stack, i);
+                // TODO ItemStack input = ItemPattern.getInputSlot(stack, i);
 
-                inputs.add(input == null ? NonNullList.create() : NonNullList.from(ItemStack.EMPTY, input));
+                // TODO inputs.add(input == null ? NonNullList.create() : NonNullList.from(ItemStack.EMPTY, input));
 
-                if (input != null) {
+                // TODO  if (input != null) {
-                    inv.setInventorySlotContents(i, input);
+                // TODO     inv.setInventorySlotContents(i, input);
-                }
+                // TODO }
             }
 
             // TODO: better way of collecting recipes

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java

@@ -22,7 +22,6 @@ import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
 import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
 import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
-import com.raoulvdberge.refinedstorage.item.ItemPattern;
 import com.raoulvdberge.refinedstorage.tile.config.IType;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
 import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
@@ -102,7 +101,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I
 
             ItemStack pattern = getStackInSlot(slot);
             if (slot == 1 && !pattern.isEmpty()) {
-                boolean isPatternProcessing = ItemPattern.isProcessing(pattern);
+                /* TODO boolean isPatternProcessing = ItemPattern.isProcessing(pattern);
 
                 if (isPatternProcessing && isProcessingPattern()) {
                     for (int i = 0; i < 9; ++i) {
@@ -118,7 +117,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I
                     for (int i = 0; i < 9; ++i) {
                         matrix.setInventorySlotContents(i, StackUtils.nullToEmpty(ItemPattern.getInputSlot(pattern, i)));
                     }
-                }
+                }*/
             }
         }
 
@@ -548,26 +547,26 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I
 
             ItemStack pattern = new ItemStack(RSItems.PATTERN);
 
-            ItemPattern.setVersion(pattern);
+            /*TODO ItemPattern.setVersion(pattern);
             ItemPattern.setOredict(pattern, oredictPattern);
             ItemPattern.setProcessing(pattern, processingPattern);
-
+*/
             if (processingPattern) {
                 for (int i = 0; i < 18; ++i) {
                     if (!processingMatrix.getStackInSlot(i).isEmpty()) {
                         if (i >= 9) {
-                            ItemPattern.setOutputSlot(pattern, i - 9, processingMatrix.getStackInSlot(i));
+                            // TODO ItemPattern.setOutputSlot(pattern, i - 9, processingMatrix.getStackInSlot(i));
                         } else {
-                            ItemPattern.setInputSlot(pattern, i, processingMatrix.getStackInSlot(i));
+                            // TODO ItemPattern.setInputSlot(pattern, i, processingMatrix.getStackInSlot(i));
                         }
                     }
 
                     FluidStack fluid = processingMatrixFluids.getFluid(i);
                     if (fluid != null) {
                         if (i >= 9) {
-                            ItemPattern.setFluidOutputSlot(pattern, i - 9, fluid);
+                            // TODO ItemPattern.setFluidOutputSlot(pattern, i - 9, fluid);
                         } else {
-                            ItemPattern.setFluidInputSlot(pattern, i, fluid);
+                            // TODO ItemPattern.setFluidInputSlot(pattern, i, fluid);
                         }
                     }
                 }
@@ -576,7 +575,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGridNetworkAware, I
                     ItemStack ingredient = matrix.getStackInSlot(i);
 
                     if (!ingredient.isEmpty()) {
-                        ItemPattern.setInputSlot(pattern, i, ingredient);
+                        // TODO ItemPattern.setInputSlot(pattern, i, ingredient);
                     }
                 }
             }

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java

@@ -6,13 +6,11 @@ import com.raoulvdberge.refinedstorage.api.util.Action;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
 import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
 import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
-import com.raoulvdberge.refinedstorage.item.ItemNetworkCard;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.items.IItemHandler;
 
 import javax.annotation.Nullable;
@@ -30,8 +28,8 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
             if (card.isEmpty()) {
                 receiver = null;
             } else {
-                receiver = ItemNetworkCard.getReceiver(card);
+                // TODO receiver = ItemNetworkCard.getReceiver(card);
-                receiverDimension = ItemNetworkCard.getDimension(card);
+                // TODO receiverDimension = ItemNetworkCard.getDimension(card);
             }
 
             if (network != null) {

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java

@@ -10,7 +10,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.security.SecurityCard;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
 import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
 import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
-import com.raoulvdberge.refinedstorage.item.ItemSecurityCard;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
@@ -80,7 +79,8 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
             ItemStack stack = cardsInv.getStackInSlot(i);
 
             if (!stack.isEmpty()) {
-                UUID uuid = ItemSecurityCard.getOwner(stack);
+                UUID uuid = null;/*TODO ItemSecurityCard.getOwner(stack)*/
+                ;
 
                 if (uuid == null) {
                     this.globalCard = createCard(stack, null);
@@ -97,7 +97,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
         SecurityCard card = new SecurityCard(uuid);
 
         for (Permission permission : Permission.values()) {
-            card.getPermissions().put(permission, ItemSecurityCard.hasPermission(stack, permission));
+            card.getPermissions().put(permission, /*TODO ItemSecurityCard.hasPermission(stack, permission)*/false);
         }
 
         return card;
@@ -145,7 +145,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
         ItemStack card = getEditCard().getStackInSlot(0);
 
         if (!card.isEmpty()) {
-            ItemSecurityCard.setPermission(card, permission, state);
+            // TODO ItemSecurityCard.setPermission(card, permission, state);
         }
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java

@@ -6,7 +6,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.ICoverable;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeCable;
-import com.raoulvdberge.refinedstorage.item.ItemCover;
 import net.minecraft.block.*;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
@@ -130,7 +129,7 @@ public class CoverManager {
         for (Map.Entry<Direction, Cover> entry : covers.entrySet()) {
             ItemStack cover = entry.getValue().getType().createStack();
 
-            ItemCover.setItem(cover, entry.getValue().getStack());
+            // TODO ItemCover.setItem(cover, entry.getValue().getStack());
 
             handler.setStackInSlot(i++, cover);
         }

src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java

@@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.block;
 
 import com.raoulvdberge.refinedstorage.block.info.BlockDirection;
 import com.raoulvdberge.refinedstorage.block.info.IBlockInfo;
+import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
 import com.raoulvdberge.refinedstorage.item.itemblock.ItemBlockBase;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
 import com.raoulvdberge.refinedstorage.render.collision.CollisionGroup;
@@ -59,7 +60,7 @@ public abstract class BlockBase extends Block {
     }
 
     public Item createItem() {
-        return new ItemBlockBase(this, false);
+        return new ItemBlockBase(this, new ItemInfo(info.getId().getNamespace(), info.getId().getPath()));
     }
 /* TODO
     @Override

src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java

@@ -2,9 +2,7 @@ package com.raoulvdberge.refinedstorage.block;
 
 import com.raoulvdberge.refinedstorage.api.network.grid.GridType;
 import com.raoulvdberge.refinedstorage.block.info.BlockInfoBuilder;
-import com.raoulvdberge.refinedstorage.item.itemblock.ItemBlockBase;
 import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
-import net.minecraft.item.Item;
 import net.minecraft.state.EnumProperty;
 
 public class BlockGrid extends BlockNode {
@@ -75,9 +73,4 @@ public class BlockGrid extends BlockNode {
     public boolean hasConnectedState() {
         return true;
     }
-
-    @Override
-    public Item createItem() {
-        return new ItemBlockBase(this, true);
-    }
 }

src/main/java/com/raoulvdberge/refinedstorage/container/ContainerCrafterManager.java

@@ -10,7 +10,6 @@ import com.raoulvdberge.refinedstorage.gui.grid.filtering.GridFilterParser;
 import com.raoulvdberge.refinedstorage.gui.grid.stack.GridStackItem;
 import com.raoulvdberge.refinedstorage.gui.grid.stack.IGridStack;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
-import com.raoulvdberge.refinedstorage.item.ItemPattern;
 import com.raoulvdberge.refinedstorage.tile.TileCrafterManager;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
@@ -167,7 +166,8 @@ public class ContainerCrafterManager extends ContainerBase {
                     if (stack.isEmpty()) {
                         visible = false;
                     } else {
-                        CraftingPattern pattern = ItemPattern.getPatternFromCache(crafterManager.getWorld(), stack);
+                        // TODO CraftingPattern pattern = ItemPattern.getPatternFromCache(crafterManager.getWorld(), stack);
+                        CraftingPattern pattern = null;
 
                         visible = false;
 

src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFilter.java

@@ -1,15 +1,10 @@
 package com.raoulvdberge.refinedstorage.container;
 
 import com.raoulvdberge.refinedstorage.RSContainers;
-import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilter;
-import com.raoulvdberge.refinedstorage.container.slot.filter.SlotFilterFluid;
 import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
 import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter;
 import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilterIcon;
-import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterIcon;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterItems;
-import com.raoulvdberge.refinedstorage.item.ItemFilter;
-import com.raoulvdberge.refinedstorage.tile.config.IType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 
@@ -30,8 +25,8 @@ public class ContainerFilter extends ContainerBase {
         FluidInventory fluidFilter = new FluidInventoryFilter(stack);
 
         for (int i = 0; i < 27; ++i) {
-            addSlot(new SlotFilter(filter, i, x, y).setEnableHandler(() -> ItemFilter.getType(stack) == IType.ITEMS));
+            // TODO addSlot(new SlotFilter(filter, i, x, y).setEnableHandler(() -> ItemFilter.getType(stack) == IType.ITEMS));
-            addSlot(new SlotFilterFluid(fluidFilter, i, x, y).setEnableHandler(() -> ItemFilter.getType(stack) == IType.FLUIDS));
+            // TODO addSlot(new SlotFilterFluid(fluidFilter, i, x, y).setEnableHandler(() -> ItemFilter.getType(stack) == IType.FLUIDS));
 
             if ((i + 1) % 9 == 0) {
                 x = 8;
@@ -41,12 +36,12 @@ public class ContainerFilter extends ContainerBase {
             }
         }
 
-        addSlot(new SlotFilter(new ItemHandlerFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> ItemFilter.getType(stack) == IType.ITEMS));
+        // TODO addSlot(new SlotFilter(new ItemHandlerFilterIcon(stack), 0, 8, 117).setEnableHandler(() -> ItemFilter.getType(stack) == IType.ITEMS));
-        addSlot(new SlotFilterFluid(fluidIcon, 0, 8, 117).setEnableHandler(() -> ItemFilter.getType(stack) == IType.FLUIDS));
+        // TODO addSlot(new SlotFilterFluid(fluidIcon, 0, 8, 117).setEnableHandler(() -> ItemFilter.getType(stack) == IType.FLUIDS));
 
         addPlayerInventory(8, 149);
 
-        transferManager.addFilterTransfer(player.inventory, filter, fluidFilter, () -> ItemFilter.getType(stack));
+        // TODO transferManager.addFilterTransfer(player.inventory, filter, fluidFilter, () -> ItemFilter.getType(stack));
     }
 
     public ItemStack getStack() {

src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java

@@ -10,7 +10,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPrev
 import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack;
 import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack;
 import com.raoulvdberge.refinedstorage.gui.control.Scrollbar;
-import com.raoulvdberge.refinedstorage.item.ItemPattern;
 import com.raoulvdberge.refinedstorage.util.RenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screen.Screen;
@@ -138,7 +137,7 @@ public class GuiCraftingPreview extends GuiBase {
 
                     GlStateManager.popMatrix();
 
-                    ICraftingPattern pattern = ItemPattern.getPatternFromCache(parent.getMinecraft().world, (ItemStack) stacks.get(0).getElement());
+                    ICraftingPattern pattern = /* TODO ItemPattern.getPatternFromCache(parent.getMinecraft().world, (ItemStack) stacks.get(0).getElement())*/null;
 
                     int yy = 83;
                     for (ItemStack output : pattern.getOutputs()) {

src/main/java/com/raoulvdberge/refinedstorage/gui/GuiFilter.java

@@ -4,7 +4,6 @@ import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import com.raoulvdberge.refinedstorage.api.util.IFilter;
 import com.raoulvdberge.refinedstorage.container.ContainerFilter;
 import com.raoulvdberge.refinedstorage.gui.control.SideButtonFilterType;
-import com.raoulvdberge.refinedstorage.item.ItemFilter;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.entity.player.PlayerInventory;
@@ -30,11 +29,11 @@ public class GuiFilter extends GuiBase<ContainerFilter> {
 
         this.stack = container.getStack();
 
-        this.compare = ItemFilter.getCompare(container.getStack());
+        /* TODO this.compare = ItemFilter.getCompare(container.getStack());
         this.mode = ItemFilter.getMode(container.getStack());
         this.modFilter = ItemFilter.isModFilter(container.getStack());
         this.name = ItemFilter.getName(container.getStack());
-        this.type = ItemFilter.getType(container.getStack());
+        this.type = ItemFilter.getType(container.getStack());*/
     }
 
     @Override
@@ -127,7 +126,7 @@ public class GuiFilter extends GuiBase<ContainerFilter> {
     public void setType(int type) {
         this.type = type;
 
-        ItemFilter.setType(stack, type);
+        // TODO ItemFilter.setType(stack, type);
     }
 
     public void sendUpdate() {

src/main/java/com/raoulvdberge/refinedstorage/gui/GuiSecurityManager.java

@@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage.gui;
 import com.raoulvdberge.refinedstorage.api.network.security.Permission;
 import com.raoulvdberge.refinedstorage.container.ContainerSecurityManager;
 import com.raoulvdberge.refinedstorage.gui.control.SideButtonRedstoneMode;
-import com.raoulvdberge.refinedstorage.item.ItemSecurityCard;
 import com.raoulvdberge.refinedstorage.tile.TileSecurityManager;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.PlayerInventory;
@@ -39,7 +38,7 @@ public class GuiSecurityManager extends GuiBase<ContainerSecurityManager> {
         ItemStack card = securityManager.getNode().getEditCard().getStackInSlot(0);
 
         for (Permission permission : Permission.values()) {
-            permissions[permission.getId()].setIsChecked(!card.isEmpty() && ItemSecurityCard.hasPermission(card, permission));
+            // TODO permissions[permission.getId()].setIsChecked(!card.isEmpty() && ItemSecurityCard.hasPermission(card, permission));
         }
     }
 

src/main/java/com/raoulvdberge/refinedstorage/inventory/fluid/FluidInventoryFilterIcon.java

@@ -1,9 +1,7 @@
 package com.raoulvdberge.refinedstorage.inventory.fluid;
 
-import com.raoulvdberge.refinedstorage.item.ItemFilter;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraftforge.fluids.FluidStack;
 
 public class FluidInventoryFilterIcon extends FluidInventory {
     public FluidInventoryFilterIcon(ItemStack stack) {
@@ -14,12 +12,12 @@ public class FluidInventoryFilterIcon extends FluidInventory {
                 stack.setTag(new CompoundNBT());
             }
 
-            ItemFilter.setFluidIcon(stack, getFluid(slot));
+            // TODO ItemFilter.setFluidIcon(stack, getFluid(slot));
         };
-
+/*
         FluidStack icon = ItemFilter.getFluidIcon(stack);
         if (icon != null) {
             setFluid(0, icon);
-        }
+        }*/
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilter.java

@@ -3,21 +3,14 @@ package com.raoulvdberge.refinedstorage.inventory.item;
 import com.raoulvdberge.refinedstorage.RSItems;
 import com.raoulvdberge.refinedstorage.api.network.grid.IGridTab;
 import com.raoulvdberge.refinedstorage.api.util.IFilter;
-import com.raoulvdberge.refinedstorage.apiimpl.network.grid.GridTab;
-import com.raoulvdberge.refinedstorage.apiimpl.util.FilterFluid;
-import com.raoulvdberge.refinedstorage.apiimpl.util.FilterItem;
 import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
-import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter;
 import com.raoulvdberge.refinedstorage.inventory.item.validator.ItemValidatorBasic;
-import com.raoulvdberge.refinedstorage.item.ItemFilter;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.fml.common.thread.EffectiveSide;
 
 import javax.annotation.Nullable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
@@ -53,7 +46,7 @@ public class ItemHandlerFilter extends ItemHandlerBase {
     }
 
     private void addFilter(ItemStack filter) {
-        int compare = ItemFilter.getCompare(filter);
+        /* TODO int compare = ItemFilter.getCompare(filter);
         int mode = ItemFilter.getMode(filter);
         boolean modFilter = ItemFilter.isModFilter(filter);
 
@@ -82,6 +75,6 @@ public class ItemHandlerFilter extends ItemHandlerBase {
             this.filters.addAll(filters);
         } else {
             tabs.add(new GridTab(filters, ItemFilter.getName(filter), icon, fluidIcon));
-        }
+        }*/
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerFilterIcon.java

@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.inventory.item;
 
-import com.raoulvdberge.refinedstorage.item.ItemFilter;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.ItemStackHandler;
 
@@ -12,13 +11,13 @@ public class ItemHandlerFilterIcon extends ItemStackHandler {
 
         this.stack = stack;
 
-        setStackInSlot(0, ItemFilter.getIcon(stack));
+        //TODO setStackInSlot(0, ItemFilter.getIcon(stack));
     }
 
     @Override
     protected void onContentsChanged(int slot) {
         super.onContentsChanged(slot);
 
-        ItemFilter.setIcon(stack, getStackInSlot(0));
+        // TODO ItemFilter.setIcon(stack, getStackInSlot(0));
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/inventory/item/ItemHandlerUpgrade.java

@@ -51,7 +51,7 @@ public class ItemHandlerUpgrade extends ItemHandlerBase {
         int usage = 0;
 
         for (int i = 0; i < getSlots(); ++i) {
-            usage += ItemUpgrade.getEnergyUsage(getStackInSlot(i));
+            // TODO usage += ItemUpgrade.getEnergyUsage(getStackInSlot(i));
         }
 
         return usage;
@@ -62,7 +62,8 @@ public class ItemHandlerUpgrade extends ItemHandlerBase {
 
         for (int i = 0; i < getSlots(); ++i) {
             if (!getStackInSlot(i).isEmpty()) {
-                int fortune = ItemUpgrade.getFortuneLevel(getStackInSlot(i));
+                // TODO int fortune = ItemUpgrade.getFortuneLevel(getStackInSlot(i));
+                int fortune = 0;
 
                 if (fortune > maxFortune) {
                     maxFortune = fortune;

src/main/java/com/raoulvdberge/refinedstorage/item/ItemBase.java

@@ -1,24 +1,23 @@
 package com.raoulvdberge.refinedstorage.item;
 
-import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.IItemInfo;
 import com.raoulvdberge.refinedstorage.render.IModelRegistration;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
+import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public abstract class ItemBase extends Item {
     protected final IItemInfo info;
 
     public ItemBase(IItemInfo info) {
+        super(new Item.Properties());
         this.info = info;
 
         setRegistryName(info.getId());
-        setCreativeTab(RS.INSTANCE.tab);
+        // TODO setCreativeTab(RS.INSTANCE.tab);
     }
 
-    @SideOnly(Side.CLIENT)
+    @OnlyIn(Dist.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
     }
 
@@ -26,13 +25,4 @@ public abstract class ItemBase extends Item {
     public String getTranslationKey() {
         return "item." + info.getId().toString();
     }
-
-    @Override
-    public String getTranslationKey(ItemStack stack) {
-        if (getHasSubtypes()) {
-            return getTranslationKey() + "." + stack.getItemDamage();
-        }
-
-        return getTranslationKey();
-    }
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java

@@ -2,14 +2,6 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemCore extends ItemBase {
     private static final int TYPE_CONSTRUCTION = 0;
@@ -18,10 +10,10 @@ public class ItemCore extends ItemBase {
     public ItemCore() {
         super(new ItemInfo(RS.ID, "core"));
 
-        setHasSubtypes(true);
+        /*setHasSubtypes(true);
-        setMaxDamage(0);
+        setMaxDamage(0);*/
     }
-
+/*
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -40,5 +32,5 @@ public class ItemCore extends ItemBase {
         for (int i = 0; i < 2; ++i) {
             items.add(new ItemStack(this, 1, i));
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemCover.java

@@ -1,57 +1,25 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
-import com.raoulvdberge.refinedstorage.api.network.security.Permission;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.ICoverable;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.Cover;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverType;
 import com.raoulvdberge.refinedstorage.item.info.IItemInfo;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import com.raoulvdberge.refinedstorage.render.model.loader.CustomModelLoaderCover;
-import com.raoulvdberge.refinedstorage.tile.TileNode;
-import com.raoulvdberge.refinedstorage.util.WorldUtils;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.List;
 
 public class ItemCover extends ItemBase {
     private static final String NBT_ITEM = "Item";
 
-    public static final ItemStack HIDDEN_COVER_ALTERNATIVE = new ItemStack(Blocks.STONEBRICK);
+    // public static final ItemStack HIDDEN_COVER_ALTERNATIVE = new ItemStack(Blocks.STONEBRICK);
 
     public ItemCover(IItemInfo info) {
         super(info);
 
-        setCreativeTab(RS.INSTANCE.coversTab);
+        //setCreativeTab(RS.INSTANCE.coversTab);
     }
 
     public ItemCover() {
         this(new ItemInfo(RS.ID, "cover"));
     }
 
+    /*
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -175,5 +143,5 @@ public class ItemCover extends ItemBase {
 
     protected Cover createCover(ItemStack stack) {
         return new Cover(stack, CoverType.NORMAL);
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemCuttingTool.java

@@ -2,20 +2,15 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemCuttingTool extends ItemBase {
     public ItemCuttingTool() {
         super(new ItemInfo(RS.ID, "cutting_tool"));
 
-        setMaxDamage(50 - 1);
+        //setMaxDamage(50 - 1);
-        setMaxStackSize(1);
+        //setMaxStackSize(1);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -44,5 +39,5 @@ public class ItemCuttingTool extends ItemBase {
     @Override
     public String getTranslationKey(ItemStack stack) {
         return getTranslationKey(); // Ignore damage
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java

@@ -2,20 +2,9 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.item.capprovider.CapabilityProviderEnergy;
 import com.raoulvdberge.refinedstorage.item.info.IItemInfo;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
-import net.minecraftforge.energy.CapabilityEnergy;
-import net.minecraftforge.energy.IEnergyStorage;
-
-import javax.annotation.Nullable;
-import java.util.List;
 
 public abstract class ItemEnergyItem extends ItemBase {
     public static final int TYPE_NORMAL = 0;
@@ -27,10 +16,10 @@ public abstract class ItemEnergyItem extends ItemBase {
         super(info);
 
         this.energyCapacity = energyCapacity;
-
+/*
         setMaxDamage(energyCapacity);
         setMaxStackSize(1);
-        setHasSubtypes(true);
+        setHasSubtypes(true);*/
     }
 
     @Override
@@ -38,6 +27,7 @@ public abstract class ItemEnergyItem extends ItemBase {
         return new CapabilityProviderEnergy(stack, energyCapacity);
     }
 
+    /* TODO
     @Override
     public boolean isDamageable() {
         return true;
@@ -99,5 +89,5 @@ public abstract class ItemEnergyItem extends ItemBase {
 
             tooltip.add(I18n.format("misc.refinedstorage:energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()));
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemFilter.java

@@ -1,34 +1,7 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.RSGui;
-import com.raoulvdberge.refinedstorage.RSItems;
-import com.raoulvdberge.refinedstorage.api.util.IComparer;
-import com.raoulvdberge.refinedstorage.api.util.IFilter;
-import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventoryFilter;
-import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilterItems;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import com.raoulvdberge.refinedstorage.tile.config.IType;
-import com.raoulvdberge.refinedstorage.util.RenderUtils;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.List;
 
 public class ItemFilter extends ItemBase {
     private static final String NBT_COMPARE = "Compare";
@@ -43,9 +16,10 @@ public class ItemFilter extends ItemBase {
     public ItemFilter() {
         super(new ItemInfo(RS.ID, "filter"));
 
-        setMaxStackSize(1);
+        //setMaxStackSize(1);
     }
 
+    /* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -181,5 +155,5 @@ public class ItemFilter extends ItemBase {
         }
 
         stack.getTagCompound().putInt(NBT_TYPE, type);
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java

@@ -1,31 +1,12 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.RSItems;
 import com.raoulvdberge.refinedstorage.api.storage.StorageType;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
 import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSyncData;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
-import com.raoulvdberge.refinedstorage.block.enums.FluidStorageType;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.InventoryHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.*;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nullable;
-import java.util.List;
 import java.util.UUID;
 
 public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvider {
@@ -40,11 +21,12 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
     public ItemFluidStorageDisk() {
         super(new ItemInfo(RS.ID, "fluid_storage_disk"));
 
-        setMaxStackSize(1);
+        //setMaxStackSize(1);
-        setHasSubtypes(true);
+        //setHasSubtypes(true);
-        setMaxDamage(0);
+        //setMaxDamage(0);
     }
 
+    /* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -146,27 +128,28 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
     @Override
     public int getEntityLifespan(ItemStack stack, World world) {
         return Integer.MAX_VALUE;
-    }
+    }*/
 
     @Override
     public UUID getId(ItemStack disk) {
-        return disk.getTagCompound().getUniqueId(NBT_ID);
+        return disk.getTag().getUniqueId(NBT_ID);
     }
 
     @Override
     public void setId(ItemStack disk, UUID id) {
-        disk.setTagCompound(new CompoundNBT());
+        disk.setTag(new CompoundNBT());
-        disk.getTagCompound().setUniqueId(NBT_ID, id);
+        disk.getTag().putUniqueId(NBT_ID, id);
     }
 
     @Override
     public boolean isValid(ItemStack disk) {
-        return disk.hasTagCompound() && disk.getTagCompound().hasUniqueId(NBT_ID);
+        return disk.hasTag() && disk.getTag().hasUniqueId(NBT_ID);
     }
 
     @Override
     public int getCapacity(ItemStack disk) {
-        return FluidStorageType.getById(disk.getItemDamage()).getCapacity();
+        return 123;
+        // TODO return FluidStorageType.getById(disk.getItemDamage()).getCapacity();
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java

@@ -2,14 +2,6 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemFluidStoragePart extends ItemBase {
     public static final int TYPE_64K = 0;
@@ -20,10 +12,10 @@ public class ItemFluidStoragePart extends ItemBase {
     public ItemFluidStoragePart() {
         super(new ItemInfo(RS.ID, "fluid_storage_part"));
 
-        setHasSubtypes(true);
+        //setHasSubtypes(true);
-        setMaxDamage(0);
+        //setMaxDamage(0);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -50,5 +42,5 @@ public class ItemFluidStoragePart extends ItemBase {
         for (int i = 0; i <= 3; ++i) {
             items.add(new ItemStack(this, 1, i));
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemHollowCover.java

@@ -1,20 +1,13 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.Cover;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverType;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemHollowCover extends ItemCover {
     public ItemHollowCover() {
         super(new ItemInfo(RS.ID, "hollow_cover"));
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -24,5 +17,5 @@ public class ItemHollowCover extends ItemCover {
     @Override
     protected Cover createCover(ItemStack stack) {
         return new Cover(stack, CoverType.HOLLOW);
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java

@@ -1,26 +1,7 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.RSBlocks;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nullable;
-import java.util.List;
 
 public class ItemNetworkCard extends ItemBase {
     private static final String NBT_RECEIVER_X = "ReceiverX";
@@ -31,9 +12,9 @@ public class ItemNetworkCard extends ItemBase {
     public ItemNetworkCard() {
         super(new ItemInfo(RS.ID, "network_card"));
 
-        setMaxStackSize(1);
+        //setMaxStackSize(1);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -81,5 +62,5 @@ public class ItemNetworkCard extends ItemBase {
 
     public static int getDimension(ItemStack stack) {
         return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_DIMENSION)) ? stack.getTagCompound().getInteger(NBT_DIMENSION) : 0;
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java

@@ -1,30 +1,9 @@
 package com.raoulvdberge.refinedstorage.item;
 
-import com.raoulvdberge.refinedstorage.RSBlocks;
-import com.raoulvdberge.refinedstorage.api.network.INetwork;
-import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemProvider;
 import com.raoulvdberge.refinedstorage.item.info.IItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
+import net.minecraft.util.ResourceLocation;
-import net.minecraft.block.Block;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.*;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextComponentTranslation;
-import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nullable;
+public abstract class ItemNetworkItem extends ItemEnergyItem /*implements INetworkItemProvider*/ {
-import java.util.List;
-import java.util.function.Consumer;
-
-public abstract class ItemNetworkItem extends ItemEnergyItem implements INetworkItemProvider {
     private static final String NBT_CONTROLLER_X = "ControllerX";
     private static final String NBT_CONTROLLER_Y = "ControllerY";
     private static final String NBT_CONTROLLER_Z = "ControllerZ";
@@ -33,15 +12,10 @@ public abstract class ItemNetworkItem extends ItemEnergyItem implements INetwork
     public ItemNetworkItem(IItemInfo info, int energyCapacity) {
         super(info, energyCapacity);
 
-        addPropertyOverride(new ResourceLocation("connected"), (stack, world, entity) -> (entity != null && isValid(stack)) ? 1.0f : 0.0f);
+        addPropertyOverride(new ResourceLocation("connected"), (stack, world, entity) -> (entity != null && /*isValid(stack)*/false) ? 1.0f : 0.0f);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerModels(IModelRegistration modelRegistration) {
-
     }
 
+    /* TODO
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, EnumHand hand) {
         ItemStack stack = player.getHeldItem(hand);
@@ -131,5 +105,5 @@ public abstract class ItemNetworkItem extends ItemEnergyItem implements INetwork
             && stack.getTagCompound().hasKey(NBT_CONTROLLER_Y)
             && stack.getTagCompound().hasKey(NBT_CONTROLLER_Z)
             && stack.getTagCompound().hasKey(NBT_DIMENSION_ID);
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java

@@ -1,42 +1,14 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.RSItems;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
-import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import com.raoulvdberge.refinedstorage.render.color.ItemColorPattern;
-import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelPattern;
-import com.raoulvdberge.refinedstorage.util.RenderUtils;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
-public class ItemPattern extends ItemBase implements ICraftingPatternProvider {
+public class ItemPattern extends ItemBase/* implements ICraftingPatternProvider */ {
     private static Map<ItemStack, CraftingPattern> PATTERN_CACHE = new HashMap<>();
 
     private static final String NBT_VERSION = "Version";
@@ -50,7 +22,7 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider {
     public ItemPattern() {
         super(new ItemInfo(RS.ID, "pattern"));
     }
-
+/*
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -244,5 +216,5 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider {
         if (!world.isRemote) {
             API.instance().getOneSixMigrationHelper().migratePattern(stack);
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java

@@ -2,14 +2,6 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemProcessor extends ItemBase {
     public static final int TYPE_CUT_BASIC = 0;
@@ -22,10 +14,10 @@ public class ItemProcessor extends ItemBase {
     public ItemProcessor() {
         super(new ItemInfo(RS.ID, "processor"));
 
-        setHasSubtypes(true);
+        //setHasSubtypes(true);
-        setMaxDamage(0);
+        //setMaxDamage(0);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -56,5 +48,5 @@ public class ItemProcessor extends ItemBase {
         for (int i = 0; i <= 5; ++i) {
             items.add(new ItemStack(this, 1, i));
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessorBinding.java

@@ -2,18 +2,16 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 
 public class ItemProcessorBinding extends ItemBase {
     public ItemProcessorBinding() {
         super(new ItemInfo(RS.ID, "processor_binding"));
     }
-
+/* TODO
     @Override
     public void registerModels(IModelRegistration modelRegistration) {
         super.registerModels(modelRegistration);
 
         modelRegistration.setModel(this, 0, new ModelResourceLocation(RS.ID + ":processor_binding", "inventory"));
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemQuartzEnrichedIron.java

@@ -2,19 +2,15 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemQuartzEnrichedIron extends ItemBase {
     public ItemQuartzEnrichedIron() {
         super(new ItemInfo(RS.ID, "quartz_enriched_iron"));
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
         modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java

@@ -1,26 +1,7 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.network.security.Permission;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.UUID;
 
 public class ItemSecurityCard extends ItemBase {
     private static final String NBT_OWNER = "Owner";
@@ -30,11 +11,11 @@ public class ItemSecurityCard extends ItemBase {
     public ItemSecurityCard() {
         super(new ItemInfo(RS.ID, "security_card"));
 
-        setMaxStackSize(1);
+        //setMaxStackSize(1);
 
-        addPropertyOverride(new ResourceLocation("active"), (stack, world, entity) -> (entity != null && isValid(stack)) ? 1.0f : 0.0f);
+        //addPropertyOverride(new ResourceLocation("active"), (stack, world, entity) -> (entity != null && isValid(stack)) ? 1.0f : 0.0f);
     }
-
+    /* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -99,5 +80,5 @@ public class ItemSecurityCard extends ItemBase {
                 tooltip.add("- " + I18n.format("gui.refinedstorage:security_manager.permission." + permission.getId()));
             }
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemSilicon.java

@@ -2,19 +2,15 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemSilicon extends ItemBase {
     public ItemSilicon() {
         super(new ItemInfo(RS.ID, "silicon"));
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
         modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java

@@ -1,31 +1,12 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.RSItems;
 import com.raoulvdberge.refinedstorage.api.storage.StorageType;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
 import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSyncData;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
-import com.raoulvdberge.refinedstorage.block.enums.ItemStorageType;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.InventoryHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.*;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nullable;
-import java.util.List;
 import java.util.UUID;
 
 public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider {
@@ -40,12 +21,12 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider {
     public ItemStorageDisk() {
         super(new ItemInfo(RS.ID, "storage_disk"));
 
-        setMaxStackSize(1);
+        //setMaxStackSize(1);
-        setHasSubtypes(true);
+        //setHasSubtypes(true);
-        setMaxDamage(0);
+        //setMaxDamage(0);
     }
 
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -147,27 +128,28 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider {
     @Override
     public int getEntityLifespan(ItemStack stack, World world) {
         return Integer.MAX_VALUE;
-    }
+    }*/
 
     @Override
     public UUID getId(ItemStack disk) {
-        return disk.getTagCompound().getUniqueId(NBT_ID);
+        return disk.getTag().getUniqueId(NBT_ID);
     }
 
     @Override
     public void setId(ItemStack disk, UUID id) {
-        disk.setTagCompound(new CompoundNBT());
+        disk.setTag(new CompoundNBT());
-        disk.getTagCompound().setUniqueId(NBT_ID, id);
+        disk.getTag().putUniqueId(NBT_ID, id);
     }
 
     @Override
     public boolean isValid(ItemStack disk) {
-        return disk.hasTagCompound() && disk.getTagCompound().hasUniqueId(NBT_ID);
+        return disk.hasTag() && disk.getTag().hasUniqueId(NBT_ID);
     }
 
     @Override
     public int getCapacity(ItemStack disk) {
-        return ItemStorageType.getById(disk.getItemDamage()).getCapacity();
+        return 123;
+        // TODO return ItemStorageType.getById(disk.getItemDamage()).getCapacity();
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageHousing.java

@@ -2,19 +2,15 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemStorageHousing extends ItemBase {
     public ItemStorageHousing() {
         super(new ItemInfo(RS.ID, "storage_housing"));
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
         modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java

@@ -2,14 +2,6 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemStoragePart extends ItemBase {
     public static final int TYPE_1K = 0;
@@ -20,10 +12,10 @@ public class ItemStoragePart extends ItemBase {
     public ItemStoragePart() {
         super(new ItemInfo(RS.ID, "storage_part"));
 
-        setHasSubtypes(true);
+        //setHasSubtypes(true);
-        setMaxDamage(0);
+        //setMaxDamage(0);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -50,5 +42,5 @@ public class ItemStoragePart extends ItemBase {
         for (int i = 0; i <= 3; ++i) {
             items.add(new ItemStack(this, 1, i));
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java

@@ -2,20 +2,6 @@ package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nullable;
-import java.util.List;
 
 public class ItemUpgrade extends ItemBase {
     public static final int TYPE_RANGE = 1;
@@ -30,10 +16,10 @@ public class ItemUpgrade extends ItemBase {
     public ItemUpgrade() {
         super(new ItemInfo(RS.ID, "upgrade"));
 
-        setHasSubtypes(true);
+        //setHasSubtypes(true);
-        setMaxDamage(0);
+        //setMaxDamage(0);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -118,5 +104,5 @@ public class ItemUpgrade extends ItemBase {
             default:
                 return 0;
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessCraftingMonitor.java

@@ -1,21 +1,7 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem;
-import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler;
-import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemWirelessCraftingMonitor;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nonnull;
-import java.util.Optional;
-import java.util.UUID;
 
 public class ItemWirelessCraftingMonitor extends ItemNetworkItem {
     public static final String NBT_TAB_SELECTED = "TabSelected";
@@ -24,7 +10,7 @@ public class ItemWirelessCraftingMonitor extends ItemNetworkItem {
     public ItemWirelessCraftingMonitor() {
         super(new ItemInfo(RS.ID, "wireless_crafting_monitor"), RS.INSTANCE.config.wirelessCraftingMonitorCapacity);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -80,5 +66,5 @@ public class ItemWirelessCraftingMonitor extends ItemNetworkItem {
         }
 
         stack.getTagCompound().putInt(NBT_TAB_PAGE, tabPage);
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessFluidGrid.java

@@ -1,26 +1,13 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
-import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem;
-import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler;
-import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemWirelessFluidGrid;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nonnull;
 
 public class ItemWirelessFluidGrid extends ItemNetworkItem {
     public ItemWirelessFluidGrid() {
         super(new ItemInfo(RS.ID, "wireless_fluid_grid"), RS.INSTANCE.config.wirelessFluidGridCapacity);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -55,5 +42,5 @@ public class ItemWirelessFluidGrid extends ItemNetworkItem {
 
     public static int getSize(ItemStack stack) {
         return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SIZE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SIZE) : IGrid.SIZE_STRETCH;
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemWirelessGrid.java

@@ -1,21 +1,8 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.network.grid.IGrid;
-import com.raoulvdberge.refinedstorage.api.network.item.INetworkItem;
-import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemHandler;
-import com.raoulvdberge.refinedstorage.apiimpl.network.item.NetworkItemWirelessGrid;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid;
 import com.raoulvdberge.refinedstorage.item.info.IItemInfo;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import javax.annotation.Nonnull;
 
 public class ItemWirelessGrid extends ItemNetworkItem {
     public ItemWirelessGrid(IItemInfo info) {
@@ -25,7 +12,7 @@ public class ItemWirelessGrid extends ItemNetworkItem {
     public ItemWirelessGrid() {
         this(new ItemInfo(RS.ID, "wireless_grid"));
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -64,5 +51,5 @@ public class ItemWirelessGrid extends ItemNetworkItem {
 
     public static int getSize(ItemStack stack) {
         return (stack.hasTagCompound() && stack.getTagCompound().hasKey(NetworkNodeGrid.NBT_SIZE)) ? stack.getTagCompound().getInteger(NetworkNodeGrid.NBT_SIZE) : IGrid.SIZE_STRETCH;
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java

@@ -1,38 +1,15 @@
 package com.raoulvdberge.refinedstorage.item;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.api.network.security.Permission;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.ICoverable;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager;
-import com.raoulvdberge.refinedstorage.block.BlockCable;
 import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.render.IModelRegistration;
-import com.raoulvdberge.refinedstorage.render.collision.AdvancedRayTraceResult;
-import com.raoulvdberge.refinedstorage.render.collision.AdvancedRayTracer;
-import com.raoulvdberge.refinedstorage.tile.TileNode;
-import com.raoulvdberge.refinedstorage.util.WorldUtils;
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.InventoryHelper;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class ItemWrench extends ItemBase {
     public ItemWrench() {
         super(new ItemInfo(RS.ID, "wrench"));
 
-        setMaxStackSize(1);
+        //setMaxStackSize(1);
     }
-
+/* TODO
     @Override
     @SideOnly(Side.CLIENT)
     public void registerModels(IModelRegistration modelRegistration) {
@@ -94,5 +71,5 @@ public class ItemWrench extends ItemBase {
         block.rotateBlock(world, pos, player.getHorizontalFacing().getOpposite());
 
         return EnumActionResult.SUCCESS;
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/capprovider/CapabilityProviderEnergy.java

@@ -2,10 +2,12 @@ package com.raoulvdberge.refinedstorage.item.capprovider;
 
 import com.raoulvdberge.refinedstorage.integration.forgeenergy.ItemEnergyForge;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.energy.CapabilityEnergy;
+import net.minecraftforge.energy.IEnergyStorage;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -13,19 +15,26 @@ import javax.annotation.Nullable;
 public class CapabilityProviderEnergy implements ICapabilityProvider {
     private ItemStack stack;
     private int energyCapacity;
+    private LazyOptional<IEnergyStorage> cap = LazyOptional.of(() -> new ItemEnergyForge(stack, energyCapacity));
 
     public CapabilityProviderEnergy(ItemStack stack, int energyCapacity) {
         this.stack = stack;
         this.energyCapacity = energyCapacity;
     }
 
+    @Nonnull
     @Override
-    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+    public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-        return capability == CapabilityEnergy.ENERGY;
+        return getCapability(cap);
     }
 
+    @Nonnull
     @Override
-    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+    public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap) {
-        return capability == CapabilityEnergy.ENERGY ? CapabilityEnergy.ENERGY.cast(new ItemEnergyForge(stack, energyCapacity)) : null;
+        if (cap == CapabilityEnergy.ENERGY) {
+            return this.cap.cast();
+        }
+
+        return LazyOptional.empty();
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockBase.java

@@ -1,46 +1,21 @@
 package com.raoulvdberge.refinedstorage.item.itemblock;
 
 import com.raoulvdberge.refinedstorage.block.BlockBase;
-import com.raoulvdberge.refinedstorage.tile.TileBase;
+import com.raoulvdberge.refinedstorage.item.info.IItemInfo;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.BlockItem;
-import net.minecraft.item.ItemStack;
+import net.minecraft.item.Item;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 
 public class ItemBlockBase extends BlockItem {
     private BlockBase block;
 
-    public ItemBlockBase(BlockBase block, boolean subtypes) {
+    public ItemBlockBase(BlockBase block, IItemInfo info) {
-        super(block);
+        super(block, new Item.Properties());
 
         this.block = block;
 
         setRegistryName(block.getInfo().getId());
-
-        if (subtypes) {
-            setMaxDamage(0);
-            setHasSubtypes(true);
-        }
     }
-
+/* TODO
-    @Override
-    public int getMetadata(int damage) {
-        return damage;
-    }
-
-    @Override
-    public String getTranslationKey(ItemStack stack) {
-        if (getHasSubtypes()) {
-            return getTranslationKey() + "." + stack.getItemDamage();
-        }
-
-        return getTranslationKey();
-    }
-
     @Override
     public boolean placeBlockAt(ItemStack stack, PlayerEntity player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, IBlockState newState) {
         boolean result = super.placeBlockAt(stack, player, world, pos, side, hitX, hitY, hitZ, newState);
@@ -54,5 +29,5 @@ public class ItemBlockBase extends BlockItem {
         }
 
         return result;
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockController.java

@@ -2,26 +2,15 @@ package com.raoulvdberge.refinedstorage.item.itemblock;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.block.BlockController;
-import com.raoulvdberge.refinedstorage.block.enums.ControllerType;
+import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.tile.TileController;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
-
-import javax.annotation.Nullable;
-import java.util.List;
 
 public class ItemBlockController extends ItemBlockBase {
     public ItemBlockController(BlockController block) {
-        super(block, true);
+        super(block, new ItemInfo(RS.ID, "controller"));
 
-        setMaxStackSize(1);
+        // setMaxStackSize(1);
     }
-
+/* TODO
     @Override
     public double getDurabilityForDisplay(ItemStack stack) {
         return 1D - ((double) getEnergyStored(stack) / (double) RS.INSTANCE.config.controllerCapacity);
@@ -69,5 +58,5 @@ public class ItemBlockController extends ItemBlockBase {
         stack.setTagCompound(tag);
 
         return stack;
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockEnergyItem.java

@@ -2,20 +2,10 @@ package com.raoulvdberge.refinedstorage.item.itemblock;
 
 import com.raoulvdberge.refinedstorage.block.BlockBase;
 import com.raoulvdberge.refinedstorage.item.capprovider.CapabilityProviderEnergy;
-import net.minecraft.client.resources.I18n;
+import com.raoulvdberge.refinedstorage.item.info.IItemInfo;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
-import net.minecraftforge.energy.CapabilityEnergy;
-import net.minecraftforge.energy.IEnergyStorage;
-
-import javax.annotation.Nullable;
-import java.util.List;
 
 public abstract class ItemBlockEnergyItem extends ItemBlockBase {
     public static final int TYPE_NORMAL = 0;
@@ -23,20 +13,20 @@ public abstract class ItemBlockEnergyItem extends ItemBlockBase {
 
     private int energyCapacity;
 
-    public ItemBlockEnergyItem(BlockBase block, int energyCapacity) {
+    public ItemBlockEnergyItem(BlockBase block, int energyCapacity, IItemInfo info) {
-        super(block, true);
+        super(block, info);
 
         this.energyCapacity = energyCapacity;
 
-        setMaxDamage(energyCapacity);
+        //setMaxDamage(energyCapacity);
-        setMaxStackSize(1);
+        //setMaxStackSize(1);
     }
 
     @Override
     public ICapabilityProvider initCapabilities(ItemStack stack, CompoundNBT tag) {
         return new CapabilityProviderEnergy(stack, energyCapacity);
     }
-
+/* TODO
     @Override
     public boolean isDamageable() {
         return true;
@@ -98,5 +88,5 @@ public abstract class ItemBlockEnergyItem extends ItemBlockBase {
 
             tooltip.add(I18n.format("misc.refinedstorage:energy_stored", energy.getEnergyStored(), energy.getMaxEnergyStored()));
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockFluidStorage.java

@@ -1,35 +1,14 @@
 package com.raoulvdberge.refinedstorage.item.itemblock;
 
-import com.raoulvdberge.refinedstorage.RSBlocks;
+import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.RSItems;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSyncData;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.NetworkNodeFluidStorage;
-import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper;
 import com.raoulvdberge.refinedstorage.block.BlockFluidStorage;
-import com.raoulvdberge.refinedstorage.item.ItemFluidStorageDisk;
+import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.item.ItemProcessor;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.InventoryHelper;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.world.World;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.UUID;
 
 public class ItemBlockFluidStorage extends ItemBlockBase {
     public ItemBlockFluidStorage(BlockFluidStorage block) {
-        super(block, true);
+        super(block, new ItemInfo(RS.ID, "fluid_storage"));
     }
-
+/* TODO
     @Override
     public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
         super.addInformation(stack, world, tooltip, flag);
@@ -113,5 +92,5 @@ public class ItemBlockFluidStorage extends ItemBlockBase {
         if (!world.isRemote) {
             OneSixMigrationHelper.migrateFluidStorageBlockItem(world, stack);
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockPortableGrid.java

@@ -1,30 +1,14 @@
 package com.raoulvdberge.refinedstorage.item.itemblock;
 
 import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.block.BlockPortableGrid;
-import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid;
+import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-import javax.annotation.Nullable;
-import java.util.List;
 
 public class ItemBlockPortableGrid extends ItemBlockEnergyItem {
     public ItemBlockPortableGrid(BlockPortableGrid block) {
-        super(block, RS.INSTANCE.config.portableGridCapacity);
+        super(block, RS.INSTANCE.config.portableGridCapacity, new ItemInfo(RS.ID, "portable_grid"));
     }
-
+/* TODO
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, EnumHand hand) {
         ItemStack stack = player.getHeldItem(hand);
@@ -71,5 +55,5 @@ public class ItemBlockPortableGrid extends ItemBlockEnergyItem {
         }
 
         return super.shouldCauseReequipAnimation(oldStack, newStack, slotChanged);
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/item/itemblock/ItemBlockStorage.java

@@ -1,35 +1,14 @@
 package com.raoulvdberge.refinedstorage.item.itemblock;
 
-import com.raoulvdberge.refinedstorage.RSBlocks;
+import com.raoulvdberge.refinedstorage.RS;
-import com.raoulvdberge.refinedstorage.RSItems;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk;
-import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskSyncData;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.storage.NetworkNodeStorage;
-import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper;
 import com.raoulvdberge.refinedstorage.block.BlockStorage;
-import com.raoulvdberge.refinedstorage.item.ItemProcessor;
+import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
-import com.raoulvdberge.refinedstorage.item.ItemStorageDisk;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.InventoryHelper;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.world.World;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.UUID;
 
 public class ItemBlockStorage extends ItemBlockBase {
     public ItemBlockStorage(BlockStorage storage) {
-        super(storage, true);
+        super(storage, new ItemInfo(RS.ID, "storage"));
     }
-
+/* TODO
     @Override
     public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
         super.addInformation(stack, world, tooltip, flag);
@@ -113,5 +92,5 @@ public class ItemBlockStorage extends ItemBlockBase {
         if (!world.isRemote) {
             OneSixMigrationHelper.migrateItemStorageBlockItem(world, stack);
         }
-    }
+    }*/
 }

src/main/java/com/raoulvdberge/refinedstorage/recipe/RecipeCover.java

@@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage.recipe;
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSItems;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager;
-import com.raoulvdberge.refinedstorage.item.ItemCover;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
@@ -11,7 +10,6 @@ import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import net.minecraftforge.items.ItemHandlerHelper;
 
 public class RecipeCover implements IRecipe<CraftingInventory> {
     @Override
@@ -54,7 +52,7 @@ public class RecipeCover implements IRecipe<CraftingInventory> {
             if (CoverManager.isValidCover(slot)) {
                 ItemStack cover = new ItemStack(RSItems.COVER, 6);
 
-                ItemCover.setItem(cover, ItemHandlerHelper.copyStackWithSize(slot, 1));
+                // TODO ItemCover.setItem(cover, ItemHandlerHelper.copyStackWithSize(slot, 1));
 
                 return cover;
             }

src/main/java/com/raoulvdberge/refinedstorage/recipe/RecipeHollowCover.java

@@ -2,9 +2,6 @@ package com.raoulvdberge.refinedstorage.recipe;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSItems;
-import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager;
-import com.raoulvdberge.refinedstorage.item.ItemCover;
-import com.raoulvdberge.refinedstorage.item.ItemHollowCover;
 import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
@@ -17,17 +14,17 @@ import javax.annotation.Nullable;
 
 public class RecipeHollowCover implements IRecipe<CraftingInventory> {
     protected boolean isValid(ItemStack slot, @Nullable ItemStack previousValidSlot) {
-        ItemStack currentCover = ItemCover.getItem(slot);
+        // TODO ItemStack currentCover = ItemCover.getItem(slot);
 
-        if (slot.getItem() == RSItems.COVER && CoverManager.isValidCover(currentCover)) {
+        /*if (slot.getItem() == RSItems.COVER && CoverManager.isValidCover(currentCover)) {
             if (previousValidSlot == null) {
                 return true;
             }
 
-            ItemStack previousCover = ItemCover.getItem(previousValidSlot);
+            // TODO ItemStack previousCover = ItemCover.getItem(previousValidSlot);
 
-            return previousCover.getItem() == currentCover.getItem();
+            // TODO return previousCover.getItem() == currentCover.getItem();
-        }
+        }*/
 
         return false;
     }
@@ -59,7 +56,7 @@ public class RecipeHollowCover implements IRecipe<CraftingInventory> {
     public ItemStack getCraftingResult(CraftingInventory inv) {
         ItemStack stack = new ItemStack(RSItems.HOLLOW_COVER, 8);
 
-        ItemHollowCover.setItem(stack, ItemCover.getItem(inv.getStackInSlot(0)));
+        // TODO ItemHollowCover.setItem(stack, ItemCover.getItem(inv.getStackInSlot(0)));
 
         return stack;
     }

src/main/java/com/raoulvdberge/refinedstorage/render/color/ItemColorPattern.java

@@ -1,23 +1,21 @@
 package com.raoulvdberge.refinedstorage.render.color;
 
-import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern;
-import com.raoulvdberge.refinedstorage.item.ItemPattern;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.item.ItemStack;
 
 public class ItemColorPattern implements IItemColor {
     @Override
     public int getColor(ItemStack stack, int tintIndex) {
-        CraftingPattern pattern = ItemPattern.getPatternFromCache(Minecraft.getInstance().world, stack);
+        // TODO CraftingPattern pattern = ItemPattern.getPatternFromCache(Minecraft.getInstance().world, stack);
 
-        if (/*TODO BakedModelPattern.canDisplayOutput(stack, pattern)*/false) {
+        /*
+        if (BakedModelPattern.canDisplayOutput(stack, pattern)) {
             int color = Minecraft.getInstance().getItemColors().getColor(pattern.getOutputs().get(0), tintIndex);
 
             if (color != -1) {
                 return color;
             }
-        }
+        }*/
 
         return 0xFFFFFF;
     }

src/main/java/com/raoulvdberge/refinedstorage/render/teisr/TileEntityItemStackRendererPattern.java

@@ -1,16 +1,14 @@
 package com.raoulvdberge.refinedstorage.render.teisr;
 
-import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern;
-import com.raoulvdberge.refinedstorage.item.ItemPattern;
 import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
 import net.minecraft.item.ItemStack;
 
 public class TileEntityItemStackRendererPattern extends ItemStackTileEntityRenderer {
     @Override
     public void renderByItem(ItemStack stack) {
-        CraftingPattern pattern = ItemPattern.getPatternFromCache(null, stack);
+        /* TODO CraftingPattern pattern = ItemPattern.getPatternFromCache(null, stack);*/
-        ItemStack outputStack = pattern.getOutputs().get(0);
+        //ItemStack outputStack = pattern.getOutputs().get(0);
 
-        outputStack.getItem().getTileEntityItemStackRenderer().renderByItem(outputStack);
+        //outputStack.getItem().getTileEntityItemStackRenderer().renderByItem(outputStack);
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/WirelessCraftingMonitor.java

@@ -3,7 +3,6 @@ package com.raoulvdberge.refinedstorage.tile.craftingmonitor;
 import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingManager;
 import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
 import com.raoulvdberge.refinedstorage.api.network.INetwork;
-import com.raoulvdberge.refinedstorage.item.ItemWirelessCraftingMonitor;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
@@ -28,10 +27,10 @@ public class WirelessCraftingMonitor implements ICraftingMonitor {
 
     public WirelessCraftingMonitor(ItemStack stack) {
         this.stack = stack;
-        this.networkDimension = ItemWirelessCraftingMonitor.getDimensionId(stack);
+        /* TODO this.networkDimension = ItemWirelessCraftingMonitor.getDimensionId(stack);
         this.network = new BlockPos(ItemWirelessCraftingMonitor.getX(stack), ItemWirelessCraftingMonitor.getY(stack), ItemWirelessCraftingMonitor.getZ(stack));
         this.tabPage = ItemWirelessCraftingMonitor.getTabPage(stack);
-        this.tabSelected = ItemWirelessCraftingMonitor.getTabSelected(stack);
+        this.tabSelected = ItemWirelessCraftingMonitor.getTabSelected(stack);*/
     }
 
     @Override

src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java

@@ -11,7 +11,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridF
 import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
-import com.raoulvdberge.refinedstorage.item.ItemWirelessFluidGrid;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.PlayerEntity;
@@ -60,7 +59,7 @@ public class WirelessFluidGrid implements IGridNetworkAware {
     };
 
     public WirelessFluidGrid(ItemStack stack) {
-        this.networkDimension = ItemWirelessFluidGrid.getDimensionId(stack);
+        /* TODO this.networkDimension = ItemWirelessFluidGrid.getDimensionId(stack);
         this.network = new BlockPos(ItemWirelessFluidGrid.getX(stack), ItemWirelessFluidGrid.getY(stack), ItemWirelessFluidGrid.getZ(stack));
 
         this.stack = stack;
@@ -70,7 +69,7 @@ public class WirelessFluidGrid implements IGridNetworkAware {
         this.searchBoxMode = ItemWirelessFluidGrid.getSearchBoxMode(stack);
         this.tabSelected = ItemWirelessFluidGrid.getTabSelected(stack);
         this.tabPage = ItemWirelessFluidGrid.getTabPage(stack);
-        this.size = ItemWirelessFluidGrid.getSize(stack);
+        this.size = ItemWirelessFluidGrid.getSize(stack);*/
 
         if (stack.hasTag()) {
             StackUtils.readItems(filter, 0, stack.getTag());

src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessGrid.java

@@ -11,7 +11,6 @@ import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheListenerGridI
 import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
-import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
@@ -60,7 +59,7 @@ public class WirelessGrid implements IGridNetworkAware {
     };
 
     public WirelessGrid(ItemStack stack) {
-        this.networkDimension = ItemWirelessGrid.getDimensionId(stack);
+        /* TODO this.networkDimension = ItemWirelessGrid.getDimensionId(stack);
         this.network = new BlockPos(ItemWirelessGrid.getX(stack), ItemWirelessGrid.getY(stack), ItemWirelessGrid.getZ(stack));
 
         this.stack = stack;
@@ -71,7 +70,7 @@ public class WirelessGrid implements IGridNetworkAware {
         this.searchBoxMode = ItemWirelessGrid.getSearchBoxMode(stack);
         this.tabSelected = ItemWirelessGrid.getTabSelected(stack);
         this.tabPage = ItemWirelessGrid.getTabPage(stack);
-        this.size = ItemWirelessGrid.getSize(stack);
+        this.size = ItemWirelessGrid.getSize(stack);*/
 
         if (stack.hasTag()) {
             StackUtils.readItems(filter, 0, stack.getTag());

src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/PortableGrid.java

@@ -26,7 +26,6 @@ import com.raoulvdberge.refinedstorage.gui.GuiBase;
 import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
-import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
@@ -133,12 +132,12 @@ public class PortableGrid implements IGrid, IPortableGrid, IStorageDiskContainer
         this.stack = stack;
 
         if (player != null) {
-            this.sortingType = ItemWirelessGrid.getSortingType(stack);
+            /* TODO this.sortingType = ItemWirelessGrid.getSortingType(stack);
             this.sortingDirection = ItemWirelessGrid.getSortingDirection(stack);
             this.searchBoxMode = ItemWirelessGrid.getSearchBoxMode(stack);
             this.tabSelected = ItemWirelessGrid.getTabSelected(stack);
             this.tabPage = ItemWirelessGrid.getTabPage(stack);
-            this.size = ItemWirelessGrid.getSize(stack);
+            this.size = ItemWirelessGrid.getSize(stack);*/
         }
 
         if (!stack.hasTag()) {

src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java

@@ -30,7 +30,6 @@ import com.raoulvdberge.refinedstorage.gui.grid.GuiGrid;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerFilter;
 import com.raoulvdberge.refinedstorage.inventory.listener.ListenerTile;
-import com.raoulvdberge.refinedstorage.item.ItemWirelessGrid;
 import com.raoulvdberge.refinedstorage.render.constants.ConstantsDisk;
 import com.raoulvdberge.refinedstorage.tile.TileBase;
 import com.raoulvdberge.refinedstorage.tile.config.IRedstoneConfigurable;
@@ -226,13 +225,13 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid,
     }
 
     public void onPassItemContext(ItemStack stack) {
-        this.sortingType = ItemWirelessGrid.getSortingType(stack);
+        /* TODO this.sortingType = ItemWirelessGrid.getSortingType(stack);
         this.sortingDirection = ItemWirelessGrid.getSortingDirection(stack);
         this.searchBoxMode = ItemWirelessGrid.getSearchBoxMode(stack);
         this.tabSelected = ItemWirelessGrid.getTabSelected(stack);
         this.tabPage = ItemWirelessGrid.getTabPage(stack);
         this.size = ItemWirelessGrid.getSize(stack);
-
+*/
         IEnergyStorage energyStorage = stack.getCapability(CapabilityEnergy.ENERGY).orElse(null);
 
         this.energyStorage = recreateEnergyStorage(energyStorage != null ? energyStorage.getEnergyStored() : 0);