Some code cleanup.

src/main/java/com/refinedmods/refinedstorage/api/IRSAPI.java

@@ -143,7 +143,7 @@ public interface IRSAPI {
      * @param type     the storage type
      * @param provider the external storage provider
      */
-    void addExternalStorageProvider(StorageType type, IExternalStorageProvider provider);
+    void addExternalStorageProvider(StorageType type, IExternalStorageProvider<?> provider);
 
     /**
      * @param type the type

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/craftingmonitor/ICraftingMonitorElementList.java

@@ -9,6 +9,7 @@ public interface ICraftingMonitorElementList {
      * @param element the {@link ICraftingMonitorElement}
      */
     void directAdd(ICraftingMonitorElement element);
+
     /**
      * Add a element to the Storage list, similar elements will be merged.
      * A {@link #commit()} will stop any following adds to be merged with previous ones.
@@ -16,6 +17,7 @@ public interface ICraftingMonitorElementList {
      * @param element the {@link ICraftingMonitorElement}
      */
     void addStorage(ICraftingMonitorElement element);
+
     /**
      * Add a element to the Processing or Crafting list, similar elements will be merged.
      * A {@link #commit()} will stop any following adds to be merged with previous ones.

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/preview/ICraftingPreviewElementRegistry.java

@@ -16,7 +16,7 @@ public interface ICraftingPreviewElementRegistry {
      * @param id      the id, as specified in {@link ICraftingPreviewElement#getId()}
      * @param factory the factory
      */
-    void add(ResourceLocation id, Function<PacketBuffer, ICraftingPreviewElement> factory);
+    void add(ResourceLocation id, Function<PacketBuffer, ICraftingPreviewElement<?>> factory);
 
     /**
      * Returns a factory from the registry.
@@ -25,5 +25,5 @@ public interface ICraftingPreviewElementRegistry {
      * @return the factory, or null if no factory was found
      */
     @Nullable
-    Function<PacketBuffer, ICraftingPreviewElement> get(ResourceLocation id);
+    Function<PacketBuffer, ICraftingPreviewElement<?>> get(ResourceLocation id);
 }

src/main/java/com/refinedmods/refinedstorage/api/autocrafting/task/ICraftingTask.java

