diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java
index 5cf478df..ddcb2fe9 100644
--- a/src/main/java/codechicken/nei/BookmarkPanel.java
+++ b/src/main/java/codechicken/nei/BookmarkPanel.java
@@ -4,18 +4,6 @@ import static codechicken.lib.gui.GuiDraw.drawRect;
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 import static codechicken.nei.NEIClientUtils.translate;
 
-import codechicken.core.CommonUtils;
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemPanel.ItemPanelSlot;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.BookmarkRecipeId;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.NBTJson;
-import codechicken.nei.util.ReadableNumberConverter;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSyntaxException;
 import java.awt.Point;
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,14 +13,31 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+
 import javax.annotation.Nullable;
+
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+
 import org.apache.commons.io.IOUtils;
 import org.lwjgl.opengl.GL11;
 
+import codechicken.core.CommonUtils;
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemPanel.ItemPanelSlot;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.BookmarkRecipeId;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.util.NBTJson;
+import codechicken.nei.util.ReadableNumberConverter;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSyntaxException;
+
 public class BookmarkPanel extends PanelWidget {
 
     protected File bookmarkFile;
@@ -48,6 +53,7 @@ public class BookmarkPanel extends PanelWidget {
     protected int activeNamespaceIndex = 0;
 
     protected static class BookmarkStackMeta {
+
         public int factor;
         public BookmarkRecipeId recipeId;
         public boolean ingredient = false;
@@ -172,11 +178,8 @@ public class BookmarkPanel extends PanelWidget {
                     } else {
                         meta = getMetadata(idx);
 
-                        if (idx > 0
-                                && ((i % columns) == 0)
-                                        == (meta.recipeId != null
-                                                && meta.ingredient
-                                                && meta.recipeId.equals(getRecipeId(idx - 1)))) {
+                        if (idx > 0 && ((i % columns) == 0) == (meta.recipeId != null && meta.ingredient
+                                && meta.recipeId.equals(getRecipeId(idx - 1)))) {
                             pmask.add(null);
                         } else {
                             pmask.add(idx++);
@@ -207,7 +210,7 @@ public class BookmarkPanel extends PanelWidget {
             for (int idx = 0; idx < realItems.size(); idx++) {
                 final BookmarkStackMeta meta = getMetadata(idx);
                 if ((recipeId == null && meta.recipeId == null
-                                || recipeId != null && meta.recipeId != null && recipeId.equals(meta.recipeId))
+                        || recipeId != null && meta.recipeId != null && recipeId.equals(meta.recipeId))
                         && StackInfo.equalItemAndNBT(stackA, getItem(idx), useNBT)) {
                     return idx;
                 }
@@ -293,8 +296,7 @@ public class BookmarkPanel extends PanelWidget {
         }
 
         private boolean isPartOfFocusedRecipe(ItemPanelSlot focused, int myIdx) {
-            return NEIClientUtils.shiftKey()
-                    && focused != null
+            return NEIClientUtils.shiftKey() && focused != null
                     && LayoutManager.bookmarkPanel.sortedStackIndex == -1
                     && getRecipeId(focused.slotIndex) != null
                     && getRecipeId(myIdx) != null
@@ -310,12 +312,8 @@ public class BookmarkPanel extends PanelWidget {
             } else if (focus != null) {
                 BookmarkStackMeta meta = getMetadata(idx);
                 if (isPartOfFocusedRecipe(focus, idx)) {
-                    drawRect(
-                            rect.x,
-                            rect.y,
-                            rect.w,
-                            rect.h,
-                            meta.ingredient ? 0x88b3b300 : 0x88009933); // highlight recipe
+                    drawRect(rect.x, rect.y, rect.w, rect.h, meta.ingredient ? 0x88b3b300 : 0x88009933); // highlight
+                                                                                                         // recipe
                 } else if (focus.slotIndex == idx) {
                     drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555); // highlight
                 }
@@ -328,8 +326,7 @@ public class BookmarkPanel extends PanelWidget {
                     || LayoutManager.bookmarkPanel.sortedStackIndex != idx) {
                 final ItemStack stack = getItem(idx);
                 final BookmarkStackMeta meta = getMetadata(idx);
-                final String stackSize = meta.factor < 0 || meta.fluidDisplay
-                        ? ""
+                final String stackSize = meta.factor < 0 || meta.fluidDisplay ? ""
                         : ReadableNumberConverter.INSTANCE.toWideReadableForm(stack.stackSize);
                 if (animation.containsKey(stack) && animation.get(stack) < 1) {
                     final float currentScale = animation.get(stack) + SCALE_SPEED;
@@ -384,6 +381,7 @@ public class BookmarkPanel extends PanelWidget {
         namespaceLabel = new Label("1", true);
 
         namespacePrev = new Button("Prev") {
+
             public boolean onButtonPress(boolean rightclick) {
 
                 if (rightclick) {
@@ -400,6 +398,7 @@ public class BookmarkPanel extends PanelWidget {
         };
 
         namespaceNext = new Button("Next") {
+
             public boolean onButtonPress(boolean rightclick) {
                 if (rightclick) {
                     return false;
@@ -450,12 +449,8 @@ public class BookmarkPanel extends PanelWidget {
         addOrRemoveItem(stackA, null, null, false, false);
     }
 
-    public void addOrRemoveItem(
-            ItemStack stackover,
-            final String handlerName,
-            final List<PositionedStack> ingredients,
-            boolean saveIngredients,
-            boolean saveStackSize) {
+    public void addOrRemoveItem(ItemStack stackover, final String handlerName, final List<PositionedStack> ingredients,
+            boolean saveIngredients, boolean saveStackSize) {
         loadBookmarksIfNeeded();
 
         final Point mousePos = getMousePosition();
@@ -635,8 +630,7 @@ public class BookmarkPanel extends PanelWidget {
                     src.close();
                     dst.close();
 
-                } catch (IOException e) {
-                }
+                } catch (IOException e) {}
             }
         }
 
@@ -738,10 +732,8 @@ public class BookmarkPanel extends PanelWidget {
                     }
 
                     if (settings.get("viewmode") != null) {
-                        namespaces
-                                .get(namespaceIndex)
-                                .setViewMode(BookmarkViewMode.valueOf(
-                                        settings.get("viewmode").getAsString()));
+                        namespaces.get(namespaceIndex)
+                                .setViewMode(BookmarkViewMode.valueOf(settings.get("viewmode").getAsString()));
                     }
 
                     if (settings.get("active") != null && settings.get("active").getAsBoolean()) {
@@ -768,22 +760,14 @@ public class BookmarkPanel extends PanelWidget {
                 ItemStack itemStack = StackInfo.loadFromNBT(itemStackNBT);
 
                 if (itemStack != null) {
-                    namespaces
-                            .get(namespaceIndex)
-                            .addItem(
-                                    itemStack,
-                                    new BookmarkStackMeta(
-                                            recipeId,
-                                            jsonObject.has("factor")
-                                                    ? jsonObject.get("factor").getAsInt()
-                                                    : 0,
-                                            jsonObject.has("ingredient")
-                                                    ? jsonObject
-                                                            .get("ingredient")
-                                                            .getAsBoolean()
-                                                    : false,
-                                            itemStackNBT.hasKey("gtFluidName")),
-                                    false);
+                    namespaces.get(namespaceIndex).addItem(
+                            itemStack,
+                            new BookmarkStackMeta(
+                                    recipeId,
+                                    jsonObject.has("factor") ? jsonObject.get("factor").getAsInt() : 0,
+                                    jsonObject.has("ingredient") ? jsonObject.get("ingredient").getAsBoolean() : false,
+                                    itemStackNBT.hasKey("gtFluidName")),
+                            false);
                 } else {
                     NEIClientConfig.logger.warn(
                             "Failed to load bookmarked ItemStack from json string, the item no longer exists:\n{}",
@@ -947,8 +931,7 @@ public class BookmarkPanel extends PanelWidget {
                     } else if (sortedGrid.getViewMode() == BookmarkViewMode.TODO_LIST) {
                         final ItemStack stack = sortedGrid.getItem(sortedStackIndex);
                         final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
-                        final boolean isIngredient = sortedStackIndex > 0
-                                && meta.recipeId != null
+                        final boolean isIngredient = sortedStackIndex > 0 && meta.recipeId != null
                                 && meta.ingredient
                                 && meta.recipeId.equals(sortedGrid.getRecipeId(sortedStackIndex - 1));
 
@@ -960,13 +943,12 @@ public class BookmarkPanel extends PanelWidget {
                                 sortedStackIndex = sortedGrid.indexOf(stack, meta.recipeId);
                             }
 
-                        } else if (mouseOverSlot != null
-                                && meta.recipeId != null
+                        } else if (mouseOverSlot != null && meta.recipeId != null
                                 && sortedGrid.getMetadata(mouseOverSlot.slotIndex).ingredient
                                 && meta.recipeId.equals(sortedGrid.getRecipeId(mouseOverSlot.slotIndex))) {
-                            sortedGrid.moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
-                            sortedStackIndex = sortedGrid.indexOf(stack, meta.recipeId);
-                        }
+                                    sortedGrid.moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
+                                    sortedStackIndex = sortedGrid.indexOf(stack, meta.recipeId);
+                                }
                     }
                 }
             }
@@ -1005,10 +987,7 @@ public class BookmarkPanel extends PanelWidget {
             GuiContainerManager.drawItem(
                     mousex - 8,
                     mousey - 8,
-                    namespaces
-                            .get(sortedNamespaceIndex)
-                            .getItem(sortedStackIndex)
-                            .copy(),
+                    namespaces.get(sortedNamespaceIndex).getItem(sortedStackIndex).copy(),
                     true);
             GuiContainerManager.drawItems.zLevel -= 100;
         }
@@ -1074,11 +1053,10 @@ public class BookmarkPanel extends PanelWidget {
     public boolean onMouseWheel(int shift, int mousex, int mousey) {
 
         if (new Rectangle4i(
-                        namespacePrev.x,
-                        namespacePrev.y,
-                        namespaceNext.x + namespaceNext.w - namespacePrev.x,
-                        namespacePrev.h)
-                .contains(mousex, mousey)) {
+                namespacePrev.x,
+                namespacePrev.y,
+                namespaceNext.x + namespaceNext.w - namespacePrev.x,
+                namespacePrev.h).contains(mousex, mousey)) {
 
             if (shift > 0) {
                 prevNamespace();
diff --git a/src/main/java/codechicken/nei/Button.java b/src/main/java/codechicken/nei/Button.java
index a2651423..d4af7908 100644
--- a/src/main/java/codechicken/nei/Button.java
+++ b/src/main/java/codechicken/nei/Button.java
@@ -5,6 +5,7 @@ import static codechicken.lib.gui.GuiDraw.getStringWidth;
 import java.util.List;
 
 public abstract class Button extends Widget {
+
     public Button(String s) {
         label = s;
     }
@@ -60,10 +61,7 @@ public abstract class Button extends Widget {
     public Image icon;
 
     /**
-     * 0x4 = state flag, as opposed to 1 click
-     * 0 = normal
-     * 1 = on
-     * 2 = disabled
+     * 0x4 = state flag, as opposed to 1 click 0 = normal 1 = on 2 = disabled
      */
     public int state;
 }
diff --git a/src/main/java/codechicken/nei/ButtonCycled.java b/src/main/java/codechicken/nei/ButtonCycled.java
index d17d2590..34e4458d 100644
--- a/src/main/java/codechicken/nei/ButtonCycled.java
+++ b/src/main/java/codechicken/nei/ButtonCycled.java
@@ -1,6 +1,7 @@
 package codechicken.nei;
 
 public abstract class ButtonCycled extends Button {
+
     public ButtonCycled() {}
 
     public ButtonCycled(int num) {
diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java
index 4bc7e059..c3429a9a 100644
--- a/src/main/java/codechicken/nei/ClientHandler.java
+++ b/src/main/java/codechicken/nei/ClientHandler.java
@@ -1,19 +1,5 @@
 package codechicken.nei;
 
-import codechicken.core.ClientUtils;
-import codechicken.core.GuiModListScroll;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.nei.api.API;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.recipe.GuiRecipeTab;
-import codechicken.nei.recipe.StackInfo;
-import com.google.common.collect.Lists;
-import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -31,6 +17,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.FontRenderer;
@@ -44,32 +31,44 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
+
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 import org.apache.commons.io.IOUtils;
 
+import codechicken.core.ClientUtils;
+import codechicken.core.GuiModListScroll;
+import codechicken.lib.packet.PacketCustom;
+import codechicken.nei.api.API;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.StackInfo;
+
+import com.google.common.collect.Lists;
+
+import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.TickEvent;
+import cpw.mods.fml.common.gameevent.TickEvent.Phase;
+
 public class ClientHandler {
-    private static String[] defaultSerialHandlers = {"WayofTime.alchemicalWizardry.client.nei.NEIAlchemyRecipeHandler"};
-    private static String[] defaultHeightHackHandlerRegex = {
-        "buildcraft.compat.nei.*",
-        "cofh.thermalexpansion.plugins.nei.handlers.*",
-        "crazypants.enderio.nei.*",
-        "forestry.factory.recipes.nei.*",
-        "ic2.neiIntegration.core.recipehandler.*",
-        "mariculture.plugins.nei.*",
-        "redgear.brewcraft.plugins.nei.*",
-        "tconstruct.plugins.nei.*",
-        "WayofTime.alchemicalWizardry.client.nei.*",
-    };
+
+    private static String[] defaultSerialHandlers = {
+            "WayofTime.alchemicalWizardry.client.nei.NEIAlchemyRecipeHandler" };
+    private static String[] defaultHeightHackHandlerRegex = { "buildcraft.compat.nei.*",
+            "cofh.thermalexpansion.plugins.nei.handlers.*", "crazypants.enderio.nei.*",
+            "forestry.factory.recipes.nei.*", "ic2.neiIntegration.core.recipehandler.*", "mariculture.plugins.nei.*",
+            "redgear.brewcraft.plugins.nei.*", "tconstruct.plugins.nei.*",
+            "WayofTime.alchemicalWizardry.client.nei.*", };
     private static String[] defaultHandlerOrdering = {
-        "# Each line in this file should either be a comment (starts with '#') or an ordering.",
-        "# Ordering lines are <handler ID>,<ordering number>.",
-        "# Handlers will be sorted in order of number ascending, so smaller numbers first.",
-        "# Any handlers that are missing from this file will be assigned to 0.",
-        "# Negative numbers are fine.",
-        "# If you delete this file, it will be regenerated with all registered handler IDs.",
-    };
+            "# Each line in this file should either be a comment (starts with '#') or an ordering.",
+            "# Ordering lines are <handler ID>,<ordering number>.",
+            "# Handlers will be sorted in order of number ascending, so smaller numbers first.",
+            "# Any handlers that are missing from this file will be assigned to 0.", "# Negative numbers are fine.",
+            "# If you delete this file, it will be regenerated with all registered handler IDs.", };
     private static ClientHandler instance;
 
     private ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
@@ -100,9 +99,10 @@ public class ClientHandler {
             items = SMPmagneticItems;
         } else {
             items = world.getEntitiesWithinAABB(
-                    EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
+                    EntityItem.class,
+                    player.boundingBox.expand(distancexz, distancey, distancexz));
         }
-        for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext(); ) {
+        for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext();) {
             EntityItem item = iterator.next();
 
             if (item.delayBeforeCanPickup > 0) continue;
@@ -166,8 +166,7 @@ public class ClientHandler {
         if (!file.exists()) {
             try (FileWriter writer = new FileWriter(file)) {
                 NEIClientConfig.logger.info("Creating default serial handlers list {}", file);
-                Collection<String> toSave = Loader.isModLoaded("dreamcraft")
-                        ? Collections.singletonList("")
+                Collection<String> toSave = Loader.isModLoaded("dreamcraft") ? Collections.singletonList("")
                         : Arrays.asList(defaultSerialHandlers);
                 IOUtils.writeLines(toSave, "\n", writer);
             } catch (IOException e) {
@@ -196,8 +195,7 @@ public class ClientHandler {
 
         try (FileReader reader = new FileReader(file)) {
             NEIClientConfig.logger.info("Loading height hack handlers from file {}", file);
-            NEIClientConfig.heightHackHandlerRegex = IOUtils.readLines(reader).stream()
-                    .map(Pattern::compile)
+            NEIClientConfig.heightHackHandlerRegex = IOUtils.readLines(reader).stream().map(Pattern::compile)
                     .collect(Collectors.toCollection(HashSet::new));
         } catch (IOException e) {
             NEIClientConfig.logger.error("Failed to load height hack handlers from file {}", file, e);
@@ -228,8 +226,7 @@ public class ClientHandler {
                 NEIClientConfig.logger.info("Creating default handler ordering CSV {}", file);
 
                 List<String> toWrite = Lists.newArrayList(defaultHandlerOrdering);
-                GuiRecipeTab.handlerMap.keySet().stream()
-                        .sorted()
+                GuiRecipeTab.handlerMap.keySet().stream().sorted()
                         .forEach(handlerId -> toWrite.add(String.format("%s,0", handlerId)));
 
                 IOUtils.writeLines(toWrite, "\n", writer);
@@ -319,7 +316,7 @@ public class ClientHandler {
                 NEIClientConfig.setInternalEnabled(false);
 
                 if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer
-                NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
+                    NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
 
                 ItemMobSpawner.clearEntityReferences(world);
             }
@@ -334,6 +331,7 @@ public class ClientHandler {
 
     public static RuntimeException throwCME(final String message) {
         final GuiScreen errorGui = new GuiErrorScreen(null, null) {
+
             @Override
             public void handleMouseInput() {}
 
@@ -351,17 +349,14 @@ public class ClientHandler {
 
         @SuppressWarnings("serial")
         CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException() {
+
             @Override
             public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
                 Minecraft.getMinecraft().displayGuiScreen(errorGui);
             }
 
             @Override
-            public void drawScreen(
-                    GuiErrorScreen errorScreen,
-                    FontRenderer fontRenderer,
-                    int mouseRelX,
-                    int mouseRelY,
+            public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY,
                     float tickTime) {}
         };
         throw e;
diff --git a/src/main/java/codechicken/nei/ContainerCreativeInv.java b/src/main/java/codechicken/nei/ContainerCreativeInv.java
index a1a68148..44ab51be 100644
--- a/src/main/java/codechicken/nei/ContainerCreativeInv.java
+++ b/src/main/java/codechicken/nei/ContainerCreativeInv.java
@@ -1,7 +1,5 @@
 package codechicken.nei;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -11,8 +9,13 @@ import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class ContainerCreativeInv extends Container {
+
     private class SlotArmor extends Slot {
+
         final int armorType;
 
         public SlotArmor(IInventory inv, int x, int y, int slot, int armor) {
@@ -38,14 +41,15 @@ public class ContainerCreativeInv extends Container {
     }
 
     private class SlotBlockArmor extends SlotArmor {
+
         public SlotBlockArmor(IInventory inv, int x, int y, int slot, int armor) {
             super(inv, x, y, slot, armor);
         }
 
         @Override
         public boolean isItemValid(ItemStack stack) {
-            return super.isItemValid(stack)
-                    || stack != null; // && Block.getBlockFromItem(stack.getItem()) != Blocks.air;
+            return super.isItemValid(stack) || stack != null; // && Block.getBlockFromItem(stack.getItem()) !=
+                                                              // Blocks.air;
         }
     }
 
@@ -54,20 +58,22 @@ public class ContainerCreativeInv extends Container {
     public ContainerCreativeInv(EntityPlayer player, ExtendedCreativeInv extraInv) {
         this.player = player;
         InventoryPlayer invPlayer = player.inventory;
-        for (int row = 0; row < 6; row++)
-            for (int col = 0; col < 9; col++)
-                addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
+        for (int row = 0; row < 6; row++) for (int col = 0; col < 9; col++)
+            addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
 
-        for (int row = 0; row < 3; ++row)
-            for (int col = 0; col < 9; ++col)
-                addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
+        for (int row = 0; row < 3; ++row) for (int col = 0; col < 9; ++col)
+            addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
 
         for (int col = 0; col < 9; ++col) addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
 
         addSlotToContainer(new SlotBlockArmor(invPlayer, invPlayer.getSizeInventory() - 1, -15, 23, 0));
-        for (int armorType = 1; armorType < 4; armorType++)
-            addSlotToContainer(new SlotArmor(
-                    invPlayer, invPlayer.getSizeInventory() - 1 - armorType, -15, 23 + armorType * 18, armorType));
+        for (int armorType = 1; armorType < 4; armorType++) addSlotToContainer(
+                new SlotArmor(
+                        invPlayer,
+                        invPlayer.getSizeInventory() - 1 - armorType,
+                        -15,
+                        23 + armorType * 18,
+                        armorType));
     }
 
     @Override
diff --git a/src/main/java/codechicken/nei/ContainerEnchantmentModifier.java b/src/main/java/codechicken/nei/ContainerEnchantmentModifier.java
index e970e7fa..b7823a97 100644
--- a/src/main/java/codechicken/nei/ContainerEnchantmentModifier.java
+++ b/src/main/java/codechicken/nei/ContainerEnchantmentModifier.java
@@ -1,7 +1,7 @@
 package codechicken.nei;
 
-import codechicken.lib.render.CCRenderState;
 import java.util.ArrayList;
+
 import net.minecraft.client.gui.Gui;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayer;
@@ -13,13 +13,18 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
+
 import org.lwjgl.opengl.GL11;
 
+import codechicken.lib.render.CCRenderState;
+
 /**
  * This is crap code, don't ever do this.
  */
 public class ContainerEnchantmentModifier extends ContainerEnchantment {
+
     public static class EnchantmentHash {
+
         public EnchantmentHash(Enchantment e, int i, int l) {
             enchantment = e;
             state = i;
@@ -101,9 +106,7 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
         int barempty = height - getScrollBarHeight();
         int sbary = rely + (int) (barempty * percentscrolled + 0.5);
 
-        if (button == 0
-                && getScrollBarHeight() < height
-                && // the scroll bar can move (not full length)
+        if (button == 0 && getScrollBarHeight() < height && // the scroll bar can move (not full length)
                 mousex >= relx + cwidth
                 && mousex < relx + cwidth + getScrollBarWidth()
                 && mousey >= rely
@@ -217,10 +220,10 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
             if (NEIServerUtils.stackHasEnchantment(toolstack, e.effectId)) {
                 state = 2;
                 level = NEIServerUtils.getEnchantmentLevel(toolstack, e.effectId);
-            } else if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e)
-                    && validate) {
-                state = 1;
-            }
+            } else
+                if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e) && validate) {
+                    state = 1;
+                }
             slotEnchantment.add(new EnchantmentHash(e, state, level));
         }
         if (numoptions != slotEnchantment.size()) {
@@ -255,7 +258,12 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
             GL11.glColor3f(1, 1, 1);
             if (hasScrollBar()) {
                 gui.drawTexturedModalRect(
-                        relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth - 30, slotheight);
+                        relx,
+                        rely + slot * slotheight,
+                        0,
+                        gui.ySize + slotheight * shade,
+                        cwidth - 30,
+                        slotheight);
                 gui.drawTexturedModalRect(
                         relx + cwidth - 30,
                         rely + slot * slotheight,
@@ -265,7 +273,12 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
                         slotheight);
             } else {
                 gui.drawTexturedModalRect(
-                        relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth + 7, slotheight);
+                        relx,
+                        rely + slot * slotheight,
+                        0,
+                        gui.ySize + slotheight * shade,
+                        cwidth + 7,
+                        slotheight);
             }
 
             gui.getFontRenderer().drawString(text, relx + 4, rely + slot * slotheight + 5, textColourFromState(shade));
@@ -284,12 +297,8 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
 
         Gui.drawRect(sbarx, rely, sbarx + getScrollBarWidth(), rely + height, 0xFF202020); // background
         Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth(), sbary + getScrollBarHeight(), 0xFF8B8B8B); // corners
-        Gui.drawRect(
-                sbarx,
-                sbary,
-                sbarx + getScrollBarWidth() - 1,
-                sbary + getScrollBarHeight() - 1,
-                0xFFF0F0F0); // topleft up
+        Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth() - 1, sbary + getScrollBarHeight() - 1, 0xFFF0F0F0); // topleft
+                                                                                                                   // up
         Gui.drawRect(
                 sbarx + 1,
                 sbary + 1,
diff --git a/src/main/java/codechicken/nei/ContainerPotionCreator.java b/src/main/java/codechicken/nei/ContainerPotionCreator.java
index 5129f34a..3f7afd0b 100644
--- a/src/main/java/codechicken/nei/ContainerPotionCreator.java
+++ b/src/main/java/codechicken/nei/ContainerPotionCreator.java
@@ -1,10 +1,5 @@
 package codechicken.nei;
 
-import codechicken.lib.inventory.ContainerExtended;
-import codechicken.lib.inventory.InventoryNBT;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.inventory.SlotHandleClicks;
-import codechicken.lib.packet.PacketCustom;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.IInventory;
@@ -16,8 +11,16 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.potion.PotionEffect;
 
+import codechicken.lib.inventory.ContainerExtended;
+import codechicken.lib.inventory.InventoryNBT;
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.inventory.SlotHandleClicks;
+import codechicken.lib.packet.PacketCustom;
+
 public class ContainerPotionCreator extends ContainerExtended {
+
     public class SlotPotion extends Slot {
+
         public SlotPotion(IInventory inv, int slotIndex, int x, int y) {
             super(inv, slotIndex, x, y);
         }
@@ -40,6 +43,7 @@ public class ContainerPotionCreator extends ContainerExtended {
     }
 
     public class SlotPotionStore extends SlotHandleClicks {
+
         public SlotPotionStore(IInventory inv, int slotIndex, int x, int y) {
             super(inv, slotIndex, x, y);
         }
@@ -68,6 +72,7 @@ public class ContainerPotionCreator extends ContainerExtended {
     }
 
     public static class InventoryPotionStore extends InventoryNBT {
+
         public InventoryPotionStore() {
             super(9, NEIClientConfig.global.nbt.getCompoundTag("potionStore"));
         }
@@ -128,9 +133,9 @@ public class ContainerPotionCreator extends ContainerExtended {
             PotionEffect e = PotionEffect.readCustomPotionEffectFromNBT(tag);
             if (e.getPotionID() != effectID) newEffects.appendTag(tag);
         }
-        if (add)
-            newEffects.appendTag(new PotionEffect(effectID, packet.readInt(), packet.readUByte())
-                    .writeCustomPotionEffectToNBT(new NBTTagCompound()));
+        if (add) newEffects.appendTag(
+                new PotionEffect(effectID, packet.readInt(), packet.readUByte())
+                        .writeCustomPotionEffectToNBT(new NBTTagCompound()));
         potion.getTagCompound().setTag("CustomPotionEffects", newEffects);
     }
 
diff --git a/src/main/java/codechicken/nei/DefaultHighlightHandler.java b/src/main/java/codechicken/nei/DefaultHighlightHandler.java
index 9ea1e1a1..f24a7378 100644
--- a/src/main/java/codechicken/nei/DefaultHighlightHandler.java
+++ b/src/main/java/codechicken/nei/DefaultHighlightHandler.java
@@ -1,32 +1,29 @@
 package codechicken.nei;
 
-import codechicken.nei.api.IHighlightHandler;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.guihook.GuiContainerManager;
 import java.util.List;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
+import codechicken.nei.api.IHighlightHandler;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.guihook.GuiContainerManager;
+
 public class DefaultHighlightHandler implements IHighlightHandler {
+
     @Override
-    public List<String> handleTextData(
-            ItemStack stack,
-            World world,
-            EntityPlayer player,
-            MovingObjectPosition mop,
-            List<String> currenttip,
-            ItemInfo.Layout layout) {
+    public List<String> handleTextData(ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop,
+            List<String> currenttip, ItemInfo.Layout layout) {
         String name = null;
         try {
             String s = GuiContainerManager.itemDisplayNameShort(stack);
             if (s != null && !s.endsWith("Unnamed")) name = s;
 
             if (name != null) currenttip.add(name);
-        } catch (Exception ignored) {
-        }
+        } catch (Exception ignored) {}
 
         if (name != null && stack.getItem() == Items.redstone) {
             int md = world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ);
diff --git a/src/main/java/codechicken/nei/DoubleFilteredFilter.java b/src/main/java/codechicken/nei/DoubleFilteredFilter.java
index 46e72711..6663f02d 100644
--- a/src/main/java/codechicken/nei/DoubleFilteredFilter.java
+++ b/src/main/java/codechicken/nei/DoubleFilteredFilter.java
@@ -1,9 +1,11 @@
 package codechicken.nei;
 
-import codechicken.nei.api.ItemFilter;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.api.ItemFilter;
+
 public class DoubleFilteredFilter implements ItemFilter {
+
     private ItemFilter filter;
     private ItemList.PatternItemFilter patternFilter;
 
diff --git a/src/main/java/codechicken/nei/ExtendedCreativeInv.java b/src/main/java/codechicken/nei/ExtendedCreativeInv.java
index 93c408fd..588158d0 100644
--- a/src/main/java/codechicken/nei/ExtendedCreativeInv.java
+++ b/src/main/java/codechicken/nei/ExtendedCreativeInv.java
@@ -1,11 +1,13 @@
 package codechicken.nei;
 
-import cpw.mods.fml.relauncher.Side;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
+import cpw.mods.fml.relauncher.Side;
+
 public class ExtendedCreativeInv implements IInventory {
+
     final PlayerSave playerSave;
     final Side side;
 
diff --git a/src/main/java/codechicken/nei/FastTransferManager.java b/src/main/java/codechicken/nei/FastTransferManager.java
index 557f0c14..b401262e 100644
--- a/src/main/java/codechicken/nei/FastTransferManager.java
+++ b/src/main/java/codechicken/nei/FastTransferManager.java
@@ -4,21 +4,25 @@ import static codechicken.nei.NEIServerUtils.areStacksIdentical;
 import static codechicken.nei.NEIServerUtils.areStacksSameType;
 import static codechicken.nei.NEIServerUtils.copyStack;
 
-import codechicken.nei.guihook.GuiContainerManager;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.guihook.GuiContainerManager;
+
 public class FastTransferManager {
+
     /**
      * Based on the general assumption that we want to fill top to bottom, left to right
      */
     public static class SlotPositionComparator implements Comparator<Integer> {
+
         final Container container;
 
         public SlotPositionComparator(Container c) {
@@ -101,8 +105,7 @@ public class FastTransferManager {
         if (!fillZoneWithHeldItem(window, toZone)) return;
 
         for (int transferFrom : slotZones.get(fromZone)) {
-            ItemStack transferStack =
-                    window.inventorySlots.getSlot(transferFrom).getStack();
+            ItemStack transferStack = window.inventorySlots.getSlot(transferFrom).getStack();
 
             if (!areStacksSameType(heldStack, transferStack)) continue;
 
@@ -142,12 +145,10 @@ public class FastTransferManager {
                 ItemStack after = compareAfter.get(i);
 
                 if (!areStacksIdentical(before, after) && after != null)
-                    if (before == null
-                            ? areStacksSameType(stack, after)
-                            : // transfered into this empty slot
-                            areStacksSameType(stack, after)
-                                    && after.stackSize - before.stackSize > 0) // it added to this stack
-                    return i;
+                    if (before == null ? areStacksSameType(stack, after) : // transfered into this empty slot
+                            areStacksSameType(stack, after) && after.stackSize - before.stackSize > 0) // it added to
+                                                                                                       // this stack
+                        return i;
             }
 
             return -1;
@@ -180,16 +181,16 @@ public class FastTransferManager {
 
         if (from.isItemValid(from.getStack())) moveOneItem(window, fromSlot, toSlot);
         else // slots that you can't put stuff in
-        moveOutputSet(window, fromSlot, toSlot);
+            moveOutputSet(window, fromSlot, toSlot);
     }
 
     public void moveOutputSet(GuiContainer window, int fromSlot, int toSlot) {
         if (NEIClientUtils.getHeldItem() != null) return;
 
         clickSlot(window, fromSlot); // pickup fromSlot
-        if (NEIClientUtils.getHeldItem()
-                == null) // maybe this container does auto transfers. No need to pick up the final item
-        return;
+        if (NEIClientUtils.getHeldItem() == null) // maybe this container does auto transfers. No need to pick up the
+                                                  // final item
+            return;
         clickSlot(window, toSlot); // place one in toSlot
     }
 
@@ -202,15 +203,15 @@ public class FastTransferManager {
     public void retrieveItem(GuiContainer window, int toSlot) {
         Slot slot = window.inventorySlots.getSlot(toSlot);
         ItemStack slotStack = slot.getStack();
-        if (slotStack == null
-                || slotStack.stackSize == slot.getSlotStackLimit()
-                || slotStack.stackSize == slotStack.getMaxStackSize()) return;
+        if (slotStack == null || slotStack.stackSize == slot.getSlotStackLimit()
+                || slotStack.stackSize == slotStack.getMaxStackSize())
+            return;
 
         generateSlotMap(window.inventorySlots, slotStack);
 
         Integer destZone = slotZoneMap.get(toSlot);
         if (destZone == null) // slots that don't accept
-        return;
+            return;
 
         int firstZoneSlot = findShiftClickDestinationSlot(window.inventorySlots, toSlot);
         int firstZone = -1;
@@ -239,9 +240,9 @@ public class FastTransferManager {
             Slot slot = window.inventorySlots.getSlot(i);
             ItemStack stack1 = slot.getStack();
 
-            if (areStacksSameType(stack, stack1)
-                    && stack1.stackSize != slot.getSlotStackLimit()
-                    && // get from full stacks on second pass
+            if (areStacksSameType(stack, stack1) && stack1.stackSize != slot.getSlotStackLimit() && // get from full
+                                                                                                    // stacks on second
+                                                                                                    // pass
                     stack1.stackSize != stack1.getMaxStackSize()) {
                 moveOneItem(window, i, toSlot);
                 return true;
@@ -312,7 +313,7 @@ public class FastTransferManager {
         generateSlotMap(window.inventorySlots, held);
         Integer zone = slotZoneMap.get(pickedUpFromSlot);
         if (zone == null) // something went wrong and we can't work out where the item was picked up from
-        return;
+            return;
 
         for (int slotIndex : slotZones.get(zone)) {
             Slot slot = window.inventorySlots.getSlot(slotIndex);
diff --git a/src/main/java/codechicken/nei/GuiEnchantmentModifier.java b/src/main/java/codechicken/nei/GuiEnchantmentModifier.java
index 9bfe1706..cf9c429f 100644
--- a/src/main/java/codechicken/nei/GuiEnchantmentModifier.java
+++ b/src/main/java/codechicken/nei/GuiEnchantmentModifier.java
@@ -2,15 +2,18 @@ package codechicken.nei;
 
 import static codechicken.nei.NEIClientUtils.translate;
 
-import codechicken.lib.render.CCRenderState;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.world.World;
+
 import org.lwjgl.opengl.GL11;
 
+import codechicken.lib.render.CCRenderState;
+
 public class GuiEnchantmentModifier extends GuiContainer {
+
     final ContainerEnchantmentModifier container;
 
     public GuiEnchantmentModifier(InventoryPlayer inventoryplayer, World world, int i, int j, int k) {
diff --git a/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java b/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java
index 9a446f12..5f76fb4f 100644
--- a/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java
+++ b/src/main/java/codechicken/nei/GuiExtendedCreativeInv.java
@@ -1,18 +1,22 @@
 package codechicken.nei;
 
+import java.util.Collections;
+import java.util.List;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.opengl.GL11;
+
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.api.INEIGuiHandler;
 import codechicken.nei.api.TaggedInventoryArea;
-import java.util.Collections;
-import java.util.List;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import org.lwjgl.opengl.GL11;
 
 public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler {
+
     public GuiExtendedCreativeInv(Container par1Container) {
         super(par1Container);
         ySize = 198;
diff --git a/src/main/java/codechicken/nei/GuiNEIButton.java b/src/main/java/codechicken/nei/GuiNEIButton.java
index 7a22e8f1..962f5720 100644
--- a/src/main/java/codechicken/nei/GuiNEIButton.java
+++ b/src/main/java/codechicken/nei/GuiNEIButton.java
@@ -4,9 +4,11 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 
 public class GuiNEIButton extends GuiButton {
+
     protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
 
     public GuiNEIButton(int i, int j, int k, int l, int i1, String s) {
@@ -22,8 +24,8 @@ public class GuiNEIButton extends GuiButton {
         boolean flag = i >= xPosition && j >= yPosition && i < xPosition + width && j < yPosition + height;
         int k = getHoverState(flag);
         drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height / 2); // top left
-        drawTexturedModalRect(
-                xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height / 2); // top right
+        drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height / 2); // top
+                                                                                                                      // right
         drawTexturedModalRect(
                 xPosition,
                 yPosition + height / 2,
@@ -40,14 +42,23 @@ public class GuiNEIButton extends GuiButton {
                 height / 2); // bottom right
         mouseDragged(minecraft, i, j);
 
-        if (!enabled)
-            drawCenteredString(
-                    fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffa0a0a0);
-        else if (flag)
-            drawCenteredString(
-                    fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffffa0);
-        else
-            drawCenteredString(
-                    fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xe0e0e0);
+        if (!enabled) drawCenteredString(
+                fontrenderer,
+                displayString,
+                xPosition + width / 2,
+                yPosition + (height - 8) / 2,
+                0xffa0a0a0);
+        else if (flag) drawCenteredString(
+                fontrenderer,
+                displayString,
+                xPosition + width / 2,
+                yPosition + (height - 8) / 2,
+                0xffffa0);
+        else drawCenteredString(
+                fontrenderer,
+                displayString,
+                xPosition + width / 2,
+                yPosition + (height - 8) / 2,
+                0xe0e0e0);
     }
 }
diff --git a/src/main/java/codechicken/nei/GuiPotionCreator.java b/src/main/java/codechicken/nei/GuiPotionCreator.java
index d264ad5a..23eae133 100644
--- a/src/main/java/codechicken/nei/GuiPotionCreator.java
+++ b/src/main/java/codechicken/nei/GuiPotionCreator.java
@@ -2,24 +2,29 @@ package codechicken.nei;
 
 import static codechicken.nei.NEIClientUtils.translate;
 
+import java.awt.Dimension;
+import java.util.ArrayList;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.StatCollector;
+
+import org.lwjgl.opengl.GL11;
+
 import codechicken.core.gui.GuiCCButton;
 import codechicken.core.gui.GuiCCTextField;
 import codechicken.core.gui.GuiScrollSlot;
 import codechicken.core.inventory.GuiContainerWidget;
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.FontUtils;
-import java.awt.Dimension;
-import java.util.ArrayList;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.StatCollector;
-import org.lwjgl.opengl.GL11;
 
 public class GuiPotionCreator extends GuiContainerWidget {
+
     public class GuiSlotPotionEffects extends GuiScrollSlot {
+
         public int selectedslot = -1;
         public boolean enabled = true;
         private final ArrayList<Potion> validPotions = new ArrayList<>();
@@ -69,7 +74,12 @@ public class GuiPotionCreator extends GuiContainerWidget {
             CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
             drawTexturedModalRect(x, y, 0, 166 + getSlotHeight(slot) * shade, width - 30, getSlotHeight(slot));
             drawTexturedModalRect(
-                    x + width - 30, y, width - 23, 166 + getSlotHeight(slot) * shade, 30, getSlotHeight(slot));
+                    x + width - 30,
+                    y,
+                    width - 23,
+                    166 + getSlotHeight(slot) * shade,
+                    30,
+                    getSlotHeight(slot));
 
             if (potion.hasStatusIcon()) {
                 CCRenderState.changeTexture("textures/gui/container/inventory.png");
@@ -94,9 +104,7 @@ public class GuiPotionCreator extends GuiContainerWidget {
 
         private PotionEffect getEffect(int id) {
             ItemStack potion = container.potionInv.getStackInSlot(0);
-            if (potion != null
-                    && potion.hasTagCompound()
-                    && potion.getTagCompound().hasKey("CustomPotionEffects")) {
+            if (potion != null && potion.hasTagCompound() && potion.getTagCompound().hasKey("CustomPotionEffects")) {
                 NBTTagList potionTagList = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
                 for (int i = 0; i < potionTagList.tagCount(); i++) {
                     PotionEffect effect = PotionEffect.readCustomPotionEffectFromNBT(potionTagList.getCompoundTagAt(i));
@@ -167,6 +175,7 @@ public class GuiPotionCreator extends GuiContainerWidget {
     }
 
     public class GuiDurationField extends GuiCCTextField {
+
         private String baseValue;
 
         public GuiDurationField(int x, int y, int width, int height) {
@@ -216,8 +225,8 @@ public class GuiPotionCreator extends GuiContainerWidget {
         @Override
         public void drawText() {
             String s = getText();
-            String seconds =
-                    s.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
+            String seconds = s
+                    .substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
             String minutes = s.length() < 3 ? "" : s.substring(0, s.length() - 2);
             int ty = y + height / 2 - 4;
             int tcolour = getTextColour();
diff --git a/src/main/java/codechicken/nei/HUDRenderer.java b/src/main/java/codechicken/nei/HUDRenderer.java
index d439d4ee..dd4a09a8 100644
--- a/src/main/java/codechicken/nei/HUDRenderer.java
+++ b/src/main/java/codechicken/nei/HUDRenderer.java
@@ -5,23 +5,27 @@ import static codechicken.lib.gui.GuiDraw.drawString;
 import static codechicken.lib.gui.GuiDraw.drawTooltipBox;
 import static codechicken.lib.gui.GuiDraw.getStringWidth;
 
-import codechicken.lib.config.ConfigTag;
-import codechicken.nei.KeyManager.IKeyStateTracker;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.StackInfo;
 import java.awt.Dimension;
 import java.awt.Point;
 import java.util.List;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition.MovingObjectType;
 import net.minecraft.world.World;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import codechicken.lib.config.ConfigTag;
+import codechicken.nei.KeyManager.IKeyStateTracker;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.StackInfo;
+
 public class HUDRenderer implements IKeyStateTracker {
+
     @Override
     public void tickKeyStates() {
         if (KeyManager.keyStates.get("world.highlight_tips").down) {
@@ -32,8 +36,7 @@ public class HUDRenderer implements IKeyStateTracker {
 
     public static void renderOverlay() {
         Minecraft mc = Minecraft.getMinecraft();
-        if (mc.currentScreen == null
-                && mc.theWorld != null
+        if (mc.currentScreen == null && mc.theWorld != null
                 && !mc.gameSettings.keyBindPlayerList.getIsKeyPressed()
                 && NEIClientConfig.getBooleanSetting("world.highlight_tips")
                 && mc.objectMouseOver != null
diff --git a/src/main/java/codechicken/nei/Image.java b/src/main/java/codechicken/nei/Image.java
index cea87961..4259291f 100644
--- a/src/main/java/codechicken/nei/Image.java
+++ b/src/main/java/codechicken/nei/Image.java
@@ -1,6 +1,7 @@
 package codechicken.nei;
 
 public class Image {
+
     public int x;
     public int y;
     public int width;
diff --git a/src/main/java/codechicken/nei/InfiniteStackSizeHandler.java b/src/main/java/codechicken/nei/InfiniteStackSizeHandler.java
index 0d4aaf73..dc957a02 100644
--- a/src/main/java/codechicken/nei/InfiniteStackSizeHandler.java
+++ b/src/main/java/codechicken/nei/InfiniteStackSizeHandler.java
@@ -1,11 +1,13 @@
 package codechicken.nei;
 
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.nei.api.IInfiniteItemHandler;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.nei.api.IInfiniteItemHandler;
+
 public class InfiniteStackSizeHandler implements IInfiniteItemHandler {
+
     @Override
     public void onPickup(ItemStack heldItem) {
         heldItem.stackSize = 1;
diff --git a/src/main/java/codechicken/nei/InfiniteToolHandler.java b/src/main/java/codechicken/nei/InfiniteToolHandler.java
index c55aea66..5899e40f 100644
--- a/src/main/java/codechicken/nei/InfiniteToolHandler.java
+++ b/src/main/java/codechicken/nei/InfiniteToolHandler.java
@@ -1,10 +1,12 @@
 package codechicken.nei;
 
-import codechicken.nei.api.IInfiniteItemHandler;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.api.IInfiniteItemHandler;
+
 public class InfiniteToolHandler implements IInfiniteItemHandler {
+
     @Override
     public void onPickup(ItemStack heldItem) {
         heldItem.setItemDamage(0);
diff --git a/src/main/java/codechicken/nei/InventoryCraftingDummy.java b/src/main/java/codechicken/nei/InventoryCraftingDummy.java
index 034c9dc5..ac776c2a 100644
--- a/src/main/java/codechicken/nei/InventoryCraftingDummy.java
+++ b/src/main/java/codechicken/nei/InventoryCraftingDummy.java
@@ -5,15 +5,14 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.InventoryCrafting;
 
 public class InventoryCraftingDummy extends InventoryCrafting {
+
     public InventoryCraftingDummy() {
-        super(
-                new Container() {
-                    @Override
-                    public boolean canInteractWith(EntityPlayer entityplayer) {
-                        return true;
-                    }
-                },
-                3,
-                3);
+        super(new Container() {
+
+            @Override
+            public boolean canInteractWith(EntityPlayer entityplayer) {
+                return true;
+            }
+        }, 3, 3);
     }
 }
diff --git a/src/main/java/codechicken/nei/ItemList.java b/src/main/java/codechicken/nei/ItemList.java
index eee223d7..deca7e4c 100644
--- a/src/main/java/codechicken/nei/ItemList.java
+++ b/src/main/java/codechicken/nei/ItemList.java
@@ -1,12 +1,5 @@
 package codechicken.nei;
 
-import codechicken.nei.ThreadOperationTimer.TimeoutException;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.api.ItemFilter.ItemFilterProvider;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.guihook.GuiContainerManager;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -15,11 +8,22 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import codechicken.nei.ThreadOperationTimer.TimeoutException;
+import codechicken.nei.api.ItemFilter;
+import codechicken.nei.api.ItemFilter.ItemFilterProvider;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.guihook.GuiContainerManager;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+
 public class ItemList {
+
     /**
      * Fields are replaced atomically and contents never modified.
      */
@@ -38,12 +42,12 @@ public class ItemList {
     private static final HashSet<Item> erroredItems = new HashSet<>();
     private static final HashSet<String> stackTraces = new HashSet<>();
     /**
-     * Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is
-     * actually finished or not.
+     * Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is actually finished or not.
      */
     public static boolean loadFinished;
 
     public static class EverythingItemFilter implements ItemFilter {
+
         @Override
         public boolean matches(ItemStack item) {
             return true;
@@ -51,6 +55,7 @@ public class ItemList {
     }
 
     public static class NothingItemFilter implements ItemFilter {
+
         @Override
         public boolean matches(ItemStack item) {
             return false;
@@ -58,6 +63,7 @@ public class ItemList {
     }
 
     public static class PatternItemFilter implements ItemFilter {
+
         public Pattern pattern;
 
         public PatternItemFilter(Pattern pattern) {
@@ -71,6 +77,7 @@ public class ItemList {
     }
 
     public static class AllMultiItemFilter implements ItemFilter {
+
         public List<ItemFilter> filters;
 
         public AllMultiItemFilter(List<ItemFilter> filters) {
@@ -83,18 +90,18 @@ public class ItemList {
 
         @Override
         public boolean matches(ItemStack item) {
-            for (ItemFilter filter : filters)
-                try {
-                    if (!filter.matches(item)) return false;
-                } catch (Exception e) {
-                    NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
-                }
+            for (ItemFilter filter : filters) try {
+                if (!filter.matches(item)) return false;
+            } catch (Exception e) {
+                NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
+            }
 
             return true;
         }
     }
 
     public static class AnyMultiItemFilter implements ItemFilter {
+
         public List<ItemFilter> filters;
 
         public AnyMultiItemFilter(List<ItemFilter> filters) {
@@ -107,18 +114,18 @@ public class ItemList {
 
         @Override
         public boolean matches(ItemStack item) {
-            for (ItemFilter filter : filters)
-                try {
-                    if (filter.matches(item)) return true;
-                } catch (Exception e) {
-                    NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
-                }
+            for (ItemFilter filter : filters) try {
+                if (filter.matches(item)) return true;
+            } catch (Exception e) {
+                NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
+            }
 
             return false;
         }
     }
 
     public static interface ItemsLoadedCallback {
+
         public void itemsLoaded();
     }
 
@@ -135,7 +142,7 @@ public class ItemList {
     }
 
     /**
-     * @deprecated  use getItemListFilter().matches(item)
+     * @deprecated use getItemListFilter().matches(item)
      */
     @Deprecated
     public static boolean itemMatches(ItemStack item) {
@@ -155,28 +162,27 @@ public class ItemList {
     }
 
     public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading") {
+
         private void damageSearch(Item item, List<ItemStack> permutations) {
             HashSet<String> damageIconSet = new HashSet<>();
-            for (int damage = 0; damage < 16; damage++)
-                try {
-                    ItemStack itemstack = new ItemStack(item, 1, damage);
-                    IIcon icon = item.getIconIndex(itemstack);
-                    String name = GuiContainerManager.concatenatedDisplayName(itemstack, false);
-                    String s = name + "@" + (icon == null ? 0 : icon.hashCode());
-                    if (!damageIconSet.contains(s)) {
-                        damageIconSet.add(s);
-                        permutations.add(itemstack);
-                    }
-                } catch (TimeoutException t) {
-                    throw t;
-                } catch (Throwable t) {
-                    NEIServerUtils.logOnce(
-                            t,
-                            stackTraces,
-                            "Ommiting " + item + ":" + damage + " "
-                                    + item.getClass().getSimpleName(),
-                            item.toString());
+            for (int damage = 0; damage < 16; damage++) try {
+                ItemStack itemstack = new ItemStack(item, 1, damage);
+                IIcon icon = item.getIconIndex(itemstack);
+                String name = GuiContainerManager.concatenatedDisplayName(itemstack, false);
+                String s = name + "@" + (icon == null ? 0 : icon.hashCode());
+                if (!damageIconSet.contains(s)) {
+                    damageIconSet.add(s);
+                    permutations.add(itemstack);
                 }
+            } catch (TimeoutException t) {
+                throw t;
+            } catch (Throwable t) {
+                NEIServerUtils.logOnce(
+                        t,
+                        stackTraces,
+                        "Ommiting " + item + ":" + damage + " " + item.getClass().getSimpleName(),
+                        item.toString());
+            }
         }
 
         @Override
@@ -239,6 +245,7 @@ public class ItemList {
     public static ForkJoinPool forkJoinPool = getPool(numProcessors * 2 / 3);
 
     public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
+
         @Override
         public void execute() {
             // System.out.println("Executing NEI Item Filtering");
@@ -246,10 +253,8 @@ public class ItemList {
             ItemFilter filter = getItemListFilter();
 
             try {
-                filtered = ItemList.forkJoinPool
-                        .submit(() -> items.parallelStream()
-                                .filter(PresetsWidget::matches)
-                                .filter(filter::matches)
+                filtered = ItemList.forkJoinPool.submit(
+                        () -> items.parallelStream().filter(PresetsWidget::matches).filter(filter::matches)
                                 .collect(Collectors.toCollection(ArrayList::new)))
                         .get();
             } catch (InterruptedException | ExecutionException e) {
diff --git a/src/main/java/codechicken/nei/ItemMobSpawner.java b/src/main/java/codechicken/nei/ItemMobSpawner.java
index 9f20f6ac..4f3ff960 100644
--- a/src/main/java/codechicken/nei/ItemMobSpawner.java
+++ b/src/main/java/codechicken/nei/ItemMobSpawner.java
@@ -3,6 +3,7 @@ package codechicken.nei;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
@@ -20,6 +21,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 
 public class ItemMobSpawner extends ItemBlock {
+
     private static Map<Integer, EntityLiving> entityHashMap;
     private static Map<Integer, String> IDtoNameMap;
     public static int idPig;
@@ -48,20 +50,11 @@ public class ItemMobSpawner extends ItemBlock {
         return Blocks.mob_spawner.getBlockTextureFromSide(0);
     }
 
-    public boolean onItemUse(
-            ItemStack itemstack,
-            EntityPlayer entityplayer,
-            World world,
-            int x,
-            int y,
-            int z,
-            int par7,
-            float par8,
-            float par9,
-            float par10) {
+    public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int par7,
+            float par8, float par9, float par10) {
         if (super.onItemUse(itemstack, entityplayer, world, x, y, z, par7, par8, par9, par10) && world.isRemote) {
-            TileEntityMobSpawner tileentitymobspawner =
-                    (TileEntityMobSpawner) world.getTileEntity(placedX, placedY, placedZ);
+            TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner) world
+                    .getTileEntity(placedX, placedY, placedZ);
             if (tileentitymobspawner != null) {
                 setDefaultTag(itemstack);
                 String mobtype = IDtoNameMap.get(itemstack.getItemDamage());
@@ -93,8 +86,7 @@ public class ItemMobSpawner extends ItemBlock {
             loadSpawners(world);
             Class<?> clazz = (Class<?>) EntityList.IDtoClassMapping.get(ID);
             try {
-                e = (EntityLiving)
-                        clazz.getConstructor(new Class[] {World.class}).newInstance(world);
+                e = (EntityLiving) clazz.getConstructor(new Class[] { World.class }).newInstance(world);
             } catch (Throwable t) {
                 if (clazz == null)
                     NEIClientConfig.logger.error("Null class for entity (" + ID + ", " + IDtoNameMap.get(ID));
@@ -117,15 +109,13 @@ public class ItemMobSpawner extends ItemBlock {
     public static void loadSpawners(World world) {
         if (loaded) return;
         loaded = true;
-        HashMap<Class<Entity>, String> classToStringMapping =
-                (HashMap<Class<Entity>, String>) EntityList.classToStringMapping;
-        HashMap<Class<Entity>, Integer> classToIDMapping =
-                (HashMap<Class<Entity>, Integer>) EntityList.classToIDMapping;
+        HashMap<Class<Entity>, String> classToStringMapping = (HashMap<Class<Entity>, String>) EntityList.classToStringMapping;
+        HashMap<Class<Entity>, Integer> classToIDMapping = (HashMap<Class<Entity>, Integer>) EntityList.classToIDMapping;
         for (Class<Entity> eclass : classToStringMapping.keySet()) {
             if (!EntityLiving.class.isAssignableFrom(eclass)) continue;
             try {
-                EntityLiving entityliving = (EntityLiving)
-                        eclass.getConstructor(new Class[] {World.class}).newInstance(world);
+                EntityLiving entityliving = (EntityLiving) eclass.getConstructor(new Class[] { World.class })
+                        .newInstance(world);
                 entityliving.isChild();
 
                 int id = classToIDMapping.get(eclass);
@@ -136,13 +126,11 @@ public class ItemMobSpawner extends ItemBlock {
                 IDtoNameMap.put(id, name);
 
                 if (name.equals("Pig")) idPig = id;
-            } catch (Throwable ignored) {
-            }
+            } catch (Throwable ignored) {}
         }
 
         IDtoNameMap.entrySet()
-                .removeIf(e -> getEntity(e.getKey()).getClass() == EntityPig.class
-                        && !e.getValue().equals("Pig"));
+                .removeIf(e -> getEntity(e.getKey()).getClass() == EntityPig.class && !e.getValue().equals("Pig"));
     }
 
     @Override
diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java
index 57fa0aed..d827f9be 100644
--- a/src/main/java/codechicken/nei/ItemPanel.java
+++ b/src/main/java/codechicken/nei/ItemPanel.java
@@ -2,16 +2,19 @@ package codechicken.nei;
 
 import static codechicken.lib.gui.GuiDraw.drawRect;
 
-import codechicken.lib.vec.Rectangle4i;
 import java.util.ArrayList;
+
 import javax.annotation.Nullable;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
+import codechicken.lib.vec.Rectangle4i;
+
 public class ItemPanel extends PanelWidget {
 
     /**
-     *  Backwards compat :-/
+     * Backwards compat :-/
      */
     @SuppressWarnings("unused")
     @Deprecated
@@ -33,6 +36,7 @@ public class ItemPanel extends PanelWidget {
     public ItemQuantityField quantity;
 
     public static class ItemPanelSlot {
+
         public ItemStack item;
         public int slotIndex;
 
@@ -48,6 +52,7 @@ public class ItemPanel extends PanelWidget {
     }
 
     protected static class ItemPanelGrid extends ItemsGrid {
+
         public ArrayList<ItemStack> newItems;
 
         public void setItems(ArrayList<ItemStack> items) {
@@ -94,6 +99,7 @@ public class ItemPanel extends PanelWidget {
         super.init();
 
         more = new Button("+") {
+
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if (rightclick) return false;
@@ -110,6 +116,7 @@ public class ItemPanel extends PanelWidget {
             }
         };
         less = new Button("-") {
+
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if (rightclick) return false;
diff --git a/src/main/java/codechicken/nei/ItemPanels.java b/src/main/java/codechicken/nei/ItemPanels.java
index 2eb3b5d2..4be1bfbd 100644
--- a/src/main/java/codechicken/nei/ItemPanels.java
+++ b/src/main/java/codechicken/nei/ItemPanels.java
@@ -1,6 +1,7 @@
 package codechicken.nei;
 
 public class ItemPanels {
+
     public static final ItemPanel itemPanel = new ItemPanel();
     public static final BookmarkPanel bookmarkPanel = new BookmarkPanel();
 }
diff --git a/src/main/java/codechicken/nei/ItemQuantityField.java b/src/main/java/codechicken/nei/ItemQuantityField.java
index 5a654d35..e109d73e 100644
--- a/src/main/java/codechicken/nei/ItemQuantityField.java
+++ b/src/main/java/codechicken/nei/ItemQuantityField.java
@@ -3,6 +3,7 @@ package codechicken.nei;
 import static codechicken.nei.NEIClientUtils.translate;
 
 public class ItemQuantityField extends TextField {
+
     public ItemQuantityField(String ident) {
         super(ident);
         centered = true;
diff --git a/src/main/java/codechicken/nei/ItemSorter.java b/src/main/java/codechicken/nei/ItemSorter.java
index a8e44c64..8d1633ef 100644
--- a/src/main/java/codechicken/nei/ItemSorter.java
+++ b/src/main/java/codechicken/nei/ItemSorter.java
@@ -1,21 +1,25 @@
 package codechicken.nei;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
+
 import codechicken.lib.config.ConfigTagParent;
 import codechicken.nei.ItemList.ItemsLoadedCallback;
 import codechicken.nei.api.API;
 import codechicken.nei.api.ItemInfo;
 import codechicken.nei.config.GuiItemSorter;
 import codechicken.nei.config.OptionOpenGui;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
 
 public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
+
     public static class SortEntry {
+
         public final String name;
         public final Comparator<ItemStack> comparator;
 
@@ -44,7 +48,7 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
 
     public static void sort(ArrayList<ItemStack> items) {
         try {
-            //            items = (ArrayList<ItemStack>)
+            // items = (ArrayList<ItemStack>)
             // items.parallelStream().sorted(instance).collect(Collectors.toList());
             items.sort(instance);
         } catch (Exception e) {
@@ -125,6 +129,7 @@ public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
         });
         tag.getTag("inventory.itemsort").setDefaultValue(getSaveString(list));
         API.addOption(new OptionOpenGui("inventory.itemsort", GuiItemSorter.class) {
+
             @Override
             public void useGlobals() {
                 super.useGlobals();
diff --git a/src/main/java/codechicken/nei/ItemStackMap.java b/src/main/java/codechicken/nei/ItemStackMap.java
index 11b64533..8827982e 100644
--- a/src/main/java/codechicken/nei/ItemStackMap.java
+++ b/src/main/java/codechicken/nei/ItemStackMap.java
@@ -4,20 +4,24 @@ import static codechicken.lib.inventory.InventoryUtils.actualDamage;
 import static codechicken.lib.inventory.InventoryUtils.newItemStack;
 import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE;
 
-import com.google.common.base.Objects;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import com.google.common.base.Objects;
+
 /**
  * A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup
  */
 public class ItemStackMap<T> {
+
     public static class StackMetaKey {
+
         public final int damage;
         public final NBTTagCompound tag;
 
@@ -42,6 +46,7 @@ public class ItemStackMap<T> {
     }
 
     public static class Entry<T> {
+
         public final ItemStack key;
         public final T value;
 
@@ -52,6 +57,7 @@ public class ItemStackMap<T> {
     }
 
     public class DetailMap {
+
         private boolean hasWildcard;
         private T wildcard;
         private HashMap<Integer, T> damageMap;
@@ -121,8 +127,7 @@ public class ItemStackMap<T> {
         }
 
         private void updateSize() {
-            int newSize = (hasWildcard ? 1 : 0)
-                    + (metaMap != null ? metaMap.size() : 0)
+            int newSize = (hasWildcard ? 1 : 0) + (metaMap != null ? metaMap.size() : 0)
                     + (tagMap != null ? tagMap.size() : 0)
                     + (damageMap != null ? damageMap.size() : 0);
 
@@ -151,16 +156,12 @@ public class ItemStackMap<T> {
 
         public void addEntries(Item item, List<Entry<T>> list) {
             if (wildcard != null) list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
-            if (damageMap != null)
-                for (Map.Entry<Integer, T> entry : damageMap.entrySet())
-                    list.add(new Entry<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
-            if (tagMap != null)
-                for (Map.Entry<NBTTagCompound, T> entry : tagMap.entrySet())
-                    list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
-            if (metaMap != null)
-                for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet())
-                    list.add(new Entry<>(
-                            newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
+            if (damageMap != null) for (Map.Entry<Integer, T> entry : damageMap.entrySet())
+                list.add(new Entry<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
+            if (tagMap != null) for (Map.Entry<NBTTagCompound, T> entry : tagMap.entrySet())
+                list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
+            if (metaMap != null) for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet()) list.add(
+                    new Entry<>(newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
         }
     }
 
@@ -223,8 +224,7 @@ public class ItemStackMap<T> {
 
     public List<ItemStack> keys() {
         LinkedList<ItemStack> list = new LinkedList<>();
-        for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
-            entry.getValue().addKeys(entry.getKey(), list);
+        for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet()) entry.getValue().addKeys(entry.getKey(), list);
         return list;
     }
 
@@ -236,8 +236,7 @@ public class ItemStackMap<T> {
 
     public List<Entry<T>> entries() {
         LinkedList<Entry<T>> list = new LinkedList<>();
-        for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
-            entry.getValue().addEntries(entry.getKey(), list);
+        for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet()) entry.getValue().addEntries(entry.getKey(), list);
         return list;
     }
 
diff --git a/src/main/java/codechicken/nei/ItemStackSet.java b/src/main/java/codechicken/nei/ItemStackSet.java
index eca471a6..31c0543c 100644
--- a/src/main/java/codechicken/nei/ItemStackSet.java
+++ b/src/main/java/codechicken/nei/ItemStackSet.java
@@ -1,11 +1,13 @@
 package codechicken.nei;
 
-import codechicken.nei.api.ItemFilter;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.api.ItemFilter;
+
 public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter {
+
     public ItemStackSet with(ItemStack... items) {
         for (ItemStack item : items) add(item);
         return this;
diff --git a/src/main/java/codechicken/nei/ItemsGrid.java b/src/main/java/codechicken/nei/ItemsGrid.java
index b1bb683c..8da187c0 100644
--- a/src/main/java/codechicken/nei/ItemsGrid.java
+++ b/src/main/java/codechicken/nei/ItemsGrid.java
@@ -2,15 +2,12 @@ package codechicken.nei;
 
 import static codechicken.lib.gui.GuiDraw.drawRect;
 
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemPanel.ItemPanelSlot;
-import codechicken.nei.api.GuiInfo;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.StackInfo;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import javax.annotation.Nullable;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -18,9 +15,17 @@ import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.item.ItemStack;
+
 import org.lwjgl.opengl.GL11;
 
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemPanel.ItemPanelSlot;
+import codechicken.nei.api.GuiInfo;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.StackInfo;
+
 public class ItemsGrid {
+
     public static final int SLOT_SIZE = 18;
 
     protected int width;
@@ -178,8 +183,7 @@ public class ItemsGrid {
 
             for (int r = 0; r < rows; r++) {
                 final int idx = columns * r + c;
-                if (GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c))
-                        && idx >= 0
+                if (GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c)) && idx >= 0
                         && idx < invalidSlotMap.length
                         && !invalidSlotMap[idx]) {
                     invalidSlotMap[idx] = true;
@@ -208,7 +212,10 @@ public class ItemsGrid {
 
     public Rectangle4i getSlotRect(int row, int column) {
         return new Rectangle4i(
-                marginLeft + paddingLeft + column * SLOT_SIZE, marginTop + row * SLOT_SIZE, SLOT_SIZE, SLOT_SIZE);
+                marginLeft + paddingLeft + column * SLOT_SIZE,
+                marginTop + row * SLOT_SIZE,
+                SLOT_SIZE,
+                SLOT_SIZE);
     }
 
     public boolean isInvalidSlot(int index) {
@@ -302,7 +309,10 @@ public class ItemsGrid {
                 GL11.glDisable(GL11.GL_BLEND);
                 GL11.glDepthMask(true);
                 OpenGlHelper.glBlendFunc(
-                        GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+                        GL11.GL_SRC_ALPHA,
+                        GL11.GL_ONE_MINUS_SRC_ALPHA,
+                        GL11.GL_SRC_ALPHA,
+                        GL11.GL_ONE_MINUS_SRC_ALPHA);
                 GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 
                 drawItems();
diff --git a/src/main/java/codechicken/nei/KeyManager.java b/src/main/java/codechicken/nei/KeyManager.java
index 1c8c8044..104b5ca9 100644
--- a/src/main/java/codechicken/nei/KeyManager.java
+++ b/src/main/java/codechicken/nei/KeyManager.java
@@ -8,11 +8,14 @@ import java.util.Map.Entry;
  * Good old down/held/up keystate tracker
  */
 public class KeyManager {
+
     public static interface IKeyStateTracker {
+
         public void tickKeyStates();
     }
 
     public static class KeyState {
+
         public boolean down;
         public boolean held;
         public boolean up;
diff --git a/src/main/java/codechicken/nei/Label.java b/src/main/java/codechicken/nei/Label.java
index 3c58dd8c..533a398b 100644
--- a/src/main/java/codechicken/nei/Label.java
+++ b/src/main/java/codechicken/nei/Label.java
@@ -4,6 +4,7 @@ import static codechicken.lib.gui.GuiDraw.drawString;
 import static codechicken.lib.gui.GuiDraw.drawStringC;
 
 public class Label extends Widget {
+
     final boolean centered;
     final int colour;
     public String text;
diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java
index 0e15e74c..b67304aa 100644
--- a/src/main/java/codechicken/nei/LayoutManager.java
+++ b/src/main/java/codechicken/nei/LayoutManager.java
@@ -32,6 +32,23 @@ import static codechicken.nei.NEIClientUtils.toggleMagnetMode;
 import static codechicken.nei.NEIClientUtils.toggleRaining;
 import static codechicken.nei.NEIClientUtils.translate;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.TreeSet;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainerCreative;
+import net.minecraft.client.renderer.InventoryEffectRenderer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.KeyManager.IKeyStateTracker;
 import codechicken.nei.api.API;
@@ -48,27 +65,10 @@ import codechicken.nei.guihook.IContainerObjectHandler;
 import codechicken.nei.guihook.IContainerTooltipHandler;
 import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.RecipeCatalysts;
-import java.util.HashMap;
-import java.util.List;
-import java.util.TreeSet;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.gui.inventory.GuiContainerCreative;
-import net.minecraft.client.renderer.InventoryEffectRenderer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
 
-public class LayoutManager
-        implements IContainerInputHandler,
-                IContainerTooltipHandler,
-                IContainerDrawHandler,
-                IContainerObjectHandler,
-                IKeyStateTracker {
+public class LayoutManager implements IContainerInputHandler, IContainerTooltipHandler, IContainerDrawHandler,
+        IContainerObjectHandler, IKeyStateTracker {
+
     private static LayoutManager instance;
 
     /** Note: this variable isn't actually used by this mod, but NEI add-ons might need it. */
@@ -113,10 +113,9 @@ public class LayoutManager
     public static HashMap<Integer, LayoutStyle> layoutStyles = new HashMap<>();
 
     /**
-     * This is set to true immediately after item loading thread is started,
-     * to prevent duplicated loading thread from being executed.
-     * If you want to know if item list is actually finished loading,
-     * Use {@link ItemList#loadFinished} instead.
+     * This is set to true immediately after item loading thread is started, to prevent duplicated loading thread from
+     * being executed. If you want to know if item list is actually finished loading, Use {@link ItemList#loadFinished}
+     * instead.
      */
     public static boolean itemsLoaded = false;
 
@@ -139,11 +138,8 @@ public class LayoutManager
 
     @Override
     public void onPreDraw(GuiContainer gui) {
-        if (!isHidden()
-                && isEnabled()
-                && gui
-                        instanceof
-                        InventoryEffectRenderer) // Reset the gui to the center of the screen, for potion effect offsets
+        if (!isHidden() && isEnabled() && gui instanceof InventoryEffectRenderer) // Reset the gui to the center of the
+                                                                                  // screen, for potion effect offsets
         // etc
         {
             gui.guiLeft = (gui.width - gui.xSize) / 2;
@@ -183,9 +179,9 @@ public class LayoutManager
 
         for (Widget widget : controlWidgets) {
             widget.onGuiClick(mousex, mousey);
-            if (widget.contains(mousex, mousey)
-                    ? widget.handleClick(mousex, mousey, button)
-                    : widget.handleClickExt(mousex, mousey, button)) return true;
+            if (widget.contains(mousex, mousey) ? widget.handleClick(mousex, mousey, button)
+                    : widget.handleClickExt(mousex, mousey, button))
+                return true;
         }
 
         return false;
@@ -304,8 +300,8 @@ public class LayoutManager
     }
 
     @Override
-    public List<String> handleItemTooltip(
-            GuiContainer gui, ItemStack itemstack, int mousex, int mousey, List<String> currenttip) {
+    public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
+            List<String> currenttip) {
         return currenttip;
     }
 
@@ -350,6 +346,7 @@ public class LayoutManager
         searchField = new SearchField("search");
 
         options = new ButtonCycled(3) {
+
             @Override
             public void init() {
                 this.icons[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 32, 0, 16, 16).build();
@@ -360,14 +357,12 @@ public class LayoutManager
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if (!rightclick) {
-                    if (Keyboard.getEventKeyState()
-                            && (Keyboard.getEventKey() == Keyboard.KEY_LCONTROL
-                                    || Keyboard.getEventKey() == Keyboard.KEY_RCONTROL)) {
+                    if (Keyboard.getEventKeyState() && (Keyboard.getEventKey() == Keyboard.KEY_LCONTROL
+                            || Keyboard.getEventKey() == Keyboard.KEY_RCONTROL)) {
                         NEIClientConfig.cycleSetting("inventory.cheatmode", 3);
                     } else {
-                        if (Keyboard.getEventKeyState()
-                                && (Keyboard.getEventKey() == Keyboard.KEY_LSHIFT
-                                        || Keyboard.getEventKey() == Keyboard.KEY_RSHIFT)) {
+                        if (Keyboard.getEventKeyState() && (Keyboard.getEventKey() == Keyboard.KEY_LSHIFT
+                                || Keyboard.getEventKey() == Keyboard.KEY_RSHIFT)) {
                             GuiRecipeTab.loadHandlerInfo();
                             RecipeCatalysts.loadCatalystInfo();
                         }
@@ -397,6 +392,7 @@ public class LayoutManager
         };
 
         bookmarksButton = new ButtonCycled(2) {
+
             @Override
             public void init() {
                 this.icons[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 0, 16, 16).build();
@@ -423,6 +419,7 @@ public class LayoutManager
         less = ItemPanels.itemPanel.less;
         quantity = ItemPanels.itemPanel.quantity;
         delete = new Button() {
+
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if ((state & 0x3) == 2) return false;
@@ -450,16 +447,16 @@ public class LayoutManager
 
             @Override
             public void postDraw(int mousex, int mousey) {
-                if (contains(mousex, mousey) && getHeldItem() != null && (state & 0x3) != 2)
-                    GuiDraw.drawTip(
-                            mousex + 9,
-                            mousey,
-                            translate(
-                                    "inventory.delete." + (shiftKey() ? "all" : "one"),
-                                    GuiContainerManager.itemDisplayNameShort(getHeldItem())));
+                if (contains(mousex, mousey) && getHeldItem() != null && (state & 0x3) != 2) GuiDraw.drawTip(
+                        mousex + 9,
+                        mousey,
+                        translate(
+                                "inventory.delete." + (shiftKey() ? "all" : "one"),
+                                GuiContainerManager.itemDisplayNameShort(getHeldItem())));
             }
         };
         gamemode = new ButtonCycled(3) {
+
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if (!rightclick) {
@@ -475,6 +472,7 @@ public class LayoutManager
             }
         };
         rain = new Button() {
+
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if (handleDisabledButtonPress("rain", rightclick)) return true;
@@ -491,6 +489,7 @@ public class LayoutManager
             }
         };
         magnet = new Button() {
+
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if (!rightclick) {
@@ -507,6 +506,7 @@ public class LayoutManager
         for (int i = 0; i < 4; i++) {
             final int zone = i;
             timeButtons[i] = new Button() {
+
                 @Override
                 public boolean onButtonPress(boolean rightclick) {
                     if (handleDisabledButtonPress(NEIActions.timeZones[zone], rightclick)) return true;
@@ -525,6 +525,7 @@ public class LayoutManager
             };
         }
         heal = new Button() {
+
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if (!rightclick) {
@@ -598,9 +599,9 @@ public class LayoutManager
 
         NEIController.load(gui);
 
-        if (checkCreativeInv(gui)
-                && gui.mc.currentScreen instanceof GuiContainerCreative) // override creative with creative+
-        gui.mc.displayGuiScreen(null); // close the screen and wait for the server to open it for us
+        if (checkCreativeInv(gui) && gui.mc.currentScreen instanceof GuiContainerCreative) // override creative with
+                                                                                           // creative+
+            gui.mc.displayGuiScreen(null); // close the screen and wait for the server to open it for us
     }
 
     @Override
@@ -730,10 +731,8 @@ public class LayoutManager
     @Override
     public void renderSlotOverlay(GuiContainer window, Slot slot) {
         ItemStack item = slot.getStack();
-        if (world.nbt.getBoolean("searchinventories")
-                && (item == null
-                        ? !getSearchExpression().equals("")
-                        : !((SearchField) searchField).getFilter().matches(item))) {
+        if (world.nbt.getBoolean("searchinventories") && (item == null ? !getSearchExpression().equals("")
+                : !((SearchField) searchField).getFilter().matches(item))) {
             GL11.glDisable(GL11.GL_LIGHTING);
             GL11.glDisable(GL11.GL_DEPTH_TEST);
             GL11.glTranslatef(0, 0, 150);
@@ -753,7 +752,7 @@ public class LayoutManager
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
         if (!isDrawableResource) drawTexturedModalRect(x, y, image.x, image.y, image.width, image.height);
-        else ((DrawableResource) image).draw(x, y);
+        else((DrawableResource) image).draw(x, y);
         GL11.glDisable(GL11.GL_BLEND);
     }
 
diff --git a/src/main/java/codechicken/nei/LayoutStyleMinecraft.java b/src/main/java/codechicken/nei/LayoutStyleMinecraft.java
index 7c70ed4d..eb40b12c 100644
--- a/src/main/java/codechicken/nei/LayoutStyleMinecraft.java
+++ b/src/main/java/codechicken/nei/LayoutStyleMinecraft.java
@@ -20,12 +20,15 @@ import static codechicken.nei.NEIClientConfig.disabledActions;
 import static codechicken.nei.NEIClientConfig.getMagnetMode;
 import static codechicken.nei.NEIClientConfig.isEnabled;
 
-import codechicken.nei.api.LayoutStyle;
-import codechicken.nei.drawable.DrawableBuilder;
 import net.minecraft.client.gui.inventory.GuiContainer;
+
 import org.lwjgl.opengl.GL11;
 
+import codechicken.nei.api.LayoutStyle;
+import codechicken.nei.drawable.DrawableBuilder;
+
 public class LayoutStyleMinecraft extends LayoutStyle {
+
     public int buttonCount;
     public int leftSize;
     public int numButtons;
@@ -88,9 +91,9 @@ public class LayoutStyleMinecraft extends LayoutStyle {
 
         if (canPerformAction("delete")) layoutButton(delete);
         if (canPerformAction("rain")) layoutButton(rain);
-        if (NEIClientUtils.isValidGamemode("creative")
-                || NEIClientUtils.isValidGamemode("creative+")
-                || NEIClientUtils.isValidGamemode("adventure")) layoutButton(gamemode);
+        if (NEIClientUtils.isValidGamemode("creative") || NEIClientUtils.isValidGamemode("creative+")
+                || NEIClientUtils.isValidGamemode("adventure"))
+            layoutButton(gamemode);
         if (canPerformAction("magnet")) layoutButton(magnet);
         if (canPerformAction("time")) {
             for (int i = 0; i < 4; i++) {
@@ -150,10 +153,9 @@ public class LayoutStyleMinecraft extends LayoutStyle {
 
         int tex;
         if ((b.state & 0x3) == 2) tex = 0;
-        else if ((b.state & 0x4) == 0 && b.contains(mousex, mousey)
-                || // not a state button and mouseover
+        else if ((b.state & 0x4) == 0 && b.contains(mousex, mousey) || // not a state button and mouseover
                 (b.state & 0x3) == 1) // state active
-        tex = 2;
+            tex = 2;
         else tex = 1;
         LayoutManager.drawButtonBackground(b.x, b.y, b.w, b.h, true, tex);
 
diff --git a/src/main/java/codechicken/nei/NEIActions.java b/src/main/java/codechicken/nei/NEIActions.java
index b400905f..282a5699 100644
--- a/src/main/java/codechicken/nei/NEIActions.java
+++ b/src/main/java/codechicken/nei/NEIActions.java
@@ -6,6 +6,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 public class NEIActions {
+
     public static final int protocol = 0;
 
     public static HashMap<String, NEIActions> nameActionMap = new HashMap<>();
@@ -61,8 +62,8 @@ public class NEIActions {
         canDisable.add("rain");
     }
 
-    public static final String[] timeZones = new String[] {"dawn", "noon", "dusk", "midnight"};
-    public static final String[] gameModes = new String[] {"survival", "creative", "creative+", "adventure"};
+    public static final String[] timeZones = new String[] { "dawn", "noon", "dusk", "midnight" };
+    public static final String[] gameModes = new String[] { "survival", "creative", "creative+", "adventure" };
 
     public String name;
     public String base;
diff --git a/src/main/java/codechicken/nei/NEICPH.java b/src/main/java/codechicken/nei/NEICPH.java
index 4ad9cc59..907b7696 100644
--- a/src/main/java/codechicken/nei/NEICPH.java
+++ b/src/main/java/codechicken/nei/NEICPH.java
@@ -1,10 +1,5 @@
 package codechicken.nei;
 
-import codechicken.core.ClientUtils;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
-import cpw.mods.fml.relauncher.Side;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiInventory;
 import net.minecraft.item.ItemStack;
@@ -12,7 +7,14 @@ import net.minecraft.network.play.INetHandlerPlayClient;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.world.World;
 
+import codechicken.core.ClientUtils;
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.packet.PacketCustom;
+import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
+import cpw.mods.fml.relauncher.Side;
+
 public class NEICPH implements IClientPacketHandler {
+
     public static final String channel = "NEI";
 
     @Override
@@ -38,14 +40,14 @@ public class NEICPH implements IClientPacketHandler {
                 break;
             case 21:
                 ClientUtils.openSMPGui(
-                        packet.readUByte(), new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
+                        packet.readUByte(),
+                        new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
                 break;
             case 23:
-                if (packet.readBoolean())
-                    ClientUtils.openSMPGui(
-                            packet.readUByte(),
-                            new GuiExtendedCreativeInv(new ContainerCreativeInv(
-                                    mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT))));
+                if (packet.readBoolean()) ClientUtils.openSMPGui(
+                        packet.readUByte(),
+                        new GuiExtendedCreativeInv(
+                                new ContainerCreativeInv(mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT))));
                 else mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
                 break;
             case 24:
@@ -143,8 +145,7 @@ public class NEICPH implements IClientPacketHandler {
 
     public static void sendRequestContainer() {
         PacketCustom packet = new PacketCustom(channel, 16);
-        packet.writeInt(
-                Minecraft.getMinecraft().thePlayer.openContainer.getInventory().size());
+        packet.writeInt(Minecraft.getMinecraft().thePlayer.openContainer.getInventory().size());
         packet.sendToServer();
     }
 
diff --git a/src/main/java/codechicken/nei/NEIChestGuiHandler.java b/src/main/java/codechicken/nei/NEIChestGuiHandler.java
index a11c359a..b924db08 100644
--- a/src/main/java/codechicken/nei/NEIChestGuiHandler.java
+++ b/src/main/java/codechicken/nei/NEIChestGuiHandler.java
@@ -1,15 +1,18 @@
 package codechicken.nei;
 
-import codechicken.nei.api.INEIGuiAdapter;
-import codechicken.nei.api.TaggedInventoryArea;
 import java.util.Collections;
 import java.util.List;
+
 import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.ContainerChest;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.api.INEIGuiAdapter;
+import codechicken.nei.api.TaggedInventoryArea;
+
 public class NEIChestGuiHandler extends INEIGuiAdapter {
+
     public int chestSize(GuiContainer gui) {
         return ((ContainerChest) gui.inventorySlots).getLowerChestInventory().getSizeInventory();
     }
diff --git a/src/main/java/codechicken/nei/NEIClientConfig.java b/src/main/java/codechicken/nei/NEIClientConfig.java
index ed29f7bd..532d3daa 100644
--- a/src/main/java/codechicken/nei/NEIClientConfig.java
+++ b/src/main/java/codechicken/nei/NEIClientConfig.java
@@ -1,5 +1,26 @@
 package codechicken.nei;
 
+import java.io.File;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraft.world.storage.SaveFormatComparator;
+import net.minecraftforge.common.MinecraftForge;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
 import codechicken.core.CCUpdateChecker;
 import codechicken.core.ClassDiscoverer;
 import codechicken.core.ClientUtils;
@@ -31,35 +52,20 @@ import codechicken.nei.recipe.IRecipeHandler;
 import codechicken.nei.recipe.RecipeCatalysts;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.obfuscator.ObfuscationRun;
+
 import com.google.common.base.Objects;
-import java.io.File;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
-import net.minecraft.world.storage.SaveFormatComparator;
-import net.minecraftforge.common.MinecraftForge;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.lwjgl.input.Keyboard;
 
 public class NEIClientConfig {
+
     private static boolean configLoaded;
     private static boolean enabledOverride;
     private static String worldPath;
 
     public static Logger logger = LogManager.getLogger("NotEnoughItems");
     public static File configDir = new File(CommonUtils.getMinecraftDir(), "config/NEI/");
-    public static ConfigSet global =
-            new ConfigSet(new File("saves/NEI/client.dat"), new ConfigFile(new File(configDir, "client.cfg")));
+    public static ConfigSet global = new ConfigSet(
+            new File("saves/NEI/client.dat"),
+            new ConfigFile(new File(configDir, "client.cfg")));
     public static ConfigSet world;
     public static final File handlerFile = new File(configDir, "handlers.csv");
     public static final File catalystFile = new File(configDir, "catalysts.csv");
@@ -84,8 +90,8 @@ public class NEIClientConfig {
 
     // Function that extracts the handler ID from a handler, with special logic for
     // TemplateRecipeHandler: prefer using the overlay ID if it exists.
-    public static final Function<IRecipeHandler, String> HANDLER_ID_FUNCTION =
-            handler -> Objects.firstNonNull(handler.getOverlayIdentifier(), handler.getHandlerId());
+    public static final Function<IRecipeHandler, String> HANDLER_ID_FUNCTION = handler -> Objects
+            .firstNonNull(handler.getOverlayIdentifier(), handler.getHandlerId());
 
     public static int getHandlerOrder(IRecipeHandler handler) {
         if (handlerOrdering.get(handler.getOverlayIdentifier()) != null) {
@@ -98,8 +104,8 @@ public class NEIClientConfig {
     }
 
     // Comparator that compares handlers using the handlerOrdering map.
-    public static final Comparator<IRecipeHandler> HANDLER_COMPARATOR =
-            Comparator.comparingInt(NEIClientConfig::getHandlerOrder);
+    public static final Comparator<IRecipeHandler> HANDLER_COMPARATOR = Comparator
+            .comparingInt(NEIClientConfig::getHandlerOrder);
 
     public static ItemStack[] creativeInv;
 
@@ -121,10 +127,8 @@ public class NEIClientConfig {
         tag.setComment(
                 "Main configuration of NEI.\nMost of these options can be changed ingame.\nDeleting any element will restore it to it's default value");
 
-        tag.getTag("command")
-                .useBraces()
-                .setComment(
-                        "Change these options if you have a different mod installed on the server that handles the commands differently, Eg. Bukkit Essentials");
+        tag.getTag("command").useBraces().setComment(
+                "Change these options if you have a different mod installed on the server that handles the commands differently, Eg. Bukkit Essentials");
         tag.setNewLineMode(1);
 
         tag.getTag("inventory.widgetsenabled").getBooleanValue(true);
@@ -132,11 +136,11 @@ public class NEIClientConfig {
 
         tag.getTag("inventory.hidden").getBooleanValue(false);
         tag.getTag("inventory.cheatmode").getIntValue(2);
-        tag.getTag("inventory.lockmode")
-                .setComment(
-                        "For those who can't help themselves.\nSet this to a mode and you will be unable to change it ingame")
+        tag.getTag("inventory.lockmode").setComment(
+                "For those who can't help themselves.\nSet this to a mode and you will be unable to change it ingame")
                 .getIntValue(-1);
         API.addOption(new OptionCycled("inventory.cheatmode", 3) {
+
             @Override
             public boolean optionValid(int index) {
                 return getLockedMode() == -1 || getLockedMode() == index && NEIInfo.isValidMode(index);
@@ -183,6 +187,7 @@ public class NEIClientConfig {
 
         tag.getTag("inventory.invertMouseScrollTransfer").getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.invertMouseScrollTransfer", true) {
+
             @Override
             public boolean isEnabled() {
                 return isMouseScrollTransferEnabled();
@@ -205,10 +210,10 @@ public class NEIClientConfig {
         tag.getTag("command.heal").setDefaultValue("");
         API.addOption(new OptionTextField("command.heal"));
 
-        tag.getTag("inventory.worldSpecificBookmarks")
-                .setComment("Global or world specific bookmarks")
+        tag.getTag("inventory.worldSpecificBookmarks").setComment("Global or world specific bookmarks")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.worldSpecificBookmarks", true) {
+
             @Override
             public boolean onClick(int button) {
                 super.onClick(button);
@@ -217,10 +222,10 @@ public class NEIClientConfig {
             }
         });
 
-        tag.getTag("inventory.worldSpecificPresets")
-                .setComment("Global or world specific presets")
+        tag.getTag("inventory.worldSpecificPresets").setComment("Global or world specific presets")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.worldSpecificPresets", true) {
+
             @Override
             public boolean onClick(int button) {
                 super.onClick(button);
@@ -229,60 +234,43 @@ public class NEIClientConfig {
             }
         });
 
-        tag.getTag("inventory.bookmarksEnabled")
-                .setComment("Enable/disable bookmarks")
-                .getBooleanValue(true);
+        tag.getTag("inventory.bookmarksEnabled").setComment("Enable/disable bookmarks").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.bookmarksEnabled", true));
-        tag.getTag("inventory.useNBTInBookmarks")
-                .setComment("Use NBT in Bookmarks")
-                .getBooleanValue(true);
+        tag.getTag("inventory.useNBTInBookmarks").setComment("Use NBT in Bookmarks").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.useNBTInBookmarks", true));
-        tag.getTag("inventory.bookmarksAnimationEnabled")
-                .setComment("REI Style Animation in Bookmarks")
+        tag.getTag("inventory.bookmarksAnimationEnabled").setComment("REI Style Animation in Bookmarks")
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.bookmarksAnimationEnabled", true));
-        tag.getTag("inventory.showRecipeMarker")
-                .setComment("Show Recipe Marker")
-                .getBooleanValue(false);
+        tag.getTag("inventory.showRecipeMarker").setComment("Show Recipe Marker").getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.showRecipeMarker", true));
 
-        tag.getTag("inventory.showItemQuantityWidget")
-                .setComment("Show Item Quantity Widget")
-                .getBooleanValue(true);
+        tag.getTag("inventory.showItemQuantityWidget").setComment("Show Item Quantity Widget").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.showItemQuantityWidget", true));
 
-        tag.getTag("inventory.jei_style_tabs")
-                .setComment("Enable/disable JEI Style Tabs")
-                .getBooleanValue(true);
+        tag.getTag("inventory.jei_style_tabs").setComment("Enable/disable JEI Style Tabs").getBooleanValue(true);
         API.addOption(new OptionToggleButtonBoubs("inventory.jei_style_tabs", true));
         tag.getTag("inventory.jei_style_item_presence_overlay")
-                .setComment("Enable/disable JEI Style item presence overlay on ?-hover")
-                .getBooleanValue(true);
+                .setComment("Enable/disable JEI Style item presence overlay on ?-hover").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.jei_style_item_presence_overlay", true));
-        tag.getTag("inventory.jei_style_recipe_catalyst")
-                .setComment("Enable/disable JEI Style Recipe Catalysts")
+        tag.getTag("inventory.jei_style_recipe_catalyst").setComment("Enable/disable JEI Style Recipe Catalysts")
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.jei_style_recipe_catalyst", true));
 
-        tag.getTag("inventory.creative_tab_style")
-                .setComment("Creative or JEI style tabs")
-                .getBooleanValue(false);
+        tag.getTag("inventory.creative_tab_style").setComment("Creative or JEI style tabs").getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.creative_tab_style", true));
 
-        tag.getTag("inventory.ignore_potion_overlap")
-                .setComment("Ignore overlap with potion effect HUD")
+        tag.getTag("inventory.ignore_potion_overlap").setComment("Ignore overlap with potion effect HUD")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.ignore_potion_overlap", true));
 
-        tag.getTag("inventory.optimize_gui_overlap_computation")
-                .setComment("Optimize computation for GUI overlap")
+        tag.getTag("inventory.optimize_gui_overlap_computation").setComment("Optimize computation for GUI overlap")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.optimize_gui_overlap_computation", true));
 
-        tag.getTag("tools.handler_load_from_config")
-                .setComment("ADVANCED: Load handlers from config")
+        tag.getTag("tools.handler_load_from_config").setComment("ADVANCED: Load handlers from config")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("tools.handler_load_from_config", true) {
+
             @Override
             public boolean onClick(int button) {
                 super.onClick(button);
@@ -291,10 +279,10 @@ public class NEIClientConfig {
             }
         });
 
-        tag.getTag("tools.catalyst_load_from_config")
-                .setComment("ADVANCED: Load catalysts from config")
+        tag.getTag("tools.catalyst_load_from_config").setComment("ADVANCED: Load catalysts from config")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("tools.catalyst_load_from_config", true) {
+
             @Override
             public boolean onClick(int button) {
                 super.onClick(button);
@@ -308,6 +296,7 @@ public class NEIClientConfig {
 
     private static void linkOptionList() {
         OptionList.setOptionList(new OptionList("nei.options") {
+
             @Override
             public ConfigSet globalConfigSet() {
                 return global;
@@ -348,7 +337,8 @@ public class NEIClientConfig {
         API.addHashBind("gui.bookmark_recipe", Keyboard.KEY_A + NEIClientUtils.SHIFT_HASH);
         API.addHashBind("gui.bookmark_count", Keyboard.KEY_A + NEIClientUtils.CTRL_HASH);
         API.addHashBind(
-                "gui.bookmark_recipe_count", Keyboard.KEY_A + NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH);
+                "gui.bookmark_recipe_count",
+                Keyboard.KEY_A + NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH);
         API.addHashBind("gui.overlay", Keyboard.KEY_S);
         API.addHashBind("gui.overlay_use", Keyboard.KEY_S + NEIClientUtils.SHIFT_HASH);
         API.addHashBind("gui.overlay_hide", Keyboard.KEY_S + NEIClientUtils.CTRL_HASH);
@@ -402,10 +392,8 @@ public class NEIClientConfig {
         ItemPanels.itemPanel.quantity.setText(Integer.toString(getItemQuantity()));
         SubsetWidget.loadHidden();
 
-        if (newWorld && Minecraft.getMinecraft().isSingleplayer())
-            world.config
-                    .getTag("inventory.cheatmode")
-                    .setIntValue(NEIClientUtils.mc().playerController.isInCreativeMode() ? 2 : 0);
+        if (newWorld && Minecraft.getMinecraft().isSingleplayer()) world.config.getTag("inventory.cheatmode")
+                .setIntValue(NEIClientUtils.mc().playerController.isInCreativeMode() ? 2 : 0);
 
         NEIInfo.load(ClientUtils.getWorld());
     }
@@ -445,10 +433,12 @@ public class NEIClientConfig {
         configLoaded = true;
 
         new Thread("NEI Plugin Loader") {
+
             @Override
             public void run() {
                 ClassDiscoverer classDiscoverer = new ClassDiscoverer(
-                        test -> test.startsWith("NEI") && test.endsWith("Config.class"), IConfigureNEI.class);
+                        test -> test.startsWith("NEI") && test.endsWith("Config.class"),
+                        IConfigureNEI.class);
 
                 classDiscoverer.findClasses();
 
diff --git a/src/main/java/codechicken/nei/NEIClientUtils.java b/src/main/java/codechicken/nei/NEIClientUtils.java
index 1a68d7d3..35e7a2ae 100644
--- a/src/main/java/codechicken/nei/NEIClientUtils.java
+++ b/src/main/java/codechicken/nei/NEIClientUtils.java
@@ -8,13 +8,6 @@ import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
 import static codechicken.nei.NEIClientConfig.invCreativeMode;
 import static codechicken.nei.NEIClientConfig.world;
 
-import codechicken.lib.inventory.InventoryRange;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.util.LangProxy;
-import codechicken.nei.api.GuiInfo;
-import codechicken.nei.api.IInfiniteItemHandler;
-import codechicken.nei.api.ItemInfo;
-import com.google.common.collect.Iterables;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.math.BigInteger;
@@ -33,6 +26,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.FontRenderer;
@@ -46,9 +40,20 @@ import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.input.Keyboard;
 
+import codechicken.lib.inventory.InventoryRange;
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.util.LangProxy;
+import codechicken.nei.api.GuiInfo;
+import codechicken.nei.api.IInfiniteItemHandler;
+import codechicken.nei.api.ItemInfo;
+
+import com.google.common.collect.Iterables;
+
 public class NEIClientUtils extends NEIServerUtils {
+
     public static LangProxy lang = new LangProxy("nei");
 
     /** Formats a number with group separator and at most 2 fraction digits. */
@@ -110,8 +115,7 @@ public class NEIClientUtils extends NEIServerUtils {
     }
 
     public static void decreaseSlotStack(int slotNumber) {
-        ItemStack stack = slotNumber == -999
-                ? getHeldItem()
+        ItemStack stack = slotNumber == -999 ? getHeldItem()
                 : mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
         if (stack == null) return;
 
@@ -152,7 +156,7 @@ public class NEIClientUtils extends NEIServerUtils {
     }
 
     /**
-     * @param mode      -1 = normal cheats, 0 = no infinites, 1 = replenish stack
+     * @param mode -1 = normal cheats, 0 = no infinites, 1 = replenish stack
      */
     public static void cheatItem(ItemStack stack, int button, int mode) {
         if (!canCheatItem(stack)) return;
@@ -191,16 +195,14 @@ public class NEIClientUtils extends NEIServerUtils {
         ItemStack stack = copyStack(base, i);
         if (hasSMPCounterPart()) {
             ItemStack typestack = copyStack(stack, 1);
-            if (!infinite
-                    && !canItemFitInInventory(mc().thePlayer, stack)
+            if (!infinite && !canItemFitInInventory(mc().thePlayer, stack)
                     && (mc().currentScreen instanceof GuiContainer)) {
                 GuiContainer gui = getGuiContainer();
                 final List<Iterable<Integer>> handlerSlots;
                 try {
                     GuiInfo.readLock.lock();
                     handlerSlots = GuiInfo.guiHandlers.stream()
-                            .map(handler -> handler.getItemSpawnSlots(gui, typestack))
-                            .filter(x -> x != null)
+                            .map(handler -> handler.getItemSpawnSlots(gui, typestack)).filter(x -> x != null)
                             .collect(Collectors.toCollection(LinkedList::new));
                 } finally {
                     GuiInfo.readLock.unlock();
@@ -225,7 +227,7 @@ public class NEIClientUtils extends NEIServerUtils {
                 if (given > 0) NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
             } else NEICPH.sendGiveItem(stack, infinite, true);
         } else {
-            for (int given = 0; given < stack.stackSize; ) {
+            for (int given = 0; given < stack.stackSize;) {
                 int qty = Math.min(stack.stackSize - given, stack.getMaxStackSize());
                 sendCommand(
                         getStringSetting("command.item"),
@@ -261,9 +263,7 @@ public class NEIClientUtils extends NEIServerUtils {
 
     public static boolean isValidGamemode(String s) {
         return s.equals("survival")
-                || canPerformAction(s)
-                        && Arrays.asList(getStringArrSetting("inventory.gamemodes"))
-                                .contains(s);
+                || canPerformAction(s) && Arrays.asList(getStringArrSetting("inventory.gamemodes")).contains(s);
     }
 
     public static int getNextGamemode() {
@@ -282,11 +282,10 @@ public class NEIClientUtils extends NEIServerUtils {
         if (mode == nmode) return;
 
         if (hasSMPCounterPart()) NEICPH.sendGamemode(nmode);
-        else
-            sendCommand(
-                    getStringSetting("command.creative"),
-                    getGameType(nmode),
-                    mc().thePlayer.getCommandSenderName());
+        else sendCommand(
+                getStringSetting("command.creative"),
+                getGameType(nmode),
+                mc().thePlayer.getCommandSenderName());
     }
 
     public static long getTime() {
@@ -311,9 +310,8 @@ public class NEIClientUtils extends NEIServerUtils {
         NumberFormat numberformat = NumberFormat.getIntegerInstance();
         numberformat.setGroupingUsed(false);
         MessageFormat messageformat = new MessageFormat(command);
-        for (int i = 0; i < args.length; i++)
-            if (args[i] instanceof Integer || args[i] instanceof Long)
-                messageformat.setFormatByArgumentIndex(i, numberformat);
+        for (int i = 0; i < args.length; i++) if (args[i] instanceof Integer || args[i] instanceof Long)
+            messageformat.setFormatByArgumentIndex(i, numberformat);
 
         mc().thePlayer.sendChatMessage(messageformat.format(args));
     }
@@ -349,13 +347,13 @@ public class NEIClientUtils extends NEIServerUtils {
                 continue;
             }
             if (next + 1 != i) {
-                ranges.add(new int[] {start, next});
+                ranges.add(new int[] { start, next });
                 start = next = i;
                 continue;
             }
             next = i;
         }
-        ranges.add(new int[] {start, next});
+        ranges.add(new int[] { start, next });
         return ranges;
     }
 
@@ -433,8 +431,7 @@ public class NEIClientUtils extends NEIServerUtils {
         if (Keyboard.getEventKeyState()) {
             final int keycode = Keyboard.getEventKey();
 
-            if (keycode != Keyboard.KEY_LSHIFT
-                    && keycode != Keyboard.KEY_RSHIFT
+            if (keycode != Keyboard.KEY_LSHIFT && keycode != Keyboard.KEY_RSHIFT
                     && keycode != Keyboard.KEY_LCONTROL
                     && keycode != Keyboard.KEY_RCONTROL
                     && keycode != Keyboard.KEY_LMENU
diff --git a/src/main/java/codechicken/nei/NEICompatibility.java b/src/main/java/codechicken/nei/NEICompatibility.java
index dd4a16da..9b1c59b8 100644
--- a/src/main/java/codechicken/nei/NEICompatibility.java
+++ b/src/main/java/codechicken/nei/NEICompatibility.java
@@ -1,3 +1,4 @@
 package codechicken.nei;
 
-public class NEICompatibility {}
+public class NEICompatibility {
+}
diff --git a/src/main/java/codechicken/nei/NEIController.java b/src/main/java/codechicken/nei/NEIController.java
index b245fc6c..110b7c28 100644
--- a/src/main/java/codechicken/nei/NEIController.java
+++ b/src/main/java/codechicken/nei/NEIController.java
@@ -2,6 +2,16 @@ package codechicken.nei;
 
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 
+import java.awt.Point;
+import java.util.LinkedList;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainerCreative;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.inventory.SlotCrafting;
+import net.minecraft.item.ItemStack;
+
 import codechicken.nei.api.API;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
@@ -11,16 +21,9 @@ import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
 import codechicken.nei.guihook.IContainerSlotClickHandler;
 import codechicken.nei.recipe.GuiRecipe;
-import java.awt.Point;
-import java.util.LinkedList;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.gui.inventory.GuiContainerCreative;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.inventory.SlotCrafting;
-import net.minecraft.item.ItemStack;
 
 public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler {
+
     private static final NEIController instance = new NEIController();
 
     public static GuiContainerManager manager;
@@ -82,16 +85,15 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
     public static void processCreativeCycling(InventoryPlayer inventory) {
         if (NEIClientConfig.invCreativeMode() && NEIClientUtils.controlKey()) {
             if (selectedItem != inventory.currentItem) {
-                if (inventory.currentItem == selectedItem + 1
-                        || (inventory.currentItem == 0 && selectedItem == 8)) // foward
+                if (inventory.currentItem == selectedItem + 1 || (inventory.currentItem == 0 && selectedItem == 8)) // foward
                 {
                     NEICPH.sendCreativeScroll(1);
                     inventory.currentItem = selectedItem;
                 } else if (inventory.currentItem == selectedItem - 1
                         || (inventory.currentItem == 8 && selectedItem == 0)) {
-                    NEICPH.sendCreativeScroll(-1);
-                    inventory.currentItem = selectedItem;
-                }
+                            NEICPH.sendCreativeScroll(-1);
+                            inventory.currentItem = selectedItem;
+                        }
             }
         }
 
@@ -106,8 +108,8 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
     }
 
     @Override
-    public boolean handleSlotClick(
-            GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed) {
+    public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier,
+            boolean eventconsumed) {
         if (eventconsumed || !NEIClientConfig.isEnabled() || isSpreading(gui)) return eventconsumed;
 
         if (deleteMode && slotIndex >= 0 && slot != null) {
@@ -123,12 +125,12 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
         if (button == 1 && slot instanceof SlotCrafting) // right click
         {
             for (int i1 = 0; i1 < 64; i1++) // click this slot 64 times
-            manager.handleSlotClick(slot.slotNumber, button, 0);
+                manager.handleSlotClick(slot.slotNumber, button, 0);
             return true;
         }
 
-        if (NEIClientUtils.controlKey()
-                && modifier != 4 // Drop key pressed: net.minecraft.client.gui.inventory.GuiContainer.keyTyped
+        if (NEIClientUtils.controlKey() && modifier != 4 // Drop key pressed:
+                                                         // net.minecraft.client.gui.inventory.GuiContainer.keyTyped
                 && slot != null
                 && slot.getStack() != null
                 && slot.isItemValid(slot.getStack())) {
@@ -138,8 +140,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
         if (GuiInfo.hasCustomSlots(gui)) return false;
 
-        if (slotIndex >= 0
-                && NEIClientUtils.shiftKey()
+        if (slotIndex >= 0 && NEIClientUtils.shiftKey()
                 && NEIClientUtils.getHeldItem() != null
                 && !slot.getHasStack()) {
             ItemStack held = NEIClientUtils.getHeldItem();
@@ -167,8 +168,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
         if (firstheld != nowHeld) pickedUpFromSlot = slotIndex;
 
         if (NEIClientConfig.canPerformAction("item") && NEIClientConfig.hasSMPCounterPart()) {
-            if (heldStackInfinite != null
-                    && slot != null
+            if (heldStackInfinite != null && slot != null
                     && slot.inventory == NEIClientUtils.mc().thePlayer.inventory) {
                 ItemStack stack = slot.getStack();
                 if (stack != null) {
@@ -214,9 +214,9 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
     @Override
     public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-        if (!NEIClientConfig.isEnabled()
-                || GuiInfo.hasCustomSlots(gui)
-                || !NEIClientConfig.isMouseScrollTransferEnabled()) return false;
+        if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui)
+                || !NEIClientConfig.isMouseScrollTransferEnabled())
+            return false;
 
         // slot in GuiRecipe does not contain actual stack
         // and scroll should be handled by GuiRecipe, not here
diff --git a/src/main/java/codechicken/nei/NEICreativeGuiHandler.java b/src/main/java/codechicken/nei/NEICreativeGuiHandler.java
index 7ffe412c..40e0432a 100644
--- a/src/main/java/codechicken/nei/NEICreativeGuiHandler.java
+++ b/src/main/java/codechicken/nei/NEICreativeGuiHandler.java
@@ -1,11 +1,13 @@
 package codechicken.nei;
 
-import codechicken.nei.api.INEIGuiAdapter;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiContainerCreative;
 import net.minecraft.creativetab.CreativeTabs;
 
+import codechicken.nei.api.INEIGuiAdapter;
+
 public class NEICreativeGuiHandler extends INEIGuiAdapter {
+
     @Override
     public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
         if (!(gui instanceof GuiContainerCreative)) return currentVisibility;
diff --git a/src/main/java/codechicken/nei/NEIDummySlotHandler.java b/src/main/java/codechicken/nei/NEIDummySlotHandler.java
index 8fff3807..0cfec373 100644
--- a/src/main/java/codechicken/nei/NEIDummySlotHandler.java
+++ b/src/main/java/codechicken/nei/NEIDummySlotHandler.java
@@ -1,18 +1,19 @@
 package codechicken.nei;
 
-import codechicken.lib.inventory.ContainerExtended;
-import codechicken.lib.inventory.SlotDummy;
-import codechicken.nei.api.INEIGuiAdapter;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import codechicken.lib.inventory.ContainerExtended;
+import codechicken.lib.inventory.SlotDummy;
+import codechicken.nei.api.INEIGuiAdapter;
+
 public class NEIDummySlotHandler extends INEIGuiAdapter {
+
     @Override
     public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) {
         Slot slot = gui.getSlotAtPosition(mousex, mousey);
-        if (slot instanceof SlotDummy
-                && slot.isItemValid(draggedStack)
+        if (slot instanceof SlotDummy && slot.isItemValid(draggedStack)
                 && gui.inventorySlots instanceof ContainerExtended) {
             ((SlotDummy) slot).slotClick(draggedStack, button, NEIClientUtils.shiftKey());
             NEICPH.sendDummySlotSet(slot.slotNumber, slot.getStack());
diff --git a/src/main/java/codechicken/nei/NEIModContainer.java b/src/main/java/codechicken/nei/NEIModContainer.java
index c61d780c..354df5b3 100644
--- a/src/main/java/codechicken/nei/NEIModContainer.java
+++ b/src/main/java/codechicken/nei/NEIModContainer.java
@@ -1,13 +1,20 @@
 package codechicken.nei;
 
+import java.io.File;
+import java.util.*;
+
+import net.minecraft.util.EnumChatFormatting;
+
 import codechicken.core.CommonUtils;
 import codechicken.core.launch.CodeChickenCorePlugin;
 import codechicken.nei.api.IConfigureNEI;
 import codechicken.nei.asm.NEICorePlugin;
 import codechicken.nei.config.IMCHandler;
 import codechicken.nei.recipe.GuiRecipeTab;
+
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
+
 import cpw.mods.fml.client.FMLFileResourcePack;
 import cpw.mods.fml.client.FMLFolderResourcePack;
 import cpw.mods.fml.common.DummyModContainer;
@@ -21,11 +28,9 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.VersionParser;
 import cpw.mods.fml.common.versioning.VersionRange;
-import java.io.File;
-import java.util.*;
-import net.minecraft.util.EnumChatFormatting;
 
 public class NEIModContainer extends DummyModContainer {
+
     public static LinkedList<IConfigureNEI> plugins = new LinkedList<>();
 
     private static boolean gregTech5Loaded;
@@ -42,8 +47,7 @@ public class NEIModContainer extends DummyModContainer {
         modMetadata.version = "GRADLETOKEN_VERSION";
         modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123");
         modMetadata.url = "https://github.com/GTNewHorizons/NotEnoughItems";
-        modMetadata.description =
-                "Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more; GTNH Version includes many enhancements.";
+        modMetadata.description = "Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more; GTNH Version includes many enhancements.";
         return modMetadata;
     }
 
diff --git a/src/main/java/codechicken/nei/NEIPotionGuiHandler.java b/src/main/java/codechicken/nei/NEIPotionGuiHandler.java
index d634942d..bbce8874 100644
--- a/src/main/java/codechicken/nei/NEIPotionGuiHandler.java
+++ b/src/main/java/codechicken/nei/NEIPotionGuiHandler.java
@@ -1,18 +1,21 @@
 package codechicken.nei;
 
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.api.INEIGuiAdapter;
 import java.util.Collection;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.InventoryEffectRenderer;
 import net.minecraft.potion.PotionEffect;
 
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.api.INEIGuiAdapter;
+
 /**
  * Inspired by InventoryEffectRendererGuiHandler.java in JEI
  */
 public class NEIPotionGuiHandler extends INEIGuiAdapter {
+
     @Override
     public boolean hideItemPanelSlot(GuiContainer guiContainer, int slotX, int slotY, int slotW, int slotH) {
         if (NEIClientConfig.ignorePotionOverlap()) {
diff --git a/src/main/java/codechicken/nei/NEISPH.java b/src/main/java/codechicken/nei/NEISPH.java
index 3dc87773..7bcca83e 100644
--- a/src/main/java/codechicken/nei/NEISPH.java
+++ b/src/main/java/codechicken/nei/NEISPH.java
@@ -1,14 +1,8 @@
 package codechicken.nei;
 
-import codechicken.core.CommonUtils;
-import codechicken.core.ServerUtils;
-import codechicken.lib.inventory.SlotDummy;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
-import codechicken.lib.vec.BlockCoord;
-import cpw.mods.fml.relauncher.Side;
 import java.util.LinkedList;
 import java.util.Set;
+
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.InventoryBasic;
@@ -19,7 +13,16 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityMobSpawner;
 import net.minecraft.world.World;
 
+import codechicken.core.CommonUtils;
+import codechicken.core.ServerUtils;
+import codechicken.lib.inventory.SlotDummy;
+import codechicken.lib.packet.PacketCustom;
+import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
+import codechicken.lib.vec.BlockCoord;
+import cpw.mods.fml.relauncher.Side;
+
 public class NEISPH implements IServerPacketHandler {
+
     @Override
     public void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) {
         if (!NEIServerConfig.authenticatePacket(sender, packet)) return;
@@ -120,7 +123,8 @@ public class NEISPH implements IServerPacketHandler {
                     new ContainerCreativeInv(
                             sender,
                             new ExtendedCreativeInv(
-                                    NEIServerConfig.forPlayer(sender.getCommandSenderName()), Side.SERVER)),
+                                    NEIServerConfig.forPlayer(sender.getCommandSenderName()),
+                                    Side.SERVER)),
                     (player, windowId) -> {
                         PacketCustom packet = new PacketCustom(channel, 23);
                         packet.writeBoolean(true);
diff --git a/src/main/java/codechicken/nei/NEIServerConfig.java b/src/main/java/codechicken/nei/NEIServerConfig.java
index 986f14e4..e45245e0 100644
--- a/src/main/java/codechicken/nei/NEIServerConfig.java
+++ b/src/main/java/codechicken/nei/NEIServerConfig.java
@@ -1,10 +1,5 @@
 package codechicken.nei;
 
-import codechicken.core.CommonUtils;
-import codechicken.core.ServerUtils;
-import codechicken.lib.config.ConfigFile;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.packet.PacketCustom;
 import java.io.File;
 import java.io.FileReader;
 import java.io.PrintWriter;
@@ -16,6 +11,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.init.Blocks;
@@ -25,11 +21,19 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import codechicken.core.CommonUtils;
+import codechicken.core.ServerUtils;
+import codechicken.lib.config.ConfigFile;
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.packet.PacketCustom;
+
 public class NEIServerConfig {
+
     private static MinecraftServer server;
 
     public static Logger logger = LogManager.getLogger("NotEnoughItems");
@@ -73,8 +77,7 @@ public class NEIServerConfig {
 
         serverConfig.setNewLineMode(1);
         serverConfig.getTag("permissions").useBraces();
-        serverConfig
-                .getTag("permissions")
+        serverConfig.getTag("permissions")
                 .setComment("List of players who can use these features.\nEg. time=CodeChicken, Friend1");
 
         setDefaultFeature("time");
@@ -93,7 +96,7 @@ public class NEIServerConfig {
     }
 
     private static void setDefaultFeature(String featurename, String... names) {
-        if (names.length == 0) names = new String[] {"OP"};
+        if (names.length == 0) names = new String[] { "OP" };
 
         StringBuilder list = new StringBuilder();
         for (int i = 0; i < names.length; i++) {
diff --git a/src/main/java/codechicken/nei/NEIServerUtils.java b/src/main/java/codechicken/nei/NEIServerUtils.java
index 6c02e3ea..5dde12f7 100644
--- a/src/main/java/codechicken/nei/NEIServerUtils.java
+++ b/src/main/java/codechicken/nei/NEIServerUtils.java
@@ -1,13 +1,5 @@
 package codechicken.nei;
 
-import codechicken.core.CommonUtils;
-import codechicken.core.ServerUtils;
-import codechicken.lib.inventory.InventoryRange;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.nei.util.NBTHelper;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.registry.GameRegistry;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -19,6 +11,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.zip.ZipException;
+
 import net.minecraft.command.ICommandSender;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayer;
@@ -41,9 +34,20 @@ import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldSettings.GameType;
 import net.minecraftforge.oredict.OreDictionary;
+
 import org.apache.logging.log4j.Level;
 
+import codechicken.core.CommonUtils;
+import codechicken.core.ServerUtils;
+import codechicken.lib.inventory.InventoryRange;
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.packet.PacketCustom;
+import codechicken.nei.util.NBTHelper;
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.registry.GameRegistry;
+
 public class NEIServerUtils {
+
     public static boolean isRaining(World world) {
         return world.getWorldInfo().isRaining();
     }
@@ -51,7 +55,7 @@ public class NEIServerUtils {
     public static void toggleRaining(World world, boolean notify) {
         boolean raining = !world.isRaining();
         if (!raining) // turn off
-        ((WorldServer) world).provider.resetRainAndThunder();
+            ((WorldServer) world).provider.resetRainAndThunder();
         else world.getWorldInfo().setRaining(!isRaining(world));
 
         if (notify)
@@ -114,17 +118,18 @@ public class NEIServerUtils {
     }
 
     public static void sendNotice(ICommandSender sender, IChatComponent msg, String permission) {
-        ChatComponentTranslation notice =
-                new ChatComponentTranslation("chat.type.admin", sender.getCommandSenderName(), msg.createCopy());
+        ChatComponentTranslation notice = new ChatComponentTranslation(
+                "chat.type.admin",
+                sender.getCommandSenderName(),
+                msg.createCopy());
         notice.getChatStyle().setColor(EnumChatFormatting.GRAY).setItalic(true);
 
         if (NEIServerConfig.canPlayerPerformAction("CONSOLE", permission))
             MinecraftServer.getServer().addChatMessage(notice);
 
-        for (EntityPlayer p : ServerUtils.getPlayers())
-            if (p == sender) p.addChatComponentMessage(msg);
-            else if (NEIServerConfig.canPlayerPerformAction(p.getCommandSenderName(), permission))
-                p.addChatComponentMessage(notice);
+        for (EntityPlayer p : ServerUtils.getPlayers()) if (p == sender) p.addChatComponentMessage(msg);
+        else if (NEIServerConfig.canPlayerPerformAction(p.getCommandSenderName(), permission))
+            p.addChatComponentMessage(notice);
     }
 
     /**
@@ -133,8 +138,7 @@ public class NEIServerUtils {
      * @return whether the two items are the same in terms of damage and itemID.
      */
     public static boolean areStacksSameType(ItemStack stack1, ItemStack stack2) {
-        return stack1 != null
-                && stack2 != null
+        return stack1 != null && stack2 != null
                 && (stack1.getItem() == stack2.getItem()
                         && (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
                         && ItemStack.areItemStackTagsEqual(stack2, stack1));
@@ -142,28 +146,28 @@ public class NEIServerUtils {
 
     /**
      * NBT-friendly version of {@link #areStacksSameType(ItemStack, ItemStack)}
+     * 
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same in terms of itemID, damage and NBT.
      */
     public static boolean areStacksSameTypeWithNBT(ItemStack stack1, ItemStack stack2) {
-        return stack1 != null
-                && stack2 != null
+        return stack1 != null && stack2 != null
                 && stack1.getItem() == stack2.getItem()
                 && (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
                 && NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
     }
 
     /**
-     * {@link ItemStack}s with damage -1 are wildcards allowing all damages. Eg all colours of wool are allowed to create Beds.
+     * {@link ItemStack}s with damage -1 are wildcards allowing all damages. Eg all colours of wool are allowed to
+     * create Beds.
      *
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same from the perspective of a crafting inventory.
      */
     public static boolean areStacksSameTypeCrafting(ItemStack stack1, ItemStack stack2) {
-        return stack1 != null
-                && stack2 != null
+        return stack1 != null && stack2 != null
                 && stack1.getItem() == stack2.getItem()
                 && (stack1.getItemDamage() == stack2.getItemDamage()
                         || stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE
@@ -173,13 +177,13 @@ public class NEIServerUtils {
 
     /**
      * NBT-friendly version of {@link #areStacksSameTypeCrafting(ItemStack, ItemStack)}
+     * 
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same from the perspective of a crafting inventory.
      */
     public static boolean areStacksSameTypeCraftingWithNBT(ItemStack stack1, ItemStack stack2) {
-        return stack1 != null
-                && stack2 != null
+        return stack1 != null && stack2 != null
                 && stack1.getItem() == stack2.getItem()
                 && (stack1.getItemDamage() == stack2.getItemDamage()
                         || stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE
@@ -276,18 +280,16 @@ public class NEIServerUtils {
     }
 
     public static void setGamemode(EntityPlayerMP player, int mode) {
-        if (mode < 0
-                || mode >= NEIActions.gameModes.length
-                || NEIActions.nameActionMap.containsKey(NEIActions.gameModes[mode])
-                        && !NEIServerConfig.canPlayerPerformAction(
-                                player.getCommandSenderName(), NEIActions.gameModes[mode])) return;
+        if (mode < 0 || mode >= NEIActions.gameModes.length
+                || NEIActions.nameActionMap.containsKey(NEIActions.gameModes[mode]) && !NEIServerConfig
+                        .canPlayerPerformAction(player.getCommandSenderName(), NEIActions.gameModes[mode]))
+            return;
 
         // creative+
         NEIServerConfig.forPlayer(player.getCommandSenderName()).enableAction("creative+", mode == 2);
-        if (mode == 2
-                && !(player.openContainer
-                        instanceof ContainerCreativeInv)) // open the container immediately for the client
-        NEISPH.processCreativeInv(player, true);
+        if (mode == 2 && !(player.openContainer instanceof ContainerCreativeInv)) // open the container immediately for
+                                                                                  // the client
+            NEISPH.processCreativeInv(player, true);
 
         // change it on the server
         player.theItemInWorldManager.setGameType(getGameType(mode));
@@ -331,11 +333,10 @@ public class NEIServerUtils {
         ArrayList<int[]> arraylist = new ArrayList<>();
         if (itemstack != null) {
             NBTTagList nbttaglist = itemstack.getEnchantmentTagList();
-            if (nbttaglist != null)
-                for (int i = 0; i < nbttaglist.tagCount(); i++) {
-                    NBTTagCompound tag = nbttaglist.getCompoundTagAt(i);
-                    arraylist.add(new int[] {tag.getShort("id"), tag.getShort("lvl")});
-                }
+            if (nbttaglist != null) for (int i = 0; i < nbttaglist.tagCount(); i++) {
+                NBTTagCompound tag = nbttaglist.getCompoundTagAt(i);
+                arraylist.add(new int[] { tag.getShort("id"), tag.getShort("lvl") });
+            }
         }
         return arraylist;
     }
@@ -368,7 +369,7 @@ public class NEIServerUtils {
 
     @SuppressWarnings("unchecked")
     public static ItemStack[] extractRecipeItems(Object obj) {
-        if (obj instanceof ItemStack) return new ItemStack[] {(ItemStack) obj};
+        if (obj instanceof ItemStack) return new ItemStack[] { (ItemStack) obj };
         if (obj instanceof ItemStack[]) return (ItemStack[]) obj;
         if (obj instanceof List) return ((List<ItemStack>) obj).toArray(new ItemStack[0]);
 
@@ -377,6 +378,7 @@ public class NEIServerUtils {
 
     public static List<Integer> getRange(final int start, final int end) {
         return new AbstractList<Integer>() {
+
             @Override
             public Integer get(int index) {
                 return start + index;
diff --git a/src/main/java/codechicken/nei/OffsetPositioner.java b/src/main/java/codechicken/nei/OffsetPositioner.java
index 1bc253fe..775a633c 100644
--- a/src/main/java/codechicken/nei/OffsetPositioner.java
+++ b/src/main/java/codechicken/nei/OffsetPositioner.java
@@ -1,9 +1,11 @@
 package codechicken.nei;
 
-import codechicken.nei.api.IStackPositioner;
 import java.util.ArrayList;
 
+import codechicken.nei.api.IStackPositioner;
+
 public class OffsetPositioner implements IStackPositioner {
+
     public OffsetPositioner(int x, int y) {
         offsetx = x;
         offsety = y;
diff --git a/src/main/java/codechicken/nei/PanelWidget.java b/src/main/java/codechicken/nei/PanelWidget.java
index c3875b5e..fb6bc971 100644
--- a/src/main/java/codechicken/nei/PanelWidget.java
+++ b/src/main/java/codechicken/nei/PanelWidget.java
@@ -1,5 +1,10 @@
 package codechicken.nei;
 
+import java.util.ArrayList;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.ItemPanel.ItemPanelSlot;
 import codechicken.nei.api.GuiInfo;
@@ -8,11 +13,9 @@ import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.GuiUsageRecipe;
-import java.util.ArrayList;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
 
 public abstract class PanelWidget extends Widget {
+
     protected static final int PADDING = 2;
 
     public ItemStack draggedStack;
@@ -36,6 +39,7 @@ public abstract class PanelWidget extends Widget {
         pageLabel = new Label("0/0", true);
 
         pagePrev = new Button("Prev") {
+
             public boolean onButtonPress(boolean rightclick) {
                 if (!rightclick) {
                     grid.shiftPage(-1);
@@ -50,6 +54,7 @@ public abstract class PanelWidget extends Widget {
             }
         };
         pageNext = new Button("Next") {
+
             public boolean onButtonPress(boolean rightclick) {
                 if (!rightclick) {
                     grid.shiftPage(1);
@@ -78,21 +83,24 @@ public abstract class PanelWidget extends Widget {
     public abstract int getHeight(GuiContainer gui);
 
     public void resize(GuiContainer gui) {
-        final Rectangle4i margin =
-                new Rectangle4i(getMarginLeft(gui), getMarginTop(gui), getWidth(gui), getHeight(gui));
+        final Rectangle4i margin = new Rectangle4i(
+                getMarginLeft(gui),
+                getMarginTop(gui),
+                getWidth(gui),
+                getHeight(gui));
 
         final int minWidth = 5 * ItemsGrid.SLOT_SIZE;
         final int minHeight = 9 * ItemsGrid.SLOT_SIZE;
 
         final String settingName = getPositioningSettingName();
-        int paddingLeft = (int) Math.ceil(
-                margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
-        int paddingTop = (int) Math.ceil(
-                margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
-        int paddingRight = (int) Math.ceil(
-                margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue() / 100000.0);
-        int paddingBottom = (int) Math.ceil(
-                margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue() / 100000.0);
+        int paddingLeft = (int) Math
+                .ceil(margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
+        int paddingTop = (int) Math
+                .ceil(margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
+        int paddingRight = (int) Math
+                .ceil(margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue() / 100000.0);
+        int paddingBottom = (int) Math
+                .ceil(margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue() / 100000.0);
 
         int deltaHeight = Math.min(0, margin.h - paddingTop - paddingBottom - minHeight) / 2;
 
@@ -118,20 +126,19 @@ public abstract class PanelWidget extends Widget {
         int paddingLeft = 0;
         int paddingRight = 0;
 
-        while (paddingLeft < w
-                && GuiInfo.hideItemPanelSlot(
-                        gui, new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
+        while (paddingLeft < w && GuiInfo.hideItemPanelSlot(
+                gui,
+                new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
             paddingLeft += ItemsGrid.SLOT_SIZE;
         }
 
-        while (paddingRight < w
-                && GuiInfo.hideItemPanelSlot(
-                        gui,
-                        new Rectangle4i(
-                                x + w - paddingRight - ItemsGrid.SLOT_SIZE,
-                                y,
-                                ItemsGrid.SLOT_SIZE,
-                                ItemsGrid.SLOT_SIZE))) {
+        while (paddingRight < w && GuiInfo.hideItemPanelSlot(
+                gui,
+                new Rectangle4i(
+                        x + w - paddingRight - ItemsGrid.SLOT_SIZE,
+                        y,
+                        ItemsGrid.SLOT_SIZE,
+                        ItemsGrid.SLOT_SIZE))) {
             paddingRight += ItemsGrid.SLOT_SIZE;
         }
 
@@ -180,8 +187,7 @@ public abstract class PanelWidget extends Widget {
 
     @Override
     public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
-        if (mouseDownSlot >= 0
-                && draggedStack == null
+        if (mouseDownSlot >= 0 && draggedStack == null
                 && NEIClientUtils.getHeldItem() == null
                 && NEIClientConfig.hasSMPCounterPart()) {
             ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
@@ -278,8 +284,7 @@ public abstract class PanelWidget extends Widget {
         }
 
         final GuiContainer gui = NEIClientUtils.getGuiContainer();
-        if (mouseX < gui.guiLeft
-                || mouseY < gui.guiTop
+        if (mouseX < gui.guiLeft || mouseY < gui.guiTop
                 || mouseX >= gui.guiLeft + gui.xSize
                 || mouseY >= gui.guiTop + gui.ySize) {
             draggedStack = null;
diff --git a/src/main/java/codechicken/nei/PlayerSave.java b/src/main/java/codechicken/nei/PlayerSave.java
index d2c8c23e..b92ff09e 100644
--- a/src/main/java/codechicken/nei/PlayerSave.java
+++ b/src/main/java/codechicken/nei/PlayerSave.java
@@ -1,14 +1,17 @@
 package codechicken.nei;
 
-import codechicken.core.ServerUtils;
-import codechicken.lib.inventory.InventoryUtils;
 import java.io.File;
+
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
+import codechicken.core.ServerUtils;
+import codechicken.lib.inventory.InventoryUtils;
+
 public class PlayerSave {
+
     public String username;
 
     private File saveFile;
diff --git a/src/main/java/codechicken/nei/PopupInputHandler.java b/src/main/java/codechicken/nei/PopupInputHandler.java
index 56b9ac6f..7ea149ed 100644
--- a/src/main/java/codechicken/nei/PopupInputHandler.java
+++ b/src/main/java/codechicken/nei/PopupInputHandler.java
@@ -2,10 +2,12 @@ package codechicken.nei;
 
 import static codechicken.nei.NEIClientConfig.canPerformAction;
 
-import codechicken.nei.guihook.IContainerInputHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 
+import codechicken.nei.guihook.IContainerInputHandler;
+
 public class PopupInputHandler implements IContainerInputHandler {
+
     @Override
     public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
         return false;
diff --git a/src/main/java/codechicken/nei/PositionedStack.java b/src/main/java/codechicken/nei/PositionedStack.java
index f1ad8af5..af0b062f 100644
--- a/src/main/java/codechicken/nei/PositionedStack.java
+++ b/src/main/java/codechicken/nei/PositionedStack.java
@@ -2,16 +2,17 @@ package codechicken.nei;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 /**
- * Simply an {@link ItemStack} with position.
- * Mainly used in the recipe handlers.
+ * Simply an {@link ItemStack} with position. Mainly used in the recipe handlers.
  */
 public class PositionedStack {
+
     public int relx;
     public int rely;
     public ItemStack[] items;
@@ -60,7 +61,7 @@ public class PositionedStack {
         }
         items = stacks.toArray(new ItemStack[0]);
 
-        if (items.length == 0) items = new ItemStack[] {new ItemStack(Blocks.fire)};
+        if (items.length == 0) items = new ItemStack[] { new ItemStack(Blocks.fire) };
 
         permutated = true;
         setPermutationToRender(0);
@@ -77,9 +78,9 @@ public class PositionedStack {
     public void setPermutationToRender(int index) {
         item = items[index].copy();
         if (item.getItem() == null) item = new ItemStack(Blocks.fire);
-        else if (item.getItemDamage() == OreDictionary.WILDCARD_VALUE
-                && item.getItem() != null
-                && item.getItem().isRepairable()) item.setItemDamage(0);
+        else if (item.getItemDamage() == OreDictionary.WILDCARD_VALUE && item.getItem() != null
+                && item.getItem().isRepairable())
+            item.setItemDamage(0);
     }
 
     public boolean contains(ItemStack ingredient) {
diff --git a/src/main/java/codechicken/nei/PresetsWidget.java b/src/main/java/codechicken/nei/PresetsWidget.java
index cf818596..c459ae70 100644
--- a/src/main/java/codechicken/nei/PresetsWidget.java
+++ b/src/main/java/codechicken/nei/PresetsWidget.java
@@ -2,20 +2,6 @@ package codechicken.nei;
 
 import static codechicken.nei.NEIClientUtils.translate;
 
-import codechicken.core.CommonUtils;
-import codechicken.core.gui.GuiScrollSlot;
-import codechicken.lib.gui.GuiDraw;
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemPanel.ItemPanelSlot;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.recipe.GuiRecipe;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.NBTJson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSyntaxException;
-import cpw.mods.fml.common.registry.GameRegistry;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -27,15 +13,34 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;
+
 import org.apache.commons.io.IOUtils;
 import org.lwjgl.input.Keyboard;
 
+import codechicken.core.CommonUtils;
+import codechicken.core.gui.GuiScrollSlot;
+import codechicken.lib.gui.GuiDraw;
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemPanel.ItemPanelSlot;
+import codechicken.nei.api.ItemFilter;
+import codechicken.nei.recipe.GuiRecipe;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.util.NBTJson;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSyntaxException;
+import cpw.mods.fml.common.registry.GameRegistry;
+
 public class PresetsWidget extends Widget {
 
     public static class PresetTag implements ItemFilter {
+
         public String filename = null;
         public String displayName = "";
         public boolean whitelist = true;
@@ -77,8 +82,7 @@ public class PresetsWidget extends Widget {
                 }
 
                 final JsonParser parser = new JsonParser();
-                final JsonObject metaObject =
-                        parser.parse(itemStrings.remove(0)).getAsJsonObject();
+                final JsonObject metaObject = parser.parse(itemStrings.remove(0)).getAsJsonObject();
                 final String displayName = metaObject.get("displayName").getAsString();
                 final boolean whitelist = metaObject.get("whitelist").getAsBoolean();
                 final HashSet<String> items = new HashSet<>();
@@ -149,6 +153,7 @@ public class PresetsWidget extends Widget {
     }
 
     protected static class SubsetListBox extends GuiScrollSlot {
+
         protected final List<PresetTag> presets = new ArrayList<>();
         protected final List<PresetTag> selected = new ArrayList<>();
         protected int lastSelectedIndex = 0;
@@ -159,12 +164,12 @@ public class PresetsWidget extends Widget {
 
             try {
 
-                presets.addAll(ItemList.forkJoinPool
-                        .submit(() -> Arrays.asList(presetsDir.listFiles()).parallelStream()
-                                .map(f -> PresetTag.loadFromFile(f))
-                                .filter(p -> p != null)
-                                .collect(Collectors.toCollection(ArrayList::new)))
-                        .get());
+                presets.addAll(
+                        ItemList.forkJoinPool.submit(
+                                () -> Arrays.asList(presetsDir.listFiles()).parallelStream()
+                                        .map(f -> PresetTag.loadFromFile(f)).filter(p -> p != null)
+                                        .collect(Collectors.toCollection(ArrayList::new)))
+                                .get());
 
             } catch (InterruptedException | ExecutionException e) {
                 e.printStackTrace();
@@ -312,10 +317,10 @@ public class PresetsWidget extends Widget {
             final int directionState = direction.contains(x + mx, y + my) ? 1 : 2;
             final int deleteState = delete.contains(x + mx, y + my) ? 1 : 2;
 
-            final String displayName =
-                    NEIClientUtils.cropText(PresetsWidget.fontRenderer, tag.displayName, option.w - 6);
-            final String dirName =
-                    tag.whitelist ? translate("presets.whitelist.label") : translate("presets.blacklist.label");
+            final String displayName = NEIClientUtils
+                    .cropText(PresetsWidget.fontRenderer, tag.displayName, option.w - 6);
+            final String dirName = tag.whitelist ? translate("presets.whitelist.label")
+                    : translate("presets.blacklist.label");
 
             // blacklist or whitelist
             LayoutManager.getLayoutStyle()
@@ -408,6 +413,7 @@ public class PresetsWidget extends Widget {
     }
 
     protected static class MouseSelection {
+
         public int startX = -1;
         public int startY = -1;
         public int startIndex = -1;
@@ -520,8 +526,7 @@ public class PresetsWidget extends Widget {
 
         @Override
         public String getRenderLabel() {
-            return edit != null && edit.whitelist
-                    ? translate("presets.whitelist.label")
+            return edit != null && edit.whitelist ? translate("presets.whitelist.label")
                     : translate("presets.blacklist.label");
         }
 
@@ -529,8 +534,7 @@ public class PresetsWidget extends Widget {
         public void addTooltips(List<String> tooltip) {
             if (edit != null) {
                 tooltip.add(
-                        edit.whitelist
-                                ? translate("presets.whitelist.tooltip")
+                        edit.whitelist ? translate("presets.whitelist.tooltip")
                                 : translate("presets.blacklist.tooltip"));
             }
         }
@@ -627,8 +631,7 @@ public class PresetsWidget extends Widget {
     protected static String getModId(final ItemStack stack) {
         try {
             return GameRegistry.findUniqueIdentifierFor(stack.getItem()).modId;
-        } catch (Exception ignored) {
-        }
+        } catch (Exception ignored) {}
 
         return null;
     }
@@ -674,8 +677,7 @@ public class PresetsWidget extends Widget {
             final List<PresetTag> selected = listbox.getSelected();
             final int size = selected.size();
 
-            selectedValue.text = size > 1
-                    ? translate("presets.label.selected", size)
+            selectedValue.text = size > 1 ? translate("presets.label.selected", size)
                     : (size == 1 ? selected.get(0).displayName : "");
             selectedValue.y = y;
             selectedValue.h = h;
@@ -782,8 +784,7 @@ public class PresetsWidget extends Widget {
             return false;
         }
 
-        if (selectedDisplayName.focused()
-                && (keyID == Keyboard.KEY_RETURN || keyID == Keyboard.KEY_NUMPADENTER)
+        if (selectedDisplayName.focused() && (keyID == Keyboard.KEY_RETURN || keyID == Keyboard.KEY_NUMPADENTER)
                 && !selectedDisplayName.text().isEmpty()) {
             selectedDisplayName.handleKeyPress(keyID, keyChar);
             selectedDisplayName.setFocus(false);
diff --git a/src/main/java/codechicken/nei/RestartableTask.java b/src/main/java/codechicken/nei/RestartableTask.java
index 798ee617..85ab95a2 100644
--- a/src/main/java/codechicken/nei/RestartableTask.java
+++ b/src/main/java/codechicken/nei/RestartableTask.java
@@ -1,6 +1,7 @@
 package codechicken.nei;
 
 public abstract class RestartableTask {
+
     public final String name;
     private Thread thread;
     private volatile boolean restart;
@@ -14,14 +15,13 @@ public abstract class RestartableTask {
 
     private void start() {
         thread = new Thread(name) {
+
             @Override
             public void run() {
                 do {
-                    while (stopped)
-                        try {
-                            Thread.sleep(1);
-                        } catch (InterruptedException ignored) {
-                        }
+                    while (stopped) try {
+                        Thread.sleep(1);
+                    } catch (InterruptedException ignored) {}
                     if (!restart) execute();
                 } while (!finish());
             }
@@ -52,7 +52,8 @@ public abstract class RestartableTask {
     }
 
     /**
-     * Stops execution until restart is called. If a thread is running, the restart flag will be set, and the thread will be paused once the execute method exits.
+     * Stops execution until restart is called. If a thread is running, the restart flag will be set, and the thread
+     * will be paused once the execute method exits.
      */
     public synchronized void stop() {
         if (thread != null) {
diff --git a/src/main/java/codechicken/nei/SearchField.java b/src/main/java/codechicken/nei/SearchField.java
index 3ac1c521..c929d40b 100644
--- a/src/main/java/codechicken/nei/SearchField.java
+++ b/src/main/java/codechicken/nei/SearchField.java
@@ -2,6 +2,13 @@ package codechicken.nei;
 
 import static codechicken.nei.NEIClientConfig.world;
 
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import net.minecraft.util.EnumChatFormatting;
+
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.ItemList.AnyMultiItemFilter;
 import codechicken.nei.ItemList.EverythingItemFilter;
@@ -10,17 +17,14 @@ import codechicken.nei.api.API;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
 import codechicken.nei.util.TextHistory;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-import net.minecraft.util.EnumChatFormatting;
 
 public class SearchField extends TextField implements ItemFilterProvider {
+
     /**
      * Interface for returning a custom filter based on search field text
      */
     public static interface ISearchProvider {
+
         /**
          * @return false if this filter should only be used if no other non-default filters match the search string
          */
@@ -33,6 +37,7 @@ public class SearchField extends TextField implements ItemFilterProvider {
     }
 
     private static class DefaultSearchProvider implements ISearchProvider {
+
         @Override
         public boolean isPrimary() {
             return false;
@@ -145,8 +150,7 @@ public class SearchField extends TextField implements ItemFilterProvider {
         Pattern pattern = null;
         try {
             pattern = Pattern.compile(search);
-        } catch (PatternSyntaxException ignored) {
-        }
+        } catch (PatternSyntaxException ignored) {}
         return pattern == null || pattern.toString().length() == 0 ? null : pattern;
     }
 
@@ -178,12 +182,10 @@ public class SearchField extends TextField implements ItemFilterProvider {
 
     private boolean handleNavigateHistory(TextHistory.Direction direction) {
         if (focused()) {
-            return history.get(direction, text())
-                    .map(newText -> {
-                        setText(newText);
-                        return true;
-                    })
-                    .orElse(false);
+            return history.get(direction, text()).map(newText -> {
+                setText(newText);
+                return true;
+            }).orElse(false);
         }
         return false;
     }
diff --git a/src/main/java/codechicken/nei/ServerHandler.java b/src/main/java/codechicken/nei/ServerHandler.java
index 99ea8fc0..1a10c793 100644
--- a/src/main/java/codechicken/nei/ServerHandler.java
+++ b/src/main/java/codechicken/nei/ServerHandler.java
@@ -1,5 +1,13 @@
 package codechicken.nei;
 
+import java.util.List;
+
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
+
 import codechicken.core.CommonUtils;
 import codechicken.lib.packet.PacketCustom;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -10,14 +18,9 @@ import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
-import java.util.List;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.WorldEvent;
 
 public class ServerHandler {
+
     private static ServerHandler instance;
 
     public static void load() {
@@ -32,11 +35,10 @@ public class ServerHandler {
 
     @SubscribeEvent
     public void tickEvent(TickEvent.WorldTickEvent event) {
-        if (event.phase == Phase.START
-                && !event.world.isRemote
-                && NEIServerConfig.dimTags.containsKey(
-                        CommonUtils.getDimension(event.world))) // fake worlds that don't call Load
-        processDisabledProperties(event.world);
+        if (event.phase == Phase.START && !event.world.isRemote
+                && NEIServerConfig.dimTags.containsKey(CommonUtils.getDimension(event.world))) // fake worlds that don't
+                                                                                               // call Load
+            processDisabledProperties(event.world);
     }
 
     @SubscribeEvent
@@ -72,8 +74,8 @@ public class ServerHandler {
         double maxspeedy = 0.5;
         double speedxz = 0.05;
         double speedy = 0.07;
-        List<EntityItem> items = player.worldObj.getEntitiesWithinAABB(
-                EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
+        List<EntityItem> items = player.worldObj
+                .getEntitiesWithinAABB(EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
         for (EntityItem item : items) {
             if (item.delayBeforeCanPickup > 0) continue;
             if (!NEIServerUtils.canItemFitInInventory(player, item.getEntityItem())) continue;
diff --git a/src/main/java/codechicken/nei/SlotOP.java b/src/main/java/codechicken/nei/SlotOP.java
index bc182830..57d2dbbe 100644
--- a/src/main/java/codechicken/nei/SlotOP.java
+++ b/src/main/java/codechicken/nei/SlotOP.java
@@ -1,6 +1,7 @@
 package codechicken.nei;
 
 public abstract class SlotOP {
+
     public abstract String getDescription();
 
     public abstract int[] getKeyBind();
diff --git a/src/main/java/codechicken/nei/SpawnerRenderer.java b/src/main/java/codechicken/nei/SpawnerRenderer.java
index df95c0ae..1bda171a 100644
--- a/src/main/java/codechicken/nei/SpawnerRenderer.java
+++ b/src/main/java/codechicken/nei/SpawnerRenderer.java
@@ -1,7 +1,5 @@
 package codechicken.nei;
 
-import codechicken.core.ClientUtils;
-import codechicken.lib.render.CCRenderState;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -13,10 +11,15 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.client.IItemRenderer;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import codechicken.core.ClientUtils;
+import codechicken.lib.render.CCRenderState;
+
 public class SpawnerRenderer implements IItemRenderer {
+
     @Override
     public boolean handleRenderType(ItemStack item, ItemRenderType type) {
         return true;
diff --git a/src/main/java/codechicken/nei/SubsetWidget.java b/src/main/java/codechicken/nei/SubsetWidget.java
index 116c5b11..9625f874 100644
--- a/src/main/java/codechicken/nei/SubsetWidget.java
+++ b/src/main/java/codechicken/nei/SubsetWidget.java
@@ -2,18 +2,6 @@ package codechicken.nei;
 
 import static codechicken.nei.NEIClientUtils.translate;
 
-import codechicken.core.gui.GuiScrollSlot;
-import codechicken.lib.gui.GuiDraw;
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemList.AnyMultiItemFilter;
-import codechicken.nei.ItemList.ItemsLoadedCallback;
-import codechicken.nei.ItemList.NothingItemFilter;
-import codechicken.nei.SearchField.ISearchProvider;
-import codechicken.nei.api.API;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.api.ItemFilter.ItemFilterProvider;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.guihook.GuiContainerManager;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,24 +15,42 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.regex.Pattern;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.EnumChatFormatting;
 
+import codechicken.core.gui.GuiScrollSlot;
+import codechicken.lib.gui.GuiDraw;
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemList.AnyMultiItemFilter;
+import codechicken.nei.ItemList.ItemsLoadedCallback;
+import codechicken.nei.ItemList.NothingItemFilter;
+import codechicken.nei.SearchField.ISearchProvider;
+import codechicken.nei.api.API;
+import codechicken.nei.api.ItemFilter;
+import codechicken.nei.api.ItemFilter.ItemFilterProvider;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.guihook.GuiContainerManager;
+
 public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoadedCallback, ISearchProvider {
+
     public static ReentrantReadWriteLock hiddenItemLock = new ReentrantReadWriteLock();
     public static Lock writeLock = hiddenItemLock.writeLock();
     public static Lock readLock = hiddenItemLock.readLock();
 
     public static class SubsetState {
+
         int state = 2;
         ArrayList<ItemStack> items = new ArrayList<>();
     }
 
     public static class SubsetTag {
+
         protected class SubsetSlot extends GuiScrollSlot {
+
             public SubsetSlot() {
                 super(0, 0, 0, 0);
                 setSmoothScroll(false);
@@ -190,10 +196,9 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa
             } else {
                 String childname = name.substring(0, idx);
                 SubsetTag child = children.get(childname.toLowerCase());
-                if (child == null)
-                    children.put(
-                            childname.toLowerCase(),
-                            child = new SubsetTag(fullname == null ? childname : fullname + '.' + childname));
+                if (child == null) children.put(
+                        childname.toLowerCase(),
+                        child = new SubsetTag(fullname == null ? childname : fullname + '.' + childname));
                 recacheChildren();
                 child.addTag(tag);
             }
@@ -533,6 +538,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa
     }
 
     private static final RestartableTask prepareDirtyHiddenItems = new RestartableTask("NEI Subset Save Thread") {
+
         private List<ItemStack> getList() {
             try {
                 if (readLock.tryLock(5, TimeUnit.SECONDS)) {
@@ -566,6 +572,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa
     private static final UpdateStateTask updateState = new UpdateStateTask();
 
     private static class UpdateStateTask extends RestartableTask {
+
         private volatile boolean reallocate;
 
         public UpdateStateTask() {
@@ -599,9 +606,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider, ItemsLoa
                 for (ItemStack item : ItemList.items) {
                     if (interrupted()) return;
                     if (ItemInfo.isHidden(item)) continue;
-                    for (SubsetTag tag : tags)
-                        if (tag.filter.matches(item))
-                            state.get(tag.fullname).items.add(item);
+                    for (SubsetTag tag : tags) if (tag.filter.matches(item)) state.get(tag.fullname).items.add(item);
                 }
             }
 
diff --git a/src/main/java/codechicken/nei/TextField.java b/src/main/java/codechicken/nei/TextField.java
index fcbf2e85..e7bc956b 100644
--- a/src/main/java/codechicken/nei/TextField.java
+++ b/src/main/java/codechicken/nei/TextField.java
@@ -2,9 +2,11 @@ package codechicken.nei;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiTextField;
+
 import org.lwjgl.input.Keyboard;
 
 public abstract class TextField extends Widget {
+
     protected GuiTextField field;
 
     private static final int maxSearchLength = 256;
@@ -23,7 +25,7 @@ public abstract class TextField extends Widget {
     public TextField(String ident) {
         identifier = ident;
         initInternalTextField();
-        //        Keyboard.enableRepeatEvents(true);
+        // Keyboard.enableRepeatEvents(true);
     }
 
     public int getTextColour() {
diff --git a/src/main/java/codechicken/nei/ThreadOperationTimer.java b/src/main/java/codechicken/nei/ThreadOperationTimer.java
index b4e49209..e0e6979a 100644
--- a/src/main/java/codechicken/nei/ThreadOperationTimer.java
+++ b/src/main/java/codechicken/nei/ThreadOperationTimer.java
@@ -4,8 +4,10 @@ import com.google.common.base.Objects;
 import cpw.mods.fml.common.FMLCommonHandler;
 
 public class ThreadOperationTimer extends Thread {
+
     @SuppressWarnings("serial")
     public static class TimeoutException extends RuntimeException {
+
         public final Object operation;
 
         public TimeoutException(String msg, Object op) {
@@ -48,10 +50,13 @@ public class ThreadOperationTimer extends Thread {
     @SuppressWarnings("deprecation")
     @Override
     public void run() {
-        if (FMLCommonHandler.instance()
-                .findContainerFor("NotEnoughItems")
-                .getVersion()
-                .contains("$")) return; // don't run this thread in a source environment
+        if (FMLCommonHandler.instance().findContainerFor("NotEnoughItems").getVersion().contains("$")) return; // don't
+                                                                                                               // run
+                                                                                                               // this
+                                                                                                               // thread
+                                                                                                               // in a
+                                                                                                               // source
+                                                                                                               // environment
 
         while (thread.isAlive()) {
             synchronized (this) {
@@ -63,8 +68,7 @@ public class ThreadOperationTimer extends Thread {
             }
             try {
                 Thread.sleep(50);
-            } catch (InterruptedException ie) {
-            }
+            } catch (InterruptedException ie) {}
         }
     }
 
diff --git a/src/main/java/codechicken/nei/VisiblityData.java b/src/main/java/codechicken/nei/VisiblityData.java
index 9995dcc7..e52d2dc3 100644
--- a/src/main/java/codechicken/nei/VisiblityData.java
+++ b/src/main/java/codechicken/nei/VisiblityData.java
@@ -1,6 +1,7 @@
 package codechicken.nei;
 
 public class VisiblityData {
+
     public boolean showUtilityButtons = true;
     /**
      * Item panel and associated buttons
diff --git a/src/main/java/codechicken/nei/Widget.java b/src/main/java/codechicken/nei/Widget.java
index 867ab7c1..7dc978d8 100644
--- a/src/main/java/codechicken/nei/Widget.java
+++ b/src/main/java/codechicken/nei/Widget.java
@@ -1,10 +1,13 @@
 package codechicken.nei;
 
-import codechicken.lib.vec.Rectangle4i;
 import java.util.List;
+
 import net.minecraft.item.ItemStack;
 
+import codechicken.lib.vec.Rectangle4i;
+
 public abstract class Widget {
+
     public Widget() {}
 
     public abstract void draw(int mx, int my);
diff --git a/src/main/java/codechicken/nei/WidgetZOrder.java b/src/main/java/codechicken/nei/WidgetZOrder.java
index 7effbad3..86259f89 100644
--- a/src/main/java/codechicken/nei/WidgetZOrder.java
+++ b/src/main/java/codechicken/nei/WidgetZOrder.java
@@ -3,6 +3,7 @@ package codechicken.nei;
 import java.util.Comparator;
 
 public class WidgetZOrder implements Comparator<Widget> {
+
     final boolean topfirst;
 
     public WidgetZOrder(boolean topfirst) {
diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java
index c921be5b..f6e41aa6 100644
--- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java
+++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java
@@ -1,8 +1,5 @@
 package codechicken.nei;
 
-import codechicken.lib.math.MathHelper;
-import codechicken.lib.render.RenderUtils;
-import codechicken.nei.KeyManager.IKeyStateTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EnumCreatureType;
@@ -13,8 +10,13 @@ import net.minecraft.world.SpawnerAnimals;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
+
 import org.lwjgl.opengl.GL11;
 
+import codechicken.lib.math.MathHelper;
+import codechicken.lib.render.RenderUtils;
+import codechicken.nei.KeyManager.IKeyStateTracker;
+
 public class WorldOverlayRenderer implements IKeyStateTracker {
 
     public static int chunkOverlay = 0;
@@ -184,136 +186,135 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
         GL11.glLineWidth(1.5F);
         GL11.glBegin(GL11.GL_LINES);
 
-        for (int cx = -4; cx <= 4; cx++)
-            for (int cz = -4; cz <= 4; cz++) {
-                double x1 = (entity.chunkCoordX + cx) << 4;
-                double z1 = (entity.chunkCoordZ + cz) << 4;
-                double x2 = x1 + 16;
-                double z2 = z1 + 16;
+        for (int cx = -4; cx <= 4; cx++) for (int cz = -4; cz <= 4; cz++) {
+            double x1 = (entity.chunkCoordX + cx) << 4;
+            double z1 = (entity.chunkCoordZ + cz) << 4;
+            double x2 = x1 + 16;
+            double z2 = z1 + 16;
 
-                double dy = 128;
-                double y1 = Math.floor(entity.posY - dy / 2);
-                double y2 = y1 + dy;
-                if (y1 < 0) {
-                    y1 = 0;
-                    y2 = dy;
-                }
+            double dy = 128;
+            double y1 = Math.floor(entity.posY - dy / 2);
+            double y2 = y1 + dy;
+            if (y1 < 0) {
+                y1 = 0;
+                y2 = dy;
+            }
 
-                if (y1 > entity.worldObj.getHeight()) {
-                    y2 = entity.worldObj.getHeight();
-                    y1 = y2 - dy;
-                }
+            if (y1 > entity.worldObj.getHeight()) {
+                y2 = entity.worldObj.getHeight();
+                y1 = y2 - dy;
+            }
 
-                double dist = Math.pow(1.5, -(cx * cx + cz * cz));
+            double dist = Math.pow(1.5, -(cx * cx + cz * cz));
 
-                GL11.glColor4d(0.9, 0, 0, dist);
-                if (cx >= 0 && cz >= 0) {
-                    GL11.glVertex3d(x2, y1, z2);
-                    GL11.glVertex3d(x2, y2, z2);
-                }
-                if (cx >= 0 && cz <= 0) {
-                    GL11.glVertex3d(x2, y1, z1);
-                    GL11.glVertex3d(x2, y2, z1);
-                }
-                if (cx <= 0 && cz >= 0) {
-                    GL11.glVertex3d(x1, y1, z2);
-                    GL11.glVertex3d(x1, y2, z2);
-                }
-                if (cx <= 0 && cz <= 0) {
-                    GL11.glVertex3d(x1, y1, z1);
-                    GL11.glVertex3d(x1, y2, z1);
-                }
+            GL11.glColor4d(0.9, 0, 0, dist);
+            if (cx >= 0 && cz >= 0) {
+                GL11.glVertex3d(x2, y1, z2);
+                GL11.glVertex3d(x2, y2, z2);
+            }
+            if (cx >= 0 && cz <= 0) {
+                GL11.glVertex3d(x2, y1, z1);
+                GL11.glVertex3d(x2, y2, z1);
+            }
+            if (cx <= 0 && cz >= 0) {
+                GL11.glVertex3d(x1, y1, z2);
+                GL11.glVertex3d(x1, y2, z2);
+            }
+            if (cx <= 0 && cz <= 0) {
+                GL11.glVertex3d(x1, y1, z1);
+                GL11.glVertex3d(x1, y2, z1);
+            }
 
-                if (cx == 0 && cz == 0) {
-                    if (chunkOverlay == 2) {
-                        dy = 32;
-                        y1 = Math.floor(entity.posY - dy / 2);
-                        y2 = y1 + dy;
-                        if (y1 < 0) {
-                            y1 = 0;
-                            y2 = dy;
-                        }
-
-                        if (y1 > entity.worldObj.getHeight()) {
-                            y2 = entity.worldObj.getHeight();
-                            y1 = y2 - dy;
-                        }
-
-                        GL11.glColor4d(0, 0.9, 0, 0.4);
-                        for (double y = (int) y1; y <= y2; y++) {
-                            GL11.glVertex3d(x2, y, z1);
-                            GL11.glVertex3d(x2, y, z2);
-                            GL11.glVertex3d(x1, y, z1);
-                            GL11.glVertex3d(x1, y, z2);
-                            GL11.glVertex3d(x1, y, z2);
-                            GL11.glVertex3d(x2, y, z2);
-                            GL11.glVertex3d(x1, y, z1);
-                            GL11.glVertex3d(x2, y, z1);
-                        }
-                        for (double h = 1; h <= 15; h++) {
-                            GL11.glVertex3d(x1 + h, y1, z1);
-                            GL11.glVertex3d(x1 + h, y2, z1);
-                            GL11.glVertex3d(x1 + h, y1, z2);
-                            GL11.glVertex3d(x1 + h, y2, z2);
-                            GL11.glVertex3d(x1, y1, z1 + h);
-                            GL11.glVertex3d(x1, y2, z1 + h);
-                            GL11.glVertex3d(x2, y1, z1 + h);
-                            GL11.glVertex3d(x2, y2, z1 + h);
-                        }
-                    } else if (chunkOverlay == 3) {
-                        int gx1 = ((entity.chunkCoordX < 0 ? entity.chunkCoordX - 3 : entity.chunkCoordX) / 3 * 3) << 4;
-                        int gz1 = ((entity.chunkCoordZ < 0 ? entity.chunkCoordZ - 3 : entity.chunkCoordZ) / 3 * 3) << 4;
-                        if (entity.chunkCoordX < 0) {
-                            gx1 += 16;
-                        }
-                        if (entity.chunkCoordZ < 0) {
-                            gz1 += 16;
-                        }
-                        int gx2 = gx1 + 48;
-                        int gz2 = gz1 + 48;
-
-                        GL11.glColor4d(0, 0.9, 0, 0.4);
-                        for (double y = (int) y1; y <= y2; y++) {
-                            GL11.glVertex3d(gx2, y, gz1);
-                            GL11.glVertex3d(gx2, y, gz2);
-                            GL11.glVertex3d(gx1, y, gz1);
-                            GL11.glVertex3d(gx1, y, gz2);
-                            GL11.glVertex3d(gx1, y, gz2);
-                            GL11.glVertex3d(gx2, y, gz2);
-                            GL11.glVertex3d(gx1, y, gz1);
-                            GL11.glVertex3d(gx2, y, gz1);
-                        }
-                        for (double h = 4; h <= 44; h += 4) {
-                            if (h % 16 == 0) {
-                                continue;
-                            }
-                            GL11.glVertex3d(gx1 + h, y1, gz1);
-                            GL11.glVertex3d(gx1 + h, y2, gz1);
-                            GL11.glVertex3d(gx1 + h, y1, gz2);
-                            GL11.glVertex3d(gx1 + h, y2, gz2);
-                            GL11.glVertex3d(gx1, y1, gz1 + h);
-                            GL11.glVertex3d(gx1, y2, gz1 + h);
-                            GL11.glVertex3d(gx2, y1, gz1 + h);
-                            GL11.glVertex3d(gx2, y2, gz1 + h);
-                        }
-
-                        GL11.glColor4d(0, 0, 0.9, 0.4);
-                        gx1 += 23;
-                        gz1 += 23;
-                        gx2 = gx1 + 1;
-                        gz2 = gz1 + 1;
-
-                        GL11.glVertex3d(gx1, y1, gz1);
-                        GL11.glVertex3d(gx1, y2, gz1);
-                        GL11.glVertex3d(gx2, y1, gz1);
-                        GL11.glVertex3d(gx2, y2, gz1);
-                        GL11.glVertex3d(gx1, y1, gz2);
-                        GL11.glVertex3d(gx1, y2, gz2);
-                        GL11.glVertex3d(gx2, y1, gz2);
-                        GL11.glVertex3d(gx2, y2, gz2);
+            if (cx == 0 && cz == 0) {
+                if (chunkOverlay == 2) {
+                    dy = 32;
+                    y1 = Math.floor(entity.posY - dy / 2);
+                    y2 = y1 + dy;
+                    if (y1 < 0) {
+                        y1 = 0;
+                        y2 = dy;
                     }
+
+                    if (y1 > entity.worldObj.getHeight()) {
+                        y2 = entity.worldObj.getHeight();
+                        y1 = y2 - dy;
+                    }
+
+                    GL11.glColor4d(0, 0.9, 0, 0.4);
+                    for (double y = (int) y1; y <= y2; y++) {
+                        GL11.glVertex3d(x2, y, z1);
+                        GL11.glVertex3d(x2, y, z2);
+                        GL11.glVertex3d(x1, y, z1);
+                        GL11.glVertex3d(x1, y, z2);
+                        GL11.glVertex3d(x1, y, z2);
+                        GL11.glVertex3d(x2, y, z2);
+                        GL11.glVertex3d(x1, y, z1);
+                        GL11.glVertex3d(x2, y, z1);
+                    }
+                    for (double h = 1; h <= 15; h++) {
+                        GL11.glVertex3d(x1 + h, y1, z1);
+                        GL11.glVertex3d(x1 + h, y2, z1);
+                        GL11.glVertex3d(x1 + h, y1, z2);
+                        GL11.glVertex3d(x1 + h, y2, z2);
+                        GL11.glVertex3d(x1, y1, z1 + h);
+                        GL11.glVertex3d(x1, y2, z1 + h);
+                        GL11.glVertex3d(x2, y1, z1 + h);
+                        GL11.glVertex3d(x2, y2, z1 + h);
+                    }
+                } else if (chunkOverlay == 3) {
+                    int gx1 = ((entity.chunkCoordX < 0 ? entity.chunkCoordX - 3 : entity.chunkCoordX) / 3 * 3) << 4;
+                    int gz1 = ((entity.chunkCoordZ < 0 ? entity.chunkCoordZ - 3 : entity.chunkCoordZ) / 3 * 3) << 4;
+                    if (entity.chunkCoordX < 0) {
+                        gx1 += 16;
+                    }
+                    if (entity.chunkCoordZ < 0) {
+                        gz1 += 16;
+                    }
+                    int gx2 = gx1 + 48;
+                    int gz2 = gz1 + 48;
+
+                    GL11.glColor4d(0, 0.9, 0, 0.4);
+                    for (double y = (int) y1; y <= y2; y++) {
+                        GL11.glVertex3d(gx2, y, gz1);
+                        GL11.glVertex3d(gx2, y, gz2);
+                        GL11.glVertex3d(gx1, y, gz1);
+                        GL11.glVertex3d(gx1, y, gz2);
+                        GL11.glVertex3d(gx1, y, gz2);
+                        GL11.glVertex3d(gx2, y, gz2);
+                        GL11.glVertex3d(gx1, y, gz1);
+                        GL11.glVertex3d(gx2, y, gz1);
+                    }
+                    for (double h = 4; h <= 44; h += 4) {
+                        if (h % 16 == 0) {
+                            continue;
+                        }
+                        GL11.glVertex3d(gx1 + h, y1, gz1);
+                        GL11.glVertex3d(gx1 + h, y2, gz1);
+                        GL11.glVertex3d(gx1 + h, y1, gz2);
+                        GL11.glVertex3d(gx1 + h, y2, gz2);
+                        GL11.glVertex3d(gx1, y1, gz1 + h);
+                        GL11.glVertex3d(gx1, y2, gz1 + h);
+                        GL11.glVertex3d(gx2, y1, gz1 + h);
+                        GL11.glVertex3d(gx2, y2, gz1 + h);
+                    }
+
+                    GL11.glColor4d(0, 0, 0.9, 0.4);
+                    gx1 += 23;
+                    gz1 += 23;
+                    gx2 = gx1 + 1;
+                    gz2 = gz1 + 1;
+
+                    GL11.glVertex3d(gx1, y1, gz1);
+                    GL11.glVertex3d(gx1, y2, gz1);
+                    GL11.glVertex3d(gx2, y1, gz1);
+                    GL11.glVertex3d(gx2, y2, gz1);
+                    GL11.glVertex3d(gx1, y1, gz2);
+                    GL11.glVertex3d(gx1, y2, gz2);
+                    GL11.glVertex3d(gx2, y1, gz2);
+                    GL11.glVertex3d(gx2, y2, gz2);
                 }
             }
+        }
 
         GL11.glEnd();
         GL11.glEnable(GL11.GL_LIGHTING);
diff --git a/src/main/java/codechicken/nei/api/API.java b/src/main/java/codechicken/nei/api/API.java
index 55ff2b65..461b2c57 100644
--- a/src/main/java/codechicken/nei/api/API.java
+++ b/src/main/java/codechicken/nei/api/API.java
@@ -1,5 +1,17 @@
 package codechicken.nei.api;
 
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.input.Keyboard;
+
 import codechicken.nei.ItemList;
 import codechicken.nei.ItemSorter;
 import codechicken.nei.ItemStackSet;
@@ -24,23 +36,15 @@ import codechicken.nei.recipe.IUsageHandler;
 import codechicken.nei.recipe.RecipeCatalysts;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.StackInfo;
+
 import com.google.common.collect.Sets;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import org.lwjgl.input.Keyboard;
 
 /**
- * This is the main class that handles item property configuration.
- * WARNING: DO NOT access this class until the world has been loaded
- * These methods should be called from INEIConfig implementors
+ * This is the main class that handles item property configuration. WARNING: DO NOT access this class until the world
+ * has been loaded These methods should be called from INEIConfig implementors
  */
 public class API {
+
     /**
      * Register a new Crafting Recipe handler;
      *
@@ -63,8 +67,7 @@ public class API {
      * Add a gui to the default overlay renderer with the default position
      *
      * @param classz The class of your gui
-     * @param ident  The identification string, currently
-     *               {crafting, crafting2x2, smelting, fuel, brewing}
+     * @param ident  The identification string, currently {crafting, crafting2x2, smelting, fuel, brewing}
      */
     public static void registerGuiOverlay(Class<? extends GuiContainer> classz, String ident) {
         registerGuiOverlay(classz, ident, 5, 11);
@@ -74,8 +77,7 @@ public class API {
      * Add a gui to the default overlay renderer with an offset
      *
      * @param classz The class of your gui
-     * @param ident  The identification string, currently
-     *               {crafting, crafting2x2, smelting, fuel, brewing}
+     * @param ident  The identification string, currently {crafting, crafting2x2, smelting, fuel, brewing}
      * @param x      x-offset
      * @param y      y-offset
      */
@@ -87,12 +89,11 @@ public class API {
      * Add a gui to the default overlay renderer
      *
      * @param classz     The class of your gui
-     * @param ident      The identification string, currently
-     *                   {crafting, crafting2x2, smelting, fuel, brewing}
+     * @param ident      The identification string, currently {crafting, crafting2x2, smelting, fuel, brewing}
      * @param positioner A Stack Repositioner for moving the items to the right place
      */
-    public static void registerGuiOverlay(
-            Class<? extends GuiContainer> classz, String ident, IStackPositioner positioner) {
+    public static void registerGuiOverlay(Class<? extends GuiContainer> classz, String ident,
+            IStackPositioner positioner) {
         RecipeInfo.registerGuiOverlay(classz, ident, positioner);
     }
 
@@ -101,13 +102,14 @@ public class API {
      * @param handler The handler to register
      * @param ident   The recipe identification string
      */
-    public static void registerGuiOverlayHandler(
-            Class<? extends GuiContainer> classz, IOverlayHandler handler, String ident) {
+    public static void registerGuiOverlayHandler(Class<? extends GuiContainer> classz, IOverlayHandler handler,
+            String ident) {
         RecipeInfo.registerOverlayHandler(classz, handler, ident);
     }
 
     /**
-     * Set the offset to be added to items to translate them into recipe coords on the actual gui, default is 5, 11. Primarily RecipeTransferRects
+     * Set the offset to be added to items to translate them into recipe coords on the actual gui, default is 5, 11.
+     * Primarily RecipeTransferRects
      *
      * @param classz The class of your gui
      * @param x
@@ -127,8 +129,8 @@ public class API {
     }
 
     /**
-     * Hide an item from the item panel
-     * Damage values of OreDictionary.WILDCARD_VALUE and ItemStackMap.WILDCARD_TAG tags function as wildcards for their respective variables
+     * Hide an item from the item panel Damage values of OreDictionary.WILDCARD_VALUE and ItemStackMap.WILDCARD_TAG tags
+     * function as wildcards for their respective variables
      */
     public static void hideItem(ItemStack item) {
         if (!ItemInfo.hiddenItems.contains(item)) {
@@ -149,6 +151,7 @@ public class API {
 
     /**
      * Adds an item to the item panel. Any items added using this function will override the default search pattern.
+     * 
      * @param item an item with data
      */
     public static void addItemListEntry(ItemStack item) {
@@ -171,6 +174,7 @@ public class API {
 
     /**
      * Add a custom KeyBinding to be configured in the Controls menu.
+     * 
      * @param ident      An identifier for your key, eg "shoot"
      * @param defaultKey The default value, commonly obtained from {@link Keyboard}
      */
@@ -182,6 +186,7 @@ public class API {
 
     /**
      * Add a custom KeyBinding to be configured in the Controls menu.
+     * 
      * @param ident      An identifier for your key, eg "shoot"
      * @param defaultKey The default value, commonly obtained from {@link Keyboard}
      */
@@ -196,6 +201,7 @@ public class API {
 
     /**
      * Add a new Layout Style for the NEI interface
+     * 
      * @param styleID The Unique ID to be used for storing your style in the config and cycling through avaliable styles
      * @param style   The style to add.
      */
@@ -205,6 +211,7 @@ public class API {
 
     /**
      * Registers a new Infinite Item Handler.
+     * 
      * @param handler The handler to be registered.
      */
     public static void addInfiniteItemHandler(IInfiniteItemHandler handler) {
@@ -213,6 +220,7 @@ public class API {
 
     /**
      * Registers a new Infinite Item Handler.
+     * 
      * @param block   The block to handle, null for all.
      * @param handler The handler to be registered.
      */
@@ -222,6 +230,7 @@ public class API {
 
     /**
      * Tells NEI not to perform any Fast Transfer operations on slots of a particular class
+     * 
      * @param slotClass The class of slot to be exempted
      */
     public static void addFastTransferExemptSlot(Class<? extends Slot> slotClass) {
@@ -230,8 +239,10 @@ public class API {
 
     /**
      * Register a new text handler for the block highlight tooltip with a layout specification (HEADER, BODY or FOOTER).
+     * 
      * @param handler The handler to be registered.
-     * @param layout  A HUDAugmenterRegistry.Layout entry. HEADER is displayed before BODY which is displayed before FOOTER.
+     * @param layout  A HUDAugmenterRegistry.Layout entry. HEADER is displayed before BODY which is displayed before
+     *                FOOTER.
      */
     public static void registerHighlightHandler(IHighlightHandler handler, ItemInfo.Layout... layout) {
         ItemInfo.registerHighlightHandler(handler, layout);
@@ -239,6 +250,7 @@ public class API {
 
     /**
      * Register a mode handler for overriding NEI recipe/utility/cheat mode settings.
+     * 
      * @param handler The handler to be registered.
      */
     public static void registerModeHandler(INEIModeHandler handler) {
@@ -247,6 +259,7 @@ public class API {
 
     /**
      * Register a filter provider for the item panel.
+     * 
      * @param filterProvider The filter provider to be registered.
      */
     public static void addItemFilter(ItemFilterProvider filterProvider) {
@@ -257,7 +270,8 @@ public class API {
 
     /**
      * Adds a new tag to the item subset dropdown.
-     * @param name The fully qualified name, Eg Blocks.MobSpawners. NOT case sensitive
+     * 
+     * @param name   The fully qualified name, Eg Blocks.MobSpawners. NOT case sensitive
      * @param filter A filter for matching items that fit in this subset
      */
     public static void addSubset(String name, ItemFilter filter) {
@@ -266,7 +280,8 @@ public class API {
 
     /**
      * Adds a new tag to the item subset dropdown.
-     * @param name The fully qualified name, Eg Blocks.MobSpawners. NOT case sensitive
+     * 
+     * @param name  The fully qualified name, Eg Blocks.MobSpawners. NOT case sensitive
      * @param items An iterable of itemstacks to be added as a subset
      */
     public static void addSubset(String name, Iterable<ItemStack> items) {
@@ -291,15 +306,19 @@ public class API {
 
     /**
      * Adds a new sorting option to the item panel sort menu
-     * @param name A unique id for this sort option. Will be used in the config for saving and translated in the options gui. Note that if the translation key name.tip exists, it will be used for a tooltip
+     * 
+     * @param name A unique id for this sort option. Will be used in the config for saving and translated in the options
+     *             gui. Note that if the translation key name.tip exists, it will be used for a tooltip
      */
     public static void addSortOption(String name, Comparator<ItemStack> comparator) {
         ItemSorter.add(name, comparator);
     }
 
     /**
-     * Adds an additional item list entry for an item, sorted after the rest of the items are found through the normal process
-     * @param item The item to add the variant for
+     * Adds an additional item list entry for an item, sorted after the rest of the items are found through the normal
+     * process
+     * 
+     * @param item    The item to add the variant for
      * @param variant The stack to appear in the item panel
      */
     public static void addItemVariant(Item item, ItemStack variant) {
@@ -314,10 +333,12 @@ public class API {
     }
 
     /**
-     * Adds an association between an ingredient and what it can craft. (i.e. Furnace ItemStack -> Smelting and Fuel Recipes)
-     * Allows players to see what ingredient they need to craft in order to make recipes from a recipe category.
-     * @param stack the ingredient that can craft recipes (like a furnace or crafting table)
-     * @param handler the recipe category handled by the ingredient
+     * Adds an association between an ingredient and what it can craft. (i.e. Furnace ItemStack -> Smelting and Fuel
+     * Recipes) Allows players to see what ingredient they need to craft in order to make recipes from a recipe
+     * category.
+     * 
+     * @param stack    the ingredient that can craft recipes (like a furnace or crafting table)
+     * @param handler  the recipe category handled by the ingredient
      * @param priority higher priority comes first, default to 0
      */
     public static void addRecipeCatalyst(ItemStack stack, IRecipeHandler handler, int priority) {
@@ -333,11 +354,13 @@ public class API {
     }
 
     /**
-     * Adds an association between an ingredient and what it can craft. (i.e. Furnace ItemStack -> Smelting and Fuel Recipes)
-     * Allows players to see what ingredient they need to craft in order to make recipes from a recipe category.
-     * @param stack the ingredient that can craft recipes (like a furnace or crafting table)
+     * Adds an association between an ingredient and what it can craft. (i.e. Furnace ItemStack -> Smelting and Fuel
+     * Recipes) Allows players to see what ingredient they need to craft in order to make recipes from a recipe
+     * category.
+     * 
+     * @param stack     the ingredient that can craft recipes (like a furnace or crafting table)
      * @param handlerID recipe category identifier (see also {@link RecipeCatalysts#getRecipeID(IRecipeHandler)})
-     * @param priority higher priority comes first, default to 0
+     * @param priority  higher priority comes first, default to 0
      */
     public static void addRecipeCatalyst(ItemStack stack, String handlerID, int priority) {
         RecipeCatalysts.addRecipeCatalyst(handlerID, new CatalystInfo(stack, priority));
diff --git a/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java b/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java
index 952bab10..e0397221 100644
--- a/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java
+++ b/src/main/java/codechicken/nei/api/DefaultOverlayRenderer.java
@@ -1,13 +1,17 @@
 package codechicken.nei.api;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.inventory.Slot;
+
+import org.lwjgl.opengl.GL11;
+
 import codechicken.nei.PositionedStack;
 import codechicken.nei.guihook.GuiContainerManager;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.inventory.Slot;
-import org.lwjgl.opengl.GL11;
 
 public class DefaultOverlayRenderer implements IRecipeOverlayRenderer {
+
     public DefaultOverlayRenderer(List<PositionedStack> ai, IStackPositioner positioner) {
         positioner = this.positioner = positioner;
         ingreds = new ArrayList<>();
diff --git a/src/main/java/codechicken/nei/api/GuiInfo.java b/src/main/java/codechicken/nei/api/GuiInfo.java
index e7f0c012..f09d2806 100644
--- a/src/main/java/codechicken/nei/api/GuiInfo.java
+++ b/src/main/java/codechicken/nei/api/GuiInfo.java
@@ -1,5 +1,14 @@
 package codechicken.nei.api;
 
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainerCreative;
+
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.NEIChestGuiHandler;
 import codechicken.nei.NEICreativeGuiHandler;
@@ -9,15 +18,9 @@ import codechicken.nei.recipe.CheatItemHandler;
 import codechicken.nei.recipe.FillFluidContainerHandler;
 import codechicken.nei.recipe.GuiRecipeCatalyst;
 import codechicken.nei.recipe.SearchInputDropHandler;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.gui.inventory.GuiContainerCreative;
 
 public class GuiInfo {
+
     public static final LinkedList<INEIGuiHandler> guiHandlers = new LinkedList<>();
     public static final HashSet<Class<? extends GuiContainer>> customSlotGuis = new HashSet<>();
     public static ReentrantReadWriteLock guiHandlersLock = new ReentrantReadWriteLock();
diff --git a/src/main/java/codechicken/nei/api/IConfigureNEI.java b/src/main/java/codechicken/nei/api/IConfigureNEI.java
index fd67a61d..95ff559a 100644
--- a/src/main/java/codechicken/nei/api/IConfigureNEI.java
+++ b/src/main/java/codechicken/nei/api/IConfigureNEI.java
@@ -1,10 +1,11 @@
 package codechicken.nei.api;
 
 /**
- * An nei configuration entry point should implement this class and have name "NEI<someting>Config"
- * loadConfig will only be called when NEI is installed.
+ * An nei configuration entry point should implement this class and have name "NEI<someting>Config" loadConfig will only
+ * be called when NEI is installed.
  */
 public interface IConfigureNEI {
+
     public void loadConfig();
 
     public String getName();
diff --git a/src/main/java/codechicken/nei/api/IGuiContainerOverlay.java b/src/main/java/codechicken/nei/api/IGuiContainerOverlay.java
index 3446eb0c..48597a64 100644
--- a/src/main/java/codechicken/nei/api/IGuiContainerOverlay.java
+++ b/src/main/java/codechicken/nei/api/IGuiContainerOverlay.java
@@ -4,6 +4,7 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 
 public interface IGuiContainerOverlay {
+
     GuiContainer getFirstScreen();
 
     default GuiScreen getFirstScreenGeneral() {
diff --git a/src/main/java/codechicken/nei/api/IHighlightHandler.java b/src/main/java/codechicken/nei/api/IHighlightHandler.java
index a1eaf42d..e93ff30e 100644
--- a/src/main/java/codechicken/nei/api/IHighlightHandler.java
+++ b/src/main/java/codechicken/nei/api/IHighlightHandler.java
@@ -1,19 +1,16 @@
 package codechicken.nei.api;
 
 import java.util.List;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
 public interface IHighlightHandler {
+
     public ItemStack identifyHighlight(World world, EntityPlayer player, MovingObjectPosition mop);
 
-    public List<String> handleTextData(
-            ItemStack itemStack,
-            World world,
-            EntityPlayer player,
-            MovingObjectPosition mop,
-            List<String> currenttip,
-            ItemInfo.Layout layout);
+    public List<String> handleTextData(ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop,
+            List<String> currenttip, ItemInfo.Layout layout);
 }
diff --git a/src/main/java/codechicken/nei/api/IInfiniteItemHandler.java b/src/main/java/codechicken/nei/api/IInfiniteItemHandler.java
index 1c9552bb..ec2434c8 100644
--- a/src/main/java/codechicken/nei/api/IInfiniteItemHandler.java
+++ b/src/main/java/codechicken/nei/api/IInfiniteItemHandler.java
@@ -4,6 +4,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
 public interface IInfiniteItemHandler {
+
     void onPickup(ItemStack heldItem);
 
     void onPlaceInfinite(ItemStack heldItem);
diff --git a/src/main/java/codechicken/nei/api/INEIGuiAdapter.java b/src/main/java/codechicken/nei/api/INEIGuiAdapter.java
index e762e111..ab12e41b 100644
--- a/src/main/java/codechicken/nei/api/INEIGuiAdapter.java
+++ b/src/main/java/codechicken/nei/api/INEIGuiAdapter.java
@@ -1,13 +1,15 @@
 package codechicken.nei.api;
 
-import codechicken.nei.VisiblityData;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
+import codechicken.nei.VisiblityData;
+
 /**
  * Lets you just override those things you want to
  */
@@ -41,8 +43,7 @@ public class INEIGuiAdapter implements INEIGuiHandler {
     }
 
     protected String formattingText(String displayName) {
-        return SPECIAL_REGEX_CHARS
-                .matcher(EnumChatFormatting.getTextWithoutFormattingCodes(displayName))
+        return SPECIAL_REGEX_CHARS.matcher(EnumChatFormatting.getTextWithoutFormattingCodes(displayName))
                 .replaceAll("\\\\$0");
     }
 }
diff --git a/src/main/java/codechicken/nei/api/INEIGuiHandler.java b/src/main/java/codechicken/nei/api/INEIGuiHandler.java
index 40731f80..b6af67d8 100644
--- a/src/main/java/codechicken/nei/api/INEIGuiHandler.java
+++ b/src/main/java/codechicken/nei/api/INEIGuiHandler.java
@@ -1,19 +1,22 @@
 package codechicken.nei.api;
 
-import codechicken.nei.VisiblityData;
 import java.util.List;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.VisiblityData;
+
 /**
  * If this is implemented on a gui, it will be automatically registered
  */
 public interface INEIGuiHandler {
+
     public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility);
 
     /**
-     * NEI will give the specified item to the InventoryRange returned if the player's inventory is full.
-     * Should not return null, just an empty list
+     * NEI will give the specified item to the InventoryRange returned if the player's inventory is full. Should not
+     * return null, just an empty list
      */
     public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item);
 
@@ -23,20 +26,24 @@ public interface INEIGuiHandler {
     public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui);
 
     /**
-     * Handles clicks while an itemstack has been dragged from the item panel. Use this to set configurable slots and the like.
-     * Changes made to the stackSize of the dragged stack will be kept
-     * @param gui The current gui instance
-     * @param mousex The x position of the mouse
-     * @param mousey The y position of the mouse
+     * Handles clicks while an itemstack has been dragged from the item panel. Use this to set configurable slots and
+     * the like. Changes made to the stackSize of the dragged stack will be kept
+     * 
+     * @param gui          The current gui instance
+     * @param mousex       The x position of the mouse
+     * @param mousey       The y position of the mouse
      * @param draggedStack The stack being dragged from the item panel
-     * @param button The button presed
-     * @return True if the drag n drop was handled. False to resume processing through other routes. The held stack will be deleted if draggedStack.stackSize == 0
+     * @param button       The button presed
+     * @return True if the drag n drop was handled. False to resume processing through other routes. The held stack will
+     *         be deleted if draggedStack.stackSize == 0
      */
     public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button);
 
     /**
-     * Used to prevent the item panel from drawing on top of other gui elements.
-     * This function will also be called with a 1x1 size rectangle on the mouse position for determining if the given coordinate should override item panel functions such as scrolling
+     * Used to prevent the item panel from drawing on top of other gui elements. This function will also be called with
+     * a 1x1 size rectangle on the mouse position for determining if the given coordinate should override item panel
+     * functions such as scrolling
+     * 
      * @param x The x coordinate of the rectangle bounding the slot
      * @param y The y coordinate of the rectangle bounding the slot
      * @param w The w coordinate of the rectangle bounding the slot
diff --git a/src/main/java/codechicken/nei/api/INEIModeHandler.java b/src/main/java/codechicken/nei/api/INEIModeHandler.java
index 49a6d0b7..fd0a74c2 100644
--- a/src/main/java/codechicken/nei/api/INEIModeHandler.java
+++ b/src/main/java/codechicken/nei/api/INEIModeHandler.java
@@ -1,5 +1,6 @@
 package codechicken.nei.api;
 
 public interface INEIModeHandler {
+
     public boolean isModeValid(int mode);
 }
diff --git a/src/main/java/codechicken/nei/api/IOverlayHandler.java b/src/main/java/codechicken/nei/api/IOverlayHandler.java
index c068ef13..16156721 100644
--- a/src/main/java/codechicken/nei/api/IOverlayHandler.java
+++ b/src/main/java/codechicken/nei/api/IOverlayHandler.java
@@ -1,8 +1,10 @@
 package codechicken.nei.api;
 
-import codechicken.nei.recipe.IRecipeHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 
+import codechicken.nei.recipe.IRecipeHandler;
+
 public interface IOverlayHandler {
+
     public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift);
 }
diff --git a/src/main/java/codechicken/nei/api/IRecipeOverlayRenderer.java b/src/main/java/codechicken/nei/api/IRecipeOverlayRenderer.java
index b94ef0fe..ebbdde9b 100644
--- a/src/main/java/codechicken/nei/api/IRecipeOverlayRenderer.java
+++ b/src/main/java/codechicken/nei/api/IRecipeOverlayRenderer.java
@@ -1,8 +1,10 @@
 package codechicken.nei.api;
 
-import codechicken.nei.guihook.GuiContainerManager;
 import net.minecraft.inventory.Slot;
 
+import codechicken.nei.guihook.GuiContainerManager;
+
 public interface IRecipeOverlayRenderer {
+
     public void renderOverlay(GuiContainerManager gui, Slot slot);
 }
diff --git a/src/main/java/codechicken/nei/api/IStackPositioner.java b/src/main/java/codechicken/nei/api/IStackPositioner.java
index eeef5c09..3e24db92 100644
--- a/src/main/java/codechicken/nei/api/IStackPositioner.java
+++ b/src/main/java/codechicken/nei/api/IStackPositioner.java
@@ -1,12 +1,14 @@
 package codechicken.nei.api;
 
-import codechicken.nei.PositionedStack;
 import java.util.ArrayList;
 
+import codechicken.nei.PositionedStack;
+
 /**
  * For repositioning recipes in overlay renderers.
  *
  */
 public interface IStackPositioner {
+
     public ArrayList<PositionedStack> positionStacks(ArrayList<PositionedStack> ai);
 }
diff --git a/src/main/java/codechicken/nei/api/ItemFilter.java b/src/main/java/codechicken/nei/api/ItemFilter.java
index 08dff90b..de0f32dd 100644
--- a/src/main/java/codechicken/nei/api/ItemFilter.java
+++ b/src/main/java/codechicken/nei/api/ItemFilter.java
@@ -3,10 +3,13 @@ package codechicken.nei.api;
 import net.minecraft.item.ItemStack;
 
 public interface ItemFilter {
+
     /**
-     * Provides an item filter. May be called from any thread. Returned filter should only reference objects with immutable state.
+     * Provides an item filter. May be called from any thread. Returned filter should only reference objects with
+     * immutable state.
      */
     public static interface ItemFilterProvider {
+
         public ItemFilter getFilter();
     }
 
diff --git a/src/main/java/codechicken/nei/api/ItemInfo.java b/src/main/java/codechicken/nei/api/ItemInfo.java
index 6ffac2ec..a3e584ad 100644
--- a/src/main/java/codechicken/nei/api/ItemInfo.java
+++ b/src/main/java/codechicken/nei/api/ItemInfo.java
@@ -1,26 +1,5 @@
 package codechicken.nei.api;
 
-import codechicken.core.featurehack.GameDataManipulator;
-import codechicken.nei.InfiniteStackSizeHandler;
-import codechicken.nei.InfiniteToolHandler;
-import codechicken.nei.ItemList;
-import codechicken.nei.ItemMobSpawner;
-import codechicken.nei.ItemStackMap;
-import codechicken.nei.ItemStackSet;
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.PopupInputHandler;
-import codechicken.nei.config.ArrayDumper;
-import codechicken.nei.config.HandlerDumper;
-import codechicken.nei.config.ItemPanelDumper;
-import codechicken.nei.config.RegistryDumper;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.BrewingRecipeHandler;
-import codechicken.nei.recipe.RecipeItemInputHandler;
-import com.google.common.collect.ArrayListMultimap;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.ModContainer;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,6 +7,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
+
 import net.minecraft.block.Block;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.creativetab.CreativeTabs;
@@ -59,10 +39,35 @@ import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.IShearable;
 import net.minecraftforge.oredict.OreDictionary;
 
+import codechicken.core.featurehack.GameDataManipulator;
+import codechicken.nei.InfiniteStackSizeHandler;
+import codechicken.nei.InfiniteToolHandler;
+import codechicken.nei.ItemList;
+import codechicken.nei.ItemMobSpawner;
+import codechicken.nei.ItemStackMap;
+import codechicken.nei.ItemStackSet;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.PopupInputHandler;
+import codechicken.nei.config.ArrayDumper;
+import codechicken.nei.config.HandlerDumper;
+import codechicken.nei.config.ItemPanelDumper;
+import codechicken.nei.config.RegistryDumper;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.BrewingRecipeHandler;
+import codechicken.nei.recipe.RecipeItemInputHandler;
+
+import com.google.common.collect.ArrayListMultimap;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
+
 /**
  * This is an internal class for storing information about items, to be accessed by the API
  */
 public class ItemInfo {
+
     public static enum Layout {
         HEADER,
         BODY,
@@ -83,6 +88,7 @@ public class ItemInfo {
     public static final HashMap<Item, String> itemOwners = new HashMap<>();
 
     private static class ItemStackKey {
+
         public final ItemStack stack;
 
         public ItemStackKey(ItemStack stack) {
@@ -96,8 +102,7 @@ public class ItemInfo {
             hashCode = 31 * hashCode + stack.stackSize;
             hashCode = 31 * hashCode + Item.getIdFromItem(stack.getItem());
             hashCode = 31 * hashCode + stack.getItemDamage();
-            hashCode = 31 * hashCode
-                    + (!stack.hasTagCompound() ? 0 : stack.getTagCompound().hashCode());
+            hashCode = 31 * hashCode + (!stack.hasTagCompound() ? 0 : stack.getTagCompound().hashCode());
             return hashCode;
         }
 
@@ -129,8 +134,7 @@ public class ItemInfo {
     }
 
     /**
-     * @deprecated
-     * Use field directly
+     * @deprecated Use field directly
      */
     @Deprecated
     public static List<ItemStack> getItemOverrides(Item item) {
@@ -176,22 +180,18 @@ public class ItemInfo {
 
     private static void addIDDumps() {
         API.addOption(new RegistryDumper<Item>("tools.dump.item") {
+
             @Override
             public String[] header() {
-                return new String[] {"Name", "ID", "Has Block", "Mod", "Class", "Display Name"};
+                return new String[] { "Name", "ID", "Has Block", "Mod", "Class", "Display Name" };
             }
 
             @Override
             public String[] dump(Item item, int id, String name) {
-                return new String[] {
-                    name,
-                    Integer.toString(id),
-                    Boolean.toString(Block.getBlockFromItem(item) != Blocks.air),
-                    ItemInfo.itemOwners.get(item),
-                    item.getClass().getCanonicalName(),
-                    EnumChatFormatting.getTextWithoutFormattingCodes(
-                            GuiContainerManager.itemDisplayNameShort(new ItemStack(item)))
-                };
+                return new String[] { name, Integer.toString(id),
+                        Boolean.toString(Block.getBlockFromItem(item) != Blocks.air), ItemInfo.itemOwners.get(item),
+                        item.getClass().getCanonicalName(), EnumChatFormatting.getTextWithoutFormattingCodes(
+                                GuiContainerManager.itemDisplayNameShort(new ItemStack(item))) };
             }
 
             @Override
@@ -200,25 +200,19 @@ public class ItemInfo {
             }
         });
         API.addOption(new RegistryDumper<Block>("tools.dump.block") {
+
             @Override
             public String[] header() {
-                return new String[] {"Name", "ID", "Has Item", "Mod", "Class", "Display Name"};
+                return new String[] { "Name", "ID", "Has Item", "Mod", "Class", "Display Name" };
             }
 
             @Override
             public String[] dump(Block block, int id, String name) {
                 final Item item = Item.getItemFromBlock(block);
-                return new String[] {
-                    name,
-                    Integer.toString(id),
-                    Boolean.toString(item != null),
-                    ItemInfo.itemOwners.get(block),
-                    block.getClass().getCanonicalName(),
-                    item != null
-                            ? EnumChatFormatting.getTextWithoutFormattingCodes(
-                                    GuiContainerManager.itemDisplayNameShort(new ItemStack(item)))
-                            : "null"
-                };
+                return new String[] { name, Integer.toString(id), Boolean.toString(item != null),
+                        ItemInfo.itemOwners.get(block), block.getClass().getCanonicalName(),
+                        item != null ? EnumChatFormatting.getTextWithoutFormattingCodes(
+                                GuiContainerManager.itemDisplayNameShort(new ItemStack(item))) : "null" };
             }
 
             @Override
@@ -227,15 +221,14 @@ public class ItemInfo {
             }
         });
         API.addOption(new ArrayDumper<Potion>("tools.dump.potion") {
+
             public String[] header() {
-                return new String[] {"ID", "Unlocalised name", "Class"};
+                return new String[] { "ID", "Unlocalised name", "Class" };
             }
 
             @Override
             public String[] dump(Potion potion, int id) {
-                return new String[] {
-                    Integer.toString(id), potion.getName(), potion.getClass().getCanonicalName()
-                };
+                return new String[] { Integer.toString(id), potion.getName(), potion.getClass().getCanonicalName() };
             }
 
             @Override
@@ -244,20 +237,16 @@ public class ItemInfo {
             }
         });
         API.addOption(new ArrayDumper<Enchantment>("tools.dump.enchantment") {
+
             public String[] header() {
-                return new String[] {"ID", "Unlocalised name", "Type", "Min Level", "Max Level", "Class"};
+                return new String[] { "ID", "Unlocalised name", "Type", "Min Level", "Max Level", "Class" };
             }
 
             @Override
             public String[] dump(Enchantment ench, int id) {
-                return new String[] {
-                    Integer.toString(id),
-                    ench.getName(),
-                    ench.type.toString(),
-                    Integer.toString(ench.getMinLevel()),
-                    Integer.toString(ench.getMaxLevel()),
-                    ench.getClass().getCanonicalName()
-                };
+                return new String[] { Integer.toString(id), ench.getName(), ench.type.toString(),
+                        Integer.toString(ench.getMinLevel()), Integer.toString(ench.getMaxLevel()),
+                        ench.getClass().getCanonicalName() };
             }
 
             @Override
@@ -266,19 +255,11 @@ public class ItemInfo {
             }
         });
         API.addOption(new ArrayDumper<BiomeGenBase>("tools.dump.biome") {
+
             @Override
             public String[] header() {
-                return new String[] {
-                    "ID",
-                    "Name",
-                    "Temperature",
-                    "Rainfall",
-                    "Spawn Chance",
-                    "Root Height",
-                    "Height Variation",
-                    "Types",
-                    "Class"
-                };
+                return new String[] { "ID", "Name", "Temperature", "Rainfall", "Spawn Chance", "Root Height",
+                        "Height Variation", "Types", "Class" };
             }
 
             @Override
@@ -290,17 +271,11 @@ public class ItemInfo {
                     s_types.append(t.name());
                 }
 
-                return new String[] {
-                    Integer.toString(id),
-                    biome.biomeName,
-                    Float.toString(biome.getFloatTemperature(0, 0, 0)),
-                    Float.toString(biome.getFloatRainfall()),
-                    Float.toString(biome.getSpawningChance()),
-                    Float.toString(biome.rootHeight),
-                    Float.toString(biome.heightVariation),
-                    s_types.toString(),
-                    biome.getClass().getCanonicalName()
-                };
+                return new String[] { Integer.toString(id), biome.biomeName,
+                        Float.toString(biome.getFloatTemperature(0, 0, 0)), Float.toString(biome.getFloatRainfall()),
+                        Float.toString(biome.getSpawningChance()), Float.toString(biome.rootHeight),
+                        Float.toString(biome.heightVariation), s_types.toString(),
+                        biome.getClass().getCanonicalName() };
             }
 
             @Override
@@ -319,8 +294,7 @@ public class ItemInfo {
             UniqueIdentifier ident = null;
             try {
                 ident = GameRegistry.findUniqueIdentifierFor(item);
-            } catch (Exception ignored) {
-            }
+            } catch (Exception ignored) {}
 
             if (ident == null) {
                 NEIClientConfig.logger.error("Failed to find identifier for: " + item);
@@ -410,8 +384,8 @@ public class ItemInfo {
                         item.getSubItems(item, itemTab, stackList);
                         for (ItemStack stack : stackList) set.add(stack);
                     } catch (Exception e) {
-                        NEIClientConfig.logger.error(
-                                "Error loading sub-items for: " + item + ". Tab: " + itemTab.getTabLabel(), e);
+                        NEIClientConfig.logger
+                                .error("Error loading sub-items for: " + item + ". Tab: " + itemTab.getTabLabel(), e);
                     }
                 }
             }
@@ -423,21 +397,20 @@ public class ItemInfo {
                 else if (item instanceof ItemAxe) axes.with(item);
                 else if (item instanceof ItemHoe) hoes.with(item);
                 else if (item instanceof ItemSword) swords.with(item);
-                else if (item instanceof ItemArmor)
-                    switch (((ItemArmor) item).armorType) {
-                        case 0:
-                            helmets.with(item);
-                            break;
-                        case 1:
-                            chest.with(item);
-                            break;
-                        case 2:
-                            legs.with(item);
-                            break;
-                        case 3:
-                            boots.with(item);
-                            break;
-                    }
+                else if (item instanceof ItemArmor) switch (((ItemArmor) item).armorType) {
+                    case 0:
+                        helmets.with(item);
+                        break;
+                    case 1:
+                        chest.with(item);
+                        break;
+                    case 2:
+                        legs.with(item);
+                        break;
+                    case 3:
+                        boots.with(item);
+                        break;
+                }
                 else if (item == Items.arrow || item == Items.bow) ranged.with(item);
                 else if (item == Items.fishing_rod || item == Items.flint_and_steel || item == Items.shears)
                     other.with(item);
@@ -517,8 +490,7 @@ public class ItemInfo {
 
         try {
             items.addAll(mouseoverBlock.getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0));
-        } catch (Exception ignored) {
-        }
+        } catch (Exception ignored) {}
         if (mouseoverBlock instanceof IShearable) {
             IShearable shearable = (IShearable) mouseoverBlock;
             if (shearable.isShearable(new ItemStack(Items.shears), world, x, y, z))
@@ -531,12 +503,11 @@ public class ItemInfo {
     }
 
     public static void registerHighlightHandler(IHighlightHandler handler, ItemInfo.Layout... layouts) {
-        for (ItemInfo.Layout layout : layouts)
-            ItemInfo.highlightHandlers.get(layout).add(handler);
+        for (ItemInfo.Layout layout : layouts) ItemInfo.highlightHandlers.get(layout).add(handler);
     }
 
-    public static List<String> getText(
-            ItemStack itemStack, World world, EntityPlayer player, MovingObjectPosition mop) {
+    public static List<String> getText(ItemStack itemStack, World world, EntityPlayer player,
+            MovingObjectPosition mop) {
         List<String> retString = new ArrayList<>();
 
         for (ItemInfo.Layout layout : ItemInfo.Layout.values())
@@ -550,7 +521,6 @@ public class ItemInfo {
         return itemSearchNames.computeIfAbsent(
                 new ItemStackKey(stack),
                 key -> EnumChatFormatting.getTextWithoutFormattingCodes(
-                        GuiContainerManager.concatenatedDisplayName(key.stack, true)
-                                .toLowerCase()));
+                        GuiContainerManager.concatenatedDisplayName(key.stack, true).toLowerCase()));
     }
 }
diff --git a/src/main/java/codechicken/nei/api/LayoutStyle.java b/src/main/java/codechicken/nei/api/LayoutStyle.java
index 9f4138db..5f570e91 100644
--- a/src/main/java/codechicken/nei/api/LayoutStyle.java
+++ b/src/main/java/codechicken/nei/api/LayoutStyle.java
@@ -1,11 +1,13 @@
 package codechicken.nei.api;
 
+import net.minecraft.client.gui.inventory.GuiContainer;
+
 import codechicken.nei.Button;
 import codechicken.nei.VisiblityData;
 import codechicken.nei.guihook.GuiContainerManager;
-import net.minecraft.client.gui.inventory.GuiContainer;
 
 public abstract class LayoutStyle {
+
     public abstract void init();
 
     public abstract void reset();
diff --git a/src/main/java/codechicken/nei/api/NEIInfo.java b/src/main/java/codechicken/nei/api/NEIInfo.java
index 4eb5901a..a2549cd5 100644
--- a/src/main/java/codechicken/nei/api/NEIInfo.java
+++ b/src/main/java/codechicken/nei/api/NEIInfo.java
@@ -1,11 +1,14 @@
 package codechicken.nei.api;
 
+import java.util.LinkedList;
+
+import net.minecraft.world.World;
+
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.config.OptionCycled;
-import java.util.LinkedList;
-import net.minecraft.world.World;
 
 public class NEIInfo {
+
     public static final LinkedList<INEIModeHandler> modeHandlers = new LinkedList<>();
 
     public static void load(World world) {
diff --git a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java
index 7d1f7e42..1758b933 100644
--- a/src/main/java/codechicken/nei/api/ShortcutInputHandler.java
+++ b/src/main/java/codechicken/nei/api/ShortcutInputHandler.java
@@ -1,5 +1,12 @@
 package codechicken.nei.api;
 
+import java.util.List;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.input.Mouse;
+
 import codechicken.nei.ItemPanels;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.NEIClientConfig;
@@ -8,10 +15,6 @@ import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.GuiUsageRecipe;
-import java.util.List;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-import org.lwjgl.input.Mouse;
 
 public abstract class ShortcutInputHandler {
 
diff --git a/src/main/java/codechicken/nei/api/TaggedInventoryArea.java b/src/main/java/codechicken/nei/api/TaggedInventoryArea.java
index 518afc1e..818e01eb 100644
--- a/src/main/java/codechicken/nei/api/TaggedInventoryArea.java
+++ b/src/main/java/codechicken/nei/api/TaggedInventoryArea.java
@@ -1,12 +1,14 @@
 package codechicken.nei.api;
 
 import java.util.HashSet;
+
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
 public class TaggedInventoryArea {
+
     public final HashSet<Integer> slots = new HashSet<>();
     public final String tagName;
     /**
diff --git a/src/main/java/codechicken/nei/asm/GuiContainerManagerAPITransformer.java b/src/main/java/codechicken/nei/asm/GuiContainerManagerAPITransformer.java
index efaeef8b..199f5e9a 100644
--- a/src/main/java/codechicken/nei/asm/GuiContainerManagerAPITransformer.java
+++ b/src/main/java/codechicken/nei/asm/GuiContainerManagerAPITransformer.java
@@ -3,11 +3,13 @@ package codechicken.nei.asm;
 import static org.objectweb.asm.Opcodes.POP;
 import static org.objectweb.asm.Opcodes.PUTSTATIC;
 
-import codechicken.lib.asm.ASMHelper;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 
+import codechicken.lib.asm.ASMHelper;
+
 public class GuiContainerManagerAPITransformer extends ClassVisitor {
+
     private final String tname;
     private boolean changed = false;
 
@@ -19,14 +21,18 @@ public class GuiContainerManagerAPITransformer extends ClassVisitor {
     @Override
     public MethodVisitor visitMethod(int access, String mname, String mdesc, String signature, String[] exceptions) {
         return new MethodVisitor(api, super.visitMethod(access, mname, mdesc, signature, exceptions)) {
+
             @Override
             public void visitFieldInsn(int opcode, String owner, String name, String desc) {
-                if (opcode == PUTSTATIC
-                        && "codechicken/nei/guihook/GuiContainerManager".equals(owner)
+                if (opcode == PUTSTATIC && "codechicken/nei/guihook/GuiContainerManager".equals(owner)
                         && name.endsWith("Handlers")
                         && desc.equals("Ljava/util/LinkedList;")) {
                     ASMHelper.logger.warn(
-                            "Found suspicious PUTSTATIC {} in {}#{}{}, replacing with POP!", name, tname, mname, mdesc);
+                            "Found suspicious PUTSTATIC {} in {}#{}{}, replacing with POP!",
+                            name,
+                            tname,
+                            mname,
+                            mdesc);
                     changed = true;
                     super.visitInsn(POP);
                 } else {
diff --git a/src/main/java/codechicken/nei/asm/NEICorePlugin.java b/src/main/java/codechicken/nei/asm/NEICorePlugin.java
index 25909669..f5f5e638 100644
--- a/src/main/java/codechicken/nei/asm/NEICorePlugin.java
+++ b/src/main/java/codechicken/nei/asm/NEICorePlugin.java
@@ -1,17 +1,19 @@
 package codechicken.nei.asm;
 
+import java.io.File;
+import java.util.Map;
+
 import codechicken.core.launch.CodeChickenCorePlugin;
 import codechicken.lib.asm.ASMInit;
 import cpw.mods.fml.relauncher.IFMLCallHook;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
-import java.io.File;
-import java.util.Map;
 
-@TransformerExclusions(value = {"codechicken.nei.asm"})
+@TransformerExclusions(value = { "codechicken.nei.asm" })
 @MCVersion("1.7.10")
 public class NEICorePlugin implements IFMLLoadingPlugin, IFMLCallHook {
+
     public static File location;
 
     public NEICorePlugin() {
@@ -21,7 +23,7 @@ public class NEICorePlugin implements IFMLLoadingPlugin, IFMLCallHook {
     @Override
     public String[] getASMTransformerClass() {
         CodeChickenCorePlugin.versionCheck(CodeChickenCorePlugin.mcVersion, "NotEnoughItems");
-        return new String[] {"codechicken.nei.asm.NEITransformer"};
+        return new String[] { "codechicken.nei.asm.NEITransformer" };
     }
 
     @Override
@@ -38,11 +40,7 @@ public class NEICorePlugin implements IFMLLoadingPlugin, IFMLCallHook {
     public void injectData(Map<String, Object> data) {
         location = (File) data.get("coremodLocation");
         if (location == null)
-            location = new File(getClass()
-                    .getProtectionDomain()
-                    .getCodeSource()
-                    .getLocation()
-                    .getPath());
+            location = new File(getClass().getProtectionDomain().getCodeSource().getLocation().getPath());
     }
 
     @Override
diff --git a/src/main/java/codechicken/nei/asm/NEITransformer.java b/src/main/java/codechicken/nei/asm/NEITransformer.java
index a891ac2e..ccf8ddcd 100644
--- a/src/main/java/codechicken/nei/asm/NEITransformer.java
+++ b/src/main/java/codechicken/nei/asm/NEITransformer.java
@@ -8,6 +8,20 @@ import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES;
 import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS;
 import static org.objectweb.asm.Opcodes.*;
 
+import java.util.Map;
+
+import net.minecraft.launchwrapper.IClassTransformer;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.ClassNode;
+import org.objectweb.asm.tree.FieldInsnNode;
+import org.objectweb.asm.tree.InsnList;
+import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.VarInsnNode;
+
 import codechicken.lib.asm.ASMBlock;
 import codechicken.lib.asm.ASMHelper;
 import codechicken.lib.asm.ASMInit;
@@ -22,19 +36,9 @@ import codechicken.lib.asm.ModularASMTransformer.MethodTransformer;
 import codechicken.lib.asm.ModularASMTransformer.MethodWriter;
 import codechicken.lib.asm.ObfMapping;
 import cpw.mods.fml.relauncher.FMLLaunchHandler;
-import java.util.Map;
-import net.minecraft.launchwrapper.IClassTransformer;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.InsnList;
-import org.objectweb.asm.tree.InsnNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.VarInsnNode;
 
 public class NEITransformer implements IClassTransformer {
+
     static {
         ASMInit.init();
     }
@@ -47,98 +51,114 @@ public class NEITransformer implements IClassTransformer {
         if (FMLLaunchHandler.side().isClient()) {
             // Generates method to set the placed position of a mob spawner for the item callback. More portable than
             // copying vanilla placement code
-            transformer.add(new MethodWriter(
-                    ACC_PUBLIC,
-                    new ObfMapping(
-                            "net/minecraft/block/BlockMobSpawner",
-                            "func_149689_a",
-                            "(Lnet/minecraft/world/World;IIILnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;)V"),
-                    asmblocks.get("spawnerPlaced")));
+            transformer.add(
+                    new MethodWriter(
+                            ACC_PUBLIC,
+                            new ObfMapping(
+                                    "net/minecraft/block/BlockMobSpawner",
+                                    "func_149689_a",
+                                    "(Lnet/minecraft/world/World;IIILnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;)V"),
+                            asmblocks.get("spawnerPlaced")));
 
             // Make MobSpawnerBaseLogic use getSpawnerWorld when creating new entities
-            transformer.add(new MethodReplacer(
-                    new ObfMapping(
-                            "net/minecraft/tileentity/MobSpawnerBaseLogic",
-                            "func_98281_h",
-                            "()Lnet/minecraft/entity/Entity;"),
-                    asmblocks.get("d_spawnerWorld"),
-                    asmblocks.get("spawnerWorld")));
+            transformer.add(
+                    new MethodReplacer(
+                            new ObfMapping(
+                                    "net/minecraft/tileentity/MobSpawnerBaseLogic",
+                                    "func_98281_h",
+                                    "()Lnet/minecraft/entity/Entity;"),
+                            asmblocks.get("d_spawnerWorld"),
+                            asmblocks.get("spawnerWorld")));
         }
 
         // Removes trailing seperators from NBTTagList/Compound.toString because OCD
-        transformer.add(new MethodInjector(
-                new ObfMapping("net/minecraft/nbt/NBTTagCompound", "toString", "()Ljava/lang/String;"),
-                asmblocks.get("n_commaFix"),
-                asmblocks.get("commaFix"),
-                true));
-        transformer.add(new MethodInjector(
-                new ObfMapping("net/minecraft/nbt/NBTTagList", "toString", "()Ljava/lang/String;"),
-                asmblocks.get("n_commaFix"),
-                asmblocks.get("commaFix"),
-                true));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping("net/minecraft/nbt/NBTTagCompound", "toString", "()Ljava/lang/String;"),
+                        asmblocks.get("n_commaFix"),
+                        asmblocks.get("commaFix"),
+                        true));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping("net/minecraft/nbt/NBTTagList", "toString", "()Ljava/lang/String;"),
+                        asmblocks.get("n_commaFix"),
+                        asmblocks.get("commaFix"),
+                        true));
 
         // fix workbench container losing items on shift click output without room for the full stack
         transformer.add(
-                new MethodTransformer(new ObfMapping(
-                        "net/minecraft/inventory/ContainerWorkbench",
-                        "func_82846_b",
-                        "(Lnet/minecraft/entity/player/EntityPlayer;I)Lnet/minecraft/item/ItemStack;")) {
+                new MethodTransformer(
+                        new ObfMapping(
+                                "net/minecraft/inventory/ContainerWorkbench",
+                                "func_82846_b",
+                                "(Lnet/minecraft/entity/player/EntityPlayer;I)Lnet/minecraft/item/ItemStack;")) {
+
                     @Override
                     public void transform(MethodNode mv) {
                         ASMHelper.logger.debug("NEI: Applying workbench fix");
-                        InsnListSection key = findN(mv.instructions, asmblocks.get("n_workbenchFix").list)
-                                .get(0);
+                        InsnListSection key = findN(mv.instructions, asmblocks.get("n_workbenchFix").list).get(0);
                         key.insertBefore(asmblocks.get("workbenchFix").rawListCopy());
                     }
                 });
 
         // put glint alpha into the buffer correctly for exporting
-        transformer.add(new MethodReplacer(
-                new ObfMapping("net/minecraft/client/renderer/entity/RenderItem", "func_77018_a", "(IIIII)V"),
-                asmblocks.get("d_glintAlphaFix"),
-                asmblocks.get("glintAlphaFix")));
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping("net/minecraft/client/renderer/entity/RenderItem", "func_77018_a", "(IIIII)V"),
+                        asmblocks.get("d_glintAlphaFix"),
+                        asmblocks.get("glintAlphaFix")));
 
         String GuiContainer = "net/minecraft/client/gui/inventory/GuiContainer";
         // add manager field
-        transformer.add(new FieldWriter(
-                ACC_PUBLIC, new ObfMapping(GuiContainer, "manager", "Lcodechicken/nei/guihook/GuiContainerManager;")));
+        transformer.add(
+                new FieldWriter(
+                        ACC_PUBLIC,
+                        new ObfMapping(GuiContainer, "manager", "Lcodechicken/nei/guihook/GuiContainerManager;")));
 
         // Fill out getManager in GuiContainerManager
-        transformer.add(new MethodWriter(
-                ACC_PUBLIC | ACC_STATIC,
-                new ObfMapping(
-                        "codechicken/nei/guihook/GuiContainerManager",
-                        "getManager",
-                        "(Lnet/minecraft/client/gui/inventory/GuiContainer;)Lcodechicken/nei/guihook/GuiContainerManager;"),
-                asmblocks.get("m_getManager")));
+        transformer.add(
+                new MethodWriter(
+                        ACC_PUBLIC | ACC_STATIC,
+                        new ObfMapping(
+                                "codechicken/nei/guihook/GuiContainerManager",
+                                "getManager",
+                                "(Lnet/minecraft/client/gui/inventory/GuiContainer;)Lcodechicken/nei/guihook/GuiContainerManager;"),
+                        asmblocks.get("m_getManager")));
 
         // Generate load method
-        transformer.add(new MethodWriter(
-                ACC_PUBLIC,
-                new ObfMapping(GuiContainer, "func_146280_a", "(Lnet/minecraft/client/Minecraft;II)V"),
-                asmblocks.get("m_setWorldAndResolution")));
+        transformer.add(
+                new MethodWriter(
+                        ACC_PUBLIC,
+                        new ObfMapping(GuiContainer, "func_146280_a", "(Lnet/minecraft/client/Minecraft;II)V"),
+                        asmblocks.get("m_setWorldAndResolution")));
 
         // Generate handleKeyboardInput method
-        transformer.add(new MethodWriter(
-                ACC_PUBLIC,
-                new ObfMapping(GuiContainer, "func_146282_l", "()V"),
-                asmblocks.get("m_handleKeyboardInput")));
+        transformer.add(
+                new MethodWriter(
+                        ACC_PUBLIC,
+                        new ObfMapping(GuiContainer, "func_146282_l", "()V"),
+                        asmblocks.get("m_handleKeyboardInput")));
 
         // Generate handleKeyboardInput method
-        transformer.add(new MethodWriter(
-                ACC_PUBLIC,
-                new ObfMapping(GuiContainer, "func_146282_l", "()V"),
-                asmblocks.get("m_handleKeyboardInput")));
+        transformer.add(
+                new MethodWriter(
+                        ACC_PUBLIC,
+                        new ObfMapping(GuiContainer, "func_146282_l", "()V"),
+                        asmblocks.get("m_handleKeyboardInput")));
 
         // Generate handleKeyboardInput method
-        transformer.add(new MethodWriter(
-                ACC_PUBLIC,
-                new ObfMapping(GuiContainer, "func_146282_l", "()V"),
-                asmblocks.get("m_handleKeyboardInput")));
+        transformer.add(
+                new MethodWriter(
+                        ACC_PUBLIC,
+                        new ObfMapping(GuiContainer, "func_146282_l", "()V"),
+                        asmblocks.get("m_handleKeyboardInput")));
 
         // Generate handleMouseInput method
-        transformer.add(new MethodWriter(
-                ACC_PUBLIC, new ObfMapping(GuiContainer, "func_146274_d", "()V"), asmblocks.get("m_handleMouseInput")));
+        transformer.add(
+                new MethodWriter(
+                        ACC_PUBLIC,
+                        new ObfMapping(GuiContainer, "func_146274_d", "()V"),
+                        asmblocks.get("m_handleMouseInput")));
 
         addProtectedForwarder(
                 new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
@@ -155,86 +175,111 @@ public class NEITransformer implements IClassTransformer {
                         "(Lnet/minecraft/client/gui/inventory/GuiContainer;Lnet/minecraft/inventory/Slot;III)V"));
 
         // Inject preDraw at the start of drawScreen
-        transformer.add(new MethodInjector(
-                new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"), asmblocks.get("preDraw"), true));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
+                        asmblocks.get("preDraw"),
+                        true));
 
         // Inject objectUnderMouse check before drawing slot highlights
-        transformer.add(new MethodInjector(
-                new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
-                asmblocks.get("n_objectUnderMouse"),
-                asmblocks.get("objectUnderMouse"),
-                false));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
+                        asmblocks.get("n_objectUnderMouse"),
+                        asmblocks.get("objectUnderMouse"),
+                        false));
 
         // Inject renderObjects after drawGuiContainerForegroundLayer
-        transformer.add(new MethodInjector(
-                new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
-                asmblocks.get("n_renderObjects"),
-                asmblocks.get("renderObjects"),
-                false));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
+                        asmblocks.get("n_renderObjects"),
+                        asmblocks.get("renderObjects"),
+                        false));
 
         // Replace default renderToolTip with delegate
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
-                asmblocks.get("d_renderToolTip"),
-                asmblocks.get("renderTooltips")));
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"),
+                        asmblocks.get("d_renderToolTip"),
+                        asmblocks.get("renderTooltips")));
 
         // Replace zLevel = 200 with zLevel = 500 in drawItemStack
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_146982_a", "(Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V"),
-                asmblocks.get("d_zLevel"),
-                asmblocks.get("zLevel")));
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(
+                                GuiContainer,
+                                "func_146982_a",
+                                "(Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V"),
+                        asmblocks.get("d_zLevel"),
+                        asmblocks.get("zLevel")));
 
         // Replace default renderItem with delegate and slot overlay/underlay
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_146977_a", "(Lnet/minecraft/inventory/Slot;)V"),
-                asmblocks.get("d_drawSlot"),
-                asmblocks.get("drawSlot")));
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(GuiContainer, "func_146977_a", "(Lnet/minecraft/inventory/Slot;)V"),
+                        asmblocks.get("d_drawSlot"),
+                        asmblocks.get("drawSlot")));
 
         // Inject mouseClicked hook at the start of mouseClicked
-        transformer.add(new MethodInjector(
-                new ObfMapping(GuiContainer, "func_73864_a", "(III)V"), asmblocks.get("mouseClicked"), true));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(GuiContainer, "func_73864_a", "(III)V"),
+                        asmblocks.get("mouseClicked"),
+                        true));
 
         // Replace general handleMouseClicked call with delegate
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_73864_a", "(III)V"),
-                asmblocks.get("d_handleMouseClick"),
-                asmblocks.get("handleMouseClick"))); // mouseClicked
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"),
-                asmblocks.get("d_handleMouseClick"),
-                asmblocks.get("handleMouseClick"))); // mouseClickMove
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_146286_b", "(III)V"),
-                asmblocks.get("d_handleMouseClick"),
-                asmblocks.get("handleMouseClick"))); // mouseMovedOrUp
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
-                asmblocks.get("d_handleMouseClick"),
-                asmblocks.get("handleMouseClick"))); // keyTyped
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_146983_a", "(I)Z"),
-                asmblocks.get("d_handleMouseClick"),
-                asmblocks.get("handleMouseClick"))); // checkHotbarKeys
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(GuiContainer, "func_73864_a", "(III)V"),
+                        asmblocks.get("d_handleMouseClick"),
+                        asmblocks.get("handleMouseClick"))); // mouseClicked
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"),
+                        asmblocks.get("d_handleMouseClick"),
+                        asmblocks.get("handleMouseClick"))); // mouseClickMove
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(GuiContainer, "func_146286_b", "(III)V"),
+                        asmblocks.get("d_handleMouseClick"),
+                        asmblocks.get("handleMouseClick"))); // mouseMovedOrUp
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
+                        asmblocks.get("d_handleMouseClick"),
+                        asmblocks.get("handleMouseClick"))); // keyTyped
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(GuiContainer, "func_146983_a", "(I)Z"),
+                        asmblocks.get("d_handleMouseClick"),
+                        asmblocks.get("handleMouseClick"))); // checkHotbarKeys
 
         // Write delegate for handleMouseClicked
-        transformer.add(new MethodWriter(
-                ACC_PUBLIC,
-                new ObfMapping(GuiContainer, "managerHandleMouseClick", "(Lnet/minecraft/inventory/Slot;III)V"),
-                asmblocks.get("m_managerHandleMouseClick")));
+        transformer.add(
+                new MethodWriter(
+                        ACC_PUBLIC,
+                        new ObfMapping(GuiContainer, "managerHandleMouseClick", "(Lnet/minecraft/inventory/Slot;III)V"),
+                        asmblocks.get("m_managerHandleMouseClick")));
 
         // Inject mouseDragged hook after super call in mouseDragged
-        transformer.add(new MethodInjector(
-                new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"),
-                asmblocks.get("n_mouseDragged"),
-                asmblocks.get("mouseDragged"),
-                false));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"),
+                        asmblocks.get("n_mouseDragged"),
+                        asmblocks.get("mouseDragged"),
+                        false));
 
         // Inject overrideMouseUp at the start of mouseMovedOrUp
-        transformer.add(new MethodInjector(
-                new ObfMapping(GuiContainer, "func_146286_b", "(III)V"), asmblocks.get("overrideMouseUp"), true));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(GuiContainer, "func_146286_b", "(III)V"),
+                        asmblocks.get("overrideMouseUp"),
+                        true));
 
         // Inject mouseUp at the end of main elseif chain in mouseMovedOrUp
         transformer.add(new MethodTransformer(new ObfMapping(GuiContainer, "func_146286_b", "(III)V")) {
+
             @Override
             public void transform(MethodNode mv) {
                 ASMHelper.logger.debug("NEI: Injecting mouseUp call");
@@ -252,50 +297,59 @@ public class NEITransformer implements IClassTransformer {
         });
 
         // Replace general handleSlotClick call with delegate
-        transformer.add(new MethodReplacer(
-                new ObfMapping(GuiContainer, "func_146984_a", "(Lnet/minecraft/inventory/Slot;III)V"),
-                asmblocks.get("d_handleSlotClick"),
-                asmblocks.get("handleSlotClick")));
+        transformer.add(
+                new MethodReplacer(
+                        new ObfMapping(GuiContainer, "func_146984_a", "(Lnet/minecraft/inventory/Slot;III)V"),
+                        asmblocks.get("d_handleSlotClick"),
+                        asmblocks.get("handleSlotClick")));
 
         // Inject lastKeyTyped at the start of keyTyped
-        transformer.add(new MethodInjector(
-                new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"), asmblocks.get("lastKeyTyped"), true));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
+                        asmblocks.get("lastKeyTyped"),
+                        true));
 
         // Inject updateScreen hook after super call
-        transformer.add(new MethodInjector(
-                new ObfMapping(GuiContainer, "func_73876_c", "()V"),
-                asmblocks.get("n_updateScreen"),
-                asmblocks.get("updateScreen"),
-                false));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(GuiContainer, "func_73876_c", "()V"),
+                        asmblocks.get("n_updateScreen"),
+                        asmblocks.get("updateScreen"),
+                        false));
 
         // Cancel tab click calls when tabs are obscured
-        transformer.add(new MethodInjector(
-                new ObfMapping(
-                        "net/minecraft/client/gui/inventory/GuiContainerCreative",
-                        "func_147049_a",
-                        "(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
-                asmblocks.get("handleTabClick"),
-                true));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(
+                                "net/minecraft/client/gui/inventory/GuiContainerCreative",
+                                "func_147049_a",
+                                "(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
+                        asmblocks.get("handleTabClick"),
+                        true));
 
         // Cancel tab tooltip rendering when tabs are obscured
-        transformer.add(new MethodInjector(
-                new ObfMapping(
-                        "net/minecraft/client/gui/inventory/GuiContainerCreative",
-                        "func_147052_b",
-                        "(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
-                asmblocks.get("renderTabTooltip"),
-                true));
+        transformer.add(
+                new MethodInjector(
+                        new ObfMapping(
+                                "net/minecraft/client/gui/inventory/GuiContainerCreative",
+                                "func_147052_b",
+                                "(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
+                        asmblocks.get("renderTabTooltip"),
+                        true));
 
-        String[] buttons = new String[] {"CancelButton", "ConfirmButton", "PowerButton"};
-        String[] this_fields = new String[] {"field_146146_o", "field_146147_o", "field_146150_o"};
+        String[] buttons = new String[] { "CancelButton", "ConfirmButton", "PowerButton" };
+        String[] this_fields = new String[] { "field_146146_o", "field_146147_o", "field_146150_o" };
         for (int i = 0; i < 3; i++) {
             ObfMapping m = new ObfMapping(
-                    "net/minecraft/client/gui/inventory/GuiBeacon$" + buttons[i], "func_146111_b", "(II)V");
+                    "net/minecraft/client/gui/inventory/GuiBeacon$" + buttons[i],
+                    "func_146111_b",
+                    "(II)V");
             InsnListSection l = asmblocks.get("beaconButtonObscured").list.copy();
             FieldInsnNode this_ref = ((FieldInsnNode) l.get(1));
             this_ref.owner = m.toClassloading().s_owner;
             if (ObfMapping.obfuscated) // missing srg mappings for inner outer reference fields
-            this_ref.name = ObfMapping.obfMapper.mapFieldName(null, this_fields[i], null);
+                this_ref.name = ObfMapping.obfMapper.mapFieldName(null, this_fields[i], null);
             transformer.add(new MethodInjector(m, l.list, true));
         }
     }
@@ -321,8 +375,9 @@ public class NEITransformer implements IClassTransformer {
         transformer.add(new MethodWriter(ACC_PUBLIC, publicCall, forward2));
     }
 
-    private final ObfMapping c_GuiContainer =
-            new ObfMapping("net/minecraft/client/gui/inventory/GuiContainer").toClassloading();
+    private final ObfMapping c_GuiContainer = new ObfMapping("net/minecraft/client/gui/inventory/GuiContainer")
+            .toClassloading();
+
     /**
      * Adds super.updateScreen() to non implementing GuiContainer subclasses
      */
diff --git a/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java b/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java
index a7f9990c..9155bd4c 100644
--- a/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java
+++ b/src/main/java/codechicken/nei/asm/OreDictionaryVisitor.java
@@ -10,49 +10,54 @@ import org.objectweb.asm.MethodVisitor;
 
 /**
  * Code without this patch
+ * 
  * <pre>
  * public class OreDictionary {
- * public static int getOreID(String name) {
- * Integer val = nameToId.get(name);
- * if (val == null)
- * {
- * idToName.add(name);
- * val = idToName.size() - 1; //0 indexed
- * nameToId.put(name, val);
- * idToStack.add(new ArrayList<ItemStack>());
- * idToStackUn.add(new UnmodifiableArrayList(idToStack.get(val)));
- * }
- * return val;
- * }
+ * 
+ *     public static int getOreID(String name) {
+ *         Integer val = nameToId.get(name);
+ *         if (val == null) {
+ *             idToName.add(name);
+ *             val = idToName.size() - 1; // 0 indexed
+ *             nameToId.put(name, val);
+ *             idToStack.add(new ArrayList<ItemStack>());
+ *             idToStackUn.add(new UnmodifiableArrayList(idToStack.get(val)));
+ *         }
+ *         return val;
+ *     }
  * }
  * </pre>
+ * 
  * Code with this patch
+ * 
  * <pre>
  * public class OreDictionary {
- * private static final Object emptyEntryCreationLock = new Object();
- * public static int getOreID(String name) {
- * Integer val = nameToId.get(name);
- * if (val == null)
- * {
- * synchronized (emptyEntryCreationLock) {
- * if ((val = nameToId.get(name)) != null)
- * return val;
- * idToName.add(name);
- * val = idToName.size() - 1; //0 indexed
- * nameToId.put(name, val);
- * idToStack.add(new ArrayList<ItemStack>());
- * idToStackUn.add(new UnmodifiableArrayList(idToStack.get(val)));
- * }
- * }
- * return val;
- * }
+ * 
+ *     private static final Object emptyEntryCreationLock = new Object();
+ * 
+ *     public static int getOreID(String name) {
+ *         Integer val = nameToId.get(name);
+ *         if (val == null) {
+ *             synchronized (emptyEntryCreationLock) {
+ *                 if ((val = nameToId.get(name)) != null) return val;
+ *                 idToName.add(name);
+ *                 val = idToName.size() - 1; // 0 indexed
+ *                 nameToId.put(name, val);
+ *                 idToStack.add(new ArrayList<ItemStack>());
+ *                 idToStackUn.add(new UnmodifiableArrayList(idToStack.get(val)));
+ *             }
+ *         }
+ *         return val;
+ *     }
  * }
  * </pre>
  */
 public class OreDictionaryVisitor extends ClassVisitor {
+
     private static final Logger logger = LogManager.getLogger("OreDictionaryVisitor");
 
     private static class GetOreIDVisitor extends MethodVisitor {
+
         Label jumpEnd;
         Label catchStart = new Label();
         Label exitStart = new Label();
@@ -118,6 +123,7 @@ public class OreDictionaryVisitor extends ClassVisitor {
     }
 
     private static class ClassInitializerVisitor extends MethodVisitor {
+
         public ClassInitializerVisitor(int api, MethodVisitor mv) {
             super(api, mv);
         }
diff --git a/src/main/java/codechicken/nei/config/ArrayDumper.java b/src/main/java/codechicken/nei/config/ArrayDumper.java
index cda62ac5..8ca9014c 100644
--- a/src/main/java/codechicken/nei/config/ArrayDumper.java
+++ b/src/main/java/codechicken/nei/config/ArrayDumper.java
@@ -3,6 +3,7 @@ package codechicken.nei.config;
 import java.util.LinkedList;
 
 public abstract class ArrayDumper<T> extends DataDumper {
+
     public ArrayDumper(String name) {
         super(name);
     }
@@ -14,7 +15,7 @@ public abstract class ArrayDumper<T> extends DataDumper {
         for (int i = 0; i < array.length; i++) {
             T obj = array[i];
             if (obj == null) {
-                if (mode == 1 || mode == 2) list.add(new String[] {Integer.toString(i), null, null, null, null});
+                if (mode == 1 || mode == 2) list.add(new String[] { Integer.toString(i), null, null, null, null });
             } else {
                 if (mode == 0 || mode == 2) list.add(dump(obj, i));
             }
diff --git a/src/main/java/codechicken/nei/config/ConfigSet.java b/src/main/java/codechicken/nei/config/ConfigSet.java
index c73c89c0..471adfac 100644
--- a/src/main/java/codechicken/nei/config/ConfigSet.java
+++ b/src/main/java/codechicken/nei/config/ConfigSet.java
@@ -1,11 +1,14 @@
 package codechicken.nei.config;
 
+import java.io.File;
+
+import net.minecraft.nbt.NBTTagCompound;
+
 import codechicken.lib.config.ConfigTagParent;
 import codechicken.nei.NEIServerUtils;
-import java.io.File;
-import net.minecraft.nbt.NBTTagCompound;
 
 public class ConfigSet {
+
     private final File nbtFile;
     public NBTTagCompound nbt;
     public final ConfigTagParent config;
diff --git a/src/main/java/codechicken/nei/config/DataDumper.java b/src/main/java/codechicken/nei/config/DataDumper.java
index fa3f9cad..918e06cc 100644
--- a/src/main/java/codechicken/nei/config/DataDumper.java
+++ b/src/main/java/codechicken/nei/config/DataDumper.java
@@ -3,19 +3,23 @@ package codechicken.nei.config;
 import static codechicken.lib.gui.GuiDraw.drawString;
 import static codechicken.lib.gui.GuiDraw.drawStringC;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.IChatComponent;
+
+import org.lwjgl.opengl.GL11;
+
 import codechicken.core.CommonUtils;
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.IChatComponent;
-import org.lwjgl.opengl.GL11;
 
 public abstract class DataDumper extends Option {
+
     public DataDumper(String name) {
         super(name);
     }
@@ -52,7 +56,9 @@ public abstract class DataDumper extends Option {
 
     public IChatComponent dumpMessage(File file) {
         return new ChatComponentTranslation(
-                "nei.options.tools.dump.dumped", translateN(name), "dumps/" + file.getName());
+                "nei.options.tools.dump.dumped",
+                translateN(name),
+                "dumps/" + file.getName());
     }
 
     public void dumpTo(File file) throws IOException {
diff --git a/src/main/java/codechicken/nei/config/GuiHighlightTips.java b/src/main/java/codechicken/nei/config/GuiHighlightTips.java
index 9b7c9afe..cd37cfe2 100644
--- a/src/main/java/codechicken/nei/config/GuiHighlightTips.java
+++ b/src/main/java/codechicken/nei/config/GuiHighlightTips.java
@@ -4,22 +4,26 @@ import static codechicken.lib.gui.GuiDraw.displaySize;
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 import static codechicken.nei.NEIClientUtils.translate;
 
+import java.awt.Dimension;
+import java.awt.Point;
+import java.util.Arrays;
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+
+import org.lwjgl.input.Keyboard;
+
 import codechicken.core.gui.GuiCCButton;
 import codechicken.core.gui.GuiScreenWidget;
 import codechicken.lib.math.MathHelper;
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.HUDRenderer;
-import java.awt.Dimension;
-import java.awt.Point;
-import java.util.Arrays;
-import java.util.List;
-import net.minecraft.client.Minecraft;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import org.lwjgl.input.Keyboard;
 
 public class GuiHighlightTips extends GuiScreenWidget {
+
     private final String name;
     private GuiCCButton toggleButton;
     private final Option opt;
@@ -71,20 +75,18 @@ public class GuiHighlightTips extends GuiScreenWidget {
         super.drawScreen(mousex, mousey, f);
         if (show()) {
             ItemStack stack = new ItemStack(Blocks.redstone_block);
-            List<String> tip = Arrays.asList(
-                    stack.getDisplayName(), EnumChatFormatting.RED + translate("options." + name + ".sample"));
+            List<String> tip = Arrays
+                    .asList(stack.getDisplayName(), EnumChatFormatting.RED + translate("options." + name + ".sample"));
             HUDRenderer.renderOverlay(stack, tip, renderPos());
         }
     }
 
     public Point getPos() {
-        return new Point(
-                opt.renderTag(name + ".x").getIntValue(),
-                opt.renderTag(name + ".y").getIntValue());
+        return new Point(opt.renderTag(name + ".x").getIntValue(), opt.renderTag(name + ".y").getIntValue());
     }
 
     public Dimension sampleSize() // copied from HUDManager when running with the sample for this gui
-            {
+    {
         return new Dimension(101, 30);
     }
 
diff --git a/src/main/java/codechicken/nei/config/GuiItemIconDumper.java b/src/main/java/codechicken/nei/config/GuiItemIconDumper.java
index 416eb87a..b3ad024a 100644
--- a/src/main/java/codechicken/nei/config/GuiItemIconDumper.java
+++ b/src/main/java/codechicken/nei/config/GuiItemIconDumper.java
@@ -1,11 +1,5 @@
 package codechicken.nei.config;
 
-import codechicken.core.CommonUtils;
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.ItemPanels;
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.guihook.GuiContainerManager;
 import java.awt.Dimension;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -13,7 +7,9 @@ import java.io.IOException;
 import java.nio.IntBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
+
 import javax.imageio.ImageIO;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -24,16 +20,23 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
+
 import org.lwjgl.BufferUtils;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import codechicken.core.CommonUtils;
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.ItemPanels;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.guihook.GuiContainerManager;
+
 public class GuiItemIconDumper extends GuiScreen {
-    static final int[] illegalChars = {
-        34, 60, 62, 124, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
-        26, 27, 28, 29, 30, 31, 58, 42, 63, 92, 47
-    };
+
+    static final int[] illegalChars = { 34, 60, 62, 124, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+            18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 58, 42, 63, 92, 47 };
 
     static {
         Arrays.sort(illegalChars);
@@ -123,7 +126,9 @@ public class GuiItemIconDumper extends GuiScreen {
             int x = i % cols * boxSize;
             int y = i / cols * boxSize;
             exportImage(
-                    dir, img.getSubimage(x + borderSize, y + borderSize, iconSize, iconSize), items.get(parseIndex));
+                    dir,
+                    img.getSubimage(x + borderSize, y + borderSize, iconSize, iconSize),
+                    items.get(parseIndex));
         }
 
         if (parseIndex >= items.size()) {
@@ -175,7 +180,13 @@ public class GuiItemIconDumper extends GuiScreen {
             GL11.glGetTexImage(GL11.GL_TEXTURE_2D, 0, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, pixelBuffer);
         } else {
             GL11.glReadPixels(
-                    0, 0, texSize.width, texSize.height, GL12.GL_BGRA, GL12.GL_UNSIGNED_INT_8_8_8_8_REV, pixelBuffer);
+                    0,
+                    0,
+                    texSize.width,
+                    texSize.height,
+                    GL12.GL_BGRA,
+                    GL12.GL_UNSIGNED_INT_8_8_8_8_REV,
+                    pixelBuffer);
         }
 
         pixelBuffer.get(pixelValues);
diff --git a/src/main/java/codechicken/nei/config/GuiItemSorter.java b/src/main/java/codechicken/nei/config/GuiItemSorter.java
index a7846808..8c31555d 100644
--- a/src/main/java/codechicken/nei/config/GuiItemSorter.java
+++ b/src/main/java/codechicken/nei/config/GuiItemSorter.java
@@ -3,18 +3,23 @@ package codechicken.nei.config;
 import static codechicken.lib.gui.GuiDraw.drawStringC;
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.gui.GuiScreen;
+
+import org.lwjgl.opengl.GL11;
+
 import codechicken.lib.math.MathHelper;
 import codechicken.nei.ItemSorter;
 import codechicken.nei.ItemSorter.SortEntry;
 import codechicken.nei.LayoutManager;
-import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.client.gui.GuiScreen;
-import org.lwjgl.opengl.GL11;
 
 public class GuiItemSorter extends GuiOptionPane {
+
     public class SortItem {
+
         public double ya;
         public double y;
         public final SortEntry e;
diff --git a/src/main/java/codechicken/nei/config/GuiOptionList.java b/src/main/java/codechicken/nei/config/GuiOptionList.java
index a2188c21..b9d90b0e 100644
--- a/src/main/java/codechicken/nei/config/GuiOptionList.java
+++ b/src/main/java/codechicken/nei/config/GuiOptionList.java
@@ -6,11 +6,6 @@ import static codechicken.lib.gui.GuiDraw.fontRenderer;
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
-import codechicken.core.gui.GuiCCButton;
-import codechicken.core.gui.GuiScreenWidget;
-import codechicken.core.gui.GuiScrollSlot;
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.LayoutManager;
 import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -18,13 +13,23 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
+
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
+import codechicken.core.gui.GuiCCButton;
+import codechicken.core.gui.GuiScreenWidget;
+import codechicken.core.gui.GuiScrollSlot;
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.LayoutManager;
+
 public class GuiOptionList extends GuiScreenWidget {
+
     public class OptionScrollSlot extends GuiScrollSlot {
+
         public final ArrayList<Option> options = new ArrayList<>();
 
         public OptionScrollSlot() {
@@ -238,8 +243,7 @@ public class GuiOptionList extends GuiScreenWidget {
         List<String> tooltip = new LinkedList<>();
         Point mouse = getMousePosition();
         if (worldButton.pointInside(mouse.x, mouse.y))
-            tooltip.addAll(Arrays.asList(translateToLocal("nei.options.global.tip." + (world ? "1" : "0"))
-                    .split(":")));
+            tooltip.addAll(Arrays.asList(translateToLocal("nei.options.global.tip." + (world ? "1" : "0")).split(":")));
 
         tooltip = slot.handleTooltip(mouse.x, mouse.y, tooltip);
         drawMultilineTip(mouse.x + 12, mouse.y - 12, tooltip);
diff --git a/src/main/java/codechicken/nei/config/GuiOptionPane.java b/src/main/java/codechicken/nei/config/GuiOptionPane.java
index 6cba5657..b1fca939 100644
--- a/src/main/java/codechicken/nei/config/GuiOptionPane.java
+++ b/src/main/java/codechicken/nei/config/GuiOptionPane.java
@@ -5,18 +5,23 @@ import static codechicken.lib.gui.GuiDraw.fontRenderer;
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
-import codechicken.core.gui.GuiCCButton;
-import codechicken.core.gui.GuiScreenWidget;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.LinkedList;
 import java.util.List;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
+
 import org.lwjgl.input.Keyboard;
 
+import codechicken.core.gui.GuiCCButton;
+import codechicken.core.gui.GuiScreenWidget;
+
 public abstract class GuiOptionPane extends GuiScreenWidget {
+
     public class ScrollPane extends OptionScrollPane {
+
         @Override
         public int contentHeight() {
             return GuiOptionPane.this.contentHeight();
diff --git a/src/main/java/codechicken/nei/config/GuiPanelSettings.java b/src/main/java/codechicken/nei/config/GuiPanelSettings.java
index faca6e95..3f11d5b5 100644
--- a/src/main/java/codechicken/nei/config/GuiPanelSettings.java
+++ b/src/main/java/codechicken/nei/config/GuiPanelSettings.java
@@ -2,28 +2,33 @@ package codechicken.nei.config;
 
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 
+import java.awt.Point;
+import java.util.ArrayList;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
 import codechicken.core.gui.GuiScreenWidget;
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.ItemPanels;
 import codechicken.nei.ItemsGrid;
 import codechicken.nei.guihook.GuiContainerManager;
-import java.awt.Point;
-import java.util.ArrayList;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.item.ItemStack;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 public class GuiPanelSettings extends GuiScreenWidget {
+
     private final Option opt;
 
     private PanelPlaceholder bookmarksPanel;
     private PanelPlaceholder itemsPanel;
 
     protected static class PanelResizeButton {
+
         private int x;
         private int y;
         private int w;
@@ -45,6 +50,7 @@ public class GuiPanelSettings extends GuiScreenWidget {
     }
 
     protected static class PanelPlaceholder {
+
         protected static int PANEL_SIZE = 16;
 
         private final Option opt;
@@ -111,31 +117,27 @@ public class GuiPanelSettings extends GuiScreenWidget {
             final int minWidth = 5 * ItemsGrid.SLOT_SIZE;
             final int minHeight = 9 * ItemsGrid.SLOT_SIZE;
 
-            int paddingLeft =
-                    (int) Math.ceil(margin.w * opt.renderTag(name + ".left").getIntValue() / 100000.0);
-            int paddingTop =
-                    (int) Math.ceil(margin.h * opt.renderTag(name + ".top").getIntValue() / 100000.0);
-            int paddingRight =
-                    (int) Math.ceil(margin.w * opt.renderTag(name + ".right").getIntValue() / 100000.0);
-            int paddingBottom =
-                    (int) Math.ceil(margin.h * opt.renderTag(name + ".bottom").getIntValue() / 100000.0);
+            int paddingLeft = (int) Math.ceil(margin.w * opt.renderTag(name + ".left").getIntValue() / 100000.0);
+            int paddingTop = (int) Math.ceil(margin.h * opt.renderTag(name + ".top").getIntValue() / 100000.0);
+            int paddingRight = (int) Math.ceil(margin.w * opt.renderTag(name + ".right").getIntValue() / 100000.0);
+            int paddingBottom = (int) Math.ceil(margin.h * opt.renderTag(name + ".bottom").getIntValue() / 100000.0);
 
             if (dragDir != null) {
                 final Point mouse = getMousePosition();
                 Point drag = new Point(mouse.x - dragDown.x, mouse.y - dragDown.y);
 
                 if (dragDir == "left") {
-                    paddingLeft = Math.min(
-                            Math.max(0, margin.w - paddingRight - minWidth), Math.max(0, paddingLeft + drag.x));
+                    paddingLeft = Math
+                            .min(Math.max(0, margin.w - paddingRight - minWidth), Math.max(0, paddingLeft + drag.x));
                 } else if (dragDir == "right") {
-                    paddingRight = Math.min(
-                            Math.max(0, margin.w - paddingLeft - minWidth), Math.max(0, paddingRight - drag.x));
+                    paddingRight = Math
+                            .min(Math.max(0, margin.w - paddingLeft - minWidth), Math.max(0, paddingRight - drag.x));
                 } else if (dragDir == "top") {
-                    paddingTop = Math.min(
-                            Math.max(0, margin.h - paddingBottom - minHeight), Math.max(0, paddingTop + drag.y));
+                    paddingTop = Math
+                            .min(Math.max(0, margin.h - paddingBottom - minHeight), Math.max(0, paddingTop + drag.y));
                 } else if (dragDir == "bottom") {
-                    paddingBottom = Math.min(
-                            Math.max(0, margin.h - paddingTop - minHeight), Math.max(0, paddingBottom - drag.y));
+                    paddingBottom = Math
+                            .min(Math.max(0, margin.h - paddingTop - minHeight), Math.max(0, paddingBottom - drag.y));
                 } else if (dragDir == "move") {
                     int width = margin.w - paddingRight - paddingLeft;
                     int height = margin.h - paddingTop - paddingBottom;
@@ -155,7 +157,7 @@ public class GuiPanelSettings extends GuiScreenWidget {
             paddingTop = Math.min(margin.h - minHeight, Math.max(0, paddingTop + deltaHeight));
             paddingBottom = Math.min(margin.h - paddingTop - minHeight, Math.max(0, paddingBottom - deltaHeight));
 
-            return new int[] {paddingLeft, paddingTop, paddingRight, paddingBottom};
+            return new int[] { paddingLeft, paddingTop, paddingRight, paddingBottom };
         }
 
         protected void drawItems() {
diff --git a/src/main/java/codechicken/nei/config/HandlerDumper.java b/src/main/java/codechicken/nei/config/HandlerDumper.java
index 8606edd9..6ba90e0a 100644
--- a/src/main/java/codechicken/nei/config/HandlerDumper.java
+++ b/src/main/java/codechicken/nei/config/HandlerDumper.java
@@ -1,5 +1,15 @@
 package codechicken.nei.config;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.LinkedList;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentTranslation;
+
+import org.apache.commons.io.IOUtils;
+
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.GuiUsageRecipe;
@@ -7,25 +17,19 @@ import codechicken.nei.recipe.HandlerInfo;
 import codechicken.nei.recipe.IRecipeHandler;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import codechicken.nei.util.NBTJson;
+
 import com.google.common.base.Objects;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.LinkedList;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChatComponentTranslation;
-import org.apache.commons.io.IOUtils;
 
 public class HandlerDumper extends DataDumper {
+
     public HandlerDumper(String name) {
         super(name);
     }
 
     @Override
     public String[] header() {
-        return new String[] {
-            "Handler Recipe Name", "Handler Class", "Overlay Identifier", "Mod DisplayName", "ItemStack"
-        };
+        return new String[] { "Handler Recipe Name", "Handler Class", "Overlay Identifier", "Mod DisplayName",
+                "ItemStack" };
     }
 
     @Override
@@ -34,21 +38,15 @@ public class HandlerDumper extends DataDumper {
         for (IRecipeHandler handler : GuiUsageRecipe.usagehandlers) {
             final String handlerName = handler.getHandlerId();
             final String handlerId = Objects.firstNonNull(
-                    handler instanceof TemplateRecipeHandler
-                            ? ((TemplateRecipeHandler) handler).getOverlayIdentifier()
+                    handler instanceof TemplateRecipeHandler ? ((TemplateRecipeHandler) handler).getOverlayIdentifier()
                             : null,
                     "null");
             HandlerInfo info = GuiRecipeTab.getHandlerInfo(handlerName, handlerId);
 
-            list.add(new String[] {
-                handler.getRecipeName(),
-                handlerName,
-                handlerId,
-                info != null ? info.getModName() : "Unknown",
-                info != null && info.getItemStack() != null
-                        ? info.getItemStack().toString()
-                        : "Unknown"
-            });
+            list.add(
+                    new String[] { handler.getRecipeName(), handlerName, handlerId,
+                            info != null ? info.getModName() : "Unknown",
+                            info != null && info.getItemStack() != null ? info.getItemStack().toString() : "Unknown" });
         }
         return list;
     }
diff --git a/src/main/java/codechicken/nei/config/IMCHandler.java b/src/main/java/codechicken/nei/config/IMCHandler.java
index e1eafb86..22c361b8 100644
--- a/src/main/java/codechicken/nei/config/IMCHandler.java
+++ b/src/main/java/codechicken/nei/config/IMCHandler.java
@@ -1,5 +1,14 @@
 package codechicken.nei.config;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
 import codechicken.core.CommonUtils;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIServerUtils;
@@ -11,15 +20,9 @@ import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 
 public class IMCHandler {
+
     private static final Set<String> processedCatalystSenders = new HashSet<>();
 
     private IMCHandler() {}
@@ -89,12 +92,11 @@ public class IMCHandler {
         info.setYShift(yShift);
 
         try {
-            final int imageHeight =
-                    tag.hasKey("handlerHeight") ? tag.getInteger("handlerHeight") : HandlerInfo.DEFAULT_HEIGHT;
-            final int imageWidth =
-                    tag.hasKey("handlerWidth") ? tag.getInteger("handlerWidth") : HandlerInfo.DEFAULT_WIDTH;
-            final int maxRecipesPerPage = tag.hasKey("maxRecipesPerPage")
-                    ? tag.getInteger("maxRecipesPerPage")
+            final int imageHeight = tag.hasKey("handlerHeight") ? tag.getInteger("handlerHeight")
+                    : HandlerInfo.DEFAULT_HEIGHT;
+            final int imageWidth = tag.hasKey("handlerWidth") ? tag.getInteger("handlerWidth")
+                    : HandlerInfo.DEFAULT_WIDTH;
+            final int maxRecipesPerPage = tag.hasKey("maxRecipesPerPage") ? tag.getInteger("maxRecipesPerPage")
                     : HandlerInfo.DEFAULT_MAX_PER_PAGE;
             info.setHandlerDimensions(imageHeight, imageWidth, maxRecipesPerPage);
         } catch (NumberFormatException ignored) {
@@ -146,10 +148,10 @@ public class IMCHandler {
         }
         final int priority = tag.getInteger("priority");
 
-        RecipeCatalysts.addOrPut(
-                RecipeCatalysts.catalystsAdderFromIMC, handlerID, new CatalystInfo(itemStack, priority));
-        NEIClientConfig.logger.info(
-                String.format("Added catalyst `%s` to handler %s", itemStack.getDisplayName(), handlerID));
+        RecipeCatalysts
+                .addOrPut(RecipeCatalysts.catalystsAdderFromIMC, handlerID, new CatalystInfo(itemStack, priority));
+        NEIClientConfig.logger
+                .info(String.format("Added catalyst `%s` to handler %s", itemStack.getDisplayName(), handlerID));
     }
 
     private static void handleRemoveCatalystInfo(IMCMessage message) {
@@ -180,15 +182,19 @@ public class IMCHandler {
         if (RecipeCatalysts.catalystsRemoverFromIMC.containsKey(handlerID)) {
             RecipeCatalysts.catalystsRemoverFromIMC.get(handlerID).add(itemStack);
         } else {
-            RecipeCatalysts.catalystsRemoverFromIMC.put(
-                    handlerID, new ArrayList<>(Collections.singletonList(itemStack)));
+            RecipeCatalysts.catalystsRemoverFromIMC
+                    .put(handlerID, new ArrayList<>(Collections.singletonList(itemStack)));
         }
-        NEIClientConfig.logger.info(
-                String.format("Removed catalyst `%s` from handler %s", itemStack.getDisplayName(), handlerID));
+        NEIClientConfig.logger
+                .info(String.format("Removed catalyst `%s` from handler %s", itemStack.getDisplayName(), handlerID));
     }
 
     private static void logInvalidMessage(FMLInterModComms.IMCMessage message, String type) {
-        FMLLog.bigWarning(String.format(
-                "Received invalid IMC '%s' from %s. Not a %s Message.", message.key, message.getSender(), type));
+        FMLLog.bigWarning(
+                String.format(
+                        "Received invalid IMC '%s' from %s. Not a %s Message.",
+                        message.key,
+                        message.getSender(),
+                        type));
     }
 }
diff --git a/src/main/java/codechicken/nei/config/ItemPanelDumper.java b/src/main/java/codechicken/nei/config/ItemPanelDumper.java
index 51babccb..f18dce7e 100644
--- a/src/main/java/codechicken/nei/config/ItemPanelDumper.java
+++ b/src/main/java/codechicken/nei/config/ItemPanelDumper.java
@@ -1,15 +1,11 @@
 package codechicken.nei.config;
 
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemPanels;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.guihook.GuiContainerManager;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.LinkedList;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -19,8 +15,15 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemPanels;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.guihook.GuiContainerManager;
+
 public class ItemPanelDumper extends DataDumper {
-    private static final int[] resolutions = new int[] {16, 32, 48, 64, 128, 256};
+
+    private static final int[] resolutions = new int[] { 16, 32, 48, 64, 128, 256 };
 
     public ItemPanelDumper(String name) {
         super(name);
@@ -28,20 +31,18 @@ public class ItemPanelDumper extends DataDumper {
 
     @Override
     public String[] header() {
-        return new String[] {"Item Name", "Item ID", "Item meta", "Has NBT", "Display Name"};
+        return new String[] { "Item Name", "Item ID", "Item meta", "Has NBT", "Display Name" };
     }
 
     @Override
     public Iterable<String[]> dump(int mode) {
         LinkedList<String[]> list = new LinkedList<>();
-        for (ItemStack stack : ItemPanels.itemPanel.getItems())
-            list.add(new String[] {
-                Item.itemRegistry.getNameForObject(stack.getItem()),
-                Integer.toString(Item.getIdFromItem(stack.getItem())),
-                Integer.toString(InventoryUtils.actualDamage(stack)),
-                stack.stackTagCompound == null ? "false" : "true",
-                EnumChatFormatting.getTextWithoutFormattingCodes(GuiContainerManager.itemDisplayNameShort(stack))
-            });
+        for (ItemStack stack : ItemPanels.itemPanel.getItems()) list.add(
+                new String[] { Item.itemRegistry.getNameForObject(stack.getItem()),
+                        Integer.toString(Item.getIdFromItem(stack.getItem())),
+                        Integer.toString(InventoryUtils.actualDamage(stack)),
+                        stack.stackTagCompound == null ? "false" : "true", EnumChatFormatting
+                                .getTextWithoutFormattingCodes(GuiContainerManager.itemDisplayNameShort(stack)) });
 
         return list;
     }
diff --git a/src/main/java/codechicken/nei/config/Option.java b/src/main/java/codechicken/nei/config/Option.java
index e4adde55..89a7e337 100644
--- a/src/main/java/codechicken/nei/config/Option.java
+++ b/src/main/java/codechicken/nei/config/Option.java
@@ -1,17 +1,19 @@
 package codechicken.nei.config;
 
-import codechicken.lib.config.ConfigTag;
-import codechicken.nei.config.GuiOptionList.OptionScrollSlot;
 import java.util.List;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
+import codechicken.lib.config.ConfigTag;
+import codechicken.nei.config.GuiOptionList.OptionScrollSlot;
+
 public abstract class Option {
+
     public static void playClickSound() {
-        Minecraft.getMinecraft()
-                .getSoundHandler()
+        Minecraft.getMinecraft().getSoundHandler()
                 .playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
     }
 
@@ -46,9 +48,9 @@ public abstract class Option {
     }
 
     private <T> T assertParentOverride(T elem) {
-        if (elem == null)
-            throw new IllegalStateException("Option " + fullName()
-                    + " does not have a defined parent list. Use OptionList.setOptionList to insert a parent");
+        if (elem == null) throw new IllegalStateException(
+                "Option " + fullName()
+                        + " does not have a defined parent list. Use OptionList.setOptionList to insert a parent");
         return elem;
     }
 
@@ -164,7 +166,8 @@ public abstract class Option {
     }
 
     /**
-     * Called when world specific is activated for this option. Should copy the global value into a world specific override
+     * Called when world specific is activated for this option. Should copy the global value into a world specific
+     * override
      */
     public void copyGlobals() {
         copyGlobal(configName(), true);
diff --git a/src/main/java/codechicken/nei/config/OptionButton.java b/src/main/java/codechicken/nei/config/OptionButton.java
index 62397c95..46b4bc8b 100644
--- a/src/main/java/codechicken/nei/config/OptionButton.java
+++ b/src/main/java/codechicken/nei/config/OptionButton.java
@@ -5,15 +5,19 @@ import static codechicken.lib.gui.GuiDraw.drawString;
 import static codechicken.lib.gui.GuiDraw.drawStringC;
 import static codechicken.lib.gui.GuiDraw.getStringWidth;
 
-import codechicken.nei.LayoutManager;
-import codechicken.nei.NEIClientUtils;
 import java.awt.Rectangle;
 import java.util.List;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.ResourceLocation;
+
 import org.lwjgl.opengl.GL11;
 
+import codechicken.nei.LayoutManager;
+import codechicken.nei.NEIClientUtils;
+
 public abstract class OptionButton extends Option {
+
     protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
 
     public final String prefix;
diff --git a/src/main/java/codechicken/nei/config/OptionCycled.java b/src/main/java/codechicken/nei/config/OptionCycled.java
index 8d6d8db3..9574d464 100644
--- a/src/main/java/codechicken/nei/config/OptionCycled.java
+++ b/src/main/java/codechicken/nei/config/OptionCycled.java
@@ -1,6 +1,7 @@
 package codechicken.nei.config;
 
 public class OptionCycled extends OptionButton {
+
     public final int count;
     public final boolean prefixed;
 
@@ -35,8 +36,7 @@ public class OptionCycled extends OptionButton {
 
     public boolean cycle() {
         int next = value();
-        do next = (next + 1) % count;
-        while (!optionValid(next));
+        do next = (next + 1) % count; while (!optionValid(next));
 
         if (next == value()) return false;
 
diff --git a/src/main/java/codechicken/nei/config/OptionGamemodes.java b/src/main/java/codechicken/nei/config/OptionGamemodes.java
index afc821c9..c8cbc77c 100644
--- a/src/main/java/codechicken/nei/config/OptionGamemodes.java
+++ b/src/main/java/codechicken/nei/config/OptionGamemodes.java
@@ -4,6 +4,7 @@ import codechicken.nei.Image;
 import codechicken.nei.LayoutManager;
 
 public class OptionGamemodes extends OptionStringSet {
+
     public OptionGamemodes(String name) {
         super(name);
 
diff --git a/src/main/java/codechicken/nei/config/OptionIntegerField.java b/src/main/java/codechicken/nei/config/OptionIntegerField.java
index c2379814..09efc177 100644
--- a/src/main/java/codechicken/nei/config/OptionIntegerField.java
+++ b/src/main/java/codechicken/nei/config/OptionIntegerField.java
@@ -1,6 +1,7 @@
 package codechicken.nei.config;
 
 public class OptionIntegerField extends OptionTextField {
+
     public final int min;
     public final int max;
 
diff --git a/src/main/java/codechicken/nei/config/OptionKeyBind.java b/src/main/java/codechicken/nei/config/OptionKeyBind.java
index 0738cd7d..31c9f528 100644
--- a/src/main/java/codechicken/nei/config/OptionKeyBind.java
+++ b/src/main/java/codechicken/nei/config/OptionKeyBind.java
@@ -3,12 +3,15 @@ package codechicken.nei.config;
 import static codechicken.lib.gui.GuiDraw.drawRect;
 import static codechicken.lib.gui.GuiDraw.drawStringC;
 
-import codechicken.nei.NEIClientUtils;
 import java.awt.Rectangle;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.EnumChatFormatting;
+
 import org.lwjgl.input.Keyboard;
 
+import codechicken.nei.NEIClientUtils;
+
 public class OptionKeyBind extends OptionButton {
 
     private boolean editing = false;
diff --git a/src/main/java/codechicken/nei/config/OptionList.java b/src/main/java/codechicken/nei/config/OptionList.java
index 31e15e08..468db24e 100644
--- a/src/main/java/codechicken/nei/config/OptionList.java
+++ b/src/main/java/codechicken/nei/config/OptionList.java
@@ -1,16 +1,20 @@
 package codechicken.nei.config;
 
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.config.GuiOptionList.OptionScrollSlot;
 import java.util.ArrayList;
 import java.util.HashMap;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.config.GuiOptionList.OptionScrollSlot;
+
 public class OptionList extends OptionButton {
+
     public static final OptionList root = new RootOptionList();
 
     private static class RootOptionList extends OptionList {
+
         public RootOptionList() {
             super(null);
         }
@@ -111,9 +115,10 @@ public class OptionList extends OptionButton {
 
     /**
      * Create an instance of a GuiOptionList subclass for the given parameter list
+     * 
      * @param parent The parent screen for the back button
-     * @param list The option list to be displayed in the gui
-     * @param world true if in world config mode, false for global
+     * @param list   The option list to be displayed in the gui
+     * @param world  true if in world config mode, false for global
      */
     public GuiOptionList getGui(GuiScreen parent, OptionList list, boolean world) {
         return this.parent.getGui(parent, list, world);
diff --git a/src/main/java/codechicken/nei/config/OptionOpenGui.java b/src/main/java/codechicken/nei/config/OptionOpenGui.java
index c8465560..b5778090 100644
--- a/src/main/java/codechicken/nei/config/OptionOpenGui.java
+++ b/src/main/java/codechicken/nei/config/OptionOpenGui.java
@@ -1,10 +1,12 @@
 package codechicken.nei.config;
 
-import codechicken.nei.NEIClientConfig;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 
+import codechicken.nei.NEIClientConfig;
+
 public class OptionOpenGui extends OptionButton {
+
     public final Class<? extends GuiScreen> guiClass;
 
     public OptionOpenGui(String name, Class<? extends GuiScreen> guiClass) {
@@ -15,11 +17,10 @@ public class OptionOpenGui extends OptionButton {
     @Override
     public boolean onClick(int button) {
         try {
-            Minecraft.getMinecraft()
-                    .displayGuiScreen(guiClass.getConstructor(Option.class).newInstance(this));
+            Minecraft.getMinecraft().displayGuiScreen(guiClass.getConstructor(Option.class).newInstance(this));
         } catch (Exception e) {
-            NEIClientConfig.logger.error(
-                    "Unable to open gui class: " + guiClass.getName() + " from option " + fullName(), e);
+            NEIClientConfig.logger
+                    .error("Unable to open gui class: " + guiClass.getName() + " from option " + fullName(), e);
         }
         return true;
     }
diff --git a/src/main/java/codechicken/nei/config/OptionScrollPane.java b/src/main/java/codechicken/nei/config/OptionScrollPane.java
index aee5ed18..22c742cf 100644
--- a/src/main/java/codechicken/nei/config/OptionScrollPane.java
+++ b/src/main/java/codechicken/nei/config/OptionScrollPane.java
@@ -1,13 +1,17 @@
 package codechicken.nei.config;
 
-import codechicken.core.gui.GuiScrollPane;
 import java.awt.*;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.renderer.Tessellator;
+
 import org.lwjgl.opengl.GL11;
 
+import codechicken.core.gui.GuiScrollPane;
+
 public abstract class OptionScrollPane extends GuiScrollPane {
+
     public OptionScrollPane() {
         super(0, 0, 0, 0);
         setMargins(24, 4, 20, 4);
diff --git a/src/main/java/codechicken/nei/config/OptionStringSet.java b/src/main/java/codechicken/nei/config/OptionStringSet.java
index 9360268c..787a6304 100644
--- a/src/main/java/codechicken/nei/config/OptionStringSet.java
+++ b/src/main/java/codechicken/nei/config/OptionStringSet.java
@@ -2,17 +2,20 @@ package codechicken.nei.config;
 
 import static codechicken.lib.gui.GuiDraw.drawString;
 
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.LayoutManager;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.LayoutManager;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
 public abstract class OptionStringSet extends Option {
+
     public final LinkedList<String> options = new LinkedList<>();
     public final Multimap<String, String> dependants = ArrayListMultimap.create();
     public final Map<String, String> dependancies = new HashMap<>();
diff --git a/src/main/java/codechicken/nei/config/OptionTextField.java b/src/main/java/codechicken/nei/config/OptionTextField.java
index d8e2a086..981a85b7 100644
--- a/src/main/java/codechicken/nei/config/OptionTextField.java
+++ b/src/main/java/codechicken/nei/config/OptionTextField.java
@@ -3,19 +3,25 @@ package codechicken.nei.config;
 import static codechicken.lib.gui.GuiDraw.drawString;
 import static codechicken.lib.gui.GuiDraw.getStringWidth;
 
+import java.util.List;
+
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.TextField;
 import codechicken.nei.config.GuiOptionList.OptionScrollSlot;
-import java.util.List;
 
 public class OptionTextField extends Option {
+
     private boolean focused = false;
     private TextField textField = new TextField("test") {
+
         @Override
         public void onTextChange(String oldText) {
-            if (focused() && isValidValue(text()))
-                if (!defaulting()
-                        || !text().equals(getTag().getValue())) // don't override global if text hasn't changed
+            if (focused() && isValidValue(text())) if (!defaulting() || !text().equals(getTag().getValue())) // don't
+                                                                                                             // override
+                                                                                                             // global
+                                                                                                             // if text
+                                                                                                             // hasn't
+                                                                                                             // changed
                 getTag().setValue(text());
         }
 
diff --git a/src/main/java/codechicken/nei/config/OptionToggleButton.java b/src/main/java/codechicken/nei/config/OptionToggleButton.java
index 82dfd6f6..a218a2d9 100644
--- a/src/main/java/codechicken/nei/config/OptionToggleButton.java
+++ b/src/main/java/codechicken/nei/config/OptionToggleButton.java
@@ -1,6 +1,7 @@
 package codechicken.nei.config;
 
 public class OptionToggleButton extends OptionButton {
+
     public final boolean prefixed;
 
     public OptionToggleButton(String name, boolean prefixed) {
diff --git a/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java b/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java
index e8c76161..370af29f 100644
--- a/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java
+++ b/src/main/java/codechicken/nei/config/OptionToggleButtonBoubs.java
@@ -1,16 +1,26 @@
 package codechicken.nei.config;
 
+import java.awt.Rectangle;
+
 import codechicken.nei.Image;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.drawable.DrawableBuilder;
 import codechicken.nei.drawable.DrawableResource;
-import java.awt.Rectangle;
 
 public class OptionToggleButtonBoubs extends OptionButton {
-    private static final DrawableResource coolBoubs =
-            new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 48, 16, 22, 22).build();
-    private static final DrawableResource angryBoubs =
-            new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 70, 16, 22, 22).build();
+
+    private static final DrawableResource coolBoubs = new DrawableBuilder(
+            "nei:textures/nei_tabbed_sprites.png",
+            48,
+            16,
+            22,
+            22).build();
+    private static final DrawableResource angryBoubs = new DrawableBuilder(
+            "nei:textures/nei_tabbed_sprites.png",
+            70,
+            16,
+            22,
+            22).build();
 
     public final boolean prefixed;
 
diff --git a/src/main/java/codechicken/nei/config/OptionUtilities.java b/src/main/java/codechicken/nei/config/OptionUtilities.java
index d71891c7..236b20a8 100644
--- a/src/main/java/codechicken/nei/config/OptionUtilities.java
+++ b/src/main/java/codechicken/nei/config/OptionUtilities.java
@@ -1,17 +1,20 @@
 package codechicken.nei.config;
 
-import codechicken.nei.Image;
-import codechicken.nei.LayoutManager;
-import codechicken.nei.guihook.GuiContainerManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import codechicken.nei.Image;
+import codechicken.nei.LayoutManager;
+import codechicken.nei.guihook.GuiContainerManager;
+
 public class OptionUtilities extends OptionStringSet {
+
     public OptionUtilities(String name) {
         super(name);
         options.add("time");
diff --git a/src/main/java/codechicken/nei/config/RegistryDumper.java b/src/main/java/codechicken/nei/config/RegistryDumper.java
index 28455595..5e0085eb 100644
--- a/src/main/java/codechicken/nei/config/RegistryDumper.java
+++ b/src/main/java/codechicken/nei/config/RegistryDumper.java
@@ -1,9 +1,11 @@
 package codechicken.nei.config;
 
 import java.util.LinkedList;
+
 import net.minecraft.util.RegistryNamespaced;
 
 public abstract class RegistryDumper<T> extends DataDumper {
+
     public RegistryDumper(String name) {
         super(name);
     }
diff --git a/src/main/java/codechicken/nei/drawable/DrawableBuilder.java b/src/main/java/codechicken/nei/drawable/DrawableBuilder.java
index 4864d20b..deb97c3b 100644
--- a/src/main/java/codechicken/nei/drawable/DrawableBuilder.java
+++ b/src/main/java/codechicken/nei/drawable/DrawableBuilder.java
@@ -3,6 +3,7 @@ package codechicken.nei.drawable;
 import net.minecraft.util.ResourceLocation;
 
 public class DrawableBuilder {
+
     private final ResourceLocation resourceLocation;
     private int u;
     private int v;
diff --git a/src/main/java/codechicken/nei/drawable/DrawableResource.java b/src/main/java/codechicken/nei/drawable/DrawableResource.java
index f1159571..7686fa74 100644
--- a/src/main/java/codechicken/nei/drawable/DrawableResource.java
+++ b/src/main/java/codechicken/nei/drawable/DrawableResource.java
@@ -1,10 +1,11 @@
 package codechicken.nei.drawable;
 
-import codechicken.nei.Image;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.util.ResourceLocation;
 
+import codechicken.nei.Image;
+
 public class DrawableResource extends Image {
 
     private final ResourceLocation resourceLocation;
@@ -16,18 +17,8 @@ public class DrawableResource extends Image {
     private final int paddingLeft;
     private final int paddingRight;
 
-    public DrawableResource(
-            ResourceLocation resourceLocation,
-            int u,
-            int v,
-            int width,
-            int height,
-            int paddingTop,
-            int paddingBottom,
-            int paddingLeft,
-            int paddingRight,
-            int textureWidth,
-            int textureHeight) {
+    public DrawableResource(ResourceLocation resourceLocation, int u, int v, int width, int height, int paddingTop,
+            int paddingBottom, int paddingLeft, int paddingRight, int textureWidth, int textureHeight) {
         super(u, v, width, height);
         this.resourceLocation = resourceLocation;
         this.textureWidth = textureWidth;
diff --git a/src/main/java/codechicken/nei/drawable/GuiElementDuex.java b/src/main/java/codechicken/nei/drawable/GuiElementDuex.java
index 5772cf04..00a7627e 100644
--- a/src/main/java/codechicken/nei/drawable/GuiElementDuex.java
+++ b/src/main/java/codechicken/nei/drawable/GuiElementDuex.java
@@ -1,25 +1,25 @@
 package codechicken.nei.drawable;
 
+import net.minecraft.client.gui.GuiScreen;
+
+import org.lwjgl.opengl.GL11;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.gui.GuiScreen;
-import org.lwjgl.opengl.GL11;
 
 /*
-* Taken from Mantle 1.12-1.3.3.49 under the MIT License
-*
-* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt)
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
+ * Taken from Mantle 1.12-1.3.3.49 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights
+ * (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions: The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 @SideOnly(Side.CLIENT)
 public class GuiElementDuex {
diff --git a/src/main/java/codechicken/nei/drawable/GuiElementScalable.java b/src/main/java/codechicken/nei/drawable/GuiElementScalable.java
index 76ad0220..bb02bf50 100644
--- a/src/main/java/codechicken/nei/drawable/GuiElementScalable.java
+++ b/src/main/java/codechicken/nei/drawable/GuiElementScalable.java
@@ -1,24 +1,23 @@
 package codechicken.nei.drawable;
 
+import net.minecraft.client.gui.GuiScreen;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.client.gui.GuiScreen;
 
 /*
-* Taken from Mantle 1.12-1.3.3.49 under the MIT License
-*
-* The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt)
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
-* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-* and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-*/
+ * Taken from Mantle 1.12-1.3.3.49 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights
+ * (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions: The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 @SideOnly(Side.CLIENT)
 public class GuiElementScalable extends GuiElementDuex {
diff --git a/src/main/java/codechicken/nei/event/NEIConfigsLoadedEvent.java b/src/main/java/codechicken/nei/event/NEIConfigsLoadedEvent.java
index 1b95addd..cff68282 100644
--- a/src/main/java/codechicken/nei/event/NEIConfigsLoadedEvent.java
+++ b/src/main/java/codechicken/nei/event/NEIConfigsLoadedEvent.java
@@ -1,8 +1,9 @@
 package codechicken.nei.event;
 
+import net.minecraftforge.common.MinecraftForge;
+
 import codechicken.nei.api.IConfigureNEI;
 import cpw.mods.fml.common.eventhandler.Event;
-import net.minecraftforge.common.MinecraftForge;
 
 /**
  * Event is posted from <font color=red>NEI Plugin Loader Thread</font> after all {@link IConfigureNEI} were loaded.
@@ -11,4 +12,5 @@ import net.minecraftforge.common.MinecraftForge;
  * <br>
  * This event is fired on the {@link MinecraftForge#EVENT_BUS}.
  */
-public class NEIConfigsLoadedEvent extends Event {}
+public class NEIConfigsLoadedEvent extends Event {
+}
diff --git a/src/main/java/codechicken/nei/event/NEIRegisterHandlerInfosEvent.java b/src/main/java/codechicken/nei/event/NEIRegisterHandlerInfosEvent.java
index 91e6cf23..8f40546d 100644
--- a/src/main/java/codechicken/nei/event/NEIRegisterHandlerInfosEvent.java
+++ b/src/main/java/codechicken/nei/event/NEIRegisterHandlerInfosEvent.java
@@ -1,16 +1,18 @@
 package codechicken.nei.event;
 
+import java.util.function.Consumer;
+
+import net.minecraftforge.common.MinecraftForge;
+
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.HandlerInfo;
 import codechicken.nei.recipe.IRecipeHandler;
 import cpw.mods.fml.common.eventhandler.Event;
-import java.util.function.Consumer;
-import net.minecraftforge.common.MinecraftForge;
 
 /**
- * Event is posted every time the handler infos got registered or reloaded.
- * During it, you can safely register your custom handler info.
+ * Event is posted every time the handler infos got registered or reloaded. During it, you can safely register your
+ * custom handler info.
  *
  * <br>
  * This event does not have a result. {@link HasResult}<br>
@@ -18,8 +20,9 @@ import net.minecraftforge.common.MinecraftForge;
  * This event is fired on the {@link MinecraftForge#EVENT_BUS}.
  */
 public class NEIRegisterHandlerInfosEvent extends Event {
-    public void registerHandlerInfo(
-            String handlerName, String modName, String modId, Consumer<HandlerInfo.Builder> builder) {
+
+    public void registerHandlerInfo(String handlerName, String modName, String modId,
+            Consumer<HandlerInfo.Builder> builder) {
         HandlerInfo.Builder b = new HandlerInfo.Builder(handlerName, modName, modId);
         builder.accept(b);
         HandlerInfo info = b.build();
@@ -30,10 +33,7 @@ public class NEIRegisterHandlerInfosEvent extends Event {
         }
     }
 
-    public void registerHandlerInfo(
-            Class<? extends IRecipeHandler> handlerClazz,
-            String modName,
-            String modId,
+    public void registerHandlerInfo(Class<? extends IRecipeHandler> handlerClazz, String modName, String modId,
             Consumer<HandlerInfo.Builder> builder) {
         registerHandlerInfo(handlerClazz.getName(), modName, modId, builder);
     }
diff --git a/src/main/java/codechicken/nei/guihook/DefaultSlotClickHandler.java b/src/main/java/codechicken/nei/guihook/DefaultSlotClickHandler.java
index 64f4b9b0..e09734e4 100644
--- a/src/main/java/codechicken/nei/guihook/DefaultSlotClickHandler.java
+++ b/src/main/java/codechicken/nei/guihook/DefaultSlotClickHandler.java
@@ -4,12 +4,13 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
 
 public class DefaultSlotClickHandler implements IContainerSlotClickHandler {
+
     @Override
     public void beforeSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) {}
 
     @Override
-    public boolean handleSlotClick(
-            GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed) {
+    public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier,
+            boolean eventconsumed) {
         if (!eventconsumed) callHandleMouseClick(gui, slot, slotIndex, button, modifier);
 
         return true;
diff --git a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java
index b2dd1cdb..639d30a9 100644
--- a/src/main/java/codechicken/nei/guihook/GuiContainerManager.java
+++ b/src/main/java/codechicken/nei/guihook/GuiContainerManager.java
@@ -5,9 +5,6 @@ import static codechicken.lib.gui.GuiDraw.fontRenderer;
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 import static codechicken.lib.gui.GuiDraw.renderEngine;
 
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.recipe.StackInfo;
 import java.awt.Point;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -16,6 +13,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Pattern;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiScreen;
@@ -27,25 +25,31 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
+
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.recipe.StackInfo;
+
 public class GuiContainerManager {
+
     public GuiContainer window;
 
     public static RenderItem drawItems = new RenderItem();
-    public static final LinkedList<IContainerTooltipHandler> tooltipHandlers =
-            new HideousLinkedList<>(new CopyOnWriteArrayList<>());
-    public static final LinkedList<IContainerInputHandler> inputHandlers =
-            new HideousLinkedList<>(new CopyOnWriteArrayList<>());
-    public static final LinkedList<IContainerDrawHandler> drawHandlers =
-            new HideousLinkedList<>(new CopyOnWriteArrayList<>());
-    public static final LinkedList<IContainerObjectHandler> objectHandlers =
-            new HideousLinkedList<>(new CopyOnWriteArrayList<>());
-    public static final LinkedList<IContainerSlotClickHandler> slotClickHandlers =
-            new HideousLinkedList<>(new CopyOnWriteArrayList<>());
+    public static final LinkedList<IContainerTooltipHandler> tooltipHandlers = new HideousLinkedList<>(
+            new CopyOnWriteArrayList<>());
+    public static final LinkedList<IContainerInputHandler> inputHandlers = new HideousLinkedList<>(
+            new CopyOnWriteArrayList<>());
+    public static final LinkedList<IContainerDrawHandler> drawHandlers = new HideousLinkedList<>(
+            new CopyOnWriteArrayList<>());
+    public static final LinkedList<IContainerObjectHandler> objectHandlers = new HideousLinkedList<>(
+            new CopyOnWriteArrayList<>());
+    public static final LinkedList<IContainerSlotClickHandler> slotClickHandlers = new HideousLinkedList<>(
+            new CopyOnWriteArrayList<>());
 
     static {
         addSlotClickHandler(new DefaultSlotClickHandler());
@@ -98,7 +102,8 @@ public class GuiContainerManager {
     }
 
     /**
-     * Care needs to be taken with this method. It will insert your handler at the start of the list to be called first. You may need to simply edit the list yourself.
+     * Care needs to be taken with this method. It will insert your handler at the start of the list to be called first.
+     * You may need to simply edit the list yourself.
      *
      * @param handler The handler to register.
      */
@@ -115,10 +120,12 @@ public class GuiContainerManager {
     }
 
     /**
-     * Extra lines are often used for more information. For example enchantments, potion effects and mob spawner contents.
+     * Extra lines are often used for more information. For example enchantments, potion effects and mob spawner
+     * contents.
      *
-     * @param stack       The item to get the name for.
-     * @param gui             An instance of the currentscreen passed to tooltip handlers. If null, only gui inspecific handlers should respond
+     * @param stack           The item to get the name for.
+     * @param gui             An instance of the currentscreen passed to tooltip handlers. If null, only gui inspecific
+     *                        handlers should respond
      * @param includeHandlers If true tooltip handlers will add to the item tip
      * @return A list of Strings representing the text to be displayed on each line of the tool tip.
      */
@@ -128,8 +135,7 @@ public class GuiContainerManager {
             namelist = stack.getTooltip(
                     Minecraft.getMinecraft().thePlayer,
                     includeHandlers && Minecraft.getMinecraft().gameSettings.advancedItemTooltips);
-        } catch (Throwable ignored) {
-        }
+        } catch (Throwable ignored) {}
 
         if (namelist == null) namelist = new ArrayList<>();
 
@@ -200,7 +206,8 @@ public class GuiContainerManager {
     }
 
     /**
-     * Concatenates the multiline display name into one line for easy searching using string and {@link Pattern} functions.
+     * Concatenates the multiline display name into one line for easy searching using string and {@link Pattern}
+     * functions.
      *
      * @param itemstack The stack to get the name for
      * @return The multiline display name of this item separated by '#'
@@ -239,8 +246,8 @@ public class GuiContainerManager {
     private static int modelviewDepth = -1;
     private static final HashSet<String> stackTraces = new HashSet<>();
 
-    public static void drawItem(
-            int i, int j, ItemStack itemstack, FontRenderer fontRenderer, boolean smallAmount, String stackSize) {
+    public static void drawItem(int i, int j, ItemStack itemstack, FontRenderer fontRenderer, boolean smallAmount,
+            String stackSize) {
         enable3DRender();
         // for lighting correction
         boolean glRescale = GL11.glGetBoolean(GL12.GL_RESCALE_NORMAL);
@@ -295,8 +302,8 @@ public class GuiContainerManager {
         enable2DRender();
         GL11.glScaled(scaleFactor, scaleFactor, scaleFactor);
 
-        final int X = (int)
-                (((float) offsetX + 16.0f - fontRenderer.getStringWidth(stackSize) * scaleFactor) * inverseScaleFactor);
+        final int X = (int) (((float) offsetX + 16.0f - fontRenderer.getStringWidth(stackSize) * scaleFactor)
+                * inverseScaleFactor);
         final int Y = (int) (((float) offsetY + 16.0f - 7.0f * scaleFactor) * inverseScaleFactor);
         fontRenderer.drawStringWithShadow(stackSize, X, Y, 16777215);
 
@@ -611,13 +618,11 @@ public class GuiContainerManager {
     public void handleSlotClick(int slotIndex, int button, int modifiers) {
         if (slotIndex == -1) return;
 
-        if (window
-                instanceof
-                IGuiClientSide) // send the calls directly to the container bypassing the MPController window send
-        window.mc.thePlayer.openContainer.slotClick(slotIndex, button, modifiers, window.mc.thePlayer);
-        else
-            window.mc.playerController.windowClick(
-                    window.inventorySlots.windowId, slotIndex, button, modifiers, window.mc.thePlayer);
+        if (window instanceof IGuiClientSide) // send the calls directly to the container bypassing the MPController
+                                              // window send
+            window.mc.thePlayer.openContainer.slotClick(slotIndex, button, modifiers, window.mc.thePlayer);
+        else window.mc.playerController
+                .windowClick(window.inventorySlots.windowId, slotIndex, button, modifiers, window.mc.thePlayer);
     }
 
     /**
diff --git a/src/main/java/codechicken/nei/guihook/HideousLinkedList.java b/src/main/java/codechicken/nei/guihook/HideousLinkedList.java
index 316ab621..0a4abf1c 100644
--- a/src/main/java/codechicken/nei/guihook/HideousLinkedList.java
+++ b/src/main/java/codechicken/nei/guihook/HideousLinkedList.java
@@ -7,11 +7,13 @@ import java.util.function.UnaryOperator;
 import java.util.stream.Stream;
 
 /**
- * A hideous LinkedList that is backed by an arbitrary list, for alternative characteristics while preserving
- * binary compatibility...
+ * A hideous LinkedList that is backed by an arbitrary list, for alternative characteristics while preserving binary
+ * compatibility...
+ * 
  * @param <E>
  */
 final class HideousLinkedList<E> extends LinkedList<E> {
+
     private final List<E> backing;
 
     HideousLinkedList(List<E> backing) {
diff --git a/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java b/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java
index c3018e04..503cdc0f 100644
--- a/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java
+++ b/src/main/java/codechicken/nei/guihook/IContainerDrawHandler.java
@@ -4,34 +4,44 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
 
 public interface IContainerDrawHandler {
+
     /**
      * Initialize your objects and the gui for drawing.
+     * 
      * @param gui An instance of the currentscreen
      */
     public void onPreDraw(GuiContainer gui);
+
     /**
      * Draw your objects. Called after all normal gui rendering has been performed.
-     * @param gui An instance of the currentscreen
+     * 
+     * @param gui    An instance of the currentscreen
      * @param mousex The x position of the mouse in pixels from left
      * @param mousey The y position of the mouse in pixels from top
      */
     public void renderObjects(GuiContainer gui, int mousex, int mousey);
+
     /**
      * Use this to draw things that should always be on top, for example objects being held by the mouse.
-     * @param gui An instance of the currentscreen
+     * 
+     * @param gui    An instance of the currentscreen
      * @param mousex The x position of the mouse in pixels from left
      * @param mousey The y position of the mouse in pixels from top
      */
     public void postRenderObjects(GuiContainer gui, int mousex, int mousey);
+
     /**
      * Render something over a slot before the item in the slot.
-     * @param gui An instance of the currentscreen
+     * 
+     * @param gui  An instance of the currentscreen
      * @param slot The slot being rendered.
      */
     public void renderSlotUnderlay(GuiContainer gui, Slot slot);
+
     /**
      * Render something over a slot after the item in the slot.
-     * @param gui An instance of the currentscreen
+     * 
+     * @param gui  An instance of the currentscreen
      * @param slot The slot being rendered.
      */
     public void renderSlotOverlay(GuiContainer gui, Slot slot);
diff --git a/src/main/java/codechicken/nei/guihook/IContainerInputHandler.java b/src/main/java/codechicken/nei/guihook/IContainerInputHandler.java
index 485d6940..b12f9ee3 100644
--- a/src/main/java/codechicken/nei/guihook/IContainerInputHandler.java
+++ b/src/main/java/codechicken/nei/guihook/IContainerInputHandler.java
@@ -1,12 +1,15 @@
 package codechicken.nei.guihook;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
+
 import org.lwjgl.input.Keyboard;
 
 public interface IContainerInputHandler {
+
     /**
      * Only use this for things like input boxes that have to be 'focused' first and will not conflict with others
-     * @param gui An instance of the currentscreen
+     * 
+     * @param gui     An instance of the currentscreen
      * @param keyChar The character representing the keyPress
      * @param keyCode The KeyCode as defined in {@link Keyboard}
      * @return true to terminate further processing of this event.
@@ -15,38 +18,48 @@ public interface IContainerInputHandler {
 
     /**
      * This version of keyTyped is passive and will be called on every input handler before keyTyped is processed
-     * @param gui An instance of the currentscreen
+     * 
+     * @param gui     An instance of the currentscreen
      * @param keyChar The character representing the keyPress
-     * @param keyID The KeyCode as defined in {@link Keyboard}
+     * @param keyID   The KeyCode as defined in {@link Keyboard}
      */
     public void onKeyTyped(GuiContainer gui, char keyChar, int keyID);
+
     /**
-     * This version of keyTyped is called if the key event has not been handled by the first pass, use this for key bindings that work globally
-     * @param gui An instance of the currentscreen
+     * This version of keyTyped is called if the key event has not been handled by the first pass, use this for key
+     * bindings that work globally
+     * 
+     * @param gui     An instance of the currentscreen
      * @param keyChar The character representing the keyPress
-     * @param keyID The KeyCode as defined in {@link Keyboard}
+     * @param keyID   The KeyCode as defined in {@link Keyboard}
      * @return true to terminate further processing of this event.
      */
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID);
+
     /**
      * Called when the mouse is clicked in the gui
-     * @param gui An instance of the currentscreen
+     * 
+     * @param gui    An instance of the currentscreen
      * @param mousex The x position of the mouse in pixels from left
      * @param mousey The y position of the mouse in pixels from top
      * @param button The button index being pressed, {0 = Left Click, 1 = Right Click, 2 = Middle Click}
      * @return true to terminate further processing of this event.
      */
     public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button);
+
     /**
-     * This version of mouseClicked is passive and will be called on every input handler before mouseClicked is processed
-     * @param gui An instance of the currentscreen
+     * This version of mouseClicked is passive and will be called on every input handler before mouseClicked is
+     * processed
+     * 
+     * @param gui    An instance of the currentscreen
      * @param mousex The x position of the mouse in pixels from left
      * @param mousey The y position of the mouse in pixels from top
      * @param button The button index being pressed, {0 = Left Click, 1 = Right Click, 2 = Middle Click}
      */
     public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button);
+
     /**
-     * @param gui An instance of the currentscreen
+     * @param gui    An instance of the currentscreen
      * @param mousex The x position of the mouse in pixels from left
      * @param mousey The y position of the mouse in pixels from top
      * @param button The button index being released, {0 = Left Click, 1 = Right Click, 2 = Middle Click}
@@ -54,29 +67,33 @@ public interface IContainerInputHandler {
     public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button);
 
     /**
-     * @param gui An instance of the currentscreen
-     * @param mousex The x position of the mouse in pixels from left
-     * @param mousey The y position of the mouse in pixels from top
+     * @param gui      An instance of the currentscreen
+     * @param mousex   The x position of the mouse in pixels from left
+     * @param mousey   The y position of the mouse in pixels from top
      * @param scrolled The number of notches scrolled. Positive for up.
      * @return true to terminate further processing of this event.
      */
     public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled);
 
     /**
-     * This version of mouseScrolled is passive and will be called on every input handler before mouseScrolled is processed
-     * @param gui An instance of the currentscreen
-     * @param mousex The x position of the mouse in pixels from left
-     * @param mousey The y position of the mouse in pixels from top
+     * This version of mouseScrolled is passive and will be called on every input handler before mouseScrolled is
+     * processed
+     * 
+     * @param gui      An instance of the currentscreen
+     * @param mousex   The x position of the mouse in pixels from left
+     * @param mousey   The y position of the mouse in pixels from top
      * @param scrolled The number of notches scrolled. Positive for up.
      */
     public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled);
 
     /**
-     * This version of mouseClicked is passive and will be called on every input handler before mouseClicked is processed
-     * @param gui An instance of the currentscreen
-     * @param mousex The x position of the mouse in pixels from left
-     * @param mousey The y position of the mouse in pixels from top
-     * @param button The button index being pressed, {0 = Left Click, 1 = Right Click, 2 = Middle Click}
+     * This version of mouseClicked is passive and will be called on every input handler before mouseClicked is
+     * processed
+     * 
+     * @param gui      An instance of the currentscreen
+     * @param mousex   The x position of the mouse in pixels from left
+     * @param mousey   The y position of the mouse in pixels from top
+     * @param button   The button index being pressed, {0 = Left Click, 1 = Right Click, 2 = Middle Click}
      * @param heldTime The number of milliseconds since the button was first pressed
      */
     public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime);
diff --git a/src/main/java/codechicken/nei/guihook/IContainerObjectHandler.java b/src/main/java/codechicken/nei/guihook/IContainerObjectHandler.java
index 3d4efa35..d86490c5 100644
--- a/src/main/java/codechicken/nei/guihook/IContainerObjectHandler.java
+++ b/src/main/java/codechicken/nei/guihook/IContainerObjectHandler.java
@@ -7,27 +7,32 @@ import net.minecraft.item.ItemStack;
  * Provides more general gui calls as well as functions for more integration between objects
  */
 public interface IContainerObjectHandler {
+
     /**
      * Called once per tick in the gui.
+     * 
      * @param gui An instance of the currentscreen
      */
     public void guiTick(GuiContainer gui);
 
     /**
      * Called when the same gui is reshown.
+     * 
      * @param gui An instance of the currentscreen
      */
     public void refresh(GuiContainer gui);
 
     /**
      * Called when the gui is shown
+     * 
      * @param gui An instance of the currentscreen
      */
     public void load(GuiContainer gui);
 
     /**
      * Do not return an item that is handled somewhere else
-     * @param gui An instance of the currentscreen
+     * 
+     * @param gui    An instance of the currentscreen
      * @param mousex The x position of the mouse in pixels from left
      * @param mousey The y position of the mouse in pixels from top
      * @return The itemstack from one of your objects that the mouse is hovering over
@@ -35,7 +40,7 @@ public interface IContainerObjectHandler {
     public ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey);
 
     /**
-     * @param gui An instance of the currentscreen
+     * @param gui    An instance of the currentscreen
      * @param mousex The x position of the mouse in pixels from left
      * @param mousey The y position of the mouse in pixels from top
      * @return true if there is an object of yours obscuring the slot that the mouse would otherwise be hovering over.
diff --git a/src/main/java/codechicken/nei/guihook/IContainerSlotClickHandler.java b/src/main/java/codechicken/nei/guihook/IContainerSlotClickHandler.java
index 760c2360..74568d57 100644
--- a/src/main/java/codechicken/nei/guihook/IContainerSlotClickHandler.java
+++ b/src/main/java/codechicken/nei/guihook/IContainerSlotClickHandler.java
@@ -4,10 +4,11 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
 
 public interface IContainerSlotClickHandler {
+
     public void beforeSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier);
 
-    public boolean handleSlotClick(
-            GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed);
+    public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier,
+            boolean eventconsumed);
 
     public void afterSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier);
 }
diff --git a/src/main/java/codechicken/nei/guihook/IContainerTooltipHandler.java b/src/main/java/codechicken/nei/guihook/IContainerTooltipHandler.java
index 5bf5b869..d58f3461 100644
--- a/src/main/java/codechicken/nei/guihook/IContainerTooltipHandler.java
+++ b/src/main/java/codechicken/nei/guihook/IContainerTooltipHandler.java
@@ -1,39 +1,50 @@
 package codechicken.nei.guihook;
 
 import java.util.List;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
 /**
- * If this interface is implemented by a GuiContainer then it will be the first handler delegated to but handleItmeDisplayName will not be called
+ * If this interface is implemented by a GuiContainer then it will be the first handler delegated to but
+ * handleItmeDisplayName will not be called
  */
 public interface IContainerTooltipHandler {
+
     /**
-     * Use this to add tooltips for other objects. If the current tip has lines in it after this call, the item tootip will not be handled. GuiContainerManager.shouldShowTooltip is not enforced here. It is recommended that you make this check yourself
-     * @param gui An instance of the currentscreen
-     * @param mousex The x position of the mouse in pixels from left
-     * @param mousey The y position of the mouse in pixels from top
+     * Use this to add tooltips for other objects. If the current tip has lines in it after this call, the item tootip
+     * will not be handled. GuiContainerManager.shouldShowTooltip is not enforced here. It is recommended that you make
+     * this check yourself
+     * 
+     * @param gui        An instance of the currentscreen
+     * @param mousex     The x position of the mouse in pixels from left
+     * @param mousey     The y position of the mouse in pixels from top
      * @param currenttip A list of strings, representing each line of the current tooltip as modified by other handlers
      * @return The modified list. NOTE: Do not return null
      */
     public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip);
 
     /**
-     * Use this for modifying the multiline display name of an item which may not necessarily be under the mouse. GuiContainerManager.shouldShowTooltip is enforced here.
-     * @param gui An instance of the currentscreen. If only general information about the item is wanted (Eg. potion effects) then this may be null.
-     * @param itemstack The ItemStack under the mouse
+     * Use this for modifying the multiline display name of an item which may not necessarily be under the mouse.
+     * GuiContainerManager.shouldShowTooltip is enforced here.
+     * 
+     * @param gui        An instance of the currentscreen. If only general information about the item is wanted (Eg.
+     *                   potion effects) then this may be null.
+     * @param itemstack  The ItemStack under the mouse
      * @param currenttip A list of strings, representing each line of the current tooltip as modified by other handlers
      * @return The modified list. NOTE: Do not return null
      */
     public List<String> handleItemDisplayName(GuiContainer gui, ItemStack itemstack, List<String> currenttip);
 
     /**
-     * Use this for modifying the tooltips of items that are under the mouse. GuiContainerManager.shouldShowTooltip is enforced here.
-     * @param gui An instance of the currentscreen
-     * @param itemstack The ItemStack under the mouse
+     * Use this for modifying the tooltips of items that are under the mouse. GuiContainerManager.shouldShowTooltip is
+     * enforced here.
+     * 
+     * @param gui        An instance of the currentscreen
+     * @param itemstack  The ItemStack under the mouse
      * @param currenttip A list of strings, representing each line of the current tooltip as modified by other handlers
      * @return The modified list. NOTE: Do not return null
      */
-    public List<String> handleItemTooltip(
-            GuiContainer gui, ItemStack itemstack, int mousex, int mousey, List<String> currenttip);
+    public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
+            List<String> currenttip);
 }
diff --git a/src/main/java/codechicken/nei/guihook/IGuiClientSide.java b/src/main/java/codechicken/nei/guihook/IGuiClientSide.java
index a035575b..84e33ecd 100644
--- a/src/main/java/codechicken/nei/guihook/IGuiClientSide.java
+++ b/src/main/java/codechicken/nei/guihook/IGuiClientSide.java
@@ -3,4 +3,5 @@ package codechicken.nei.guihook;
 /**
  * Marker interface. If detected, slot clicks will be sent only to the client side container and not to the server
  */
-public interface IGuiClientSide {}
+public interface IGuiClientSide {
+}
diff --git a/src/main/java/codechicken/nei/guihook/IGuiHandleMouseWheel.java b/src/main/java/codechicken/nei/guihook/IGuiHandleMouseWheel.java
index 9645e23b..e9f5d078 100644
--- a/src/main/java/codechicken/nei/guihook/IGuiHandleMouseWheel.java
+++ b/src/main/java/codechicken/nei/guihook/IGuiHandleMouseWheel.java
@@ -4,5 +4,6 @@ package codechicken.nei.guihook;
  * Interface for GuiContainers to recieve NEI compatible mouse wheel events
  */
 public interface IGuiHandleMouseWheel {
+
     public void mouseScrolled(int i);
 }
diff --git a/src/main/java/codechicken/nei/guihook/IGuiSlotDraw.java b/src/main/java/codechicken/nei/guihook/IGuiSlotDraw.java
index 82118b7a..1aa8eb51 100644
--- a/src/main/java/codechicken/nei/guihook/IGuiSlotDraw.java
+++ b/src/main/java/codechicken/nei/guihook/IGuiSlotDraw.java
@@ -4,5 +4,6 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 public interface IGuiSlotDraw {
+
     public void drawSlotItem(Slot slot, ItemStack stack, int x, int y, String quantity);
 }
diff --git a/src/main/java/codechicken/nei/recipe/BookmarkRecipeId.java b/src/main/java/codechicken/nei/recipe/BookmarkRecipeId.java
index 8254c58c..d43d3a3f 100644
--- a/src/main/java/codechicken/nei/recipe/BookmarkRecipeId.java
+++ b/src/main/java/codechicken/nei/recipe/BookmarkRecipeId.java
@@ -1,15 +1,18 @@
 package codechicken.nei.recipe;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
 import codechicken.nei.PositionedStack;
 import codechicken.nei.util.NBTJson;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 
 public class BookmarkRecipeId {
 
@@ -67,8 +70,8 @@ public class BookmarkRecipeId {
         Short idx = 0;
 
         for (PositionedStack pStack : stacks) {
-            final NBTTagCompound tagCompoundA =
-                    StackInfo.itemStackToNBT(StackInfo.getItemStackWithMinimumDamage(pStack.items));
+            final NBTTagCompound tagCompoundA = StackInfo
+                    .itemStackToNBT(StackInfo.getItemStackWithMinimumDamage(pStack.items));
             final NBTTagCompound tagCompoundB = ingredients.get(idx);
 
             if (tagCompoundB == null || !tagCompoundB.equals(tagCompoundA)) {
diff --git a/src/main/java/codechicken/nei/recipe/BrewingOverlayHandler.java b/src/main/java/codechicken/nei/recipe/BrewingOverlayHandler.java
index 815af812..4e5b09f5 100644
--- a/src/main/java/codechicken/nei/recipe/BrewingOverlayHandler.java
+++ b/src/main/java/codechicken/nei/recipe/BrewingOverlayHandler.java
@@ -1,11 +1,14 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.PositionedStack;
 import java.util.List;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
 
+import codechicken.nei.PositionedStack;
+
 public class BrewingOverlayHandler extends DefaultOverlayHandler {
+
     @Override
     public Slot[][] mapIngredSlots(GuiContainer gui, List<PositionedStack> ingredients) {
         Slot[][] map = super.mapIngredSlots(gui, ingredients);
diff --git a/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java b/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java
index ddc6d483..2153f378 100644
--- a/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/BrewingRecipeHandler.java
@@ -2,17 +2,13 @@ package codechicken.nei.recipe;
 
 import static net.minecraft.init.Items.potionitem;
 
-import codechicken.nei.ItemStackSet;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.NEIServerUtils;
-import codechicken.nei.PositionedStack;
-import codechicken.nei.api.API;
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
+
 import net.minecraft.client.gui.inventory.GuiBrewingStand;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemPotion;
@@ -21,8 +17,16 @@ import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.potion.PotionHelper;
 
+import codechicken.nei.ItemStackSet;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.NEIServerUtils;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.api.API;
+
 public class BrewingRecipeHandler extends TemplateRecipeHandler {
+
     public static class BrewingRecipe {
+
         public PositionedStack precursorPotion;
         public PositionedStack result;
         public PositionedStack ingredient;
@@ -35,6 +39,7 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
     }
 
     public class CachedBrewingRecipe extends CachedRecipe {
+
         public final BrewingRecipe recipe;
 
         public CachedBrewingRecipe(BrewingRecipe recipe) {
@@ -77,9 +82,9 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
 
     @Override
     public void loadCraftingRecipes(String outputId, Object... results) {
-        if (outputId.equals("brewing")
-                && getClass() == BrewingRecipeHandler.class) // don't want subclasses getting a hold of this
-        for (BrewingRecipe recipe : apotions) arecipes.add(new CachedBrewingRecipe(recipe));
+        if (outputId.equals("brewing") && getClass() == BrewingRecipeHandler.class) // don't want subclasses getting a
+                                                                                    // hold of this
+            for (BrewingRecipe recipe : apotions) arecipes.add(new CachedBrewingRecipe(recipe));
         else super.loadCraftingRecipes(outputId, results);
     }
 
@@ -89,9 +94,7 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
         int damage = result.getItemDamage();
 
         // Note: Not safe as written for parallelStream
-        apotions.stream()
-                .filter(recipe -> recipe.result.item.getItemDamage() == damage)
-                .map(CachedBrewingRecipe::new)
+        apotions.stream().filter(recipe -> recipe.result.item.getItemDamage() == damage).map(CachedBrewingRecipe::new)
                 .collect(Collectors.toCollection(() -> arecipes));
     }
 
@@ -101,10 +104,10 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
 
         // Note: Not safe as written for parallelStream
         apotions.stream()
-                .filter(recipe -> NEIServerUtils.areStacksSameType(recipe.ingredient.item, ingredient)
-                        || NEIServerUtils.areStacksSameType(recipe.precursorPotion.item, ingredient))
-                .map(CachedBrewingRecipe::new)
-                .collect(Collectors.toCollection(() -> arecipes));
+                .filter(
+                        recipe -> NEIServerUtils.areStacksSameType(recipe.ingredient.item, ingredient)
+                                || NEIServerUtils.areStacksSameType(recipe.precursorPotion.item, ingredient))
+                .map(CachedBrewingRecipe::new).collect(Collectors.toCollection(() -> arecipes));
     }
 
     @Override
@@ -129,8 +132,7 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
                 if (ItemPotion.isSplash(basePotion)) continue;
 
                 for (ItemStack ingred : ingredients.values()) {
-                    int result = PotionHelper.applyIngredient(
-                            basePotion, ingred.getItem().getPotionEffect(ingred));
+                    int result = PotionHelper.applyIngredient(basePotion, ingred.getItem().getPotionEffect(ingred));
 
                     if (ItemPotion.isSplash(result)) { // splash potions qualify
                         addPotion(ingred, basePotion, result, allPotions, newPotions);
@@ -139,14 +141,13 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
 
                     List<?> baseMods = potionitem.getEffects(basePotion);
                     List<?> newMods = potionitem.getEffects(result); // compare ID's
-                    if (basePotion > 0 && baseMods == newMods
-                            || // same modifers and not water->empty
-                            baseMods != null && (baseMods.equals(newMods) || newMods == null)
-                            || // modifiers different and doesn't lose modifiers
-                            basePotion == result
-                            || // same potion
+                    if (basePotion > 0 && baseMods == newMods || // same modifers and not water->empty
+                            baseMods != null && (baseMods.equals(newMods) || newMods == null) || // modifiers different
+                                                                                                 // and doesn't lose
+                                                                                                 // modifiers
+                            basePotion == result || // same potion
                             levelModifierChanged(basePotion, result)) // redstone/glowstone cycle
-                    continue;
+                        continue;
 
                     addPotion(ingred, basePotion, result, allPotions, newPotions);
                 }
@@ -157,12 +158,12 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
 
         API.setItemListEntries(
                 potionitem,
-                allPotions.stream()
-                        .map(potionID -> new ItemStack(potionitem, 1, potionID))
+                allPotions.stream().map(potionID -> new ItemStack(potionitem, 1, potionID))
                         .collect(Collectors.toList()));
         API.addSubset("Items.Potions", new ItemStackSet().with(potionitem));
         API.addSubset(
-                "Items.Potions.Splash", item -> item.getItem() == potionitem && (item.getItemDamage() & 0x4000) != 0);
+                "Items.Potions.Splash",
+                item -> item.getItem() == potionitem && (item.getItemDamage() & 0x4000) != 0);
 
         ItemStackSet positivepots = new ItemStackSet();
         ItemStackSet negativepots = new ItemStackSet();
@@ -171,10 +172,9 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
         for (int potionID : allPotions) {
             List<PotionEffect> effectlist = potionitem.getEffects(potionID);
             int type = 0;
-            if (effectlist != null && !effectlist.isEmpty())
-                for (PotionEffect potioneffect : effectlist)
-                    if (Potion.potionTypes[potioneffect.getPotionID()].isBadEffect()) type--;
-                    else type++;
+            if (effectlist != null && !effectlist.isEmpty()) for (PotionEffect potioneffect : effectlist)
+                if (Potion.potionTypes[potioneffect.getPotionID()].isBadEffect()) type--;
+                else type++;
 
             (type == 0 ? neutralpots : type > 0 ? positivepots : negativepots)
                     .add(new ItemStack(potionitem, 1, potionID));
@@ -192,11 +192,11 @@ public class BrewingRecipeHandler extends TemplateRecipeHandler {
         return basemod != 0 && basemod != resultmod;
     }
 
-    private static void addPotion(
-            ItemStack ingred, int basePotion, int result, TreeSet<Integer> allPotions, HashSet<Integer> newPotions) {
+    private static void addPotion(ItemStack ingred, int basePotion, int result, TreeSet<Integer> allPotions,
+            HashSet<Integer> newPotions) {
         apotions.add(new BrewingRecipe(ingred, basePotion, result));
         if (allPotions.add(result)) // it's new
-        newPotions.add(result);
+            newPotions.add(result);
     }
 
     @Override
diff --git a/src/main/java/codechicken/nei/recipe/CatalystInfo.java b/src/main/java/codechicken/nei/recipe/CatalystInfo.java
index 6ccc0adb..106e2036 100644
--- a/src/main/java/codechicken/nei/recipe/CatalystInfo.java
+++ b/src/main/java/codechicken/nei/recipe/CatalystInfo.java
@@ -3,6 +3,7 @@ package codechicken.nei.recipe;
 import net.minecraft.item.ItemStack;
 
 public class CatalystInfo {
+
     private final ItemStack stack;
     private final int priority;
 
diff --git a/src/main/java/codechicken/nei/recipe/CatalystInfoList.java b/src/main/java/codechicken/nei/recipe/CatalystInfoList.java
index 99024585..291f092e 100644
--- a/src/main/java/codechicken/nei/recipe/CatalystInfoList.java
+++ b/src/main/java/codechicken/nei/recipe/CatalystInfoList.java
@@ -1,16 +1,21 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.NEIServerUtils;
-import com.google.common.collect.ForwardingList;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.annotation.Nonnull;
+
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIServerUtils;
+
+import com.google.common.collect.ForwardingList;
+
 // Do not directly extend ArrayList, see Effective Java Item 16
 public class CatalystInfoList extends ForwardingList<CatalystInfo> {
+
     private final String handlerID;
     private final List<CatalystInfo> catalystInfoList = new ArrayList<>();
 
@@ -31,9 +36,11 @@ public class CatalystInfoList extends ForwardingList<CatalystInfo> {
     @Override
     public boolean add(@Nonnull CatalystInfo catalystInfo) {
         if (contains(catalystInfo)) {
-            NEIClientConfig.logger.info(String.format(
-                    "catalyst %s is already registered to handler %s",
-                    catalystInfo.getStack().getDisplayName(), handlerID));
+            NEIClientConfig.logger.info(
+                    String.format(
+                            "catalyst %s is already registered to handler %s",
+                            catalystInfo.getStack().getDisplayName(),
+                            handlerID));
             return false;
         }
         super.add(catalystInfo);
diff --git a/src/main/java/codechicken/nei/recipe/CheatItemHandler.java b/src/main/java/codechicken/nei/recipe/CheatItemHandler.java
index 29ad9417..02e6247a 100644
--- a/src/main/java/codechicken/nei/recipe/CheatItemHandler.java
+++ b/src/main/java/codechicken/nei/recipe/CheatItemHandler.java
@@ -1,13 +1,14 @@
 package codechicken.nei.recipe;
 
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
 import codechicken.nei.NEICPH;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.NEIServerUtils;
 import codechicken.nei.api.INEIGuiAdapter;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
 
 public class CheatItemHandler extends INEIGuiAdapter {
 
@@ -25,12 +26,12 @@ public class CheatItemHandler extends INEIGuiAdapter {
                     contents = 0;
                 }
 
-                final int total = Math.min(
-                        contents + add, Math.min(overSlot.getSlotStackLimit(), draggedStack.getMaxStackSize()));
+                final int total = Math
+                        .min(contents + add, Math.min(overSlot.getSlotStackLimit(), draggedStack.getMaxStackSize()));
 
                 if (total > contents) {
-                    NEIClientUtils.setSlotContents(
-                            overSlot.slotNumber, NEIServerUtils.copyStack(draggedStack, total), true);
+                    NEIClientUtils
+                            .setSlotContents(overSlot.slotNumber, NEIServerUtils.copyStack(draggedStack, total), true);
                     NEICPH.sendGiveItem(NEIServerUtils.copyStack(draggedStack, total), false, false);
                     draggedStack.stackSize -= total - contents;
                 }
diff --git a/src/main/java/codechicken/nei/recipe/ContainerRecipe.java b/src/main/java/codechicken/nei/recipe/ContainerRecipe.java
index 8ff5f73e..9859f064 100644
--- a/src/main/java/codechicken/nei/recipe/ContainerRecipe.java
+++ b/src/main/java/codechicken/nei/recipe/ContainerRecipe.java
@@ -1,14 +1,17 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.PositionedStack;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.PositionedStack;
+
 public class ContainerRecipe extends Container {
+
     private class RecipeInventory implements IInventory {
+
         @Override
         public boolean isUseableByPlayer(EntityPlayer entityplayer) {
             return true;
@@ -97,6 +100,7 @@ public class ContainerRecipe extends Container {
     public void addSlot(PositionedStack stack, int recipex, int recipey) {
         int slot = inventorySlots.size();
         addSlotToContainer(new Slot(recipeInventory, slot, recipex + stack.relx, recipey + stack.rely) {
+
             @Override
             public boolean isItemValid(ItemStack par1ItemStack) {
                 return false;
diff --git a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java
index 85e04fe8..b769e335 100644
--- a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java
+++ b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java
@@ -1,22 +1,25 @@
 package codechicken.nei.recipe;
 
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.nei.FastTransferManager;
-import codechicken.nei.PositionedStack;
-import codechicken.nei.api.IOverlayHandler;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.nei.FastTransferManager;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.api.IOverlayHandler;
+
 @SuppressWarnings("rawtypes, unchecked")
 public class DefaultOverlayHandler implements IOverlayHandler {
+
     public static Class gtItem;
 
     static {
@@ -28,6 +31,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
     }
 
     public static class DistributedIngred {
+
         public DistributedIngred(ItemStack item) {
             stack = InventoryUtils.copyStack(item, 1);
         }
@@ -40,6 +44,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
     }
 
     public static class IngredientDistribution {
+
         public IngredientDistribution(DistributedIngred distrib, ItemStack permutation) {
             this.distrib = distrib;
             this.permutation = permutation;
@@ -82,14 +87,13 @@ public class DefaultOverlayHandler implements IOverlayHandler {
 
     @SuppressWarnings("unchecked")
     private boolean clearIngredients(GuiContainer gui, List<PositionedStack> ingreds) {
-        for (PositionedStack pstack : ingreds)
-            for (Slot slot : (List<Slot>) gui.inventorySlots.inventorySlots)
-                if (slot.xDisplayPosition == pstack.relx + offsetx && slot.yDisplayPosition == pstack.rely + offsety) {
-                    if (!slot.getHasStack()) continue;
+        for (PositionedStack pstack : ingreds) for (Slot slot : (List<Slot>) gui.inventorySlots.inventorySlots)
+            if (slot.xDisplayPosition == pstack.relx + offsetx && slot.yDisplayPosition == pstack.rely + offsety) {
+                if (!slot.getHasStack()) continue;
 
-                    FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1);
-                    if (slot.getHasStack()) return false;
-                }
+                FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1);
+                if (slot.getHasStack()) return false;
+            }
 
         return true;
     }
@@ -152,8 +156,8 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         return quantity;
     }
 
-    private Slot[][] assignIngredSlots(
-            GuiContainer gui, List<PositionedStack> ingredients, List<IngredientDistribution> assignedIngredients) {
+    private Slot[][] assignIngredSlots(GuiContainer gui, List<PositionedStack> ingredients,
+            List<IngredientDistribution> assignedIngredients) {
         Slot[][] recipeSlots = mapIngredSlots(gui, ingredients); // setup the slot map
 
         HashMap<Slot, Integer> distribution = new HashMap<>();
@@ -169,7 +173,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         }
 
         while (avaliableSlots.size() > 0 && remainingIngreds.size() > 0) {
-            for (Iterator<Integer> iterator = remainingIngreds.iterator(); iterator.hasNext(); ) {
+            for (Iterator<Integer> iterator = remainingIngreds.iterator(); iterator.hasNext();) {
                 int i = iterator.next();
                 boolean assigned = false;
                 DistributedIngred istack = assignedIngredients.get(i).distrib;
@@ -196,8 +200,8 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         return recipeSlots;
     }
 
-    private List<IngredientDistribution> assignIngredients(
-            List<PositionedStack> ingredients, List<DistributedIngred> ingredStacks) {
+    private List<IngredientDistribution> assignIngredients(List<PositionedStack> ingredients,
+            List<DistributedIngred> ingredStacks) {
         ArrayList<IngredientDistribution> assignedIngredients = new ArrayList<>();
         for (PositionedStack posstack : ingredients) // assign what we need and have
         {
@@ -206,10 +210,10 @@ public class DefaultOverlayHandler implements IOverlayHandler {
             int biggestSize = 0;
             for (ItemStack pstack : posstack.items) {
                 for (DistributedIngred istack : ingredStacks) {
-                    if (!canStack(pstack, istack.stack)
-                            || istack.invAmount - istack.distributed < pstack.stackSize
+                    if (!canStack(pstack, istack.stack) || istack.invAmount - istack.distributed < pstack.stackSize
                             || istack.recipeAmount == 0
-                            || pstack.stackSize == 0) continue;
+                            || pstack.stackSize == 0)
+                        continue;
 
                     int relsize = (istack.invAmount - istack.invAmount / istack.recipeAmount * istack.distributed)
                             / pstack.stackSize;
@@ -223,7 +227,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
             }
 
             if (biggestIngred == null) // not enough ingreds
-            return null;
+                return null;
 
             biggestIngred.distributed += permutation.stackSize;
             assignedIngredients.add(new IngredientDistribution(biggestIngred, permutation));
@@ -234,7 +238,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
 
     @SuppressWarnings("unchecked")
     private void findInventoryQuantities(GuiContainer gui, List<DistributedIngred> ingredStacks) {
-        for (Slot slot : (List<Slot>) gui.inventorySlots.inventorySlots) /*work out how much we have to go round*/ {
+        for (Slot slot : (List<Slot>) gui.inventorySlots.inventorySlots) /* work out how much we have to go round */ {
             if (slot.getHasStack() && canMoveFrom(slot, gui)) {
                 ItemStack pstack = slot.getStack();
                 DistributedIngred istack = findIngred(ingredStacks, pstack);
@@ -245,7 +249,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
 
     private List<DistributedIngred> getPermutationIngredients(List<PositionedStack> ingredients) {
         ArrayList<DistributedIngred> ingredStacks = new ArrayList<>();
-        for (PositionedStack posstack : ingredients) /*work out what we need*/ {
+        for (PositionedStack posstack : ingredients) /* work out what we need */ {
             for (ItemStack pstack : posstack.items) {
                 DistributedIngred istack = findIngred(ingredStacks, pstack);
                 if (istack == null) ingredStacks.add(istack = new DistributedIngred(pstack));
@@ -262,7 +266,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
     @SuppressWarnings("unchecked")
     public Slot[][] mapIngredSlots(GuiContainer gui, List<PositionedStack> ingredients) {
         Slot[][] recipeSlotList = new Slot[ingredients.size()][];
-        for (int i = 0; i < ingredients.size(); i++) /*identify slots*/ {
+        for (int i = 0; i < ingredients.size(); i++) /* identify slots */ {
             LinkedList<Slot> recipeSlots = new LinkedList<>();
             PositionedStack pstack = ingredients.get(i);
             for (Slot slot : (List<Slot>) gui.inventorySlots.inventorySlots) {
@@ -289,8 +293,9 @@ public class DefaultOverlayHandler implements IOverlayHandler {
             // GT Items don't have any NBT set for the recipe, so if either of the stacks has a NULL nbt, and the other
             // doesn't, pretend they stack
             if (((gtItem != null && gtItem.isInstance(stack1.getItem()))
-                            || (stack1.getMaxStackSize() == 1 && stack2.getMaxStackSize() == 1))
-                    && (stack1.stackTagCompound == null ^ stack2.stackTagCompound == null)) return true;
+                    || (stack1.getMaxStackSize() == 1 && stack2.getMaxStackSize() == 1))
+                    && (stack1.stackTagCompound == null ^ stack2.stackTagCompound == null))
+                return true;
         }
         return false;
     }
diff --git a/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java b/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java
index 9d0e78a0..28e59afe 100644
--- a/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java
+++ b/src/main/java/codechicken/nei/recipe/FillFluidContainerHandler.java
@@ -1,14 +1,15 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.ItemPanel.ItemPanelSlot;
-import codechicken.nei.ItemPanels;
-import codechicken.nei.api.INEIGuiAdapter;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
+import codechicken.nei.ItemPanel.ItemPanelSlot;
+import codechicken.nei.ItemPanels;
+import codechicken.nei.api.INEIGuiAdapter;
+
 public class FillFluidContainerHandler extends INEIGuiAdapter {
 
     @Override
diff --git a/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java b/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java
index 7ddff569..ff03bbd2 100644
--- a/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/FireworkRecipeHandler.java
@@ -1,24 +1,28 @@
 package codechicken.nei.recipe;
 
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.InventoryCraftingDummy;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.PositionedStack;
-import codechicken.nei.guihook.GuiContainerManager;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+
 import net.minecraft.init.Items;
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.RecipeFireworks;
 
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.InventoryCraftingDummy;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.guihook.GuiContainerManager;
+
 public class FireworkRecipeHandler extends ShapelessRecipeHandler {
+
     public class CachedFireworkRecipe extends CachedShapelessRecipe {
+
         final LinkedList<Object> itemList = new LinkedList<>();
 
         public final Object[] baseIngredients;
@@ -57,24 +61,15 @@ public class FireworkRecipeHandler extends ShapelessRecipeHandler {
 
     public FireworkRecipeHandler() {
         super();
-        stackorder = new int[][] {
-            {0, 0},
-            {1, 0},
-            {2, 0},
-            {0, 1},
-            {1, 1},
-            {2, 1},
-            {0, 2},
-            {1, 2},
-            {2, 2}
-        };
+        stackorder = new int[][] { { 0, 0 }, { 1, 0 }, { 2, 0 }, { 0, 1 }, { 1, 1 }, { 2, 1 }, { 0, 2 }, { 1, 2 },
+                { 2, 2 } };
         loadAllFireworks();
     }
 
     private void loadAllFireworks() {
         // charges
-        Item[] shapes = new Item[] {null, Items.fire_charge, Items.gold_nugget, Items.feather, Items.skull};
-        Item[] effects = new Item[] {null, Items.diamond, Items.glowstone_dust};
+        Item[] shapes = new Item[] { null, Items.fire_charge, Items.gold_nugget, Items.feather, Items.skull };
+        Item[] effects = new Item[] { null, Items.diamond, Items.glowstone_dust };
         for (Item shape : shapes)
             for (Item effect : effects) genRecipe(Items.gunpowder, shape, effect, Items.dye, Items.dye, 0);
 
@@ -102,8 +97,8 @@ public class FireworkRecipeHandler extends ShapelessRecipeHandler {
         Object[] ingreds = new Object[numIngreds];
         for (int i = 0, j = 0; i < params.length - 2; i++) if (params[i] != null) ingreds[j++] = params[i];
 
-        mfireworks.add(
-                new CachedFireworkRecipe(ingreds, params[params.length - 2], (Integer) params[params.length - 1]));
+        mfireworks
+                .add(new CachedFireworkRecipe(ingreds, params[params.length - 2], (Integer) params[params.length - 1]));
     }
 
     @Override
@@ -155,11 +150,11 @@ public class FireworkRecipeHandler extends ShapelessRecipeHandler {
         Point mousepos = GuiDraw.getMousePosition();
         Point relMouse = new Point(mousepos.x - gui.guiLeft, mousepos.y - gui.guiTop);
         Point recipepos = gui.getRecipePosition(recipe);
-        if (currenttip.isEmpty()
-                && GuiContainerManager.getStackMouseOver(gui) == null
+        if (currenttip.isEmpty() && GuiContainerManager.getStackMouseOver(gui) == null
                 && new Rectangle(recipepos.x, recipepos.y, 166, 55).contains(relMouse))
-            currenttip.add(NEIClientUtils.translate(
-                    "recipe.firework.tooltip" + ((CachedFireworkRecipe) arecipes.get(recipe)).recipeType));
+            currenttip.add(
+                    NEIClientUtils.translate(
+                            "recipe.firework.tooltip" + ((CachedFireworkRecipe) arecipes.get(recipe)).recipeType));
         return currenttip;
     }
 }
diff --git a/src/main/java/codechicken/nei/recipe/FuelRecipeHandler.java b/src/main/java/codechicken/nei/recipe/FuelRecipeHandler.java
index b314d8fb..4fc3d62c 100644
--- a/src/main/java/codechicken/nei/recipe/FuelRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/FuelRecipeHandler.java
@@ -2,18 +2,22 @@ package codechicken.nei.recipe;
 
 import static codechicken.nei.NEIClientUtils.translate;
 
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.PositionedStack;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.PositionedStack;
+
 public class FuelRecipeHandler extends FurnaceRecipeHandler {
+
     public class CachedFuelRecipe extends CachedRecipe {
+
         public final FuelPair fuel;
 
         public CachedFuelRecipe(FuelPair fuel) {
@@ -50,10 +54,9 @@ public class FuelRecipeHandler extends FurnaceRecipeHandler {
     @SuppressWarnings("unchecked")
     private void loadAllSmelting() {
         // Note: Not safe as written for parallelStream
-        final Map<ItemStack, ItemStack> smeltingRecipes =
-                (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
-        smeltingRecipes.entrySet().stream()
-                .map(recipe -> new SmeltingPair(recipe.getKey(), recipe.getValue()))
+        final Map<ItemStack, ItemStack> smeltingRecipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting()
+                .getSmeltingList();
+        smeltingRecipes.entrySet().stream().map(recipe -> new SmeltingPair(recipe.getKey(), recipe.getValue()))
                 .collect(Collectors.toCollection(() -> mfurnace));
     }
 
@@ -66,10 +69,8 @@ public class FuelRecipeHandler extends FurnaceRecipeHandler {
 
     public void loadUsageRecipes(ItemStack ingredient) {
         // Note: Not safe as written for parallelStream
-        afuels.stream()
-                .filter(fuel -> fuel != null && fuel.stack != null && fuel.stack.contains(ingredient))
-                .map(CachedFuelRecipe::new)
-                .collect(Collectors.toCollection(() -> arecipes));
+        afuels.stream().filter(fuel -> fuel != null && fuel.stack != null && fuel.stack.contains(ingredient))
+                .map(CachedFuelRecipe::new).collect(Collectors.toCollection(() -> arecipes));
     }
 
     @Override
@@ -89,8 +90,7 @@ public class FuelRecipeHandler extends FurnaceRecipeHandler {
         NumberFormat numberInstance = NumberFormat.getNumberInstance();
         numberInstance.setMaximumFractionDigits(2);
         String smeltCount = numberInstance.format(fuel.burnTime / 200f);
-        Minecraft.getMinecraft()
-                .fontRenderer
+        Minecraft.getMinecraft().fontRenderer
                 .drawString(translate("recipe.fuel.smeltCount", smeltCount), 73, 51, 0xFF000000);
     }
 }
diff --git a/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java b/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java
index 849e83d4..4ffb9881 100644
--- a/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/FurnaceRecipeHandler.java
@@ -1,21 +1,25 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.NEIServerUtils;
-import codechicken.nei.PositionedStack;
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiFurnace;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.NEIServerUtils;
+import codechicken.nei.PositionedStack;
+
 public class FurnaceRecipeHandler extends TemplateRecipeHandler {
+
     public class SmeltingPair extends CachedRecipe {
+
         public SmeltingPair(ItemStack ingred, ItemStack result) {
             ingred.stackSize = 1;
             this.ingred = new PositionedStack(ingred, 51, 6);
@@ -39,6 +43,7 @@ public class FurnaceRecipeHandler extends TemplateRecipeHandler {
     }
 
     public static class FuelPair {
+
         public FuelPair(ItemStack ingred, int burnTime) {
             this.stack = new PositionedStack(ingred, 51, 42, false);
             this.burnTime = burnTime;
@@ -77,10 +82,9 @@ public class FurnaceRecipeHandler extends TemplateRecipeHandler {
 
     @Override
     public void loadCraftingRecipes(String outputId, Object... results) {
-        if (outputId.equals("smelting")
-                && getClass() == FurnaceRecipeHandler.class) { // don't want subclasses getting a hold of this
-            Map<ItemStack, ItemStack> recipes =
-                    (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
+        if (outputId.equals("smelting") && getClass() == FurnaceRecipeHandler.class) { // don't want subclasses getting
+                                                                                       // a hold of this
+            Map<ItemStack, ItemStack> recipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
             for (Entry<ItemStack, ItemStack> recipe : recipes.entrySet())
                 arecipes.add(new SmeltingPair(recipe.getKey(), recipe.getValue()));
         } else super.loadCraftingRecipes(outputId, results);
@@ -88,8 +92,7 @@ public class FurnaceRecipeHandler extends TemplateRecipeHandler {
 
     @Override
     public void loadCraftingRecipes(ItemStack result) {
-        Map<ItemStack, ItemStack> recipes =
-                (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
+        Map<ItemStack, ItemStack> recipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
         for (Entry<ItemStack, ItemStack> recipe : recipes.entrySet())
             if (NEIServerUtils.areStacksSameType(recipe.getValue(), result))
                 arecipes.add(new SmeltingPair(recipe.getKey(), recipe.getValue()));
@@ -97,16 +100,15 @@ public class FurnaceRecipeHandler extends TemplateRecipeHandler {
 
     @Override
     public void loadUsageRecipes(String inputId, Object... ingredients) {
-        if (inputId.equals("fuel")
-                && getClass() == FurnaceRecipeHandler.class) // don't want subclasses getting a hold of this
-        loadCraftingRecipes("smelting");
+        if (inputId.equals("fuel") && getClass() == FurnaceRecipeHandler.class) // don't want subclasses getting a hold
+                                                                                // of this
+            loadCraftingRecipes("smelting");
         else super.loadUsageRecipes(inputId, ingredients);
     }
 
     @Override
     public void loadUsageRecipes(ItemStack ingredient) {
-        Map<ItemStack, ItemStack> recipes =
-                (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
+        Map<ItemStack, ItemStack> recipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
         for (Entry<ItemStack, ItemStack> recipe : recipes.entrySet())
             if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getKey(), ingredient)) {
                 SmeltingPair arecipe = new SmeltingPair(recipe.getKey(), recipe.getValue());
diff --git a/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java b/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java
index dda54165..5e345ba3 100644
--- a/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java
+++ b/src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java
@@ -2,19 +2,22 @@ package codechicken.nei.recipe;
 
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.item.ItemStack;
+
 import codechicken.nei.ItemPanel.ItemPanelSlot;
 import codechicken.nei.ItemPanels;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PositionedStack;
-import java.awt.Point;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.item.ItemStack;
 
 public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
+
     public static ArrayList<ICraftingHandler> craftinghandlers = new ArrayList<>();
     public static ArrayList<ICraftingHandler> serialCraftingHandlers = new ArrayList<>();
 
@@ -22,8 +25,8 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
         return openRecipeGui(outputId, false, false, results);
     }
 
-    public static boolean openRecipeGui(
-            String outputId, final Boolean overlay, final Boolean shift, Object... results) {
+    public static boolean openRecipeGui(String outputId, final Boolean overlay, final Boolean shift,
+            Object... results) {
         final Minecraft mc = NEIClientUtils.mc();
 
         final BookmarkRecipeId recipeId = "item".equals(outputId)
@@ -33,7 +36,9 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
         if (overlay && recipeId == null) return false;
 
         final RecipeHandlerQuery<ICraftingHandler> recipeQuery = new RecipeHandlerQuery<>(
-                h -> h.getRecipeHandler(outputId, results), craftinghandlers, serialCraftingHandlers);
+                h -> h.getRecipeHandler(outputId, results),
+                craftinghandlers,
+                serialCraftingHandlers);
 
         final ArrayList<ICraftingHandler> handlers = recipeQuery.runWithProfiling("recipe.concurrent.crafting");
 
@@ -86,8 +91,8 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
     public static void registerRecipeHandler(ICraftingHandler handler) {
         final String handlerId = handler.getHandlerId();
         if (craftinghandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId))
-                || serialCraftingHandlers.stream()
-                        .anyMatch(h -> h.getHandlerId().equals(handlerId))) return;
+                || serialCraftingHandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId)))
+            return;
 
         if (NEIClientConfig.serialHandlers.contains(handlerId)) serialCraftingHandlers.add(handler);
         else craftinghandlers.add(handler);
diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipe.java b/src/main/java/codechicken/nei/recipe/GuiRecipe.java
index d36f7b4a..0573aff0 100644
--- a/src/main/java/codechicken/nei/recipe/GuiRecipe.java
+++ b/src/main/java/codechicken/nei/recipe/GuiRecipe.java
@@ -1,5 +1,27 @@
 package codechicken.nei.recipe;
 
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+
 import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.GuiNEIButton;
 import codechicken.nei.LayoutManager;
@@ -19,32 +41,10 @@ import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerTooltipHandler;
 import codechicken.nei.guihook.IGuiClientSide;
 import codechicken.nei.guihook.IGuiHandleMouseWheel;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
 
-public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
-        implements IGuiContainerOverlay,
-                IGuiClientSide,
-                IGuiHandleMouseWheel,
-                IContainerTooltipHandler,
-                INEIGuiHandler {
+public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer implements IGuiContainerOverlay,
+        IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler, INEIGuiHandler {
+
     // Background image calculations
     private static final int BG_TOP_HEIGHT = 6;
     private static final int BG_MIDDLE_HEIGHT = 154;
@@ -60,12 +60,20 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
     private static final int buttonHeight = 12;
 
     // Background image
-    final DrawableResource bgTop =
-            new DrawableBuilder("nei:textures/gui/recipebg.png", 0, BG_TOP_Y, 176, BG_TOP_HEIGHT).build();
-    final DrawableResource bgMiddle =
-            new DrawableBuilder("nei:textures/gui/recipebg.png", 0, BG_MIDDLE_Y, 176, BG_MIDDLE_HEIGHT).build();
-    final DrawableResource bgBottom =
-            new DrawableBuilder("nei:textures/gui/recipebg.png", 0, BG_BOTTOM_Y, 176, BG_BOTTOM_HEIGHT).build();
+    final DrawableResource bgTop = new DrawableBuilder("nei:textures/gui/recipebg.png", 0, BG_TOP_Y, 176, BG_TOP_HEIGHT)
+            .build();
+    final DrawableResource bgMiddle = new DrawableBuilder(
+            "nei:textures/gui/recipebg.png",
+            0,
+            BG_MIDDLE_Y,
+            176,
+            BG_MIDDLE_HEIGHT).build();
+    final DrawableResource bgBottom = new DrawableBuilder(
+            "nei:textures/gui/recipebg.png",
+            0,
+            BG_BOTTOM_Y,
+            176,
+            BG_BOTTOM_HEIGHT).build();
 
     public ArrayList<H> currenthandlers = new ArrayList<>();
 
@@ -109,23 +117,23 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
     }
 
     /**
-     * Many old mods assumed a fixed NEI window height of {@code 166} pixels. Now that this is no
-     * longer the case, their fluid mouseover handling is broken. This helper class fixes these old
-     * mods by hacking the {@link #height} property's value so that these old mods' calculations
-     * return the correct value for the new height.
+     * Many old mods assumed a fixed NEI window height of {@code 166} pixels. Now that this is no longer the case, their
+     * fluid mouseover handling is broken. This helper class fixes these old mods by hacking the {@link #height}
+     * property's value so that these old mods' calculations return the correct value for the new height.
      *
-     * <p>This class is an {@link AutoCloseable} so that it can be used with try-with-resources,
-     * which will ensure that {@link #height} is returned to the correct value afterwards.
+     * <p>
+     * This class is an {@link AutoCloseable} so that it can be used with try-with-resources, which will ensure that
+     * {@link #height} is returned to the correct value afterwards.
      */
     private class HeightHack implements AutoCloseable {
+
         private final int trueHeight;
 
         private HeightHack() {
             trueHeight = height;
 
             boolean applyHeightHack = NEIClientConfig.heightHackHandlerRegex.stream()
-                    .map(pattern -> pattern.matcher(handler.getHandlerId()))
-                    .anyMatch(Matcher::matches);
+                    .map(pattern -> pattern.matcher(handler.getHandlerId())).anyMatch(Matcher::matches);
             if (applyHeightHack) {
                 // The old mods use the calculation ((height - 166) / 2) to compute the y-value of
                 // the top edge of the NEI window.
@@ -405,11 +413,11 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
                 nextPage();
                 return;
         }
-        if (overlayButtons != null
-                && guibutton.id >= OVERLAY_BUTTON_ID_START
+        if (overlayButtons != null && guibutton.id >= OVERLAY_BUTTON_ID_START
                 && guibutton.id < OVERLAY_BUTTON_ID_START + overlayButtons.length) {
             overlayRecipe(
-                    page * getRecipesPerPage() + guibutton.id - OVERLAY_BUTTON_ID_START, NEIClientUtils.shiftKey());
+                    page * getRecipesPerPage() + guibutton.id - OVERLAY_BUTTON_ID_START,
+                    NEIClientUtils.shiftKey());
         }
     }
 
@@ -430,8 +438,8 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
     }
 
     @Override
-    public List<String> handleItemTooltip(
-            GuiContainer gui, ItemStack stack, int mousex, int mousey, List<String> currenttip) {
+    public List<String> handleItemTooltip(GuiContainer gui, ItemStack stack, int mousex, int mousey,
+            List<String> currenttip) {
         // Height hacking is probably not needed as it doesn't look like any mods check mouse
         // position for this method.
         for (int i : getRecipeIndices()) currenttip = handler.handleItemTooltip(this, stack, currenttip, i);
@@ -546,18 +554,15 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
         itemPresenceCacheRecipe = recipe;
         itemPresenceCacheSlots.clear();
         List<PositionedStack> ingredients = handler.getIngredientStacks(recipe);
-        ArrayList<ItemStack> invStacks = ((List<Slot>) firstGui.inventorySlots.inventorySlots)
-                .stream()
-                        .filter(s -> s != null
-                                && s.getStack() != null
+        ArrayList<ItemStack> invStacks = ((List<Slot>) firstGui.inventorySlots.inventorySlots).stream()
+                .filter(
+                        s -> s != null && s.getStack() != null
                                 && s.getStack().stackSize > 0
                                 && s.isItemValid(s.getStack())
                                 && s.canTakeStack(mc.thePlayer))
-                        .map(s -> s.getStack().copy())
-                        .collect(Collectors.toCollection(ArrayList::new));
+                .map(s -> s.getStack().copy()).collect(Collectors.toCollection(ArrayList::new));
         for (PositionedStack stack : ingredients) {
-            Optional<ItemStack> used = invStacks.stream()
-                    .filter(is -> is.stackSize > 0 && stack.contains(is))
+            Optional<ItemStack> used = invStacks.stream().filter(is -> is.stackSize > 0 && stack.contains(is))
                     .findFirst();
             itemPresenceCacheSlots.add(used.isPresent());
             if (used.isPresent()) {
@@ -582,12 +587,10 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
         try (HeightHack heightHack = new HeightHack()) {
             for (int i = page * recipesPerPage; i < handler.numRecipes() && i < (page + 1) * recipesPerPage; i++) {
                 handler.drawForeground(i);
-                if (drawItemPresence
-                        && isMouseOverOverlayButton(i - page * recipesPerPage)
+                if (drawItemPresence && isMouseOverOverlayButton(i - page * recipesPerPage)
                         && firstGui.inventorySlots != null) {
                     List<PositionedStack> ingredients = handler.getIngredientStacks(i);
-                    if (itemPresenceCacheRecipe != i
-                            || itemPresenceCacheSlots == null
+                    if (itemPresenceCacheRecipe != i || itemPresenceCacheSlots == null
                             || itemPresenceCacheSlots.size() != ingredients.size()) {
                         updateItemPresenceCache(i);
                     }
@@ -682,8 +685,8 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
     }
 
     public boolean isMouseOver(PositionedStack stack, int recipe) {
-        Slot stackSlot =
-                slotcontainer.getSlotWithStack(stack, getRecipePosition(recipe).x, getRecipePosition(recipe).y);
+        Slot stackSlot = slotcontainer
+                .getSlotWithStack(stack, getRecipePosition(recipe).x, getRecipePosition(recipe).y);
         Point mousepos = GuiDraw.getMousePosition();
         Slot mouseoverSlot = getSlotAtPosition(mousepos.x, mousepos.y);
 
@@ -694,8 +697,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
         if (buttonId >= 0 && buttonId < overlayButtons.length) {
             GuiButton button = overlayButtons[buttonId];
             Point mousePos = GuiDraw.getMousePosition();
-            return button.visible
-                    && mousePos.x >= button.xPosition
+            return button.visible && mousePos.x >= button.xPosition
                     && mousePos.y >= button.yPosition
                     && mousePos.x < button.xPosition + button.width
                     && mousePos.y < button.yPosition + button.height;
@@ -709,12 +711,9 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer
     }
 
     private int getRecipesPerPage(HandlerInfo handlerInfo) {
-        if (handlerInfo != null)
-            return Math.max(
-                    Math.min(
-                            ((ySize - (buttonHeight * 3)) / handlerInfo.getHeight()),
-                            handlerInfo.getMaxRecipesPerPage()),
-                    1);
+        if (handlerInfo != null) return Math.max(
+                Math.min(((ySize - (buttonHeight * 3)) / handlerInfo.getHeight()), handlerInfo.getMaxRecipesPerPage()),
+                1);
         else return (handler.recipiesPerPage());
     }
 
diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java b/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java
index b4ccee36..84a6a43a 100644
--- a/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java
+++ b/src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java
@@ -1,14 +1,17 @@
 package codechicken.nei.recipe;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.util.ResourceLocation;
+
+import org.lwjgl.util.Rectangle;
+
 import codechicken.nei.api.INEIGuiAdapter;
 import codechicken.nei.drawable.GuiElementDuex;
 import codechicken.nei.drawable.GuiElementScalable;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.util.Rectangle;
 
 public class GuiRecipeCatalyst extends INEIGuiAdapter {
+
     private GuiRecipe<?> guiRecipe;
     public static final int ingredientSize = 16;
     public static final int ingredientBorder = 1;
@@ -24,8 +27,7 @@ public class GuiRecipeCatalyst extends INEIGuiAdapter {
 
     public void draw() {
         if (guiRecipe == null) return;
-        int catalystsSize =
-                RecipeCatalysts.getRecipeCatalysts(guiRecipe.getHandler()).size();
+        int catalystsSize = RecipeCatalysts.getRecipeCatalysts(guiRecipe.getHandler()).size();
         if (catalystsSize == 0) return;
 
         int availableHeight = RecipeCatalysts.getHeight();
@@ -50,8 +52,7 @@ public class GuiRecipeCatalyst extends INEIGuiAdapter {
     public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
         if (!(gui instanceof GuiRecipe)) return false;
         guiRecipe = (GuiRecipe<?>) gui;
-        int catalystsSize =
-                RecipeCatalysts.getRecipeCatalysts(guiRecipe.getHandler()).size();
+        int catalystsSize = RecipeCatalysts.getRecipeCatalysts(guiRecipe.getHandler()).size();
         if (catalystsSize == 0) return false;
 
         int availableHeight = RecipeCatalysts.getHeight();
@@ -68,30 +69,40 @@ public class GuiRecipeCatalyst extends INEIGuiAdapter {
         return targetRect.intersects(catalystRect);
     }
 
-    private void drawBordered(
-            String location,
-            int xPos,
-            int yPos,
-            int width,
-            int height,
-            int texWidth,
-            int texHeight,
-            int sliceLeft,
-            int sliceRight,
-            int sliceTop,
-            int sliceBottom) {
+    private void drawBordered(String location, int xPos, int yPos, int width, int height, int texWidth, int texHeight,
+            int sliceLeft, int sliceRight, int sliceTop, int sliceBottom) {
         Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(location));
 
         GuiElementDuex cornerTopLeft = new GuiElementDuex(0, 0, sliceLeft, sliceTop, texWidth, texHeight);
-        GuiElementDuex cornerTopRight =
-                new GuiElementDuex(texWidth - sliceRight, 0, sliceRight, sliceTop, texWidth, texHeight);
-        GuiElementDuex cornerBottomLeft =
-                new GuiElementDuex(0, texHeight - sliceBottom, sliceLeft, sliceBottom, texWidth, texHeight);
+        GuiElementDuex cornerTopRight = new GuiElementDuex(
+                texWidth - sliceRight,
+                0,
+                sliceRight,
+                sliceTop,
+                texWidth,
+                texHeight);
+        GuiElementDuex cornerBottomLeft = new GuiElementDuex(
+                0,
+                texHeight - sliceBottom,
+                sliceLeft,
+                sliceBottom,
+                texWidth,
+                texHeight);
         GuiElementDuex cornerBottomRight = new GuiElementDuex(
-                texWidth - sliceRight, texHeight - sliceBottom, sliceRight, sliceBottom, texWidth, texHeight);
+                texWidth - sliceRight,
+                texHeight - sliceBottom,
+                sliceRight,
+                sliceBottom,
+                texWidth,
+                texHeight);
 
-        GuiElementScalable borderTop =
-                new GuiElementScalable(sliceLeft, 0, texWidth - sliceLeft - sliceRight, sliceTop, texWidth, texHeight);
+        GuiElementScalable borderTop = new GuiElementScalable(
+                sliceLeft,
+                0,
+                texWidth - sliceLeft - sliceRight,
+                sliceTop,
+                texWidth,
+                texHeight);
         GuiElementScalable borderBottom = new GuiElementScalable(
                 sliceLeft,
                 texHeight - sliceBottom,
@@ -99,10 +110,20 @@ public class GuiRecipeCatalyst extends INEIGuiAdapter {
                 sliceBottom,
                 texWidth,
                 texHeight);
-        GuiElementScalable borderLeft =
-                new GuiElementScalable(0, sliceTop, sliceLeft, texHeight - sliceTop - sliceBottom, texWidth, texHeight);
+        GuiElementScalable borderLeft = new GuiElementScalable(
+                0,
+                sliceTop,
+                sliceLeft,
+                texHeight - sliceTop - sliceBottom,
+                texWidth,
+                texHeight);
         GuiElementScalable borderRight = new GuiElementScalable(
-                texWidth - sliceRight, sliceTop, sliceRight, texHeight - sliceTop - sliceBottom, texWidth, texHeight);
+                texWidth - sliceRight,
+                sliceTop,
+                sliceRight,
+                texHeight - sliceTop - sliceBottom,
+                texWidth,
+                texHeight);
         GuiElementScalable center = new GuiElementScalable(
                 sliceLeft,
                 sliceTop,
diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java b/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java
index 476d121d..e6ae7fa4 100644
--- a/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java
+++ b/src/main/java/codechicken/nei/recipe/GuiRecipeTab.java
@@ -1,12 +1,5 @@
 package codechicken.nei.recipe;
 
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.Widget;
-import codechicken.nei.drawable.DrawableResource;
-import codechicken.nei.event.NEIRegisterHandlerInfosEvent;
-import codechicken.nei.guihook.GuiContainerManager;
-import cpw.mods.fml.common.Loader;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -18,10 +11,12 @@ import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 import java.util.*;
+
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.MinecraftForge;
+
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
@@ -29,7 +24,16 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.Widget;
+import codechicken.nei.drawable.DrawableResource;
+import codechicken.nei.event.NEIRegisterHandlerInfosEvent;
+import codechicken.nei.guihook.GuiContainerManager;
+import cpw.mods.fml.common.Loader;
+
 public abstract class GuiRecipeTab extends Widget {
+
     public static HandlerInfo DEFAULT_HANDLER_INFO = getDefaultHandlerInfo();
     public static HashMap<String, HandlerInfo> handlerMap = new HashMap<>();
     public static HashMap<String, HandlerInfo> handlerAdderFromIMC = new HashMap<>();
@@ -123,7 +127,10 @@ public abstract class GuiRecipeTab extends Widget {
             int textCenterY = y + (int) (getHeight() / 2f) - 3;
             int color = selected ? 0xffffa0 : 0xe0e0e0;
             fontRenderer.drawStringWithShadow(
-                    text, textCenterX - (int) (fontRenderer.getStringWidth(text) / 2f), textCenterY, color);
+                    text,
+                    textCenterX - (int) (fontRenderer.getStringWidth(text) / 2f),
+                    textCenterY,
+                    color);
             GL11.glColor4f(1, 1, 1, 1);
         }
     }
@@ -256,8 +263,9 @@ public abstract class GuiRecipeTab extends Widget {
                 try {
                     final int imageHeight = intOrDefault(record.get("handlerHeight"), HandlerInfo.DEFAULT_HEIGHT);
                     final int imageWidth = intOrDefault(record.get("handlerWidth"), HandlerInfo.DEFAULT_WIDTH);
-                    final int maxRecipesPerPage =
-                            intOrDefault(record.get("maxRecipesPerPage"), HandlerInfo.DEFAULT_MAX_PER_PAGE);
+                    final int maxRecipesPerPage = intOrDefault(
+                            record.get("maxRecipesPerPage"),
+                            HandlerInfo.DEFAULT_MAX_PER_PAGE);
                     info.setHandlerDimensions(imageHeight, imageWidth, maxRecipesPerPage);
                 } catch (NumberFormatException ignored) {
                     NEIClientConfig.logger.info("Error setting handler dimensions for " + handler);
@@ -281,7 +289,9 @@ public abstract class GuiRecipeTab extends Widget {
     private static HandlerInfo getDefaultHandlerInfo() {
         final HandlerInfo info = new HandlerInfo("Unknown", "Unknown", "Unknown", false, "");
         info.setHandlerDimensions(
-                HandlerInfo.DEFAULT_HEIGHT, HandlerInfo.DEFAULT_WIDTH, HandlerInfo.DEFAULT_MAX_PER_PAGE);
+                HandlerInfo.DEFAULT_HEIGHT,
+                HandlerInfo.DEFAULT_WIDTH,
+                HandlerInfo.DEFAULT_MAX_PER_PAGE);
         return info;
     }
 
diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeTabCreative.java b/src/main/java/codechicken/nei/recipe/GuiRecipeTabCreative.java
index 5e1dcf49..3fc1c0e1 100644
--- a/src/main/java/codechicken/nei/recipe/GuiRecipeTabCreative.java
+++ b/src/main/java/codechicken/nei/recipe/GuiRecipeTabCreative.java
@@ -4,12 +4,21 @@ import codechicken.nei.drawable.DrawableBuilder;
 import codechicken.nei.drawable.DrawableResource;
 
 public class GuiRecipeTabCreative extends GuiRecipeTab {
+
     public static final int TAB_WIDTH = 28;
     public static final int TAB_HEIGHT = 31;
-    private static final DrawableResource selectedTabImage =
-            new DrawableBuilder("minecraft:textures/gui/container/creative_inventory/tabs.png", 28, 32, 28, 32).build();
-    private static final DrawableResource unselectedTabImage =
-            new DrawableBuilder("minecraft:textures/gui/container/creative_inventory/tabs.png", 28, 0, 28, 30).build();
+    private static final DrawableResource selectedTabImage = new DrawableBuilder(
+            "minecraft:textures/gui/container/creative_inventory/tabs.png",
+            28,
+            32,
+            28,
+            32).build();
+    private static final DrawableResource unselectedTabImage = new DrawableBuilder(
+            "minecraft:textures/gui/container/creative_inventory/tabs.png",
+            28,
+            0,
+            28,
+            30).build();
 
     public GuiRecipeTabCreative(GuiRecipe<?> guiRecipe, IRecipeHandler handler, int x, int y) {
         super(guiRecipe, handler, x, y);
diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeTabJEI.java b/src/main/java/codechicken/nei/recipe/GuiRecipeTabJEI.java
index 6d376997..73bda07b 100644
--- a/src/main/java/codechicken/nei/recipe/GuiRecipeTabJEI.java
+++ b/src/main/java/codechicken/nei/recipe/GuiRecipeTabJEI.java
@@ -4,12 +4,21 @@ import codechicken.nei.drawable.DrawableBuilder;
 import codechicken.nei.drawable.DrawableResource;
 
 public class GuiRecipeTabJEI extends GuiRecipeTab {
+
     public static final int TAB_WIDTH = 24;
     public static final int TAB_HEIGHT = 24;
-    private static final DrawableResource selectedTabImage =
-            new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 16, 24, 24).build();
-    private static final DrawableResource unselectedTabImage =
-            new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 24, 16, 24, 24).build();
+    private static final DrawableResource selectedTabImage = new DrawableBuilder(
+            "nei:textures/nei_tabbed_sprites.png",
+            0,
+            16,
+            24,
+            24).build();
+    private static final DrawableResource unselectedTabImage = new DrawableBuilder(
+            "nei:textures/nei_tabbed_sprites.png",
+            24,
+            16,
+            24,
+            24).build();
 
     public GuiRecipeTabJEI(GuiRecipe<?> guiRecipe, IRecipeHandler handler, int x, int y) {
         super(guiRecipe, handler, x, y);
diff --git a/src/main/java/codechicken/nei/recipe/GuiRecipeTabs.java b/src/main/java/codechicken/nei/recipe/GuiRecipeTabs.java
index 7f43235c..ea7336a2 100644
--- a/src/main/java/codechicken/nei/recipe/GuiRecipeTabs.java
+++ b/src/main/java/codechicken/nei/recipe/GuiRecipeTabs.java
@@ -1,13 +1,15 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.Button;
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.NEIClientUtils;
 import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 
+import codechicken.nei.Button;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIClientUtils;
+
 public class GuiRecipeTabs {
+
     private final GuiRecipe<?> guiRecipe;
     private final List<GuiRecipeTab> tabs = new ArrayList<>();
     private final List<Button> buttons = new ArrayList<>();
@@ -82,6 +84,7 @@ public class GuiRecipeTabs {
         // Maybe add buttons
         if (numHandlers > categoriesPerPage) {
             Button prevTab = new Button("prevTab") {
+
                 @Override
                 public boolean onButtonPress(boolean rightClick) {
                     if (!rightClick) {
@@ -102,6 +105,7 @@ public class GuiRecipeTabs {
             buttons.add(prevTab);
 
             Button nextTab = new Button("nextTab") {
+
                 @Override
                 public boolean onButtonPress(boolean rightclick) {
                     if (!rightclick) {
diff --git a/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java b/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java
index 11b70713..08e7e827 100644
--- a/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java
+++ b/src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java
@@ -1,17 +1,22 @@
 package codechicken.nei.recipe;
 
+import java.util.ArrayList;
+
+import net.minecraft.client.Minecraft;
+
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
-import java.util.ArrayList;
-import net.minecraft.client.Minecraft;
 
 public class GuiUsageRecipe extends GuiRecipe<IUsageHandler> {
+
     public static ArrayList<IUsageHandler> usagehandlers = new ArrayList<>();
     public static ArrayList<IUsageHandler> serialUsageHandlers = new ArrayList<>();
 
     public static boolean openRecipeGui(String inputId, Object... ingredients) {
         RecipeHandlerQuery<IUsageHandler> recipeQuery = new RecipeHandlerQuery<>(
-                h -> getUsageOrCatalystHandler(h, inputId, ingredients), usagehandlers, serialUsageHandlers);
+                h -> getUsageOrCatalystHandler(h, inputId, ingredients),
+                usagehandlers,
+                serialUsageHandlers);
         ArrayList<IUsageHandler> handlers = recipeQuery.runWithProfiling("recipe.concurrent.usage");
         if (handlers.isEmpty()) return false;
 
@@ -35,14 +40,15 @@ public class GuiUsageRecipe extends GuiRecipe<IUsageHandler> {
     public static void registerUsageHandler(IUsageHandler handler) {
         final String handlerId = handler.getHandlerId();
         if (usagehandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId))
-                || serialUsageHandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId))) return;
+                || serialUsageHandlers.stream().anyMatch(h -> h.getHandlerId().equals(handlerId)))
+            return;
 
         if (NEIClientConfig.serialHandlers.contains(handlerId)) serialUsageHandlers.add(handler);
         else usagehandlers.add(handler);
     }
 
-    private static IUsageHandler getUsageOrCatalystHandler(
-            IUsageHandler handler, String inputId, Object... ingredients) {
+    private static IUsageHandler getUsageOrCatalystHandler(IUsageHandler handler, String inputId,
+            Object... ingredients) {
         boolean skipCatalyst = NEIClientUtils.controlKey();
         if (NEIClientConfig.areJEIStyleRecipeCatalystsVisible() && !skipCatalyst) {
             return handler.getUsageAndCatalystHandler(inputId, ingredients);
diff --git a/src/main/java/codechicken/nei/recipe/HandlerInfo.java b/src/main/java/codechicken/nei/recipe/HandlerInfo.java
index d658198f..a616c5f6 100644
--- a/src/main/java/codechicken/nei/recipe/HandlerInfo.java
+++ b/src/main/java/codechicken/nei/recipe/HandlerInfo.java
@@ -1,13 +1,15 @@
 package codechicken.nei.recipe;
 
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIServerUtils;
 import codechicken.nei.drawable.DrawableBuilder;
 import codechicken.nei.drawable.DrawableResource;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 
 public class HandlerInfo {
+
     public static int DEFAULT_HEIGHT = 65;
     public static int DEFAULT_WIDTH = 166;
     public static int DEFAULT_MAX_PER_PAGE = 1;
@@ -111,6 +113,7 @@ public class HandlerInfo {
     }
 
     public static class Builder {
+
         private final HandlerInfo info;
 
         public Builder(String handlerName, String modName, String modId) {
@@ -128,8 +131,8 @@ public class HandlerInfo {
             return this;
         }
 
-        public Builder setDisplayImage(
-                ResourceLocation location, int imageX, int imageY, int imageWidth, int imageHeight) {
+        public Builder setDisplayImage(ResourceLocation location, int imageX, int imageY, int imageWidth,
+                int imageHeight) {
             info.itemStack = null;
             info.setImage(location.toString(), imageX, imageY, imageWidth, imageHeight);
             return this;
diff --git a/src/main/java/codechicken/nei/recipe/ICraftingHandler.java b/src/main/java/codechicken/nei/recipe/ICraftingHandler.java
index 52a02b2b..e4edebef 100644
--- a/src/main/java/codechicken/nei/recipe/ICraftingHandler.java
+++ b/src/main/java/codechicken/nei/recipe/ICraftingHandler.java
@@ -2,15 +2,15 @@ package codechicken.nei.recipe;
 
 /**
  *
- * Implement this to show custom recipes in the usage viewer.
- * See the default vanilla ones for more info.
+ * Implement this to show custom recipes in the usage viewer. See the default vanilla ones for more info.
  *
  */
 public interface ICraftingHandler extends IRecipeHandler {
+
     /**
      *
      * @param outputId A String identifier representing the type of output produced. Eg. {"item", "fuel"}
-     * @param results Objects representing the results that matching recipes must produce.
+     * @param results  Objects representing the results that matching recipes must produce.
      * @return An instance of {@link ICraftingHandler} configured with a list of recipes that produce matching output.
      */
     public ICraftingHandler getRecipeHandler(String outputId, Object... results);
diff --git a/src/main/java/codechicken/nei/recipe/IRecipeHandler.java b/src/main/java/codechicken/nei/recipe/IRecipeHandler.java
index 8d3101b2..76fb41aa 100644
--- a/src/main/java/codechicken/nei/recipe/IRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/IRecipeHandler.java
@@ -1,22 +1,27 @@
 package codechicken.nei.recipe;
 
+import java.util.List;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.input.Keyboard;
+
 import codechicken.nei.PositionedStack;
 import codechicken.nei.api.IOverlayHandler;
 import codechicken.nei.api.IRecipeOverlayRenderer;
-import java.util.List;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.ItemStack;
-import org.lwjgl.input.Keyboard;
 
 /**
  * Do not implement this. Implement one of it's subinterfaces, either {@link ICraftingHandler} or {@link IUsageHandler}
  */
 public interface IRecipeHandler {
+
     /**
      * For legacy compatibility reasons, this method's default implementation returns the class name.
      *
-     * @return A unique identifier for this handler, used for finding duplicate handlers as well as GUI tab {@link HandlerInfo}.
+     * @return A unique identifier for this handler, used for finding duplicate handlers as well as GUI tab
+     *         {@link HandlerInfo}.
      */
     default String getHandlerId() {
         return getClass().getName();
@@ -24,16 +29,16 @@ public interface IRecipeHandler {
 
     /**
      *
-     * @return The name of this inventory.
-     * To be displayed at the top of the viewing container.
+     * @return The name of this inventory. To be displayed at the top of the viewing container.
      */
     String getRecipeName();
 
     /**
-     * For legacy compatibility reasons, this method's default implementation returns the recipe name. This is also the expected behavior
+     * For legacy compatibility reasons, this method's default implementation returns the recipe name. This is also the
+     * expected behavior
      *
-     * @return The name of this inventory.
-     * To be displayed in the tooltip in the tab at the top of the viewing container.
+     * @return The name of this inventory. To be displayed in the tooltip in the tab at the top of the viewing
+     *         container.
      */
     default String getRecipeTabName() {
         return getRecipeName();
@@ -44,93 +49,111 @@ public interface IRecipeHandler {
      * @return The number of recipes that this handler contains.
      */
     int numRecipes();
+
     /**
      * Draw the background of this recipe handler (basically the slot layout image).
+     * 
      * @param recipe The recipe index to draw at this position.
      */
     void drawBackground(int recipe);
+
     /**
      * Draw the foreground of this recipe handler (for things like progress bars).
+     * 
      * @param recipe The recipe index to draw at this position.
      */
     void drawForeground(int recipe);
+
     /**
      *
      * @param recipe The recipe index to get items for.
-     * @return A list of the ingredient {@link PositionedStack}s in this recipe relative to the top left corner of your recipe drawing space.
+     * @return A list of the ingredient {@link PositionedStack}s in this recipe relative to the top left corner of your
+     *         recipe drawing space.
      */
     List<PositionedStack> getIngredientStacks(int recipe);
+
     /**
      *
      * @param recipetype The recipe index to get items for.
-     * @return A list of the other {@link PositionedStack}s in this recipe relative to the top left corner of your recipe drawing space. For example fuel in furnaces.
+     * @return A list of the other {@link PositionedStack}s in this recipe relative to the top left corner of your
+     *         recipe drawing space. For example fuel in furnaces.
      */
     List<PositionedStack> getOtherStacks(int recipetype);
+
     /**
      *
      * @param recipe The recipe index to get the result for.
      * @return The recipe result {@link PositionedStack} relative to the top left corner of your recipe drawing space.
      */
     PositionedStack getResultStack(int recipe);
+
     /**
      * A tick function called for updating progress bars and cycling damage items.
      */
     void onUpdate();
+
     /**
      *
-     * @param recipe The recipe index to check for.
-     * @param gui The GUI to overlay.
+     * @param recipe    The recipe index to check for.
+     * @param gui       The GUI to overlay.
      * @param container The container of the GUI.
      * @return true if this recipe can render an overlay for the specified type of inventory GUI.
      */
     boolean hasOverlay(GuiContainer gui, Container container, int recipe);
+
     /**
      *
      * @param recipe The recipe index to get the overlay renderer for.
-     * @return An instance of {@link IRecipeOverlayRenderer} to be used for rendering the overlay of this specific recipe.
+     * @return An instance of {@link IRecipeOverlayRenderer} to be used for rendering the overlay of this specific
+     *         recipe.
      */
     IRecipeOverlayRenderer getOverlayRenderer(GuiContainer gui, int recipe);
+
     /**
      *
      * @param recipe The recipe index to get the overlay renderer for.
      * @return An instance of {@link IOverlayHandler} to be used for rendering the overlay of this specific recipe.
      */
     IOverlayHandler getOverlayHandler(GuiContainer gui, int recipe);
+
     /**
-     * Simply works with the {@link codechicken.nei.api.DefaultOverlayRenderer}
-     * If the current container has been registered with this identifier, the question mark appears and an overlay guide can be drawn.
+     * Simply works with the {@link codechicken.nei.api.DefaultOverlayRenderer} If the current container has been
+     * registered with this identifier, the question mark appears and an overlay guide can be drawn.
      *
      * @return The overlay identifier of this recipe type.
      */
     default String getOverlayIdentifier() {
         return null;
     }
+
     /**
      *
      * @return The number of recipes that can fit on a page in the viewer (1 or 2)
      */
     int recipiesPerPage();
+
     /**
      *
-     * @param gui An instance of the currentscreen
+     * @param gui        An instance of the currentscreen
      * @param currenttip The current tooltip, will contain item name and info
-     * @param recipe The recipe index being handled
+     * @param recipe     The recipe index being handled
      * @return The modified tooltip. DO NOT return null
      */
     List<String> handleTooltip(GuiRecipe<?> gui, List<String> currenttip, int recipe);
+
     /**
      *
-     * @param gui An instance of the currentscreen
-     * @param stack The itemstack currently under the mouse
+     * @param gui        An instance of the currentscreen
+     * @param stack      The itemstack currently under the mouse
      * @param currenttip The current tooltip, will contain item name and info
-     * @param recipe The recipe index being handled
+     * @param recipe     The recipe index being handled
      * @return The modified tooltip. DO NOT return null
      */
     List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack stack, List<String> currenttip, int recipe);
 
     /**
      *
-     * @param gui An instance of the currentscreen
+     * @param gui     An instance of the currentscreen
      * @param keyChar The character representing the keyPress
      * @param keyCode The KeyCode as defined in {@link Keyboard}
      * @return true to terminate further processing of this event.
@@ -139,7 +162,7 @@ public interface IRecipeHandler {
 
     /**
      *
-     * @param gui An instance of the currentscreen
+     * @param gui    An instance of the currentscreen
      * @param button The button index being pressed, {0 = Left Click, 1 = Right Click, 2 = Middle Click}
      * @return true to terminate further processing of this event.
      */
@@ -148,7 +171,7 @@ public interface IRecipeHandler {
     /**
      * For legacy compatibility reasons, this method has a do-nothing default implementation.
      *
-     * @param gui An instance of the currentscreen
+     * @param gui    An instance of the currentscreen
      * @param scroll The scroll direction, {> 0 = Up, < 0 = Down}
      * @return true to terminate further processing of this event.
      */
diff --git a/src/main/java/codechicken/nei/recipe/IUsageHandler.java b/src/main/java/codechicken/nei/recipe/IUsageHandler.java
index 88b35d67..44c6da88 100644
--- a/src/main/java/codechicken/nei/recipe/IUsageHandler.java
+++ b/src/main/java/codechicken/nei/recipe/IUsageHandler.java
@@ -2,14 +2,14 @@ package codechicken.nei.recipe;
 
 /**
  *
- * Implement this to show custom recipes in the usage viewer.
- * See the default vanilla ones for more info.
+ * Implement this to show custom recipes in the usage viewer. See the default vanilla ones for more info.
  *
  */
 public interface IUsageHandler extends IRecipeHandler {
+
     /**
      *
-     * @param inputId A String identifier representing the type of ingredients used. Eg. {"item", "fuel"}
+     * @param inputId     A String identifier representing the type of ingredients used. Eg. {"item", "fuel"}
      * @param ingredients Objects representing the ingredients that matching recipes must contain.
      * @return An instance of {@link IUsageHandler} configured with a list of recipes that contain matching input
      */
diff --git a/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java b/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java
index 61ea1adb..4da62de1 100644
--- a/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/ProfilerRecipeHandler.java
@@ -3,6 +3,15 @@ package codechicken.nei.recipe;
 import static codechicken.lib.gui.GuiDraw.drawString;
 import static codechicken.lib.gui.GuiDraw.getStringWidth;
 
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemStack;
+
 import codechicken.core.TaskProfiler;
 import codechicken.core.TaskProfiler.ProfilerResult;
 import codechicken.nei.NEIClientConfig;
@@ -10,15 +19,9 @@ import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.api.IOverlayHandler;
 import codechicken.nei.api.IRecipeOverlayRenderer;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.ItemStack;
 
 public class ProfilerRecipeHandler implements ICraftingHandler, IUsageHandler {
+
     private static final TaskProfiler profiler = new TaskProfiler();
 
     public static TaskProfiler getProfiler() {
@@ -52,7 +55,7 @@ public class ProfilerRecipeHandler implements ICraftingHandler, IUsageHandler {
     @Override
     public void drawForeground(int recipe) {
         List<ProfilerResult> results = profiler.getResults();
-        for (Iterator<ProfilerResult> it = results.iterator(); it.hasNext(); )
+        for (Iterator<ProfilerResult> it = results.iterator(); it.hasNext();)
             if (it.next().name.equals(getRecipeName())) it.remove();
 
         results.sort((o1, o2) -> o1.time < o2.time ? 1 : -1);
diff --git a/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java b/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java
index 2abc8fc6..ae3650d1 100644
--- a/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java
+++ b/src/main/java/codechicken/nei/recipe/RecipeCatalysts.java
@@ -1,10 +1,5 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.NEIServerUtils;
-import codechicken.nei.PositionedStack;
-import com.google.common.base.Objects;
-import cpw.mods.fml.common.Loader;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -20,12 +15,22 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import net.minecraft.item.ItemStack;
+
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIServerUtils;
+import codechicken.nei.PositionedStack;
+
+import com.google.common.base.Objects;
+import cpw.mods.fml.common.Loader;
+
 public class RecipeCatalysts {
+
     private static final Map<String, CatalystInfoList> catalystsAdderFromAPI = new HashMap<>();
     private static final Map<String, List<ItemStack>> catalystsRemoverFromAPI = new HashMap<>();
     public static final Map<String, CatalystInfoList> catalystsAdderFromIMC = new HashMap<>();
@@ -89,8 +94,11 @@ public class RecipeCatalysts {
                 ItemStack catalyst = catalysts.get(index).getStack();
                 int column = index / rowCount;
                 int row = index % rowCount;
-                newStacks.add(new PositionedStack(
-                        catalyst, -column * GuiRecipeCatalyst.ingredientSize, row * GuiRecipeCatalyst.ingredientSize));
+                newStacks.add(
+                        new PositionedStack(
+                                catalyst,
+                                -column * GuiRecipeCatalyst.ingredientSize,
+                                row * GuiRecipeCatalyst.ingredientSize));
             }
             newMap.put(entry.getKey(), newStacks);
         }
@@ -239,9 +247,9 @@ public class RecipeCatalysts {
     }
 
     /**
-     * Basically {@link NEIClientConfig#HANDLER_ID_FUNCTION}.
-     * Force using {@link IRecipeHandler#getHandlerId()} if specified in catalysts.csv.
-     * In other words, refuse to share handlerID defined in {@link TemplateRecipeHandler#getOverlayIdentifier()}.
+     * Basically {@link NEIClientConfig#HANDLER_ID_FUNCTION}. Force using {@link IRecipeHandler#getHandlerId()} if
+     * specified in catalysts.csv. In other words, refuse to share handlerID defined in
+     * {@link TemplateRecipeHandler#getOverlayIdentifier()}.
      */
     public static String getRecipeID(IRecipeHandler handler) {
         if (forceClassNameList.stream().anyMatch(s -> s.equals(handler.getHandlerId()))) {
diff --git a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java
index 4a6dbb09..5c4ec4f9 100644
--- a/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java
+++ b/src/main/java/codechicken/nei/recipe/RecipeHandlerQuery.java
@@ -1,20 +1,23 @@
 package codechicken.nei.recipe;
 
-import codechicken.core.TaskProfiler;
-import codechicken.nei.ItemList;
-import codechicken.nei.NEIClientConfig;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 
+import codechicken.core.TaskProfiler;
+import codechicken.nei.ItemList;
+import codechicken.nei.NEIClientConfig;
+
 class RecipeHandlerQuery<T extends IRecipeHandler> {
+
     private final Function<T, T> recipeHandlerFunction;
     private final List<T> recipeHandlers;
     private final List<T> serialRecipeHandlers;
@@ -48,17 +51,13 @@ class RecipeHandlerQuery<T extends IRecipeHandler> {
     }
 
     private ArrayList<T> getSerialHandlersWithRecipes() {
-        return serialRecipeHandlers.stream()
-                .map(recipeHandlerFunction)
-                .filter(h -> h.numRecipes() > 0)
+        return serialRecipeHandlers.stream().map(recipeHandlerFunction).filter(h -> h.numRecipes() > 0)
                 .collect(Collectors.toCollection(ArrayList::new));
     }
 
     private ArrayList<T> getHandlersWithRecipes() throws InterruptedException, ExecutionException {
-        return ItemList.forkJoinPool
-                .submit(() -> recipeHandlers.parallelStream()
-                        .map(recipeHandlerFunction)
-                        .filter(h -> h.numRecipes() > 0)
+        return ItemList.forkJoinPool.submit(
+                () -> recipeHandlers.parallelStream().map(recipeHandlerFunction).filter(h -> h.numRecipes() > 0)
                         .collect(Collectors.toCollection(ArrayList::new)))
                 .get();
     }
diff --git a/src/main/java/codechicken/nei/recipe/RecipeInfo.java b/src/main/java/codechicken/nei/recipe/RecipeInfo.java
index 77d90dd3..4bf5194c 100644
--- a/src/main/java/codechicken/nei/recipe/RecipeInfo.java
+++ b/src/main/java/codechicken/nei/recipe/RecipeInfo.java
@@ -1,19 +1,24 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.OffsetPositioner;
-import codechicken.nei.api.API;
-import codechicken.nei.api.IOverlayHandler;
-import codechicken.nei.api.IStackPositioner;
-import com.google.common.base.Objects;
 import java.util.HashMap;
+
 import net.minecraft.client.gui.inventory.GuiBrewingStand;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiCrafting;
 import net.minecraft.client.gui.inventory.GuiFurnace;
 import net.minecraft.client.gui.inventory.GuiInventory;
 
+import codechicken.nei.OffsetPositioner;
+import codechicken.nei.api.API;
+import codechicken.nei.api.IOverlayHandler;
+import codechicken.nei.api.IStackPositioner;
+
+import com.google.common.base.Objects;
+
 public class RecipeInfo {
+
     private static class OverlayKey {
+
         final String ident;
         final Class<? extends GuiContainer> guiClass;
 
@@ -39,13 +44,13 @@ public class RecipeInfo {
     static final HashMap<OverlayKey, IStackPositioner> positionerMap = new HashMap<>();
     static final HashMap<Class<? extends GuiContainer>, int[]> offsets = new HashMap<>();
 
-    public static void registerOverlayHandler(
-            Class<? extends GuiContainer> classz, IOverlayHandler handler, String ident) {
+    public static void registerOverlayHandler(Class<? extends GuiContainer> classz, IOverlayHandler handler,
+            String ident) {
         overlayMap.put(new OverlayKey(classz, ident), handler);
     }
 
-    public static void registerGuiOverlay(
-            Class<? extends GuiContainer> classz, String ident, IStackPositioner positioner) {
+    public static void registerGuiOverlay(Class<? extends GuiContainer> classz, String ident,
+            IStackPositioner positioner) {
         positionerMap.put(new OverlayKey(classz, ident), positioner);
         if (positioner instanceof OffsetPositioner && !offsets.containsKey(classz)) {
             OffsetPositioner p = (OffsetPositioner) positioner;
@@ -54,7 +59,7 @@ public class RecipeInfo {
     }
 
     public static void setGuiOffset(Class<? extends GuiContainer> classz, int x, int y) {
-        offsets.put(classz, new int[] {x, y});
+        offsets.put(classz, new int[] { x, y });
     }
 
     public static boolean hasDefaultOverlay(GuiContainer gui, String ident) {
@@ -75,7 +80,7 @@ public class RecipeInfo {
 
     public static int[] getGuiOffset(GuiContainer gui) {
         int[] offset = offsets.get(gui.getClass());
-        return offset == null ? new int[] {5, 11} : offset;
+        return offset == null ? new int[] { 5, 11 } : offset;
     }
 
     public static void load() {
diff --git a/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java b/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java
index 9783e308..7f45335c 100644
--- a/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java
+++ b/src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java
@@ -1,11 +1,12 @@
 package codechicken.nei.recipe;
 
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+
 import codechicken.nei.ItemPanels;
 import codechicken.nei.api.ShortcutInputHandler;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
 
 public class RecipeItemInputHandler implements IContainerInputHandler {
 
@@ -16,9 +17,9 @@ public class RecipeItemInputHandler implements IContainerInputHandler {
 
     @Override
     public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-        if (!(gui instanceof GuiRecipe)
-                || ItemPanels.itemPanel.contains(mousex, mousey)
-                || ItemPanels.bookmarkPanel.contains(mousex, mousey)) return false;
+        if (!(gui instanceof GuiRecipe) || ItemPanels.itemPanel.contains(mousex, mousey)
+                || ItemPanels.bookmarkPanel.contains(mousex, mousey))
+            return false;
 
         ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
 
diff --git a/src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java b/src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java
index b7fe664e..17d81fae 100644
--- a/src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java
+++ b/src/main/java/codechicken/nei/recipe/SearchInputDropHandler.java
@@ -2,11 +2,12 @@ package codechicken.nei.recipe;
 
 import static codechicken.nei.LayoutManager.searchField;
 
-import codechicken.nei.api.INEIGuiAdapter;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
+import codechicken.nei.api.INEIGuiAdapter;
+
 public class SearchInputDropHandler extends INEIGuiAdapter {
 
     @Override
diff --git a/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java b/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java
index 39adea37..73b41f07 100644
--- a/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/ShapedRecipeHandler.java
@@ -1,5 +1,18 @@
 package codechicken.nei.recipe;
 
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiCrafting;
+import net.minecraft.inventory.Container;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.ShapedRecipes;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+
 import codechicken.core.ReflectionManager;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
@@ -9,20 +22,11 @@ import codechicken.nei.api.DefaultOverlayRenderer;
 import codechicken.nei.api.IOverlayHandler;
 import codechicken.nei.api.IRecipeOverlayRenderer;
 import codechicken.nei.api.IStackPositioner;
-import java.awt.Rectangle;
-import java.util.ArrayList;
-import java.util.List;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.gui.inventory.GuiCrafting;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.CraftingManager;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapedRecipes;
-import net.minecraftforge.oredict.ShapedOreRecipe;
 
 public class ShapedRecipeHandler extends TemplateRecipeHandler {
+
     public class CachedShapedRecipe extends CachedRecipe {
+
         public ArrayList<PositionedStack> ingredients;
         public PositionedStack result;
 
@@ -134,8 +138,7 @@ public class ShapedRecipeHandler extends TemplateRecipeHandler {
             int height = ReflectionManager.getField(ShapedOreRecipe.class, Integer.class, recipe, 5);
 
             Object[] items = recipe.getInput();
-            for (Object item : items)
-                if (item instanceof List && ((List<?>) item).isEmpty()) // ore handler, no ores
+            for (Object item : items) if (item instanceof List && ((List<?>) item).isEmpty()) // ore handler, no ores
                 return null;
 
             return new CachedShapedRecipe(width, height, items, recipe.getRecipeOutput());
diff --git a/src/main/java/codechicken/nei/recipe/ShapelessRecipeHandler.java b/src/main/java/codechicken/nei/recipe/ShapelessRecipeHandler.java
index a0d6727a..195d632d 100644
--- a/src/main/java/codechicken/nei/recipe/ShapelessRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/ShapelessRecipeHandler.java
@@ -1,32 +1,27 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.NEIServerUtils;
-import codechicken.nei.PositionedStack;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.ShapelessRecipes;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.NEIServerUtils;
+import codechicken.nei.PositionedStack;
+
 public class ShapelessRecipeHandler extends ShapedRecipeHandler {
-    public int[][] stackorder = new int[][] {
-        {0, 0},
-        {1, 0},
-        {0, 1},
-        {1, 1},
-        {0, 2},
-        {1, 2},
-        {2, 0},
-        {2, 1},
-        {2, 2}
-    };
+
+    public int[][] stackorder = new int[][] { { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 }, { 0, 2 }, { 1, 2 }, { 2, 0 },
+            { 2, 1 }, { 2, 2 } };
 
     public class CachedShapelessRecipe extends CachedRecipe {
+
         public CachedShapelessRecipe() {
             ingredients = new ArrayList<>();
         }
@@ -49,13 +44,15 @@ public class ShapelessRecipeHandler extends ShapedRecipeHandler {
             ingredients.clear();
             int itemsSize = items.size();
             if (itemsSize > stackorder.length) {
-                NEIClientConfig.logger.error(
-                        "RECIPE BUG: Too many items (" + itemsSize + ") for " + this.result.toString());
+                NEIClientConfig.logger
+                        .error("RECIPE BUG: Too many items (" + itemsSize + ") for " + this.result.toString());
                 itemsSize = stackorder.length;
             }
             for (int ingred = 0; ingred < itemsSize; ingred++) {
                 PositionedStack stack = new PositionedStack(
-                        items.get(ingred), 25 + stackorder[ingred][0] * 18, 6 + stackorder[ingred][1] * 18);
+                        items.get(ingred),
+                        25 + stackorder[ingred][0] * 18,
+                        6 + stackorder[ingred][1] * 18);
                 stack.setMaxSize(1);
                 ingredients.add(stack);
             }
@@ -138,7 +135,7 @@ public class ShapelessRecipeHandler extends ShapedRecipeHandler {
 
     private CachedShapelessRecipe shapelessRecipe(ShapelessRecipes recipe) {
         if (recipe.recipeItems == null) // because some mod subclasses actually do this
-        return null;
+            return null;
 
         try {
             return new CachedShapelessRecipe(recipe.recipeItems, recipe.getRecipeOutput());
@@ -150,8 +147,7 @@ public class ShapelessRecipeHandler extends ShapedRecipeHandler {
     public CachedShapelessRecipe forgeShapelessRecipe(ShapelessOreRecipe recipe) {
         ArrayList<Object> items = recipe.getInput();
 
-        for (Object item : items)
-            if (item instanceof List && ((List<?>) item).isEmpty()) // ore handler, no ores
+        for (Object item : items) if (item instanceof List && ((List<?>) item).isEmpty()) // ore handler, no ores
             return null;
 
         try {
diff --git a/src/main/java/codechicken/nei/recipe/StackInfo.java b/src/main/java/codechicken/nei/recipe/StackInfo.java
index 005cdaef..b1164aec 100644
--- a/src/main/java/codechicken/nei/recipe/StackInfo.java
+++ b/src/main/java/codechicken/nei/recipe/StackInfo.java
@@ -1,9 +1,5 @@
 package codechicken.nei.recipe;
 
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.api.IStackStringifyHandler;
-import codechicken.nei.recipe.stackinfo.DefaultStackStringifyHandler;
-import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -14,13 +10,20 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.WeakHashMap;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.fluids.FluidStack;
+
 import org.apache.commons.io.IOUtils;
 
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.api.IStackStringifyHandler;
+import codechicken.nei.recipe.stackinfo.DefaultStackStringifyHandler;
+import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
+
 public class StackInfo {
 
     public static final ArrayList<IStackStringifyHandler> stackStringifyHandlers = new ArrayList<>();
diff --git a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java
index a43fb9ad..6e12c1d9 100644
--- a/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java
+++ b/src/main/java/codechicken/nei/recipe/TemplateRecipeHandler.java
@@ -4,20 +4,6 @@ import static codechicken.lib.gui.GuiDraw.changeTexture;
 import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect;
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
 
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemList;
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.NEIServerUtils;
-import codechicken.nei.PositionedStack;
-import codechicken.nei.api.DefaultOverlayRenderer;
-import codechicken.nei.api.IOverlayHandler;
-import codechicken.nei.api.IRecipeOverlayRenderer;
-import codechicken.nei.api.IStackPositioner;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerInputHandler;
-import codechicken.nei.guihook.IContainerTooltipHandler;
-import com.google.common.base.Stopwatch;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.ArrayList;
@@ -32,6 +18,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
+
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.init.Blocks;
 import net.minecraft.inventory.Container;
@@ -39,16 +26,32 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntityFurnace;
+
 import org.lwjgl.opengl.GL11;
 
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemList;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.NEIServerUtils;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.api.DefaultOverlayRenderer;
+import codechicken.nei.api.IOverlayHandler;
+import codechicken.nei.api.IRecipeOverlayRenderer;
+import codechicken.nei.api.IStackPositioner;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.guihook.IContainerInputHandler;
+import codechicken.nei.guihook.IContainerTooltipHandler;
+
+import com.google.common.base.Stopwatch;
+
 /**
- * A Template Recipe Handler!
- * How about that.
- * Because it was sooo hard, and more seriously required lots of copied code to make a handler in the past.
- * you can now extend this class to make your custom recipe handlers much easier to create.
- * Just look at the 5 handlers included by default to work out how to do stuff if you are still stuck.
+ * A Template Recipe Handler! How about that. Because it was sooo hard, and more seriously required lots of copied code
+ * to make a handler in the past. you can now extend this class to make your custom recipe handlers much easier to
+ * create. Just look at the 5 handlers included by default to work out how to do stuff if you are still stuck.
  */
 public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageHandler {
+
     protected static ReentrantLock lock = new ReentrantLock();
 
     public static void findFuelsOnce() {
@@ -87,20 +90,17 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
         if (parallel) {
             try {
                 FurnaceRecipeHandler.afuels = ItemList.forkJoinPool
-                        .submit(() -> ItemList.items.parallelStream()
-                                .map(TemplateRecipeHandler::identifyFuel)
-                                .filter(Objects::nonNull)
-                                .collect(Collectors.toCollection(ArrayList::new)))
+                        .submit(
+                                () -> ItemList.items.parallelStream().map(TemplateRecipeHandler::identifyFuel)
+                                        .filter(Objects::nonNull).collect(Collectors.toCollection(ArrayList::new)))
                         .get();
             } catch (InterruptedException | ExecutionException e) {
                 FurnaceRecipeHandler.afuels = new ArrayList<>();
                 e.printStackTrace();
             }
         } else {
-            FurnaceRecipeHandler.afuels = ItemList.items.stream()
-                    .map(TemplateRecipeHandler::identifyFuel)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toCollection(ArrayList::new));
+            FurnaceRecipeHandler.afuels = ItemList.items.stream().map(TemplateRecipeHandler::identifyFuel)
+                    .filter(Objects::nonNull).collect(Collectors.toCollection(ArrayList::new));
         }
 
         NEIClientConfig.logger.info("FindFuels took " + stopwatch.stop());
@@ -114,10 +114,11 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     /**
-     * This Recipe Handler runs on this internal class
-     * Fill the recipe array with subclasses of this to make transforming the different types of recipes out there into a nice format for NEI a much easier job.
+     * This Recipe Handler runs on this internal class Fill the recipe array with subclasses of this to make
+     * transforming the different types of recipes out there into a nice format for NEI a much easier job.
      */
     public abstract class CachedRecipe {
+
         final long offset = System.currentTimeMillis();
 
         /**
@@ -126,8 +127,7 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
         public abstract PositionedStack getResult();
 
         /**
-         * The ingredients required to produce the result
-         * Use this if you have more than one ingredient
+         * The ingredients required to produce the result Use this if you have more than one ingredient
          *
          * @return A list of positioned ingredient items.
          */
@@ -146,8 +146,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
         }
 
         /**
-         * Return extra items that are not directly involved in the ingredient->result relationship. Eg fuels.
-         * Use this if you have more than one other stack
+         * Return extra items that are not directly involved in the ingredient->result relationship. Eg fuels. Use this
+         * if you have more than one other stack
          *
          * @return A list of positioned items.
          */
@@ -173,7 +173,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
 
         /**
          * This will perform default cycling of ingredients, mulitItem capable
-         * @param cycle Current cycle step
+         * 
+         * @param cycle       Current cycle step
          * @param ingredients List of ItemStacks to cycle
          * @return The provided list of ingredients, with their permutations cycled to a different permutation, if one
          *         is available
@@ -201,10 +202,9 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
                         stack.item = stack.items[i];
                         stack.item.setItemDamage(ingredient.getItemDamage());
                         if (ingredient.hasTagCompound()) {
-                            stack.item.setTagCompound(
-                                    (NBTTagCompound) ingredient.getTagCompound().copy());
+                            stack.item.setTagCompound((NBTTagCompound) ingredient.getTagCompound().copy());
                         }
-                        stack.items = new ItemStack[] {stack.item};
+                        stack.items = new ItemStack[] { stack.item };
                         stack.setPermutationToRender(0);
                         break;
                     }
@@ -214,7 +214,7 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
 
         /**
          * @param ingredients Collection of ItemStacks
-         * @param ingredient ItemStack we're looking for
+         * @param ingredient  ItemStack we're looking for
          * @return true if any of the permutations of the ingredients contain this ItemStack
          */
         public boolean contains(Collection<PositionedStack> ingredients, ItemStack ingredient) {
@@ -234,7 +234,7 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
 
         /**
          * @param ingredients Collection of ItemStacks
-         * @param ingredient Item we're looking for
+         * @param ingredient  Item we're looking for
          * @return true if any of the permutations of the ingredients contain this Item
          */
         public boolean contains(Collection<PositionedStack> ingredients, Item ingredient) {
@@ -244,10 +244,12 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     /**
-     * The Rectangle is an region of the gui relative to the corner of the recipe that will activate the recipe with the corresponding outputId apon being clicked.
-     * Apply this over fuel icons or arrows that the user may click to see all recipes pertaining to that action.
+     * The Rectangle is an region of the gui relative to the corner of the recipe that will activate the recipe with the
+     * corresponding outputId apon being clicked. Apply this over fuel icons or arrows that the user may click to see
+     * all recipes pertaining to that action.
      */
     public static class RecipeTransferRect {
+
         public RecipeTransferRect(Rectangle rectangle, String outputId, Object... results) {
             rect = rectangle;
             this.outputId = outputId;
@@ -270,11 +272,11 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     public static class RecipeTransferRectHandler implements IContainerInputHandler, IContainerTooltipHandler {
-        private static final HashMap<Class<? extends GuiContainer>, HashSet<RecipeTransferRect>> guiMap =
-                new HashMap<>();
 
-        public static void registerRectsToGuis(
-                List<Class<? extends GuiContainer>> classes, List<RecipeTransferRect> rects) {
+        private static final HashMap<Class<? extends GuiContainer>, HashSet<RecipeTransferRect>> guiMap = new HashMap<>();
+
+        public static void registerRectsToGuis(List<Class<? extends GuiContainer>> classes,
+                List<RecipeTransferRect> rects) {
             if (classes == null) return;
 
             for (Class<? extends GuiContainer> clazz : classes) {
@@ -343,8 +345,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
 
             if (GuiContainerManager.shouldShowTooltip(gui) && currenttip.size() == 0) {
                 int[] offset = RecipeInfo.getGuiOffset(gui);
-                currenttip = TemplateRecipeHandler.transferRectTooltip(
-                        gui, guiMap.get(gui.getClass()), offset[0], offset[1], currenttip);
+                currenttip = TemplateRecipeHandler
+                        .transferRectTooltip(gui, guiMap.get(gui.getClass()), offset[0], offset[1], currenttip);
             }
             return currenttip;
         }
@@ -355,8 +357,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
         }
 
         @Override
-        public List<String> handleItemTooltip(
-                GuiContainer gui, ItemStack itemstack, int mousex, int mousey, List<String> currenttip) {
+        public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
+                List<String> currenttip) {
             return currenttip;
         }
 
@@ -370,8 +372,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     /**
-     * Internal tick counter, initialised to random value and incremented every tick.
-     * Used for cycling similar ingredients and progress bars.
+     * Internal tick counter, initialised to random value and incremented every tick. Used for cycling similar
+     * ingredients and progress bars.
      */
     public int cycleticks = Math.abs((int) System.currentTimeMillis());
     /**
@@ -389,14 +391,14 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     /**
-     * Add all RecipeTransferRects to the transferRects list during this call.
-     * Afterward they may be added to the input handler for the corresponding guis from getRecipeTransferRectGuis
+     * Add all RecipeTransferRects to the transferRects list during this call. Afterward they may be added to the input
+     * handler for the corresponding guis from getRecipeTransferRectGuis
      */
     public void loadTransferRects() {}
 
     /**
-     * In this function you need to fill up the empty recipe array with recipes.
-     * The default passes it to a cleaner handler if outputId is an item
+     * In this function you need to fill up the empty recipe array with recipes. The default passes it to a cleaner
+     * handler if outputId is an item
      *
      * @param outputId A String identifier representing the type of output produced. Eg. {"item", "fuel"}
      * @param results  Objects representing the results that matching recipes must produce.
@@ -413,8 +415,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     public void loadCraftingRecipes(ItemStack result) {}
 
     /**
-     * In this function you need to fill up the empty recipe array with recipes
-     * The default passes it to a cleaner handler if inputId is an item
+     * In this function you need to fill up the empty recipe array with recipes The default passes it to a cleaner
+     * handler if inputId is an item
      *
      * @param inputId     A String identifier representing the type of ingredients used. Eg. {"item", "fuel"}
      * @param ingredients Objects representing the ingredients that matching recipes must contain.
@@ -436,8 +438,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     public abstract String getGuiTexture();
 
     /**
-     * Simply works with the {@link DefaultOverlayRenderer}
-     * If the current container has been registered with this identifier, the question mark appears and an overlay guide can be drawn.
+     * Simply works with the {@link DefaultOverlayRenderer} If the current container has been registered with this
+     * identifier, the question mark appears and an overlay guide can be drawn.
      *
      * @return The overlay identifier of this recipe type.
      */
@@ -454,8 +456,7 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     public void drawExtras(int recipe) {}
 
     /**
-     * Draws a texture rectangle that changes size with time.
-     * Commonly used for progress bars.
+     * Draws a texture rectangle that changes size with time. Commonly used for progress bars.
      *
      * @param x         X position on screen
      * @param y         Y position on screen
@@ -471,9 +472,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     /**
-     * Draws a texture rectangle that changes size with time.
-     * Commonly used for progress bars.
-     * If for some reason you don't like the default counter use this and specify the progress percentage.
+     * Draws a texture rectangle that changes size with time. Commonly used for progress bars. If for some reason you
+     * don't like the default counter use this and specify the progress percentage.
      *
      * @param x          X position on screen
      * @param y          Y position on screen
@@ -508,7 +508,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     /**
-     * @return The gui classes to which the transfer rects added in the constructor are to be located over. null if none.
+     * @return The gui classes to which the transfer rects added in the constructor are to be located over. null if
+     *         none.
      */
     public List<Class<? extends GuiContainer>> getRecipeTransferRectGuis() {
         Class<? extends GuiContainer> clazz = getGuiClass();
@@ -552,9 +553,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     /**
-     * First look up {@link RecipeCatalysts} whether target ingredient is registered for it.
-     * If so, load all recipes for this handler.
-     * Fallback to {@link TemplateRecipeHandler#getUsageHandler}.
+     * First look up {@link RecipeCatalysts} whether target ingredient is registered for it. If so, load all recipes for
+     * this handler. Fallback to {@link TemplateRecipeHandler#getUsageHandler}.
      */
     public IUsageHandler getUsageAndCatalystHandler(String inputId, Object... ingredients) {
         TemplateRecipeHandler handler = newInstance();
@@ -576,8 +576,8 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
     }
 
     /**
-     * Override this if you have multiple {@link RecipeTransferRect}s.
-     * Used for {@link TemplateRecipeHandler#getUsageAndCatalystHandler}.
+     * Override this if you have multiple {@link RecipeTransferRect}s. Used for
+     * {@link TemplateRecipeHandler#getUsageAndCatalystHandler}.
      */
     public String specifyTransferRect() {
         return null;
@@ -707,26 +707,21 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
         return transferRect(gui, transferRects, offset.x, offset.y, usage);
     }
 
-    private static boolean transferRect(
-            GuiContainer gui, Collection<RecipeTransferRect> transferRects, int offsetx, int offsety, boolean usage) {
+    private static boolean transferRect(GuiContainer gui, Collection<RecipeTransferRect> transferRects, int offsetx,
+            int offsety, boolean usage) {
         Point pos = getMousePosition();
         Point relMouse = new Point(pos.x - gui.guiLeft - offsetx, pos.y - gui.guiTop - offsety);
         for (RecipeTransferRect rect : transferRects) {
-            if (rect.rect.contains(relMouse)
-                    && (usage
-                            ? GuiUsageRecipe.openRecipeGui(rect.outputId, rect.results)
-                            : GuiCraftingRecipe.openRecipeGui(rect.outputId, rect.results))) return true;
+            if (rect.rect.contains(relMouse) && (usage ? GuiUsageRecipe.openRecipeGui(rect.outputId, rect.results)
+                    : GuiCraftingRecipe.openRecipeGui(rect.outputId, rect.results)))
+                return true;
         }
 
         return false;
     }
 
-    private static List<String> transferRectTooltip(
-            GuiContainer gui,
-            Collection<RecipeTransferRect> transferRects,
-            int offsetx,
-            int offsety,
-            List<String> currenttip) {
+    private static List<String> transferRectTooltip(GuiContainer gui, Collection<RecipeTransferRect> transferRects,
+            int offsetx, int offsety, List<String> currenttip) {
         Point pos = getMousePosition();
         Point relMouse = new Point(pos.x - gui.guiLeft - offsetx, pos.y - gui.guiTop - offsety);
         for (RecipeTransferRect rect : transferRects) {
diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java
index 6579b497..a1b6de9b 100644
--- a/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java
+++ b/src/main/java/codechicken/nei/recipe/stackinfo/DefaultStackStringifyHandler.java
@@ -1,7 +1,5 @@
 package codechicken.nei.recipe.stackinfo;
 
-import codechicken.nei.api.IStackStringifyHandler;
-import cpw.mods.fml.common.registry.GameData;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -9,6 +7,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
+import codechicken.nei.api.IStackStringifyHandler;
+import cpw.mods.fml.common.registry.GameData;
+
 public class DefaultStackStringifyHandler implements IStackStringifyHandler {
 
     public NBTTagCompound convertItemStackToNBT(ItemStack stack, boolean saveStackSize) {
diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java
index 2e724b42..abcd72b2 100644
--- a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java
+++ b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java
@@ -1,13 +1,15 @@
 package codechicken.nei.recipe.stackinfo;
 
-import codechicken.nei.api.IStackStringifyHandler;
 import java.lang.reflect.Method;
+
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
+import codechicken.nei.api.IStackStringifyHandler;
+
 public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
 
     public static Class GTDisplayFluid = null;
@@ -23,7 +25,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
             getFluidDisplayStack = gtUtility.getMethod("getFluidDisplayStack", FluidStack.class, boolean.class);
 
         } catch (Exception ignored) {
-            /*Do nothing*/
+            /* Do nothing */
         }
     }
 
@@ -57,8 +59,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
                     return (ItemStack) obj;
                 }
 
-            } catch (Exception e) {
-            }
+            } catch (Exception e) {}
         }
 
         return null;
@@ -74,8 +75,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
                     return (FluidStack) obj;
                 }
 
-            } catch (Exception e) {
-            }
+            } catch (Exception e) {}
         }
 
         return null;
diff --git a/src/main/java/codechicken/nei/util/NBTHelper.java b/src/main/java/codechicken/nei/util/NBTHelper.java
index c8bc46e3..0f2e28f9 100644
--- a/src/main/java/codechicken/nei/util/NBTHelper.java
+++ b/src/main/java/codechicken/nei/util/NBTHelper.java
@@ -1,7 +1,9 @@
 package codechicken.nei.util;
 
 import java.util.Set;
+
 import javax.annotation.Nullable;
+
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -9,8 +11,8 @@ import net.minecraft.nbt.NBTTagList;
 public class NBTHelper {
 
     /*
-     * Taken from Botania r1.11-379 by Vazkii under the Botania License
-     * You can obtain one at https://botaniamod.net/license.php
+     * Taken from Botania r1.11-379 by Vazkii under the Botania License You can obtain one at
+     * https://botaniamod.net/license.php
      */
 
     /**
@@ -32,7 +34,7 @@ public class NBTHelper {
     private static boolean matchTagCompound(NBTTagCompound template, NBTTagCompound target) {
         if (template.tagMap.size() > target.tagMap.size()) return false;
 
-        //noinspection unchecked
+        // noinspection unchecked
         for (String key : (Set<String>) template.func_150296_c()) {
             if (!matchTag(template.getTag(key), target.getTag(key))) return false;
         }
diff --git a/src/main/java/codechicken/nei/util/NBTJson.java b/src/main/java/codechicken/nei/util/NBTJson.java
index cc8a968e..8adcd459 100644
--- a/src/main/java/codechicken/nei/util/NBTJson.java
+++ b/src/main/java/codechicken/nei/util/NBTJson.java
@@ -1,14 +1,11 @@
 package codechicken.nei.util;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagByte;
 import net.minecraft.nbt.NBTTagByteArray;
@@ -22,7 +19,13 @@ import net.minecraft.nbt.NBTTagLong;
 import net.minecraft.nbt.NBTTagShort;
 import net.minecraft.nbt.NBTTagString;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+
 public class NBTJson {
+
     private static final Pattern numberPattern = Pattern.compile("^([-+]?\\d+\\.?\\d*E*\\d*)([bBsSlLfFdD]?)$");
 
     public static String toJson(NBTTagCompound tag) {
@@ -166,9 +169,7 @@ public class NBTJson {
             }
 
             if (nbtList.stream().allMatch(n -> n instanceof NBTTagInt)) {
-                return new NBTTagIntArray(nbtList.stream()
-                        .mapToInt(i -> ((NBTTagInt) i).func_150287_d())
-                        .toArray());
+                return new NBTTagIntArray(nbtList.stream().mapToInt(i -> ((NBTTagInt) i).func_150287_d()).toArray());
             } else if (nbtList.stream().allMatch(n -> n instanceof NBTTagByte)) {
                 final byte[] abyte = new byte[nbtList.size()];
 
@@ -216,8 +217,7 @@ public class NBTJson {
             try {
                 final String className = obj.get("__custom_type").getAsString();
                 return (NBTBase) Class.forName(className).newInstance();
-            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException th) {
-            }
+            } catch (ClassNotFoundException | InstantiationException | IllegalAccessException th) {}
         }
 
         return null;
diff --git a/src/main/java/codechicken/nei/util/ReadableNumberConverter.java b/src/main/java/codechicken/nei/util/ReadableNumberConverter.java
index a939833e..9fe88459 100644
--- a/src/main/java/codechicken/nei/util/ReadableNumberConverter.java
+++ b/src/main/java/codechicken/nei/util/ReadableNumberConverter.java
@@ -6,14 +6,14 @@ import java.text.DecimalFormatSymbols;
 import java.text.Format;
 
 /**
- * copy from ae2
- * Converter class to convert a large number into a SI system.
+ * copy from ae2 Converter class to convert a large number into a SI system.
  *
  * @author thatsIch
  * @version rv2
  * @since rv2
  */
 public enum ReadableNumberConverter {
+
     INSTANCE;
 
     /**
diff --git a/src/main/java/codechicken/nei/util/TextHistory.java b/src/main/java/codechicken/nei/util/TextHistory.java
index 05ba6e37..eb804c8f 100644
--- a/src/main/java/codechicken/nei/util/TextHistory.java
+++ b/src/main/java/codechicken/nei/util/TextHistory.java
@@ -8,6 +8,7 @@ import java.util.Optional;
  * Backported from JustEnoughItems/Core/src/main/java/mezz/jei/core/util/TextHistory.java
  */
 public class TextHistory {
+
     private static final int MAX_HISTORY = 100;
 
     public enum Direction {