Merge pull request #11 from GTNewHorizons/cleanup-recipes

Clean up recipes

src/main/java/ab/api/AdvancedBotanyAPI.java

@@ -18,12 +18,12 @@ import ab.common.core.handler.ConfigABHandler;
 
 public class AdvancedBotanyAPI {
 
-    public static List<RecipeAdvancedPlate> advancedPlateRecipes = new ArrayList<RecipeAdvancedPlate>();
-    public static List<RecipeAncientAlphirine> alphirineRecipes = new ArrayList<RecipeAncientAlphirine>();
-    public static List<TerraFarmlandList> farmlandList = new ArrayList<TerraFarmlandList>();
-    public static List<Achievement> achievements = new ArrayList<Achievement>();
-    public static List<ItemStack> relicList = new ArrayList<ItemStack>();
-    public static List<ItemStack> diceList = new ArrayList<ItemStack>();
+    public static List<RecipeAdvancedPlate> advancedPlateRecipes = new ArrayList<>();
+    public static List<RecipeAncientAlphirine> alphirineRecipes = new ArrayList<>();
+    public static List<TerraFarmlandList> farmlandList = new ArrayList<>();
+    public static List<Achievement> achievements = new ArrayList<>();
+    public static List<ItemStack> relicList = new ArrayList<>();
+    public static List<ItemStack> diceList = new ArrayList<>();
 
     public static Item.ToolMaterial mithrilToolMaterial = EnumHelper.addToolMaterial("MITHRIL", 7, -1, 8.0F, 4.0F, 24);
     public static ItemArmor.ArmorMaterial nebulaArmorMaterial = EnumHelper.addArmorMaterial(
@@ -47,6 +47,22 @@ public class AdvancedBotanyAPI {
         return recipe;
     }
 
+    public static RecipeAdvancedPlate registerAdvancedPlateRecipe(ItemStack output, int mana, int color,
+            Object... inputs) {
+        RecipeAdvancedPlate recipe = new RecipeAdvancedPlate(output, mana, color, inputs);
+        advancedPlateRecipes.add(recipe);
+        return recipe;
+    }
+
+    public static RecipeAdvancedPlate registerAdvancedPlateRecipe(String output, int mana, int color,
+            Object... inputs) {
+        RecipeAdvancedPlate recipe = RecipeAdvancedPlate.fromOreDictOutput(output, mana, color, inputs);
+        if (recipe != null) {
+            advancedPlateRecipes.add(recipe);
+        }
+        return recipe;
+    }
+
     public static RecipeAncientAlphirine registerAlphirineRecipe(ItemStack output, ItemStack input, int chance) {
         RecipeAncientAlphirine recipe = new RecipeAncientAlphirine(output, input, chance);
         alphirineRecipes.add(recipe);

src/main/java/ab/api/recipe/RecipeAdvancedPlate.java

@@ -1,33 +1,26 @@
 package ab.api.recipe;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
 
-public class RecipeAdvancedPlate {
+import vazkii.botania.api.recipe.RecipePetals;
 
-    private ItemStack output;
-    private int color;
-    private List<ItemStack> inputs;
-    private int mana;
+public class RecipeAdvancedPlate extends RecipePetals {
 
-    public RecipeAdvancedPlate(ItemStack output, int mana, int color, ItemStack... inputs) {
-        this.output = output;
+    private final int color;
+    private final int mana;
+
+    public static RecipeAdvancedPlate fromOreDictOutput(String output, int mana, int color, Object... inputs) {
+        List<ItemStack> ores = OreDictionary.getOres(output);
+        return !ores.isEmpty() ? new RecipeAdvancedPlate(ores.get(0), mana, color, inputs) : null;
+    }
+
+    public RecipeAdvancedPlate(ItemStack output, int mana, int color, Object... inputs) {
+        super(output, inputs);
         this.mana = mana;
         this.color = color;
-        List<ItemStack> inputsToSet = new ArrayList();
-        for (ItemStack obj : inputs) inputsToSet.add(obj);
-        this.inputs = inputsToSet;
-    }
-
-    public List<ItemStack> getInputs() {
-        return new ArrayList(this.inputs);
-    }
-
-    public ItemStack getOutput() {
-        return this.output;
     }
 
     public int getManaUsage() {
@@ -37,31 +30,4 @@ public class RecipeAdvancedPlate {
     public int getColor() {
         return this.color;
     }
-
-    public boolean matches(IInventory inv) {
-        List<ItemStack> inputsMissing = new ArrayList(this.inputs);
-        for (int i = 1; i < inv.getSizeInventory(); i++) {
-            ItemStack stack = inv.getStackInSlot(i);
-            if (stack == null) break;
-            int stackIndex = -1;
-            for (int j = 0; j < inputsMissing.size(); j++) {
-                ItemStack input = inputsMissing.get(j);
-                if (input instanceof ItemStack && simpleAreStacksEqual(input.copy(), stack)) {
-                    stackIndex = j;
-                    break;
-                }
-            }
-            if (stackIndex != -1) {
-                inputsMissing.remove(stackIndex);
-            } else {
-                return false;
-            }
-        }
-        return inputsMissing.isEmpty();
-    }
-
-    boolean simpleAreStacksEqual(ItemStack input, ItemStack stack) {
-        if (input.getItemDamage() == 32767) input.setItemDamage(stack.getItemDamage());
-        return (input.getItem() == stack.getItem() && input.getItemDamage() == stack.getItemDamage());
-    }
 }

src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java

@@ -10,21 +10,22 @@ import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
+import net.minecraftforge.oredict.OreDictionary;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.api.internal.IGuiLexiconEntry;
-import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.api.lexicon.LexiconRecipeMappings;
-import vazkii.botania.client.core.handler.ClientTickHandler;
-import vazkii.botania.common.core.handler.ConfigHandler;
-import vazkii.botania.common.lexicon.page.PageRecipe;
 import ab.api.AdvancedBotanyAPI;
 import ab.api.recipe.RecipeAdvancedPlate;
 import ab.client.core.ClientHelper;
 import ab.common.lib.register.BlockListAB;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.internal.IGuiLexiconEntry;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.api.lexicon.LexiconRecipeMappings;
+import vazkii.botania.client.core.handler.ClientTickHandler;
+import vazkii.botania.common.core.handler.ConfigHandler;
+import vazkii.botania.common.lexicon.page.PageRecipe;
 
 public class AdvancedPlateCraftPage extends PageRecipe {
 
@@ -68,14 +69,24 @@ public class AdvancedPlateCraftPage extends PageRecipe {
         TextureManager render = (Minecraft.getMinecraft()).renderEngine;
         renderItemAtGridPos(gui, 3, 0, recipe.getOutput(), false);
         renderItemAtGridPos(gui, 2, 1, new ItemStack(BlockListAB.blockABPlate), false);
-        List<ItemStack> inputs = recipe.getInputs();
+        List<Object> inputs = recipe.getInputs();
         int degreePerInput = (int) (360.0F / inputs.size());
         float currentDegree = ConfigHandler.lexiconRotatingItems ? (GuiScreen.isShiftKeyDown() ? this.ticksElapsed
                 : (this.ticksElapsed + ClientTickHandler.partialTicks)) : 0.0F;
-        for (ItemStack obj : inputs) {
-            ItemStack copy = obj.copy();
-            if (copy.getItemDamage() == 32767) copy.setItemDamage(0);
-            renderItemAtAngle(gui, currentDegree, copy);
+        for (Object obj : inputs) {
+            ItemStack copy = null;
+            if (obj instanceof String oreName) {
+                List<ItemStack> ores = OreDictionary.getOres(oreName);
+                if (!ores.isEmpty()) {
+                    copy = ores.get(0).copy();
+                }
+            } else if (obj instanceof ItemStack itemStack) {
+                copy = itemStack.copy();
+            }
+            if (copy != null) {
+                if (copy.getItemDamage() == OreDictionary.WILDCARD_VALUE) copy.setItemDamage(0);
+                renderItemAtAngle(gui, currentDegree, copy);
+            }
             currentDegree += degreePerInput;
         }
         renderManaBar(gui, mx, my);
@@ -116,7 +127,7 @@ public class AdvancedPlateCraftPage extends PageRecipe {
     }
 
     public List<ItemStack> getDisplayedRecipes() {
-        ArrayList<ItemStack> list = new ArrayList<ItemStack>();
+        ArrayList<ItemStack> list = new ArrayList<>();
         list.add(recipe.getOutput());
         return list;
     }

src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java

@@ -14,16 +14,16 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.api.internal.IGuiLexiconEntry;
-import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.api.lexicon.LexiconRecipeMappings;
-import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
-import vazkii.botania.common.lexicon.page.PageRecipe;
 import ab.api.AdvancedBotanyAPI;
 import ab.api.recipe.RecipeAncientAlphirine;
 import ab.client.core.ClientHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.internal.IGuiLexiconEntry;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.api.lexicon.LexiconRecipeMappings;
+import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
+import vazkii.botania.common.lexicon.page.PageRecipe;
 
 public class AlphirineCraftPage extends PageRecipe {
 

src/main/java/ab/client/core/handler/BoundRenderHandler.java

@@ -18,11 +18,11 @@ import net.minecraftforge.client.event.RenderWorldLastEvent;
 
 import org.lwjgl.opengl.GL11;
 
+import ab.api.IBoundRender;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import vazkii.botania.api.wand.ICoordBoundItem;
 import vazkii.botania.api.wand.IWireframeAABBProvider;
 import vazkii.botania.client.core.handler.ClientTickHandler;
-import ab.api.IBoundRender;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class BoundRenderHandler {
 

src/main/java/ab/client/core/handler/ClientHandler.java

@@ -18,13 +18,13 @@ import net.minecraft.util.StatCollector;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
-import vazkii.botania.common.lib.LibObfuscation;
 import ab.api.IRankItem;
 import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.ReflectionHelper;
+import vazkii.botania.client.core.handler.ClientTickHandler;
+import vazkii.botania.common.lib.LibObfuscation;
 
 public class ClientHandler {
 

src/main/java/ab/client/core/handler/HudRenderHandler.java

@@ -8,11 +8,11 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 
-import vazkii.botania.common.item.ItemLexicon;
-import vazkii.botania.common.item.ItemTwigWand;
 import ab.api.IRenderHud;
 import ab.common.item.equipment.ItemBlackHalo;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import vazkii.botania.common.item.ItemLexicon;
+import vazkii.botania.common.item.ItemTwigWand;
 
 public class HudRenderHandler {
 

src/main/java/ab/client/core/handler/PlayerRendererHandler.java

@@ -14,12 +14,12 @@ import net.minecraftforge.client.event.RenderPlayerEvent;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.api.item.IPhantomInkable;
-import vazkii.botania.client.core.handler.ClientTickHandler;
 import ab.client.core.ClientHelper;
 import ab.common.item.equipment.armor.ItemNebulaArmor;
 import ab.common.item.equipment.armor.ItemNebulaHelm;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import vazkii.botania.api.item.IPhantomInkable;
+import vazkii.botania.client.core.handler.ClientTickHandler;
 
 public class PlayerRendererHandler {
 

src/main/java/ab/client/core/proxy/ClientProxy.java

@@ -3,20 +3,47 @@ package ab.client.core.proxy;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
 
-import vazkii.botania.common.Botania;
 import ab.client.core.handler.BoundRenderHandler;
 import ab.client.core.handler.ClientHandler;
 import ab.client.core.handler.HudRenderHandler;
 import ab.client.core.handler.PlayerRendererHandler;
-import ab.client.render.block.*;
-import ab.client.render.entity.*;
+import ab.client.render.block.RenderBlockABSpreader;
+import ab.client.render.block.RenderBlockEngineerHopper;
+import ab.client.render.block.RenderBlockManaCharger;
+import ab.client.render.block.RenderBlockManaContainer;
+import ab.client.render.block.RenderBlockManaCrystalCube;
+import ab.client.render.block.RenderBlockNidavellirForge;
+import ab.client.render.entity.EntityNullRender;
+import ab.client.render.entity.RenderEntityAdvancedSpark;
+import ab.client.render.entity.RenderEntityAlphirinePortal;
 import ab.client.render.item.RenderItemAntigravityCharm;
 import ab.client.render.item.RenderItemSphereNavigation;
-import ab.client.render.tile.*;
-import ab.common.block.tile.*;
+import ab.client.render.tile.RenderTileABSpreader;
+import ab.client.render.tile.RenderTileBoardFate;
+import ab.client.render.tile.RenderTileEngineerHopper;
+import ab.client.render.tile.RenderTileGameBoard;
+import ab.client.render.tile.RenderTileMagicCraftingCrate;
+import ab.client.render.tile.RenderTileManaCharger;
+import ab.client.render.tile.RenderTileManaContainer;
+import ab.client.render.tile.RenderTileManaCrystalCube;
+import ab.client.render.tile.RenderTileNidavellirForge;
+import ab.common.block.tile.TileABSpreader;
+import ab.common.block.tile.TileBoardFate;
+import ab.common.block.tile.TileEngineerHopper;
+import ab.common.block.tile.TileGameBoard;
+import ab.common.block.tile.TileMagicCraftCrate;
+import ab.common.block.tile.TileManaCharger;
+import ab.common.block.tile.TileManaContainer;
+import ab.common.block.tile.TileManaCrystalCube;
+import ab.common.block.tile.TileNidavellirForge;
 import ab.common.core.handler.ConfigABHandler;
 import ab.common.core.proxy.CommonProxy;
-import ab.common.entity.*;
+import ab.common.entity.EntityAdvancedSpark;
+import ab.common.entity.EntityAlphirinePortal;
+import ab.common.entity.EntityManaVine;
+import ab.common.entity.EntityNebulaBlaze;
+import ab.common.entity.EntitySeed;
+import ab.common.entity.EntitySword;
 import ab.common.lib.register.BlockListAB;
 import ab.common.lib.register.ItemListAB;
 import cpw.mods.fml.client.registry.ClientRegistry;
@@ -25,6 +52,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import vazkii.botania.common.Botania;
 
 public class ClientProxy extends CommonProxy {
 

src/main/java/ab/client/gui/ContainerItemChest.java

@@ -6,8 +6,8 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import vazkii.botania.client.gui.SlotLocked;
 import ab.common.item.relic.ItemTalismanHiddenRiches;
+import vazkii.botania.client.gui.SlotLocked;
 
 public class ContainerItemChest extends Container {
 

src/main/java/ab/client/model/ModelManaCharger.java

@@ -7,10 +7,10 @@ import net.minecraft.item.ItemStack;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.LightningHandler;
-import vazkii.botania.common.core.helper.Vector3;
 import ab.client.render.tile.RenderTileManaCharger;
 import ab.common.block.tile.TileManaCharger;
+import vazkii.botania.client.core.handler.LightningHandler;
+import vazkii.botania.common.core.helper.Vector3;
 
 public class ModelManaCharger extends ModelBase {
 

src/main/java/ab/client/nei/RecipeHandlerAdvancedPlate.java

@@ -6,6 +6,7 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
+import net.minecraftforge.oredict.OreDictionary;
 
 import org.lwjgl.opengl.GL11;
 
@@ -22,7 +23,7 @@ public class RecipeHandlerAdvancedPlate extends TemplateRecipeHandler {
 
     public class CachedAdvancedPlateRecipe extends TemplateRecipeHandler.CachedRecipe {
 
-        public List<PositionedStack> inputs = new ArrayList<PositionedStack>();
+        public List<PositionedStack> inputs = new ArrayList<>();
         public PositionedStack output;
         public int manaUsage;
 
@@ -33,13 +34,17 @@ public class RecipeHandlerAdvancedPlate extends TemplateRecipeHandler {
             this.manaUsage = recipe.getManaUsage();
         }
 
-        public void setIngredients(List<ItemStack> inputs) {
+        public void setIngredients(List<Object> inputs) {
             float degreePerInput = 360.0F / inputs.size();
             float currentDegree = -90.0F;
-            for (Object o : inputs) {
+            for (Object obj : inputs) {
                 int posX = (int) Math.round(73.0D + Math.cos(currentDegree * Math.PI / 180.0D) * 32.0D);
                 int posY = (int) Math.round(55.0D + Math.sin(currentDegree * Math.PI / 180.0D) * 32.0D);
-                this.inputs.add(new PositionedStack(o, posX, posY));
+                if (obj instanceof String oreName) {
+                    this.inputs.add(new PositionedStack(OreDictionary.getOres(oreName), posX, posY));
+                } else if (obj instanceof ItemStack itemStack) {
+                    this.inputs.add(new PositionedStack(itemStack, posX, posY));
+                }
                 currentDegree += degreePerInput;
             }
         }
@@ -66,11 +71,8 @@ public class RecipeHandlerAdvancedPlate extends TemplateRecipeHandler {
     }
 
     public void loadTransferRects() {
-        this.transferRects.add(
-                new TemplateRecipeHandler.RecipeTransferRect(
-                        new Rectangle(72, 54, 18, 18),
-                        getRecipeID(),
-                        new Object[0]));
+        this.transferRects
+                .add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(72, 54, 18, 18), getRecipeID()));
     }
 
     public int recipiesPerPage() {

src/main/java/ab/client/nei/RecipeHandlerAlphirine.java

@@ -10,7 +10,6 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
 import ab.api.AdvancedBotanyAPI;
 import ab.api.recipe.RecipeAncientAlphirine;
 import ab.client.core.ClientHelper;
@@ -18,6 +17,7 @@ import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.NEIServerUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.TemplateRecipeHandler;
+import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
 
 public class RecipeHandlerAlphirine extends TemplateRecipeHandler {
 

src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java

@@ -2,10 +2,10 @@ package ab.client.render.entity;
 
 import net.minecraft.util.IIcon;
 
-import vazkii.botania.client.render.entity.RenderSparkBase;
-import vazkii.botania.common.item.ItemSparkUpgrade;
 import ab.common.entity.EntityAdvancedSpark;
 import ab.common.item.ItemAdvancedSpark;
+import vazkii.botania.client.render.entity.RenderSparkBase;
+import vazkii.botania.common.item.ItemSparkUpgrade;
 
 public class RenderEntityAdvancedSpark extends RenderSparkBase<EntityAdvancedSpark> {
 

src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java

@@ -11,9 +11,9 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
 import ab.client.core.ClientHelper;
 import ab.common.block.BlockLebethronWood;
+import vazkii.botania.client.core.handler.ClientTickHandler;
 
 public class RenderEntityAlphirinePortal extends Render {
 

src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java

@@ -10,8 +10,8 @@ import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.common.core.helper.ItemNBTHelper;
 import ab.common.item.ItemAntigravityCharm;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class RenderItemAntigravityCharm implements IItemRenderer {
 

src/main/java/ab/client/render/tile/RenderTileABSpreader.java

@@ -12,12 +12,12 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
+import ab.common.block.tile.TileABSpreader;
 import vazkii.botania.api.mana.ILens;
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.proxy.ClientProxy;
 import vazkii.botania.client.model.ModelSpreader;
 import vazkii.botania.client.render.item.RenderLens;
-import ab.common.block.tile.TileABSpreader;
 
 public class RenderTileABSpreader extends TileEntitySpecialRenderer {
 

src/main/java/ab/client/render/tile/RenderTileBoardFate.java

@@ -10,9 +10,9 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
 import ab.client.model.ModelDiceFate;
 import ab.common.block.tile.TileBoardFate;
+import vazkii.botania.client.core.handler.ClientTickHandler;
 
 public class RenderTileBoardFate extends TileEntitySpecialRenderer {
 

src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java

@@ -9,8 +9,8 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
 import ab.client.model.ModelEngineerHopper;
+import vazkii.botania.client.core.handler.ClientTickHandler;
 
 public class RenderTileEngineerHopper extends TileEntitySpecialRenderer {
 

src/main/java/ab/client/render/tile/RenderTileGameBoard.java

@@ -10,9 +10,9 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
 import ab.client.model.ModelDiceFate;
 import ab.common.block.tile.TileGameBoard;
+import vazkii.botania.client.core.handler.ClientTickHandler;
 
 public class RenderTileGameBoard extends TileEntitySpecialRenderer {
 

src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java

@@ -18,10 +18,10 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
 import ab.common.block.BlockMagicCraftCrate;
 import ab.common.block.tile.TileMagicCraftCrate;
 import ab.common.lib.register.BlockListAB;
+import vazkii.botania.client.core.handler.ClientTickHandler;
 
 public class RenderTileMagicCraftingCrate extends TileEntitySpecialRenderer {
 

src/main/java/ab/client/render/tile/RenderTileManaCharger.java

@@ -19,9 +19,9 @@ import net.minecraftforge.client.ForgeHooksClient;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
 import ab.client.model.ModelManaCharger;
 import ab.common.block.tile.TileManaCharger;
+import vazkii.botania.client.core.handler.ClientTickHandler;
 
 public class RenderTileManaCharger extends TileEntitySpecialRenderer {
 

src/main/java/ab/client/render/tile/RenderTileManaContainer.java

@@ -12,12 +12,12 @@ import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
-import vazkii.botania.client.core.helper.ShaderHelper;
-import vazkii.botania.common.block.mana.BlockPool;
 import ab.client.core.ClientHelper;
 import ab.client.model.ModelManaContainer;
 import ab.common.block.tile.TileManaContainer;
+import vazkii.botania.client.core.handler.ClientTickHandler;
+import vazkii.botania.client.core.helper.ShaderHelper;
+import vazkii.botania.common.block.mana.BlockPool;
 
 public class RenderTileManaContainer extends TileEntitySpecialRenderer {
 

src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java

@@ -16,9 +16,9 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
 import ab.client.model.ModelNidavellirForge;
 import ab.common.block.tile.TileNidavellirForge;
+import vazkii.botania.client.core.handler.ClientTickHandler;
 
 public class RenderTileNidavellirForge extends TileEntitySpecialRenderer {
 

src/main/java/ab/common/block/BlockABSpreader.java

@@ -20,16 +20,16 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
+import ab.AdvancedBotany;
+import ab.common.block.tile.TileABSpreader;
+import ab.common.lib.register.BlockListAB;
+import ab.common.lib.register.RecipeListAB;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.api.wand.IWireframeAABBProvider;
 import vazkii.botania.common.item.ModItems;
-import ab.AdvancedBotany;
-import ab.common.block.tile.TileABSpreader;
-import ab.common.lib.register.BlockListAB;
-import ab.common.lib.register.RecipeListAB;
 
 public class BlockABSpreader extends BlockContainer
         implements IWandable, IWandHUD, IWireframeAABBProvider, ILexiconable {

src/main/java/ab/common/block/BlockAntigravitation.java

@@ -8,9 +8,9 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import vazkii.botania.common.Botania;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.Botania;
 
 public class BlockAntigravitation extends Block {
 

src/main/java/ab/common/block/BlockBoardFate.java

@@ -18,15 +18,15 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.lexicon.ILexiconable;
-import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.common.achievement.IPickupAchievement;
 import ab.AdvancedBotany;
 import ab.common.block.tile.TileBoardFate;
 import ab.common.block.tile.TileGameBoard;
 import ab.common.block.tile.TileInventory;
 import ab.common.lib.register.AchievementRegister;
 import ab.common.lib.register.RecipeListAB;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.common.achievement.IPickupAchievement;
 
 public class BlockBoardFate extends BlockContainer implements IPickupAchievement, ILexiconable {
 

src/main/java/ab/common/block/BlockEngineerHopper.java

@@ -14,16 +14,16 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.lexicon.ILexiconable;
-import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.api.wand.IWandHUD;
-import vazkii.botania.api.wand.IWandable;
-import vazkii.botania.common.block.ModBlocks;
 import ab.AdvancedBotany;
 import ab.common.block.tile.TileEngineerHopper;
 import ab.common.block.tile.TileInventory;
 import ab.common.lib.register.BlockListAB;
 import ab.common.lib.register.RecipeListAB;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.api.wand.IWandHUD;
+import vazkii.botania.api.wand.IWandable;
+import vazkii.botania.common.block.ModBlocks;
 
 public class BlockEngineerHopper extends BlockContainer implements IWandable, IWandHUD, ILexiconable {
 

src/main/java/ab/common/block/BlockFreyrLiana.java

@@ -13,11 +13,11 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import vazkii.botania.api.lexicon.ILexiconable;
-import vazkii.botania.api.lexicon.LexiconEntry;
 import ab.common.core.CommonHelper;
 import ab.common.lib.register.BlockListAB;
 import ab.common.lib.register.RecipeListAB;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
 
 public class BlockFreyrLiana extends BlockBush implements ILexiconable {
 

src/main/java/ab/common/block/BlockLebethronWood.java

@@ -18,14 +18,14 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.internal.VanillaPacketDispatcher;
-import vazkii.botania.api.lexicon.ILexiconable;
-import vazkii.botania.api.lexicon.LexiconEntry;
 import ab.AdvancedBotany;
 import ab.common.block.tile.TileLebethronCore;
 import ab.common.lib.register.RecipeListAB;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.internal.VanillaPacketDispatcher;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
 
 public class BlockLebethronWood extends Block implements ILexiconable, ITileEntityProvider {
 

src/main/java/ab/common/block/BlockLuminousFreyrLiana.java

@@ -8,9 +8,9 @@ import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import vazkii.botania.common.Botania;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.Botania;
 
 public class BlockLuminousFreyrLiana extends BlockFreyrLiana {
 

src/main/java/ab/common/block/BlockMagicCraftCrate.java

@@ -22,6 +22,10 @@ import net.minecraft.world.World;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import ab.AdvancedBotany;
+import ab.common.block.tile.TileMagicCraftCrate;
+import ab.common.item.ItemCraftingPattern;
+import ab.common.lib.register.RecipeListAB;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.client.lib.UtilsFX;
@@ -32,10 +36,6 @@ import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.common.block.BlockModContainer;
-import ab.AdvancedBotany;
-import ab.common.block.tile.TileMagicCraftCrate;
-import ab.common.item.ItemCraftingPattern;
-import ab.common.lib.register.RecipeListAB;
 
 public class BlockMagicCraftCrate extends BlockModContainer implements IWandable, IWandHUD, ILexiconable {
 

src/main/java/ab/common/block/BlockManaCharger.java

@@ -14,17 +14,17 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
+import ab.AdvancedBotany;
+import ab.common.block.tile.TileInventory;
+import ab.common.block.tile.TileManaCharger;
+import ab.common.lib.register.BlockListAB;
+import ab.common.lib.register.RecipeListAB;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.mana.IManaItem;
 import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.common.block.ModBlocks;
-import ab.AdvancedBotany;
-import ab.common.block.tile.TileInventory;
-import ab.common.block.tile.TileManaCharger;
-import ab.common.lib.register.BlockListAB;
-import ab.common.lib.register.RecipeListAB;
 
 public class BlockManaCharger extends BlockContainer implements IWandHUD, IWandable, ILexiconable {
 

src/main/java/ab/common/block/BlockManaContainer.java

@@ -14,15 +14,15 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import ab.AdvancedBotany;
+import ab.common.block.tile.TileManaContainer;
+import ab.common.lib.register.BlockListAB;
+import ab.common.lib.register.RecipeListAB;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
 import vazkii.botania.common.block.ModBlocks;
-import ab.AdvancedBotany;
-import ab.common.block.tile.TileManaContainer;
-import ab.common.lib.register.BlockListAB;
-import ab.common.lib.register.RecipeListAB;
 
 public class BlockManaContainer extends BlockContainer implements IWandHUD, IWandable, ILexiconable {
 

src/main/java/ab/common/block/BlockManaCrystalCube.java

@@ -12,14 +12,14 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.lexicon.ILexiconable;
-import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.common.block.ModBlocks;
-import vazkii.botania.common.item.ItemTwigWand;
 import ab.AdvancedBotany;
 import ab.common.block.tile.TileManaCrystalCube;
 import ab.common.lib.register.BlockListAB;
 import ab.common.lib.register.RecipeListAB;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.item.ItemTwigWand;
 
 public class BlockManaCrystalCube extends BlockContainer implements ILexiconable {
 

src/main/java/ab/common/block/BlockNidavellirForge.java

@@ -15,14 +15,14 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.lexicon.ILexiconable;
-import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.common.block.ModBlocks;
 import ab.AdvancedBotany;
 import ab.common.block.tile.TileInventory;
 import ab.common.block.tile.TileNidavellirForge;
 import ab.common.lib.register.BlockListAB;
 import ab.common.lib.register.RecipeListAB;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.common.block.ModBlocks;
 
 public class BlockNidavellirForge extends BlockContainer implements ILexiconable {
 

src/main/java/ab/common/block/BlockTerraFarmland.java

@@ -19,13 +19,13 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import vazkii.botania.api.lexicon.ILexiconable;
-import vazkii.botania.api.lexicon.LexiconEntry;
 import ab.api.AdvancedBotanyAPI;
 import ab.api.TerraFarmlandList;
 import ab.common.lib.register.RecipeListAB;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.lexicon.ILexiconable;
+import vazkii.botania.api.lexicon.LexiconEntry;
 
 public class BlockTerraFarmland extends Block implements ILexiconable {
 

src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java

@@ -8,14 +8,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.api.subtile.RadiusDescriptor;
-import vazkii.botania.api.subtile.SubTileFunctional;
-import vazkii.botania.common.item.ItemLexicon;
 import ab.api.AdvancedBotanyAPI;
 import ab.api.recipe.RecipeAncientAlphirine;
 import ab.common.entity.EntityAlphirinePortal;
 import ab.common.lib.register.RecipeListAB;
+import vazkii.botania.api.lexicon.LexiconEntry;
+import vazkii.botania.api.subtile.RadiusDescriptor;
+import vazkii.botania.api.subtile.SubTileFunctional;
+import vazkii.botania.common.item.ItemLexicon;
 
 public class SubTileAncientAlphirine extends SubTileFunctional {
 

src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java

@@ -5,12 +5,12 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import ab.common.block.tile.TileGameBoard;
+import ab.common.lib.register.RecipeListAB;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.subtile.RadiusDescriptor;
 import vazkii.botania.api.subtile.SubTileGenerating;
 import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
-import ab.common.block.tile.TileGameBoard;
-import ab.common.lib.register.RecipeListAB;
 
 public class SubTileArdentAzarcissus extends SubTileGenerating {
 

src/main/java/ab/common/block/subtile/SubTileAspecolus.java

@@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
+import ab.common.lib.register.RecipeListAB;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.common.Thaumcraft;
@@ -17,7 +18,6 @@ import thaumcraft.common.lib.network.playerdata.PacketAspectPool;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.subtile.RadiusDescriptor;
 import vazkii.botania.api.subtile.SubTileFunctional;
-import ab.common.lib.register.RecipeListAB;
 
 public class SubTileAspecolus extends SubTileFunctional {
 

src/main/java/ab/common/block/subtile/SubTileDictarius.java

@@ -14,12 +14,12 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import ab.common.core.handler.ConfigABHandler;
+import ab.common.lib.register.RecipeListAB;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.subtile.RadiusDescriptor;
 import vazkii.botania.api.subtile.SubTileGenerating;
 import vazkii.botania.common.block.tile.TileSpecialFlower;
-import ab.common.core.handler.ConfigABHandler;
-import ab.common.lib.register.RecipeListAB;
 
 public class SubTileDictarius extends SubTileGenerating {
 

src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java

@@ -8,13 +8,13 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
+import ab.common.lib.register.RecipeListAB;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.common.entities.EntityAspectOrb;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.subtile.RadiusDescriptor;
 import vazkii.botania.api.subtile.SubTileFunctional;
 import vazkii.botania.common.block.ModBlocks;
-import ab.common.lib.register.RecipeListAB;
 
 public class SubTilePureGladiolus extends SubTileFunctional {
 

src/main/java/ab/common/block/tile/TileABSpreader.java

@@ -11,13 +11,13 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
+import ab.common.core.handler.ConfigABHandler;
 import vazkii.botania.api.mana.BurstProperties;
 import vazkii.botania.api.mana.ILensEffect;
 import vazkii.botania.api.mana.IManaReceiver;
 import vazkii.botania.client.core.handler.HUDHandler;
 import vazkii.botania.common.block.tile.mana.TileSpreader;
 import vazkii.botania.common.entity.EntityManaBurst;
-import ab.common.core.handler.ConfigABHandler;
 
 public class TileABSpreader extends TileSpreader {
 

src/main/java/ab/common/block/tile/TileBoardFate.java

@@ -13,11 +13,11 @@ import net.minecraft.util.ChatStyle;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.Vec3;
 
+import ab.api.AdvancedBotanyAPI;
+import ab.common.core.handler.ConfigABHandler;
 import vazkii.botania.api.internal.VanillaPacketDispatcher;
 import vazkii.botania.api.item.IRelic;
 import vazkii.botania.common.item.relic.ItemRelic;
-import ab.api.AdvancedBotanyAPI;
-import ab.common.core.handler.ConfigABHandler;
 
 public class TileBoardFate extends TileInventory {
 

src/main/java/ab/common/block/tile/TileEngineerHopper.java

@@ -19,9 +19,9 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.common.item.ModItems;
 import ab.api.IBoundRender;
 import ab.client.core.ClientHelper;
+import vazkii.botania.common.item.ModItems;
 
 public class TileEngineerHopper extends TileInventory implements IHopper, IBoundRender {
 

src/main/java/ab/common/block/tile/TileGameBoard.java

@@ -15,9 +15,9 @@ import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.ChatStyle;
 import net.minecraft.util.EnumChatFormatting;
 
+import ab.api.IRenderHud;
 import vazkii.botania.api.internal.VanillaPacketDispatcher;
 import vazkii.botania.common.block.tile.TileMod;
-import ab.api.IRenderHud;
 
 public class TileGameBoard extends TileMod implements IRenderHud {
 

src/main/java/ab/common/block/tile/TileLebethronCore.java

@@ -17,13 +17,13 @@ import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
 
+import ab.api.IRenderHud;
+import ab.common.lib.register.BlockListAB;
 import vazkii.botania.api.internal.VanillaPacketDispatcher;
 import vazkii.botania.api.lexicon.multiblock.Multiblock;
 import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.block.tile.TileMod;
-import ab.api.IRenderHud;
-import ab.common.lib.register.BlockListAB;
 
 public class TileLebethronCore extends TileMod implements IRenderHud {
 

src/main/java/ab/common/block/tile/TileMagicCraftCrate.java

@@ -14,6 +14,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 
+import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.common.items.relics.ItemThaumonomicon;
 import thaumcraft.common.items.wands.ItemWandCasting;
@@ -21,7 +22,6 @@ import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager;
 import thaumcraft.common.tiles.TileMagicWorkbench;
 import vazkii.botania.api.internal.VanillaPacketDispatcher;
 import vazkii.botania.common.item.ModItems;
-import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
 
 public class TileMagicCraftCrate extends TileMagicWorkbench implements ISidedInventory, IInventory {
 

src/main/java/ab/common/block/tile/TileManaCharger.java

@@ -15,15 +15,15 @@ import net.minecraft.util.StatCollector;
 
 import org.lwjgl.opengl.GL11;
 
+import ab.api.IRenderHud;
+import ab.client.core.ClientHelper;
+import ab.common.core.handler.ConfigABHandler;
 import vazkii.botania.api.internal.VanillaPacketDispatcher;
 import vazkii.botania.api.mana.IManaItem;
 import vazkii.botania.api.mana.IManaReceiver;
 import vazkii.botania.api.mana.spark.ISparkAttachable;
 import vazkii.botania.api.wand.IWandBindable;
 import vazkii.botania.common.block.ModBlocks;
-import ab.api.IRenderHud;
-import ab.client.core.ClientHelper;
-import ab.common.core.handler.ConfigABHandler;
 
 public class TileManaCharger extends TileInventory implements ISidedInventory, IRenderHud, IWandBindable {
 

src/main/java/ab/common/block/tile/TileManaContainer.java

@@ -15,13 +15,13 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.StatCollector;
 
+import ab.client.core.ClientHelper;
+import ab.common.core.handler.ConfigABHandler;
 import vazkii.botania.api.mana.IManaPool;
 import vazkii.botania.api.mana.spark.ISparkAttachable;
 import vazkii.botania.api.mana.spark.ISparkEntity;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.block.tile.TileMod;
-import ab.client.core.ClientHelper;
-import ab.common.core.handler.ConfigABHandler;
 
 public class TileManaContainer extends TileMod implements IManaPool, ISparkAttachable {
 

src/main/java/ab/common/block/tile/TileManaCrystalCube.java

@@ -7,12 +7,12 @@ import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
 
+import ab.api.IRenderHud;
+import ab.client.core.ClientHelper;
 import vazkii.botania.api.mana.spark.ISparkAttachable;
 import vazkii.botania.api.mana.spark.ISparkEntity;
 import vazkii.botania.api.mana.spark.SparkHelper;
 import vazkii.botania.common.block.tile.TileMod;
-import ab.api.IRenderHud;
-import ab.client.core.ClientHelper;
 
 public class TileManaCrystalCube extends TileMod implements IRenderHud {
 

src/main/java/ab/common/block/tile/TileNidavellirForge.java

@@ -11,6 +11,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.AxisAlignedBB;
 
+import ab.api.AdvancedBotanyAPI;
+import ab.api.recipe.RecipeAdvancedPlate;
 import vazkii.botania.api.internal.VanillaPacketDispatcher;
 import vazkii.botania.api.mana.IManaPool;
 import vazkii.botania.api.mana.spark.ISparkAttachable;
@@ -18,8 +20,6 @@ import vazkii.botania.api.mana.spark.ISparkEntity;
 import vazkii.botania.api.mana.spark.SparkHelper;
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.common.Botania;
-import ab.api.AdvancedBotanyAPI;
-import ab.api.recipe.RecipeAdvancedPlate;
 
 public class TileNidavellirForge extends TileInventory implements ISparkAttachable, ISidedInventory {
 

src/main/java/ab/common/entity/EntityAdvancedSpark.java

@@ -19,6 +19,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
+import ab.common.lib.register.ItemListAB;
+import baubles.common.lib.PlayerHandler;
 import vazkii.botania.api.mana.IManaItem;
 import vazkii.botania.api.mana.spark.ISparkAttachable;
 import vazkii.botania.api.mana.spark.ISparkEntity;
@@ -26,8 +28,6 @@ import vazkii.botania.api.mana.spark.SparkHelper;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.core.helper.Vector3;
 import vazkii.botania.common.item.ModItems;
-import ab.common.lib.register.ItemListAB;
-import baubles.common.lib.PlayerHandler;
 
 public class EntityAdvancedSpark extends Entity implements ISparkEntity {
 

src/main/java/ab/common/entity/EntityManaVine.java

@@ -17,15 +17,15 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
-import vazkii.botania.common.Botania;
-import vazkii.botania.common.core.handler.ConfigHandler;
-import vazkii.botania.common.lib.LibObfuscation;
 import ab.client.core.ClientHelper;
 import ab.common.core.CommonHelper;
 import ab.common.lib.register.BlockListAB;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.Botania;
+import vazkii.botania.common.core.handler.ConfigHandler;
+import vazkii.botania.common.lib.LibObfuscation;
 
 public class EntityManaVine extends EntityThrowable {
 

src/main/java/ab/common/entity/EntityNebulaBlaze.java

@@ -13,9 +13,9 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
-import vazkii.botania.common.Botania;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.Botania;
 
 public class EntityNebulaBlaze extends EntityThrowable {
 

src/main/java/ab/common/entity/EntitySeed.java

@@ -17,11 +17,11 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.BlockEvent;
 
-import vazkii.botania.common.Botania;
-import vazkii.botania.common.item.ItemGrassSeeds;
 import ab.common.item.equipment.ItemSprawlRod;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.Botania;
+import vazkii.botania.common.item.ItemGrassSeeds;
 
 public class EntitySeed extends EntityThrowable {
 

src/main/java/ab/common/entity/EntitySword.java

@@ -13,9 +13,9 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
-import vazkii.botania.common.Botania;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.Botania;
 
 public class EntitySword extends EntityThrowable {
 

src/main/java/ab/common/item/ItemABResource.java

@@ -16,11 +16,11 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.recipe.IFlowerComponent;
 import ab.AdvancedBotany;
 import ab.api.AdvancedBotanyAPI;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.recipe.IFlowerComponent;
 
 public class ItemABResource extends Item implements IFlowerComponent {
 

src/main/java/ab/common/item/ItemAdvancedSpark.java

@@ -8,13 +8,13 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
+import ab.common.entity.EntityAdvancedSpark;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import vazkii.botania.api.internal.VanillaPacketDispatcher;
 import vazkii.botania.api.mana.IManaGivingItem;
 import vazkii.botania.api.mana.spark.ISparkAttachable;
 import vazkii.botania.api.mana.spark.ISparkEntity;
-import ab.common.entity.EntityAdvancedSpark;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemAdvancedSpark extends ItemMod implements IManaGivingItem {
 

src/main/java/ab/common/item/ItemAntigravityCharm.java

@@ -13,11 +13,11 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import vazkii.botania.common.core.helper.ItemNBTHelper;
 import ab.common.core.CommonHelper;
 import ab.common.lib.register.BlockListAB;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class ItemAntigravityCharm extends ItemMod {
 

src/main/java/ab/common/item/equipment/ItemAquaSword.java

@@ -13,11 +13,11 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.Vec3;
 
-import vazkii.botania.api.mana.ManaItemHandler;
-import vazkii.botania.common.Botania;
 import ab.AdvancedBotany;
 import ab.api.AdvancedBotanyAPI;
 import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler;
+import vazkii.botania.api.mana.ManaItemHandler;
+import vazkii.botania.common.Botania;
 
 public class ItemAquaSword extends ItemSword {
 

src/main/java/ab/common/item/equipment/ItemBauble.java

@@ -14,12 +14,6 @@ import net.minecraft.stats.StatBase;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.item.ICosmeticAttachable;
-import vazkii.botania.api.item.IPhantomInkable;
-import vazkii.botania.client.core.helper.RenderHelper;
-import vazkii.botania.common.achievement.ModAchievements;
-import vazkii.botania.common.core.helper.ItemNBTHelper;
-import vazkii.botania.common.entity.EntityDoppleganger;
 import ab.AdvancedBotany;
 import baubles.api.BaubleType;
 import baubles.api.IBauble;
@@ -27,6 +21,12 @@ import baubles.common.container.InventoryBaubles;
 import baubles.common.lib.PlayerHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.item.ICosmeticAttachable;
+import vazkii.botania.api.item.IPhantomInkable;
+import vazkii.botania.client.core.helper.RenderHelper;
+import vazkii.botania.common.achievement.ModAchievements;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
+import vazkii.botania.common.entity.EntityDoppleganger;
 
 public abstract class ItemBauble extends Item implements IBauble, ICosmeticAttachable, IPhantomInkable {
 

src/main/java/ab/common/item/equipment/ItemBlackHalo.java

@@ -29,15 +29,15 @@ import net.minecraftforge.common.MinecraftForge;
 
 import org.lwjgl.opengl.GL11;
 
+import ab.common.item.ItemMod;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import vazkii.botania.api.item.IBlockProvider;
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.common.core.helper.InventoryHelper;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
 import vazkii.botania.common.item.ItemBlackHoleTalisman;
-import ab.common.item.ItemMod;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemBlackHalo extends ItemMod implements IBlockProvider {
 

src/main/java/ab/common/item/equipment/ItemManaFlower.java

@@ -4,10 +4,10 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-import vazkii.botania.api.mana.IManaGivingItem;
-import vazkii.botania.api.mana.ManaItemHandler;
 import ab.AdvancedBotany;
 import baubles.api.BaubleType;
+import vazkii.botania.api.mana.IManaGivingItem;
+import vazkii.botania.api.mana.ManaItemHandler;
 
 public class ItemManaFlower extends ItemBauble implements IManaGivingItem {
 

src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java

@@ -10,11 +10,11 @@ import net.minecraft.item.ItemTool;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import vazkii.botania.common.core.helper.ItemNBTHelper;
 import ab.AdvancedBotany;
 import ab.api.AdvancedBotanyAPI;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class ItemMithrillMultiTool extends ItemTool {
 

src/main/java/ab/common/item/equipment/ItemMithrillRing.java

@@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import baubles.api.BaubleType;
 import vazkii.botania.api.mana.IManaItem;
 import vazkii.botania.api.mana.IManaTooltipDisplay;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
-import baubles.api.BaubleType;
 
 public class ItemMithrillRing extends ItemBauble implements IManaItem, IManaTooltipDisplay {
 

src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java

@@ -6,11 +6,11 @@ import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.mana.IManaUsingItem;
-import vazkii.botania.api.mana.ManaItemHandler;
 import ab.api.AdvancedBotanyAPI;
 import ab.common.entity.EntityNebulaBlaze;
 import ab.common.item.ItemMod;
+import vazkii.botania.api.mana.IManaUsingItem;
+import vazkii.botania.api.mana.ManaItemHandler;
 
 public class ItemNebulaBlaze extends ItemMod implements IManaUsingItem {
 

src/main/java/ab/common/item/equipment/ItemNebulaRod.java

@@ -23,15 +23,15 @@ import net.minecraft.world.chunk.Chunk;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.EnderTeleportEvent;
 
-import vazkii.botania.api.mana.IManaUsingItem;
-import vazkii.botania.api.mana.ManaItemHandler;
-import vazkii.botania.common.Botania;
-import vazkii.botania.common.core.helper.Vector3;
 import ab.api.AdvancedBotanyAPI;
 import ab.client.core.ClientHelper;
 import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler;
 import ab.common.core.handler.ConfigABHandler;
 import ab.common.item.ItemMod;
+import vazkii.botania.api.mana.IManaUsingItem;
+import vazkii.botania.api.mana.ManaItemHandler;
+import vazkii.botania.common.Botania;
+import vazkii.botania.common.core.helper.Vector3;
 
 public class ItemNebulaRod extends ItemMod implements IManaUsingItem {
 

src/main/java/ab/common/item/equipment/ItemSpaceBlade.java

@@ -29,20 +29,20 @@ import net.minecraft.util.StatCollector;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
+import com.google.common.collect.Multimap;
+
+import ab.AdvancedBotany;
+import ab.api.AdvancedBotanyAPI;
+import ab.api.IRankItem;
+import ab.common.core.handler.ConfigABHandler;
+import ab.common.core.handler.NetworkHandler;
+import ab.common.entity.EntitySword;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
-import ab.AdvancedBotany;
-import ab.api.AdvancedBotanyAPI;
-import ab.api.IRankItem;
-import ab.common.core.handler.*;
-import ab.common.entity.EntitySword;
-
-import com.google.common.collect.Multimap;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemSpaceBlade extends ItemSword implements IRankItem, IManaUsingItem {
 

src/main/java/ab/common/item/equipment/ItemSprawlRod.java

@@ -9,13 +9,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
+import ab.common.core.handler.ConfigABHandler;
+import ab.common.entity.EntitySeed;
+import ab.common.item.ItemMod;
 import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.item.ModItems;
-import ab.common.core.handler.ConfigABHandler;
-import ab.common.entity.EntitySeed;
-import ab.common.item.ItemMod;
 
 public class ItemSprawlRod extends ItemMod implements IManaUsingItem {
 

src/main/java/ab/common/item/equipment/ItemTerraHoe.java

@@ -11,15 +11,15 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.UseHoeEvent;
 
+import ab.AdvancedBotany;
+import ab.common.lib.register.BlockListAB;
+import cpw.mods.fml.common.eventhandler.Event.Result;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.item.ModItems;
-import ab.AdvancedBotany;
-import ab.common.lib.register.BlockListAB;
-import cpw.mods.fml.common.eventhandler.Event.Result;
 
 public class ItemTerraHoe extends ItemHoe implements IManaUsingItem {
 

src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java

@@ -15,17 +15,17 @@ import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ISpecialArmor;
 
-import vazkii.botania.api.mana.IManaItem;
-import vazkii.botania.api.mana.IManaTooltipDisplay;
-import vazkii.botania.api.mana.ManaItemHandler;
-import vazkii.botania.common.core.helper.ItemNBTHelper;
-import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor;
 import ab.AdvancedBotany;
 import ab.api.AdvancedBotanyAPI;
 import ab.client.model.armor.ModelArmorNebula;
 import ab.common.lib.register.ItemListAB;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.mana.IManaItem;
+import vazkii.botania.api.mana.IManaTooltipDisplay;
+import vazkii.botania.api.mana.ManaItemHandler;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
+import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor;
 
 public class ItemNebulaArmor extends ItemManasteelArmor implements IManaItem, IManaTooltipDisplay {
 

src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java

@@ -9,8 +9,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.LivingEvent;
 
-import vazkii.botania.common.Botania;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import vazkii.botania.common.Botania;
 
 public class ItemNebulaBoots extends ItemNebulaArmor {
 

src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java

@@ -13,6 +13,7 @@ import net.minecraftforge.event.entity.living.LivingEvent;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class ItemNebulaChest extends ItemNebulaArmor {

src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java

@@ -14,15 +14,15 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.mana.IManaDiscountArmor;
 import vazkii.botania.api.mana.IManaGivingItem;
 import vazkii.botania.api.mana.IManaItem;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 public class ItemNebulaHelm extends ItemNebulaArmor implements IManaDiscountArmor, IManaGivingItem {
 
     private static final String TAG_COSMIC_FACE = "enableCosmicFace";

src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java

@@ -3,10 +3,10 @@ package ab.common.item.equipment.armor;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 
-import thaumcraft.api.IGoggles;
-import thaumcraft.api.nodes.IRevealer;
 import cpw.mods.fml.common.Optional.Interface;
 import cpw.mods.fml.common.Optional.InterfaceList;
+import thaumcraft.api.IGoggles;
+import thaumcraft.api.nodes.IRevealer;
 
 @InterfaceList({ @Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true),
         @Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true) })

src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java

@@ -9,13 +9,13 @@ import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 
-import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor;
 import ab.AdvancedBotany;
 import ab.api.AdvancedBotanyAPI;
 import ab.client.model.armor.ModelArmorWildHunt;
 import ab.common.lib.register.ItemListAB;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor;
 
 public class ItemWildHuntArmor extends ItemManasteelArmor {
 

src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java

@@ -5,9 +5,9 @@ import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
+import ab.common.entity.EntityManaVine;
 import vazkii.botania.api.mana.IManaUsingItem;
 import vazkii.botania.api.mana.ManaItemHandler;
-import ab.common.entity.EntityManaVine;
 
 public class ItemFreyrSlingshot extends ItemModRelic implements IManaUsingItem {
 

src/main/java/ab/common/item/relic/ItemHornPlenty.java

@@ -11,8 +11,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
 
-import vazkii.botania.api.mana.ManaItemHandler;
-import vazkii.botania.common.core.helper.ItemNBTHelper;
 import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler;
 import ab.common.core.handler.ConfigABHandler;
 import ab.common.core.handler.NetworkHandler;
@@ -20,6 +18,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.mana.ManaItemHandler;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class ItemHornPlenty extends ItemModRelic {
 

src/main/java/ab/common/item/relic/ItemModRelic.java

@@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
 
-import vazkii.botania.common.item.relic.ItemRelic;
 import ab.AdvancedBotany;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.common.item.relic.ItemRelic;
 
 public class ItemModRelic extends ItemRelic {
 

src/main/java/ab/common/item/relic/ItemPocketWardrobe.java

@@ -20,13 +20,13 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
-import vazkii.botania.common.core.helper.ItemNBTHelper;
 import ab.client.core.ClientHelper;
 import ab.common.entity.EntityAnonymousSteve;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.client.core.handler.ClientTickHandler;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class ItemPocketWardrobe extends ItemModRelic {
 

src/main/java/ab/common/item/relic/ItemSphereNavigation.java

@@ -16,14 +16,14 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
-import vazkii.botania.api.mana.ManaItemHandler;
-import vazkii.botania.common.Botania;
-import vazkii.botania.common.core.helper.ItemNBTHelper;
 import ab.client.core.handler.ItemsRemainingRender;
 import ab.common.core.handler.ConfigABHandler;
 import ab.common.core.handler.NetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.api.mana.ManaItemHandler;
+import vazkii.botania.common.Botania;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class ItemSphereNavigation extends ItemModRelic {
 

src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java

@@ -23,13 +23,13 @@ import net.minecraftforge.common.MinecraftForge;
 
 import org.lwjgl.opengl.GL11;
 
-import vazkii.botania.client.core.handler.ClientTickHandler;
-import vazkii.botania.common.core.helper.ItemNBTHelper;
 import ab.AdvancedBotany;
 import ab.client.core.ClientHelper;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import vazkii.botania.client.core.handler.ClientTickHandler;
+import vazkii.botania.common.core.helper.ItemNBTHelper;
 
 public class ItemTalismanHiddenRiches extends ItemModRelic {
 

src/main/java/ab/common/lib/register/BlockListAB.java

@@ -2,7 +2,6 @@ package ab.common.lib.register;
 
 import net.minecraft.block.Block;
 
-import vazkii.botania.common.Botania;
 import ab.common.block.BlockABSpreader;
 import ab.common.block.BlockABStorage;
 import ab.common.block.BlockAntigravitation;
@@ -31,6 +30,7 @@ import ab.common.core.handler.ConfigABHandler;
 import ab.common.item.block.ItemBlockBase;
 import ab.common.item.block.ItemBlockBoard;
 import cpw.mods.fml.common.registry.GameRegistry;
+import vazkii.botania.common.Botania;
 
 public class BlockListAB {
 

src/main/java/ab/common/lib/register/FlowerRegister.java

@@ -1,14 +1,14 @@
 package ab.common.lib.register;
 
-import vazkii.botania.api.BotaniaAPI;
-import vazkii.botania.api.subtile.SubTileEntity;
-import vazkii.botania.common.Botania;
 import ab.common.block.subtile.ABSubTileSignature;
 import ab.common.block.subtile.SubTileAncientAlphirine;
 import ab.common.block.subtile.SubTileArdentAzarcissus;
 import ab.common.block.subtile.SubTileAspecolus;
 import ab.common.block.subtile.SubTileDictarius;
 import ab.common.block.subtile.SubTilePureGladiolus;
+import vazkii.botania.api.BotaniaAPI;
+import vazkii.botania.api.subtile.SubTileEntity;
+import vazkii.botania.common.Botania;
 
 public class FlowerRegister {
 

src/main/java/ab/common/lib/register/ItemListAB.java

@@ -2,10 +2,22 @@ package ab.common.lib.register;
 
 import net.minecraft.item.Item;
 
-import vazkii.botania.common.Botania;
 import ab.common.core.handler.ConfigABHandler;
-import ab.common.item.*;
-import ab.common.item.equipment.*;
+import ab.common.item.ItemABResource;
+import ab.common.item.ItemAdvancedSpark;
+import ab.common.item.ItemAntigravityCharm;
+import ab.common.item.ItemCraftingPattern;
+import ab.common.item.equipment.ItemAquaSword;
+import ab.common.item.equipment.ItemBlackHalo;
+import ab.common.item.equipment.ItemManaFlower;
+import ab.common.item.equipment.ItemMithrillMultiTool;
+import ab.common.item.equipment.ItemMithrillRing;
+import ab.common.item.equipment.ItemNebulaBlaze;
+import ab.common.item.equipment.ItemNebulaRing;
+import ab.common.item.equipment.ItemNebulaRod;
+import ab.common.item.equipment.ItemSpaceBlade;
+import ab.common.item.equipment.ItemSprawlRod;
+import ab.common.item.equipment.ItemTerraHoe;
 import ab.common.item.equipment.armor.ItemNebulaBoots;
 import ab.common.item.equipment.armor.ItemNebulaChest;
 import ab.common.item.equipment.armor.ItemNebulaHelm;
@@ -17,6 +29,7 @@ import ab.common.item.relic.ItemPocketWardrobe;
 import ab.common.item.relic.ItemSphereNavigation;
 import ab.common.item.relic.ItemTalismanHiddenRiches;
 import cpw.mods.fml.common.registry.GameRegistry;
+import vazkii.botania.common.Botania;
 
 public class ItemListAB {
 

src/main/java/ab/common/minetweaker/AdvancedPlateMT.java

@@ -1,16 +1,15 @@
 package ab.common.minetweaker;
 
+import net.minecraft.item.ItemStack;
+
+import ab.api.AdvancedBotanyAPI;
+import ab.api.recipe.RecipeAdvancedPlate;
 import minetweaker.IUndoableAction;
 import minetweaker.MineTweakerAPI;
 import minetweaker.api.item.IItemStack;
 import minetweaker.api.minecraft.MineTweakerMC;
-
-import net.minecraft.item.ItemStack;
-
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
-import ab.api.AdvancedBotanyAPI;
-import ab.api.recipe.RecipeAdvancedPlate;
 
 @ZenClass("mods.advBotany.AdvancedPlate")
 public class AdvancedPlateMT {

src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java

@@ -2,19 +2,18 @@ package ab.common.minetweaker;
 
 import java.util.List;
 
+import net.minecraft.item.ItemStack;
+
+import ab.api.recipe.lexicon.AdvancedPlateCraftPage;
 import minetweaker.IUndoableAction;
 import minetweaker.MineTweakerAPI;
 import minetweaker.api.item.IItemStack;
 import minetweaker.api.minecraft.MineTweakerMC;
-
-import net.minecraft.item.ItemStack;
-
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.lexicon.LexiconPage;
-import ab.api.recipe.lexicon.AdvancedPlateCraftPage;
 
 @ZenClass("mods.advBotany.AdvancedPlatePage")
 public class AdvancedPlatePageMT {

src/main/java/ab/common/minetweaker/AlphirineMT.java

@@ -1,16 +1,15 @@
 package ab.common.minetweaker;
 
+import net.minecraft.item.ItemStack;
+
+import ab.api.AdvancedBotanyAPI;
+import ab.api.recipe.RecipeAncientAlphirine;
 import minetweaker.IUndoableAction;
 import minetweaker.MineTweakerAPI;
 import minetweaker.api.item.IItemStack;
 import minetweaker.api.minecraft.MineTweakerMC;
-
-import net.minecraft.item.ItemStack;
-
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
-import ab.api.AdvancedBotanyAPI;
-import ab.api.recipe.RecipeAncientAlphirine;
 
 @ZenClass("mods.advBotany.AncientAlphirine")
 public class AlphirineMT {

src/main/java/ab/common/minetweaker/AlphirinePageMT.java

@@ -2,19 +2,18 @@ package ab.common.minetweaker;
 
 import java.util.List;
 
+import net.minecraft.item.ItemStack;
+
+import ab.api.recipe.lexicon.AlphirineCraftPage;
 import minetweaker.IUndoableAction;
 import minetweaker.MineTweakerAPI;
 import minetweaker.api.item.IItemStack;
 import minetweaker.api.minecraft.MineTweakerMC;
-
-import net.minecraft.item.ItemStack;
-
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.lexicon.LexiconPage;
-import ab.api.recipe.lexicon.AlphirineCraftPage;
 
 @ZenClass("mods.advBotany.AlphirinePage")
 public class AlphirinePageMT {

src/main/java/ab/utils/OreDict.java

@@ -37,7 +37,7 @@ public class OreDict {
     public static final ItemStack preference(String... oredictKeys) {
         for (String key : oredictKeys) {
             List<ItemStack> ores = OreDictionary.getOres(key);
-            if (ores != null && ores.size() > 0) return ores.get(0);
+            if (ores != null && !ores.isEmpty()) return ores.get(0);
         }
         throw new IllegalArgumentException("Can't find any oreDictionary entry among " + Arrays.toString(oredictKeys));
     }