@@ -89,7 +89,7 @@ public interface ICraftingTask {
      *
      * @return get a list of {@link ICraftingPreviewElement}s
      */
-    List<ICraftingPreviewElement> getPreviewStacks();
+    List<ICraftingPreviewElement<?>> getPreviewStacks();
 
     /**
      * @return the crafting pattern corresponding to this task

src/main/java/com/refinedmods/refinedstorage/api/network/grid/GridType.java

@@ -2,6 +2,8 @@ package com.refinedmods.refinedstorage.api.network.grid;
 
 import net.minecraft.util.IStringSerializable;
 
+import javax.annotation.Nonnull;
+
 /**
  * Represents a grid type.
  * Used in {@link IGrid} to determine grid GUI rendering.
@@ -24,23 +26,20 @@ public enum GridType implements IStringSerializable {
      */
     FLUID(3, "fluid");
 
-    private int id;
-    private String name;
+    private final int id;
+    private final String name;
 
     GridType(int id, String name) {
         this.id = id;
         this.name = name;
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return name;
     }
 
-    public int getId() {
-        return id;
-    }
-
     @Override
     public String toString() {
         return name;

src/main/java/com/refinedmods/refinedstorage/api/network/grid/IGridManager.java

@@ -20,13 +20,6 @@ public interface IGridManager {
      */
     void add(ResourceLocation id, IGridFactory factory);
 
-    /**
-     * @param id the id of the factory
-     * @return the factory, or null if no factory was found
-     */
-    @Nullable
-    IGridFactory get(ResourceLocation id);
-
     /**
      * Opens a grid. Can only be called on the server.
      *

src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawer.java

@@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.autocrafting.preview.ICraftingPreviewE
  * This {@link FunctionalInterface} is used to define a draw/render function.
  * This function use x and y coords and the element to draw.
  * Usually packaged in a {@link IElementDrawers}.
- * Used in {@link ICraftingPreviewElement#draw(int, int, IElementDrawers)} and {@link ICraftingMonitorElement#draw(int, int, IElementDrawers, boolean)}.
+ * Used in {@link ICraftingPreviewElement#draw(int, int, IElementDrawers)} and {@link ICraftingMonitorElement#draw(int, int, IElementDrawers)}.
  *
  * @param <T> the element to draw, usually {@link String}, {@link net.minecraft.item.ItemStack} or {@link net.minecraftforge.fluids.FluidStack}
  */

src/main/java/com/refinedmods/refinedstorage/api/render/IElementDrawers.java

@@ -36,7 +36,7 @@ public interface IElementDrawers {
         return getNullDrawer();
     }
 
-    default IElementDrawer getErrorDrawer() {
+    default IElementDrawer<?> getErrorDrawer() {
         return getNullDrawer();
     }
 

src/main/java/com/refinedmods/refinedstorage/api/storage/AccessType.java

@@ -17,7 +17,7 @@ public enum AccessType {
      */
     EXTRACT(2);
 
-    private int id;
+    private final int id;
 
     /**
      * @param id the id of this access type

src/main/java/com/refinedmods/refinedstorage/api/storage/IStorage.java

@@ -9,7 +9,7 @@ import java.util.Collection;
 import java.util.Comparator;
 
 public interface IStorage<T> {
-    Comparator<IStorage> COMPARATOR = (left, right) -> {
+    Comparator<IStorage<?>> COMPARATOR = (left, right) -> {
         int compare = Integer.compare(right.getPriority(), left.getPriority());
 
         return compare != 0 ? compare : Integer.compare(right.getStored(), left.getStored());

src/main/java/com/refinedmods/refinedstorage/api/storage/disk/StorageDiskSyncData.java

@@ -4,8 +4,8 @@ package com.refinedmods.refinedstorage.api.storage.disk;
  * Contains synced info about a storage disk.
  */
 public class StorageDiskSyncData {
-    private int stored;
-    private int capacity;
+    private final int stored;
+    private final int capacity;
 
     public StorageDiskSyncData(int stored, int capacity) {
         this.stored = stored;

src/main/java/com/refinedmods/refinedstorage/api/util/StackListEntry.java

@@ -8,8 +8,8 @@ import java.util.UUID;
  * @param <T> the stack type
  */
 public class StackListEntry<T> {
-    private UUID id;
-    private T stack;
+    private final UUID id;
+    private final T stack;
 
     public StackListEntry(T stack) {
         this.stack = stack;

src/main/java/com/refinedmods/refinedstorage/api/util/StackListResult.java

@@ -8,9 +8,9 @@ import java.util.UUID;
  * @param <T> the stack type
  */
 public class StackListResult<T> {
-    private T stack;
-    private UUID id;
-    private int change;
+    private final T stack;
+    private final UUID id;
+    private final int change;
 
     public StackListResult(T stack, UUID id, int change) {
         this.stack = stack;

src/main/java/com/refinedmods/refinedstorage/apiimpl/API.java

@@ -92,7 +92,7 @@ public class API implements IRSAPI {
 
         for (ModFileScanData.AnnotationData annotation : annotations) {
             try {
-                Class clazz = Class.forName(annotation.getClassType().getClassName());
+                Class<?> clazz = Class.forName(annotation.getClassType().getClassName());
                 Field field = clazz.getField(annotation.getMemberName());
 
                 if (field.getType() == IRSAPI.class) {
@@ -296,8 +296,8 @@ public class API implements IRSAPI {
     }
 
     private int getHashCode(ListNBT tag, int result) {
-        for (int i = 0; i < tag.size(); ++i) {
-            result = getHashCode(tag.get(i), result);
+        for (INBT tagItem : tag) {
+            result = getHashCode(tagItem, result);
         }
 
         return result;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingManager.java

@@ -37,21 +37,21 @@ public class CraftingManager implements ICraftingManager {
     private static final String NBT_TASK_TYPE = "Type";
     private static final String NBT_TASK_DATA = "Task";
 
-    private INetwork network;
+    private final INetwork network;
 
-    private Map<ITextComponent, List<IItemHandlerModifiable>> containerInventories = new LinkedHashMap<>();
-    private Map<ICraftingPattern, Set<ICraftingPatternContainer>> patternToContainer = new HashMap<>();
+    private final Map<ITextComponent, List<IItemHandlerModifiable>> containerInventories = new LinkedHashMap<>();
+    private final Map<ICraftingPattern, Set<ICraftingPatternContainer>> patternToContainer = new HashMap<>();
 
-    private List<ICraftingPattern> patterns = new ArrayList<>();
+    private final List<ICraftingPattern> patterns = new ArrayList<>();
 
-    private Map<UUID, ICraftingTask> tasks = new LinkedHashMap<>();
-    private List<ICraftingTask> tasksToAdd = new ArrayList<>();
-    private List<UUID> tasksToCancel = new ArrayList<>();
+    private final Map<UUID, ICraftingTask> tasks = new LinkedHashMap<>();
+    private final List<ICraftingTask> tasksToAdd = new ArrayList<>();
+    private final List<UUID> tasksToCancel = new ArrayList<>();
     private ListNBT tasksToRead;
 
-    private Map<Object, Long> throttledRequesters = new HashMap<>();
+    private final Map<Object, Long> throttledRequesters = new HashMap<>();
 
-    private Set<ICraftingMonitorListener> listeners = new HashSet<>();
+    private final Set<ICraftingMonitorListener> listeners = new HashSet<>();
 
     public CraftingManager(INetwork network) {
         this.network = network;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChain.java

@@ -7,7 +7,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CraftingPatternChain implements ICraftingPatternChain {
-    private List<ICraftingPattern> patterns = new ArrayList<>();
+    private final List<ICraftingPattern> patterns = new ArrayList<>();
     private int pos;
 
     public void addPattern(ICraftingPattern pattern) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternChainList.java

@@ -36,7 +36,7 @@ public class CraftingPatternChainList implements ICraftingPatternChainList {
         return chain;
     }
 
-    private class Key {
+    private static class Key {
         private final ICraftingPattern pattern;
 
         public Key(ICraftingPattern pattern) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/CraftingPatternFactory.java

@@ -170,7 +170,7 @@ public class CraftingPatternFactory {
         inv.setInventorySlotContents(i, input);
     }
 
-    private void modifyCraftingInputsToUseAlternatives(ICraftingRecipe recipe, List<NonNullList<ItemStack>> inputs) throws CraftingPatternFactoryException {
+    private void modifyCraftingInputsToUseAlternatives(ICraftingRecipe recipe, List<NonNullList<ItemStack>> inputs) {
         if (!recipe.getIngredients().isEmpty()) {
             inputs.clear();
 

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementList.java

@@ -7,11 +7,11 @@ import net.minecraft.util.ResourceLocation;
 import java.util.*;
 
 public class CraftingMonitorElementList implements ICraftingMonitorElementList {
-    private List<ICraftingMonitorElement> elements = new LinkedList<>();
-    private Map<ResourceLocation, Map<Integer, ICraftingMonitorElement>> currentLists = new LinkedHashMap<>();
-    private Map<ResourceLocation, Map<Integer, ICraftingMonitorElement>> currentCraftingLists = new LinkedHashMap<>();
-    private Map<ResourceLocation, Map<Integer, ICraftingMonitorElement>> currentProcessingLists = new LinkedHashMap<>();
-    private Map<ResourceLocation, Map<Integer, ICraftingMonitorElement>> currentStorageLists = new LinkedHashMap<>();
+    private final List<ICraftingMonitorElement> elements = new LinkedList<>();
+    private final Map<ResourceLocation, Map<Integer, ICraftingMonitorElement>> currentLists = new LinkedHashMap<>();
+    private final Map<ResourceLocation, Map<Integer, ICraftingMonitorElement>> currentCraftingLists = new LinkedHashMap<>();
+    private final Map<ResourceLocation, Map<Integer, ICraftingMonitorElement>> currentProcessingLists = new LinkedHashMap<>();
+    private final Map<ResourceLocation, Map<Integer, ICraftingMonitorElement>> currentStorageLists = new LinkedHashMap<>();
 
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementRegistry.java

@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.function.Function;
 
 public class CraftingMonitorElementRegistry implements ICraftingMonitorElementRegistry {
-    private Map<ResourceLocation, Function<PacketBuffer, ICraftingMonitorElement>> registry = new HashMap<>();
+    private final Map<ResourceLocation, Function<PacketBuffer, ICraftingMonitorElement>> registry = new HashMap<>();
 
     @Override
     public void add(ResourceLocation id, Function<PacketBuffer, ICraftingMonitorElement> factory) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ErrorCraftingMonitorElement.java

@@ -14,8 +14,8 @@ import javax.annotation.Nullable;
 public class ErrorCraftingMonitorElement implements ICraftingMonitorElement {
     public static final ResourceLocation ID = new ResourceLocation("error");
 
-    private ICraftingMonitorElement base;
-    private String message;
+    private final ICraftingMonitorElement base;
+    private final String message;
 
     public ErrorCraftingMonitorElement(ICraftingMonitorElement base, String message) {
         this.base = base;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/FluidCraftingMonitorElement.java

@@ -24,7 +24,7 @@ public class FluidCraftingMonitorElement implements ICraftingMonitorElement {
 
     public static final ResourceLocation ID = new ResourceLocation(RS.ID, "fluid");
 
-    private FluidStack stack;
+    private final FluidStack stack;
     private int stored;
     private int missing;
     private int processing;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/craftingmonitor/ItemCraftingMonitorElement.java

@@ -25,7 +25,7 @@ public class ItemCraftingMonitorElement implements ICraftingMonitorElement {
 
     public static final ResourceLocation ID = new ResourceLocation(RS.ID, "item");
 
-    private ItemStack stack;
+    private final ItemStack stack;
     private int stored;
     private int missing;
     private int processing;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementRegistry.java

@@ -11,16 +11,16 @@ import java.util.Map;
 import java.util.function.Function;
 
 public class CraftingPreviewElementRegistry implements ICraftingPreviewElementRegistry {
-    private Map<ResourceLocation, Function<PacketBuffer, ICraftingPreviewElement>> registry = new HashMap<>();
+    private final Map<ResourceLocation, Function<PacketBuffer, ICraftingPreviewElement<?>>> registry = new HashMap<>();
 
     @Override
-    public void add(ResourceLocation id, Function<PacketBuffer, ICraftingPreviewElement> factory) {
+    public void add(ResourceLocation id, Function<PacketBuffer, ICraftingPreviewElement<?>> factory) {
         registry.put(id, factory);
     }
 
     @Nullable
     @Override
-    public Function<PacketBuffer, ICraftingPreviewElement> get(ResourceLocation id) {
+    public Function<PacketBuffer, ICraftingPreviewElement<?>> get(ResourceLocation id) {
         return registry.get(id);
     }
 }

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ErrorCraftingPreviewElement.java

@@ -11,8 +11,8 @@ import net.minecraft.util.ResourceLocation;
 public class ErrorCraftingPreviewElement implements ICraftingPreviewElement<ItemStack> {
     public static final ResourceLocation ID = new ResourceLocation(RS.ID, "error");
 
-    private CraftingTaskErrorType type;
-    private ItemStack stack;
+    private final CraftingTaskErrorType type;
+    private final ItemStack stack;
 
     public ErrorCraftingPreviewElement(CraftingTaskErrorType type, ItemStack stack) {
         this.type = type;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/FluidCraftingPreviewElement.java

@@ -17,7 +17,7 @@ import net.minecraftforge.fluids.FluidStack;
 public class FluidCraftingPreviewElement implements ICraftingPreviewElement<FluidStack> {
     public static final ResourceLocation ID = new ResourceLocation(RS.ID, "fluid");
 
-    private FluidStack stack;
+    private final FluidStack stack;
     private int available;
     private boolean missing;
     // If missing is true then toCraft is the missing amount

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/preview/ItemCraftingPreviewElement.java

@@ -17,7 +17,7 @@ import net.minecraftforge.items.ItemHandlerHelper;
 public class ItemCraftingPreviewElement implements ICraftingPreviewElement<ItemStack> {
     public static final ResourceLocation ID = new ResourceLocation(RS.ID, "item");
 
-    private ItemStack stack;
+    private final ItemStack stack;
     private int available;
     private boolean missing;
     // If missing is true then toCraft is the missing amount

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/CraftingTaskRegistry.java

@@ -9,7 +9,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class CraftingTaskRegistry implements ICraftingTaskRegistry {
-    private Map<ResourceLocation, ICraftingTaskFactory> registry = new HashMap<>();
+    private final Map<ResourceLocation, ICraftingTaskFactory> registry = new HashMap<>();
 
     @Override
     public void add(ResourceLocation id, ICraftingTaskFactory factory) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Crafting.java

@@ -17,10 +17,10 @@ class Crafting {
     private static final String NBT_TO_EXTRACT = "ToExtract";
     private static final String NBT_ROOT = "Root";
 
-    private ICraftingPattern pattern;
-    private NonNullList<ItemStack> took;
-    private IStackList<ItemStack> toExtract;
-    private boolean root;
+    private final ICraftingPattern pattern;
+    private final NonNullList<ItemStack> took;
+    private final IStackList<ItemStack> toExtract;
+    private final boolean root;
 
     public Crafting(ICraftingPattern pattern, NonNullList<ItemStack> took, IStackList<ItemStack> toExtract, boolean root) {
         this.pattern = pattern;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTask.java

@@ -68,34 +68,34 @@ public class CraftingTask implements ICraftingTask {
 
     private static final Logger LOGGER = LogManager.getLogger(CraftingTask.class);
 
-    private INetwork network;
-    private ICraftingRequestInfo requested;
-    private int quantity;
-    private ICraftingPattern pattern;
+    private final INetwork network;
+    private final ICraftingRequestInfo requested;
+    private final int quantity;
+    private final ICraftingPattern pattern;
     private UUID id = UUID.randomUUID();
     private int ticks;
     private long calculationStarted = -1;
     private long executionStarted = -1;
     private int totalSteps;
-    private Set<ICraftingPattern> patternsUsed = new HashSet<>();
+    private final Set<ICraftingPattern> patternsUsed = new HashSet<>();
 
-    private IStorageDisk<ItemStack> internalStorage;
-    private IStorageDisk<FluidStack> internalFluidStorage;
+    private final IStorageDisk<ItemStack> internalStorage;
+    private final IStorageDisk<FluidStack> internalFluidStorage;
 
     private IStackList<ItemStack> toExtractInitial = API.instance().createItemStackList();
     private IStackList<FluidStack> toExtractInitialFluids = API.instance().createFluidStackList();
 
-    private List<Crafting> crafting = new ArrayList<>();
-    private List<Processing> processing = new ArrayList<>();
+    private final List<Crafting> crafting = new ArrayList<>();
+    private final List<Processing> processing = new ArrayList<>();
 
     private IStackList<ItemStack> missing = API.instance().createItemStackList();
     private IStackList<FluidStack> missingFluids = API.instance().createFluidStackList();
 
-    private IStackList<ItemStack> toTake = API.instance().createItemStackList();
-    private IStackList<FluidStack> toTakeFluids = API.instance().createFluidStackList();
+    private final IStackList<ItemStack> toTake = API.instance().createItemStackList();
+    private final IStackList<FluidStack> toTakeFluids = API.instance().createFluidStackList();
 
-    private IStackList<ItemStack> toCraft = API.instance().createItemStackList();
-    private IStackList<FluidStack> toCraftFluids = API.instance().createFluidStackList();
+    private final IStackList<ItemStack> toCraft = API.instance().createItemStackList();
+    private final IStackList<FluidStack> toCraftFluids = API.instance().createFluidStackList();
 
     public CraftingTask(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) {
         this.network = network;
@@ -281,7 +281,7 @@ public class CraftingTask implements ICraftingTask {
     }
 
     static class PossibleInputs {
-        private List<ItemStack> possibilities;
+        private final List<ItemStack> possibilities;
         private int pos;
 
         PossibleInputs(List<ItemStack> possibilities) {
@@ -323,7 +323,7 @@ public class CraftingTask implements ICraftingTask {
     }
 
     static class PossibleFluidInputs {
-        private List<FluidStack> possibilities;
+        private final List<FluidStack> possibilities;
         private int pos;
 
         PossibleFluidInputs(List<FluidStack> possibilities) {
@@ -698,7 +698,7 @@ public class CraftingTask implements ICraftingTask {
 
                     network.getCraftingManager().onTaskChanged();
 
-                    counter.merge(container, 1, (a, b) -> a + b);
+                    counter.merge(container, 1, Integer::sum);
                 }
             }
         }
@@ -816,7 +816,7 @@ public class CraftingTask implements ICraftingTask {
 
                         p.getPattern().getContainer().onUsedForProcessing();
 
-                        counter.merge(container, 1, (a, b) -> a + b);
+                        counter.merge(container, 1, Integer::sum);
                     }
                 }
 
@@ -1163,7 +1163,7 @@ public class CraftingTask implements ICraftingTask {
     }
 
     @Override
-    public List<ICraftingPreviewElement> getPreviewStacks() {
+    public List<ICraftingPreviewElement<?>> getPreviewStacks() {
         Map<Integer, ItemCraftingPreviewElement> map = new LinkedHashMap<>();
         Map<Integer, FluidCraftingPreviewElement> mapFluids = new LinkedHashMap<>();
 
@@ -1253,7 +1253,7 @@ public class CraftingTask implements ICraftingTask {
             mapFluids.put(hash, previewStack);
         }
 
-        List<ICraftingPreviewElement> elements = new ArrayList<>();
+        List<ICraftingPreviewElement<?>> elements = new ArrayList<>();
 
         elements.addAll(map.values());
         elements.addAll(mapFluids.values());

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/CraftingTaskError.java

@@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError;
 import javax.annotation.Nullable;
 
 public class CraftingTaskError implements ICraftingTaskError {
-    private CraftingTaskErrorType type;
+    private final CraftingTaskErrorType type;
     private ICraftingPattern recursedPattern;
 
     public CraftingTaskError(CraftingTaskErrorType type) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v5/Processing.java

@@ -18,13 +18,13 @@ class Processing {
     private static final String NBT_STATE = "State";
     private static final String NBT_ROOT = "Root";
 
-    private ICraftingPattern pattern;
-    private IStackList<ItemStack> itemsToReceive;
-    private IStackList<FluidStack> fluidsToReceive;
-    private IStackList<ItemStack> itemsToPut;
-    private IStackList<FluidStack> fluidsToPut;
+    private final ICraftingPattern pattern;
+    private final IStackList<ItemStack> itemsToReceive;
+    private final IStackList<FluidStack> fluidsToReceive;
+    private final IStackList<ItemStack> itemsToPut;
+    private final IStackList<FluidStack> fluidsToPut;
     private ProcessingState state = ProcessingState.READY;
-    private boolean root;
+    private final boolean root;
 
     public Processing(ICraftingPattern pattern, IStackList<ItemStack> itemsToReceive, IStackList<FluidStack> fluidsToReceive, IStackList<ItemStack> itemsToPut, IStackList<FluidStack> fluidsToPut, boolean root) {
         this.pattern = pattern;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Craft.java

@@ -27,11 +27,11 @@ public abstract class Craft {
     private static final String NBT_QUANTITY = "Quantity";
     private static final String NBT_NEEDED_PER_CRAFT = "NeededPerCraft";
 
-    private boolean root;
+    private final boolean root;
     protected int quantity;
-    private ICraftingPattern pattern;
-    private Map<Integer, IStackList<ItemStack>> itemsToUse = new LinkedHashMap<>();
-    private Map<Integer, Integer> neededPerCraft = new LinkedHashMap<>();
+    private final ICraftingPattern pattern;
+    private final Map<Integer, IStackList<ItemStack>> itemsToUse = new LinkedHashMap<>();
+    private final Map<Integer, Integer> neededPerCraft = new LinkedHashMap<>();
 
     Craft(ICraftingPattern pattern, boolean root) {
         this.pattern = pattern;

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/Crafting.java

@@ -12,7 +12,7 @@ import net.minecraftforge.common.util.Constants;
 
 class Crafting extends Craft {
     private static final String NBT_RECIPE = "Recipe";
-    private NonNullList<ItemStack> recipe;
+    private final NonNullList<ItemStack> recipe;
 
     Crafting(ICraftingPattern pattern, boolean root, NonNullList<ItemStack> recipe) {
         super(pattern, root);

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTask.java

@@ -71,35 +71,35 @@ public class CraftingTask implements ICraftingTask {
 
     private static final Logger LOGGER = LogManager.getLogger(CraftingTask.class);
 
-    private INetwork network;
-    private ICraftingRequestInfo requested;
-    private int quantity;
-    private ICraftingPattern pattern;
+    private final INetwork network;
+    private final ICraftingRequestInfo requested;
+    private final int quantity;
+    private final ICraftingPattern pattern;
     private UUID id = UUID.randomUUID();
     private int ticks;
     private long calculationStarted = -1;
     private long executionStarted = -1;
     private int totalSteps;
     private int currentstep;
-    private Set<ICraftingPattern> patternsUsed = new HashSet<>();
+    private final Set<ICraftingPattern> patternsUsed = new HashSet<>();
 
-    private IStorageDisk<ItemStack> internalStorage;
-    private IStorageDisk<FluidStack> internalFluidStorage;
+    private final IStorageDisk<ItemStack> internalStorage;
+    private final IStorageDisk<FluidStack> internalFluidStorage;
 
     private IStackList<ItemStack> toExtractInitial = API.instance().createItemStackList();
     private IStackList<FluidStack> toExtractInitialFluids = API.instance().createFluidStackList();
 
-    private Map<ICraftingPattern, Craft> crafts = new LinkedHashMap<>();
-    private List<Craft> toRemove = new ArrayList<>();
+    private final Map<ICraftingPattern, Craft> crafts = new LinkedHashMap<>();
+    private final List<Craft> toRemove = new ArrayList<>();
 
     private IStackList<ItemStack> missing = API.instance().createItemStackList();
     private IStackList<FluidStack> missingFluids = API.instance().createFluidStackList();
 
-    private IStackList<ItemStack> toTake = API.instance().createItemStackList();
-    private IStackList<FluidStack> toTakeFluids = API.instance().createFluidStackList();
+    private final IStackList<ItemStack> toTake = API.instance().createItemStackList();
+    private final IStackList<FluidStack> toTakeFluids = API.instance().createFluidStackList();
 
-    private List<ItemStack> toCraft = new ArrayList<>();
-    private List<FluidStack> toCraftFluids = new ArrayList<>();
+    private final List<ItemStack> toCraft = new ArrayList<>();
+    private final List<FluidStack> toCraftFluids = new ArrayList<>();
 
     public CraftingTask(INetwork network, ICraftingRequestInfo requested, int quantity, ICraftingPattern pattern) {
         this.network = network;
@@ -273,7 +273,7 @@ public class CraftingTask implements ICraftingTask {
     }
 
     static class PossibleInputs {
-        private List<ItemStack> possibilities;
+        private final List<ItemStack> possibilities;
         private int pos;
 
         PossibleInputs(List<ItemStack> possibilities) {
@@ -315,7 +315,7 @@ public class CraftingTask implements ICraftingTask {
     }
 
     static class PossibleFluidInputs {
-        private List<FluidStack> possibilities;
+        private final List<FluidStack> possibilities;
         private int pos;
 
         PossibleFluidInputs(List<FluidStack> possibilities) {
@@ -327,6 +327,7 @@ public class CraftingTask implements ICraftingTask {
         }
 
         // Return false if we're exhausted.
+        // TODO: never called?
         boolean cycle() {
             if (pos + 1 >= possibilities.size()) {
                 pos = 0;
@@ -1199,7 +1200,7 @@ public class CraftingTask implements ICraftingTask {
     }
 
     @Override
-    public List<ICraftingPreviewElement> getPreviewStacks() {
+    public List<ICraftingPreviewElement<?>> getPreviewStacks() {
         Map<Integer, ItemCraftingPreviewElement> map = new LinkedHashMap<>();
         Map<Integer, FluidCraftingPreviewElement> mapFluids = new LinkedHashMap<>();
 
@@ -1289,7 +1290,7 @@ public class CraftingTask implements ICraftingTask {
             mapFluids.put(hash, previewStack);
         }
 
-        List<ICraftingPreviewElement> elements = new ArrayList<>();
+        List<ICraftingPreviewElement<?>> elements = new ArrayList<>();
 
         elements.addAll(map.values());
         elements.addAll(mapFluids.values());

src/main/java/com/refinedmods/refinedstorage/apiimpl/autocrafting/task/v6/CraftingTaskError.java

@@ -7,7 +7,7 @@ import com.refinedmods.refinedstorage.api.autocrafting.task.ICraftingTaskError;
 import javax.annotation.Nullable;
 
 public class CraftingTaskError implements ICraftingTaskError {
-    private CraftingTaskErrorType type;
+    private final CraftingTaskErrorType type;
     private ICraftingPattern recursedPattern;
 
     public CraftingTaskError(CraftingTaskErrorType type) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkManager.java

@@ -26,9 +26,9 @@ public class NetworkManager extends WorldSavedData implements INetworkManager {
 
     private final World world;
 
-    private Logger logger = LogManager.getLogger(getClass());
+    private final Logger logger = LogManager.getLogger(getClass());
 
-    private ConcurrentHashMap<BlockPos, INetwork> networks = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<BlockPos, INetwork> networks = new ConcurrentHashMap<>();
 
     public NetworkManager(String name, World world) {
         super(name);

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeGraph.java

@@ -19,11 +19,11 @@ import java.util.*;
 import java.util.function.Consumer;
 
 public class NetworkNodeGraph implements INetworkNodeGraph {
-    private INetwork network;
+    private final INetwork network;
     private Set<INetworkNode> nodes = Sets.newConcurrentHashSet();
-    private List<INetworkNodeGraphListener> listeners = new LinkedList<>();
+    private final List<INetworkNodeGraphListener> listeners = new LinkedList<>();
 
-    private Set<Consumer<INetwork>> actions = new HashSet<>();
+    private final Set<Consumer<INetwork>> actions = new HashSet<>();
 
     private boolean invalidating = false;
 
@@ -109,14 +109,14 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
     }
 
     private class Operator implements INetworkNodeVisitor.Operator {
-        private Set<INetworkNode> foundNodes = Sets.newConcurrentHashSet(); // All scanned nodes
+        private final Set<INetworkNode> foundNodes = Sets.newConcurrentHashSet(); // All scanned nodes
 
-        private Set<INetworkNode> newNodes = Sets.newConcurrentHashSet(); // All scanned new nodes, that didn't appear in the list before
-        private Set<INetworkNode> previousNodes = Sets.newConcurrentHashSet(nodes); // All unscanned nodes (nodes that were in the previous list, but not in the new list)
+        private final Set<INetworkNode> newNodes = Sets.newConcurrentHashSet(); // All scanned new nodes, that didn't appear in the list before
+        private final Set<INetworkNode> previousNodes = Sets.newConcurrentHashSet(nodes); // All unscanned nodes (nodes that were in the previous list, but not in the new list)
 
-        private Queue<Visitor> toCheck = new ArrayDeque<>();
+        private final Queue<Visitor> toCheck = new ArrayDeque<>();
 
-        private Action action;
+        private final Action action;
 
         public Operator(Action action) {
             this.action = action;
@@ -158,7 +158,7 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
         }
     }
 
-    private class Visitor implements INetworkNodeVisitor {
+    private static class Visitor implements INetworkNodeVisitor {
         private final INetworkNode node;
         private final World world;
         private final BlockPos pos;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/NetworkNodeManager.java

@@ -28,9 +28,9 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa
 
     private final World world;
 
-    private Logger logger = LogManager.getLogger(getClass());
+    private final Logger logger = LogManager.getLogger(getClass());
 
-    private ConcurrentHashMap<BlockPos, INetworkNode> nodes = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap<BlockPos, INetworkNode> nodes = new ConcurrentHashMap<>();
 
     public NetworkNodeManager(String name, World world) {
         super(name);

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridManager.java

@@ -25,12 +25,6 @@ public class GridManager implements IGridManager {
         factories.put(id, factory);
     }
 
-    @Override
-    @Nullable
-    public IGridFactory get(ResourceLocation id) {
-        return factories.get(id);
-    }
-
     @Override
     public void openGrid(ResourceLocation id, ServerPlayerEntity player, BlockPos pos) {
         openGrid(id, player, null, pos, -1);
@@ -67,7 +61,7 @@ public class GridManager implements IGridManager {
     @Override
     @Nullable
     public Pair<IGrid, TileEntity> createGrid(ResourceLocation id, PlayerEntity player, @Nullable ItemStack stack, @Nullable BlockPos pos, int slotId) {
-        IGridFactory factory = get(id);
+        IGridFactory factory = factories.get(id);
 
         if (factory == null) {
             return null;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/GridTab.java

@@ -15,12 +15,12 @@ import java.util.Collections;
 import java.util.List;
 
 public class GridTab implements IGridTab {
-    private List<IFilter> filters;
-    private String name;
+    private final List<IFilter> filters;
+    private final String name;
     @Nonnull
-    private ItemStack icon;
+    private final ItemStack icon;
     @Nullable
-    private FluidStack fluidIcon;
+    private final FluidStack fluidIcon;
 
     public GridTab(List<IFilter> filters, String name, @Nonnull ItemStack icon, @Nullable FluidStack fluidIcon) {
         this.filters = filters;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/FluidGridHandler.java

@@ -27,7 +27,7 @@ import java.util.Collections;
 import java.util.UUID;
 
 public class FluidGridHandler implements IFluidGridHandler {
-    private INetwork network;
+    private final INetwork network;
 
     public FluidGridHandler(INetwork network) {
         this.network = network;
@@ -41,26 +41,24 @@ public class FluidGridHandler implements IFluidGridHandler {
             return;
         }
 
-        NetworkUtils.extractBucketFromPlayerInventoryOrNetwork(player, network, bucket -> {
-            bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> {
-                network.getFluidStorageTracker().changed(player, stack.copy());
+        NetworkUtils.extractBucketFromPlayerInventoryOrNetwork(player, network, bucket -> bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> {
+            network.getFluidStorageTracker().changed(player, stack.copy());
 
-                FluidStack extracted = network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM);
+            FluidStack extracted = network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM);
 
-                fluidHandler.fill(extracted, IFluidHandler.FluidAction.EXECUTE);
+            fluidHandler.fill(extracted, IFluidHandler.FluidAction.EXECUTE);
 
-                if (shift) {
-                    if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) {
-                        InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer());
-                    }
-                } else {
-                    player.inventory.setItemStack(fluidHandler.getContainer());
-                    player.updateHeldItem();
+            if (shift) {
+                if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) {
+                    InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer());
                 }
+            } else {
+                player.inventory.setItemStack(fluidHandler.getContainer());
+                player.updateHeldItem();
+            }
 
-                network.getNetworkItemManager().drainEnergy(player, RS.SERVER_CONFIG.getWirelessFluidGrid().getExtractUsage());
-            });
-        });
+            network.getNetworkItemManager().drainEnergy(player, RS.SERVER_CONFIG.getWirelessFluidGrid().getExtractUsage());
+        }));
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java

@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.UUID;
 
 public class ItemGridHandler implements IItemGridHandler {
-    private INetwork network;
+    private final INetwork network;
 
     public ItemGridHandler(INetwork network) {
         this.network = network;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableFluidGridHandler.java

@@ -20,7 +20,7 @@ import javax.annotation.Nonnull;
 import java.util.UUID;
 
 public class PortableFluidGridHandler implements IFluidGridHandler {
-    private IPortableGrid portableGrid;
+    private final IPortableGrid portableGrid;
 
     public PortableFluidGridHandler(IPortableGrid portableGrid) {
         this.portableGrid = portableGrid;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java

@@ -19,8 +19,8 @@ import javax.annotation.Nullable;
 import java.util.UUID;
 
 public class PortableItemGridHandler implements IItemGridHandler {
-    private IPortableGrid portableGrid;
-    private IGrid grid;
+    private final IPortableGrid portableGrid;
+    private final IGrid grid;
 
     public PortableItemGridHandler(IPortableGrid portableGrid, IGrid grid) {
         this.portableGrid = portableGrid;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessCraftingMonitorNetworkItem.java

@@ -19,10 +19,10 @@ import net.minecraftforge.energy.IEnergyStorage;
 import net.minecraftforge.fml.network.NetworkHooks;
 
 public class WirelessCraftingMonitorNetworkItem implements INetworkItem {
-    private INetworkItemManager handler;
-    private PlayerEntity player;
-    private ItemStack stack;
-    private int slotId;
+    private final INetworkItemManager handler;
+    private final PlayerEntity player;
+    private final ItemStack stack;
+    private final int slotId;
 
     public WirelessCraftingMonitorNetworkItem(INetworkItemManager handler, PlayerEntity player, ItemStack stack, int slotId) {
         this.handler = handler;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessFluidGridNetworkItem.java

@@ -17,10 +17,10 @@ import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
 
 public class WirelessFluidGridNetworkItem implements INetworkItem {
-    private INetworkItemManager handler;
-    private PlayerEntity player;
-    private ItemStack stack;
-    private int slotId;
+    private final INetworkItemManager handler;
+    private final PlayerEntity player;
+    private final ItemStack stack;
+    private final int slotId;
 
     public WirelessFluidGridNetworkItem(INetworkItemManager handler, PlayerEntity player, ItemStack stack, int slotId) {
         this.handler = handler;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/item/WirelessGridNetworkItem.java

@@ -17,10 +17,10 @@ import net.minecraftforge.energy.CapabilityEnergy;
 import net.minecraftforge.energy.IEnergyStorage;
 
 public class WirelessGridNetworkItem implements INetworkItem {
-    private INetworkItemManager handler;
-    private PlayerEntity player;
-    private ItemStack stack;
-    private int slotId;
+    private final INetworkItemManager handler;
+    private final PlayerEntity player;
+    private final ItemStack stack;
+    private final int slotId;
 
     public WirelessGridNetworkItem(INetworkItemManager handler, PlayerEntity player, ItemStack stack, int slotId) {
         this.handler = handler;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java

@@ -39,7 +39,6 @@ import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
-import net.minecraftforge.items.ItemHandlerHelper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -54,11 +53,11 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
 
     private static final int BASE_SPEED = 20;
 
-    private BaseItemHandler itemFilters = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this));
-    private FluidInventory fluidFilters = new FluidInventory(1)
+    private final BaseItemHandler itemFilters = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this));
+    private final FluidInventory fluidFilters = new FluidInventory(1)
         .addListener(new NetworkNodeFluidInventoryListener(this));
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK)
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK)
         .addListener(new NetworkNodeInventoryListener(this));
 
     private int compare = IComparer.COMPARE_NBT;
@@ -273,7 +272,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
     }
 
     private class NetworkFluidHandler implements IFluidHandler {
-        private FluidStack resource;
+        private final FluidStack resource;
 
         public NetworkFluidHandler(FluidStack resource) {
             this.resource = resource;
@@ -318,9 +317,9 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
         }
     }
 
-    private class ConstructorBlockItemUseContext extends BlockItemUseContext {
-        public ConstructorBlockItemUseContext(World worldIn, @Nullable PlayerEntity playerIn, Hand handIn, ItemStack stackIn, BlockRayTraceResult rayTraceResultIn) {
-            super(worldIn, playerIn, handIn, stackIn, rayTraceResultIn);
+    private static class ConstructorBlockItemUseContext extends BlockItemUseContext {
+        public ConstructorBlockItemUseContext(World world, @Nullable PlayerEntity player, Hand hand, ItemStack stack, BlockRayTraceResult rayTraceResult) {
+            super(world, player, hand, stack, rayTraceResult);
         }
     }
 }

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CrafterNetworkNode.java

@@ -62,7 +62,7 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC
     private static final String NBT_LOCKED = "Locked";
     private static final String NBT_WAS_POWERED = "WasPowered";
 
-    private BaseItemHandler patternsInventory = new BaseItemHandler(9) {
+    private final BaseItemHandler patternsInventory = new BaseItemHandler(9) {
         @Override
         public int getSlotLimit(int slot) {
             return 1;
@@ -82,9 +82,9 @@ public class CrafterNetworkNode extends NetworkNode implements ICraftingPatternC
             }
         });
 
-    private List<ICraftingPattern> patterns = new ArrayList<>();
+    private final List<ICraftingPattern> patterns = new ArrayList<>();
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED)
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED)
         .addListener(new NetworkNodeInventoryListener(this));
 
     // Used to prevent infinite recursion on getRootContainer() when there's e.g. two crafters facing each other.

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/CraftingMonitorNetworkNode.java

@@ -93,9 +93,7 @@ public class CraftingMonitorNetworkNode extends NetworkNode implements ICrafting
 
         tag.putInt(NBT_TAB_PAGE, tabPage);
 
-        if (tabSelected.isPresent()) {
-            tag.putUniqueId(NBT_TAB_SELECTED, tabSelected.get());
-        }
+        tabSelected.ifPresent(uuid -> tag.putUniqueId(NBT_TAB_SELECTED, uuid));
 
         return tag;
     }

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java

@@ -58,14 +58,12 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I
 
     private static final int BASE_SPEED = 20;
 
-    private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
-    private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.SILK_TOUCH, UpgradeItem.Type.FORTUNE_1, UpgradeItem.Type.FORTUNE_2, UpgradeItem.Type.FORTUNE_3)
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.SILK_TOUCH, UpgradeItem.Type.FORTUNE_1, UpgradeItem.Type.FORTUNE_2, UpgradeItem.Type.FORTUNE_3)
         .addListener(new NetworkNodeInventoryListener(this))
-        .addListener((handler, slot, reading) -> {
-            tool = createTool();
-        });
+        .addListener((handler, slot, reading) -> tool = createTool());
 
     private int compare = IComparer.COMPARE_NBT;
     private int mode = IWhitelistBlacklist.BLACKLIST;
@@ -316,10 +314,6 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I
         return upgrades;
     }
 
-    public IItemHandler getInventory() {
-        return itemFilters;
-    }
-
     @Override
     public IItemHandler getDrops() {
         return upgrades;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DetectorNetworkNode.java

@@ -20,7 +20,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 public class DetectorNetworkNode extends NetworkNode implements IComparable, IType {
@@ -38,8 +37,8 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy
     private static final String NBT_TYPE = "Type";
     private static final String NBT_FLUID_FILTERS = "FluidFilters";
 
-    private BaseItemHandler itemFilters = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this));
-    private FluidInventory fluidFilters = new FluidInventory(1).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final BaseItemHandler itemFilters = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this));
+    private final FluidInventory fluidFilters = new FluidInventory(1).addListener(new NetworkNodeFluidInventoryListener(this));
 
     private int compare = IComparer.COMPARE_NBT;
     private int type = IType.ITEMS;
@@ -210,10 +209,6 @@ public class DetectorNetworkNode extends NetworkNode implements IComparable, ITy
         }
     }
 
-    public IItemHandler getInventory() {
-        return itemFilters;
-    }
-
     @Override
     public void setRedstoneMode(RedstoneMode mode) {
         // NO OP

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExporterNetworkNode.java

@@ -34,10 +34,10 @@ public class ExporterNetworkNode extends NetworkNode implements IComparable, ITy
     private static final String NBT_TYPE = "Type";
     private static final String NBT_FLUID_FILTERS = "FluidFilters";
 
-    private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
-    private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK, UpgradeItem.Type.REGULATOR)
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.CRAFTING, UpgradeItem.Type.STACK, UpgradeItem.Type.REGULATOR)
         .addListener(new NetworkNodeInventoryListener(this))
         .addListener((handler, slot, reading) -> {
             if (!reading && !getUpgrades().hasUpgrade(UpgradeItem.Type.REGULATOR)) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ExternalStorageNetworkNode.java

@@ -20,7 +20,6 @@ import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeFluidInvento
 import com.refinedmods.refinedstorage.inventory.listener.NetworkNodeInventoryListener;
 import com.refinedmods.refinedstorage.tile.ExternalStorageTile;
 import com.refinedmods.refinedstorage.tile.config.*;
-import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
 import com.refinedmods.refinedstorage.util.AccessTypeUtils;
 import com.refinedmods.refinedstorage.util.StackUtils;
 import net.minecraft.item.ItemStack;
@@ -51,8 +50,8 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
     private static final String NBT_TYPE = "Type";
     private static final String NBT_FLUID_FILTERS = "FluidFilters";
 
-    private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
-    private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
 
     private int priority = 0;
     private int compare = IComparer.COMPARE_NBT;
@@ -61,8 +60,8 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
     private AccessType accessType = AccessType.INSERT_EXTRACT;
     private int networkTicks;
 
-    private List<IExternalStorage<ItemStack>> itemStorages = new CopyOnWriteArrayList<>();
-    private List<IExternalStorage<FluidStack>> fluidStorages = new CopyOnWriteArrayList<>();
+    private final List<IExternalStorage<ItemStack>> itemStorages = new CopyOnWriteArrayList<>();
+    private final List<IExternalStorage<FluidStack>> fluidStorages = new CopyOnWriteArrayList<>();
 
     public ExternalStorageNetworkNode(World world, BlockPos pos) {
         super(world, pos);
@@ -213,17 +212,17 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
 
         if (facing != null) {
             if (type == IType.ITEMS) {
-                for (IExternalStorageProvider provider : API.instance().getExternalStorageProviders(StorageType.ITEM)) {
+                for (IExternalStorageProvider<ItemStack> provider : API.instance().getExternalStorageProviders(StorageType.ITEM)) {
                     if (provider.canProvide(facing, getDirection())) {
-                        itemStorages.add(provider.provide(this, () -> getFacingTile(), getDirection()));
+                        itemStorages.add(provider.provide(this, this::getFacingTile, getDirection()));
 
                         break;
                     }
                 }
             } else if (type == IType.FLUIDS) {
-                for (IExternalStorageProvider provider : API.instance().getExternalStorageProviders(StorageType.FLUID)) {
+                for (IExternalStorageProvider<FluidStack> provider : API.instance().getExternalStorageProviders(StorageType.FLUID)) {
                     if (provider.canProvide(facing, getDirection())) {
-                        fluidStorages.add(provider.provide(this, () -> getFacingTile(), getDirection()));
+                        fluidStorages.add(provider.provide(this, this::getFacingTile, getDirection()));
 
                         break;
                     }
@@ -250,31 +249,6 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
         return new TranslationTextComponent("gui.refinedstorage:external_storage");
     }
 
-    @Override
-    public TileDataParameter<Integer, ?> getRedstoneModeParameter() {
-        return ExternalStorageTile.REDSTONE_MODE;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getCompareParameter() {
-        return ExternalStorageTile.COMPARE;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getWhitelistBlacklistParameter() {
-        return ExternalStorageTile.WHITELIST_BLACKLIST;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getPriorityParameter() {
-        return ExternalStorageTile.PRIORITY;
-    }
-
-    @Override
-    public TileDataParameter<AccessType, ?> getAccessTypeParameter() {
-        return ExternalStorageTile.ACCESS_TYPE;
-    }
-
     @Override
     public long getStored() {
         return ExternalStorageTile.STORED.getValue();
@@ -312,11 +286,6 @@ public class ExternalStorageNetworkNode extends NetworkNode implements IStorageP
         markDirty();
     }
 
-    @Override
-    public TileDataParameter<Integer, ?> getTypeParameter() {
-        return ExternalStorageTile.TYPE;
-    }
-
     @Override
     public int getType() {
         return world.isRemote ? ExternalStorageTile.TYPE.getValue() : type;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/FluidInterfaceNetworkNode.java

@@ -40,7 +40,7 @@ public class FluidInterfaceNetworkNode extends NetworkNode {
     private static final String NBT_TANK_OUT = "TankOut";
     private static final String NBT_OUT = "Out";
 
-    private FluidTank tankIn = new FluidTank(TANK_CAPACITY) {
+    private final FluidTank tankIn = new FluidTank(TANK_CAPACITY) {
         @Override
         protected void onContentsChanged() {
             super.onContentsChanged();
@@ -52,14 +52,14 @@ public class FluidInterfaceNetworkNode extends NetworkNode {
             markDirty();
         }
     };
-    private FluidTank tankOut = new FluidTank(TANK_CAPACITY);
+    private final FluidTank tankOut = new FluidTank(TANK_CAPACITY);
 
-    private ProxyFluidHandler tank = new ProxyFluidHandler(tankIn, tankOut);
+    private final ProxyFluidHandler tank = new ProxyFluidHandler(tankIn, tankOut);
 
-    private BaseItemHandler in = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this)).addValidator(stack -> !StackUtils.getFluid(stack, true).getValue().isEmpty());
-    private FluidInventory out = new FluidInventory(1, TANK_CAPACITY).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final BaseItemHandler in = new BaseItemHandler(1).addListener(new NetworkNodeInventoryListener(this)).addValidator(stack -> !StackUtils.getFluid(stack, true).getValue().isEmpty());
+    private final FluidInventory out = new FluidInventory(1, TANK_CAPACITY).addListener(new NetworkNodeFluidInventoryListener(this));
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING).addListener(new NetworkNodeInventoryListener(this));
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING).addListener(new NetworkNodeInventoryListener(this));
 
     public FluidInterfaceNetworkNode(World world, BlockPos pos) {
         super(world, pos);

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/GridNetworkNode.java

@@ -79,7 +79,7 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
 
     private final AllowedTagList allowedTagList = new AllowedTagList(this::updateAllowedTags);
 
-    private Container craftingContainer = new Container(ContainerType.CRAFTING, 0) {
+    private final Container craftingContainer = new Container(ContainerType.CRAFTING, 0) {
         @Override
         public boolean canInteractWith(PlayerEntity player) {
             return false;
@@ -93,16 +93,16 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
         }
     };
     private ICraftingRecipe currentRecipe;
-    private CraftingInventory matrix = new CraftingInventory(craftingContainer, 3, 3);
-    private CraftResultInventory result = new CraftResultInventory();
-    private BaseItemHandler processingMatrix = new BaseItemHandler(9 * 2)
+    private final CraftingInventory matrix = new CraftingInventory(craftingContainer, 3, 3);
+    private final CraftResultInventory result = new CraftResultInventory();
+    private final BaseItemHandler processingMatrix = new BaseItemHandler(9 * 2)
         .addListener(new NetworkNodeInventoryListener(this))
         .addListener((handler, slot, reading) -> {
             if (!reading && slot < 9) {
                 allowedTagList.clearItemTags(slot);
             }
         });
-    private FluidInventory processingMatrixFluids = new FluidInventory(9 * 2, FluidAttributes.BUCKET_VOLUME * 64)
+    private final FluidInventory processingMatrixFluids = new FluidInventory(9 * 2, FluidAttributes.BUCKET_VOLUME * 64)
         .addListener(new NetworkNodeFluidInventoryListener(this))
         .addListener((handler, slot, reading) -> {
             if (!reading && slot < 9) {
@@ -112,9 +112,9 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
 
     private boolean reading;
 
-    private Set<ICraftingGridListener> craftingListeners = new HashSet<>();
+    private final Set<ICraftingGridListener> craftingListeners = new HashSet<>();
 
-    private BaseItemHandler patterns = new BaseItemHandler(2) {
+    private final BaseItemHandler patterns = new BaseItemHandler(2) {
         @Override
         public int getSlotLimit(int slot) {
             return slot == 1 ? 1 : super.getSlotLimit(slot);
@@ -171,9 +171,9 @@ public class GridNetworkNode extends NetworkNode implements INetworkAwareGrid, I
             }
         }));
 
-    private List<IFilter> filters = new ArrayList<>();
-    private List<IGridTab> tabs = new ArrayList<>();
-    private FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new NetworkNodeInventoryListener(this));
+    private final List<IFilter> filters = new ArrayList<>();
+    private final List<IGridTab> tabs = new ArrayList<>();
+    private final FilterItemHandler filter = (FilterItemHandler) new FilterItemHandler(filters, tabs).addListener(new NetworkNodeInventoryListener(this));
 
     private final GridType type;
 

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/IStorageScreen.java

@@ -1,24 +1,10 @@
 package com.refinedmods.refinedstorage.apiimpl.network.node;
 
-import com.refinedmods.refinedstorage.api.storage.AccessType;
-import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.util.text.ITextComponent;
 
 public interface IStorageScreen {
     ITextComponent getTitle();
 
-    TileDataParameter<Integer, ?> getTypeParameter();
-
-    TileDataParameter<Integer, ?> getRedstoneModeParameter();
-
-    TileDataParameter<Integer, ?> getCompareParameter();
-
-    TileDataParameter<Integer, ?> getWhitelistBlacklistParameter();
-
-    TileDataParameter<Integer, ?> getPriorityParameter();
-
-    TileDataParameter<AccessType, ?> getAccessTypeParameter();
-
     long getStored();
 
     long getCapacity();

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ImporterNetworkNode.java

@@ -36,10 +36,10 @@ public class ImporterNetworkNode extends NetworkNode implements IComparable, IWh
     private static final String NBT_TYPE = "Type";
     private static final String NBT_FLUID_FILTERS = "FLuidFilters";
 
-    private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
-    private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK).addListener(new NetworkNodeInventoryListener(this));
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK).addListener(new NetworkNodeInventoryListener(this));
 
     private int compare = IComparer.COMPARE_NBT;
     private int mode = IWhitelistBlacklist.BLACKLIST;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/InterfaceNetworkNode.java

@@ -29,14 +29,14 @@ public class InterfaceNetworkNode extends NetworkNode implements IComparable {
 
     private static final String NBT_COMPARE = "Compare";
 
-    private BaseItemHandler importItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final BaseItemHandler importItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
 
-    private BaseItemHandler exportFilterItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
-    private BaseItemHandler exportItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final BaseItemHandler exportFilterItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final BaseItemHandler exportItems = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
 
-    private IItemHandler items = new ProxyItemHandler(importItems, exportItems);
+    private final IItemHandler items = new ProxyItemHandler(importItems, exportItems);
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING)
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK, UpgradeItem.Type.CRAFTING)
         .addListener(new NetworkNodeInventoryListener(this));
 
     private int compare = IComparer.COMPARE_NBT;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkTransmitterNetworkNode.java

@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
 public class NetworkTransmitterNetworkNode extends NetworkNode {
     public static final ResourceLocation ID = new ResourceLocation(RS.ID, "network_transmitter");
 
-    private BaseItemHandler networkCard = new BaseItemHandler(1)
+    private final BaseItemHandler networkCard = new BaseItemHandler(1)
         .addValidator(new ItemValidator(RSItems.NETWORK_CARD))
         .addListener(new NetworkNodeInventoryListener(this))
         .addListener((handler, slot, reading) -> {

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SecurityManagerNetworkNode.java

@@ -28,10 +28,10 @@ import java.util.UUID;
 public class SecurityManagerNetworkNode extends NetworkNode implements ISecurityCardContainer {
     public static final ResourceLocation ID = new ResourceLocation(RS.ID, "security_manager");
 
-    private List<ISecurityCard> cards = new ArrayList<>();
+    private final List<ISecurityCard> cards = new ArrayList<>();
     private ISecurityCard globalCard;
 
-    private BaseItemHandler cardsInv = new BaseItemHandler(9 * 2)
+    private final BaseItemHandler cardsInv = new BaseItemHandler(9 * 2)
         .addValidator(new ItemValidator(RSItems.SECURITY_CARD))
         .addListener(new NetworkNodeInventoryListener(this))
         .addListener(((handler, slot, reading) -> {
@@ -44,7 +44,7 @@ public class SecurityManagerNetworkNode extends NetworkNode implements ISecurity
             }
         }));
 
-    private BaseItemHandler editCard = new BaseItemHandler(1)
+    private final BaseItemHandler editCard = new BaseItemHandler(1)
         .addValidator(new ItemValidator(RSItems.SECURITY_CARD))
         .addListener(new NetworkNodeInventoryListener(this));
 

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/SlottedCraftingRequest.java

@@ -5,8 +5,8 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNode;
 import java.util.Objects;
 
 public class SlottedCraftingRequest {
-    private INetworkNode node;
-    private int slot;
+    private final INetworkNode node;
+    private final int slot;
 
     public SlottedCraftingRequest(INetworkNode node, int slot) {
         this.node = node;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java

@@ -42,7 +42,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl
     private static final String NBT_TYPE = "Type";
     private static final String NBT_FLUID_FILTERS = "FluidFilters";
 
-    private BaseItemHandler itemFilter = new BaseItemHandler(1)
+    private final BaseItemHandler itemFilter = new BaseItemHandler(1)
         .addListener(new NetworkNodeInventoryListener(this))
         .addListener((handler, slot, reading) -> {
             if (!reading) {
@@ -50,13 +50,13 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl
             }
         });
 
-    private FluidInventory fluidFilter = new FluidInventory(1, FluidAttributes.BUCKET_VOLUME)
+    private final FluidInventory fluidFilter = new FluidInventory(1, FluidAttributes.BUCKET_VOLUME)
         .addListener((handler, slot, reading) -> {
             if (!reading) {
                 WorldUtils.updateBlock(world, pos);
             }
         });
-    private Map<String, Pair<ItemStack, Long>> deposits = new HashMap<>();
+    private final Map<String, Pair<ItemStack, Long>> deposits = new HashMap<>();
 
     private int compare = IComparer.COMPARE_NBT;
     private int type = IType.ITEMS;
@@ -216,17 +216,15 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl
 
         boolean shift = player.isCrouching();
         if (shift) {
-            NetworkUtils.extractBucketFromPlayerInventoryOrNetwork(player, network, bucket -> {
-                bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> {
-                    network.getFluidStorageTracker().changed(player, stack.copy());
+            NetworkUtils.extractBucketFromPlayerInventoryOrNetwork(player, network, bucket -> bucket.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null).ifPresent(fluidHandler -> {
+                network.getFluidStorageTracker().changed(player, stack.copy());
 
-                    fluidHandler.fill(network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM), IFluidHandler.FluidAction.EXECUTE);
+                fluidHandler.fill(network.extractFluid(stack, FluidAttributes.BUCKET_VOLUME, Action.PERFORM), IFluidHandler.FluidAction.EXECUTE);
 
-                    if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) {
-                        InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer());
-                    }
-                });
-            });
+                if (!player.inventory.addItemStackToInventory(fluidHandler.getContainer().copy())) {
+                    InventoryHelper.spawnItemStack(player.getEntityWorld(), player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), fluidHandler.getContainer());
+                }
+            }));
         }
     }
 

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/WirelessTransmitterNetworkNode.java

@@ -20,7 +20,7 @@ import javax.annotation.Nullable;
 public class WirelessTransmitterNetworkNode extends NetworkNode implements IWirelessTransmitter {
     public static final ResourceLocation ID = new ResourceLocation(RS.ID, "wireless_transmitter");
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.RANGE).addListener(new NetworkNodeInventoryListener(this));
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.RANGE).addListener(new NetworkNodeInventoryListener(this));
 
     public WirelessTransmitterNetworkNode(World world, BlockPos pos) {
         super(world, pos);

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java

@@ -54,13 +54,13 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide
     private int ticksSinceBlockUpdateRequested;
     private boolean blockUpdateRequested;
 
-    private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
-    private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
 
-    private IStorageDisk[] itemDisks = new IStorageDisk[8];
-    private IStorageDisk[] fluidDisks = new IStorageDisk[8];
+    private final IStorageDisk[] itemDisks = new IStorageDisk[8];
+    private final IStorageDisk[] fluidDisks = new IStorageDisk[8];
 
-    private BaseItemHandler disks = new BaseItemHandler(8)
+    private final BaseItemHandler disks = new BaseItemHandler(8)
         .addValidator(new StorageDiskItemValidator())
         .addListener(new NetworkNodeInventoryListener(this))
         .addListener((handler, slot, reading) -> {

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/FluidDriveWrapperStorageDisk.java

@@ -17,8 +17,8 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 
 public class FluidDriveWrapperStorageDisk implements IStorageDisk<FluidStack> {
-    private DiskDriveNetworkNode diskDrive;
-    private IStorageDisk<FluidStack> parent;
+    private final DiskDriveNetworkNode diskDrive;
+    private final IStorageDisk<FluidStack> parent;
     private DiskState lastState;
 
     public FluidDriveWrapperStorageDisk(DiskDriveNetworkNode diskDrive, IStorageDisk<FluidStack> parent) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskdrive/ItemDriveWrapperStorageDisk.java

@@ -17,8 +17,8 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 
 public class ItemDriveWrapperStorageDisk implements IStorageDisk<ItemStack> {
-    private DiskDriveNetworkNode diskDrive;
-    private IStorageDisk<ItemStack> parent;
+    private final DiskDriveNetworkNode diskDrive;
+    private final IStorageDisk<ItemStack> parent;
     private DiskState lastState;
 
     public ItemDriveWrapperStorageDisk(DiskDriveNetworkNode diskDrive, IStorageDisk<ItemStack> parent) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/DiskManipulatorNetworkNode.java

@@ -56,10 +56,10 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
     private int type = IType.ITEMS;
     private int ioMode = IO_MODE_INSERT;
 
-    private IStorageDisk<ItemStack>[] itemDisks = new IStorageDisk[6];
-    private IStorageDisk<FluidStack>[] fluidDisks = new IStorageDisk[6];
+    private final IStorageDisk<ItemStack>[] itemDisks = new IStorageDisk[6];
+    private final IStorageDisk<FluidStack>[] fluidDisks = new IStorageDisk[6];
 
-    private UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK) {
+    private final UpgradeItemHandler upgrades = (UpgradeItemHandler) new UpgradeItemHandler(4, UpgradeItem.Type.SPEED, UpgradeItem.Type.STACK) {
         @Override
         public int getStackInteractCount() {
             int count = super.getStackInteractCount();
@@ -72,7 +72,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
         }
     }.addListener(new NetworkNodeInventoryListener(this));
 
-    private BaseItemHandler inputDisks = new BaseItemHandler(3)
+    private final BaseItemHandler inputDisks = new BaseItemHandler(3)
         .addValidator(new StorageDiskItemValidator())
         .addListener(new NetworkNodeInventoryListener(this))
         .addListener((handler, slot, reading) -> {
@@ -93,7 +93,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
             }
         });
 
-    private BaseItemHandler outputDisks = new BaseItemHandler(3)
+    private final BaseItemHandler outputDisks = new BaseItemHandler(3)
         .addValidator(new StorageDiskItemValidator())
         .addListener(new NetworkNodeInventoryListener(this))
         .addListener(((handler, slot, reading) -> {
@@ -114,10 +114,10 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
             }
         }));
 
-    private ProxyItemHandler disks = new ProxyItemHandler(inputDisks, outputDisks);
+    private final ProxyItemHandler disks = new ProxyItemHandler(inputDisks, outputDisks);
 
-    private BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
-    private FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final BaseItemHandler itemFilters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final FluidInventory fluidFilters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
 
     public DiskManipulatorNetworkNode(World world, BlockPos pos) {
         super(world, pos);
@@ -149,7 +149,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
             IStorageDisk<ItemStack> storage = itemDisks[slot];
 
             if (ioMode == IO_MODE_INSERT) {
-                insertItemIntoNetwork(storage, slot);
+                insertItemIntoNetwork(storage);
             } else if (ioMode == IO_MODE_EXTRACT) {
                 extractItemFromNetwork(storage, slot);
             }
@@ -172,8 +172,9 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
         }
     }
 
-    private void insertItemIntoNetwork(IStorageDisk<ItemStack> storage, int slot) {
+    private void insertItemIntoNetwork(IStorageDisk<ItemStack> storage) {
         List<ItemStack> stacks = new ArrayList<>(storage.getStacks());
+
         for (int i = 0; i < stacks.size(); ++i) {
             ItemStack stack = stacks.get(i);
 
@@ -209,6 +210,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
             }
 
         List<ItemStack> stacks = new ArrayList<>(storage.getStacks());
+
         for (int i = 0; i < stacks.size(); ++i) {
             ItemStack stack = stacks.get(i);
 
@@ -222,6 +224,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
                 return false;
             }
         }
+
         return true;
     }
 
@@ -304,6 +307,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
             }
 
         List<FluidStack> stacks = new ArrayList<>(storage.getStacks());
+
         for (int i = 0; i < stacks.size(); ++i) {
             FluidStack stack = stacks.get(i);
 
@@ -317,6 +321,7 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
                 return false;
             }
         }
+
         return true;
     }
 
@@ -465,14 +470,6 @@ public class DiskManipulatorNetworkNode extends NetworkNode implements IComparab
         return upgrades;
     }
 
-    public IStorageDisk[] getItemDisks() {
-        return itemDisks;
-    }
-
-    public IStorageDisk[] getFluidDisks() {
-        return fluidDisks;
-    }
-
     @Override
     public void read(CompoundNBT tag) {
         super.read(tag);

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskFluidManipulatorWrapper.java

@@ -18,8 +18,8 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 
 public class StorageDiskFluidManipulatorWrapper implements IStorageDisk<FluidStack> {
-    private DiskManipulatorNetworkNode diskManipulator;
-    private IStorageDisk<FluidStack> parent;
+    private final DiskManipulatorNetworkNode diskManipulator;
+    private final IStorageDisk<FluidStack> parent;
     private DiskState lastState;
 
     public StorageDiskFluidManipulatorWrapper(DiskManipulatorNetworkNode diskManipulator, IStorageDisk<FluidStack> parent) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/diskmanipulator/StorageDiskItemManipulatorWrapper.java

@@ -18,8 +18,8 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 
 public class StorageDiskItemManipulatorWrapper implements IStorageDisk<ItemStack> {
-    private DiskManipulatorNetworkNode diskManipulator;
-    private IStorageDisk<ItemStack> parent;
+    private final DiskManipulatorNetworkNode diskManipulator;
+    private final IStorageDisk<ItemStack> parent;
     private DiskState lastState;
 
     public StorageDiskItemManipulatorWrapper(DiskManipulatorNetworkNode diskManipulator, IStorageDisk<ItemStack> parent) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageNetworkNode.java

@@ -22,7 +22,6 @@ import com.refinedmods.refinedstorage.tile.config.IAccessType;
 import com.refinedmods.refinedstorage.tile.config.IComparable;
 import com.refinedmods.refinedstorage.tile.config.IPrioritizable;
 import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
-import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
 import com.refinedmods.refinedstorage.util.AccessTypeUtils;
 import com.refinedmods.refinedstorage.util.FluidStorageBlockUtils;
 import net.minecraft.item.ItemStack;
@@ -55,9 +54,9 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre
     private static final String NBT_FILTERS = "Filters";
     public static final String NBT_ID = "Id";
 
-    private FluidInventory filters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
+    private final FluidInventory filters = new FluidInventory(9).addListener(new NetworkNodeFluidInventoryListener(this));
 
-    private FluidStorageType type;
+    private final FluidStorageType type;
 
     private AccessType accessType = AccessType.INSERT_EXTRACT;
     private int priority = 0;
@@ -234,36 +233,6 @@ public class FluidStorageNetworkNode extends NetworkNode implements IStorageScre
         return new TranslationTextComponent("block.refinedstorage." + type.getName() + "_fluid_storage_block");
     }
 
-    @Override
-    public TileDataParameter<Integer, ?> getTypeParameter() {
-        return null;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getRedstoneModeParameter() {
-        return FluidStorageTile.REDSTONE_MODE;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getCompareParameter() {
-        return FluidStorageTile.COMPARE;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getWhitelistBlacklistParameter() {
-        return FluidStorageTile.WHITELIST_BLACKLIST;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getPriorityParameter() {
-        return FluidStorageTile.PRIORITY;
-    }
-
-    @Override
-    public TileDataParameter<AccessType, ?> getAccessTypeParameter() {
-        return FluidStorageTile.ACCESS_TYPE;
-    }
-
     @Override
     public long getStored() {
         return FluidStorageTile.STORED.getValue();

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/FluidStorageWrapperStorageDisk.java

@@ -16,8 +16,8 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 
 public class FluidStorageWrapperStorageDisk implements IStorageDisk<FluidStack> {
-    private FluidStorageNetworkNode storage;
-    private IStorageDisk<FluidStack> parent;
+    private final FluidStorageNetworkNode storage;
+    private final IStorageDisk<FluidStack> parent;
 
     public FluidStorageWrapperStorageDisk(FluidStorageNetworkNode storage, IStorageDisk<FluidStack> parent) {
         this.storage = storage;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/ItemStorageWrapperStorageDisk.java

@@ -16,8 +16,8 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 
 public class ItemStorageWrapperStorageDisk implements IStorageDisk<ItemStack> {
-    private StorageNetworkNode storage;
-    private IStorageDisk<ItemStack> parent;
+    private final StorageNetworkNode storage;
+    private final IStorageDisk<ItemStack> parent;
 
     public ItemStorageWrapperStorageDisk(StorageNetworkNode storage, IStorageDisk<ItemStack> parent) {
         this.storage = storage;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/storage/StorageNetworkNode.java

@@ -22,7 +22,6 @@ import com.refinedmods.refinedstorage.tile.config.IAccessType;
 import com.refinedmods.refinedstorage.tile.config.IComparable;
 import com.refinedmods.refinedstorage.tile.config.IPrioritizable;
 import com.refinedmods.refinedstorage.tile.config.IWhitelistBlacklist;
-import com.refinedmods.refinedstorage.tile.data.TileDataParameter;
 import com.refinedmods.refinedstorage.util.AccessTypeUtils;
 import com.refinedmods.refinedstorage.util.StackUtils;
 import com.refinedmods.refinedstorage.util.StorageBlockUtils;
@@ -55,7 +54,7 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I
     private static final String NBT_MODE = "Mode";
     public static final String NBT_ID = "Id";
 
-    private BaseItemHandler filters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
+    private final BaseItemHandler filters = new BaseItemHandler(9).addListener(new NetworkNodeInventoryListener(this));
 
     private final ItemStorageType type;
 
@@ -233,36 +232,6 @@ public class StorageNetworkNode extends NetworkNode implements IStorageScreen, I
         return new TranslationTextComponent("block.refinedstorage." + type.getName() + "_storage_block");
     }
 
-    @Override
-    public TileDataParameter<Integer, ?> getTypeParameter() {
-        return null;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getRedstoneModeParameter() {
-        return StorageTile.REDSTONE_MODE;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getCompareParameter() {
-        return StorageTile.COMPARE;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getWhitelistBlacklistParameter() {
-        return StorageTile.WHITELIST_BLACKLIST;
-    }
-
-    @Override
-    public TileDataParameter<Integer, ?> getPriorityParameter() {
-        return StorageTile.PRIORITY;
-    }
-
-    @Override
-    public TileDataParameter<AccessType, ?> getAccessTypeParameter() {
-        return StorageTile.ACCESS_TYPE;
-    }
-
     @Override
     public long getStored() {
         return StorageTile.STORED.getValue();

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityCard.java

@@ -9,8 +9,8 @@ import java.util.Map;
 import java.util.UUID;
 
 public class SecurityCard implements ISecurityCard {
-    private UUID owner;
-    private Map<Permission, Boolean> permissions = new HashMap<>();
+    private final UUID owner;
+    private final Map<Permission, Boolean> permissions = new HashMap<>();
 
     public SecurityCard(@Nullable UUID owner) {
         this.owner = owner;

src/main/java/com/refinedmods/refinedstorage/apiimpl/network/security/SecurityManager.java

@@ -14,8 +14,8 @@ import java.util.Map;
 import java.util.UUID;
 
 public class SecurityManager implements ISecurityManager {
-    private INetwork network;
-    private Map<UUID, ISecurityCard> cards = new HashMap<>();
+    private final INetwork network;
+    private final Map<UUID, ISecurityCard> cards = new HashMap<>();
     private ISecurityCard globalCard;
 
     public SecurityManager(INetwork network) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingMonitorElementDrawers.java

@@ -3,6 +3,7 @@ package com.refinedmods.refinedstorage.apiimpl.render;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.refinedmods.refinedstorage.RS;
 import com.refinedmods.refinedstorage.api.render.IElementDrawer;
+import com.refinedmods.refinedstorage.container.CraftingMonitorContainer;
 import com.refinedmods.refinedstorage.screen.BaseScreen;
 import net.minecraft.client.gui.AbstractGui;
 import net.minecraft.client.gui.FontRenderer;
@@ -11,14 +12,14 @@ public class CraftingMonitorElementDrawers extends ElementDrawers {
     private int itemWidth;
     private int itemHeight;
 
-    private IElementDrawer<Integer> overlayDrawer = (x, y, color) -> {
+    private final IElementDrawer<Integer> overlayDrawer = (x, y, color) -> {
         RenderSystem.color4f(1, 1, 1, 1);
         RenderSystem.disableLighting();
 
         AbstractGui.fill(x, y, x + itemWidth, y + itemHeight, color);
     };
 
-    private IElementDrawer errorDrawer = (x, y, nothing) -> {
+    private final IElementDrawer<?> errorDrawer = (x, y, nothing) -> {
         RenderSystem.color4f(1, 1, 1, 1);
         RenderSystem.disableLighting();
 
@@ -26,7 +27,7 @@ public class CraftingMonitorElementDrawers extends ElementDrawers {
         screen.blit(x + itemWidth - 12 - 2, y + itemHeight - 12 - 2, 0, 244, 12, 12);
     };
 
-    public CraftingMonitorElementDrawers(BaseScreen gui, FontRenderer fontRenderer, int itemWidth, int itemHeight) {
+    public CraftingMonitorElementDrawers(BaseScreen<CraftingMonitorContainer> gui, FontRenderer fontRenderer, int itemWidth, int itemHeight) {
         super(gui, fontRenderer);
 
         this.itemWidth = itemWidth;
@@ -39,7 +40,7 @@ public class CraftingMonitorElementDrawers extends ElementDrawers {
     }
 
     @Override
-    public IElementDrawer getErrorDrawer() {
+    public IElementDrawer<?> getErrorDrawer() {
         return errorDrawer;
     }
 }

src/main/java/com/refinedmods/refinedstorage/apiimpl/render/CraftingPreviewElementDrawers.java

@@ -3,21 +3,19 @@ package com.refinedmods.refinedstorage.apiimpl.render;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.refinedmods.refinedstorage.api.render.IElementDrawer;
 import com.refinedmods.refinedstorage.screen.grid.CraftingPreviewScreen;
+import net.minecraft.client.gui.AbstractGui;
 import net.minecraft.client.gui.FontRenderer;
 
 public class CraftingPreviewElementDrawers extends ElementDrawers {
-    private CraftingPreviewScreen screen;
-    private IElementDrawer<Integer> overlayDrawer = (x, y, colour) -> {
+    private final IElementDrawer<Integer> overlayDrawer = (x, y, colour) -> {
         RenderSystem.color4f(1, 1, 1, 1);
         RenderSystem.disableLighting();
 
-        screen.fill(x, y, x + 73, y + 29, colour);
+        AbstractGui.fill(x, y, x + 73, y + 29, colour);
     };
 
     public CraftingPreviewElementDrawers(CraftingPreviewScreen screen, FontRenderer fontRenderer) {
         super(screen, fontRenderer);
-
-        this.screen = screen;
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/render/ElementDrawers.java

@@ -9,8 +9,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 public class ElementDrawers implements IElementDrawers {
-    protected BaseScreen screen;
-    private FontRenderer fontRenderer;
+    protected final BaseScreen screen;
+    private final FontRenderer fontRenderer;
 
     public ElementDrawers(BaseScreen screen, FontRenderer fontRenderer) {
         this.screen = screen;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/FluidStorageType.java

@@ -7,8 +7,8 @@ public enum FluidStorageType {
     FOUR_THOUSAND_NINETY_SIX_K("4096k", 4096_000),
     CREATIVE("creative", -1);
 
-    private String name;
-    private int capacity;
+    private final String name;
+    private final int capacity;
 
     FluidStorageType(String name, int capacity) {
         this.name = name;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/ItemStorageType.java

@@ -7,8 +7,8 @@ public enum ItemStorageType {
     SIXTY_FOUR_K("64k", 64_000),
     CREATIVE("creative", -1);
 
-    private String name;
-    private int capacity;
+    private final String name;
+    private final int capacity;
 
     ItemStorageType(String name, int capacity) {
         this.name = name;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableFluidStorageCache.java

@@ -16,9 +16,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 public class PortableFluidStorageCache implements IStorageCache<FluidStack> {
-    private IPortableGrid portableGrid;
-    private IStackList<FluidStack> list = API.instance().createFluidStackList();
-    private List<IStorageCacheListener<FluidStack>> listeners = new LinkedList<>();
+    private final IPortableGrid portableGrid;
+    private final IStackList<FluidStack> list = API.instance().createFluidStackList();
+    private final List<IStorageCacheListener<FluidStack>> listeners = new LinkedList<>();
 
     public PortableFluidStorageCache(IPortableGrid portableGrid) {
         this.portableGrid = portableGrid;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/PortableItemStorageCache.java

@@ -16,9 +16,9 @@ import java.util.LinkedList;
 import java.util.List;
 
 public class PortableItemStorageCache implements IStorageCache<ItemStack> {
-    private IPortableGrid portableGrid;
-    private IStackList<ItemStack> list = API.instance().createItemStackList();
-    private List<IStorageCacheListener<ItemStack>> listeners = new LinkedList<>();
+    private final IPortableGrid portableGrid;
+    private final IStackList<ItemStack> list = API.instance().createItemStackList();
+    private final List<IStorageCacheListener<ItemStack>> listeners = new LinkedList<>();
 
     public PortableItemStorageCache(IPortableGrid portableGrid) {
         this.portableGrid = portableGrid;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/FluidGridStorageCacheListener.java

@@ -14,8 +14,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class FluidGridStorageCacheListener implements IStorageCacheListener<FluidStack> {
-    private ServerPlayerEntity player;
-    private INetwork network;
+    private final ServerPlayerEntity player;
+    private final INetwork network;
 
     public FluidGridStorageCacheListener(ServerPlayerEntity player, INetwork network) {
         this.player = player;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/ItemGridStorageCacheListener.java

@@ -14,8 +14,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ItemGridStorageCacheListener implements IStorageCacheListener<ItemStack> {
-    private ServerPlayerEntity player;
-    private INetwork network;
+    private final ServerPlayerEntity player;
+    private final INetwork network;
 
     public ItemGridStorageCacheListener(ServerPlayerEntity player, INetwork network) {
         this.player = player;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableFluidGridStorageCacheListener.java

@@ -13,8 +13,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PortableFluidGridStorageCacheListener implements IStorageCacheListener<FluidStack> {
-    private IPortableGrid portableGrid;
-    private ServerPlayerEntity player;
+    private final IPortableGrid portableGrid;
+    private final ServerPlayerEntity player;
 
     public PortableFluidGridStorageCacheListener(IPortableGrid portableGrid, ServerPlayerEntity player) {
         this.portableGrid = portableGrid;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/cache/listener/PortableItemGridStorageCacheListener.java

@@ -13,8 +13,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PortableItemGridStorageCacheListener implements IStorageCacheListener<ItemStack> {
-    private IPortableGrid portableGrid;
-    private ServerPlayerEntity player;
+    private final IPortableGrid portableGrid;
+    private final ServerPlayerEntity player;
 
     public PortableItemGridStorageCacheListener(IPortableGrid portableGrid, ServerPlayerEntity player) {
         this.portableGrid = portableGrid;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/FluidStorageDisk.java

@@ -28,9 +28,9 @@ public class FluidStorageDisk implements IStorageDisk<FluidStack> {
     public static final int VERSION = 1;
 
     @Nullable
-    private ServerWorld world;
-    private int capacity;
-    private Multimap<Fluid, FluidStack> stacks = ArrayListMultimap.create();
+    private final ServerWorld world;
+    private final int capacity;
+    private final Multimap<Fluid, FluidStack> stacks = ArrayListMultimap.create();
 
     @Nullable
     private IStorageDiskListener listener;
@@ -155,7 +155,7 @@ public class FluidStorageDisk implements IStorageDisk<FluidStack> {
 
     @Override
     public int getStored() {
-        return stacks.values().stream().mapToInt(s -> s.getAmount()).sum();
+        return stacks.values().stream().mapToInt(FluidStack::getAmount).sum();
     }
 
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/ItemStorageDisk.java

@@ -29,9 +29,9 @@ public class ItemStorageDisk implements IStorageDisk<ItemStack> {
     public static final int VERSION = 1;
 
     @Nullable
-    private ServerWorld world;
-    private int capacity;
-    private Multimap<Item, ItemStack> stacks = ArrayListMultimap.create();
+    private final ServerWorld world;
+    private final int capacity;
+    private final Multimap<Item, ItemStack> stacks = ArrayListMultimap.create();
 
     @Nullable
     private IStorageDiskListener listener;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableFluidStorageDisk.java

@@ -15,8 +15,8 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 
 public class PortableFluidStorageDisk implements IStorageDisk<FluidStack> {
-    private IStorageDisk<FluidStack> parent;
-    private IPortableGrid portableGrid;
+    private final IStorageDisk<FluidStack> parent;
+    private final IPortableGrid portableGrid;
 
     public PortableFluidStorageDisk(IStorageDisk<FluidStack> parent, IPortableGrid portableGrid) {
         this.parent = parent;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/PortableItemStorageDisk.java

@@ -15,8 +15,8 @@ import javax.annotation.Nullable;
 import java.util.Collection;
 
 public class PortableItemStorageDisk implements IStorageDisk<ItemStack> {
-    private IStorageDisk<ItemStack> parent;
-    private IPortableGrid portableGrid;
+    private final IStorageDisk<ItemStack> parent;
+    private final IPortableGrid portableGrid;
 
     public PortableItemStorageDisk(IStorageDisk<ItemStack> parent, IPortableGrid portableGrid) {
         this.parent = parent;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskRegistry.java

@@ -9,7 +9,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class StorageDiskRegistry implements IStorageDiskRegistry {
-    private Map<ResourceLocation, IStorageDiskFactory> factories = new HashMap<>();
+    private final Map<ResourceLocation, IStorageDiskFactory> factories = new HashMap<>();
 
     @Override
     public void add(ResourceLocation id, IStorageDiskFactory factory) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/disk/StorageDiskSync.java

@@ -13,8 +13,8 @@ import java.util.UUID;
 public class StorageDiskSync implements IStorageDiskSync {
     private static final int THROTTLE_MS = 500;
 
-    private Map<UUID, StorageDiskSyncData> data = new HashMap<>();
-    private Map<UUID, Long> syncTime = new HashMap<>();
+    private final Map<UUID, StorageDiskSyncData> data = new HashMap<>();
+    private final Map<UUID, Long> syncTime = new HashMap<>();
 
     @Nullable
     @Override

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorage.java

@@ -18,10 +18,10 @@ import java.util.List;
 import java.util.function.Supplier;
 
 public class FluidExternalStorage implements IExternalStorage<FluidStack> {
-    private IExternalStorageContext context;
-    private Supplier<IFluidHandler> handlerSupplier;
-    private boolean connectedToInterface;
-    private FluidExternalStorageCache cache = new FluidExternalStorageCache();
+    private final IExternalStorageContext context;
+    private final Supplier<IFluidHandler> handlerSupplier;
+    private final boolean connectedToInterface;
+    private final FluidExternalStorageCache cache = new FluidExternalStorageCache();
 
     public FluidExternalStorage(IExternalStorageContext context, Supplier<IFluidHandler> handlerSupplier, boolean connectedToInterface) {
         this.context = context;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/externalstorage/ItemExternalStorage.java

@@ -19,10 +19,10 @@ import java.util.List;
 import java.util.function.Supplier;
 
 public class ItemExternalStorage implements IExternalStorage<ItemStack> {
-    private IExternalStorageContext context;
-    private Supplier<IItemHandler> handlerSupplier;
-    private boolean connectedToInterface;
-    private ItemExternalStorageCache cache = new ItemExternalStorageCache();
+    private final IExternalStorageContext context;
+    private final Supplier<IItemHandler> handlerSupplier;
+    private final boolean connectedToInterface;
+    private final ItemExternalStorageCache cache = new ItemExternalStorageCache();
 
     public ItemExternalStorage(IExternalStorageContext context, Supplier<IItemHandler> handlerSupplier, boolean connectedToInterface) {
         this.context = context;

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/FluidStorageTracker.java

@@ -64,7 +64,7 @@ public class FluidStorageTracker implements IStorageTracker<FluidStack> {
         return list;
     }
 
-    private class Key {
+    private static class Key {
         private final FluidStack stack;
 
         public Key(FluidStack stack) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/storage/tracker/ItemStorageTracker.java

@@ -64,7 +64,7 @@ public class ItemStorageTracker implements IStorageTracker<ItemStack> {
         return list;
     }
 
-    private class Key {
+    private static class Key {
         private final ItemStack stack;
 
         public Key(ItemStack stack) {

src/main/java/com/refinedmods/refinedstorage/apiimpl/util/FluidFilter.java

@@ -4,10 +4,10 @@ import com.refinedmods.refinedstorage.api.util.IFilter;
 import net.minecraftforge.fluids.FluidStack;
 
 public class FluidFilter implements IFilter<FluidStack> {
-    private FluidStack stack;
-    private int compare;
-    private int mode;
-    private boolean modFilter;
+    private final FluidStack stack;
+    private final int compare;
+    private final int mode;
+    private final boolean modFilter;
 
     public FluidFilter(FluidStack stack, int compare, int mode, boolean modFilter) {
         this.stack = stack;

src/main/java/com/refinedmods/refinedstorage/apiimpl/util/ItemFilter.java

@@ -4,10 +4,10 @@ import com.refinedmods.refinedstorage.api.util.IFilter;
 import net.minecraft.item.ItemStack;
 
 public class ItemFilter implements IFilter<ItemStack> {
-    private ItemStack stack;
-    private int compare;
-    private int mode;
-    private boolean modFilter;
+    private final ItemStack stack;
+    private final int compare;
+    private final int mode;
+    private final boolean modFilter;
 
     public ItemFilter(ItemStack stack, int compare, int mode, boolean modFilter) {
         this.stack = stack;