From ef6d40a5b376e092bb0de57cd59f4691ff9c91e6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 20 Apr 2014 19:38:34 +0100 Subject: [PATCH] Revert "Porting to IDEA, part 1." This reverts commit b0f193c38d42913744057c2772b650ec2c88ac04. --- MODSRC/vazkii/botania/api/BotaniaAPI.java | 13 ++++--- MODSRC/vazkii/botania/api/ITileBound.java | 2 +- .../api/internal/DummyManaNetwork.java | 6 +-- .../api/internal/DummyMethodHandler.java | 4 +- .../botania/api/internal/DummyPage.java | 2 +- .../api/internal/IInternalMethodHandler.java | 8 ++-- .../botania/api/internal/IManaNetwork.java | 4 +- .../botania/api/lexicon/LexiconEntry.java | 4 +- .../botania/api/lexicon/LexiconPage.java | 2 +- .../api/lexicon/LexiconRecipeMappings.java | 4 +- MODSRC/vazkii/botania/api/mana/ILens.java | 4 +- .../botania/api/mana/ManaNetworkEvent.java | 2 +- .../botania/api/recipe/RecipePetals.java | 6 +-- .../botania/api/subtile/SubTileEntity.java | 4 +- .../api/subtile/SubTileFunctional.java | 4 +- .../api/subtile/SubTileGenerating.java | 4 +- .../core/handler/BoundTileRenderer.java | 8 ++-- .../client/core/handler/CapeHandler.java | 17 +++++---- .../core/handler/ClientTickHandler.java | 16 ++++---- .../client/core/handler/HUDHandler.java | 8 ++-- .../client/core/handler/LightningHandler.java | 15 ++++++-- .../core/handler/LocalizationHandler.java | 2 +- .../client/core/helper/RenderHelper.java | 7 ++-- .../client/core/helper/ShaderHelper.java | 13 ++++--- .../client/core/proxy/ClientProxy.java | 35 ++++++++++++++---- .../vazkii/botania/client/fx/FXSparkle.java | 2 + MODSRC/vazkii/botania/client/fx/FXWisp.java | 4 +- .../vazkii/botania/client/gui/GuiLexicon.java | 6 ++- .../botania/client/gui/GuiLexiconIndex.java | 8 ++-- .../client/gui/button/GuiButtonBack.java | 8 ++-- .../gui/button/GuiButtonBackWithShift.java | 6 +-- .../client/gui/button/GuiButtonPage.java | 6 ++- .../botania/client/model/ModelPylon.java | 2 + .../client/model/ModelSpinningCubes.java | 1 + .../client/render/block/RenderAltar.java | 4 +- .../client/render/block/RenderPool.java | 4 +- .../client/render/block/RenderPylon.java | 4 +- .../render/block/RenderSpecialFlower.java | 2 +- .../client/render/block/RenderSpreader.java | 4 +- .../client/render/item/RenderLens.java | 7 +++- .../client/render/item/RenderLexicon.java | 2 + .../client/render/tile/RenderTileAltar.java | 7 +++- .../render/tile/RenderTileEnchanter.java | 3 ++ .../client/render/tile/RenderTilePool.java | 2 + .../client/render/tile/RenderTilePylon.java | 6 ++- .../render/tile/RenderTileRuneAltar.java | 6 ++- .../render/tile/RenderTileSpreader.java | 2 + MODSRC/vazkii/botania/common/Botania.java | 6 +-- .../botania/common/block/BlockAltar.java | 4 +- .../botania/common/block/BlockEnchanter.java | 4 +- .../botania/common/block/BlockLivingrock.java | 6 +-- .../botania/common/block/BlockLivingwood.java | 8 ++-- .../botania/common/block/BlockManaBeacon.java | 8 ++-- .../common/block/BlockManaDetector.java | 4 +- .../vazkii/botania/common/block/BlockMod.java | 6 +-- .../common/block/BlockModContainer.java | 6 +-- .../botania/common/block/BlockModFlower.java | 14 ++++--- .../common/block/BlockPistonRelay.java | 20 ++++++---- .../botania/common/block/BlockRuneAltar.java | 4 +- .../common/block/BlockSpecialFlower.java | 10 +++-- .../botania/common/block/BlockSpreader.java | 7 ++-- .../botania/common/block/BlockUnstable.java | 10 ++--- .../botania/common/block/ModBlocks.java | 37 ++++++++++++++++--- .../subtile/functional/SubTileBellethorn.java | 4 +- .../functional/SubTileFallenKanade.java | 4 +- .../functional/SubTileHeiseiDream.java | 8 ++-- .../subtile/functional/SubTileHopperhock.java | 8 ++-- .../subtile/functional/SubTileJiyuulia.java | 10 +++++ .../functional/SubTileTangleberrie.java | 5 ++- .../subtile/functional/SubTileTigerseye.java | 8 ++-- .../subtile/functional/SubtileOrechid.java | 8 ++-- .../subtile/generating/SubTileArcaneRose.java | 4 +- .../subtile/generating/SubTileEndoflame.java | 4 +- .../botania/common/block/tile/TileAltar.java | 7 ++-- .../common/block/tile/TileDistributor.java | 6 +-- .../common/block/tile/TileEnchanter.java | 6 +-- .../botania/common/block/tile/TilePool.java | 10 +++-- .../common/block/tile/TileRuneAltar.java | 5 ++- .../common/block/tile/TileSpecialFlower.java | 1 + .../common/block/tile/TileSpreader.java | 19 ++++++++-- .../common/block/tile/TileTurntable.java | 1 + .../common/core/BotaniaCreativeTab.java | 5 +-- .../core/handler/BiomeDecorationHandler.java | 7 ++-- .../core/handler/CommonTickHandler.java | 14 +++---- .../common/core/handler/ConfigHandler.java | 4 +- .../core/handler/InternalMethodHandler.java | 11 ++++-- .../core/handler/ManaNetworkHandler.java | 12 +++--- .../handler/TerrasteelCraftingHandler.java | 8 +++- .../common/core/helper/InventoryHelper.java | 10 ++--- .../common/core/helper/ObfuscationHelper.java | 2 +- .../botania/common/core/helper/Vector3.java | 12 +++--- .../common/core/proxy/CommonProxy.java | 17 ++++++--- .../common/crafting/ModCrafingRecipes.java | 6 ++- .../crafting/ModManaInfusionRecipes.java | 7 ++-- .../common/crafting/ModRuneRecipes.java | 8 ++-- .../common/entity/EntityManaBurst.java | 14 ++++--- .../botania/common/entity/ModEntities.java | 2 +- .../botania/common/item/Item16Colors.java | 6 +-- .../botania/common/item/ItemDirtRod.java | 1 + .../botania/common/item/ItemFertilizer.java | 7 ++-- .../botania/common/item/ItemGrassHorn.java | 10 ++--- .../botania/common/item/ItemGrassSeeds.java | 20 ++++++---- .../vazkii/botania/common/item/ItemLens.java | 20 ++++++---- .../botania/common/item/ItemManaCookie.java | 6 +-- .../botania/common/item/ItemManaGun.java | 6 +-- .../botania/common/item/ItemManaMirror.java | 7 ++-- .../botania/common/item/ItemManaPetal.java | 2 + .../botania/common/item/ItemManaResource.java | 4 +- .../botania/common/item/ItemManaTablet.java | 6 +-- .../vazkii/botania/common/item/ItemMod.java | 6 +-- .../vazkii/botania/common/item/ItemRune.java | 4 +- .../botania/common/item/ItemSignalFlare.java | 6 +-- .../botania/common/item/ItemTerraformRod.java | 6 +-- .../botania/common/item/ItemTwigWand.java | 6 +-- .../vazkii/botania/common/item/ModItems.java | 19 +++++++--- .../item/block/ItemBlockSpecialFlower.java | 4 +- .../equipment/armor/ItemManasteelArmor.java | 13 ++++--- .../equipment/armor/ItemTerrasteeelArmor.java | 7 ++-- .../item/equipment/tool/ItemManasteelAxe.java | 6 +-- .../equipment/tool/ItemManasteelPick.java | 6 +-- .../equipment/tool/ItemManasteelShears.java | 12 +++--- .../equipment/tool/ItemManasteelShovel.java | 6 +-- .../equipment/tool/ItemManasteelSword.java | 6 +-- .../item/equipment/tool/ItemTerraSword.java | 2 + .../botania/common/lexicon/LexiconData.java | 8 +++- .../lexicon/page/PageCraftingRecipe.java | 16 ++++---- .../common/lexicon/page/PageImage.java | 6 ++- .../lexicon/page/PageManaInfusionRecipe.java | 12 +++--- .../common/lexicon/page/PagePetalRecipe.java | 12 +++--- .../common/lexicon/page/PageRecipe.java | 12 +++--- .../common/lexicon/page/PageRuneRecipe.java | 10 +++-- .../common/lexicon/page/PageTerrasteel.java | 7 +++- .../botania/common/lexicon/page/PageText.java | 10 ++--- .../botania/common/lib/LibItemNames.java | 1 - .../botania/common/network/GuiHandler.java | 2 +- 135 files changed, 614 insertions(+), 387 deletions(-) diff --git a/MODSRC/vazkii/botania/api/BotaniaAPI.java b/MODSRC/vazkii/botania/api/BotaniaAPI.java index 6aefe0f7c..73fb9cc96 100644 --- a/MODSRC/vazkii/botania/api/BotaniaAPI.java +++ b/MODSRC/vazkii/botania/api/BotaniaAPI.java @@ -11,8 +11,11 @@ */ package vazkii.botania.api; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; @@ -29,10 +32,8 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; public final class BotaniaAPI { diff --git a/MODSRC/vazkii/botania/api/ITileBound.java b/MODSRC/vazkii/botania/api/ITileBound.java index 6c367dd55..6dfec0ce0 100644 --- a/MODSRC/vazkii/botania/api/ITileBound.java +++ b/MODSRC/vazkii/botania/api/ITileBound.java @@ -11,9 +11,9 @@ */ package vazkii.botania.api; +import net.minecraft.util.ChunkCoordinates; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.ChunkCoordinates; /** * Any TileEntity that implements this is technically bound diff --git a/MODSRC/vazkii/botania/api/internal/DummyManaNetwork.java b/MODSRC/vazkii/botania/api/internal/DummyManaNetwork.java index fc5f0e14f..04e4ca333 100644 --- a/MODSRC/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/MODSRC/vazkii/botania/api/internal/DummyManaNetwork.java @@ -11,12 +11,12 @@ */ package vazkii.botania.api.internal; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; - import java.util.ArrayList; import java.util.List; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChunkCoordinates; + public class DummyManaNetwork implements IManaNetwork { public static final DummyManaNetwork instance = new DummyManaNetwork(); diff --git a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java index e15e88205..c10e5238e 100644 --- a/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/DummyMethodHandler.java @@ -11,6 +11,8 @@ */ package vazkii.botania.api.internal; +import java.util.List; + import net.minecraft.client.gui.ScaledResolution; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -22,8 +24,6 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; -import java.util.List; - public class DummyMethodHandler implements IInternalMethodHandler { @Override diff --git a/MODSRC/vazkii/botania/api/internal/DummyPage.java b/MODSRC/vazkii/botania/api/internal/DummyPage.java index 217cec863..33cbcf840 100644 --- a/MODSRC/vazkii/botania/api/internal/DummyPage.java +++ b/MODSRC/vazkii/botania/api/internal/DummyPage.java @@ -11,9 +11,9 @@ */ package vazkii.botania.api.internal; +import vazkii.botania.api.lexicon.LexiconPage; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import vazkii.botania.api.lexicon.LexiconPage; /** * A dummy page. It does absolutely nothing and is only diff --git a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java index acdf239ac..5a8a7e32f 100644 --- a/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/MODSRC/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -11,8 +11,8 @@ */ package vazkii.botania.api.internal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import net.minecraft.client.gui.ScaledResolution; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,8 +22,8 @@ import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Any methods that refer to internal methods in Botania are here. diff --git a/MODSRC/vazkii/botania/api/internal/IManaNetwork.java b/MODSRC/vazkii/botania/api/internal/IManaNetwork.java index a7ff9c8db..4883fba6c 100644 --- a/MODSRC/vazkii/botania/api/internal/IManaNetwork.java +++ b/MODSRC/vazkii/botania/api/internal/IManaNetwork.java @@ -11,11 +11,11 @@ */ package vazkii.botania.api.internal; +import java.util.List; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; -import java.util.List; - /** * A basic interface for a world's Mana Network. * @see IInternalMethodHandler#getManaNetworkInstance() diff --git a/MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java b/MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java index 287f3790f..708ca373d 100644 --- a/MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/MODSRC/vazkii/botania/api/lexicon/LexiconEntry.java @@ -11,12 +11,12 @@ */ package vazkii.botania.api.lexicon; -import net.minecraft.util.StatCollector; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import net.minecraft.util.StatCollector; + public class LexiconEntry implements Comparable{ public final String unlocalizedName; diff --git a/MODSRC/vazkii/botania/api/lexicon/LexiconPage.java b/MODSRC/vazkii/botania/api/lexicon/LexiconPage.java index 98d8c55b2..4ab7bd7b2 100644 --- a/MODSRC/vazkii/botania/api/lexicon/LexiconPage.java +++ b/MODSRC/vazkii/botania/api/lexicon/LexiconPage.java @@ -11,9 +11,9 @@ */ package vazkii.botania.api.lexicon; +import vazkii.botania.api.internal.IGuiLexiconEntry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import vazkii.botania.api.internal.IGuiLexiconEntry; public abstract class LexiconPage { diff --git a/MODSRC/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/MODSRC/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 27ba84c22..49b2a133e 100644 --- a/MODSRC/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/MODSRC/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -11,11 +11,11 @@ */ package vazkii.botania.api.lexicon; -import net.minecraft.item.ItemStack; - import java.util.HashMap; import java.util.Map; +import net.minecraft.item.ItemStack; + /** * This class contains mappings for which entry and page correspond to each * craftable ItemStack. Use the map method to map an ItemStack to a page in diff --git a/MODSRC/vazkii/botania/api/mana/ILens.java b/MODSRC/vazkii/botania/api/mana/ILens.java index 6252d459a..ef2357cc4 100644 --- a/MODSRC/vazkii/botania/api/mana/ILens.java +++ b/MODSRC/vazkii/botania/api/mana/ILens.java @@ -11,9 +11,11 @@ */ package vazkii.botania.api.mana; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import vazkii.botania.api.internal.IManaBurst; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.item.ItemStack; /** * Have an Item implement this to be counted as a lens for the mana spreader. diff --git a/MODSRC/vazkii/botania/api/mana/ManaNetworkEvent.java b/MODSRC/vazkii/botania/api/mana/ManaNetworkEvent.java index 7880df12c..e04253a7d 100644 --- a/MODSRC/vazkii/botania/api/mana/ManaNetworkEvent.java +++ b/MODSRC/vazkii/botania/api/mana/ManaNetworkEvent.java @@ -11,9 +11,9 @@ */ package vazkii.botania.api.mana; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.eventhandler.Event; public class ManaNetworkEvent extends Event { diff --git a/MODSRC/vazkii/botania/api/recipe/RecipePetals.java b/MODSRC/vazkii/botania/api/recipe/RecipePetals.java index fbe6ef384..fda3587ff 100644 --- a/MODSRC/vazkii/botania/api/recipe/RecipePetals.java +++ b/MODSRC/vazkii/botania/api/recipe/RecipePetals.java @@ -11,13 +11,13 @@ */ package vazkii.botania.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; -import java.util.ArrayList; -import java.util.List; - public class RecipePetals { ItemStack output; diff --git a/MODSRC/vazkii/botania/api/subtile/SubTileEntity.java b/MODSRC/vazkii/botania/api/subtile/SubTileEntity.java index 4d362c273..23d528469 100644 --- a/MODSRC/vazkii/botania/api/subtile/SubTileEntity.java +++ b/MODSRC/vazkii/botania/api/subtile/SubTileEntity.java @@ -11,8 +11,6 @@ */ package vazkii.botania.api.subtile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; @@ -23,6 +21,8 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IIcon; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses diff --git a/MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java b/MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java index 2682288e7..6e778a748 100644 --- a/MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/MODSRC/vazkii/botania/api/subtile/SubTileFunctional.java @@ -11,6 +11,8 @@ */ package vazkii.botania.api.subtile; +import java.awt.Color; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; @@ -23,8 +25,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; -import java.awt.*; - /** * The basic class for a Functional Flower. */ diff --git a/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java b/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java index 78daa51b9..67708f739 100644 --- a/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/MODSRC/vazkii/botania/api/subtile/SubTileGenerating.java @@ -11,6 +11,8 @@ */ package vazkii.botania.api.subtile; +import java.awt.Color; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; @@ -23,8 +25,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; -import java.awt.*; - /** * The basic class for a Generating Flower. */ diff --git a/MODSRC/vazkii/botania/client/core/handler/BoundTileRenderer.java b/MODSRC/vazkii/botania/client/core/handler/BoundTileRenderer.java index 342a3cdbc..a1eeb1fcc 100644 --- a/MODSRC/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/MODSRC/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -11,7 +11,8 @@ */ package vazkii.botania.client.core.handler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import java.awt.Color; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; @@ -24,12 +25,13 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.ITileBound; import vazkii.botania.api.IWireframeAABBProvider; import vazkii.botania.common.item.ItemTwigWand; - -import java.awt.*; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class BoundTileRenderer { diff --git a/MODSRC/vazkii/botania/client/core/handler/CapeHandler.java b/MODSRC/vazkii/botania/client/core/handler/CapeHandler.java index 1e48d28ee..f22abce94 100644 --- a/MODSRC/vazkii/botania/client/core/handler/CapeHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/CapeHandler.java @@ -11,20 +11,21 @@ */ package vazkii.botania.client.core.handler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.ReflectionHelper; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.ArrayList; + +import javax.imageio.ImageIO; + import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.ThreadDownloadImageData; import net.minecraftforge.client.event.RenderPlayerEvent; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.ArrayList; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.ReflectionHelper; public class CapeHandler { diff --git a/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java b/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java index 4f3ef10ad..3d58bb655 100644 --- a/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -11,10 +11,10 @@ */ package vazkii.botania.client.core.handler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.Type; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -25,9 +25,11 @@ import vazkii.botania.client.core.handler.LightningHandler.LightningBolt; import vazkii.botania.client.gui.GuiLexicon; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.item.ItemTwigWand; - -import java.util.ArrayList; -import java.util.List; +import vazkii.botania.common.lib.LibMisc; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.Type; public class ClientTickHandler { diff --git a/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java b/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java index bad6a6431..3f990c939 100644 --- a/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/HUDHandler.java @@ -11,7 +11,8 @@ */ package vazkii.botania.client.core.handler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import java.awt.Color; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -22,15 +23,16 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.ILexiconable; import vazkii.botania.api.IWandHUD; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.item.ModItems; - -import java.awt.*; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class HUDHandler { diff --git a/MODSRC/vazkii/botania/client/core/handler/LightningHandler.java b/MODSRC/vazkii/botania/client/core/handler/LightningHandler.java index 87fe63213..f51accd64 100644 --- a/MODSRC/vazkii/botania/client/core/handler/LightningHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/LightningHandler.java @@ -11,7 +11,14 @@ */ package vazkii.botania.client.core.handler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Random; +import java.util.concurrent.ConcurrentLinkedQueue; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; @@ -25,14 +32,14 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; + import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.client.core.handler.LightningHandler.LightningBolt.Segment; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.Vector3; -import java.util.*; -import java.util.concurrent.ConcurrentLinkedQueue; - public class LightningHandler { private static final ResourceLocation outsideResource = new ResourceLocation(LibResources.MISC_WISP_LARGE); diff --git a/MODSRC/vazkii/botania/client/core/handler/LocalizationHandler.java b/MODSRC/vazkii/botania/client/core/handler/LocalizationHandler.java index 928653de8..a211da94d 100644 --- a/MODSRC/vazkii/botania/client/core/handler/LocalizationHandler.java +++ b/MODSRC/vazkii/botania/client/core/handler/LocalizationHandler.java @@ -11,8 +11,8 @@ */ package vazkii.botania.client.core.handler; -import cpw.mods.fml.common.registry.LanguageRegistry; import vazkii.botania.client.lib.LibResources; +import cpw.mods.fml.common.registry.LanguageRegistry; public final class LocalizationHandler { diff --git a/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java b/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java index 12f5867c5..5b00e26c1 100644 --- a/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/RenderHelper.java @@ -11,13 +11,14 @@ */ package vazkii.botania.client.core.helper; +import java.util.List; +import java.util.Random; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; -import org.lwjgl.opengl.GL11; -import java.util.List; -import java.util.Random; +import org.lwjgl.opengl.GL11; public final class RenderHelper { diff --git a/MODSRC/vazkii/botania/client/core/helper/ShaderHelper.java b/MODSRC/vazkii/botania/client/core/helper/ShaderHelper.java index f52f72533..7b5769a61 100644 --- a/MODSRC/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/ShaderHelper.java @@ -11,20 +11,23 @@ */ package vazkii.botania.client.core.helper; -import cpw.mods.fml.common.FMLLog; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; + import net.minecraft.client.renderer.OpenGlHelper; + import org.apache.logging.log4j.Level; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL11; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; - -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; public final class ShaderHelper { diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index 2aee3f391..823b9bafd 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -11,16 +11,16 @@ */ package vazkii.botania.client.core.proxy; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.event.FMLInitializationEvent; import net.minecraft.client.Minecraft; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.handler.*; +import vazkii.botania.client.core.handler.BoundTileRenderer; +import vazkii.botania.client.core.handler.CapeHandler; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.FXSparkle; import vazkii.botania.client.fx.FXWisp; @@ -28,15 +28,34 @@ import vazkii.botania.client.gui.GuiLexicon; import vazkii.botania.client.gui.GuiLexiconEntry; import vazkii.botania.client.gui.GuiLexiconIndex; import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.render.block.*; +import vazkii.botania.client.render.block.RenderAltar; +import vazkii.botania.client.render.block.RenderPool; +import vazkii.botania.client.render.block.RenderPylon; +import vazkii.botania.client.render.block.RenderSpecialFlower; +import vazkii.botania.client.render.block.RenderSpreader; import vazkii.botania.client.render.item.RenderLens; import vazkii.botania.client.render.item.RenderLexicon; -import vazkii.botania.client.render.tile.*; -import vazkii.botania.common.block.tile.*; +import vazkii.botania.client.render.tile.RenderTileAltar; +import vazkii.botania.client.render.tile.RenderTileEnchanter; +import vazkii.botania.client.render.tile.RenderTilePool; +import vazkii.botania.client.render.tile.RenderTilePylon; +import vazkii.botania.client.render.tile.RenderTileRuneAltar; +import vazkii.botania.client.render.tile.RenderTileSpreader; +import vazkii.botania.common.block.tile.TileAltar; +import vazkii.botania.common.block.tile.TileEnchanter; +import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.TilePylon; +import vazkii.botania.common.block.tile.TileRuneAltar; +import vazkii.botania.common.block.tile.TileSpreader; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.core.proxy.CommonProxy; import vazkii.botania.common.item.ModItems; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.relauncher.Side; public class ClientProxy extends CommonProxy { diff --git a/MODSRC/vazkii/botania/client/fx/FXSparkle.java b/MODSRC/vazkii/botania/client/fx/FXSparkle.java index f6f809b81..87185bd0b 100644 --- a/MODSRC/vazkii/botania/client/fx/FXSparkle.java +++ b/MODSRC/vazkii/botania/client/fx/FXSparkle.java @@ -17,7 +17,9 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.ObfuscationHelper; diff --git a/MODSRC/vazkii/botania/client/fx/FXWisp.java b/MODSRC/vazkii/botania/client/fx/FXWisp.java index 8299b5a94..60155c491 100644 --- a/MODSRC/vazkii/botania/client/fx/FXWisp.java +++ b/MODSRC/vazkii/botania/client/fx/FXWisp.java @@ -11,16 +11,18 @@ */ package vazkii.botania.client.fx; -import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.helper.ObfuscationHelper; +import cpw.mods.fml.client.FMLClientHandler; public class FXWisp extends EntityFX { diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java b/MODSRC/vazkii/botania/client/gui/GuiLexicon.java index e2b2a4297..27169eb71 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexicon.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexicon.java @@ -11,11 +11,15 @@ */ package vazkii.botania.client.gui; +import java.util.List; + import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -23,8 +27,6 @@ import vazkii.botania.client.gui.button.GuiButtonInvisible; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.item.ModItems; -import java.util.List; - public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); diff --git a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java b/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java index 41bd1ed46..a0fe3ef94 100644 --- a/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java +++ b/MODSRC/vazkii/botania/client/gui/GuiLexiconIndex.java @@ -11,6 +11,10 @@ */ package vazkii.botania.client.gui; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import net.minecraft.client.gui.GuiButton; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; @@ -21,10 +25,6 @@ import vazkii.botania.client.gui.button.GuiButtonBack; import vazkii.botania.client.gui.button.GuiButtonInvisible; import vazkii.botania.client.gui.button.GuiButtonPage; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - public class GuiLexiconIndex extends GuiLexicon { LexiconCategory category; diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java b/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java index 3bf8b67a9..e9b9a35e6 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java +++ b/MODSRC/vazkii/botania/client/gui/button/GuiButtonBack.java @@ -11,16 +11,18 @@ */ package vazkii.botania.client.gui.button; +import java.util.Arrays; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.GuiLexicon; -import java.util.Arrays; -import java.util.List; - public class GuiButtonBack extends GuiButton { public GuiButtonBack(int par1, int par2, int par3) { diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBackWithShift.java b/MODSRC/vazkii/botania/client/gui/button/GuiButtonBackWithShift.java index 5c3f4fa39..a2014ee0c 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonBackWithShift.java +++ b/MODSRC/vazkii/botania/client/gui/button/GuiButtonBackWithShift.java @@ -11,12 +11,12 @@ */ package vazkii.botania.client.gui.button; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; - import java.util.Arrays; import java.util.List; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; + public class GuiButtonBackWithShift extends GuiButtonBack { public GuiButtonBackWithShift(int par1, int par2, int par3) { diff --git a/MODSRC/vazkii/botania/client/gui/button/GuiButtonPage.java b/MODSRC/vazkii/botania/client/gui/button/GuiButtonPage.java index 8d32a0a83..1b0e723e0 100644 --- a/MODSRC/vazkii/botania/client/gui/button/GuiButtonPage.java +++ b/MODSRC/vazkii/botania/client/gui/button/GuiButtonPage.java @@ -11,15 +11,17 @@ */ package vazkii.botania.client.gui.button; +import java.util.Arrays; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.GuiLexicon; -import java.util.Arrays; - public class GuiButtonPage extends GuiButton { boolean right; diff --git a/MODSRC/vazkii/botania/client/model/ModelPylon.java b/MODSRC/vazkii/botania/client/model/ModelPylon.java index 9d1b1eca3..4d9c321c1 100644 --- a/MODSRC/vazkii/botania/client/model/ModelPylon.java +++ b/MODSRC/vazkii/botania/client/model/ModelPylon.java @@ -14,6 +14,8 @@ package vazkii.botania.client.model; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; +import net.minecraftforge.client.model.obj.GroupObject; +import net.minecraftforge.client.model.obj.WavefrontObject; import vazkii.botania.client.lib.LibResources; public class ModelPylon implements IPylonModel { diff --git a/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java b/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java index ab9dbd0a2..4e573d3a3 100644 --- a/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java @@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.OpenGlHelper; + import org.lwjgl.opengl.GL11; public class ModelSpinningCubes extends ModelBase { diff --git a/MODSRC/vazkii/botania/client/render/block/RenderAltar.java b/MODSRC/vazkii/botania/client/render/block/RenderAltar.java index d9a10ee7f..16671e271 100644 --- a/MODSRC/vazkii/botania/client/render/block/RenderAltar.java +++ b/MODSRC/vazkii/botania/client/render/block/RenderAltar.java @@ -11,14 +11,16 @@ */ package vazkii.botania.client.render.block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileAltar; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderAltar implements ISimpleBlockRenderingHandler { diff --git a/MODSRC/vazkii/botania/client/render/block/RenderPool.java b/MODSRC/vazkii/botania/client/render/block/RenderPool.java index 7f8fcfdda..e65e6e8cd 100644 --- a/MODSRC/vazkii/botania/client/render/block/RenderPool.java +++ b/MODSRC/vazkii/botania/client/render/block/RenderPool.java @@ -11,14 +11,16 @@ */ package vazkii.botania.client.render.block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePool; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPool implements ISimpleBlockRenderingHandler { diff --git a/MODSRC/vazkii/botania/client/render/block/RenderPylon.java b/MODSRC/vazkii/botania/client/render/block/RenderPylon.java index 8e70ac65d..9f4831e2f 100644 --- a/MODSRC/vazkii/botania/client/render/block/RenderPylon.java +++ b/MODSRC/vazkii/botania/client/render/block/RenderPylon.java @@ -11,14 +11,16 @@ */ package vazkii.botania.client.render.block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePylon; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPylon implements ISimpleBlockRenderingHandler { diff --git a/MODSRC/vazkii/botania/client/render/block/RenderSpecialFlower.java b/MODSRC/vazkii/botania/client/render/block/RenderSpecialFlower.java index e991074a0..5213cf175 100644 --- a/MODSRC/vazkii/botania/client/render/block/RenderSpecialFlower.java +++ b/MODSRC/vazkii/botania/client/render/block/RenderSpecialFlower.java @@ -11,13 +11,13 @@ */ package vazkii.botania.client.render.block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpecialFlower implements ISimpleBlockRenderingHandler { diff --git a/MODSRC/vazkii/botania/client/render/block/RenderSpreader.java b/MODSRC/vazkii/botania/client/render/block/RenderSpreader.java index 91850a4be..827fba9b3 100644 --- a/MODSRC/vazkii/botania/client/render/block/RenderSpreader.java +++ b/MODSRC/vazkii/botania/client/render/block/RenderSpreader.java @@ -11,14 +11,16 @@ */ package vazkii.botania.client.render.block; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileSpreader; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpreader implements ISimpleBlockRenderingHandler { diff --git a/MODSRC/vazkii/botania/client/render/item/RenderLens.java b/MODSRC/vazkii/botania/client/render/item/RenderLens.java index c94e75025..7e08965c1 100644 --- a/MODSRC/vazkii/botania/client/render/item/RenderLens.java +++ b/MODSRC/vazkii/botania/client/render/item/RenderLens.java @@ -11,19 +11,22 @@ */ package vazkii.botania.client.render.item; +import java.awt.Color; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.ItemLens; -import java.awt.*; - public class RenderLens implements IItemRenderer { static RenderItem render = new RenderItem(); diff --git a/MODSRC/vazkii/botania/client/render/item/RenderLexicon.java b/MODSRC/vazkii/botania/client/render/item/RenderLexicon.java index 16d5743cf..d9f937b23 100644 --- a/MODSRC/vazkii/botania/client/render/item/RenderLexicon.java +++ b/MODSRC/vazkii/botania/client/render/item/RenderLexicon.java @@ -16,7 +16,9 @@ import net.minecraft.client.model.ModelBook; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileAltar.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileAltar.java index ddad19efa..b51843f65 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -11,6 +11,9 @@ */ package vazkii.botania.client.render.tile; +import java.awt.Color; + +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; @@ -22,14 +25,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; + import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelAltar; import vazkii.botania.common.block.tile.TileAltar; -import java.awt.*; - public class RenderTileAltar extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_ALTAR); diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java index e4675d2b1..5b262145a 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -22,10 +22,13 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.BlockEnchanter; import vazkii.botania.common.block.tile.TileEnchanter; +import vazkii.botania.common.core.handler.ConfigHandler; public class RenderTileEnchanter extends TileEntitySpecialRenderer { diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTilePool.java b/MODSRC/vazkii/botania/client/render/tile/RenderTilePool.java index 3d36f47ba..cdee7471b 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTilePool.java @@ -20,8 +20,10 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; + import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java b/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java index 9b8ffec6d..20ff4faed 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -11,13 +11,17 @@ */ package vazkii.botania.client.render.tile; +import java.util.Random; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; + import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.IPylonModel; @@ -25,8 +29,6 @@ import vazkii.botania.client.model.ModelPylon; import vazkii.botania.client.model.ModelPylonOld; import vazkii.botania.common.core.handler.ConfigHandler; -import java.util.Random; - public class RenderTilePylon extends TileEntitySpecialRenderer { private static final ResourceLocation textureOld = new ResourceLocation(LibResources.MODEL_PYLON_OLD); diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index 11c0f04f3..cb9140a29 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -11,6 +11,8 @@ */ package vazkii.botania.client.render.tile; +import java.awt.Color; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemRenderer; @@ -24,13 +26,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraftforge.client.ForgeHooksClient; + import org.lwjgl.opengl.GL11; + import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.model.ModelSpinningCubes; import vazkii.botania.common.block.tile.TileRuneAltar; -import java.awt.*; - public class RenderTileRuneAltar extends TileEntitySpecialRenderer { ModelSpinningCubes cubes = new ModelSpinningCubes(); diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileSpreader.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileSpreader.java index a6d472ea0..511930c8f 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -17,8 +17,10 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; + import vazkii.botania.api.mana.ILens; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelSpreader; diff --git a/MODSRC/vazkii/botania/common/Botania.java b/MODSRC/vazkii/botania/common/Botania.java index 049a3bf2f..e6dcb185f 100644 --- a/MODSRC/vazkii/botania/common/Botania.java +++ b/MODSRC/vazkii/botania/common/Botania.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common; +import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.proxy.CommonProxy; +import vazkii.botania.common.lib.LibMisc; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -19,9 +22,6 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; -import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.proxy.CommonProxy; -import vazkii.botania.common.lib.LibMisc; @Mod(modid = LibMisc.MOD_ID, name = LibMisc.MOD_NAME, version = LibMisc.VERSION) public class Botania { diff --git a/MODSRC/vazkii/botania/common/block/BlockAltar.java b/MODSRC/vazkii/botania/common/block/BlockAltar.java index 4123510c9..bf6b7e730 100644 --- a/MODSRC/vazkii/botania/common/block/BlockAltar.java +++ b/MODSRC/vazkii/botania/common/block/BlockAltar.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -32,8 +34,6 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import java.util.Random; - public class BlockAltar extends BlockModContainer implements ILexiconable { Random random; diff --git a/MODSRC/vazkii/botania/common/block/BlockEnchanter.java b/MODSRC/vazkii/botania/common/block/BlockEnchanter.java index f268ce2e2..ad2be471b 100644 --- a/MODSRC/vazkii/botania/common/block/BlockEnchanter.java +++ b/MODSRC/vazkii/botania/common/block/BlockEnchanter.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -33,8 +35,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import java.util.Random; - public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable { Random random; diff --git a/MODSRC/vazkii/botania/common/block/BlockLivingrock.java b/MODSRC/vazkii/botania/common/block/BlockLivingrock.java index d241e68b9..c9b3fc630 100644 --- a/MODSRC/vazkii/botania/common/block/BlockLivingrock.java +++ b/MODSRC/vazkii/botania/common/block/BlockLivingrock.java @@ -11,7 +11,8 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.registry.GameRegistry; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -28,8 +29,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; - -import java.util.List; +import cpw.mods.fml.common.registry.GameRegistry; public class BlockLivingrock extends BlockMod implements ILexiconable { diff --git a/MODSRC/vazkii/botania/common/block/BlockLivingwood.java b/MODSRC/vazkii/botania/common/block/BlockLivingwood.java index 63fd859be..80ce8a3ff 100644 --- a/MODSRC/vazkii/botania/common/block/BlockLivingwood.java +++ b/MODSRC/vazkii/botania/common/block/BlockLivingwood.java @@ -11,7 +11,10 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.registry.GameRegistry; +import java.util.List; + +import javax.swing.Icon; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -29,8 +32,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; - -import java.util.List; +import cpw.mods.fml.common.registry.GameRegistry; public class BlockLivingwood extends BlockMod implements ILexiconable { diff --git a/MODSRC/vazkii/botania/common/block/BlockManaBeacon.java b/MODSRC/vazkii/botania/common/block/BlockManaBeacon.java index 633b1ce51..4fab4d51e 100644 --- a/MODSRC/vazkii/botania/common/block/BlockManaBeacon.java +++ b/MODSRC/vazkii/botania/common/block/BlockManaBeacon.java @@ -11,7 +11,9 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.registry.GameRegistry; +import java.awt.Color; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -31,9 +33,7 @@ import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; - -import java.awt.*; -import java.util.List; +import cpw.mods.fml.common.registry.GameRegistry; public class BlockManaBeacon extends BlockModContainer implements ILexiconable { diff --git a/MODSRC/vazkii/botania/common/block/BlockManaDetector.java b/MODSRC/vazkii/botania/common/block/BlockManaDetector.java index e177ccaeb..4e20b4ec6 100644 --- a/MODSRC/vazkii/botania/common/block/BlockManaDetector.java +++ b/MODSRC/vazkii/botania/common/block/BlockManaDetector.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,8 +32,6 @@ import vazkii.botania.common.block.tile.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import java.util.List; - public class BlockManaDetector extends BlockModContainer implements ILexiconable { IIcon[] icons; diff --git a/MODSRC/vazkii/botania/common/block/BlockMod.java b/MODSRC/vazkii/botania/common/block/BlockMod.java index d3deea6c3..8bc4ab1c5 100644 --- a/MODSRC/vazkii/botania/common/block/BlockMod.java +++ b/MODSRC/vazkii/botania/common/block/BlockMod.java @@ -11,14 +11,14 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockMod extends Block { diff --git a/MODSRC/vazkii/botania/common/block/BlockModContainer.java b/MODSRC/vazkii/botania/common/block/BlockModContainer.java index 2c51ef9f4..2b87de23e 100644 --- a/MODSRC/vazkii/botania/common/block/BlockModContainer.java +++ b/MODSRC/vazkii/botania/common/block/BlockModContainer.java @@ -11,9 +11,6 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -22,6 +19,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public abstract class BlockModContainer extends BlockContainer { diff --git a/MODSRC/vazkii/botania/common/block/BlockModFlower.java b/MODSRC/vazkii/botania/common/block/BlockModFlower.java index ad8a75121..350a7cd09 100644 --- a/MODSRC/vazkii/botania/common/block/BlockModFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockModFlower.java @@ -11,9 +11,11 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import java.util.Random; + +import javax.swing.Icon; + import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.client.renderer.texture.IIconRegister; @@ -34,9 +36,9 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; - -import java.util.List; -import java.util.Random; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockModFlower extends BlockFlower implements ILexiconable { diff --git a/MODSRC/vazkii/botania/common/block/BlockPistonRelay.java b/MODSRC/vazkii/botania/common/block/BlockPistonRelay.java index fd5f7f753..5859f964f 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPistonRelay.java +++ b/MODSRC/vazkii/botania/common/block/BlockPistonRelay.java @@ -11,11 +11,14 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.Type; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -36,8 +39,11 @@ import vazkii.botania.api.IWandable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; - -import java.util.*; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.common.gameevent.TickEvent.Type; public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { diff --git a/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java b/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java index 17daf59eb..dcf6c1d5d 100644 --- a/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java +++ b/MODSRC/vazkii/botania/common/block/BlockRuneAltar.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,8 +32,6 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import java.util.Random; - public class BlockRuneAltar extends BlockModContainer implements IWandable, ILexiconable { Random random; diff --git a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java index 234f46a21..03ade0eeb 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpecialFlower.java @@ -11,7 +11,12 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.registry.GameRegistry; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.ITileEntityProvider; @@ -38,8 +43,7 @@ import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; - -import java.util.*; +import cpw.mods.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { diff --git a/MODSRC/vazkii/botania/common/block/BlockSpreader.java b/MODSRC/vazkii/botania/common/block/BlockSpreader.java index 235ee690f..5b72eb599 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpreader.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpreader.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.block; +import java.util.List; +import java.util.Random; + import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonBase; @@ -22,6 +25,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -41,9 +45,6 @@ import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import java.util.List; -import java.util.Random; - public class BlockSpreader extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { Random random; diff --git a/MODSRC/vazkii/botania/common/block/BlockUnstable.java b/MODSRC/vazkii/botania/common/block/BlockUnstable.java index 1312f5b3f..7adab4118 100644 --- a/MODSRC/vazkii/botania/common/block/BlockUnstable.java +++ b/MODSRC/vazkii/botania/common/block/BlockUnstable.java @@ -11,7 +11,10 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.registry.GameRegistry; +import java.awt.Color; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -28,10 +31,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; - -import java.awt.*; -import java.util.List; -import java.util.Random; +import cpw.mods.fml.common.registry.GameRegistry; public class BlockUnstable extends BlockMod implements ILexiconable { diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 8d2e3361a..ebeba7865 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -11,18 +11,45 @@ */ package vazkii.botania.common.block; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.subtile.SubTilePureDaisy; -import vazkii.botania.common.block.subtile.functional.*; -import vazkii.botania.common.block.subtile.generating.*; -import vazkii.botania.common.block.tile.*; +import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; +import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; +import vazkii.botania.common.block.subtile.functional.SubTileExoflame; +import vazkii.botania.common.block.subtile.functional.SubTileFallenKanade; +import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; +import vazkii.botania.common.block.subtile.functional.SubTileHopperhock; +import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; +import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia; +import vazkii.botania.common.block.subtile.functional.SubTileTangleberrie; +import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; +import vazkii.botania.common.block.subtile.functional.SubtileOrechid; +import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; +import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; +import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; +import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas; +import vazkii.botania.common.block.subtile.generating.SubTileNightshade; +import vazkii.botania.common.block.subtile.generating.SubTileThermalily; +import vazkii.botania.common.block.tile.TileAltar; +import vazkii.botania.common.block.tile.TileDistributor; +import vazkii.botania.common.block.tile.TileEnchanter; +import vazkii.botania.common.block.tile.TileManaBeacon; +import vazkii.botania.common.block.tile.TileManaDetector; +import vazkii.botania.common.block.tile.TileManaVoid; +import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.TilePylon; +import vazkii.botania.common.block.tile.TileRuneAltar; +import vazkii.botania.common.block.tile.TileSpecialFlower; +import vazkii.botania.common.block.tile.TileSpreader; +import vazkii.botania.common.block.tile.TileTurntable; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; public final class ModBlocks { diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 19cb2f9e1..221b107fe 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; @@ -19,8 +21,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileBellethorn extends SubTileFunctional { @Override diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 45864e914..b16f18abe 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -19,8 +21,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileFallenKanade extends SubTileFunctional { @Override diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 8245a2ac9..e609044db 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -11,7 +11,9 @@ */ package vazkii.botania.common.block.subtile.functional; -import cpw.mods.fml.relauncher.ReflectionHelper; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIAttackOnCollide; @@ -23,9 +25,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; - -import java.util.ArrayList; -import java.util.List; +import cpw.mods.fml.relauncher.ReflectionHelper; public class SubTileHeiseiDream extends SubTileFunctional { diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 7a683da9a..86356187c 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -25,15 +28,14 @@ import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.List; - public class SubTileHopperhock extends SubTileFunctional { private static final String TAG_FILTER_TYPE = "filterType"; diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java index 035ab4ea1..76059edb8 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java @@ -11,7 +11,17 @@ */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.MathHelper; +import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lexicon.LexiconData; public class SubTileJiyuulia extends SubTileTangleberrie { diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 9a1bde46f..73c51552f 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -11,9 +11,12 @@ */ package vazkii.botania.common.block.subtile.functional; +import java.util.List; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; @@ -21,8 +24,6 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileTangleberrie extends SubTileFunctional { @Override diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index d1103ab09..e14a5bcc8 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -11,7 +11,9 @@ */ package vazkii.botania.common.block.subtile.functional; -import cpw.mods.fml.relauncher.ReflectionHelper; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.entity.EntityLiving; import net.minecraft.entity.ai.EntityAIAvoidEntity; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; @@ -25,9 +27,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; - -import java.util.ArrayList; -import java.util.List; +import cpw.mods.fml.relauncher.ReflectionHelper; public class SubTileTigerseye extends SubTileFunctional { diff --git a/MODSRC/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java b/MODSRC/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java index 0a39e7937..0c29b41bb 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java +++ b/MODSRC/vazkii/botania/common/block/subtile/functional/SubtileOrechid.java @@ -11,6 +11,10 @@ */ package vazkii.botania.common.block.subtile.functional; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -22,10 +26,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - public class SubtileOrechid extends SubTileFunctional { private static final int COST = 17500; diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 418dcbc0e..f84aebf65 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block.subtile.generating; +import java.util.List; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; @@ -18,8 +20,6 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.helper.ExperienceHelper; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileArcaneRose extends SubTileGenerating { @Override diff --git a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index a97ea90b2..2b408e041 100644 --- a/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/MODSRC/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block.subtile.generating; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,8 +25,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; -import java.util.List; - public class SubTileEndoflame extends SubTileGenerating { private static final String TAG_BURN_TIME = "burnTime"; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileAltar.java b/MODSRC/vazkii/botania/common/block/tile/TileAltar.java index a40a26d5c..0195462ad 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileAltar.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileAltar.java @@ -11,9 +11,13 @@ */ package vazkii.botania.common.block.tile; +import java.awt.Color; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Items; import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; @@ -23,9 +27,6 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibBlockNames; -import java.awt.*; -import java.util.List; - public class TileAltar extends TileSimpleInventory implements ISidedInventory { public static final String TAG_HAS_WATER = "hasWater"; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java b/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java index 6a94bbae8..fb4f8d8a1 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java @@ -11,14 +11,14 @@ */ package vazkii.botania.common.block.tile; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; -import java.util.ArrayList; -import java.util.List; - public class TileDistributor extends TileMod implements IManaReceiver { List validPools = new ArrayList(); diff --git a/MODSRC/vazkii/botania/common/block/tile/TileEnchanter.java b/MODSRC/vazkii/botania/common/block/tile/TileEnchanter.java index c6314c7c3..4cf2d7090 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileEnchanter.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.block.tile; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -27,9 +30,6 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import java.util.ArrayList; -import java.util.List; - public class TileEnchanter extends TileMod implements IManaReceiver { private static final String TAG_STAGE = "stage"; diff --git a/MODSRC/vazkii/botania/common/block/tile/TilePool.java b/MODSRC/vazkii/botania/common/block/tile/TilePool.java index 1f95577a6..e89e2de14 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TilePool.java +++ b/MODSRC/vazkii/botania/common/block/tile/TilePool.java @@ -11,6 +11,11 @@ */ package vazkii.botania.common.block.tile; +import ibxm.Player; + +import java.awt.Color; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -22,7 +27,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; @@ -32,9 +39,6 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import java.awt.*; -import java.util.List; - public class TilePool extends TileMod implements IManaPool { public static final int MAX_MANA = 1000000; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java b/MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java index bc3185cd5..0e695be80 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.block.tile; +import java.util.List; +import java.util.concurrent.Callable; + import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -27,8 +30,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; -import java.util.List; - public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver { private static final String TAG_MANA = "mana"; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileSpecialFlower.java b/MODSRC/vazkii/botania/common/block/tile/TileSpecialFlower.java index 012a7f8e6..323f9c24d 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.player.EntityPlayer; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java b/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java index d62a14c09..dc11a6683 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.block.tile; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.entity.RenderItem; @@ -21,13 +23,24 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.ITileBound; import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.mana.*; +import vazkii.botania.api.mana.BurstProperties; +import vazkii.botania.api.mana.ILens; +import vazkii.botania.api.mana.IManaCollector; +import vazkii.botania.api.mana.IManaPool; +import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; @@ -35,8 +48,6 @@ import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; import vazkii.botania.common.lib.LibBlockNames; -import java.util.List; - public class TileSpreader extends TileSimpleInventory implements IManaCollector, ITileBound { private static final int MAX_MANA = 1000; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileTurntable.java b/MODSRC/vazkii/botania/common/block/tile/TileTurntable.java index 36f4fd88b..705bb75a8 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileTurntable.java +++ b/MODSRC/vazkii/botania/common/block/tile/TileTurntable.java @@ -19,6 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; + import org.lwjgl.opengl.GL11; public class TileTurntable extends TileMod { diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index b4a6ab4b2..d9e86234b 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.core; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -19,8 +21,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import java.util.List; - public final class BotaniaCreativeTab extends CreativeTabs { public static BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); @@ -45,7 +45,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { this.list = list; addItem(ModItems.lexicon); - addItem(ModItems.test); addBlock(ModBlocks.flower); addBlock(ModBlocks.specialFlower); diff --git a/MODSRC/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/MODSRC/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index cfa7f7b6c..eda77b020 100644 --- a/MODSRC/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -11,12 +11,13 @@ */ package vazkii.botania.common.core.handler; -import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.block.Block; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType; import vazkii.botania.common.block.ModBlocks; +import cpw.mods.fml.common.eventhandler.Event.Result; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class BiomeDecorationHandler { diff --git a/MODSRC/vazkii/botania/common/core/handler/CommonTickHandler.java b/MODSRC/vazkii/botania/common/core/handler/CommonTickHandler.java index ef560fb2c..52f5e257a 100644 --- a/MODSRC/vazkii/botania/common/core/handler/CommonTickHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/CommonTickHandler.java @@ -11,19 +11,19 @@ */ package vazkii.botania.common.core.handler; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.world.World; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.WorldTickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.world.World; - -import java.util.ArrayList; -import java.util.List; public final class CommonTickHandler { diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index f77cf783b..9f79952cd 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -11,11 +11,11 @@ */ package vazkii.botania.common.core.handler; +import java.io.File; + import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import java.io.File; - public final class ConfigHandler { private static Configuration config; diff --git a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java index dfe68f4ea..7082903d6 100644 --- a/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.core.handler; +import java.util.List; + import net.minecraft.client.gui.ScaledResolution; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -27,9 +29,12 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lexicon.page.*; - -import java.util.List; +import vazkii.botania.common.lexicon.page.PageCraftingRecipe; +import vazkii.botania.common.lexicon.page.PageImage; +import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; +import vazkii.botania.common.lexicon.page.PagePetalRecipe; +import vazkii.botania.common.lexicon.page.PageRuneRecipe; +import vazkii.botania.common.lexicon.page.PageText; public class InternalMethodHandler implements IInternalMethodHandler { diff --git a/MODSRC/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/MODSRC/vazkii/botania/common/core/handler/ManaNetworkHandler.java index f7a500790..dabe6c9a3 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -11,7 +11,11 @@ */ package vazkii.botania.common.core.handler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import vazkii.botania.api.internal.IManaNetwork; @@ -19,11 +23,7 @@ import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.mana.ManaNetworkEvent.Action; import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; import vazkii.botania.common.core.helper.MathHelper; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class ManaNetworkHandler implements IManaNetwork { diff --git a/MODSRC/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java b/MODSRC/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java index 6e05a4b8d..042824907 100644 --- a/MODSRC/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java @@ -11,19 +11,23 @@ */ package vazkii.botania.common.core.handler; +import java.util.List; + import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.AxisAlignedBB; +import net.minecraftforge.event.entity.EntityEvent; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; - -import java.util.List; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class TerrasteelCraftingHandler { diff --git a/MODSRC/vazkii/botania/common/core/helper/InventoryHelper.java b/MODSRC/vazkii/botania/common/core/helper/InventoryHelper.java index 0a9722adc..6f0124187 100644 --- a/MODSRC/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/MODSRC/vazkii/botania/common/core/helper/InventoryHelper.java @@ -11,6 +11,11 @@ */ package vazkii.botania.common.core.helper; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -25,11 +30,6 @@ import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - //From OpenBlocksLib: https://github.com/OpenMods/OpenModsLib public class InventoryHelper { diff --git a/MODSRC/vazkii/botania/common/core/helper/ObfuscationHelper.java b/MODSRC/vazkii/botania/common/core/helper/ObfuscationHelper.java index 13379428a..f158a2443 100644 --- a/MODSRC/vazkii/botania/common/core/helper/ObfuscationHelper.java +++ b/MODSRC/vazkii/botania/common/core/helper/ObfuscationHelper.java @@ -11,10 +11,10 @@ */ package vazkii.botania.common.core.helper; -import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.lib.LibObfuscation; +import cpw.mods.fml.relauncher.ReflectionHelper; public class ObfuscationHelper { diff --git a/MODSRC/vazkii/botania/common/core/helper/Vector3.java b/MODSRC/vazkii/botania/common/core/helper/Vector3.java index 931e19f8b..ac9ec6da7 100644 --- a/MODSRC/vazkii/botania/common/core/helper/Vector3.java +++ b/MODSRC/vazkii/botania/common/core/helper/Vector3.java @@ -11,18 +11,20 @@ */ package vazkii.botania.common.core.helper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; + import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; + import org.lwjgl.opengl.GL11; import org.lwjgl.util.vector.Vector3f; import org.lwjgl.util.vector.Vector4f; -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class Vector3 { diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java index f9f6adf71..107aa2217 100644 --- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java @@ -11,11 +11,6 @@ */ package vazkii.botania.common.core.proxy; -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 cpw.mods.fml.common.network.NetworkRegistry; import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -23,7 +18,12 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.core.handler.*; +import vazkii.botania.common.core.handler.BiomeDecorationHandler; +import vazkii.botania.common.core.handler.CommonTickHandler; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.handler.InternalMethodHandler; +import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.handler.TerrasteelCraftingHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.ModCrafingRecipes; import vazkii.botania.common.crafting.ModManaInfusionRecipes; @@ -33,6 +33,11 @@ import vazkii.botania.common.entity.ModEntities; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.GuiHandler; +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 cpw.mods.fml.common.network.NetworkRegistry; public class CommonProxy { diff --git a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java index 26a0f2c37..bfc4fb511 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModCrafingRecipes.java @@ -11,9 +11,13 @@ */ package vazkii.botania.common.crafting; +import java.util.List; + import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -27,8 +31,6 @@ import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import java.util.List; - public final class ModCrafingRecipes { public static IRecipe recipeLexicon; diff --git a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 3f7b3e01f..071d61519 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -11,8 +11,12 @@ */ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; @@ -20,9 +24,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import java.util.ArrayList; -import java.util.List; - public final class ModManaInfusionRecipes { public static List manaPetalRecipes; diff --git a/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java b/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java index 708578dfa..3148a8738 100644 --- a/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/MODSRC/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -11,17 +11,19 @@ */ package vazkii.botania.common.crafting; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibOreDict; -import java.util.ArrayList; -import java.util.List; - public final class ModRuneRecipes { public static RecipeRuneAltar recipeWaterRune; diff --git a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java index 5ea3c5064..ac726c523 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java +++ b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java @@ -11,6 +11,10 @@ */ package vazkii.botania.common.entity; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.entity.Entity; @@ -21,7 +25,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.World; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.ILensEffect; @@ -33,10 +41,6 @@ import vazkii.botania.common.block.tile.TileSpreader; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; -import java.awt.*; -import java.util.ArrayList; -import java.util.List; - public class EntityManaBurst extends EntityThrowable implements IManaBurst { private static final String TAG_COLOR = "color"; diff --git a/MODSRC/vazkii/botania/common/entity/ModEntities.java b/MODSRC/vazkii/botania/common/entity/ModEntities.java index 3ece8164f..17d6e0a54 100644 --- a/MODSRC/vazkii/botania/common/entity/ModEntities.java +++ b/MODSRC/vazkii/botania/common/entity/ModEntities.java @@ -11,9 +11,9 @@ */ package vazkii.botania.common.entity; -import cpw.mods.fml.common.registry.EntityRegistry; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibEntityNames; +import cpw.mods.fml.common.registry.EntityRegistry; public final class ModEntities { diff --git a/MODSRC/vazkii/botania/common/item/Item16Colors.java b/MODSRC/vazkii/botania/common/item/Item16Colors.java index 52f206d3a..3ff721388 100644 --- a/MODSRC/vazkii/botania/common/item/Item16Colors.java +++ b/MODSRC/vazkii/botania/common/item/Item16Colors.java @@ -11,14 +11,14 @@ */ package vazkii.botania.common.item; +import java.awt.Color; +import java.util.List; + import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import java.awt.*; -import java.util.List; - public class Item16Colors extends ItemMod { public Item16Colors(String name) { diff --git a/MODSRC/vazkii/botania/common/item/ItemDirtRod.java b/MODSRC/vazkii/botania/common/item/ItemDirtRod.java index 42a3776d3..234acc8de 100644 --- a/MODSRC/vazkii/botania/common/item/ItemDirtRod.java +++ b/MODSRC/vazkii/botania/common/item/ItemDirtRod.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; diff --git a/MODSRC/vazkii/botania/common/item/ItemFertilizer.java b/MODSRC/vazkii/botania/common/item/ItemFertilizer.java index d3279eb27..78f1f97d5 100644 --- a/MODSRC/vazkii/botania/common/item/ItemFertilizer.java +++ b/MODSRC/vazkii/botania/common/item/ItemFertilizer.java @@ -11,6 +11,10 @@ */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ChunkCoordinates; @@ -19,9 +23,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; -import java.util.ArrayList; -import java.util.List; - public class ItemFertilizer extends ItemMod { public ItemFertilizer() { diff --git a/MODSRC/vazkii/botania/common/item/ItemGrassHorn.java b/MODSRC/vazkii/botania/common/item/ItemGrassHorn.java index ed133e2f1..6bef4b443 100644 --- a/MODSRC/vazkii/botania/common/item/ItemGrassHorn.java +++ b/MODSRC/vazkii/botania/common/item/ItemGrassHorn.java @@ -11,6 +11,11 @@ */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.entity.item.EntityItem; @@ -22,11 +27,6 @@ import net.minecraft.world.World; import vazkii.botania.api.ISpecialFlower; import vazkii.botania.common.lib.LibItemNames; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; - public class ItemGrassHorn extends ItemMod { public ItemGrassHorn() { diff --git a/MODSRC/vazkii/botania/common/item/ItemGrassSeeds.java b/MODSRC/vazkii/botania/common/item/ItemGrassSeeds.java index 3d8d356ad..f2486f16f 100644 --- a/MODSRC/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/MODSRC/vazkii/botania/common/item/ItemGrassSeeds.java @@ -11,12 +11,12 @@ */ package vazkii.botania.common.item; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -30,8 +30,12 @@ import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; - -import java.util.*; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import cpw.mods.fml.common.gameevent.TickEvent.Phase; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemGrassSeeds extends ItemMod { diff --git a/MODSRC/vazkii/botania/common/item/ItemLens.java b/MODSRC/vazkii/botania/common/item/ItemLens.java index f9b961f00..dcb97232d 100644 --- a/MODSRC/vazkii/botania/common/item/ItemLens.java +++ b/MODSRC/vazkii/botania/common/item/ItemLens.java @@ -11,7 +11,12 @@ */ package vazkii.botania.common.item; -import cpw.mods.fml.common.registry.GameRegistry; +import java.awt.Color; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -24,7 +29,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.internal.IManaBurst; @@ -38,12 +47,7 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.lib.LibItemNames; - -import java.awt.*; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import cpw.mods.fml.common.registry.GameRegistry; public class ItemLens extends ItemMod implements ILens { diff --git a/MODSRC/vazkii/botania/common/item/ItemManaCookie.java b/MODSRC/vazkii/botania/common/item/ItemManaCookie.java index b501fbe09..69d8a7ef8 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaCookie.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaCookie.java @@ -11,9 +11,6 @@ */ package vazkii.botania.common.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; @@ -21,6 +18,9 @@ import net.minecraft.potion.Potion; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { diff --git a/MODSRC/vazkii/botania/common/item/ItemManaGun.java b/MODSRC/vazkii/botania/common/item/ItemManaGun.java index 06baa839c..256b6eb02 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaGun.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaGun.java @@ -11,7 +11,8 @@ */ package vazkii.botania.common.item; -import cpw.mods.fml.common.registry.GameRegistry; +import java.util.List; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,8 +27,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; - -import java.util.List; +import cpw.mods.fml.common.registry.GameRegistry; public class ItemManaGun extends ItemMod { diff --git a/MODSRC/vazkii/botania/common/item/ItemManaMirror.java b/MODSRC/vazkii/botania/common/item/ItemManaMirror.java index e47495647..ed78db83a 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaMirror.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaMirror.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.item; +import java.awt.Color; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +22,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; @@ -27,9 +31,6 @@ import vazkii.botania.common.block.tile.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import java.awt.*; -import java.util.List; - public class ItemManaMirror extends ItemMod implements IManaItem { IIcon[] icons; diff --git a/MODSRC/vazkii/botania/common/item/ItemManaPetal.java b/MODSRC/vazkii/botania/common/item/ItemManaPetal.java index ef4882949..c38f5be5b 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaPetal.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaPetal.java @@ -11,8 +11,10 @@ */ package vazkii.botania.common.item; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/item/ItemManaResource.java b/MODSRC/vazkii/botania/common/item/ItemManaResource.java index 4d1df7e0b..d5b17dd80 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaResource.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaResource.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.item; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -19,8 +21,6 @@ import net.minecraft.util.IIcon; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; -import java.util.List; - public class ItemManaResource extends ItemMod { final int types = 5; diff --git a/MODSRC/vazkii/botania/common/item/ItemManaTablet.java b/MODSRC/vazkii/botania/common/item/ItemManaTablet.java index 9bd32a899..6d3c1494a 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaTablet.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaTablet.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.item; +import java.awt.Color; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -25,9 +28,6 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import java.awt.*; -import java.util.List; - public class ItemManaTablet extends ItemMod implements IManaItem { IIcon[] icons; diff --git a/MODSRC/vazkii/botania/common/item/ItemMod.java b/MODSRC/vazkii/botania/common/item/ItemMod.java index 2a3a25622..9796c3f58 100644 --- a/MODSRC/vazkii/botania/common/item/ItemMod.java +++ b/MODSRC/vazkii/botania/common/item/ItemMod.java @@ -11,13 +11,13 @@ */ package vazkii.botania.common.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemMod extends Item { diff --git a/MODSRC/vazkii/botania/common/item/ItemRune.java b/MODSRC/vazkii/botania/common/item/ItemRune.java index 4d885ec17..bf57422f7 100644 --- a/MODSRC/vazkii/botania/common/item/ItemRune.java +++ b/MODSRC/vazkii/botania/common/item/ItemRune.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.item; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.inventory.IInventory; @@ -21,8 +23,6 @@ import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; -import java.util.List; - public class ItemRune extends ItemMod implements IFlowerComponent { IIcon[] icons; diff --git a/MODSRC/vazkii/botania/common/item/ItemSignalFlare.java b/MODSRC/vazkii/botania/common/item/ItemSignalFlare.java index 536f704b3..b9acb0892 100644 --- a/MODSRC/vazkii/botania/common/item/ItemSignalFlare.java +++ b/MODSRC/vazkii/botania/common/item/ItemSignalFlare.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.item; +import java.awt.Color; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -31,9 +34,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; -import java.awt.*; -import java.util.List; - public class ItemSignalFlare extends ItemMod { IIcon[] icons; diff --git a/MODSRC/vazkii/botania/common/item/ItemTerraformRod.java b/MODSRC/vazkii/botania/common/item/ItemTerraformRod.java index 6832aa529..2cc2d70a5 100644 --- a/MODSRC/vazkii/botania/common/item/ItemTerraformRod.java +++ b/MODSRC/vazkii/botania/common/item/ItemTerraformRod.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.item; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.entity.player.EntityPlayer; @@ -25,9 +28,6 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; -import java.util.ArrayList; -import java.util.List; - public class ItemTerraformRod extends ItemMod { private static final int COST_PER = 55; diff --git a/MODSRC/vazkii/botania/common/item/ItemTwigWand.java b/MODSRC/vazkii/botania/common/item/ItemTwigWand.java index b5d65f691..229ed6a60 100644 --- a/MODSRC/vazkii/botania/common/item/ItemTwigWand.java +++ b/MODSRC/vazkii/botania/common/item/ItemTwigWand.java @@ -11,6 +11,9 @@ */ package vazkii.botania.common.item; +import java.awt.Color; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -31,9 +34,6 @@ import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; -import java.awt.*; -import java.util.List; - public class ItemTwigWand extends Item16Colors { IIcon[] icons; diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index c838c6774..b42e1add0 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -15,9 +15,20 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import vazkii.botania.common.item.equipment.armor.*; -import vazkii.botania.common.item.equipment.bauble.ItemSimpleRing; -import vazkii.botania.common.item.equipment.tool.*; +import vazkii.botania.common.item.equipment.armor.ItemManasteelBoots; +import vazkii.botania.common.item.equipment.armor.ItemManasteelChest; +import vazkii.botania.common.item.equipment.armor.ItemManasteelHelm; +import vazkii.botania.common.item.equipment.armor.ItemManasteelLegs; +import vazkii.botania.common.item.equipment.armor.ItemTerrasteelBoots; +import vazkii.botania.common.item.equipment.armor.ItemTerrasteelChest; +import vazkii.botania.common.item.equipment.armor.ItemTerrasteelHelm; +import vazkii.botania.common.item.equipment.armor.ItemTerrasteelLegs; +import vazkii.botania.common.item.equipment.tool.ItemManasteelAxe; +import vazkii.botania.common.item.equipment.tool.ItemManasteelPick; +import vazkii.botania.common.item.equipment.tool.ItemManasteelShears; +import vazkii.botania.common.item.equipment.tool.ItemManasteelShovel; +import vazkii.botania.common.item.equipment.tool.ItemManasteelSword; +import vazkii.botania.common.item.equipment.tool.ItemTerraSword; import vazkii.botania.common.lib.LibOreDict; public final class ModItems { @@ -55,7 +66,6 @@ public final class ModItems { public static Item terrasteelLegs; public static Item terrasteelBoots; public static Item terraSword; - public static Item test; public static void init() { lexicon = new ItemLexicon(); @@ -91,7 +101,6 @@ public final class ModItems { terrasteelLegs = new ItemTerrasteelLegs(); terrasteelBoots = new ItemTerrasteelBoots(); terraSword = new ItemTerraSword(); - test = new ItemSimpleRing(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 4b8eebfaa..dba2e40f4 100644 --- a/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/MODSRC/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -11,6 +11,8 @@ */ package vazkii.botania.common.item.block; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -27,8 +29,6 @@ import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibBlockNames; -import java.util.List; - public class ItemBlockSpecialFlower extends ItemBlock implements IRecipeKeyProvider { public ItemBlockSpecialFlower(Block block1) { diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java b/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java index 127bc9cae..888c900ab 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/ItemManasteelArmor.java @@ -11,6 +11,12 @@ */ package vazkii.botania.common.item.equipment.armor; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.item.equipment.tool.ManasteelToolCommons; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,11 +29,8 @@ import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.ISpecialArmor; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.equipment.tool.ManasteelToolCommons; +import net.minecraftforge.common.ISpecialArmor.ArmorProperties; +import net.minecraftforge.common.util.EnumHelper; public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor { diff --git a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteeelArmor.java b/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteeelArmor.java index 6784a2709..e19e8550d 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteeelArmor.java +++ b/MODSRC/vazkii/botania/common/item/equipment/armor/ItemTerrasteeelArmor.java @@ -11,8 +11,8 @@ */ package vazkii.botania.common.item.equipment.armor; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.UUID; + import net.minecraft.entity.Entity; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -20,7 +20,8 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.lib.LibResources; -import java.util.UUID; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; public class ItemTerrasteeelArmor extends ItemManasteelArmor { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java index 79193f509..3e9a19ff5 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelAxe.java @@ -11,9 +11,6 @@ */ package vazkii.botania.common.item.equipment.tool; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -25,6 +22,9 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemManasteelAxe extends ItemAxe { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java index c7b8902b8..f275b6a35 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelPick.java @@ -11,9 +11,6 @@ */ package vazkii.botania.common.item.equipment.tool; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -25,6 +22,9 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemManasteelPick extends ItemPickaxe { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java index 1efb36e4e..129ac51b1 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShears.java @@ -11,6 +11,12 @@ */ package vazkii.botania.common.item.equipment.tool; +import java.util.ArrayList; +import java.util.Random; + +import vazkii.botania.client.core.helper.IconHelper; +import vazkii.botania.common.core.BotaniaCreativeTab; +import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,12 +32,6 @@ import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraftforge.common.IShearable; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.lib.LibItemNames; - -import java.util.ArrayList; -import java.util.Random; public class ItemManasteelShears extends ItemShears { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java index 67dad3c9c..e34a3cf03 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelShovel.java @@ -11,9 +11,6 @@ */ package vazkii.botania.common.item.equipment.tool; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -25,6 +22,9 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemManasteelShovel extends ItemSpade { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelSword.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelSword.java index 036d03d30..82da84c54 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelSword.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemManasteelSword.java @@ -11,9 +11,6 @@ */ package vazkii.botania.common.item.equipment.tool; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -26,6 +23,9 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemManasteelSword extends ItemSword { diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraSword.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraSword.java index 5333be4af..9e3697c22 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraSword.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraSword.java @@ -21,7 +21,9 @@ import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; +import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensEffect; +import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java index 0b75d2f83..75931fd6a 100644 --- a/MODSRC/vazkii/botania/common/lexicon/LexiconData.java +++ b/MODSRC/vazkii/botania/common/lexicon/LexiconData.java @@ -22,7 +22,13 @@ import vazkii.botania.common.crafting.ModCrafingRecipes; import vazkii.botania.common.crafting.ModManaInfusionRecipes; import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; -import vazkii.botania.common.lexicon.page.*; +import vazkii.botania.common.lexicon.page.PageCraftingRecipe; +import vazkii.botania.common.lexicon.page.PageImage; +import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; +import vazkii.botania.common.lexicon.page.PagePetalRecipe; +import vazkii.botania.common.lexicon.page.PageRuneRecipe; +import vazkii.botania.common.lexicon.page.PageTerrasteel; +import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; public final class LexiconData { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 6af7137dd..ffec05581 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -11,9 +11,10 @@ */ package vazkii.botania.common.lexicon.page; -import cpw.mods.fml.relauncher.ReflectionHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.TextureManager; @@ -25,16 +26,17 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; + 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.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import cpw.mods.fml.relauncher.ReflectionHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PageCraftingRecipe extends PageRecipe { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageImage.java b/MODSRC/vazkii/botania/common/lexicon/page/PageImage.java index ca02f788e..ea7ae0512 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageImage.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageImage.java @@ -11,15 +11,17 @@ */ package vazkii.botania.common.lexicon.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PageImage extends LexiconPage { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 20c6bc852..20c644bd2 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -11,8 +11,9 @@ */ package vazkii.botania.common.lexicon.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Arrays; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -21,7 +22,9 @@ 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; @@ -30,9 +33,8 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePool; - -import java.util.Arrays; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PageManaInfusionRecipe extends PageRecipe { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index d899e9caa..44a4a294d 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -11,15 +11,18 @@ */ package vazkii.botania.common.lexicon.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Arrays; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; 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; @@ -27,9 +30,8 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; - -import java.util.Arrays; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PagePetalRecipe extends PageRecipe { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java index fcc07b0ff..804b456e1 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -11,8 +11,9 @@ */ package vazkii.botania.common.lexicon.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Arrays; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -23,17 +24,18 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.client.ForgeHooksClient; + import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; + import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.GuiLexiconEntry; - -import java.util.Arrays; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PageRecipe extends LexiconPage { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index cf60ba755..754c1a463 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -11,20 +11,22 @@ */ package vazkii.botania.common.lexicon.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; + import org.lwjgl.opengl.GL11; + import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePool; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PageRuneRecipe extends PagePetalRecipe { diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/MODSRC/vazkii/botania/common/lexicon/page/PageTerrasteel.java index fd3800325..eceb5d59b 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -11,18 +11,21 @@ */ package vazkii.botania.common.lexicon.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; + +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.api.recipe.RecipeManaInfusion; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.item.ModItems; diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageText.java b/MODSRC/vazkii/botania/common/lexicon/page/PageText.java index 6fe863cc9..44c22c765 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageText.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageText.java @@ -11,8 +11,9 @@ */ package vazkii.botania.common.lexicon.page; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.MathHelper; @@ -20,9 +21,8 @@ import net.minecraft.util.StatCollector; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.client.core.helper.FontHelper; - -import java.util.ArrayList; -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class PageText extends LexiconPage { diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 103c3a44f..b07b0e549 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -48,7 +48,6 @@ public final class LibItemNames { public static final String TERRASTEEL_LEGS = LibResources.PREFIX_MOD + "terrasteelLegs"; public static final String TERRASTEEL_BOOTS = LibResources.PREFIX_MOD + "terrasteelBoots"; public static final String TERRA_SWORD = LibResources.PREFIX_MOD + "terraSword"; - public static final String TEST = LibResources.PREFIX_MOD + "ring"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", diff --git a/MODSRC/vazkii/botania/common/network/GuiHandler.java b/MODSRC/vazkii/botania/common/network/GuiHandler.java index c5cf22edf..f9e172cd8 100644 --- a/MODSRC/vazkii/botania/common/network/GuiHandler.java +++ b/MODSRC/vazkii/botania/common/network/GuiHandler.java @@ -11,11 +11,11 @@ */ package vazkii.botania.common.network; -import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import vazkii.botania.client.gui.GuiLexicon; import vazkii.botania.common.lib.LibGuiIDs; +import cpw.mods.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler {