From 6076374d9635c6ad582ae4dc637953ded6affa5b Mon Sep 17 00:00:00 2001 From: Alexander Anishin Date: Sat, 16 Mar 2024 11:05:29 +0300 Subject: [PATCH] Applied spotless --- .../lexicon/AdvancedPlateCraftPage.java | 12 +++++----- .../recipe/lexicon/AlphirineCraftPage.java | 10 ++++---- .../core/handler/BoundRenderHandler.java | 4 ++-- .../ab/client/core/handler/ClientHandler.java | 4 ++-- .../client/core/handler/HudRenderHandler.java | 4 ++-- .../core/handler/PlayerRendererHandler.java | 4 ++-- .../ab/client/core/proxy/ClientProxy.java | 2 +- .../ab/client/gui/ContainerItemChest.java | 2 +- .../ab/client/model/ModelManaCharger.java | 4 ++-- .../ab/client/nei/RecipeHandlerAlphirine.java | 2 +- .../entity/RenderEntityAdvancedSpark.java | 4 ++-- .../entity/RenderEntityAlphirinePortal.java | 2 +- .../item/RenderItemAntigravityCharm.java | 2 +- .../render/tile/RenderTileABSpreader.java | 2 +- .../render/tile/RenderTileBoardFate.java | 2 +- .../render/tile/RenderTileEngineerHopper.java | 2 +- .../render/tile/RenderTileGameBoard.java | 2 +- .../tile/RenderTileMagicCraftingCrate.java | 2 +- .../render/tile/RenderTileManaCharger.java | 2 +- .../render/tile/RenderTileManaContainer.java | 6 ++--- .../tile/RenderTileNidavellirForge.java | 2 +- .../java/ab/common/block/BlockABSpreader.java | 8 +++---- .../ab/common/block/BlockAntigravitation.java | 2 +- .../java/ab/common/block/BlockBoardFate.java | 6 ++--- .../ab/common/block/BlockEngineerHopper.java | 10 ++++---- .../java/ab/common/block/BlockFreyrLiana.java | 4 ++-- .../ab/common/block/BlockLebethronWood.java | 6 ++--- .../common/block/BlockLuminousFreyrLiana.java | 2 +- .../ab/common/block/BlockMagicCraftCrate.java | 8 +++---- .../ab/common/block/BlockManaCharger.java | 10 ++++---- .../ab/common/block/BlockManaContainer.java | 8 +++---- .../ab/common/block/BlockManaCrystalCube.java | 8 +++---- .../ab/common/block/BlockNidavellirForge.java | 6 ++--- .../ab/common/block/BlockTerraFarmland.java | 4 ++-- .../subtile/SubTileAncientAlphirine.java | 8 +++---- .../subtile/SubTileArdentAzarcissus.java | 4 ++-- .../block/subtile/SubTileAspecolus.java | 2 +- .../block/subtile/SubTileDictarius.java | 4 ++-- .../block/subtile/SubTilePureGladiolus.java | 2 +- .../ab/common/block/tile/TileABSpreader.java | 2 +- .../ab/common/block/tile/TileBoardFate.java | 4 ++-- .../common/block/tile/TileEngineerHopper.java | 2 +- .../ab/common/block/tile/TileGameBoard.java | 2 +- .../common/block/tile/TileLebethronCore.java | 4 ++-- .../block/tile/TileMagicCraftCrate.java | 2 +- .../ab/common/block/tile/TileManaCharger.java | 6 ++--- .../common/block/tile/TileManaContainer.java | 4 ++-- .../block/tile/TileManaCrystalCube.java | 4 ++-- .../block/tile/TileNidavellirForge.java | 4 ++-- .../ab/common/entity/EntityAdvancedSpark.java | 4 ++-- .../java/ab/common/entity/EntityManaVine.java | 6 ++--- .../ab/common/entity/EntityNebulaBlaze.java | 2 +- .../java/ab/common/entity/EntitySeed.java | 4 ++-- .../java/ab/common/entity/EntitySword.java | 2 +- .../java/ab/common/item/ItemABResource.java | 2 +- .../ab/common/item/ItemAdvancedSpark.java | 6 ++--- .../ab/common/item/ItemAntigravityCharm.java | 2 +- .../common/item/equipment/ItemAquaSword.java | 4 ++-- .../ab/common/item/equipment/ItemBauble.java | 12 +++++----- .../common/item/equipment/ItemBlackHalo.java | 8 +++---- .../common/item/equipment/ItemManaFlower.java | 4 ++-- .../item/equipment/ItemMithrillMultiTool.java | 2 +- .../item/equipment/ItemMithrillRing.java | 2 +- .../item/equipment/ItemNebulaBlaze.java | 4 ++-- .../common/item/equipment/ItemNebulaRod.java | 8 +++---- .../common/item/equipment/ItemSpaceBlade.java | 13 +++++----- .../common/item/equipment/ItemSprawlRod.java | 6 ++--- .../common/item/equipment/ItemTerraHoe.java | 6 ++--- .../item/equipment/armor/ItemNebulaArmor.java | 10 ++++---- .../item/equipment/armor/ItemNebulaBoots.java | 2 +- .../item/equipment/armor/ItemNebulaChest.java | 1 + .../item/equipment/armor/ItemNebulaHelm.java | 6 ++--- .../armor/ItemNebulaHelmRevealing.java | 4 ++-- .../equipment/armor/ItemWildHuntArmor.java | 2 +- .../common/item/relic/ItemFreyrSlingshot.java | 2 +- .../ab/common/item/relic/ItemHornPlenty.java | 4 ++-- .../ab/common/item/relic/ItemModRelic.java | 2 +- .../common/item/relic/ItemPocketWardrobe.java | 4 ++-- .../item/relic/ItemSphereNavigation.java | 6 ++--- .../item/relic/ItemTalismanHiddenRiches.java | 4 ++-- .../ab/common/lib/register/BlockListAB.java | 2 +- .../common/lib/register/FlowerRegister.java | 6 ++--- .../ab/common/lib/register/ItemListAB.java | 2 +- .../ab/common/lib/register/RecipeListAB.java | 24 +++++++++---------- .../common/minetweaker/AdvancedPlateMT.java | 9 ++++--- .../minetweaker/AdvancedPlatePageMT.java | 7 +++--- .../ab/common/minetweaker/AlphirineMT.java | 9 ++++--- .../common/minetweaker/AlphirinePageMT.java | 7 +++--- 88 files changed, 209 insertions(+), 213 deletions(-) diff --git a/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java b/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java index 3fc7db7..2d19d7c 100644 --- a/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java +++ b/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java @@ -13,18 +13,18 @@ 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.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 { diff --git a/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java b/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java index dffa016..4507b45 100644 --- a/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java +++ b/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 { diff --git a/src/main/java/ab/client/core/handler/BoundRenderHandler.java b/src/main/java/ab/client/core/handler/BoundRenderHandler.java index 5ec87a9..3a642a7 100644 --- a/src/main/java/ab/client/core/handler/BoundRenderHandler.java +++ b/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 { diff --git a/src/main/java/ab/client/core/handler/ClientHandler.java b/src/main/java/ab/client/core/handler/ClientHandler.java index 8eb306a..93495f9 100644 --- a/src/main/java/ab/client/core/handler/ClientHandler.java +++ b/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 { diff --git a/src/main/java/ab/client/core/handler/HudRenderHandler.java b/src/main/java/ab/client/core/handler/HudRenderHandler.java index e0d76a7..59ae268 100644 --- a/src/main/java/ab/client/core/handler/HudRenderHandler.java +++ b/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 { diff --git a/src/main/java/ab/client/core/handler/PlayerRendererHandler.java b/src/main/java/ab/client/core/handler/PlayerRendererHandler.java index 832d679..5626636 100644 --- a/src/main/java/ab/client/core/handler/PlayerRendererHandler.java +++ b/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 { diff --git a/src/main/java/ab/client/core/proxy/ClientProxy.java b/src/main/java/ab/client/core/proxy/ClientProxy.java index 54ec5c6..5100710 100644 --- a/src/main/java/ab/client/core/proxy/ClientProxy.java +++ b/src/main/java/ab/client/core/proxy/ClientProxy.java @@ -3,7 +3,6 @@ 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; @@ -25,6 +24,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 { diff --git a/src/main/java/ab/client/gui/ContainerItemChest.java b/src/main/java/ab/client/gui/ContainerItemChest.java index 1dd827b..72e8bd7 100644 --- a/src/main/java/ab/client/gui/ContainerItemChest.java +++ b/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 { diff --git a/src/main/java/ab/client/model/ModelManaCharger.java b/src/main/java/ab/client/model/ModelManaCharger.java index 0865afa..b0f3677 100644 --- a/src/main/java/ab/client/model/ModelManaCharger.java +++ b/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 { diff --git a/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java b/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java index f0c24cf..cec4a58 100644 --- a/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java +++ b/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 { diff --git a/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java b/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java index 158bb55..f1e67ac 100644 --- a/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java +++ b/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 { diff --git a/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java b/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java index 2a81fd9..762ca20 100644 --- a/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java +++ b/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 { diff --git a/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java b/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java index e22ff67..75805b9 100644 --- a/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java +++ b/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 { diff --git a/src/main/java/ab/client/render/tile/RenderTileABSpreader.java b/src/main/java/ab/client/render/tile/RenderTileABSpreader.java index ec35ba6..e1fef66 100644 --- a/src/main/java/ab/client/render/tile/RenderTileABSpreader.java +++ b/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 { diff --git a/src/main/java/ab/client/render/tile/RenderTileBoardFate.java b/src/main/java/ab/client/render/tile/RenderTileBoardFate.java index 4d2f2f4..427e288 100644 --- a/src/main/java/ab/client/render/tile/RenderTileBoardFate.java +++ b/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 { diff --git a/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java b/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java index d8202ec..da909b5 100644 --- a/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java +++ b/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 { diff --git a/src/main/java/ab/client/render/tile/RenderTileGameBoard.java b/src/main/java/ab/client/render/tile/RenderTileGameBoard.java index 22b2a35..322be7e 100644 --- a/src/main/java/ab/client/render/tile/RenderTileGameBoard.java +++ b/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 { diff --git a/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java b/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java index 4c8636a..f35b6fa 100644 --- a/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java +++ b/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 { diff --git a/src/main/java/ab/client/render/tile/RenderTileManaCharger.java b/src/main/java/ab/client/render/tile/RenderTileManaCharger.java index c7d08bc..82bcb74 100644 --- a/src/main/java/ab/client/render/tile/RenderTileManaCharger.java +++ b/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 { diff --git a/src/main/java/ab/client/render/tile/RenderTileManaContainer.java b/src/main/java/ab/client/render/tile/RenderTileManaContainer.java index 34d0803..2cb21b5 100644 --- a/src/main/java/ab/client/render/tile/RenderTileManaContainer.java +++ b/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 { diff --git a/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java b/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java index df8aef3..04109f8 100644 --- a/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockABSpreader.java b/src/main/java/ab/common/block/BlockABSpreader.java index 864c21a..fb8d4fa 100644 --- a/src/main/java/ab/common/block/BlockABSpreader.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockAntigravitation.java b/src/main/java/ab/common/block/BlockAntigravitation.java index 3b6650f..86eb208 100644 --- a/src/main/java/ab/common/block/BlockAntigravitation.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockBoardFate.java b/src/main/java/ab/common/block/BlockBoardFate.java index f3f1645..11ba786 100644 --- a/src/main/java/ab/common/block/BlockBoardFate.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockEngineerHopper.java b/src/main/java/ab/common/block/BlockEngineerHopper.java index c943e93..71999da 100644 --- a/src/main/java/ab/common/block/BlockEngineerHopper.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockFreyrLiana.java b/src/main/java/ab/common/block/BlockFreyrLiana.java index e349907..0345109 100644 --- a/src/main/java/ab/common/block/BlockFreyrLiana.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockLebethronWood.java b/src/main/java/ab/common/block/BlockLebethronWood.java index 1566eb3..9aa0bea 100644 --- a/src/main/java/ab/common/block/BlockLebethronWood.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java b/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java index 4f27cec..105ac8c 100644 --- a/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockMagicCraftCrate.java b/src/main/java/ab/common/block/BlockMagicCraftCrate.java index 1ceee93..87a2ec1 100644 --- a/src/main/java/ab/common/block/BlockMagicCraftCrate.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockManaCharger.java b/src/main/java/ab/common/block/BlockManaCharger.java index c999739..b538e2d 100644 --- a/src/main/java/ab/common/block/BlockManaCharger.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockManaContainer.java b/src/main/java/ab/common/block/BlockManaContainer.java index 248b2bd..d6ac0dd 100644 --- a/src/main/java/ab/common/block/BlockManaContainer.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockManaCrystalCube.java b/src/main/java/ab/common/block/BlockManaCrystalCube.java index 0956fad..a3956a9 100644 --- a/src/main/java/ab/common/block/BlockManaCrystalCube.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockNidavellirForge.java b/src/main/java/ab/common/block/BlockNidavellirForge.java index 34e06f3..1f936ed 100644 --- a/src/main/java/ab/common/block/BlockNidavellirForge.java +++ b/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 { diff --git a/src/main/java/ab/common/block/BlockTerraFarmland.java b/src/main/java/ab/common/block/BlockTerraFarmland.java index ffe1e25..425f813 100644 --- a/src/main/java/ab/common/block/BlockTerraFarmland.java +++ b/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 { diff --git a/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java b/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java index 46f50e9..5189895 100644 --- a/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java +++ b/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 { diff --git a/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java b/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java index d28b895..acb6da6 100644 --- a/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java +++ b/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 { diff --git a/src/main/java/ab/common/block/subtile/SubTileAspecolus.java b/src/main/java/ab/common/block/subtile/SubTileAspecolus.java index 4762c60..ea80401 100644 --- a/src/main/java/ab/common/block/subtile/SubTileAspecolus.java +++ b/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 { diff --git a/src/main/java/ab/common/block/subtile/SubTileDictarius.java b/src/main/java/ab/common/block/subtile/SubTileDictarius.java index 604c048..15e2e47 100644 --- a/src/main/java/ab/common/block/subtile/SubTileDictarius.java +++ b/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 { diff --git a/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java b/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java index 43691bd..5cf67c8 100644 --- a/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileABSpreader.java b/src/main/java/ab/common/block/tile/TileABSpreader.java index b98d16e..d7d8719 100644 --- a/src/main/java/ab/common/block/tile/TileABSpreader.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileBoardFate.java b/src/main/java/ab/common/block/tile/TileBoardFate.java index 09d7439..095319d 100644 --- a/src/main/java/ab/common/block/tile/TileBoardFate.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileEngineerHopper.java b/src/main/java/ab/common/block/tile/TileEngineerHopper.java index 8079b6b..8af767e 100644 --- a/src/main/java/ab/common/block/tile/TileEngineerHopper.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileGameBoard.java b/src/main/java/ab/common/block/tile/TileGameBoard.java index 65976c5..1218ac2 100644 --- a/src/main/java/ab/common/block/tile/TileGameBoard.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileLebethronCore.java b/src/main/java/ab/common/block/tile/TileLebethronCore.java index c91e37a..d3a7484 100644 --- a/src/main/java/ab/common/block/tile/TileLebethronCore.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java b/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java index 2b5fc48..1cbdc3e 100644 --- a/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileManaCharger.java b/src/main/java/ab/common/block/tile/TileManaCharger.java index 2399485..172fd27 100644 --- a/src/main/java/ab/common/block/tile/TileManaCharger.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileManaContainer.java b/src/main/java/ab/common/block/tile/TileManaContainer.java index 2e056df..782f858 100644 --- a/src/main/java/ab/common/block/tile/TileManaContainer.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileManaCrystalCube.java b/src/main/java/ab/common/block/tile/TileManaCrystalCube.java index 5330950..55ce67d 100644 --- a/src/main/java/ab/common/block/tile/TileManaCrystalCube.java +++ b/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 { diff --git a/src/main/java/ab/common/block/tile/TileNidavellirForge.java b/src/main/java/ab/common/block/tile/TileNidavellirForge.java index 41ae6e5..8321b69 100644 --- a/src/main/java/ab/common/block/tile/TileNidavellirForge.java +++ b/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 { diff --git a/src/main/java/ab/common/entity/EntityAdvancedSpark.java b/src/main/java/ab/common/entity/EntityAdvancedSpark.java index 243151d..2bb9e2e 100644 --- a/src/main/java/ab/common/entity/EntityAdvancedSpark.java +++ b/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 { diff --git a/src/main/java/ab/common/entity/EntityManaVine.java b/src/main/java/ab/common/entity/EntityManaVine.java index 9eddd74..713f7c3 100644 --- a/src/main/java/ab/common/entity/EntityManaVine.java +++ b/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 { diff --git a/src/main/java/ab/common/entity/EntityNebulaBlaze.java b/src/main/java/ab/common/entity/EntityNebulaBlaze.java index ae3bb6b..74f1180 100644 --- a/src/main/java/ab/common/entity/EntityNebulaBlaze.java +++ b/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 { diff --git a/src/main/java/ab/common/entity/EntitySeed.java b/src/main/java/ab/common/entity/EntitySeed.java index 834b099..0317315 100644 --- a/src/main/java/ab/common/entity/EntitySeed.java +++ b/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 { diff --git a/src/main/java/ab/common/entity/EntitySword.java b/src/main/java/ab/common/entity/EntitySword.java index 92decd5..ebeff81 100644 --- a/src/main/java/ab/common/entity/EntitySword.java +++ b/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 { diff --git a/src/main/java/ab/common/item/ItemABResource.java b/src/main/java/ab/common/item/ItemABResource.java index c7d7502..c6d084e 100644 --- a/src/main/java/ab/common/item/ItemABResource.java +++ b/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 { diff --git a/src/main/java/ab/common/item/ItemAdvancedSpark.java b/src/main/java/ab/common/item/ItemAdvancedSpark.java index 2f25c82..2c95a29 100644 --- a/src/main/java/ab/common/item/ItemAdvancedSpark.java +++ b/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 { diff --git a/src/main/java/ab/common/item/ItemAntigravityCharm.java b/src/main/java/ab/common/item/ItemAntigravityCharm.java index 069d029..6e6efe4 100644 --- a/src/main/java/ab/common/item/ItemAntigravityCharm.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemAquaSword.java b/src/main/java/ab/common/item/equipment/ItemAquaSword.java index 5241b85..4501167 100644 --- a/src/main/java/ab/common/item/equipment/ItemAquaSword.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemBauble.java b/src/main/java/ab/common/item/equipment/ItemBauble.java index 2d32fe2..76c33cb 100644 --- a/src/main/java/ab/common/item/equipment/ItemBauble.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemBlackHalo.java b/src/main/java/ab/common/item/equipment/ItemBlackHalo.java index cf09980..3c2bfb2 100644 --- a/src/main/java/ab/common/item/equipment/ItemBlackHalo.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemManaFlower.java b/src/main/java/ab/common/item/equipment/ItemManaFlower.java index e08e309..be9185a 100644 --- a/src/main/java/ab/common/item/equipment/ItemManaFlower.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java b/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java index ae8fb65..7875ad2 100644 --- a/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemMithrillRing.java b/src/main/java/ab/common/item/equipment/ItemMithrillRing.java index 55d8f65..297c91c 100644 --- a/src/main/java/ab/common/item/equipment/ItemMithrillRing.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java b/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java index 9937192..2b5b3cb 100644 --- a/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemNebulaRod.java b/src/main/java/ab/common/item/equipment/ItemNebulaRod.java index 2d092da..e536b7a 100644 --- a/src/main/java/ab/common/item/equipment/ItemNebulaRod.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java b/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java index 3205d58..9a23c06 100644 --- a/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java +++ b/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java @@ -29,20 +29,19 @@ import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; -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 com.google.common.collect.Multimap; + 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; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemSpaceBlade extends ItemSword implements IRankItem, IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemSprawlRod.java b/src/main/java/ab/common/item/equipment/ItemSprawlRod.java index 9eb8437..dbb37d4 100644 --- a/src/main/java/ab/common/item/equipment/ItemSprawlRod.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/ItemTerraHoe.java b/src/main/java/ab/common/item/equipment/ItemTerraHoe.java index 69f5a16..7865701 100644 --- a/src/main/java/ab/common/item/equipment/ItemTerraHoe.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java index b9708fe..8d87ad3 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java index 9124bbe..d46d9e0 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java index 7108c53..70ba8c6 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java +++ b/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 { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java index 663c978..cc63d08 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java +++ b/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"; diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java index 2f50f26..e6ca5f0 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java +++ b/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) }) diff --git a/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java b/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java index da0aef9..f16222a 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java +++ b/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 { diff --git a/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java b/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java index 7451e1b..b02156f 100644 --- a/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java +++ b/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 { diff --git a/src/main/java/ab/common/item/relic/ItemHornPlenty.java b/src/main/java/ab/common/item/relic/ItemHornPlenty.java index 554d572..60de8ce 100644 --- a/src/main/java/ab/common/item/relic/ItemHornPlenty.java +++ b/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 { diff --git a/src/main/java/ab/common/item/relic/ItemModRelic.java b/src/main/java/ab/common/item/relic/ItemModRelic.java index 8df26ce..b73b56b 100644 --- a/src/main/java/ab/common/item/relic/ItemModRelic.java +++ b/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 { diff --git a/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java b/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java index 866d6a4..bd04aa9 100644 --- a/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java +++ b/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 { diff --git a/src/main/java/ab/common/item/relic/ItemSphereNavigation.java b/src/main/java/ab/common/item/relic/ItemSphereNavigation.java index fdd3eb7..44a0437 100644 --- a/src/main/java/ab/common/item/relic/ItemSphereNavigation.java +++ b/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 { diff --git a/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java b/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java index 7f81f59..6022ceb 100644 --- a/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java +++ b/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 { diff --git a/src/main/java/ab/common/lib/register/BlockListAB.java b/src/main/java/ab/common/lib/register/BlockListAB.java index 4d183d4..fd45802 100644 --- a/src/main/java/ab/common/lib/register/BlockListAB.java +++ b/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 { diff --git a/src/main/java/ab/common/lib/register/FlowerRegister.java b/src/main/java/ab/common/lib/register/FlowerRegister.java index a9ce751..11c9b32 100644 --- a/src/main/java/ab/common/lib/register/FlowerRegister.java +++ b/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 { diff --git a/src/main/java/ab/common/lib/register/ItemListAB.java b/src/main/java/ab/common/lib/register/ItemListAB.java index d5b01e5..0fc0509 100644 --- a/src/main/java/ab/common/lib/register/ItemListAB.java +++ b/src/main/java/ab/common/lib/register/ItemListAB.java @@ -2,7 +2,6 @@ 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.*; @@ -17,6 +16,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 { diff --git a/src/main/java/ab/common/lib/register/RecipeListAB.java b/src/main/java/ab/common/lib/register/RecipeListAB.java index 24d3e7f..585f1cf 100644 --- a/src/main/java/ab/common/lib/register/RecipeListAB.java +++ b/src/main/java/ab/common/lib/register/RecipeListAB.java @@ -15,6 +15,18 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAdvancedPlate; +import ab.api.recipe.RecipeAncientAlphirine; +import ab.api.recipe.lexicon.AdvancedPlateCraftPage; +import ab.api.recipe.lexicon.AlphirineCraftPage; +import ab.common.block.tile.TileLebethronCore; +import ab.common.core.handler.ConfigABHandler; +import ab.common.item.ItemCraftingPattern; +import ab.utils.IModHelper; +import ab.utils.LocalizationManager; +import ab.utils.OreDict; +import cpw.mods.fml.common.registry.GameRegistry; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -41,18 +53,6 @@ import vazkii.botania.common.lexicon.RLexiconEntry; import vazkii.botania.common.lexicon.page.PageImage; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibOreDict; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAdvancedPlate; -import ab.api.recipe.RecipeAncientAlphirine; -import ab.api.recipe.lexicon.AdvancedPlateCraftPage; -import ab.api.recipe.lexicon.AlphirineCraftPage; -import ab.common.block.tile.TileLebethronCore; -import ab.common.core.handler.ConfigABHandler; -import ab.common.item.ItemCraftingPattern; -import ab.utils.IModHelper; -import ab.utils.LocalizationManager; -import ab.utils.OreDict; -import cpw.mods.fml.common.registry.GameRegistry; public class RecipeListAB implements IModHelper { diff --git a/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java b/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java index 32ba90e..d9581f3 100644 --- a/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java +++ b/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 { diff --git a/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java b/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java index 4af8657..cc7100c 100644 --- a/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java +++ b/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 { diff --git a/src/main/java/ab/common/minetweaker/AlphirineMT.java b/src/main/java/ab/common/minetweaker/AlphirineMT.java index d8fc6cc..f19ec57 100644 --- a/src/main/java/ab/common/minetweaker/AlphirineMT.java +++ b/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 { diff --git a/src/main/java/ab/common/minetweaker/AlphirinePageMT.java b/src/main/java/ab/common/minetweaker/AlphirinePageMT.java index a666468..0b9c33e 100644 --- a/src/main/java/ab/common/minetweaker/AlphirinePageMT.java +++ b/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 {