diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index d9e071786..93e756cd0 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -10,22 +10,16 @@ */ package vazkii.botania.api; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.base.Preconditions; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; import net.minecraft.block.BlockStainedGlass; import net.minecraft.block.BlockStainedGlassPane; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; -import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -40,6 +34,7 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.brew.Brew; @@ -63,59 +58,62 @@ import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.SimpleWikiProvider; import vazkii.botania.api.wiki.WikiHooks; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; - -import net.minecraftforge.fml.common.Loader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; public final class BotaniaAPI { - private static List categories = new ArrayList<>(); - private static List allEntries = new ArrayList<>(); + private static final List categories = new ArrayList<>(); + private static final List allEntries = new ArrayList<>(); - public static Map knowledgeTypes = new HashMap<>(); + public static final Map knowledgeTypes = new HashMap<>(); - public static Map brewMap = new LinkedHashMap<>(); + public static final Map brewMap = new LinkedHashMap<>(); - public static List disposableBlocks = new ArrayList<>(); - public static List semiDisposableBlocks = new ArrayList<>(); + public static final List disposableBlocks = new ArrayList<>(); + public static final List semiDisposableBlocks = new ArrayList<>(); - public static List petalRecipes = new ArrayList<>(); - public static List pureDaisyRecipes = new ArrayList<>(); - public static List manaInfusionRecipes = new ArrayList<>(); - public static List runeAltarRecipes = new ArrayList<>(); - public static List elvenTradeRecipes = new ArrayList<>(); - public static List brewRecipes = new ArrayList<>(); - public static List miniFlowerRecipes = new ArrayList<>(); + public static final List petalRecipes = new ArrayList<>(); + public static final List pureDaisyRecipes = new ArrayList<>(); + public static final List manaInfusionRecipes = new ArrayList<>(); + public static final List runeAltarRecipes = new ArrayList<>(); + public static final List elvenTradeRecipes = new ArrayList<>(); + public static final List brewRecipes = new ArrayList<>(); + public static final List miniFlowerRecipes = new ArrayList<>(); - private static BiMap> subTiles = HashBiMap.> create(); - private static Map, SubTileSignature> subTileSignatures = new HashMap<>(); - public static Set subtilesForCreativeMenu = new LinkedHashSet<>(); - public static Map subTileMods = new HashMap<>(); - public static BiMap miniFlowers = HashBiMap. create(); + private static final BiMap> subTiles = HashBiMap.> create(); + private static final Map, SubTileSignature> subTileSignatures = new HashMap<>(); + public static final Set subtilesForCreativeMenu = new LinkedHashSet<>(); + public static final Map subTileMods = new HashMap<>(); + public static final BiMap miniFlowers = HashBiMap. create(); - public static Map oreWeights = new HashMap<>(); - public static Map oreWeightsNether = new HashMap<>(); - public static Map seeds = new HashMap<>(); + public static final Map oreWeights = new HashMap<>(); + public static final Map oreWeightsNether = new HashMap<>(); + public static final Map seeds = new HashMap<>(); - public static Set looniumBlacklist = new LinkedHashSet<>(); - public static Map> paintableBlocks = new LinkedHashMap<>(); - public static Set magnetBlacklist = new LinkedHashSet<>(); - public static Set> gravityRodBlacklist = new LinkedHashSet<>(); + public static final Set looniumBlacklist = new LinkedHashSet<>(); + public static final Map> paintableBlocks = new LinkedHashMap<>(); + public static final Set magnetBlacklist = new LinkedHashSet<>(); + public static final Set> gravityRodBlacklist = new LinkedHashSet<>(); - public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); - public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); + public static final ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); + public static final ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); - public static ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); - public static ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); + public static final ArmorMaterial elementiumArmorMaterial = EnumHelper.addArmorMaterial("B_ELEMENTIUM", "b_elementium", 18, new int[] { 2, 6, 5, 2 }, 18, SoundEvents.item_armor_equip_iron); + public static final ToolMaterial elementiumToolMaterial = EnumHelper.addToolMaterial("B_ELEMENTIUM", 3, 720, 6.2F, 2F, 20); - public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.item_armor_equip_iron); - public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); + public static final ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", "terrasteel", 34, new int[] {3, 8, 6, 3}, 26, SoundEvents.item_armor_equip_iron); + public static final ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); - public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.item_armor_equip_iron); + public static final ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18, SoundEvents.item_armor_equip_iron); - public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); + public static final EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic"); public static KnowledgeType basicKnowledge; public static KnowledgeType elvenKnowledge; diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index dd6d0ddd3..071d580ff 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.boss; -import java.awt.Rectangle; - import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; @@ -19,6 +17,8 @@ import net.minecraft.world.BossInfo; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import java.awt.*; + /** * An extension of IBossDisplayData. This counts as a botania boss and as a normal * minecraft boss since it has IBossDisplayData. Instead of using the typical diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java index 038b287c4..c7a425412 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBossWithShader.java @@ -11,8 +11,6 @@ package vazkii.botania.api.boss; import vazkii.botania.api.internal.ShaderCallback; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * A Botania boss whose HP bar makes use of shaders. Shaders diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index e4c73611a..2e5a26142 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -10,15 +10,12 @@ */ package vazkii.botania.api.brew; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; +import java.util.List; + /** * The class for a Brew definition, each one is a singleton. */ @@ -29,8 +26,8 @@ public class Brew { private final int color; private final int cost; private final List effects; - boolean canInfuseBloodPendant = true; - boolean canInfuseIncense = true; + private boolean canInfuseBloodPendant = true; + private boolean canInfuseIncense = true; /** * @param name The unlocalized name of this potion. diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 918149113..5bb7808ac 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -9,6 +9,18 @@ * File Created @ [Feb 14, 2015, 3:28:54 PM (GMT)] */ package vazkii.botania.api.corporea; + +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableList; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import vazkii.botania.api.BotaniaAPI; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -16,20 +28,6 @@ import java.util.Map; import java.util.WeakHashMap; import java.util.regex.Pattern; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableList; -import net.minecraft.entity.Entity; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import vazkii.botania.api.BotaniaAPI; - public final class CorporeaHelper { private static final List empty = ImmutableList.of(); @@ -38,9 +36,7 @@ public final class CorporeaHelper { private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); - public static final String[] WILDCARD_STRINGS = new String[] { - "...", "~", "+", "?" , "*" - }; + public static final String[] WILDCARD_STRINGS = { "...", "~", "+", "?" , "*" }; /** * How many items were matched in the last request. If java had "out" params like C# this wouldn't be needed :V diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java index c1b909d5b..1017006c6 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaAutoCompleteController.java @@ -10,9 +10,6 @@ */ package vazkii.botania.api.corporea; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - /** * An interface for systems which may control if the item auto complete system should be active */ diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java index 41756abd5..c7d7f4609 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java @@ -10,11 +10,10 @@ */ package vazkii.botania.api.corporea; -import java.util.List; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import java.util.List; + /** * A TileEntity that implements this will be able to intercept corporea * requests case there is a Corporea Spark on top. diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java index cd3197a30..f44048595 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaSpark.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.corporea; -import java.util.List; - import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; +import java.util.List; + /** * An interface for a Corporea Spark. Includes functions for handling * connections. diff --git a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java index c2ff6ac14..96f863af3 100644 --- a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java +++ b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java @@ -9,11 +9,10 @@ */ package vazkii.botania.api.corporea; -import java.util.List; - -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import java.util.List; + /** * This interface wraps IInventory corporea works with in order to provide * compatibility with different storage mods. diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index e6cf022b3..e1425597a 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -10,14 +10,14 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; +import java.util.List; + public class DummyManaNetwork implements IManaNetwork { public static final DummyManaNetwork instance = new DummyManaNetwork(); diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 37694a2fd..c7e3eceb8 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -22,11 +20,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; @@ -40,6 +37,8 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; +import java.util.List; + public class DummyMethodHandler implements IInternalMethodHandler { @Override diff --git a/src/main/java/vazkii/botania/api/internal/DummyPage.java b/src/main/java/vazkii/botania/api/internal/DummyPage.java index 961ea6029..6b8d7be91 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyPage.java +++ b/src/main/java/vazkii/botania/api/internal/DummyPage.java @@ -10,9 +10,9 @@ */ package vazkii.botania.api.internal; -import vazkii.botania.api.lexicon.LexiconPage; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.lexicon.LexiconPage; /** * A dummy page. It does absolutely nothing and is only diff --git a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java index b0d4d6ef4..f7703eea1 100644 --- a/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import vazkii.botania.api.lexicon.LexiconEntry; +import java.util.List; + /** * Internal interface for the Lexicon Entry GUI. This contains * everything that can be accessed from it. It's safe to cast diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index 565e386cf..0448c8f5b 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -21,11 +19,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.corporea.IWrappedInventory; @@ -38,8 +37,8 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; /** * Any methods that refer to internal methods in Botania are here. diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index 622001909..42745a74d 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaBurst.java +++ b/src/main/java/vazkii/botania/api/internal/IManaBurst.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.internal; -import java.util.UUID; - import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import java.util.UUID; + /** * Interface for the Mana Burst entity. This can safely be casted to EntityThrowable. */ diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index 54813ef97..7f1488fea 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.mana.TileSignature; +import java.util.List; + /** * A basic interface for a world's Mana Network. * @see IInternalMethodHandler#getManaNetworkInstance() diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 647b4bd31..87d64a61a 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.internal; -import java.util.List; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.List; + public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 38de54964..f890c256a 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -14,9 +14,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - /** * A Bauble Item that implements this will be have hooks to render something on * the player while its equipped. diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index 78502de4f..e51cf5034 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -11,6 +11,7 @@ package vazkii.botania.api.item; import net.minecraft.item.ItemStack; + import java.util.HashMap; public interface IFloatingFlower { @@ -35,6 +36,8 @@ public interface IFloatingFlower { public static final IslandType INFUSED = new IslandType("INFUSED"); public static final IslandType MUTATED = new IslandType("MUTATED"); + private final String typeName; + /** * Instantiates and registers a new floating flower island type * Note that you need to register the model for this island type, see BotaniaAPIClient @@ -46,8 +49,6 @@ public interface IFloatingFlower { registry.put(name, this); } - public final String typeName; - public static IslandType ofType(String typeStr) { IslandType type = registry.get(typeStr); return type == null ? GRASS : type; diff --git a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java b/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java deleted file mode 100644 index 4b54fc0e9..000000000 --- a/src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Oct 29, 2014, 4:52:04 PM (GMT)] - */ -package vazkii.botania.api.item; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -/** - * A BlockBush can implement this to check if it can be broken - * by a Horn/Drum of the Wild or not. - * @Deprecated Use IHornHarvestable instead - */ -@Deprecated -public interface IGrassHornExcempt { - - public boolean canUproot(World world, BlockPos pos); - -} diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index c8d72b877..39e7528a3 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.item; -import java.util.UUID; - import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import java.util.UUID; + /** * An item that implements this counts as a Relic item. This is purely for interaction * and other mod items should not implement this interface. diff --git a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java index 7c088c4dd..6d7969468 100644 --- a/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java +++ b/src/main/java/vazkii/botania/api/item/ISequentialBreaker.java @@ -12,8 +12,8 @@ package vazkii.botania.api.item; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; /** * An item that implements this can break multiple blocks at once diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index c28d4ae66..efa39d191 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -10,13 +10,11 @@ */ package vazkii.botania.api.item; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; /** * An item that implements this will allow for various wireframes to be drawn @@ -27,7 +25,7 @@ public interface IWireframeCoordinateListProvider { /** * Returns a list of BlockPos for the wireframes to draw. - * Can be null. + * Will not be null. */ public List getWireframesToDraw(EntityPlayer player, ItemStack stack); diff --git a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java index 11b8db411..440004a12 100644 --- a/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java +++ b/src/main/java/vazkii/botania/api/item/TinyPotatoRenderEvent.java @@ -12,8 +12,6 @@ package vazkii.botania.api.item; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.eventhandler.Event; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Why would you ever want this ._. diff --git a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java b/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java index a739f8f15..73ec1c9b0 100644 --- a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java +++ b/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java @@ -10,10 +10,10 @@ */ package vazkii.botania.api.lexicon; -import java.util.Queue; - import net.minecraftforge.fml.common.eventhandler.Event; +import java.util.Queue; + /** * Fired when the Lexica Botania's tutorial is started. You can add your * own entries to the tutorial here. Please use this responsibly. diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index ec30651b7..8d46f8246 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.lexicon; +import net.minecraft.util.ResourceLocation; + import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ResourceLocation; - public class LexiconCategory implements Comparable { private static int count = 0; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index f31fbcb46..6e2afd1fd 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -10,16 +10,16 @@ */ package vazkii.botania.api.lexicon; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.translation.I18n; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.BotaniaAPI; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; -import vazkii.botania.api.BotaniaAPI; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - public class LexiconEntry implements Comparable { public final String unlocalizedName; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index 7c70491d4..a19fd9dc7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.lexicon; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; -import vazkii.botania.api.internal.IGuiLexiconEntry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; + +import java.util.List; public abstract class LexiconPage { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index fc13ea829..4f525effe 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -10,12 +10,12 @@ */ package vazkii.botania.api.lexicon; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaItem; +import java.util.HashMap; +import java.util.Map; + /** * 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/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index 494f98f12..4f8605cc3 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -10,14 +10,14 @@ */ package vazkii.botania.api.lexicon.multiblock; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; +import java.util.HashMap; +import java.util.Map; + /** * A hook for rendering blocks in the multiblock display. */ diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 09f594ab2..dad7dd155 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -10,14 +10,18 @@ */ package vazkii.botania.api.lexicon.multiblock; -import java.util.*; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * This class describes a Mutiblock object. It's used to display a * multiblock in the lexicon and to show the player in a ghost-like diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index 6104a2118..7b7405ec3 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -11,8 +11,6 @@ package vazkii.botania.api.mana; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Have an Item implement this to be counted as a lens for the mana spreader. diff --git a/src/main/java/vazkii/botania/api/mana/IPingable.java b/src/main/java/vazkii/botania/api/mana/IPingable.java index 1605b428e..c8532bc23 100644 --- a/src/main/java/vazkii/botania/api/mana/IPingable.java +++ b/src/main/java/vazkii/botania/api/mana/IPingable.java @@ -10,10 +10,10 @@ */ package vazkii.botania.api.mana; -import java.util.UUID; - import vazkii.botania.api.internal.IManaBurst; +import java.util.UUID; + /** * This describes an interface of a Mana Sender block that should be able to pingbackable * by a burst to tell it that the burst is still alive. diff --git a/src/main/java/vazkii/botania/api/mana/TileSignature.java b/src/main/java/vazkii/botania/api/mana/TileSignature.java index 8f5b98759..a63309048 100644 --- a/src/main/java/vazkii/botania/api/mana/TileSignature.java +++ b/src/main/java/vazkii/botania/api/mana/TileSignature.java @@ -14,7 +14,7 @@ public class TileSignature { @Override public int hashCode() { - return Boolean.hashCode(remoteWorld) ^ tile.hashCode(); + return Boolean.hashCode(remoteWorld) ^ System.identityHashCode(tile); } @Override diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index 58fa96278..82bcd0214 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.mana.spark; -import java.util.List; - import com.google.common.base.Predicates; import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; +import java.util.List; + public final class SparkHelper { public static final int SPARK_SCAN_RANGE = 12; diff --git a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java index ba90e0b1c..605243ab6 100644 --- a/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java +++ b/src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.recipe; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.fml.common.eventhandler.Event; +import java.util.List; + /** * An event fired when an Elven Portal TE updates. The portal's * relevant AABB and other stuff is passed in for convenience. This diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index bedf6f061..d07da21b4 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -10,18 +10,17 @@ */ package vazkii.botania.api.recipe; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; +import java.util.ArrayList; +import java.util.List; + public class RecipeBrew { private final Brew brew; @@ -89,7 +88,7 @@ public class RecipeBrew { return inputsMissing.isEmpty(); } - boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { + private boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { return stack.getItem() == stack2.getItem() && stack.getItemDamage() == stack2.getItemDamage(); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index b1dbc324c..04e96274d 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -1,12 +1,12 @@ package vazkii.botania.api.recipe; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.List; + public class RecipeElvenTrade { private final ItemStack output; @@ -80,7 +80,7 @@ public class RecipeElvenTrade { return inputsMissing.isEmpty(); } - boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { + private boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { return stack.getItem() == stack2.getItem() && stack.getItemDamage() == stack2.getItemDamage(); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index b782f43e2..0f659de48 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.recipe; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import java.util.List; + public class RecipeManaInfusion { private final ItemStack output; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 9f1848a9b..7f0072791 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -10,15 +10,14 @@ */ package vazkii.botania.api.recipe; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.ImmutableList; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.oredict.OreDictionary; +import java.util.ArrayList; +import java.util.List; + public class RecipePetals { private final ItemStack output; @@ -83,7 +82,7 @@ public class RecipePetals { return inputsMissing.isEmpty(); } - boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { + private boolean simpleAreStacksEqual(ItemStack stack, ItemStack stack2) { return stack.getItem() == stack2.getItem() && stack.getItemDamage() == stack2.getItemDamage(); } diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 43d2f3b6f..51aea7e31 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -10,10 +10,6 @@ */ package vazkii.botania.api.recipe; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.google.common.base.Preconditions; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -23,6 +19,10 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.subtile.SubTileEntity; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class RecipePureDaisy { public static final int DEFAULT_TIME = 150; @@ -57,7 +57,7 @@ public class RecipePureDaisy { return isOreDict(stack, oredict); } - public boolean isOreDict(ItemStack stack, String entry) { + private boolean isOreDict(ItemStack stack, String entry) { if(stack == null || stack.getItem() == null) return false; diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 1324e9c7d..a5775dc68 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -17,13 +17,31 @@ import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import vazkii.botania.api.item.IFloatingFlower; -import vazkii.botania.api.state.enums.*; - -import javax.annotation.Nullable; +import vazkii.botania.api.state.enums.AlfPortalState; +import vazkii.botania.api.state.enums.AltGrassVariant; +import vazkii.botania.api.state.enums.AltarVariant; +import vazkii.botania.api.state.enums.BiomeBrickVariant; +import vazkii.botania.api.state.enums.BiomeStoneVariant; +import vazkii.botania.api.state.enums.CratePattern; +import vazkii.botania.api.state.enums.CrateVariant; +import vazkii.botania.api.state.enums.CustomBrickVariant; +import vazkii.botania.api.state.enums.DrumVariant; +import vazkii.botania.api.state.enums.EndBrickVariant; +import vazkii.botania.api.state.enums.FutureStoneVariant; +import vazkii.botania.api.state.enums.LivingRockVariant; +import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.LuminizerVariant; +import vazkii.botania.api.state.enums.PlatformVariant; +import vazkii.botania.api.state.enums.PoolVariant; +import vazkii.botania.api.state.enums.PrismarineVariant; +import vazkii.botania.api.state.enums.PylonVariant; +import vazkii.botania.api.state.enums.QuartzVariant; +import vazkii.botania.api.state.enums.SpreaderVariant; +import vazkii.botania.api.state.enums.StorageVariant; /** * Holds all Botania block state properties. Use these to set botania blockstates diff --git a/src/main/java/vazkii/botania/api/state/PropertyObject.java b/src/main/java/vazkii/botania/api/state/PropertyObject.java index 328b4dbd7..8dd5ac757 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyObject.java +++ b/src/main/java/vazkii/botania/api/state/PropertyObject.java @@ -13,7 +13,6 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import net.minecraftforge.common.property.IUnlistedProperty; -import javax.annotation.Nullable; import java.util.Objects; // Generic base class for unlisted properties diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index d15e5fbe4..05e310e80 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.subtile; -import java.util.List; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -21,16 +19,18 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; + +import java.util.List; /** * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 2161a0e49..9220a9ae4 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -10,23 +10,23 @@ */ 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; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.sound.BotaniaSoundEvents; +import java.awt.*; + /** * The basic class for a Functional Flower. */ diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index e20ce2820..e7b377d04 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -10,9 +10,6 @@ */ package vazkii.botania.api.subtile; -import java.awt.Color; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -23,9 +20,9 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -33,6 +30,9 @@ import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; import vazkii.botania.api.sound.BotaniaSoundEvents; +import java.awt.*; +import java.util.List; + /** * The basic class for a Generating Flower. */ diff --git a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java index 913d98933..957c46999 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -10,19 +10,17 @@ */ package vazkii.botania.api.subtile.signature; -import net.minecraft.item.ItemStack; - -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.translation.I18n; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; +import java.util.List; + /** * A basic (and fallback) implementation of SubTileSignature. */ diff --git a/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java b/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java index 008fa83b6..73dea37f3 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/PassiveFlower.java @@ -10,12 +10,12 @@ */ package vazkii.botania.api.subtile.signature; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - import java.lang.annotation.Retention; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + /** * This annotation used for detecting whether a SubTileEntity * is a passive flower without having to instantiate it. This diff --git a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index 11833c014..9db646582 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.subtile.signature; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import java.util.List; + /** * A singleton instance for a SubTileEntity, this is called for a few methods. */ diff --git a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java index fe32afbb4..8d3321f44 100644 --- a/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java +++ b/src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java @@ -2,8 +2,6 @@ package vazkii.botania.api.wand; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * The item equivalent of ITileBound, renders when the diff --git a/src/main/java/vazkii/botania/api/wand/ITileBound.java b/src/main/java/vazkii/botania/api/wand/ITileBound.java index 5cde38c06..6468870cd 100644 --- a/src/main/java/vazkii/botania/api/wand/ITileBound.java +++ b/src/main/java/vazkii/botania/api/wand/ITileBound.java @@ -11,8 +11,6 @@ package vazkii.botania.api.wand; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; /** * Any TileEntity that implements this is technically bound diff --git a/src/main/java/vazkii/botania/api/wand/IWandBindable.java b/src/main/java/vazkii/botania/api/wand/IWandBindable.java index 4df323f75..49506f91c 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandBindable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandBindable.java @@ -12,8 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; /** * A TileEntity that implements this can be bound to another block diff --git a/src/main/java/vazkii/botania/api/wand/IWandable.java b/src/main/java/vazkii/botania/api/wand/IWandable.java index 5663d0a85..13997803e 100644 --- a/src/main/java/vazkii/botania/api/wand/IWandable.java +++ b/src/main/java/vazkii/botania/api/wand/IWandable.java @@ -12,8 +12,8 @@ package vazkii.botania.api.wand; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; /** diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index f57a6858a..b8baba53e 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -10,14 +10,12 @@ */ package vazkii.botania.api.wiki; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; - import org.apache.commons.lang3.text.WordUtils; public class SimpleWikiProvider implements IWikiProvider { diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 479e66e6e..3d22f4cde 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.wiki; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameData; +import java.util.HashMap; +import java.util.Map; + public class WikiHooks { private static final IWikiProvider FALLBACK_PROVIDER = new SimpleWikiProvider("FTB Wiki", "http://ftb.gamepedia.com/%s"); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 68c8112b5..60b8f98aa 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -33,7 +33,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.item.IGrassHornExcempt; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.item.IHornHarvestable.EnumHornType; import vazkii.botania.api.subtile.ISpecialFlower; @@ -102,7 +101,7 @@ public class ItemGrassHorn extends ItemMod { for(int k = -rangeY; k < rangeY + 1; k++) { BlockPos pos = srcPos.add(i, k, j); Block block = world.getBlockState(pos).getBlock(); - if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) && (!(block instanceof IGrassHornExcempt) || ((IGrassHornExcempt) block).canUproot(world, pos)) || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) || stackDmg == 2 && block == Blocks.snow_layer) + if(block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) : stackDmg == 0 && block instanceof BlockBush && !(block instanceof ISpecialFlower) || stackDmg == 1 && block.isLeaves(world.getBlockState(pos), world, pos) || stackDmg == 2 && block == Blocks.snow_layer) coords.add(pos); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index c3064e8b7..363ad190d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.relic; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -171,7 +172,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC @SideOnly(Side.CLIENT) public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { if(getLokiRing(player) != stack) - return null; + return ImmutableList.of(); RayTraceResult lookPos = Minecraft.getMinecraft().objectMouseOver; @@ -190,7 +191,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC return list; } - return null; + return ImmutableList.of(); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 45d9d8aab..24dfbea09 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -35,7 +35,7 @@ public class ItemRelic extends ItemMod implements IRelic { private static final String TAG_SOULBIND_NAME = "soulbind"; private static final String TAG_SOULBIND_UUID = "soulbindUUID"; - Achievement achievement; + private Achievement achievement; public ItemRelic(String name) { super(name); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index dfb95d677..49cddcfe3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item.rod; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -392,7 +393,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra public List getWireframesToDraw(EntityPlayer player, ItemStack stack) { ItemStack holding = player.getHeldItemMainhand(); if(holding != stack || !canExchange(stack)) - return null; + return ImmutableList.of(); Block block = getBlock(stack); int meta = getBlockMeta(stack); @@ -423,7 +424,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } } - return null; + return ImmutableList.of(); } }