ForgeDirection (#74)

* ForgeDirection

* spotlessApply

* update dep

* update

---------

Co-authored-by: GitHub GTNH Actions <unknown>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

48 files changed, 199 insertions, 220 deletions

diff --git a/src/main/java/kubatech/ClientProxy.java b/src/main/java/kubatech/ClientProxy.java
index 92ef759fcc..3b5b68ec4e 100644
--- a/src/main/java/kubatech/ClientProxy.java
+++ b/src/main/java/kubatech/ClientProxy.java
@@ -20,10 +20,10 @@
 
 package kubatech;
 
+import cpw.mods.fml.common.event.*;
 import kubatech.api.utils.ModUtils;
 import kubatech.loaders.MobRecipeLoader;
 import kubatech.nei.IMCForNEI;
-import cpw.mods.fml.common.event.*;
 
 @SuppressWarnings("unused")
 public class ClientProxy extends CommonProxy {
diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java
index 71c575ecc4..a2ce560669 100644
--- a/src/main/java/kubatech/CommonProxy.java
+++ b/src/main/java/kubatech/CommonProxy.java
@@ -23,6 +23,10 @@ package kubatech;
 import static kubatech.loaders.BlockLoader.registerBlocks;
 import static kubatech.loaders.ItemLoader.registerItems;
 
+import net.minecraftforge.common.MinecraftForge;
+
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.event.*;
 import kubatech.api.LoaderReference;
 import kubatech.commands.*;
 import kubatech.config.Config;
@@ -31,11 +35,6 @@ import kubatech.loaders.RecipeLoader;
 import kubatech.loaders.TCLoader;
 import kubatech.savedata.PlayerDataManager;
 
-import net.minecraftforge.common.MinecraftForge;
-
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.event.*;
-
 public class CommonProxy {
 
     public void preInit(FMLPreInitializationEvent event) {
diff --git a/src/main/java/kubatech/FMLEventHandler.java b/src/main/java/kubatech/FMLEventHandler.java
index 0c6f3d20ea..27ff42615c 100644
--- a/src/main/java/kubatech/FMLEventHandler.java
+++ b/src/main/java/kubatech/FMLEventHandler.java
@@ -20,14 +20,13 @@
 
 package kubatech;
 
-import kubatech.api.helpers.UUIDFinder;
-import kubatech.api.network.LoadConfigPacket;
-import kubatech.savedata.PlayerDataManager;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
+import kubatech.api.helpers.UUIDFinder;
+import kubatech.api.network.LoadConfigPacket;
+import kubatech.savedata.PlayerDataManager;
 
 public class FMLEventHandler {
 
diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java
index 4ab730a150..22db1344db 100644
--- a/src/main/java/kubatech/api/Variables.java
+++ b/src/main/java/kubatech/api/Variables.java
@@ -23,10 +23,10 @@ package kubatech.api;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 
-import kubatech.api.utils.StringUtils;
-
 import net.minecraft.util.EnumChatFormatting;
 
+import kubatech.api.utils.StringUtils;
+
 public class Variables {
 
     public static final String Author = "Author: "
diff --git a/src/main/java/kubatech/api/helpers/EnderIOHelper.java b/src/main/java/kubatech/api/helpers/EnderIOHelper.java
index 683d193d34..63da31e76e 100644
--- a/src/main/java/kubatech/api/helpers/EnderIOHelper.java
+++ b/src/main/java/kubatech/api/helpers/EnderIOHelper.java
@@ -20,13 +20,12 @@
 
 package kubatech.api.helpers;
 
-import kubatech.api.LoaderReference;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.boss.IBossDisplayData;
 
 import crazypants.enderio.EnderIO;
+import kubatech.api.LoaderReference;
 
 public class EnderIOHelper {
 
diff --git a/src/main/java/kubatech/api/helpers/GTHelper.java b/src/main/java/kubatech/api/helpers/GTHelper.java
index 8521045404..201f8b45b7 100644
--- a/src/main/java/kubatech/api/helpers/GTHelper.java
+++ b/src/main/java/kubatech/api/helpers/GTHelper.java
@@ -23,9 +23,9 @@ package kubatech.api.helpers;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity;
 import static kubatech.api.Variables.ln4;
 
-import kubatech.api.implementations.KubaTechGTMultiBlockBase;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import kubatech.api.implementations.KubaTechGTMultiBlockBase;
 
 public class GTHelper {
 
diff --git a/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java b/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java
index d49d1cd16c..24758565e3 100644
--- a/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java
+++ b/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java
@@ -24,11 +24,11 @@ import static kubatech.api.utils.ModUtils.isClientSided;
 
 import java.io.IOException;
 
-import kubatech.Tags;
-import kubatech.api.LoaderReference;
 import alexiil.mods.load.ProgressDisplayer;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.ProgressManager;
+import kubatech.Tags;
+import kubatech.api.LoaderReference;
 
 @SuppressWarnings("deprecation")
 public class ProgressBarWrapper {
diff --git a/src/main/java/kubatech/api/mobhandler/MobDrop.java b/src/main/java/kubatech/api/mobhandler/MobDrop.java
index f8dafc01a1..9b8b9cd51c 100644
--- a/src/main/java/kubatech/api/mobhandler/MobDrop.java
+++ b/src/main/java/kubatech/api/mobhandler/MobDrop.java
@@ -22,13 +22,12 @@ package kubatech.api.mobhandler;
 
 import java.util.HashMap;
 
-import kubatech.api.ConstructableItemStack;
-import kubatech.api.utils.GSONUtils;
-
 import net.minecraft.item.ItemStack;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import kubatech.api.ConstructableItemStack;
+import kubatech.api.utils.GSONUtils;
 
 public class MobDrop {
 
diff --git a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
index bc4587389f..cd65d08d57 100644
--- a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
+++ b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
@@ -22,10 +22,6 @@ package kubatech.api.network;
 
 import java.nio.charset.StandardCharsets;
 
-import kubatech.api.tileentity.CustomTileEntityPacketHandler;
-import kubatech.api.utils.ModUtils;
-import kubatech.kubatech;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -38,6 +34,9 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import kubatech.api.tileentity.CustomTileEntityPacketHandler;
+import kubatech.api.utils.ModUtils;
+import kubatech.kubatech;
 
 public class CustomTileEntityPacket implements IMessage {
 
diff --git a/src/main/java/kubatech/api/network/LoadConfigPacket.java b/src/main/java/kubatech/api/network/LoadConfigPacket.java
index 9af665d46b..be3d0b803c 100644
--- a/src/main/java/kubatech/api/network/LoadConfigPacket.java
+++ b/src/main/java/kubatech/api/network/LoadConfigPacket.java
@@ -24,14 +24,14 @@ import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import kubatech.config.Config;
-import kubatech.config.OverridesConfig;
-import kubatech.kubatech;
-import kubatech.loaders.MobRecipeLoader;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import io.netty.buffer.ByteBuf;
+import kubatech.config.Config;
+import kubatech.config.OverridesConfig;
+import kubatech.kubatech;
+import kubatech.loaders.MobRecipeLoader;
 
 public class LoadConfigPacket implements IMessage {
 
diff --git a/src/main/java/kubatech/api/tea/TeaNetwork.java b/src/main/java/kubatech/api/tea/TeaNetwork.java
index 286dde6b33..68c8275bfd 100644
--- a/src/main/java/kubatech/api/tea/TeaNetwork.java
+++ b/src/main/java/kubatech/api/tea/TeaNetwork.java
@@ -4,12 +4,12 @@ import java.math.BigInteger;
 import java.util.HashSet;
 import java.util.UUID;
 
+import net.minecraft.nbt.NBTTagCompound;
+
 import kubatech.savedata.PlayerData;
 import kubatech.savedata.PlayerDataManager;
 import kubatech.tileentity.TeaStorageTile;
 
-import net.minecraft.nbt.NBTTagCompound;
-
 public class TeaNetwork {
 
     // TODO: Optimize later :P
diff --git a/src/main/java/kubatech/api/utils/ModUtils.java b/src/main/java/kubatech/api/utils/ModUtils.java
index e618c2557a..a6cceecdeb 100644
--- a/src/main/java/kubatech/api/utils/ModUtils.java
+++ b/src/main/java/kubatech/api/utils/ModUtils.java
@@ -26,12 +26,11 @@ import java.util.*;
 
 import javax.xml.bind.DatatypeConverter;
 
-import kubatech.kubatech;
-
 import net.minecraft.launchwrapper.Launch;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
+import kubatech.kubatech;
 
 public class ModUtils {
 
diff --git a/src/main/java/kubatech/client/effect/EntityRenderer.java b/src/main/java/kubatech/client/effect/EntityRenderer.java
index 2f9e5c9825..1db113c563 100644
--- a/src/main/java/kubatech/client/effect/EntityRenderer.java
+++ b/src/main/java/kubatech/client/effect/EntityRenderer.java
@@ -22,10 +22,6 @@ package kubatech.client.effect;
 
 import static net.minecraft.client.renderer.entity.RenderManager.*;
 
-import kubatech.Tags;
-import kubatech.api.utils.MobUtils;
-import kubatech.config.Config;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -44,6 +40,9 @@ import org.lwjgl.util.glu.GLU;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import kubatech.Tags;
+import kubatech.api.utils.MobUtils;
+import kubatech.config.Config;
 
 @SideOnly(Side.CLIENT)
 public class EntityRenderer extends EntityFX {
diff --git a/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java b/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java
index 9d3a883e98..40079f3fed 100644
--- a/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java
+++ b/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java
@@ -22,8 +22,6 @@ package kubatech.client.effect;
 
 import static net.minecraft.client.renderer.entity.RenderManager.*;
 
-import kubatech.api.enums.ItemList;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.OpenGlHelper;
@@ -36,6 +34,8 @@ import net.minecraft.world.World;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import kubatech.api.enums.ItemList;
+
 public class MegaApiaryBeesRenderer extends EntityFX {
 
     public MegaApiaryBeesRenderer(World world, double x, double y, double z, int age) {
diff --git a/src/main/java/kubatech/commands/CommandConfig.java b/src/main/java/kubatech/commands/CommandConfig.java
index 8f94f9334f..6b61a4ca30 100644
--- a/src/main/java/kubatech/commands/CommandConfig.java
+++ b/src/main/java/kubatech/commands/CommandConfig.java
@@ -22,11 +22,6 @@ package kubatech.commands;
 
 import static kubatech.commands.CommandConfig.Translations.*;
 
-import kubatech.api.network.LoadConfigPacket;
-import kubatech.config.Config;
-import kubatech.kubatech;
-import kubatech.loaders.MobRecipeLoader;
-
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -34,6 +29,11 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.StatCollector;
 
+import kubatech.api.network.LoadConfigPacket;
+import kubatech.config.Config;
+import kubatech.kubatech;
+import kubatech.loaders.MobRecipeLoader;
+
 public class CommandConfig extends CommandBase {
 
     enum Translations {
diff --git a/src/main/java/kubatech/commands/CommandTea.java b/src/main/java/kubatech/commands/CommandTea.java
index ac949571f2..48e1b110b5 100644
--- a/src/main/java/kubatech/commands/CommandTea.java
+++ b/src/main/java/kubatech/commands/CommandTea.java
@@ -25,14 +25,14 @@ import static kubatech.commands.CommandTea.Translations.*;
 import java.math.BigInteger;
 import java.util.UUID;
 
-import kubatech.api.helpers.UUIDFinder;
-import kubatech.api.tea.TeaNetwork;
-
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.StatCollector;
 
+import kubatech.api.helpers.UUIDFinder;
+import kubatech.api.tea.TeaNetwork;
+
 public class CommandTea extends CommandBase {
 
     enum Translations {
diff --git a/src/main/java/kubatech/config/Config.java b/src/main/java/kubatech/config/Config.java
index 4c361f6573..6508063faf 100644
--- a/src/main/java/kubatech/config/Config.java
+++ b/src/main/java/kubatech/config/Config.java
@@ -22,10 +22,10 @@ package kubatech.config;
 
 import java.io.File;
 
-import kubatech.Tags;
-
 import net.minecraftforge.common.config.Configuration;
 
+import kubatech.Tags;
+
 public class Config {
 
     private enum Category {
diff --git a/src/main/java/kubatech/config/OverridesConfig.java b/src/main/java/kubatech/config/OverridesConfig.java
index 2959b7bbed..e80e63a16f 100644
--- a/src/main/java/kubatech/config/OverridesConfig.java
+++ b/src/main/java/kubatech/config/OverridesConfig.java
@@ -29,13 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import kubatech.Tags;
-import kubatech.api.ConstructableItemStack;
-import kubatech.api.LoaderReference;
-import kubatech.api.helpers.ReflectionHelper;
-import kubatech.api.mobhandler.MobDrop;
-import kubatech.api.utils.GSONUtils;
-
 import net.minecraft.entity.EntityList;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.init.Items;
@@ -55,6 +48,12 @@ import com.google.gson.reflect.TypeToken;
 import cpw.mods.fml.common.registry.GameRegistry;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import kubatech.Tags;
+import kubatech.api.ConstructableItemStack;
+import kubatech.api.LoaderReference;
+import kubatech.api.helpers.ReflectionHelper;
+import kubatech.api.mobhandler.MobDrop;
+import kubatech.api.utils.GSONUtils;
 
 public class OverridesConfig {
 
diff --git a/src/main/java/kubatech/kubatech.java b/src/main/java/kubatech/kubatech.java
index 1814abffe1..929165d075 100644
--- a/src/main/java/kubatech/kubatech.java
+++ b/src/main/java/kubatech/kubatech.java
@@ -24,10 +24,6 @@ import static kubatech.api.enums.ItemList.LegendaryRedTea;
 
 import java.util.List;
 
-import kubatech.api.enums.ItemList;
-import kubatech.api.network.CustomTileEntityPacket;
-import kubatech.api.network.LoadConfigPacket;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -40,6 +36,9 @@ import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.relauncher.Side;
+import kubatech.api.enums.ItemList;
+import kubatech.api.network.CustomTileEntityPacket;
+import kubatech.api.network.LoadConfigPacket;
 
 @SuppressWarnings("unused")
 @Mod(
diff --git a/src/main/java/kubatech/loaders/BlockLoader.java b/src/main/java/kubatech/loaders/BlockLoader.java
index 099401eb15..e6f8d5b8ed 100644
--- a/src/main/java/kubatech/loaders/BlockLoader.java
+++ b/src/main/java/kubatech/loaders/BlockLoader.java
@@ -20,6 +20,10 @@
 
 package kubatech.loaders;
 
+import net.minecraft.block.material.Material;
+import net.minecraft.item.ItemBlock;
+
+import cpw.mods.fml.common.registry.GameRegistry;
 import kubatech.api.enums.ItemList;
 import kubatech.loaders.block.KubaBlock;
 import kubatech.loaders.block.KubaItemBlock;
@@ -28,11 +32,6 @@ import kubatech.loaders.block.blocks.TeaStorage;
 import kubatech.tileentity.TeaAcceptorTile;
 import kubatech.tileentity.TeaStorageTile;
 
-import net.minecraft.block.material.Material;
-import net.minecraft.item.ItemBlock;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-
 public class BlockLoader {
 
     public static final KubaBlock kubaBlock = new KubaBlock(Material.anvil);
diff --git a/src/main/java/kubatech/loaders/ItemLoader.java b/src/main/java/kubatech/loaders/ItemLoader.java
index 110b1d0ede..03af96a406 100644
--- a/src/main/java/kubatech/loaders/ItemLoader.java
+++ b/src/main/java/kubatech/loaders/ItemLoader.java
@@ -22,10 +22,10 @@ package kubatech.loaders;
 
 import static kubatech.api.enums.ItemList.*;
 
+import cpw.mods.fml.common.registry.GameRegistry;
 import kubatech.loaders.item.ItemProxy;
 import kubatech.loaders.item.KubaItems;
 import kubatech.loaders.item.items.*;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class ItemLoader {
 
diff --git a/src/main/java/kubatech/loaders/MTLoader.java b/src/main/java/kubatech/loaders/MTLoader.java
index 306197267e..133a876f02 100644
--- a/src/main/java/kubatech/loaders/MTLoader.java
+++ b/src/main/java/kubatech/loaders/MTLoader.java
@@ -20,12 +20,12 @@
 
 package kubatech.loaders;
 
-import kubatech.Tags;
-import minetweaker.MineTweakerImplementationAPI;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import kubatech.Tags;
+import minetweaker.MineTweakerImplementationAPI;
+
 public class MTLoader {
 
     private static final Logger LOG = LogManager.getLogger(Tags.MODID + "[MT Loader]");
diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java
index cfac6bc925..2c0bbf464f 100644
--- a/src/main/java/kubatech/loaders/MobRecipeLoader.java
+++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java
@@ -34,24 +34,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import kubatech.Tags;
-import kubatech.api.LoaderReference;
-import kubatech.api.helpers.EnderIOHelper;
-import kubatech.api.helpers.InfernalHelper;
-import kubatech.api.helpers.ProgressBarWrapper;
-import kubatech.api.mobhandler.MobDrop;
-import kubatech.api.network.LoadConfigPacket;
-import kubatech.api.utils.GSONUtils;
-import kubatech.api.utils.ModUtils;
-import kubatech.config.Config;
-import kubatech.config.OverridesConfig;
-import kubatech.nei.Mob_Handler;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
-import minetweaker.MineTweakerAPI;
-import minetweaker.api.entity.IEntityDefinition;
-import minetweaker.api.item.IItemStack;
-import minetweaker.mc1710.item.MCItemStack;
-
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -74,19 +56,35 @@ import net.minecraft.world.World;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import stanhebben.zenscript.value.IntRange;
-import thaumcraft.common.items.wands.ItemWandCasting;
-import atomicstryker.infernalmobs.common.InfernalMobsCore;
-import atomicstryker.infernalmobs.common.MobModifier;
-import atomicstryker.infernalmobs.common.mods.api.ModifierLoader;
-
 import com.google.common.io.Files;
 import com.google.gson.Gson;
 
+import atomicstryker.infernalmobs.common.InfernalMobsCore;
+import atomicstryker.infernalmobs.common.MobModifier;
+import atomicstryker.infernalmobs.common.mods.api.ModifierLoader;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_DummyWorld;
+import kubatech.Tags;
+import kubatech.api.LoaderReference;
+import kubatech.api.helpers.EnderIOHelper;
+import kubatech.api.helpers.InfernalHelper;
+import kubatech.api.helpers.ProgressBarWrapper;
+import kubatech.api.mobhandler.MobDrop;
+import kubatech.api.network.LoadConfigPacket;
+import kubatech.api.utils.GSONUtils;
+import kubatech.api.utils.ModUtils;
+import kubatech.config.Config;
+import kubatech.config.OverridesConfig;
+import kubatech.nei.Mob_Handler;
+import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
+import minetweaker.MineTweakerAPI;
+import minetweaker.api.entity.IEntityDefinition;
+import minetweaker.api.item.IItemStack;
+import minetweaker.mc1710.item.MCItemStack;
+import stanhebben.zenscript.value.IntRange;
+import thaumcraft.common.items.wands.ItemWandCasting;
 
 public class MobRecipeLoader {
 
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index 1656d0bc9d..4eb196a94e 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -24,13 +24,6 @@ import static kubatech.api.enums.ItemList.*;
 
 import java.lang.reflect.InvocationTargetException;
 
-import kubatech.Tags;
-import kubatech.api.LoaderReference;
-import kubatech.api.enums.ItemList;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary;
-
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -50,6 +43,12 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
+import kubatech.Tags;
+import kubatech.api.LoaderReference;
+import kubatech.api.enums.ItemList;
+import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
+import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse;
+import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary;
 
 public class RecipeLoader {
 
diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java
index 8f2b48ceaa..3b9fdc392a 100644
--- a/src/main/java/kubatech/loaders/TCLoader.java
+++ b/src/main/java/kubatech/loaders/TCLoader.java
@@ -25,15 +25,15 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.stream.Collectors;
 
-import kubatech.api.LoaderReference;
-import kubatech.api.enums.ItemList;
-import kubatech.api.utils.ItemID;
-import kubatech.loaders.item.items.TeaUltimate;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import cpw.mods.fml.common.registry.GameRegistry;
+import kubatech.api.LoaderReference;
+import kubatech.api.enums.ItemList;
+import kubatech.api.utils.ItemID;
+import kubatech.loaders.item.items.TeaUltimate;
 import thaumcraft.api.ThaumcraftApi;
 import thaumcraft.api.ThaumcraftApiHelper;
 import thaumcraft.api.aspects.Aspect;
@@ -42,7 +42,6 @@ import thaumcraft.api.crafting.InfusionRecipe;
 import thaumcraft.api.research.ResearchCategories;
 import thaumcraft.api.research.ResearchItem;
 import thaumcraft.api.research.ResearchPage;
-import cpw.mods.fml.common.registry.GameRegistry;
 
 public class TCLoader {
 
diff --git a/src/main/java/kubatech/loaders/block/BlockProxy.java b/src/main/java/kubatech/loaders/block/BlockProxy.java
index e5238bf2f3..86f403a0c8 100644
--- a/src/main/java/kubatech/loaders/block/BlockProxy.java
+++ b/src/main/java/kubatech/loaders/block/BlockProxy.java
@@ -24,8 +24,6 @@ import static kubatech.loaders.block.KubaBlock.defaultTileEntityUI;
 
 import java.util.List;
 
-import kubatech.Tags;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
@@ -38,6 +36,8 @@ import net.minecraft.world.World;
 
 import com.gtnewhorizons.modularui.api.screen.ITileWithModularUI;
 
+import kubatech.Tags;
+
 public class BlockProxy {
 
     private final String unlocalizedName;
diff --git a/src/main/java/kubatech/loaders/block/KubaBlock.java b/src/main/java/kubatech/loaders/block/KubaBlock.java
index 8d4d53f04d..ac722358e1 100644
--- a/src/main/java/kubatech/loaders/block/KubaBlock.java
+++ b/src/main/java/kubatech/loaders/block/KubaBlock.java
@@ -27,8 +27,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.function.Function;
 
-import kubatech.loaders.BlockLoader;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -51,6 +49,8 @@ import com.gtnewhorizons.modularui.common.builder.UIInfo;
 import com.gtnewhorizons.modularui.common.internal.wrapper.ModularGui;
 import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer;
 
+import kubatech.loaders.BlockLoader;
+
 public class KubaBlock extends Block {
 
     public static final Function<IModularUIContainerCreator, UIInfo<?, ?>> TileEntityUIFactory = containerConstructor -> UIBuilder
diff --git a/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java b/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java
index 0420ba82cb..d06466094a 100644
--- a/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java
+++ b/src/main/java/kubatech/loaders/block/blocks/TeaAcceptor.java
@@ -22,10 +22,6 @@ package kubatech.loaders.block.blocks;
 
 import java.util.List;
 
-import kubatech.loaders.block.BlockProxy;
-import kubatech.loaders.block.IProxyTileEntityProvider;
-import kubatech.tileentity.TeaAcceptorTile;
-
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -33,6 +29,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import kubatech.loaders.block.BlockProxy;
+import kubatech.loaders.block.IProxyTileEntityProvider;
+import kubatech.tileentity.TeaAcceptorTile;
+
 public class TeaAcceptor extends BlockProxy implements IProxyTileEntityProvider {
 
     public TeaAcceptor() {
diff --git a/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java b/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java
index 7e1fc42ad2..059c873ad4 100644
--- a/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java
+++ b/src/main/java/kubatech/loaders/block/blocks/TeaStorage.java
@@ -24,10 +24,6 @@ import static kubatech.api.Variables.numberFormat;
 
 import java.util.List;
 
-import kubatech.loaders.block.BlockProxy;
-import kubatech.loaders.block.IProxyTileEntityProvider;
-import kubatech.tileentity.TeaStorageTile;
-
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -36,6 +32,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
+import kubatech.loaders.block.BlockProxy;
+import kubatech.loaders.block.IProxyTileEntityProvider;
+import kubatech.tileentity.TeaStorageTile;
+
 public class TeaStorage extends BlockProxy implements IProxyTileEntityProvider {
 
     public TeaStorage() {
diff --git a/src/main/java/kubatech/loaders/item/ItemProxy.java b/src/main/java/kubatech/loaders/item/ItemProxy.java
index aa7d538790..a8d7124a65 100644
--- a/src/main/java/kubatech/loaders/item/ItemProxy.java
+++ b/src/main/java/kubatech/loaders/item/ItemProxy.java
@@ -22,8 +22,6 @@ package kubatech.loaders.item;
 
 import java.util.List;
 
-import kubatech.Tags;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -41,6 +39,8 @@ import com.gtnewhorizons.modularui.common.builder.UIInfo;
 import com.gtnewhorizons.modularui.common.internal.wrapper.ModularGui;
 import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer;
 
+import kubatech.Tags;
+
 public class ItemProxy {
 
     private static final UIInfo<?, ?> HeldItemUIInfo = UIBuilder.of()
diff --git a/src/main/java/kubatech/loaders/item/KubaItems.java b/src/main/java/kubatech/loaders/item/KubaItems.java
index 0b832c8aff..fc306ab064 100644
--- a/src/main/java/kubatech/loaders/item/KubaItems.java
+++ b/src/main/java/kubatech/loaders/item/KubaItems.java
@@ -25,8 +25,6 @@ import static kubatech.kubatech.KT;
 import java.util.HashMap;
 import java.util.List;
 
-import kubatech.loaders.ItemLoader;
-
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
@@ -39,6 +37,7 @@ import net.minecraft.world.World;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import kubatech.loaders.ItemLoader;
 
 public class KubaItems extends Item {
 
diff --git a/src/main/java/kubatech/loaders/item/items/Tea.java b/src/main/java/kubatech/loaders/item/items/Tea.java
index bf989f46ad..7af7eaafb2 100644
--- a/src/main/java/kubatech/loaders/item/items/Tea.java
+++ b/src/main/java/kubatech/loaders/item/items/Tea.java
@@ -22,13 +22,13 @@ package kubatech.loaders.item.items;
 
 import java.util.List;
 
-import kubatech.loaders.item.ItemProxy;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import kubatech.loaders.item.ItemProxy;
+
 public class Tea extends ItemProxy {
 
     private final int heal;
diff --git a/src/main/java/kubatech/loaders/item/items/TeaCollection.java b/src/main/java/kubatech/loaders/item/items/TeaCollection.java
index 8742b482c4..ef3346422a 100644
--- a/src/main/java/kubatech/loaders/item/items/TeaCollection.java
+++ b/src/main/java/kubatech/loaders/item/items/TeaCollection.java
@@ -24,10 +24,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
 
-import kubatech.api.utils.ModUtils;
-import kubatech.loaders.ItemLoader;
-import kubatech.loaders.item.ItemProxy;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -43,6 +39,10 @@ import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.AchievementPage;
 
+import kubatech.api.utils.ModUtils;
+import kubatech.loaders.ItemLoader;
+import kubatech.loaders.item.ItemProxy;
+
 public class TeaCollection extends ItemProxy {
 
     protected static TeaPage teapage;
diff --git a/src/main/java/kubatech/loaders/item/items/TeaIngredient.java b/src/main/java/kubatech/loaders/item/items/TeaIngredient.java
index 82d9b5a5ae..cb4088e925 100644
--- a/src/main/java/kubatech/loaders/item/items/TeaIngredient.java
+++ b/src/main/java/kubatech/loaders/item/items/TeaIngredient.java
@@ -22,12 +22,12 @@ package kubatech.loaders.item.items;
 
 import java.util.List;
 
-import kubatech.loaders.item.ItemProxy;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
+import kubatech.loaders.item.ItemProxy;
+
 public class TeaIngredient extends ItemProxy {
 
     public TeaIngredient(String unlocalizedName) {
diff --git a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java b/src/main/java/kubatech/loaders/item/items/TeaUltimate.java
index 2ae9b21875..db34f9e105 100644
--- a/src/main/java/kubatech/loaders/item/items/TeaUltimate.java
+++ b/src/main/java/kubatech/loaders/item/items/TeaUltimate.java
@@ -27,12 +27,6 @@ import java.math.BigInteger;
 import java.text.NumberFormat;
 import java.util.concurrent.atomic.AtomicReference;
 
-import kubatech.api.enums.ItemList;
-import kubatech.api.tea.TeaNetwork;
-import kubatech.api.utils.ModUtils;
-import kubatech.api.utils.StringUtils;
-import kubatech.loaders.item.IItemProxyGUI;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -43,8 +37,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-import codechicken.nei.NEIClientUtils;
-
 import com.gtnewhorizons.modularui.api.ModularUITextures;
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
 import com.gtnewhorizons.modularui.api.drawable.ItemDrawable;
@@ -54,6 +46,13 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.widget.Widget;
 import com.gtnewhorizons.modularui.common.widget.*;
 
+import codechicken.nei.NEIClientUtils;
+import kubatech.api.enums.ItemList;
+import kubatech.api.tea.TeaNetwork;
+import kubatech.api.utils.ModUtils;
+import kubatech.api.utils.StringUtils;
+import kubatech.loaders.item.IItemProxyGUI;
+
 public class TeaUltimate extends TeaCollection implements IItemProxyGUI {
 
     public TeaUltimate() {
diff --git a/src/main/java/kubatech/mixin/MixinPlugin.java b/src/main/java/kubatech/mixin/MixinPlugin.java
index 5f13983dd1..cdbc0ddf60 100644
--- a/src/main/java/kubatech/mixin/MixinPlugin.java
+++ b/src/main/java/kubatech/mixin/MixinPlugin.java
@@ -14,8 +14,6 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import kubatech.Tags;
-
 import net.minecraft.launchwrapper.Launch;
 
 import org.apache.logging.log4j.LogManager;
@@ -26,6 +24,8 @@ import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
 import com.gtnewhorizon.gtnhmixins.MinecraftURLClassPath;
 
+import kubatech.Tags;
+
 @SuppressWarnings("unused")
 public class MixinPlugin implements IMixinConfigPlugin {
 
diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java
index 0e694d3387..9df946b6aa 100644
--- a/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java
+++ b/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java
@@ -4,9 +4,6 @@ import static kubatech.loaders.MobRecipeLoader.randomEnchantmentDetectedString;
 
 import java.util.Random;
 
-import kubatech.api.utils.FastRandom;
-import kubatech.loaders.MobRecipeLoader;
-
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagInt;
@@ -17,6 +14,9 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import kubatech.api.utils.FastRandom;
+import kubatech.loaders.MobRecipeLoader;
+
 @SuppressWarnings("unused")
 @Mixin(value = EnchantmentHelper.class)
 public class EnchantmentHelperMixin {
diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java
index 8ff7f56a9f..4d8aaf10e6 100644
--- a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java
+++ b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java
@@ -1,7 +1,5 @@
 package kubatech.mixin.mixins.minecraft;
 
-import kubatech.loaders.BlockLoader;
-
 import net.minecraft.block.Block;
 import net.minecraft.world.World;
 
@@ -10,6 +8,8 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import kubatech.loaders.BlockLoader;
+
 @SuppressWarnings("unused")
 @Mixin(value = World.class)
 public class WorldMixin {
diff --git a/src/main/java/kubatech/nei/IMCForNEI.java b/src/main/java/kubatech/nei/IMCForNEI.java
index 1856d58ce8..2ad10225ec 100644
--- a/src/main/java/kubatech/nei/IMCForNEI.java
+++ b/src/main/java/kubatech/nei/IMCForNEI.java
@@ -20,12 +20,11 @@
 
 package kubatech.nei;
 
-import kubatech.Tags;
-import kubatech.api.LoaderReference;
-
 import net.minecraft.nbt.NBTTagCompound;
 
 import cpw.mods.fml.common.event.FMLInterModComms;
+import kubatech.Tags;
+import kubatech.api.LoaderReference;
 
 public class IMCForNEI {
 
diff --git a/src/main/java/kubatech/nei/Mob_Handler.java b/src/main/java/kubatech/nei/Mob_Handler.java
index 47a6aee683..3dd9bb5e7b 100644
--- a/src/main/java/kubatech/nei/Mob_Handler.java
+++ b/src/main/java/kubatech/nei/Mob_Handler.java
@@ -30,18 +30,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Random;
 
-import kubatech.Tags;
-import kubatech.api.LoaderReference;
-import kubatech.api.helpers.InfernalHelper;
-import kubatech.api.mobhandler.MobDrop;
-import kubatech.api.utils.FastRandom;
-import kubatech.api.utils.MobUtils;
-import kubatech.api.utils.ModUtils;
-import kubatech.config.Config;
-import kubatech.kubatech;
-import kubatech.loaders.MobRecipeLoader;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiInventory;
@@ -75,6 +63,17 @@ import cpw.mods.fml.common.event.FMLInterModComms;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.machine.spawner.BlockPoweredSpawner;
 import gregtech.api.util.GT_Utility;
+import kubatech.Tags;
+import kubatech.api.LoaderReference;
+import kubatech.api.helpers.InfernalHelper;
+import kubatech.api.mobhandler.MobDrop;
+import kubatech.api.utils.FastRandom;
+import kubatech.api.utils.MobUtils;
+import kubatech.api.utils.ModUtils;
+import kubatech.config.Config;
+import kubatech.kubatech;
+import kubatech.loaders.MobRecipeLoader;
+import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
 
 public class Mob_Handler extends TemplateRecipeHandler {
 
diff --git a/src/main/java/kubatech/nei/NEI_Config.java b/src/main/java/kubatech/nei/NEI_Config.java
index 19ada5b942..4854053475 100644
--- a/src/main/java/kubatech/nei/NEI_Config.java
+++ b/src/main/java/kubatech/nei/NEI_Config.java
@@ -22,9 +22,9 @@ package kubatech.nei;
 
 import static kubatech.api.enums.ItemList.*;
 
-import kubatech.Tags;
 import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
+import kubatech.Tags;
 
 public class NEI_Config implements IConfigureNEI {
 
diff --git a/src/main/java/kubatech/savedata/PlayerData.java b/src/main/java/kubatech/savedata/PlayerData.java
index 41ac9ccff8..16f296ffe0 100644
--- a/src/main/java/kubatech/savedata/PlayerData.java
+++ b/src/main/java/kubatech/savedata/PlayerData.java
@@ -20,10 +20,10 @@
 
 package kubatech.savedata;
 
-import kubatech.api.tea.TeaNetwork;
-
 import net.minecraft.nbt.NBTTagCompound;
 
+import kubatech.api.tea.TeaNetwork;
+
 public class PlayerData {
 
     public String username = "";
diff --git a/src/main/java/kubatech/savedata/PlayerDataManager.java b/src/main/java/kubatech/savedata/PlayerDataManager.java
index 4a2281cf0c..929990b50b 100644
--- a/src/main/java/kubatech/savedata/PlayerDataManager.java
+++ b/src/main/java/kubatech/savedata/PlayerDataManager.java
@@ -24,8 +24,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
-import kubatech.api.helpers.UUIDFinder;
-
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
@@ -33,6 +31,7 @@ import net.minecraft.world.WorldSavedData;
 import net.minecraftforge.event.world.WorldEvent;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import kubatech.api.helpers.UUIDFinder;
 
 public class PlayerDataManager extends WorldSavedData {
 
diff --git a/src/main/java/kubatech/tileentity/TeaAcceptorTile.java b/src/main/java/kubatech/tileentity/TeaAcceptorTile.java
index 6b5866476b..8ba7401b0d 100644
--- a/src/main/java/kubatech/tileentity/TeaAcceptorTile.java
+++ b/src/main/java/kubatech/tileentity/TeaAcceptorTile.java
@@ -28,12 +28,6 @@ import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiFunction;
 
-import kubatech.api.enums.ItemList;
-import kubatech.api.tea.TeaNetwork;
-import kubatech.api.utils.StringUtils;
-import kubatech.loaders.ItemLoader;
-import kubatech.loaders.block.KubaBlock;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -41,8 +35,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 
-import codechicken.nei.NEIClientUtils;
-
 import com.gtnewhorizons.modularui.api.ModularUITextures;
 import com.gtnewhorizons.modularui.api.drawable.Text;
 import com.gtnewhorizons.modularui.api.math.Color;
@@ -55,6 +47,13 @@ import com.gtnewhorizons.modularui.common.widget.DynamicTextWidget;
 import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
+import codechicken.nei.NEIClientUtils;
+import kubatech.api.enums.ItemList;
+import kubatech.api.tea.TeaNetwork;
+import kubatech.api.utils.StringUtils;
+import kubatech.loaders.ItemLoader;
+import kubatech.loaders.block.KubaBlock;
+
 public class TeaAcceptorTile extends TileEntity
     implements IInventory, ITileWithModularUI, KubaBlock.IModularUIProvider {
 
diff --git a/src/main/java/kubatech/tileentity/TeaStorageTile.java b/src/main/java/kubatech/tileentity/TeaStorageTile.java
index 1c6d4a8194..d442895011 100644
--- a/src/main/java/kubatech/tileentity/TeaStorageTile.java
+++ b/src/main/java/kubatech/tileentity/TeaStorageTile.java
@@ -23,11 +23,11 @@ package kubatech.tileentity;
 import java.math.BigInteger;
 import java.util.UUID;
 
-import kubatech.api.tea.TeaNetwork;
-
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 
+import kubatech.api.tea.TeaNetwork;
+
 public class TeaStorageTile extends TileEntity {
 
     public TeaStorageTile() {
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java
index db3dc4ff44..19ca563a79 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java
@@ -30,17 +30,6 @@ import static kubatech.api.Variables.StructureHologram;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
-import kubatech.Tags;
-import kubatech.api.LoaderReference;
-import kubatech.api.helpers.ReflectionHelper;
-import kubatech.api.implementations.KubaTechGTMultiBlockBase;
-import kubatech.api.network.CustomTileEntityPacket;
-import kubatech.api.tileentity.CustomTileEntityPacketHandler;
-import kubatech.api.utils.FastRandom;
-import kubatech.api.utils.ItemID;
-import kubatech.client.effect.EntityRenderer;
-import kubatech.loaders.MobRecipeLoader;
-
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.enchantment.Enchantment;
@@ -64,17 +53,10 @@ import net.minecraft.world.WorldProviderHell;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.FakePlayer;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
-import WayofTime.alchemicalWizardry.api.event.RitualRunEvent;
-import WayofTime.alchemicalWizardry.api.rituals.Rituals;
-import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
-import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
-import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWellOfSuffering;
-import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
-
 import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
 import com.google.common.collect.Multimap;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
@@ -90,6 +72,13 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.*;
 import com.mojang.authlib.GameProfile;
 
+import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
+import WayofTime.alchemicalWizardry.api.event.RitualRunEvent;
+import WayofTime.alchemicalWizardry.api.rituals.Rituals;
+import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
+import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
+import WayofTime.alchemicalWizardry.common.rituals.RitualEffectWellOfSuffering;
+import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
@@ -107,6 +96,16 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
+import kubatech.Tags;
+import kubatech.api.LoaderReference;
+import kubatech.api.helpers.ReflectionHelper;
+import kubatech.api.implementations.KubaTechGTMultiBlockBase;
+import kubatech.api.network.CustomTileEntityPacket;
+import kubatech.api.tileentity.CustomTileEntityPacketHandler;
+import kubatech.api.utils.FastRandom;
+import kubatech.api.utils.ItemID;
+import kubatech.client.effect.EntityRenderer;
+import kubatech.loaders.MobRecipeLoader;
 
 public class GT_MetaTileEntity_ExtremeExterminationChamber
     extends KubaTechGTMultiBlockBase<GT_MetaTileEntity_ExtremeExterminationChamber>
@@ -286,9 +285,9 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
     }
 
     @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
-        boolean aActive, boolean aRedstone) {
-        if (aSide == aFacing) {
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
+        int colorIndex, boolean aActive, boolean aRedstone) {
+        if (side == facing) {
             if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
                 TextureFactory.builder()
                     .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE)
@@ -363,7 +362,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
     }
 
     @Override
-    public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+    public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (this.mMaxProgresstime > 0) {
             GT_Utility.sendChatToPlayer(aPlayer, "Can't change mode when running !");
             return;
@@ -388,9 +387,9 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
     }
 
     @Override
-    public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
-        float aZ) {
-        if (super.onSolderingToolRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ)) return true;
+    public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
+        float aX, float aY, float aZ) {
+        if (super.onSolderingToolRightClick(side, wrenchingSide, aPlayer, aX, aY, aZ)) return true;
         mAnimationEnabled = !mAnimationEnabled;
         GT_Utility.sendChatToPlayer(aPlayer, "Animations are " + (mAnimationEnabled ? "enabled" : "disabled"));
         return true;
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java
index 5f8cfde43e..de23f01795 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeIndustrialGreenhouse.java
@@ -32,11 +32,6 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
-import kubatech.Tags;
-import kubatech.api.LoaderReference;
-import kubatech.api.implementations.KubaTechGTMultiBlockBase;
-import kubatech.client.effect.CropRenderer;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFlower;
 import net.minecraft.block.BlockStem;
@@ -55,6 +50,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.common.IPlantable;
+import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
@@ -104,6 +100,10 @@ import ic2.api.crops.CropCard;
 import ic2.api.crops.Crops;
 import ic2.core.Ic2Items;
 import ic2.core.crop.TileEntityCrop;
+import kubatech.Tags;
+import kubatech.api.LoaderReference;
+import kubatech.api.implementations.KubaTechGTMultiBlockBase;
+import kubatech.client.effect.CropRenderer;
 
 @SuppressWarnings("unused")
 public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse
@@ -183,7 +183,7 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse
     }
 
     @Override
-    public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+    public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (aPlayer.isSneaking()) {
             if (this.mMaxProgresstime > 0) {
                 GT_Utility.sendChatToPlayer(aPlayer, "You can't change IC2 mode if the machine is working!");
@@ -210,8 +210,8 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse
     }
 
     @Override
-    public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
-        float aZ) {
+    public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
+        float aX, float aY, float aZ) {
         isNoHumidity = !isNoHumidity;
         GT_Utility.sendChatToPlayer(aPlayer, "Give incoming crops no humidity " + isNoHumidity);
         return true;
@@ -988,9 +988,9 @@ public class GT_MetaTileEntity_ExtremeIndustrialGreenhouse
     }
 
     @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
-        boolean aActive, boolean aRedstone) {
-        if (aSide == aFacing) {
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
+        int colorIndex, boolean aActive, boolean aRedstone) {
+        if (side == facing) {
             if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
                 TextureFactory.builder()
                     .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE)
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java
index f68e7ad986..c42250dfdf 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java
@@ -34,11 +34,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import kubatech.Tags;
-import kubatech.api.LoaderReference;
-import kubatech.api.implementations.KubaTechGTMultiBlockBase;
-import kubatech.client.effect.MegaApiaryBeesRenderer;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -48,6 +43,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass;
 import com.gtnewhorizon.structurelib.StructureLibAPI;
@@ -90,6 +86,10 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Utility;
+import kubatech.Tags;
+import kubatech.api.LoaderReference;
+import kubatech.api.implementations.KubaTechGTMultiBlockBase;
+import kubatech.client.effect.MegaApiaryBeesRenderer;
 
 public class GT_MetaTileEntity_MegaIndustrialApiary
     extends KubaTechGTMultiBlockBase<GT_MetaTileEntity_MegaIndustrialApiary> implements ISurvivalConstructable {
@@ -330,7 +330,7 @@ public class GT_MetaTileEntity_MegaIndustrialApiary
     }
 
     @Override
-    public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+    public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (this.mMaxProgresstime > 0) {
             GT_Utility.sendChatToPlayer(aPlayer, "Can't change mode when running !");
             return;
@@ -562,9 +562,9 @@ public class GT_MetaTileEntity_MegaIndustrialApiary
     }
 
     @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
-        boolean aActive, boolean aRedstone) {
-        if (aSide == aFacing) {
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing,
+        int colorIndex, boolean aActive, boolean aRedstone) {
+        if (side == facing) {
             if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(CASING_INDEX),
                 TextureFactory.builder()
                     .addIcon(OVERLAY_FRONT_DISTILLATION_TOWER_ACTIVE)