diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index b9d932ad5..16b20db8c 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -10,19 +10,9 @@ */ package vazkii.botania.api; -import java.util.ArrayList; -import java.util.Collections; -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; @@ -39,12 +29,10 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; -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; import vazkii.botania.api.internal.DummyMethodHandler; @@ -67,6 +55,15 @@ import vazkii.botania.api.wiki.IWikiProvider; import vazkii.botania.api.wiki.SimpleWikiProvider; import vazkii.botania.api.wiki.WikiHooks; +import java.util.ArrayList; +import java.util.Collections; +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 final List categories = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index 2f2f17277..499ab347b 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -8,20 +8,16 @@ */ package vazkii.botania.api; -import java.util.Collections; -import java.util.Map; - -import com.google.common.base.Preconditions; import com.google.common.collect.Maps; - import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraftforge.fml.common.Loader; -import net.minecraftforge.fml.common.LoaderState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.subtile.SubTileEntity; +import java.util.Collections; +import java.util.Map; + /** * Class for API calls that must be made clientside */ diff --git a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java index 78c06afb6..4a8f71700 100644 --- a/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java +++ b/src/main/java/vazkii/botania/api/boss/IBotaniaBoss.java @@ -10,15 +10,15 @@ */ package vazkii.botania.api.boss; -import java.awt.Rectangle; -import java.util.UUID; - import net.minecraft.client.gui.ScaledResolution; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.ShaderCallback; +import java.awt.Rectangle; +import java.util.UUID; + /** * A Botania boss, that is subject to special rendering. */ diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index dbbf4e179..d91f0d780 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -10,13 +10,12 @@ */ package vazkii.botania.api.brew; -import java.util.List; - 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. */ diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index 31d2b7d12..608c8f5f9 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -10,16 +10,8 @@ */ package vazkii.botania.api.corporea; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -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.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -29,6 +21,13 @@ 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; +import java.util.Map; +import java.util.WeakHashMap; +import java.util.regex.Pattern; + public final class CorporeaHelper { private static final List empty = ImmutableList.of(); diff --git a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java index 8c1db88af..a5b5647d8 100644 --- a/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/api/corporea/ICorporeaInterceptor.java @@ -10,10 +10,10 @@ */ package vazkii.botania.api.corporea; -import java.util.List; - 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 ddc3721a9..bb25d9841 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 5bc57d600..626c377c7 100644 --- a/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java +++ b/src/main/java/vazkii/botania/api/corporea/IWrappedInventory.java @@ -9,10 +9,10 @@ */ package vazkii.botania.api.corporea; -import java.util.List; - 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 a6dc1c6d6..5f6b0bcd1 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -10,15 +10,14 @@ */ package vazkii.botania.api.internal; -import java.util.Set; - import com.google.common.collect.ImmutableSet; - 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.Set; + 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 3594f3afc..cd324f0b8 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; @@ -37,6 +35,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/IGuiLexiconEntry.java b/src/main/java/vazkii/botania/api/internal/IGuiLexiconEntry.java index fb0ee87b4..d774079ee 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 52b7ead58..13801f42e 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; @@ -38,6 +36,8 @@ import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.api.subtile.SubTileEntity; +import java.util.List; + /** * Any methods that refer to internal methods in Botania are here. * This is defaulted to a dummy handler, whose methods do nothing. diff --git a/src/main/java/vazkii/botania/api/internal/IManaBurst.java b/src/main/java/vazkii/botania/api/internal/IManaBurst.java index e7c7de69b..e2e8d8d80 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 51813c187..fde05af44 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.Set; - 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.Set; + /** * 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 e25a7375a..f1f466525 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -10,7 +10,6 @@ */ package vazkii.botania.api.internal; -import net.minecraft.block.state.IBlockState; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.server.management.PlayerChunkMapEntry; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index 1a124a49f..b76ad823c 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -10,10 +10,10 @@ */ package vazkii.botania.api.item; -import java.util.HashMap; - import net.minecraft.item.ItemStack; +import java.util.HashMap; + public interface IFloatingFlower { public ItemStack getDisplayStack(); diff --git a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java index 9e413b11f..dec765837 100644 --- a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -10,14 +10,12 @@ */ package vazkii.botania.api.item; -import javax.annotation.Nullable; - -import vazkii.botania.api.mana.ManaProficiencyEvent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import vazkii.botania.api.mana.ManaProficiencyEvent; /** * An armor item that implements this gives the player wearing it mana proficiency, by diff --git a/src/main/java/vazkii/botania/api/item/IRelic.java b/src/main/java/vazkii/botania/api/item/IRelic.java index 2c03f54a0..3c64806cc 100644 --- a/src/main/java/vazkii/botania/api/item/IRelic.java +++ b/src/main/java/vazkii/botania/api/item/IRelic.java @@ -10,10 +10,10 @@ */ package vazkii.botania.api.item; -import java.util.UUID; - import net.minecraft.item.ItemStack; +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/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index a885fbd40..c66fb1946 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -10,12 +10,12 @@ */ 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 java.util.List; + /** * An item that implements this will allow for various wireframes to be drawn * around the player. This will be called while the item is in the inventory, diff --git a/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java b/src/main/java/vazkii/botania/api/lexicon/BotaniaTutorialStartEvent.java index 2bcd9fe51..f32b317d9 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 f6bd51d95..bd3e21ea0 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -10,12 +10,11 @@ */ package vazkii.botania.api.lexicon; -import java.util.ArrayList; -import java.util.List; +import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; - -import net.minecraft.util.ResourceLocation; +import java.util.ArrayList; +import java.util.List; public class LexiconCategory implements Comparable { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index f007584cc..c4fe38406 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -10,18 +10,17 @@ */ package vazkii.botania.api.lexicon; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nonnull; - 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 javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + 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 3311e3264..b958f9d3e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.lexicon; -import java.util.List; - import com.google.common.collect.ImmutableList; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; @@ -19,6 +17,8 @@ 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 { public String unlocalizedName; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 0174d2abb..59473a330 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -10,13 +10,13 @@ */ package vazkii.botania.api.lexicon; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; 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 7787a98c7..df1b4006e 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 944ab8896..318b257a9 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -10,18 +10,18 @@ */ package vazkii.botania.api.lexicon.multiblock; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; 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/lexicon/multiblock/MultiblockSet.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java index 3c83f67d3..9f68aabc7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java @@ -10,12 +10,12 @@ */ package vazkii.botania.api.lexicon.multiblock; -import java.util.Collections; -import java.util.Map; - import net.minecraft.entity.Entity; import net.minecraft.util.EnumFacing; +import java.util.Collections; +import java.util.Map; + /** * A set of Multiblock objects for various rotations. */ diff --git a/src/main/java/vazkii/botania/api/mana/ILens.java b/src/main/java/vazkii/botania/api/mana/ILens.java index 928f9c447..f65ce6218 100644 --- a/src/main/java/vazkii/botania/api/mana/ILens.java +++ b/src/main/java/vazkii/botania/api/mana/ILens.java @@ -10,9 +10,7 @@ */ package vazkii.botania.api.mana; -import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import vazkii.botania.api.internal.IManaBurst; /** * 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/IManaDiscountArmor.java b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java index 75476a09b..cf15c1cda 100644 --- a/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java +++ b/src/main/java/vazkii/botania/api/mana/IManaDiscountArmor.java @@ -10,11 +10,11 @@ */ package vazkii.botania.api.mana; -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; + /** * An armor item that implements this can provide a mana discount for mana tools. * Mana tools are the ones on the main toolset (Pick, Shovel, Axe, Sword and Shovel) diff --git a/src/main/java/vazkii/botania/api/mana/IPingable.java b/src/main/java/vazkii/botania/api/mana/IPingable.java index 96250c259..b40b9cfa5 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/ManaDiscountEvent.java b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java index ed7e42f9d..561eb9f4a 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.mana; -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index 103333e30..19cf64b1f 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -10,14 +10,6 @@ */ package vazkii.botania.api.mana; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -25,6 +17,12 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + public final class ManaItemHandler { /** diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java b/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java index 1834b59ed..8d9a966f0 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemsEvent.java @@ -10,12 +10,12 @@ */ package vazkii.botania.api.mana; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; +import java.util.List; + public class ManaItemsEvent extends Event { private final EntityPlayer entityPlayer; 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 748e533aa..0566814fb 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -10,14 +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 1829e8816..5220c15c3 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 355e25392..fb11c7414 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -10,11 +10,7 @@ */ 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.item.ItemStack; import net.minecraftforge.items.IItemHandler; @@ -22,6 +18,9 @@ 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; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index ec1c3f0eb..e5ebdbfc7 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -1,13 +1,12 @@ package vazkii.botania.api.recipe; +import com.google.common.collect.ImmutableList; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + import java.util.ArrayList; import java.util.List; -import com.google.common.collect.ImmutableList; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - public class RecipeElvenTrade { private final ImmutableList outputs; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java index 5a8e477ca..593fb1612 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeManaInfusion.java @@ -10,14 +10,13 @@ */ package vazkii.botania.api.recipe; -import java.util.List; - -import javax.annotation.Nullable; - import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nullable; +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 af1285b7d..3c86617fc 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.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; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 1460c3ef4..b1521dae2 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -10,12 +10,7 @@ */ 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; import net.minecraft.item.ItemStack; @@ -24,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; diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java deleted file mode 100644 index 7fcc8042c..000000000 --- a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java +++ /dev/null @@ -1,62 +0,0 @@ -package vazkii.botania.api.sound; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.SoundEvent; - -/** - * Use these to play Botania sounds. - * Do not access this class before Botania preinits! - */ -public final class BotaniaSoundEvents { - - public static final SoundEvent airRod = getRegisteredSoundEvent("airrod"); - public static final SoundEvent agricarnation = getRegisteredSoundEvent("agricarnation"); - public static final SoundEvent altarCraft = getRegisteredSoundEvent("altarcraft"); - public static final SoundEvent babylonAttack = getRegisteredSoundEvent("babylonattack"); - public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("babylonspawn"); - public static final SoundEvent bellows = getRegisteredSoundEvent("bellows"); - public static final SoundEvent bifrostRod = getRegisteredSoundEvent("bifrostrod"); - public static final SoundEvent blackLotus = getRegisteredSoundEvent("blacklotus"); - public static final SoundEvent dash = getRegisteredSoundEvent("dash"); - public static final SoundEvent ding = getRegisteredSoundEvent("ding"); - public static final SoundEvent divaCharm = getRegisteredSoundEvent("divacharm"); - public static final SoundEvent divinationRod = getRegisteredSoundEvent("divinationrod"); - public static final SoundEvent doit = getRegisteredSoundEvent("doit"); - public static final SoundEvent enchanterFade = getRegisteredSoundEvent("enchanterform"); - public static final SoundEvent enchanterForm = getRegisteredSoundEvent("enchanterfade"); - public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("enchanterenchant"); - public static final SoundEvent endoflame = getRegisteredSoundEvent("endoflame"); - public static final SoundEvent equipBauble = getRegisteredSoundEvent("equipbauble"); - public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("gaiatrap"); - public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("goldenlaurel"); - public static final SoundEvent holyCloak = getRegisteredSoundEvent("holycloak"); - public static final SoundEvent laputaStart = getRegisteredSoundEvent("laputastart"); - public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("lexiconopen"); - public static final SoundEvent lexiconPage = getRegisteredSoundEvent("lexiconpage"); - public static final SoundEvent lightRelay = getRegisteredSoundEvent("lightrelay"); - public static final SoundEvent manaBlaster = getRegisteredSoundEvent("manablaster"); - public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("manapoolcraft"); - public static final SoundEvent missile = getRegisteredSoundEvent("missile"); - public static final SoundEvent orechid = getRegisteredSoundEvent("orechid"); - public static final SoundEvent potionCreate = getRegisteredSoundEvent("potioncreate"); - public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("runealtarcraft"); - public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("runealtarstart"); - public static final SoundEvent spreaderFire = getRegisteredSoundEvent("spreaderfire"); - public static final SoundEvent starcaller = getRegisteredSoundEvent("starcaller"); - public static final SoundEvent terraBlade = getRegisteredSoundEvent("terrablade"); - public static final SoundEvent terraformRod = getRegisteredSoundEvent("terraformrod"); - public static final SoundEvent terraPickMode = getRegisteredSoundEvent("terrapickmode"); - public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("terrasteelcraft"); - public static final SoundEvent thermalily = getRegisteredSoundEvent("thermalily"); - public static final SoundEvent unholyCloak = getRegisteredSoundEvent("unholycloak"); - public static final SoundEvent way = getRegisteredSoundEvent("way"); - - public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("music.gaia1"); - public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("music.gaia2"); - - private static SoundEvent getRegisteredSoundEvent(String name) { - return SoundEvent.REGISTRY.getObject(new ResourceLocation("botania", name)); - } - - private BotaniaSoundEvents() {} -} diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 9d195b609..f31df9465 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -10,7 +10,6 @@ package vazkii.botania.api.state; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import net.minecraft.block.BlockRailBase; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockRotatedPillar; diff --git a/src/main/java/vazkii/botania/api/state/PropertyObject.java b/src/main/java/vazkii/botania/api/state/PropertyObject.java index 497b2ae31..8dd5ac757 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyObject.java +++ b/src/main/java/vazkii/botania/api/state/PropertyObject.java @@ -8,14 +8,13 @@ */ package vazkii.botania.api.state; -import java.util.Objects; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import net.minecraftforge.common.property.IUnlistedProperty; +import java.util.Objects; + // Generic base class for unlisted properties public class PropertyObject implements IUnlistedProperty { diff --git a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java index 40545896d..91d52e25d 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java +++ b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum AlfPortalState implements IStringSerializable { OFF, ON_Z, diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java index 39c9abd58..222fdb9ea 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum AltGrassVariant implements IStringSerializable { DRY, GOLDEN, diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java index 3d7dfbb82..056b2b428 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum AltarVariant implements IStringSerializable { DEFAULT, FOREST, diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java index 99e3204c9..4808a5893 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum BiomeBrickVariant implements IStringSerializable { FOREST, PLAINS, diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java index 83d40c719..946e8fee0 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum BiomeStoneVariant implements IStringSerializable { FOREST, PLAINS, diff --git a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java index 68fa20d67..653a29776 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java +++ b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum CratePattern implements IStringSerializable { NONE, CRAFTY_1_1, diff --git a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java index de58be763..ba2fa8784 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum CrateVariant implements IStringSerializable { OPEN, CRAFTY; diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java index 56607013f..182a4c019 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum CustomBrickVariant implements IStringSerializable { HELLISH_BRICK, SOUL_BRICK, diff --git a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java index 0782734c1..50d954002 100644 --- a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum DrumVariant implements IStringSerializable { WILD, GATHERING, diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java index 49cad3eb5..bd28a9730 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum LivingRockVariant implements IStringSerializable { DEFAULT, BRICK, diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java index a00e061c3..e9d27c2f1 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum LivingWoodVariant implements IStringSerializable { DEFAULT, PLANKS, diff --git a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java index 8eeeb96f0..8ade0a003 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum LuminizerVariant implements IStringSerializable { DEFAULT, DETECTOR, diff --git a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java index cdaf94d7d..37c2e64db 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum PlatformVariant implements IStringSerializable { ABSTRUSE, SPECTRAL, diff --git a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java index 9103957c3..fe2a2e702 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum PoolVariant implements IStringSerializable { DEFAULT, CREATIVE, diff --git a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java index ce68aeca0..3a4ed9f09 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum PylonVariant implements IStringSerializable { MANA, NATURA, diff --git a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java index ccf793f4f..3bb9a1ea2 100644 --- a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum QuartzVariant implements IStringSerializable { NORMAL, CHISELED, diff --git a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java index a4c9a4e48..3794b113f 100644 --- a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum SpreaderVariant implements IStringSerializable { MANA, REDSTONE, diff --git a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java index 595fd5cde..6626730d4 100644 --- a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java @@ -8,10 +8,10 @@ */ package vazkii.botania.api.state.enums; -import java.util.Locale; - import net.minecraft.util.IStringSerializable; +import java.util.Locale; + public enum StorageVariant implements IStringSerializable { MANASTEEL, TERRASTEEL, diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 062358757..8972da1ec 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -10,9 +10,6 @@ */ package vazkii.botania.api.subtile; -import java.util.List; - -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -33,6 +30,8 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandBindable; +import java.util.List; + /** * A Sub-TileEntity, this is used for the flower system. Make sure to map subclasses * of this using BotaniaAPI.mapSubTile(String, Class). Any subclass of this must have diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index da56a4f32..530850718 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -10,8 +10,6 @@ */ package vazkii.botania.api.subtile; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.resources.I18n; @@ -27,7 +25,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; + +import java.awt.Color; /** * The basic class for a Functional Flower. @@ -137,7 +137,7 @@ public class SubTileFunctional extends SubTileEntity { return false; knownMana = mana; - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.1F, 1F); return super.onWanded(player, wand); } diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 15002ddb8..b2a1619cc 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; @@ -33,7 +30,10 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; + +import java.awt.Color; +import java.util.List; /** * The basic class for a Generating Flower. @@ -224,7 +224,7 @@ public class SubTileGenerating extends SubTileEntity { sync(); knownMana = mana; - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.1F, 1F); return super.onWanded(player, wand); } 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 17d24f089..b1dd9bb94 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java @@ -10,9 +10,6 @@ */ package vazkii.botania.api.subtile.signature; -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; @@ -24,6 +21,8 @@ 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/SubTileSignature.java b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java index ae004231a..da1a54ac1 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -10,14 +10,13 @@ */ package vazkii.botania.api.subtile.signature; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +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/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 3055153d3..a5f5166fd 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -10,14 +10,13 @@ */ package vazkii.botania.api.wiki; -import org.apache.commons.lang3.text.WordUtils; - 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 2ef5338e1..41679c416 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -10,12 +10,12 @@ */ package vazkii.botania.api.wiki; -import java.util.HashMap; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.util.ResourceLocation; +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/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index a86482739..8509ffc23 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -10,12 +10,6 @@ */ package vazkii.botania.client.challenge; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -24,6 +18,12 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public final class ModChallenges { public static final Map> challenges = new EnumMap<>(EnumChallengeLevel.class); diff --git a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java index 7b97968b5..d7ae79a8f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java @@ -10,18 +10,12 @@ */ package vazkii.botania.client.core.handler; -import java.util.List; - -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.shader.Shader; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -29,9 +23,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.item.ItemAstrolabe; +import java.util.List; + public final class AstrolabePreviewHandler { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 9c643b480..68ef528e9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.core.handler; -import javax.annotation.Nonnull; - -import net.minecraftforge.items.IItemHandler; -import org.lwjgl.opengl.GL11; - import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -27,6 +22,8 @@ import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.item.IBaubleRender.RenderType; @@ -36,6 +33,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; +import javax.annotation.Nonnull; + public final class BaubleRenderHandler implements LayerRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index 148edb6fe..64bd1dabe 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -26,6 +22,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.subtile.ISubTileContainer; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileEntity; @@ -35,6 +32,8 @@ import vazkii.botania.common.entity.EntityMagicLandmine; import vazkii.botania.common.item.ItemTwigWand; import vazkii.botania.common.item.ModItems; +import java.awt.Color; + public final class BlockHighlightRenderHandler { private BlockHighlightRenderHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 657a6be6a..1daf97acc 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -10,26 +10,25 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Rectangle; -import java.util.Collections; -import java.util.Set; -import java.util.UUID; -import java.util.WeakHashMap; - -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; +import java.awt.Rectangle; +import java.util.Collections; +import java.util.Set; +import java.util.UUID; +import java.util.WeakHashMap; + public final class BossBarHandler { private BossBarHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index 2aaf8544d..227e7c713 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; -import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -33,11 +28,15 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.CombinedInvWrapper; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; +import java.awt.Color; +import java.util.List; + public final class BoundTileRenderer { private BoundTileRenderer() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java index abe798f65..bc2b71722 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientMethodHandles.java @@ -1,17 +1,16 @@ package vazkii.botania.client.core.handler; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Field; - import com.google.common.base.Throwables; - import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Field; + public final class ClientMethodHandles { public static final MethodHandle diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 36f6aa854..1885f7516 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -11,7 +11,6 @@ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 89787558f..7f7bdd3c0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -1,8 +1,5 @@ package vazkii.botania.client.core.handler; -import java.awt.Color; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -37,6 +34,9 @@ import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; import vazkii.botania.common.item.lens.ItemLens; +import java.awt.Color; +import java.util.Map; + public final class ColorHandler { public static void init() { diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 9740368f1..01ef03c30 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -10,15 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -37,6 +28,14 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.version.VersionChecker; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + public final class ContributorFancinessHandler implements LayerRenderer { public volatile static Map flowerMap = null; diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index c40269968..0c98c98a0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -10,33 +10,30 @@ */ package vazkii.botania.client.core.handler; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - -import javax.annotation.Nonnull; - -import net.minecraft.util.NonNullList; -import org.lwjgl.input.Keyboard; - import com.google.common.collect.ImmutableList; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import org.lwjgl.input.Keyboard; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; + public class CorporeaAutoCompleteHandler { private boolean isAutoCompleted = false; diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index bf9183bea..53b968f25 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -10,17 +10,7 @@ */ package vazkii.botania.client.core.handler; -import java.util.Map; -import java.util.UUID; - -import org.lwjgl.opengl.ARBFragmentShader; -import org.lwjgl.opengl.ContextCapabilities; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL20; -import org.lwjgl.opengl.GLContext; - import com.google.common.base.Optional; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -32,11 +22,19 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.opengl.ARBFragmentShader; +import org.lwjgl.opengl.ContextCapabilities; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL20; +import org.lwjgl.opengl.GLContext; import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.lib.LibMisc; +import java.util.Map; +import java.util.UUID; + public final class DebugHandler { private DebugHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index aaf347a2f..8faedee4c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -10,15 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; -import org.lwjgl.opengl.GL11; - import baubles.api.BaublesApi; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; @@ -44,6 +35,9 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -76,6 +70,11 @@ import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibObfuscation; +import java.awt.Color; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + public final class HUDHandler { private HUDHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 646438fd7..35612cdc9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.util.regex.Pattern; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -23,6 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + +import java.util.regex.Pattern; public final class ItemsRemainingRenderHandler { diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index 2056401f2..7f875837a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.util.ArrayDeque; -import java.util.Deque; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -25,10 +20,14 @@ import net.minecraft.profiler.Profiler; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.fx.FXLightning; import vazkii.botania.client.fx.ParticleRenderDispatcher; import vazkii.botania.client.lib.LibResources; +import java.util.ArrayDeque; +import java.util.Deque; + public class LightningHandler { private LightningHandler() {} diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 182cf26dd..6e3381f5a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -8,21 +8,6 @@ */ package vazkii.botania.client.core.handler; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.nio.IntBuffer; -import java.util.Map; - -import javax.imageio.ImageIO; - -import org.apache.commons.lang3.text.WordUtils; -import org.lwjgl.BufferUtils; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -import com.google.common.collect.Maps; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -33,6 +18,9 @@ import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.BufferUtils; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.GunModel; @@ -43,6 +31,12 @@ import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.nio.IntBuffer; + public class MiscellaneousIcons { public static final MiscellaneousIcons INSTANCE = new MiscellaneousIcons(); diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 3982412dd..636b464c0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -8,10 +8,6 @@ */ package vazkii.botania.client.core.handler; -import java.util.Locale; -import java.util.Map; -import java.util.function.IntFunction; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -32,32 +28,7 @@ import vazkii.botania.client.model.SpecialFlowerModel; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; -import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; -import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; -import vazkii.botania.common.block.subtile.functional.SubTileBergamute; -import vazkii.botania.common.block.subtile.functional.SubTileBubbell; -import vazkii.botania.common.block.subtile.functional.SubTileClayconia; -import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; -import vazkii.botania.common.block.subtile.functional.SubTileDreadthorn; -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.SubTileHyacidus; -import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; -import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia; -import vazkii.botania.common.block.subtile.functional.SubTileLoonuim; -import vazkii.botania.common.block.subtile.functional.SubTileMarimorphosis; -import vazkii.botania.common.block.subtile.functional.SubTileMedumone; -import vazkii.botania.common.block.subtile.functional.SubTileOrechid; -import vazkii.botania.common.block.subtile.functional.SubTileOrechidIgnem; -import vazkii.botania.common.block.subtile.functional.SubTilePollidisiac; -import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus; -import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; -import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; -import vazkii.botania.common.block.subtile.functional.SubTileTangleberrie; -import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; -import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; +import vazkii.botania.common.block.subtile.functional.*; import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; @@ -73,6 +44,10 @@ import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import java.util.Locale; +import java.util.Map; +import java.util.function.IntFunction; + @Mod.EventBusSubscriber public final class ModelHandler { @SubscribeEvent diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java index aeb8ccddf..7c07142bf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.core.handler; -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.init.Biomes; import net.minecraft.init.Blocks; @@ -24,6 +22,8 @@ import net.minecraft.world.biome.Biome; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; +import javax.annotation.Nonnull; + /** * This class acts as a wrapper around a block access to * replace blocks with the blocks involved in the multiblock specified diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index d335aef4f..e2a659e97 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.core.handler; -import net.minecraft.util.EnumActionResult; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; @@ -22,6 +18,7 @@ import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -33,6 +30,8 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; diff --git a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java index 30f60a15e..d3537b855 100644 --- a/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java +++ b/src/main/java/vazkii/botania/client/core/handler/PersistentVariableHelper.java @@ -10,13 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.Set; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.client.challenge.Challenge; @@ -24,6 +17,13 @@ import vazkii.botania.client.challenge.ModChallenges; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.common.lib.LibMisc; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.List; +import java.util.Set; + public final class PersistentVariableHelper { private static final String TAG_FIRST_LOAD = "firstLoad"; diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index cb5e3f9f9..8a03e8271 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -10,12 +10,6 @@ */ package vazkii.botania.client.core.handler; -import java.util.ArrayDeque; -import java.util.Queue; -import java.util.Random; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -23,11 +17,16 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import java.util.ArrayDeque; +import java.util.Queue; +import java.util.Random; + public final class RedStringRenderer { public static final Queue redStringTiles = new ArrayDeque<>(); diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index ef7baf589..8672a4372 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -10,17 +10,13 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; @@ -28,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.RenderTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; @@ -38,6 +35,8 @@ import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import java.awt.Color; + public final class TooltipAdditionDisplayHandler { private static float lexiconLookupTime = 0F; diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index 80b5c48d6..62ffbabb5 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -10,14 +10,13 @@ */ package vazkii.botania.client.core.helper; -import org.lwjgl.opengl.GL11; - -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; public final class IconHelper { diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index e26f4bd2d..cca59e325 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -10,23 +10,22 @@ */ package vazkii.botania.client.core.helper; -import java.util.List; -import java.util.Random; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; +import java.util.List; +import java.util.Random; + public final class RenderHelper { public static void renderTooltip(int x, int y, List tooltipData) { diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 332a71a22..3d24d0114 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -10,23 +10,22 @@ */ package vazkii.botania.client.core.helper; -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.stream.Collectors; - +import net.minecraft.client.renderer.OpenGlHelper; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL11; - -import net.minecraft.client.renderer.OpenGlHelper; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.stream.Collectors; + public final class ShaderHelper { private static final int VERT = ARBVertexShader.GL_VERTEX_SHADER_ARB; diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index b271f7c25..51d23cd7f 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -10,14 +10,6 @@ */ package vazkii.botania.client.core.proxy; -import java.awt.Desktop; -import java.io.File; -import java.io.IOException; -import java.net.URI; -import java.time.LocalDateTime; -import java.time.Month; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; @@ -29,8 +21,6 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -69,7 +59,6 @@ import vazkii.botania.client.core.handler.DebugHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.handler.RenderLexicon; @@ -92,55 +81,11 @@ import vazkii.botania.client.render.entity.RenderPixie; import vazkii.botania.client.render.entity.RenderPoolMinecart; import vazkii.botania.client.render.entity.RenderSnowballStack; import vazkii.botania.client.render.entity.RenderSpark; -import vazkii.botania.client.render.tile.RenderTileAlfPortal; -import vazkii.botania.client.render.tile.RenderTileAltar; -import vazkii.botania.client.render.tile.RenderTileAnimatedTorch; -import vazkii.botania.client.render.tile.RenderTileAvatar; -import vazkii.botania.client.render.tile.RenderTileBellows; -import vazkii.botania.client.render.tile.RenderTileBrewery; -import vazkii.botania.client.render.tile.RenderTileCocoon; -import vazkii.botania.client.render.tile.RenderTileCorporeaCrystalCube; -import vazkii.botania.client.render.tile.RenderTileCorporeaIndex; -import vazkii.botania.client.render.tile.RenderTileEnchanter; -import vazkii.botania.client.render.tile.RenderTileFloatingFlower; -import vazkii.botania.client.render.tile.RenderTileGaiaHead; -import vazkii.botania.client.render.tile.RenderTileHourglass; -import vazkii.botania.client.render.tile.RenderTileIncensePlate; -import vazkii.botania.client.render.tile.RenderTileLightRelay; -import vazkii.botania.client.render.tile.RenderTilePool; -import vazkii.botania.client.render.tile.RenderTilePrism; -import vazkii.botania.client.render.tile.RenderTilePylon; -import vazkii.botania.client.render.tile.RenderTileRedString; -import vazkii.botania.client.render.tile.RenderTileRuneAltar; -import vazkii.botania.client.render.tile.RenderTileSparkChanger; -import vazkii.botania.client.render.tile.RenderTileSpreader; -import vazkii.botania.client.render.tile.RenderTileStarfield; -import vazkii.botania.client.render.tile.RenderTileTerraPlate; -import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu; -import vazkii.botania.client.render.tile.RenderTileTinyPotato; +import vazkii.botania.client.render.tile.*; import vazkii.botania.client.render.world.SkyblockRenderEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.functional.BergamuteEventHandler; -import vazkii.botania.common.block.tile.TileAlfPortal; -import vazkii.botania.common.block.tile.TileAltar; -import vazkii.botania.common.block.tile.TileAnimatedTorch; -import vazkii.botania.common.block.tile.TileAvatar; -import vazkii.botania.common.block.tile.TileBrewery; -import vazkii.botania.common.block.tile.TileCocoon; -import vazkii.botania.common.block.tile.TileEnchanter; -import vazkii.botania.common.block.tile.TileFloatingFlower; -import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; -import vazkii.botania.common.block.tile.TileGaiaHead; -import vazkii.botania.common.block.tile.TileHourglass; -import vazkii.botania.common.block.tile.TileIncensePlate; -import vazkii.botania.common.block.tile.TileLightRelay; -import vazkii.botania.common.block.tile.TilePylon; -import vazkii.botania.common.block.tile.TileRuneAltar; -import vazkii.botania.common.block.tile.TileSparkChanger; -import vazkii.botania.common.block.tile.TileStarfield; -import vazkii.botania.common.block.tile.TileTerraPlate; -import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import vazkii.botania.common.block.tile.TileTinyPotato; +import vazkii.botania.common.block.tile.*; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileBellows; @@ -172,6 +117,14 @@ import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; +import java.awt.Desktop; +import java.io.File; +import java.io.IOException; +import java.net.URI; +import java.time.LocalDateTime; +import java.time.Month; +import java.util.Map; + public class ClientProxy implements IProxy { public static final VertexFormat POSITION_TEX_LMAP_NORMAL = diff --git a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java index deec83cfb..0e52aff9e 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java +++ b/src/main/java/vazkii/botania/client/core/proxy/GuiFactory.java @@ -10,13 +10,13 @@ */ package vazkii.botania.client.core.proxy; -import java.util.Set; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.IModGuiFactory; import vazkii.botania.client.gui.GuiBotaniaConfig; +import java.util.Set; + public class GuiFactory implements IModGuiFactory { @Override diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index 6fa30740d..4d714addd 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -1,23 +1,23 @@ package vazkii.botania.client.fx; +import gnu.trove.map.hash.TIntIntHashMap; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.Entity; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.World; +import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.common.core.helper.Vector3; + import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Random; -import gnu.trove.map.hash.TIntIntHashMap; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.entity.Entity; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import vazkii.botania.client.core.handler.LightningHandler; -import vazkii.botania.common.core.helper.Vector3; - // Originally taken with permission from WRCBE - heavily modified public class FXLightning extends Particle { diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 9baf022ed..ab0f9096e 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -10,26 +10,25 @@ */ package vazkii.botania.client.fx; -import java.util.ArrayDeque; -import java.util.Queue; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.ArrayDeque; +import java.util.Queue; + public class FXSparkle extends Particle { private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png"); diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 29a5583d2..0642f680c 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -10,24 +10,23 @@ */ package vazkii.botania.client.fx; -import java.util.ArrayDeque; -import java.util.Queue; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.Particle; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.client.FMLClientHandler; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.ArrayDeque; +import java.util.Queue; + public class FXWisp extends Particle { private static final ResourceLocation vanillaParticles = new ResourceLocation("textures/particle/particles.png"); diff --git a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java index ce97d23a9..58dba86f6 100644 --- a/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java +++ b/src/main/java/vazkii/botania/client/fx/ParticleRenderDispatcher.java @@ -11,12 +11,11 @@ */ package vazkii.botania.client.fx; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.profiler.Profiler; +import org.lwjgl.opengl.GL11; public final class ParticleRenderDispatcher { diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index 47b60a21f..c30552b57 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.gui.bag; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -20,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.gui.SlotLocked; +import javax.annotation.Nonnull; + public class ContainerFlowerBag extends Container { private final InventoryFlowerBag flowerBagInv; diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index 8662bb554..a2baa8c8d 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.gui.bag; -import java.util.List; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; @@ -24,6 +22,8 @@ import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; +import java.util.List; + public class GuiFlowerBag extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_FLOWER_BAG); diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 6b7e8c2b0..634435ddd 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.gui.box; -import javax.annotation.Nonnull; - -import baubles.api.BaubleType; -import baubles.api.BaublesApi; import baubles.api.IBauble; import baubles.api.cap.BaublesCapabilities; import baubles.api.cap.IBaublesItemHandler; @@ -29,6 +25,7 @@ import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.gui.SlotLocked; +import javax.annotation.Nonnull; import java.util.List; public class ContainerBaubleBox extends Container { diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 4f5e72a58..950a486f5 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -11,9 +11,7 @@ package vazkii.botania.client.gui.box; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java index c18a8e9bb..351f65a96 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.gui.crafting; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench; @@ -20,6 +18,8 @@ import net.minecraft.inventory.SlotCrafting; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class ContainerCraftingHalo extends ContainerWorkbench { public ContainerCraftingHalo(InventoryPlayer playerInv, World world) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 8b50b511e..a5c8eba6d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -10,32 +10,13 @@ */ package vazkii.botania.client.gui.lexicon; -import java.awt.Desktop; -import java.io.IOException; -import java.net.URI; -import java.security.Permissions; -import java.time.LocalDateTime; -import java.time.Month; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Queue; - -import net.minecraft.client.gui.advancements.GuiScreenAdvancements; -import org.lwjgl.input.Keyboard; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.gui.advancements.GuiScreenAdvancements; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; @@ -44,11 +25,13 @@ import net.minecraft.util.ChatAllowedCharacters; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.MinecraftForge; +import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.BotaniaTutorialStartEvent; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; @@ -68,11 +51,26 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonScaleChange; import vazkii.botania.client.gui.lexicon.button.GuiButtonUpdateWarning; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibMisc; +import java.awt.Desktop; +import java.io.IOException; +import java.net.URI; +import java.time.LocalDateTime; +import java.time.Month; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Queue; + public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); @@ -661,7 +659,7 @@ public class GuiLexicon extends GuiScreen { if(konamiTime == 0 && par2 == KONAMI_CODE[konamiIndex]) { konamiIndex++; if(konamiIndex >= KONAMI_CODE.length) { - mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(BotaniaSoundEvents.way, 1.0F)); + mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(ModSounds.way, 1.0F)); konamiIndex = 0; konamiTime = 240; } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java index ee9d1e3d0..7600463c3 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.gui.lexicon; -import java.io.IOException; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; @@ -25,6 +23,8 @@ import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.common.lexicon.page.PageText; +import java.io.IOException; + public class GuiLexiconChallenge extends GuiLexicon implements IParented { private static final String TAG_CHALLENGE = "challenge"; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java index 6df545ccd..e64aeacd9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.gui.lexicon; -import java.io.IOException; -import java.util.List; - import net.minecraft.client.gui.GuiButton; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; @@ -23,6 +20,9 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.lexicon.button.GuiButtonBack; import vazkii.botania.client.gui.lexicon.button.GuiButtonChallengeIcon; +import java.io.IOException; +import java.util.List; + public class GuiLexiconChallengesList extends GuiLexicon implements IParented { GuiLexicon parent; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 7d882c7ac..439edd60c 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -10,13 +10,6 @@ */ package vazkii.botania.client.gui.lexicon; -import java.awt.Desktop; -import java.io.IOException; -import java.net.URI; -import java.util.List; - -import org.lwjgl.input.Mouse; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -25,6 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; +import org.lwjgl.input.Mouse; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.IAddonEntry; @@ -36,6 +30,11 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; import vazkii.botania.client.gui.lexicon.button.GuiButtonShare; import vazkii.botania.client.gui.lexicon.button.GuiButtonViewOnline; +import java.awt.Desktop; +import java.io.IOException; +import java.net.URI; +import java.util.List; + public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IParented { private static final String TAG_ENTRY = "entry"; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index cecab22a7..5ef40d185 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -10,14 +10,14 @@ */ package vazkii.botania.client.gui.lexicon; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconEntry; +import java.util.ArrayList; +import java.util.List; + public class GuiLexiconHistory extends GuiLexiconIndex { public static final List history = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java index f5a211915..3fc39d05f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -10,13 +10,6 @@ */ package vazkii.botania.client.gui.lexicon; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.lwjgl.input.Mouse; - import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; @@ -26,6 +19,7 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.text.TextFormatting; +import org.lwjgl.input.Mouse; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconCategory; @@ -36,6 +30,11 @@ import vazkii.botania.client.gui.lexicon.button.GuiButtonInvisible; import vazkii.botania.client.gui.lexicon.button.GuiButtonPage; import vazkii.botania.common.lexicon.DogLexiconEntry; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class GuiLexiconIndex extends GuiLexicon implements IParented { private static final String TAG_CATEGORY = "category"; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java index 0353e56b8..e14e47cf7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonAchievement.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -22,6 +17,10 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonAchievement extends GuiButtonLexicon { public GuiButtonAchievement(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java index 1688a4c4d..4a2e131dc 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBack.java @@ -10,17 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.List; + public class GuiButtonBack extends GuiButtonLexicon { public GuiButtonBack(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java index 663238c2d..daaedb7c2 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBackWithShift.java @@ -10,12 +10,12 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Arrays; -import java.util.List; - import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; +import java.util.Arrays; +import java.util.List; + public class GuiButtonBackWithShift extends GuiButtonBack { public GuiButtonBackWithShift(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index f5254534b..7b26025a3 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -1,16 +1,15 @@ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonBookmark extends GuiButtonLexicon { final GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index 3ea5ff615..690943853 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -10,18 +10,15 @@ */ package vazkii.botania.client.gui.lexicon.button; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.ARBMultitexture; -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.ARBMultitexture; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.client.core.helper.RenderHelper; @@ -30,6 +27,8 @@ import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; +import javax.annotation.Nonnull; + public class GuiButtonCategory extends GuiButtonLexicon { private static final ResourceLocation fallbackResource = new ResourceLocation(LibResources.CATEGORY_INDEX); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java index e9a7f603b..93713b62a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeIcon.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; @@ -22,6 +17,10 @@ import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.challenge.Challenge; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonChallengeIcon extends GuiButtonLexicon { public final Challenge challenge; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 2d099ad64..feecbb406 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -10,16 +10,15 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonChallengeInfo extends GuiButtonLexicon { final GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 4c519c0c7..0db4f8d41 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -22,6 +17,10 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonChallenges extends GuiButtonLexicon { public GuiButtonChallenges(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java index 0c35847ec..c29729a6a 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonDoot.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -24,6 +19,10 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + // Ssssshhhhhhh // I should've done this last year public class GuiButtonDoot extends GuiButtonLexicon { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index 8355b6f8e..c4e37e06d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -10,17 +10,16 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonHistory extends GuiButtonLexicon { final GuiLexicon gui; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index 73106494f..2d3492a06 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -10,16 +10,13 @@ */ package vazkii.botania.client.gui.lexicon.button; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.FontHelper; @@ -27,6 +24,8 @@ import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class GuiButtonInvisible extends GuiButtonLexicon { private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java index 710c76c3c..63c04f302 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java @@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.audio.SoundHandler; import net.minecraft.client.gui.GuiButton; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; public class GuiButtonLexicon extends GuiButton { @@ -23,7 +23,7 @@ public class GuiButtonLexicon extends GuiButton { @Override public void playPressSound(SoundHandler handler) { - handler.playSound(PositionedSoundRecord.getMasterRecord(BotaniaSoundEvents.lexiconPage, 1.0F)); + handler.playSound(PositionedSoundRecord.getMasterRecord(ModSounds.lexiconPage, 1.0F)); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java index 5882340e0..3cc51e6a9 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonNotes.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -22,6 +17,10 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonNotes extends GuiButtonLexicon { final GuiLexicon parent; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java index 0ce589428..9780bba1f 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonOptions.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -22,6 +17,10 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonOptions extends GuiButtonLexicon { public GuiButtonOptions(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java index f19ec30ca..dff608174 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonPage.java @@ -10,16 +10,15 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Collections; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.Collections; + public class GuiButtonPage extends GuiButtonLexicon { final boolean right; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java index cf89bab7d..87a0e0b73 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonScaleChange.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -22,6 +17,10 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonScaleChange extends GuiButtonLexicon { public GuiButtonScaleChange(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java index 4f395ecb4..488d0d6da 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonShare.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -22,6 +17,10 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.List; + public class GuiButtonShare extends GuiButtonLexicon { public GuiButtonShare(int par1, int par2, int par3) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 85ce9d7ed..c9d65a70e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -24,6 +19,10 @@ import vazkii.botania.client.core.handler.PersistentVariableHelper; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class GuiButtonUpdateWarning extends GuiButtonLexicon { public GuiButtonUpdateWarning(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java index 502df9a45..544db2453 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonViewOnline.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.gui.lexicon.button; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; @@ -22,6 +17,10 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.List; + public class GuiButtonViewOnline extends GuiButtonLexicon { public GuiButtonViewOnline(int id, int x, int y) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 25c77db81..4ede5c927 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -8,8 +8,6 @@ */ package vazkii.botania.client.integration.jei; -import javax.annotation.Nonnull; - import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; @@ -41,6 +39,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; + @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index bacebb804..16cc6fe97 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -8,13 +8,6 @@ */ package vazkii.botania.client.integration.jei.brewery; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableStatic; @@ -28,6 +21,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + public class BreweryRecipeCategory implements IRecipeCategory { public static final String UID = "botania.brewery"; diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java index 00feedda3..01241fa27 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.brewery; -import javax.annotation.Nonnull; - import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipeBrew; +import javax.annotation.Nonnull; + public class BreweryRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index fcfdc9b5d..a680d2d63 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -8,21 +8,18 @@ */ package vazkii.botania.client.integration.jei.brewery; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; +import java.util.List; + public class BreweryRecipeWrapper implements IRecipeWrapper { private final List> input; diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 20bd0a85c..4451b1f64 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -8,34 +8,31 @@ */ package vazkii.botania.client.integration.jei.elventrade; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import mezz.jei.api.ingredients.IIngredients; -import org.lwjgl.opengl.GL11; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + public class ElvenTradeRecipeCategory implements IRecipeCategory { public static final String UID = "botania.elvenTrade"; diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java index 6e372b8b3..247654d6e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.elventrade; -import javax.annotation.Nonnull; - import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipeElvenTrade; +import javax.annotation.Nonnull; + public class ElvenTradeRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 7778a0787..e32017b8e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -8,20 +8,17 @@ */ package vazkii.botania.client.integration.jei.elventrade; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeElvenTrade; +import javax.annotation.Nonnull; +import java.util.List; + public class ElvenTradeRecipeWrapper implements IRecipeWrapper { private final List> input; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index 076113fc5..fda764fc6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -8,12 +8,6 @@ */ package vazkii.botania.client.integration.jei.manapool; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -29,6 +23,11 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + public class ManaPoolRecipeCategory implements IRecipeCategory { public static final String UID = "botania.manaPool"; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java index 5daec990a..3a157ecda 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.manapool; -import javax.annotation.Nonnull; - import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipeManaInfusion; +import javax.annotation.Nonnull; + public class ManaPoolRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index ab9d7bb75..18d36461c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -8,13 +8,7 @@ */ package vazkii.botania.client.integration.jei.manapool; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableList; - import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.block.Block; @@ -23,12 +17,14 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; +import javax.annotation.Nonnull; +import java.util.List; + public class ManaPoolRecipeWrapper implements IRecipeWrapper { private final List> input; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index a12bbe82f..7ce6b46bf 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -8,14 +8,6 @@ */ package vazkii.botania.client.integration.jei.petalapothecary; -import java.awt.Point; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableStatic; @@ -31,6 +23,12 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.Point; +import java.util.ArrayList; +import java.util.List; + public class PetalApothecaryRecipeCategory implements IRecipeCategory { public static final String UID = "botania.petals"; diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java index 579854fd8..6dadf0e7b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.petalapothecary; -import javax.annotation.Nonnull; - import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipePetals; +import javax.annotation.Nonnull; + public class PetalApothecaryRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java index 3c4dda952..8a28043bd 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -8,20 +8,17 @@ */ package vazkii.botania.client.integration.jei.petalapothecary; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipePetals; +import javax.annotation.Nonnull; +import java.util.List; + public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { private final List> input; diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index cbd601caa..4bd4ba35d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -8,13 +8,6 @@ */ package vazkii.botania.client.integration.jei.puredaisy; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -31,6 +24,11 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + public class PureDaisyRecipeCategory implements IRecipeCategory { public static final String UID = "botania.pureDaisy"; diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java index 1c2ddd50c..e636e2456 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.puredaisy; -import javax.annotation.Nonnull; - import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipePureDaisy; +import javax.annotation.Nonnull; + public class PureDaisyRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index 2cef6ff2e..60a23806b 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -8,12 +8,7 @@ */ package vazkii.botania.client.integration.jei.puredaisy; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.block.Block; @@ -24,6 +19,9 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipePureDaisy; +import javax.annotation.Nonnull; +import java.util.List; + public class PureDaisyRecipeWrapper implements IRecipeWrapper { private List inputs = ImmutableList.of(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index 6087f3457..bdc584ece 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -8,14 +8,6 @@ */ package vazkii.botania.client.integration.jei.runicaltar; -import java.awt.Point; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; @@ -30,6 +22,12 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.Point; +import java.util.ArrayList; +import java.util.List; + public class RunicAltarRecipeCategory implements IRecipeCategory { public static final String UID = "botania.runicAltar"; diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java index 000cc08f6..9978ab08a 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -8,12 +8,12 @@ */ package vazkii.botania.client.integration.jei.runicaltar; -import javax.annotation.Nonnull; - import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; import vazkii.botania.api.recipe.RecipeRuneAltar; +import javax.annotation.Nonnull; + public class RunicAltarRecipeHandler implements IRecipeHandler { @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index 7ddee3bc6..f29311e6f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -8,23 +8,20 @@ */ package vazkii.botania.client.integration.jei.runicaltar; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TilePool; +import javax.annotation.Nonnull; +import java.util.List; + public class RunicAltarRecipeWrapper implements IRecipeWrapper { private final List> input; diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 9211a0c37..71e46bc08 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -8,22 +8,9 @@ */ package vazkii.botania.client.model; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nonnull; -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import javax.vecmath.Vector4f; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Table; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -47,6 +34,7 @@ import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.state.BotaniaStateProps; @@ -54,6 +42,15 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + public class FloatingFlowerModel implements IBakedModel { private static final String MUNDANE_PREFIX = "botania:shimmeringFlower_"; diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index 857968c07..4f678890e 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -1,23 +1,7 @@ package vazkii.botania.client.model; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.vecmath.Matrix4f; -import javax.vecmath.Vector3f; -import javax.vecmath.Vector4f; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -36,8 +20,21 @@ import net.minecraftforge.client.model.pipeline.IVertexConsumer; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; import net.minecraftforge.common.model.TRSRTransformation; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.item.ItemManaGun; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import javax.vecmath.Vector4f; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + public class GunModel implements IBakedModel { private final IBakedModel originalModel; diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 85976aed3..34a6abcc9 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -1,14 +1,6 @@ package vazkii.botania.client.model; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.vecmath.Matrix4f; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -19,8 +11,13 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.EnumFacing; import net.minecraftforge.client.model.IPerspectiveAwareModel; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.common.core.handler.ConfigHandler; +import javax.annotation.Nonnull; +import javax.vecmath.Matrix4f; +import java.util.List; + @SuppressWarnings("deprecation") public class LexiconModel implements IPerspectiveAwareModel { diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index b2f608f37..58e9c79d5 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -10,13 +10,12 @@ */ package vazkii.botania.client.model; -import java.awt.Color; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; +import org.lwjgl.opengl.GL11; + +import java.awt.Color; public class ModelHourglass extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index e5bb6f290..38876f373 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -10,18 +10,12 @@ */ package vazkii.botania.client.model; -import java.util.ArrayList; -import java.util.List; - -import org.lwjgl.opengl.GL11; - import com.google.common.base.Optional; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -38,8 +32,12 @@ import net.minecraftforge.client.model.pipeline.LightUtil; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.Models; import net.minecraftforge.common.model.TRSRTransformation; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.enums.PylonVariant; +import java.util.ArrayList; +import java.util.List; + public class ModelPylon implements IPylonModel { private IBakedModel manaCrystal; diff --git a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java index 75d473597..d251c3857 100644 --- a/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/src/main/java/vazkii/botania/client/model/ModelSpinningCubes.java @@ -10,12 +10,11 @@ */ package vazkii.botania.client.model; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; public class ModelSpinningCubes extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 4be0e62de..5ae521951 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -8,12 +8,7 @@ */ package vazkii.botania.client.model; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -37,6 +32,9 @@ import vazkii.botania.common.block.BlockCamo; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCamo; +import javax.annotation.Nonnull; +import java.util.List; + public class PlatformModel implements IBakedModel { @Nonnull diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 03f99cb29..f1e3eb43e 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -8,17 +8,6 @@ */ package vazkii.botania.client.model; -import java.io.IOException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Optional; - -import javax.annotation.Nonnull; -import javax.vecmath.Matrix4f; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Function; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; @@ -28,7 +17,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.gson.JsonElement; import com.google.gson.JsonParser; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -56,12 +44,21 @@ import net.minecraftforge.client.model.SimpleModelState; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.property.IExtendedBlockState; +import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.BotaniaAPIClient; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; +import javax.vecmath.Matrix4f; +import java.io.IOException; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; + public class SpecialFlowerModel implements IModelCustomData { // SpecialFlowerModel for when there are no blockModels registered for a subtile diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index 3998ccf2d..4ded2588f 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -10,14 +10,12 @@ */ package vazkii.botania.client.model.armor; -import javax.annotation.Nonnull; - -import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; +import javax.annotation.Nonnull; + public class ModelArmorElementium extends ModelArmor { private final ModelRenderer helm; public final ModelRenderer body; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index 547826ec0..043d03fa2 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -10,14 +10,12 @@ */ package vazkii.botania.client.model.armor; -import javax.annotation.Nonnull; - -import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; +import javax.annotation.Nonnull; + public class ModelArmorManasteel extends ModelArmor { private final ModelRenderer helm; public final ModelRenderer body; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index 06cf0a059..193193576 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -10,14 +10,12 @@ */ package vazkii.botania.client.model.armor; -import javax.annotation.Nonnull; - -import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; +import javax.annotation.Nonnull; + public class ModelArmorManaweave extends ModelArmor { private final ModelRenderer helm; public final ModelRenderer body; diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index 0b552afa5..9287d775c 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -10,14 +10,12 @@ */ package vazkii.botania.client.model.armor; -import javax.annotation.Nonnull; - -import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; -import net.minecraft.entity.item.EntityArmorStand; import net.minecraft.inventory.EntityEquipmentSlot; +import javax.annotation.Nonnull; + public class ModelArmorTerrasteel extends ModelArmor { private final ModelRenderer helm; public final ModelRenderer body; diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java index 84e1ca79f..c186a1eb5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -1,7 +1,5 @@ package vazkii.botania.client.render.entity; -import javax.annotation.Nonnull; - import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.layers.LayerRenderer; @@ -16,6 +14,8 @@ import vazkii.botania.client.render.tile.RenderTileGaiaHead; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class LayerGaiaHead implements LayerRenderer { private final ModelRenderer modelRenderer; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index f0d46d8eb..fdab8a8c8 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -10,12 +10,6 @@ */ package vazkii.botania.client.render.entity; -import java.util.Random; - -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -26,12 +20,16 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; +import javax.annotation.Nonnull; +import java.util.Random; + public class RenderBabylonWeapon extends Render { private static final ResourceLocation babylon = new ResourceLocation(LibResources.MISC_BABYLON); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index aa823cc02..cd8bd1282 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.entity; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -19,7 +17,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; -import net.minecraft.network.datasync.DataParameter; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 0f5947e59..ff5ef42d0 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -10,26 +10,20 @@ */ package vazkii.botania.client.render.entity; -import java.util.Map; -import java.util.UUID; - -import javax.annotation.Nonnull; - -import net.minecraft.client.entity.AbstractClientPlayer; -import org.lwjgl.opengl.ARBShaderObjects; - -import com.mojang.authlib.minecraft.MinecraftProfileTexture; - import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; +import javax.annotation.Nonnull; + public class RenderDoppleganger extends RenderBiped { public static final float DEFAULT_GRAIN_INTENSITY = 0.05F; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index 3d33811a8..ec8527fa3 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.entity; -import javax.annotation.Nonnull; - import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; @@ -20,6 +18,8 @@ import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; +import javax.annotation.Nonnull; + public class RenderManaStorm extends Render { public RenderManaStorm(RenderManager renderManager) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java index 200e3f128..cee5b73df 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -10,14 +10,14 @@ */ package vazkii.botania.client.render.entity; -import javax.annotation.Nonnull; - import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; +import javax.annotation.Nonnull; + public class RenderPinkWither extends RenderWither { private static final ResourceLocation resource = new ResourceLocation(LibResources.MODEL_PINK_WITHER); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index d8174bf8c..c954d3103 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -10,22 +10,21 @@ */ package vazkii.botania.client.render.entity; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.ARBShaderObjects; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPixie; import vazkii.botania.common.entity.EntityPixie; +import javax.annotation.Nonnull; + public class RenderPixie extends RenderLiving { final ShaderCallback callback = shader -> { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index 51dd22041..3838e5aba 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.entity; -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; @@ -22,6 +20,8 @@ import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.entity.EntityPoolMinecart; +import javax.annotation.Nonnull; + public class RenderPoolMinecart extends RenderMinecart { public RenderPoolMinecart(RenderManager manager) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java index a6b4f4713..ffde0e04a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -8,10 +8,6 @@ */ package vazkii.botania.client.render.entity; -import java.util.function.Function; - -import javax.annotation.Nonnull; - import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSnowball; @@ -19,6 +15,9 @@ import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; +import java.util.function.Function; + // Same as RenderSnowball, but ItemStack sensitive public class RenderSnowballStack extends RenderSnowball { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index 2c59c6d7d..9c374bed5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -12,7 +12,6 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.network.datasync.DataParameter; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntitySpark; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 43d3563cc..6448eef31 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -10,12 +10,6 @@ */ package vazkii.botania.client.render.entity; -import java.util.Random; - -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.Render; @@ -23,12 +17,15 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; -import net.minecraft.network.datasync.DataParameter; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.proxy.ClientProxy; +import javax.annotation.Nonnull; +import java.util.Random; + public abstract class RenderSparkBase extends Render { public RenderSparkBase(RenderManager manager) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index c5c754afa..a7d448cfc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -10,17 +10,13 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -29,6 +25,8 @@ import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; +import javax.annotation.Nonnull; + public class RenderTileAlfPortal extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 0d1142aa5..3ead2c7d1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -26,10 +22,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAltar; +import javax.annotation.Nonnull; + public class RenderTileAltar extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java index 6d48288c3..21f462c1c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.tile; -import java.util.Random; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -21,6 +19,8 @@ import net.minecraft.item.ItemStack; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.TileAnimatedTorch; +import java.util.Random; + public class RenderTileAnimatedTorch extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 97726171e..c3794b160 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nullable; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -23,6 +19,7 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -31,6 +28,8 @@ import vazkii.botania.client.model.ModelAvatar; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAvatar; +import javax.annotation.Nullable; + public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 1bbefbd06..d0ae75568 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nullable; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -21,6 +19,8 @@ import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileBellows; +import javax.annotation.Nullable; + public class RenderTileBellows extends TileEntitySpecialRenderer { private static final float[] ROTATIONS = new float[] { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 6f46ef96f..5a71e5631 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -10,9 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -25,6 +22,8 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBrewery; import vazkii.botania.common.block.tile.TileBrewery; +import javax.annotation.Nullable; + public class RenderTileBrewery extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java index d713e395d..3c2ae9a0e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -10,18 +10,17 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileCocoon; +import javax.annotation.Nonnull; + public class RenderTileCocoon extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 00264adb3..1dcb33342 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -10,18 +10,13 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - -import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.entity.RenderEntityItem; import net.minecraft.client.renderer.texture.TextureMap; @@ -40,10 +35,14 @@ import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.animation.CapabilityAnimation; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.Properties; +import org.apache.commons.lang3.tuple.Pair; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.core.handler.MethodHandles; +import javax.annotation.Nonnull; + public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { private EntityItem entity = null; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java index 54c7ec09b..874004075 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nullable; - import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelEnderCrystal; import net.minecraft.client.renderer.GlStateManager; @@ -21,6 +19,8 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; +import javax.annotation.Nullable; + public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java index de1d79800..1c82f6966 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -22,8 +18,8 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.item.EntityItem; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; @@ -31,6 +27,8 @@ import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.core.handler.MethodHandles; +import javax.annotation.Nonnull; + public class RenderTileEnchanter extends TileEntitySpecialRenderer { private EntityItem item; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 1d153f743..973684a09 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.render.tile; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; @@ -26,6 +22,9 @@ import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; +import javax.annotation.Nonnull; +import java.util.Random; + public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index d1783e274..45ee3f2bd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -10,11 +10,7 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.mojang.authlib.GameProfile; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; @@ -31,6 +27,9 @@ import net.minecraft.util.EnumFacing; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.render.entity.RenderDoppleganger; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + public class RenderTileGaiaHead extends TileEntitySkullRenderer { @Override public void render(TileEntitySkull skull, double x, double y, double z, float partialTicks, int digProgress, float unused) { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index 38f69023c..37cc4b5bc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -10,22 +10,20 @@ */ package vazkii.botania.client.render.tile; -import java.util.Random; - -import javax.annotation.Nullable; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelHourglass; import vazkii.botania.common.block.tile.TileHourglass; +import javax.annotation.Nullable; +import java.util.Random; + public class RenderTileHourglass extends TileEntitySpecialRenderer { final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index 67c8eb59a..78117439c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -10,12 +10,7 @@ */ package vazkii.botania.client.render.tile; -import java.util.Map; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -27,6 +22,9 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileIncensePlate; +import javax.annotation.Nonnull; +import java.util.Map; + public class RenderTileIncensePlate extends TileEntitySpecialRenderer { private static final Map ROTATIONS = ImmutableMap.of(EnumFacing.NORTH, 180, EnumFacing.SOUTH, 0, EnumFacing.WEST, 270, EnumFacing.EAST, 90); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index 483115991..1763c3ee1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -10,20 +10,13 @@ */ package vazkii.botania.client.render.tile; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -33,6 +26,10 @@ import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileLightRelay; +import javax.annotation.Nonnull; +import java.util.HashMap; +import java.util.Map; + public class RenderTileLightRelay extends TileEntitySpecialRenderer { private static Map sprites = new HashMap(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 8215d21f9..c90b672f1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -10,13 +10,6 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; -import java.util.Random; - -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -25,7 +18,7 @@ import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; @@ -37,6 +30,10 @@ import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; +import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.Random; + public class RenderTilePool extends TileEntitySpecialRenderer { // Overrides for when we call this TESR without an actual pool diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 5a956da11..4cf10b9e9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -22,6 +20,8 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.mana.TilePrism; +import javax.annotation.Nonnull; + //import vazkii.botania.client.render.item.RenderLens; public class RenderTilePrism extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 62b3c7c17..d733b40c1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -10,18 +10,13 @@ */ package vazkii.botania.client.render.tile; -import java.util.Random; - -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -35,6 +30,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; +import javax.annotation.Nonnull; +import java.util.Random; + public class RenderTilePylon extends TileEntitySpecialRenderer { private static final ResourceLocation textureOld = new ResourceLocation(LibResources.MODEL_PYLON_OLD); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index 56c2293fd..962bf2729 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -23,6 +21,8 @@ import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.model.ModelSpinningCubes; import vazkii.botania.common.block.tile.TileRuneAltar; +import javax.annotation.Nonnull; + public class RenderTileRuneAltar extends TileEntitySpecialRenderer { final ModelSpinningCubes cubes = new ModelSpinningCubes(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 77184c285..a63112e45 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -10,8 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -20,6 +18,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.tile.TileSparkChanger; +import javax.annotation.Nonnull; + public class RenderTileSparkChanger extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 3a7dc41b6..58cf7dfee 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -10,11 +10,6 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.BlockCarpet; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -33,6 +28,10 @@ import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileSpreader; +import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.Random; + public class RenderTileSpreader extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPREADER); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index 33b3d709f..da374ca86 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -10,24 +10,21 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; -import java.nio.FloatBuffer; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.block.tile.TileStarfield; +import javax.annotation.Nonnull; +import java.awt.Color; +import java.nio.FloatBuffer; +import java.util.Random; + // This is copied from the vanilla end portal TESR, relevant edits are commented public class RenderTileStarfield extends TileEntitySpecialRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 2350d2296..c51711789 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -10,10 +10,6 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; @@ -21,13 +17,15 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.tile.TileTerraPlate; +import javax.annotation.Nonnull; + public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @Override diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index dbcc836fc..af3916906 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -10,22 +10,20 @@ */ package vazkii.botania.client.render.tile; -import java.util.Random; - -import javax.annotation.Nullable; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTeruTeruBozu; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileTeruTeruBozu; +import javax.annotation.Nullable; +import java.util.Random; + public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index bb7145456..4b2c544f8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -10,17 +10,12 @@ */ package vazkii.botania.client.render.tile; -import java.util.Arrays; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; @@ -49,6 +44,9 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; +import javax.annotation.Nonnull; +import java.util.Arrays; + public class RenderTileTinyPotato extends TileEntitySpecialRenderer { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TINY_POTATO); private static final ResourceLocation textureGrayscale = new ResourceLocation(LibResources.MODEL_TINY_POTATO_GS); diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 4781e57c6..0ae1381c0 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -10,26 +10,25 @@ */ package vazkii.botania.client.render.world; -import java.util.Random; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraftforge.client.IRenderHandler; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientMethodHandles; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; +import java.util.Random; + public class SkyblockSkyRenderer extends IRenderHandler { private static final ResourceLocation textureSkybox = new ResourceLocation(LibResources.MISC_SKYBOX); diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 3b81f5f71..d9b405550 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -10,11 +10,8 @@ */ package vazkii.botania.common; -import net.minecraft.entity.MultiPartEntityPart; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import net.minecraft.entity.Entity; +import net.minecraft.entity.MultiPartEntityPart; import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityEnderCrystal; @@ -37,6 +34,8 @@ import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.event.FMLServerStoppingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconEntry; @@ -48,7 +47,6 @@ import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.brew.ModBrews; -import vazkii.botania.common.brew.ModPotions; import vazkii.botania.common.core.command.CommandDownloadLatest; import vazkii.botania.common.core.command.CommandOpen; import vazkii.botania.common.core.command.CommandShare; @@ -59,18 +57,15 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.IMCHandler; import vazkii.botania.common.core.handler.InternalMethodHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; -import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.handler.PixieHandler; import vazkii.botania.common.core.handler.SheddingHandler; import vazkii.botania.common.core.loot.LootHandler; import vazkii.botania.common.core.proxy.IProxy; import vazkii.botania.common.crafting.ModBrewRecipes; -import vazkii.botania.common.crafting.ModCraftingRecipes; import vazkii.botania.common.crafting.ModElvenTradeRecipes; import vazkii.botania.common.crafting.ModManaAlchemyRecipes; import vazkii.botania.common.crafting.ModManaConjurationRecipes; import vazkii.botania.common.crafting.ModManaInfusionRecipes; -import vazkii.botania.common.crafting.ModMigrationRecipes; import vazkii.botania.common.crafting.ModPetalRecipes; import vazkii.botania.common.crafting.ModPureDaisyRecipes; import vazkii.botania.common.crafting.ModRuneRecipes; @@ -84,8 +79,6 @@ import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.GuiHandler; import vazkii.botania.common.network.PacketHandler; diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 8df182993..a36af38e2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -32,6 +30,8 @@ import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable { public BlockAlfPortal() { diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 1592f78de..7a326964f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.BlockDirt; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -34,7 +29,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -43,10 +37,12 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockAltGrass extends BlockMod implements ILexiconable { public BlockAltGrass() { diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 2d56f216f..df45fe631 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -23,7 +19,6 @@ import net.minecraft.entity.Entity; 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.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; @@ -42,7 +37,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.ItemHandlerHelper; @@ -58,11 +52,12 @@ import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.item.rod.ItemWaterRod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockAltar extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0.125, 0.125, 0.875, 20.0/16, 0.875); diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index b19cffa31..33d9eafe3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -45,6 +43,8 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockAvatar extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(.3125, 0, .21875, 1-.3125, 17/16.0, 1-.21875); diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index fc36f3504..33ce3a498 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -36,6 +32,9 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockBifrost extends BlockMod implements ILexiconable { public BlockBifrost() { diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 64fef203b..13bf639e3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -32,6 +28,9 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockBifrostPerm extends BlockMod implements ILexiconable { public BlockBifrostPerm() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 6c4c1135d..4499839ef 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -30,6 +25,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class BlockCacophonium extends BlockMod { protected BlockCacophonium() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 183667e66..1520ca048 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -30,6 +25,10 @@ import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class BlockCell extends BlockMod implements ILexiconable { public BlockCell() { diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 9c3d93ebb..8c86edca2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -38,6 +33,10 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class BlockCocoon extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 0.875, 13.0/16);; diff --git a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java index 43d824978..88df0b38c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockDreamwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockDreamwood.java @@ -4,9 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.item.block.ItemBlockDreamwood; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index b97cd151c..4f635def7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -32,6 +28,9 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockEnchantedSoil extends BlockMod implements ILexiconable { public BlockEnchantedSoil() { diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 82209fec7..251427eef 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -30,6 +28,8 @@ import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockEnderEye extends BlockMod implements ILexiconable { protected BlockEnderEye() { diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index a7ec9f090..e868888bf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -10,13 +10,7 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -33,6 +27,10 @@ import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.Random; + public class BlockFakeAir extends BlockMod { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index a6cf5bdfc..7ec9509fd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -38,6 +36,8 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockFelPumpkin extends BlockMod implements ILexiconable { private static final String TAG_FEL_SPAWNED = "Botania-FelSpawned"; diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 46235cf61..6d19c3c33 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -24,13 +18,11 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.ChunkCache; @@ -40,11 +32,8 @@ import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -55,11 +44,13 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.block.tile.TileSpecialFlower; -import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; -import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; -import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD { diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 4b54a5101..a25d8a025 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -28,6 +26,8 @@ import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockForestEye extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 3f915be2c..82c3e98bd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -30,7 +24,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.render.IModelRegister; @@ -39,6 +32,11 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class BlockGaiaHead extends BlockSkull implements IModelRegister { public BlockGaiaHead() { diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index be4e23c9d..49788c0b6 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; import net.minecraft.block.BlockRailPowered; @@ -26,7 +24,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -35,11 +32,12 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockGhostRail extends BlockRailBase implements ILexiconable, IModelRegister { private static final String TAG_FLOAT_TICKS = "Botania_FloatTicks"; diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 5a4ec1433..414f65005 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -53,6 +49,9 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, IWandHUD, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1.15, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 300a5fe0f..fe4f1d5d9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -36,6 +34,8 @@ import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockIncensePlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0.375, 0, 0.125, 0.625, 1/16.0, 0.875); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 83c12bd48..9a580f475 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -38,6 +33,10 @@ import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class BlockLightLauncher extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 56a44f7af..bf902faf3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -10,18 +10,12 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -32,7 +26,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -42,10 +35,12 @@ import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileLightRelay; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(5.0/16, 5.0/16, 5.0/16, 11.0/16, 11.0/16, 11.0/16); diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 41679c99f..75d351a64 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -10,23 +10,17 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -34,10 +28,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockLivingrock extends BlockMod implements ILexiconable { public BlockLivingrock() { diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index 0bbb389fd..4cbc8ed29 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -10,24 +10,18 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -35,10 +29,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockLivingwood extends BlockMod implements ILexiconable { public BlockLivingwood() { diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 468b52d82..b86c457f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -19,15 +19,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockElven; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibMisc; public abstract class BlockMod extends Block implements IModelRegister { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 1af4bc234..2b723ca12 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,15 +10,7 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - -import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.SoundType; import net.minecraft.block.properties.PropertyEnum; @@ -41,7 +33,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -51,11 +42,15 @@ import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; 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 vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public abstract class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconable, IModelRegister { private static final int COUNT = 8; diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java index 9c52d6f1e..cfe911174 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower1.java @@ -1,7 +1,5 @@ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -12,6 +10,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; +import javax.annotation.Nonnull; + // White to Gray public class BlockModDoubleFlower1 extends BlockModDoubleFlower { public BlockModDoubleFlower1() { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java index 0325e0a38..11d5a62f8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower2.java @@ -1,7 +1,5 @@ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -12,6 +10,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; +import javax.annotation.Nonnull; + // Silver to black public class BlockModDoubleFlower2 extends BlockModDoubleFlower { diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index d5af29c03..968fa7f31 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.BlockFlower; @@ -24,10 +19,8 @@ import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; @@ -36,7 +29,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -47,11 +39,13 @@ import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; 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 vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockModFlower extends BlockFlower implements ILexiconable, IGrowable, IModelRegister { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index e6ab56fa8..a11b76ed7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -24,7 +20,6 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -34,7 +29,6 @@ import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -49,10 +43,11 @@ import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, IWandHUD { public BlockOpenCrate() { diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index a7a4d997f..b8301d04d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -10,16 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.UUID; - -import javax.annotation.Nonnull; - import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockPistonExtension; @@ -51,11 +41,20 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.Type; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.UUID; + public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { // Currently active binding attempts @@ -127,7 +126,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl if(!player.isSneaking()) { playerPositions.put(player.getUniqueID(), new DimWithPos(world.provider.getDimension(), pos)); - world.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 0.5F, 1F); + world.playSound(null, pos, ModSounds.ding, SoundCategory.BLOCKS, 0.5F, 1F); } else { spawnAsEntity(world, pos, new ItemStack(this)); world.setBlockToAir(pos); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 2a3a3c13d..3862df8fd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -23,7 +19,6 @@ import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; @@ -40,7 +35,6 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -50,13 +44,14 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.TilePlatform; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.List; + public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, IManaCollisionGhost { public BlockPlatform() { diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 2d9740760..6987d926b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -10,17 +10,12 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -30,7 +25,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -41,10 +35,11 @@ import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TilePylon; 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 javax.annotation.Nonnull; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabiliser { diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 0d17cea0a..fdc6e22ae 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -29,6 +25,9 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockRoot extends BlockMod implements ILexiconable { public BlockRoot() { diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 2ae4c9f61..acb0ea43d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.BlockVine; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; @@ -26,13 +22,15 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockSolidVines extends BlockVine implements ILexiconable { public BlockSolidVines() { diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 9620627f9..e0543c2d0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -37,6 +35,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockSparkChanger extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index f8498f9e7..56b37e77e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.BlockFlower; import net.minecraft.block.SoundType; import net.minecraft.block.properties.IProperty; @@ -29,10 +23,8 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; @@ -48,7 +40,6 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -68,6 +59,11 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, IWandable, ILexiconable, IWandHUD, IModelRegister { static { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 4e42eb71b..8e8981057 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -10,23 +10,17 @@ */ package vazkii.botania.common.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -34,10 +28,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockStorage extends BlockMod implements ILexiconable { public BlockStorage() { diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index ccf359e7b..91757bde2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -38,6 +36,8 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.01, 0.25, 0.75, 0.99, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 6f74a5c9d..29e24baac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -29,6 +27,8 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTinyPlanet extends BlockMod implements ILexiconable, IManaCollisionGhost { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 3.0/16, 3.0/16, 13.0/16, 13.0/16, 13.0/16); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 2b7379754..b5b91905a 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -17,7 +17,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -76,32 +75,7 @@ import vazkii.botania.common.block.string.BlockRedStringInterceptor; import vazkii.botania.common.block.string.BlockRedStringRelay; import vazkii.botania.common.block.subtile.SubTileManastar; import vazkii.botania.common.block.subtile.SubTilePureDaisy; -import vazkii.botania.common.block.subtile.functional.SubTileAgricarnation; -import vazkii.botania.common.block.subtile.functional.SubTileBellethorn; -import vazkii.botania.common.block.subtile.functional.SubTileBergamute; -import vazkii.botania.common.block.subtile.functional.SubTileBubbell; -import vazkii.botania.common.block.subtile.functional.SubTileClayconia; -import vazkii.botania.common.block.subtile.functional.SubTileDaffomill; -import vazkii.botania.common.block.subtile.functional.SubTileDreadthorn; -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.SubTileHyacidus; -import vazkii.botania.common.block.subtile.functional.SubTileJadedAmaranthus; -import vazkii.botania.common.block.subtile.functional.SubTileJiyuulia; -import vazkii.botania.common.block.subtile.functional.SubTileLoonuim; -import vazkii.botania.common.block.subtile.functional.SubTileMarimorphosis; -import vazkii.botania.common.block.subtile.functional.SubTileMedumone; -import vazkii.botania.common.block.subtile.functional.SubTileOrechid; -import vazkii.botania.common.block.subtile.functional.SubTileOrechidIgnem; -import vazkii.botania.common.block.subtile.functional.SubTilePollidisiac; -import vazkii.botania.common.block.subtile.functional.SubTileRannuncarpus; -import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; -import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; -import vazkii.botania.common.block.subtile.functional.SubTileTangleberrie; -import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; -import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; +import vazkii.botania.common.block.subtile.functional.*; import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; @@ -114,39 +88,7 @@ import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia; import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; -import vazkii.botania.common.block.tile.TileAlfPortal; -import vazkii.botania.common.block.tile.TileAltar; -import vazkii.botania.common.block.tile.TileAnimatedTorch; -import vazkii.botania.common.block.tile.TileAvatar; -import vazkii.botania.common.block.tile.TileBifrost; -import vazkii.botania.common.block.tile.TileBrewery; -import vazkii.botania.common.block.tile.TileCacophonium; -import vazkii.botania.common.block.tile.TileCell; -import vazkii.botania.common.block.tile.TileCocoon; -import vazkii.botania.common.block.tile.TileCraftCrate; -import vazkii.botania.common.block.tile.TileEnchanter; -import vazkii.botania.common.block.tile.TileEnderEye; -import vazkii.botania.common.block.tile.TileFakeAir; -import vazkii.botania.common.block.tile.TileFloatingFlower; -import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; -import vazkii.botania.common.block.tile.TileForestEye; -import vazkii.botania.common.block.tile.TileGaiaHead; -import vazkii.botania.common.block.tile.TileHourglass; -import vazkii.botania.common.block.tile.TileIncensePlate; -import vazkii.botania.common.block.tile.TileLightRelay; -import vazkii.botania.common.block.tile.TileManaFlame; -import vazkii.botania.common.block.tile.TileOpenCrate; -import vazkii.botania.common.block.tile.TilePlatform; -import vazkii.botania.common.block.tile.TilePylon; -import vazkii.botania.common.block.tile.TileRuneAltar; -import vazkii.botania.common.block.tile.TileSparkChanger; -import vazkii.botania.common.block.tile.TileSpawnerClaw; -import vazkii.botania.common.block.tile.TileSpecialFlower; -import vazkii.botania.common.block.tile.TileStarfield; -import vazkii.botania.common.block.tile.TileTerraPlate; -import vazkii.botania.common.block.tile.TileTeruTeruBozu; -import vazkii.botania.common.block.tile.TileTinyPlanet; -import vazkii.botania.common.block.tile.TileTinyPotato; +import vazkii.botania.common.block.tile.*; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; @@ -168,7 +110,6 @@ import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.block.tile.string.TileRedStringRelay; -import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockDreamwood; import vazkii.botania.common.item.block.ItemBlockElven; @@ -366,8 +307,6 @@ public final class ModBlocks { @SuppressWarnings("ConstantConditions") @SubscribeEvent public static void registerItemBlocks(RegistryEvent.Register evt) { - //GameRegistry.register(this instanceof IElvenItem ? new ItemBlockElven(this) : new ItemBlockMod(this), getRegistryName()); - IForgeRegistry r = evt.getRegistry(); r.register(new ItemBlockWithMetadataAndName(flower).setRegistryName(flower.getRegistryName())); r.register(new ItemBlockWithMetadataAndName(altar).setRegistryName(altar.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 7a64e1d4b..9795f0fc8 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -10,20 +10,13 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; @@ -68,6 +61,10 @@ import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + @Mod.EventBusSubscriber public final class ModFluffBlocks { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java index 14b218b5b..e9ab8fcbd 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java @@ -10,19 +10,16 @@ */ package vazkii.botania.common.block.corporea; -import javax.annotation.Nonnull; - import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.InventoryHelper; +import javax.annotation.Nonnull; + public abstract class BlockCorporeaBase extends BlockMod { public BlockCorporeaBase(Material material, String name) { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index b1ed36fe5..bd7e46e31 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.corporea; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -40,6 +38,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3.0/16, 0, 3.0/16, 13.0/16, 1, 13.0/16); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 6cef98a9c..5cffb35c5 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.corporea; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -29,6 +27,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaFunnel() { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 817bf67d6..6d272ccbf 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.corporea; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -40,6 +38,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaIndex() { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index c3f568469..fea3f643a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.corporea; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -32,6 +28,9 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexiconable { public BlockCorporeaInterceptor() { diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 3db04e63d..36b320412 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -10,15 +10,12 @@ */ package vazkii.botania.common.block.corporea; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; @@ -31,6 +28,8 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCorporeaRetainer extends BlockMod implements ILexiconable { public BlockCorporeaRetainer() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index e6ca80a5a..ae97ec152 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -33,6 +29,9 @@ import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockBuriedPetals extends BlockModFlower { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.1, 1); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index b5137df40..85d961b9b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -10,23 +10,17 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -35,10 +29,11 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.CustomBrickVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockCustomBrick extends BlockMod implements ILexiconable { public BlockCustomBrick() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 29e04dc15..5762e0608 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -44,7 +39,6 @@ import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -61,10 +55,12 @@ import vazkii.botania.common.block.tile.TileFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.IFloatingFlowerVariant; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfusionStabiliser { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index f7bdb5287..7c3da581b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -42,6 +37,9 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; +import javax.annotation.Nonnull; +import java.util.List; + public class BlockManaFlame extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.25, 0.25, 0.75, 0.75, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java index 80e45f348..2bf7b1afc 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -31,6 +29,8 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockManaGlass extends BlockMod implements ILexiconable { public BlockManaGlass() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index 295ac7fb4..d5db5d89e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - -import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.BlockMushroom; import net.minecraft.block.SoundType; @@ -25,9 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; @@ -35,7 +27,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -48,11 +39,13 @@ import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; 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 vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.Random; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IModelRegister { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index e57a071dd..de2443f61 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -21,21 +17,20 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockPavement extends BlockMod { public static final int TYPES = 6; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index 11a7d042f..6992fecc5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -22,13 +18,11 @@ import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -36,10 +30,11 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockPetalBlock extends BlockMod implements ILexiconable { public BlockPetalBlock() { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java index c6c3c7a24..548c14165 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor; -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; @@ -32,6 +30,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockShinyFlower extends BlockModFlower implements IInfusionStabiliser, IHornHarvestable { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index f11cd5ccd..6bd25eb36 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -34,6 +32,8 @@ import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockStarfield extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index c6e5a189c..e9a1e417c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -30,7 +25,6 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -38,10 +32,13 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileTinyPotato; import vazkii.botania.common.core.helper.InventoryHelper; -import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class BlockTinyPotato extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0, 0.375, 0.625, 0.375, 0.625); diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index 8bc7e15f2..dfc2b977f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -10,30 +10,25 @@ */ package vazkii.botania.common.block.decor.biomestone; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; + public class BlockBiomeStone extends BlockMod implements ILexiconable { public BlockBiomeStone(String name) { diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index 141aee2b1..8cd9da7f4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor.biomestone; -import javax.annotation.Nonnull; - import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraftforge.fml.relauncher.Side; @@ -21,6 +19,8 @@ import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBiomeStoneA extends BlockBiomeStone { public BlockBiomeStoneA() { diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index 79696dc1a..88bc64707 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor.biomestone; -import javax.annotation.Nonnull; - import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraftforge.fml.relauncher.Side; @@ -21,6 +19,8 @@ import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBiomeStoneB extends BlockBiomeStone { public BlockBiomeStoneB() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java index 671fe5d7f..2130ac294 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockAlfglassPane.java @@ -10,14 +10,14 @@ */ package vazkii.botania.common.block.decor.panes; -import javax.annotation.Nonnull; - import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockAlfglassPane extends BlockModPane { public BlockAlfglassPane() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java index a2942f8fe..cb9a7808b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockBifrostPane.java @@ -10,14 +10,14 @@ */ package vazkii.botania.common.block.decor.panes; -import javax.annotation.Nonnull; - import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockBifrostPane extends BlockModPane { public BlockBifrostPane() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java index 46b4b7b20..544add3e7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockManaglassPane.java @@ -10,14 +10,14 @@ */ package vazkii.botania.common.block.decor.panes; -import javax.annotation.Nonnull; - import net.minecraft.util.BlockRenderLayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + public class BlockManaglassPane extends BlockModPane { public BlockManaglassPane() { diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index b044ab7a5..20c574bf5 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.decor.panes; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.SoundType; @@ -20,13 +18,13 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class BlockModPane extends BlockPane implements IModelRegister { public BlockModPane(Block source) { diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 54822e153..c0d217ddd 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -10,23 +10,17 @@ */ package vazkii.botania.common.block.decor.quartz; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -36,9 +30,10 @@ import vazkii.botania.api.state.enums.QuartzVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; + public class BlockSpecialQuartz extends BlockMod implements ILexiconable { public final String type; diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index 7ee9d9946..9326ab20c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.decor.quartz; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; @@ -29,6 +25,9 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockSpecialQuartzSlab extends BlockModSlab { final Block source; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index e9ef05e6d..bba624011 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -1,10 +1,5 @@ package vazkii.botania.common.block.decor.slabs; -import java.util.Locale; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -21,7 +16,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; @@ -33,6 +27,10 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.Locale; +import java.util.Random; + public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IModelRegister { private final String name; diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index ab405643c..bd6f7aa58 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -10,14 +10,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index e544fe600..f8dcaad7b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -10,23 +10,17 @@ */ package vazkii.botania.common.block.decor.walls; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.BlockWall; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.LexiconEntry; @@ -34,9 +28,10 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; + public class BlockBiomeStoneWall extends BlockModWall { public BlockBiomeStoneWall() { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 3c34789f0..94a554146 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.decor.walls; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.block.state.BlockStateContainer; @@ -21,23 +17,22 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; + public abstract class BlockModWall extends BlockWall implements ILexiconable, IModelRegister { public BlockModWall(Block block, int meta) { diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java index 55daed748..26595cdb9 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -1,7 +1,5 @@ package vazkii.botania.common.block.dispenser; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; @@ -13,6 +11,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; +import javax.annotation.Nonnull; + // Taken from vanilla pumpkin dispense behaviour public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { private boolean field_179241_b = true; diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index 73f460879..b3300af59 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.dispenser; -import javax.annotation.Nonnull; - import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockRailBase; import net.minecraft.block.material.Material; @@ -25,6 +23,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.common.entity.EntityPoolMinecart; +import javax.annotation.Nonnull; + public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java index 1915f49d7..c96deaa09 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.dispenser; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.dispenser.BehaviorDefaultDispenseItem; @@ -22,6 +20,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.wand.IWandable; +import javax.annotation.Nonnull; + public class BehaviourWand extends BehaviorDefaultDispenseItem { @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index c2eae38ed..f79ace44b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -43,6 +41,8 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBellows extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.1875, 0, 0.1875, 1-0.1875, 10.0 / 16, 1-0.1875); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 157ee0693..22c7b119f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -46,6 +44,8 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.375, 0.05, 0.375, 0.625, 0.95, 0.625); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index 4d78036f4..6d83a0cb6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -27,6 +25,8 @@ import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockDistributor extends BlockMod implements ILexiconable { public BlockDistributor() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 4aea1b0aa..f08570358 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -46,6 +42,9 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD { private final Random random = new Random(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 98dcafd60..88903da13 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -27,7 +21,6 @@ import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.NonNullList; @@ -37,7 +30,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IManaBurst; @@ -49,10 +41,14 @@ import vazkii.botania.api.state.enums.DrumVariant; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.ItemGrassHorn; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(3/16.0, 0, 3/16.0, 13/16.0, 14/16.0, 13/16.0); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 8b590590c..b953f9d8a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -37,6 +33,9 @@ import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.List; + public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCollisionGhost { public BlockManaDetector() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 50ba2e3a3..9e592d763 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -32,6 +30,8 @@ import vazkii.botania.common.block.tile.mana.TileManaVoid; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockManaVoid extends BlockMod implements ILexiconable, IPoolOverlayProvider { public BlockManaVoid() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 4c63c9c7a..8671fb4d8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -26,9 +21,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -41,7 +34,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -55,10 +47,13 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TilePool; -import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.5, 1); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index ffe5e3fb2..cfc48f065 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -46,6 +42,9 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 383ab55ec..60b5b1b18 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.IProperty; @@ -40,6 +38,8 @@ import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockPump extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0, 0, 0.25, 1, 0.5, 0.75); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 94c6af01b..3e7d175a6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -19,9 +17,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -29,6 +25,8 @@ import vazkii.botania.common.block.tile.mana.TileRFGenerator; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRFGenerator extends BlockMod implements ILexiconable { public BlockRFGenerator() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 2353b0e4e..ce381b360 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -36,6 +34,8 @@ import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.75, 1); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index 702d4dc79..bec8f45af 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -10,16 +10,11 @@ */ package vazkii.botania.common.block.mana; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; @@ -34,6 +29,8 @@ import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockSpawnerClaw extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0, 0.125, 0.875, 1/16.0, 0.875); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 62639bab7..d9d3fca19 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.mana; -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.block.BlockPistonBase; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -35,7 +30,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.ItemHandlerHelper; @@ -52,10 +46,11 @@ import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { public BlockSpreader() { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index b326cca82..c45f9d34a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -34,6 +32,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTerraPlate extends BlockMod implements ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 3.0/16, 1); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 737902a3a..50147c5e7 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.mana; -import javax.annotation.Nonnull; - import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -34,6 +32,8 @@ import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockTurntable extends BlockMod implements IWandable, IWandHUD, ILexiconable { public BlockTurntable() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index b425f3c5c..06d430bbe 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.string; -import javax.annotation.Nonnull; - -import net.minecraft.block.BlockPistonBase; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockStateContainer; @@ -32,6 +29,8 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; + public abstract class BlockRedString extends BlockMod implements ILexiconable { public BlockRedString(String name) { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java index 2c62fb0e3..52adb0fed 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringComparator.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.string; -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; @@ -21,6 +19,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringComparator; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringComparator extends BlockRedString { public BlockRedStringComparator() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java index d6297f63c..74c2c74d0 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringContainer.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.string; -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -20,6 +18,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringContainer; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringContainer extends BlockRedString { public BlockRedStringContainer() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index e1af2cae4..c7fe7b365 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.string; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -27,6 +25,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringDispenser; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringDispenser extends BlockRedString { public BlockRedStringDispenser() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java index 8ebaa55d2..aceb03843 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringFertilizer.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.string; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; @@ -24,6 +20,9 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringFertilizer; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockRedStringFertilizer extends BlockRedString implements IGrowable { public BlockRedStringFertilizer() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 1ae23e0fb..5d89d5a83 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.string; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -32,6 +28,9 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringInterceptor; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class BlockRedStringInterceptor extends BlockRedString { public BlockRedStringInterceptor() { diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java index a0d4c5bcb..177ef6b93 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringRelay.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.string; -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; @@ -20,6 +18,8 @@ import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.block.tile.string.TileRedStringRelay; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockRedStringRelay extends BlockRedString { public BlockRedStringRelay() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 1fa952700..386875026 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -1,11 +1,5 @@ package vazkii.botania.common.block.subtile.functional; -import java.awt.Color; -import java.util.Random; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.ITickableSound; import net.minecraft.client.audio.MovingSound; @@ -22,6 +16,11 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.block.tile.mana.TilePool; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.Color; +import java.util.Random; + @SideOnly(Side.CLIENT) public class BergamuteEventHandler { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index d5afac738..474bd66f5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -21,10 +21,10 @@ import net.minecraft.init.Blocks; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; public class SubTileAgricarnation extends SubTileFunctional { @@ -59,7 +59,7 @@ public class SubTileAgricarnation extends SubTileFunctional { supertile.getWorld().scheduleUpdate(pos, block, 1); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playEvent(2005, pos, 6 + supertile.getWorld().rand.nextInt(4)); - supertile.getWorld().playSound(null, x, y, z, BotaniaSoundEvents.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); + supertile.getWorld().playSound(null, x, y, z, ModSounds.agricarnation, SoundCategory.BLOCKS, 0.01F, 0.5F + (float) Math.random() * 0.5F); break; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index 2c09a6c15..098e92295 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; -import java.util.function.Predicate; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityWitch; @@ -24,6 +21,9 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; +import java.util.function.Predicate; + public class SubTileBellethorn extends SubTileFunctional { public static final int RANGE = 6; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index d3c7dfa77..8dd4baaab 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -1,14 +1,14 @@ package vazkii.botania.common.block.subtile.functional; -import java.util.Collections; -import java.util.Set; -import java.util.WeakHashMap; - import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Collections; +import java.util.Set; +import java.util.WeakHashMap; + public class SubTileBergamute extends SubTileFunctional { private static final int RANGE = 4; private static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 568720730..4cb98f651 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -25,6 +22,9 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.List; + public class SubTileClayconia extends SubTileFunctional { private static final int COST = 80; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 213e786af..5f9b4f290 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -25,6 +23,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileDaffomill extends SubTileFunctional { private static final String TAG_ORIENTATION = "orientation"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java index 89fe0ed18..2ed02327f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDreadthorn.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.function.Predicate; - import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityAnimal; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; +import java.util.function.Predicate; + public class SubTileDreadthorn extends SubTileBellethorn { @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 297c5f102..26242ae5c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; @@ -21,6 +19,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileFallenKanade extends SubTileFunctional { private static final int RANGE = 2; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 0a558eaef..5707adae5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -10,11 +10,7 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicates; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; @@ -30,6 +26,9 @@ 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; + public class SubTileHeiseiDream extends SubTileFunctional { private static final int RANGE = 5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index ffcff9812..f5a44b1c7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -34,6 +29,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; @@ -43,6 +39,9 @@ import vazkii.botania.common.core.handler.MethodHandles; 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/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index 7be43e2e7..16d903fef 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.player.EntityPlayer; @@ -23,6 +21,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileHyacidus extends SubTileFunctional { private static final int RANGE = 6; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 99626c48c..f060e26ca 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -10,12 +10,8 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; -import java.util.Random; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; @@ -48,6 +44,9 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; +import java.util.Random; + public class SubTileLoonuim extends SubTileFunctional { private static final int COST = 35000; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index de549a813..5dd841ee0 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -10,17 +10,11 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - import gnu.trove.list.array.TIntArrayList; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; @@ -33,6 +27,10 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + public class SubTileMarimorphosis extends SubTileFunctional { private static final int COST = 12; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java index affbbf366..742b22f51 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMedumone.java @@ -10,8 +10,6 @@ */ 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.init.MobEffects; @@ -22,6 +20,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileMedumone extends SubTileFunctional { private static final int RANGE = 6; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 50e2636cf..9f86a6cec 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -27,13 +23,17 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class SubTileOrechid extends SubTileFunctional { private static final int COST = 17500; @@ -61,7 +61,7 @@ public class SubTileOrechid extends SubTileFunctional { supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); if(ConfigHandler.blockBreakParticles) supertile.getWorld().playEvent(2001, coords, Block.getIdFromBlock(block) + (meta << 12)); - supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.orechid, SoundCategory.BLOCKS, 2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.orechid, SoundCategory.BLOCKS, 2F, 1F); mana -= cost; sync(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index 3a606bead..416bb209f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -10,14 +10,14 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Map; + public class SubTileOrechidIgnem extends SubTileOrechid { private static final int COST = 20000; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index 452df1a2c..9d6729313 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; @@ -24,6 +22,8 @@ import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; +import java.util.List; + public class SubTilePollidisiac extends SubTileFunctional { private static final int RANGE = 6; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 67e7fec9a..8b268704f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.ItemPiston; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -27,6 +21,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlockSpecial; +import net.minecraft.item.ItemPiston; import net.minecraft.item.ItemRedstone; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -35,6 +30,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.IFloatingFlower; import vazkii.botania.api.item.IFlowerPlaceable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -48,6 +44,9 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; +import java.util.ArrayList; +import java.util.List; + public class SubTileRannuncarpus extends SubTileFunctional { private static final int RANGE = 2; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index ba5d563df..37acb8784 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -10,17 +10,16 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.Collections; -import java.util.Set; - import com.google.common.collect.MapMaker; - import net.minecraft.entity.Entity; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Collections; +import java.util.Set; + public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index ec004866b..1746a411d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -33,6 +31,8 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import java.util.List; + public class SubTileSpectranthemum extends SubTileFunctional { private static final String TAG_BIND_X = "bindX"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 5418677c1..35ec378de 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -10,8 +10,6 @@ */ 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.math.AxisAlignedBB; @@ -23,6 +21,8 @@ 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/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index f0ffca66e..7cafa7b77 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -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; @@ -29,6 +26,9 @@ 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; + public class SubTileTigerseye extends SubTileFunctional { private static final int RANGE = 10; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index d0695431a..375205cd4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.subtile.functional; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.WeakHashMap; - import net.minecraft.entity.monster.EntityEnderman; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; @@ -26,6 +20,12 @@ import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.WeakHashMap; + public class SubTileVinculotus extends SubTileFunctional { public static final Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 845dd5e5b..98262e99d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.math.AxisAlignedBB; @@ -21,6 +19,8 @@ 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 { private static final int RANGE = 1; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 59eb67f59..3b86d437d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; @@ -25,6 +22,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.List; + public class SubTileDandelifeon extends SubTileGenerating { private static final int RANGE = 12; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 80efaf055..92c647120 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -10,8 +10,6 @@ */ 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; @@ -21,13 +19,15 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileEndoflame extends SubTileGenerating { private static final String TAG_BURN_TIME = "burnTime"; @@ -67,7 +67,7 @@ public class SubTileEndoflame extends SubTileGenerating { if(!supertile.getWorld().isRemote) { stack.shrink(1); - supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); didSomething = true; } else { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index 56bf1b7d1..14ae08ce7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.init.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; @@ -23,6 +21,8 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import java.util.List; + public class SubTileEntropinnyum extends SubTileGenerating { private static final int RANGE = 12; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index d07e87d76..3db0ba405 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; @@ -28,6 +26,8 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileGourmaryllis extends SubTileGenerating { private static final String TAG_COOLDOWN = "cooldown"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index 915953e68..08b735a45 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; @@ -35,6 +31,10 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class SubTileHydroangeas extends SubTileGenerating { private static final String TAG_BURN_TIME = "burnTime"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index d2c4a45ec..06046ab5a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -30,6 +26,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class SubTileMunchdew extends SubTileGenerating { private static final String TAG_COOLDOWN = "cooldown"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 76affc26a..a87c3cfea 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.SoundEvents; import net.minecraft.util.EnumParticleTypes; @@ -28,6 +26,8 @@ import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileNarslimmus extends SubTileGenerating { public static final String TAG_WORLD_SPAWNED = "Botania:WorldSpawned"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java index a80477fcb..a2b9e8774 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -28,6 +26,8 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lexicon.LexiconData; +import java.util.List; + public class SubTileRafflowsia extends SubTileGenerating { private static final String TAG_LAST_FLOWER = "lastFlower"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 6628c1865..02a7f3901 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.awt.Color; -import java.util.List; - -import net.minecraft.world.WorldServer; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -27,14 +21,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.lexicon.LexiconData; +import java.awt.Color; +import java.util.List; + public class SubTileSpectrolus extends SubTileGenerating { private static final String TAG_NEXT_COLOR = "nextColor"; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index 11b87ba57..9a09a7588 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -13,8 +13,8 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.material.Material; import net.minecraft.util.SoundCategory; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lexicon.LexiconData; public class SubTileThermalily extends SubTileHydroangeas { @@ -41,7 +41,7 @@ public class SubTileThermalily extends SubTileHydroangeas { @Override public void playSound() { - supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.thermalily, SoundCategory.BLOCKS, 0.2F, 1F); + supertile.getWorld().playSound(null, supertile.getPos(), ModSounds.thermalily, SoundCategory.BLOCKS, 0.2F, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 1c8caa9b1..f772f5ca4 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -10,13 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Function; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -45,6 +38,12 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemLexicon; import vazkii.botania.common.lexicon.LexiconData; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; + public class TileAlfPortal extends TileMod { private static final BlockPos[] LIVINGWOOD_POSITIONS = { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 76039d486..6733e957f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -37,7 +32,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -47,17 +41,21 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IFlowerComponent; import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; public class TileAltar extends TileSimpleInventory implements IPetalApothecary { @@ -210,7 +208,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } private void craftingFanciness() { - world.playSound(null, pos, BotaniaSoundEvents.altarCraft, SoundCategory.BLOCKS, 1F, 1F); + world.playSound(null, pos, ModSounds.altarCraft, SoundCategory.BLOCKS, 1F, 1F); PacketHandler.sendToNearby(world, getPos(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.APOTHECARY_CRAFT, getPos().getX(), getPos().getY(), getPos().getZ())); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index 74998df45..1cd663330 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.block.tile; -import javax.annotation.Nonnull; - import net.minecraft.nbt.NBTTagCompound; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class TileBifrost extends TileMod { private static final String TAG_TICKS = "ticks"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 938ed0e97..c775135a6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.awt.Color; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; @@ -31,14 +25,19 @@ import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeBrew; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.awt.Color; +import java.util.List; + // This is mostly copypasta from TileRuneAltar public class TileBrewery extends TileSimpleInventory implements IManaReceiver { @@ -165,7 +164,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { } public void craftingFanciness() { - world.playSound(null, pos, BotaniaSoundEvents.potionCreate, SoundCategory.BLOCKS, 1F, 1.5F + (float) Math.random() * 0.25F); + world.playSound(null, pos, ModSounds.potionCreate, SoundCategory.BLOCKS, 1F, 1.5F + (float) Math.random() * 0.25F); PacketHandler.sendToNearby(world, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BREWERY_FINISH, pos.getX(), pos.getY(), pos.getZ(), recipe.getBrew().getColor(itemHandler.getStackInSlot(0)))); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index 1f6051041..e68401541 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -23,12 +23,8 @@ import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; -import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.datasync.DataParameter; import net.minecraftforge.fml.common.registry.VillagerRegistry; -import net.minecraftforge.fml.relauncher.ReflectionHelper; -import vazkii.botania.common.lib.LibObfuscation; public class TileCocoon extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 788191777..c00d1254f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -10,15 +10,10 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -28,6 +23,8 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class TileCraftCrate extends TileOpenCrate { public static final boolean[][] PATTERNS = new boolean[][] { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 7c3db11ff..7bc90f0b3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -10,16 +10,7 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import javax.annotation.Nonnull; - import com.google.common.base.Predicates; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.enchantment.Enchantment; @@ -49,13 +40,20 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + public class TileEnchanter extends TileMod implements ISparkAttachable { private static final String TAG_STAGE = "stage"; @@ -163,7 +161,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { world.setBlockState(pos, Blocks.LAPIS_BLOCK.getDefaultState(), 1 | 2); PacketHandler.sendToNearby(world, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_DESTROY, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5)); - world.playSound(null, pos, BotaniaSoundEvents.enchanterFade, SoundCategory.BLOCKS, 0.5F, 10F); + world.playSound(null, pos, ModSounds.enchanterFade, SoundCategory.BLOCKS, 0.5F, 10F); } switch(stage) { @@ -185,7 +183,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { Enchantment ench = Enchantment.getEnchantmentByID(enchantId); if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { this.enchants.add(new EnchantmentData(ench, enchantLvl)); - world.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 1F, 1F); + world.playSound(null, pos, ModSounds.ding, SoundCategory.BLOCKS, 1F, 1F); addedEnch = true; break; } @@ -285,7 +283,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } private void craftingFanciness() { - world.playSound(null, pos, BotaniaSoundEvents.enchanterEnchant, SoundCategory.BLOCKS, 1F, 1F); + world.playSound(null, pos, ModSounds.enchanterEnchant, SoundCategory.BLOCKS, 1F, 1F); PacketHandler.sendToNearby(world, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_CRAFT, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5)); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index bd945a1b1..b18874596 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.EntityEquipmentSlot; @@ -24,6 +22,8 @@ import net.minecraft.world.WorldServer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.equipment.tool.ToolCommons; +import java.util.List; + public class TileEnderEye extends TileMod { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index f833afbdd..59b5a5e57 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.block.tile; -import javax.annotation.Nonnull; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import vazkii.botania.common.block.subtile.functional.SubTileBubbell; +import javax.annotation.Nonnull; + public class TileFakeAir extends TileMod { private static final String TAG_FLOWER_X = "flowerX"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index d5ba00718..2672914a0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.awt.Color; -import java.util.List; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; @@ -29,6 +26,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.List; public class TileIncensePlate extends TileSimpleInventory { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index e5998bd29..89e302c09 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -34,14 +28,19 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; +import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; + public class TileLightRelay extends TileMod implements IWandBindable { private static final int MAX_DIST = 20; @@ -62,7 +61,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { world.spawnEntity(mover); e.startRiding(mover); if(!(e instanceof EntityItem)) { - mover.playSound(BotaniaSoundEvents.lightRelay, 0.2F, (float) Math.random() * 0.3F + 0.7F); + mover.playSound(ModSounds.lightRelay, 0.2F, (float) Math.random() * 0.3F + 0.7F); } } @@ -260,7 +259,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { boolean isItem = getRidingEntity() instanceof EntityItem; if(!isItem && ticksExisted % 30 == 0) - playSound(BotaniaSoundEvents.lightRelay, 0.05F, (float) Math.random() * 0.3F + 0.7F); + playSound(ModSounds.lightRelay, 0.05F, (float) Math.random() * 0.3F + 0.7F); BlockPos pos = new BlockPos(this); BlockPos exitPos = getExitPos(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index 0e789b717..c97041a2c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; @@ -21,6 +19,8 @@ import net.minecraft.util.ITickable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class TileMod extends TileEntity implements ITickable { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 7fdb36038..cd3b0eb78 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -24,6 +22,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.MethodHandles; +import javax.annotation.Nonnull; + public class TileOpenCrate extends TileSimpleInventory { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index e0d620ad9..0ffc5ee03 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ITickable; @@ -24,6 +22,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; +import java.util.Random; + public class TilePylon extends TileEntity implements ITickable { boolean activated = false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 84f6ba175..fed115f1f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -10,14 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -30,20 +22,26 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.recipe.RecipeRuneAltar; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.List; + public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver { private static final String TAG_MANA = "mana"; @@ -177,7 +175,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } if(manaToGet != this.manaToGet) { - world.playSound(null, pos, BotaniaSoundEvents.runeAltarStart, SoundCategory.BLOCKS, 1, 1); + world.playSound(null, pos, ModSounds.runeAltarStart, SoundCategory.BLOCKS, 1, 1); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } } @@ -262,7 +260,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } public void craftingFanciness() { - world.playSound(null, pos, BotaniaSoundEvents.runeAltarCraft, SoundCategory.BLOCKS, 1, 1); + world.playSound(null, pos, ModSounds.runeAltarCraft, SoundCategory.BLOCKS, 1, 1); PacketHandler.sendToNearby(world, getPos(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.RUNE_CRAFT, getPos().getX(), getPos().getY(), getPos().getZ())); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index bb38319f6..f560bd608 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import javax.annotation.Nonnull; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; @@ -20,6 +18,8 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; +import javax.annotation.Nonnull; + public abstract class TileSimpleInventory extends TileMod { protected SimpleItemStackHandler itemHandler = createItemHandler(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 3139759fa..f85202c76 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -24,6 +20,9 @@ import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; public class TileSparkChanger extends TileSimpleInventory { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 244425ab3..b888e8ea5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; @@ -29,6 +27,8 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.MethodHandles; +import java.util.List; + public class TileSpawnerClaw extends TileMod implements IManaReceiver { private static final String TAG_MANA = "mana"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index dbfed1ee1..ea1927532 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; import net.minecraft.block.state.IBlockState; @@ -37,6 +35,8 @@ import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.string.TileRedStringRelay; +import java.util.List; + public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTileSlowableContainer { private static final String TAG_SUBTILE_NAME = "subTileName"; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 6ff684535..c742db336 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.block.tile; -import java.util.List; - import com.google.common.base.Predicates; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -30,14 +27,15 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; -import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import java.util.List; + public class TileTerraPlate extends TileMod implements ISparkAttachable { public static final int MAX_MANA = TilePool.MAX_MANA / 2; @@ -105,7 +103,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { if(otherItem != item) otherItem.setDead(); else item.setItem(new ItemStack(ModItems.manaResource, 1, 4)); - world.playSound(null, item.posX, item.posY, item.posZ, BotaniaSoundEvents.terrasteelCraft, SoundCategory.BLOCKS, 1, 1); + world.playSound(null, item.posX, item.posY, item.posZ, ModSounds.terrasteelCraft, SoundCategory.BLOCKS, 1, 1); mana = 0; world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 590ea77c1..a8b4ce146 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -19,8 +19,8 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.items.ItemHandlerHelper; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.ModSounds; public class TileTinyPotato extends TileSimpleInventory { @@ -55,7 +55,7 @@ public class TileTinyPotato extends TileSimpleInventory { if(!world.isRemote) { if(name.toLowerCase().trim().endsWith("shia labeouf") && nextDoIt == 0) { nextDoIt = 40; - world.playSound(null, pos, BotaniaSoundEvents.doit, SoundCategory.BLOCKS, 1F, 1F); + world.playSound(null, pos, ModSounds.doit, SoundCategory.BLOCKS, 1F, 1F); } for(int i = 0; i < getSizeInventory(); i++) { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index de59bcd3f..c7d7d414c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.block.tile.corporea; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,6 +27,9 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.internal.VanillaPacketDispatcher; +import javax.annotation.Nonnull; +import java.util.List; + public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorporeaRequestor { private static final String TAG_REQUEST_TARGET = "requestTarget"; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index b4c840ebb..e7a57eef0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.tile.corporea; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.item.ItemStack; @@ -26,6 +23,9 @@ import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.InventoryHelper; +import java.util.ArrayList; +import java.util.List; + public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaRequestor { public void doRequest() { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index e8b921c81..983064576 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -10,18 +10,6 @@ */ package vazkii.botania.common.block.tile.corporea; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.lang3.text.WordUtils; - import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -35,12 +23,23 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaAutoCompleteController; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.common.core.helper.MathHelper; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequestor { public static final double RADIUS = 2.5; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index 0b7b15a98..ca700d743 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.tile.corporea; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -24,6 +21,9 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.state.BotaniaStateProps; +import java.util.ArrayList; +import java.util.List; + public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorporeaInterceptor { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 797a4fba5..12d665847 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -19,10 +19,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; +import vazkii.botania.common.core.handler.ModSounds; public class TileBellows extends TileMod { @@ -58,7 +58,7 @@ public class TileBellows extends TileMod { if(movePos < max && active && moving >= 0F) { if(moving == 0F) - world.playSound(null, pos, BotaniaSoundEvents.bellows, SoundCategory.BLOCKS, 0.1F, 3F); + world.playSound(null, pos, ModSounds.bellows, SoundCategory.BLOCKS, 0.1F, 3F); if(tile instanceof TileEntityFurnace) { TileEntityFurnace furnace = (TileEntityFurnace) tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 54f099859..d0ce75362 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.tile.mana; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -20,6 +17,9 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileMod; +import java.util.ArrayList; +import java.util.List; + public class TileDistributor extends TileMod implements IManaReceiver { final List validPools = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 9f9d65bcf..62b6a1983 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.base.Predicates; - import net.minecraft.entity.Entity; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 309cd26a9..0162bcfcf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -10,16 +10,7 @@ */ package vazkii.botania.common.block.tile.mana; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import com.google.common.base.Predicates; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -42,6 +33,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; @@ -53,7 +45,6 @@ import vazkii.botania.api.mana.ManaNetworkEvent; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.HUDHandler; @@ -65,11 +56,17 @@ import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; import vazkii.botania.common.core.handler.MethodHandles; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.item.ItemManaTablet; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; + public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAttachable, IThrottledPacket { public static final Color PARTICLE_COLOR = new Color(0x00C6FF); @@ -204,7 +201,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt private void craftingFanciness() { if(soundTicks == 0) { - world.playSound(null, pos, BotaniaSoundEvents.manaPoolCraft, SoundCategory.BLOCKS, 0.4F, 4F); + world.playSound(null, pos, ModSounds.manaPoolCraft, SoundCategory.BLOCKS, 0.4F, 4F); soundTicks = 6; } @@ -356,7 +353,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.11F, 1F); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 1091fd51d..d60f16e50 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.block.tile.mana; -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -28,6 +25,8 @@ import net.minecraftforge.fml.relauncher.Side; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; +import javax.annotation.Nonnull; + public class TilePump extends TileMod { private static final String TAG_ACTIVE = "active"; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index 1c7b6cd29..0e82bc7ba 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block.tile.mana; -import java.util.EnumMap; -import java.util.Map; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -20,9 +17,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; -import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.mana.IManaReceiver; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index ef55a915e..13e22ffbd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -10,15 +10,7 @@ */ package vazkii.botania.common.block.tile.mana; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import com.google.common.base.Predicates; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -43,6 +35,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.BurstProperties; @@ -57,7 +50,6 @@ import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.IThrottledPacket; import vazkii.botania.api.mana.ManaNetworkEvent; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandBindable; @@ -67,10 +59,15 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ManaNetworkHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.UUID; + public class TileSpreader extends TileSimpleInventory implements IManaCollector, IWandBindable, IKeyLocked, IThrottledPacket, IManaSpreader, IDirectioned, ITickable { private static final int MAX_MANA = 1000; @@ -391,7 +388,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(player instanceof EntityPlayerMP) ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 0.1F, 1); } else { RayTraceResult pos = raytraceFromEntity(world, player, true, 5); if(pos != null && pos.hitVec != null && !world.isRemote) { @@ -446,7 +443,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, world.spawnEntity(burst); burst.ping(); if(!ConfigHandler.silentSpreaders) - world.playSound(null, pos, BotaniaSoundEvents.spreaderFire, SoundCategory.BLOCKS, 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); + world.playSound(null, pos, ModSounds.spreaderFire, SoundCategory.BLOCKS, 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index 8a96c31cb..f06a0d0e8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile.mana; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; @@ -21,6 +19,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.text.TextFormatting; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index e2da73025..a303e4ac9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile.string; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; @@ -23,6 +21,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.common.block.tile.TileMod; +import javax.annotation.Nonnull; + public abstract class TileRedString extends TileMod implements ITileBound { private BlockPos binding; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 15f33d771..5db4f9678 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -10,16 +10,15 @@ */ package vazkii.botania.common.block.tile.string; -import java.util.Arrays; - -import javax.annotation.Nonnull; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; +import javax.annotation.Nonnull; +import java.util.Arrays; + public class TileRedStringContainer extends TileRedString { @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index 780718ca3..683c0377c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.block.tile.string; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.IGrowable; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import java.util.Random; + public class TileRedStringFertilizer extends TileRedString { public boolean canGrow(World world, boolean isClient) { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 67f990dca..b1c6d86d1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.block.tile.string; -import java.util.ArrayList; -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.init.SoundEvents; @@ -24,6 +19,11 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public class TileRedStringInterceptor extends TileRedString { private static final Set interceptors = new HashSet<>(); diff --git a/src/main/java/vazkii/botania/common/brew/BrewMod.java b/src/main/java/vazkii/botania/common/brew/BrewMod.java index ca6749366..7a9611b2d 100644 --- a/src/main/java/vazkii/botania/common/brew/BrewMod.java +++ b/src/main/java/vazkii/botania/common/brew/BrewMod.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.brew; -import java.util.Arrays; - import net.minecraft.potion.PotionEffect; import net.minecraft.potion.PotionUtils; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; +import java.util.Arrays; + public class BrewMod extends Brew { public BrewMod(String key, int color, int cost, PotionEffect... effects) { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java index 02e76141b..559310313 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.brew.potion; -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFishHook; import vazkii.botania.common.lib.LibPotionNames; +import javax.annotation.Nonnull; + public class PotionAllure extends PotionMod { public PotionAllure() { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java index 6ffc14967..37df98cbd 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -10,14 +10,14 @@ */ package vazkii.botania.common.brew.potion; -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.common.lib.LibPotionNames; +import javax.annotation.Nonnull; + public class PotionClear extends PotionMod { public PotionClear() { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index d0567e07a..d3f7e4e5e 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -10,11 +10,11 @@ */ package vazkii.botania.common.brew.potion; -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import vazkii.botania.common.lib.LibPotionNames; +import javax.annotation.Nonnull; + public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 89a247091..5a2aac191 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -11,15 +11,14 @@ package vazkii.botania.common.brew.potion; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 8bc9a8495..30acfd829 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.core; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -25,6 +23,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public final class BotaniaCreativeTab extends CreativeTabs { public static final BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index 603def6f1..40eeb447f 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.core.command; -import javax.annotation.Nonnull; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; @@ -21,6 +19,8 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.version.ThreadDownloadMod; import vazkii.botania.common.core.version.VersionChecker; +import javax.annotation.Nonnull; + public class CommandDownloadLatest extends CommandBase { private static final boolean ENABLED = true; diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 3d256cbaf..457798af9 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.core.command; -import javax.annotation.Nonnull; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -23,6 +21,8 @@ import net.minecraft.util.text.TextFormatting; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ItemLexicon; +import javax.annotation.Nonnull; + public class CommandOpen extends CommandBase { @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index ff0d3e601..931a8e91f 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.core.command; -import javax.annotation.Nonnull; - import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +17,8 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; + public class CommandShare extends CommandBase { @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index a07555691..ef66e6890 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.core.command; -import javax.annotation.Nonnull; - import net.minecraft.command.CommandBase; import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; @@ -22,6 +20,8 @@ import net.minecraft.util.text.translation.I18n; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.world.SkyblockWorldEvents; +import javax.annotation.Nonnull; + public class CommandSkyblockSpread extends CommandBase { @Nonnull diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 693dde733..053c16964 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.core.handler; -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentString; @@ -29,6 +23,12 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibMisc; +import java.io.File; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public final class ConfigHandler { public static Configuration config; diff --git a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java index b45986a71..c8f289e8b 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -1,7 +1,6 @@ package vazkii.botania.common.core.handler; import com.google.common.collect.ImmutableList; - import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 3de3bb5c8..0510de46d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.core.handler; -import java.util.ArrayList; -import java.util.List; - import baubles.api.BaublesApi; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSync; @@ -74,6 +71,9 @@ import vazkii.botania.common.lexicon.page.PageRuneRecipe; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibMisc; +import java.util.ArrayList; +import java.util.List; + public class InternalMethodHandler extends DummyMethodHandler { @Override diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index fd9255c3f..d535dce9a 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -10,13 +10,6 @@ */ package vazkii.botania.common.core.handler; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; -import java.util.function.BinaryOperator; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -27,6 +20,13 @@ import vazkii.botania.api.mana.ManaNetworkEvent.Action; import vazkii.botania.api.mana.ManaNetworkEvent.ManaBlockType; import vazkii.botania.api.mana.TileSignature; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; +import java.util.function.BinaryOperator; + public final class ManaNetworkHandler implements IManaNetwork { public static final ManaNetworkHandler instance = new ManaNetworkHandler(); diff --git a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java index 8bf7700a6..d258566b0 100644 --- a/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java +++ b/src/main/java/vazkii/botania/common/core/handler/MethodHandles.java @@ -1,19 +1,18 @@ package vazkii.botania.common.core.handler; -import static java.lang.invoke.MethodHandles.publicLookup; - -import java.lang.invoke.MethodHandle; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - import com.google.common.base.Throwables; - import net.minecraft.entity.item.EntityItem; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibObfuscation; +import java.lang.invoke.MethodHandle; +import java.lang.reflect.Field; +import java.lang.reflect.Method; + +import static java.lang.invoke.MethodHandles.publicLookup; + // MethodHandles for frequently reflected fields and methods. // Handles suffixed with _getter and _setter are for fields, while those without suffixes are normal methods. public final class MethodHandles { diff --git a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java index ad3ed69ed..68c4d27ac 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ModSounds.java +++ b/src/main/java/vazkii/botania/common/core/handler/ModSounds.java @@ -5,62 +5,108 @@ import net.minecraft.util.SoundEvent; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.registries.IForgeRegistry; +import vazkii.botania.common.lib.LibMisc; @Mod.EventBusSubscriber public final class ModSounds { + public static final SoundEvent airRod = makeSoundEvent("airrod"); + public static final SoundEvent agricarnation = makeSoundEvent("agricarnation"); + public static final SoundEvent altarCraft = makeSoundEvent("altarcraft"); + public static final SoundEvent babylonAttack = makeSoundEvent("babylonattack"); + public static final SoundEvent babylonSpawn = makeSoundEvent("babylonspawn"); + public static final SoundEvent bellows = makeSoundEvent("bellows"); + public static final SoundEvent bifrostRod = makeSoundEvent("bifrostrod"); + public static final SoundEvent blackLotus = makeSoundEvent("blacklotus"); + public static final SoundEvent dash = makeSoundEvent("dash"); + public static final SoundEvent ding = makeSoundEvent("ding"); + public static final SoundEvent divaCharm = makeSoundEvent("divacharm"); + public static final SoundEvent divinationRod = makeSoundEvent("divinationrod"); + public static final SoundEvent doit = makeSoundEvent("doit"); + public static final SoundEvent enchanterFade = makeSoundEvent("enchanterform"); + public static final SoundEvent enchanterForm = makeSoundEvent("enchanterfade"); + public static final SoundEvent enchanterEnchant = makeSoundEvent("enchanterenchant"); + public static final SoundEvent endoflame = makeSoundEvent("endoflame"); + public static final SoundEvent equipBauble = makeSoundEvent("equipbauble"); + public static final SoundEvent gaiaTrap = makeSoundEvent("gaiatrap"); + public static final SoundEvent goldenLaurel = makeSoundEvent("goldenlaurel"); + public static final SoundEvent holyCloak = makeSoundEvent("holycloak"); + public static final SoundEvent laputaStart = makeSoundEvent("laputastart"); + public static final SoundEvent lexiconOpen = makeSoundEvent("lexiconopen"); + public static final SoundEvent lexiconPage = makeSoundEvent("lexiconpage"); + public static final SoundEvent lightRelay = makeSoundEvent("lightrelay"); + public static final SoundEvent manaBlaster = makeSoundEvent("manablaster"); + public static final SoundEvent manaPoolCraft = makeSoundEvent("manapoolcraft"); + public static final SoundEvent missile = makeSoundEvent("missile"); + public static final SoundEvent orechid = makeSoundEvent("orechid"); + public static final SoundEvent potionCreate = makeSoundEvent("potioncreate"); + public static final SoundEvent runeAltarCraft = makeSoundEvent("runealtarcraft"); + public static final SoundEvent runeAltarStart = makeSoundEvent("runealtarstart"); + public static final SoundEvent spreaderFire = makeSoundEvent("spreaderfire"); + public static final SoundEvent starcaller = makeSoundEvent("starcaller"); + public static final SoundEvent terraBlade = makeSoundEvent("terrablade"); + public static final SoundEvent terraformRod = makeSoundEvent("terraformrod"); + public static final SoundEvent terraPickMode = makeSoundEvent("terrapickmode"); + public static final SoundEvent terrasteelCraft = makeSoundEvent("terrasteelcraft"); + public static final SoundEvent thermalily = makeSoundEvent("thermalily"); + public static final SoundEvent unholyCloak = makeSoundEvent("unholycloak"); + public static final SoundEvent way = makeSoundEvent("way"); + public static final SoundEvent gaiaMusic1 = makeSoundEvent("music.gaia1"); + public static final SoundEvent gaiaMusic2 = makeSoundEvent("music.gaia2"); + + private static SoundEvent makeSoundEvent(String name) { + ResourceLocation loc = new ResourceLocation(LibMisc.MOD_ID, name); + return new SoundEvent(loc).setRegistryName(loc); + } + @SubscribeEvent public static void registerSounds(RegistryEvent.Register evt) { - String[] sounds = { - "botania:airRod", - "botania:agricarnation", - "botania:altarCraft", - "botania:babylonAttack", - "botania:babylonSpawn", - "botania:bellows", - "botania:bifrostRod", - "botania:blackLotus", - "botania:dash", - "botania:ding", - "botania:divaCharm", - "botania:divinationRod", - "botania:doit", - "botania:enchanterForm", - "botania:enchanterFade", - "botania:enchanterEnchant", - "botania:endoflame", - "botania:equipBauble", - "botania:gaiaTrap", - "botania:goldenLaurel", - "botania:holyCloak", - "botania:laputaStart", - "botania:lexiconOpen", - "botania:lexiconPage", - "botania:lightRelay", - "botania:manaBlaster", - "botania:manaPoolCraft", - "botania:missile", - "botania:orechid", - "botania:potionCreate", - "botania:runeAltarCraft", - "botania:runeAltarStart", - "botania:spreaderFire", - "botania:starcaller", - "botania:terraBlade", - "botania:terraformRod", - "botania:terraPickMode", - "botania:terrasteelCraft", - "botania:thermalily", - "botania:unholyCloak", - "botania:way", - "botania:music.gaia1", - "botania:music.gaia2" - }; + IForgeRegistry r = evt.getRegistry(); + r.register(airRod); + r.register(agricarnation); + r.register(altarCraft); + r.register(babylonAttack); + r.register(babylonSpawn); + r.register(bellows); + r.register(bifrostRod); + r.register(blackLotus); + r.register(dash); + r.register(ding); + r.register(divaCharm); + r.register(divinationRod); + r.register(doit); + r.register(enchanterFade); + r.register(enchanterForm); + r.register(enchanterEnchant); + r.register(endoflame); + r.register(equipBauble); + r.register(gaiaTrap); + r.register(goldenLaurel); + r.register(holyCloak); + r.register(laputaStart); + r.register(lexiconOpen); + r.register(lexiconPage); + r.register(lightRelay); + r.register(manaBlaster); + r.register(manaPoolCraft); + r.register(missile); + r.register(orechid); + r.register(potionCreate); + r.register(runeAltarCraft); + r.register(runeAltarStart); + r.register(spreaderFire); + r.register(starcaller); + r.register(terraBlade); + r.register(terraformRod); + r.register(terraPickMode); + r.register(terrasteelCraft); + r.register(thermalily); + r.register(unholyCloak); + r.register(way); - for (String s : sounds) { - ResourceLocation loc = new ResourceLocation(s); - evt.getRegistry().register(new SoundEvent(loc).setRegistryName(loc)); - } + r.register(gaiaMusic1); + r.register(gaiaMusic2); } private ModSounds() {} diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index a34b39d4d..1ac0a2125 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.core.handler; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; @@ -30,6 +25,11 @@ import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; +import java.util.Objects; + public final class SheddingHandler { private SheddingHandler() {} diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index b9c09aec5..b9562b4c0 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -1,12 +1,12 @@ package vazkii.botania.common.core.helper; -import java.util.function.Predicate; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; +import java.util.function.Predicate; + public final class PlayerHelper { // Checks if either of the player's hands has an item. diff --git a/src/main/java/vazkii/botania/common/core/helper/StringObfuscator.java b/src/main/java/vazkii/botania/common/core/helper/StringObfuscator.java index 2e473d321..0502b70b8 100644 --- a/src/main/java/vazkii/botania/common/core/helper/StringObfuscator.java +++ b/src/main/java/vazkii/botania/common/core/helper/StringObfuscator.java @@ -10,12 +10,11 @@ */ package vazkii.botania.common.core.helper; +import javax.xml.bind.annotation.adapters.HexBinaryAdapter; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; - public final class StringObfuscator { public static boolean matchesHash(String str, String hash) { diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 54c6e7e08..da49aa640 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -10,15 +10,6 @@ */ package vazkii.botania.common.core.helper; -import java.math.BigDecimal; -import java.math.MathContext; -import java.math.RoundingMode; -import java.util.Objects; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.vector.Vector3f; -import org.lwjgl.util.vector.Vector4f; - import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; @@ -26,6 +17,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +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 java.util.Objects; public class Vector3 { diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java index 3df3d5f1d..2999c8cd7 100644 --- a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -1,13 +1,8 @@ package vazkii.botania.common.core.loot; -import java.util.Random; - -import javax.annotation.Nonnull; - import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; - import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootContext; @@ -17,6 +12,9 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.Random; + public class BindUuid extends LootFunction { protected BindUuid(LootCondition[] conditionsIn) { diff --git a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java index 5865da957..c5142a9a5 100644 --- a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java +++ b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java @@ -1,19 +1,17 @@ package vazkii.botania.common.core.loot; -import java.util.Random; - -import javax.annotation.Nonnull; - import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; - import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.conditions.LootCondition; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.Random; + public class EnableRelics implements LootCondition { @Override diff --git a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java index 4c1e7b73e..ab5bc5e56 100644 --- a/src/main/java/vazkii/botania/common/core/loot/LootHandler.java +++ b/src/main/java/vazkii/botania/common/core/loot/LootHandler.java @@ -1,9 +1,6 @@ package vazkii.botania.common.core.loot; -import java.util.List; - import com.google.common.collect.ImmutableList; - import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootEntry; import net.minecraft.world.storage.loot.LootEntryTable; @@ -17,6 +14,8 @@ import net.minecraftforge.event.LootTableLoadEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.lib.LibMisc; +import java.util.List; + public final class LootHandler { private static final List TABLES = ImmutableList.of( diff --git a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java index 24fcf96d6..abe6dd6cf 100644 --- a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java +++ b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java @@ -1,19 +1,17 @@ package vazkii.botania.common.core.loot; -import java.util.Random; - -import javax.annotation.Nonnull; - import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; - import net.minecraft.util.ResourceLocation; import net.minecraft.world.storage.loot.LootContext; import net.minecraft.world.storage.loot.conditions.LootCondition; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.Random; + public class TrueGuardianKiller implements LootCondition { @Override diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java index c22fe24d4..4fd6e4154 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -3,9 +3,7 @@ package vazkii.botania.common.core.proxy; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.event.FMLInitializationEvent; diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java index 93c8cc602..f4d53aefe 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -14,9 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index a7c78fe02..76fd5d079 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -10,13 +10,6 @@ */ package vazkii.botania.common.core.version; -import java.awt.Desktop; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.ITextComponent; @@ -24,6 +17,13 @@ import net.minecraft.util.text.Style; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; +import java.awt.Desktop; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + public class ThreadDownloadMod extends Thread { private final String fileName; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java index 6a061b631..59f20e917 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -10,12 +10,12 @@ */ package vazkii.botania.common.core.version; +import net.minecraftforge.common.MinecraftForge; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; -import net.minecraftforge.common.MinecraftForge; - public class ThreadVersionChecker extends Thread { public ThreadVersionChecker() { diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 1df3587fb..4970aae9c 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -10,39 +10,15 @@ */ package vazkii.botania.common.crafting; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.BlockFlower; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.registries.IForgeRegistry; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModFluffBlocks; -import vazkii.botania.common.block.tile.TileCraftCrate; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.crafting.recipe.AesirRingRecipe; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; -import vazkii.botania.common.crafting.recipe.ArmorUpgradeRecipe; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; @@ -53,16 +29,13 @@ import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; import vazkii.botania.common.crafting.recipe.ManaGunClipRecipe; import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; -import vazkii.botania.common.crafting.recipe.ManaUpgradeRecipe; import vazkii.botania.common.crafting.recipe.PhantomInkRecipe; -import vazkii.botania.common.crafting.recipe.ShapelessManaUpgradeRecipe; import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; -import vazkii.botania.common.item.ItemTwigWand; -import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibOreDict; + +import java.util.List; @Mod.EventBusSubscriber public final class ModCraftingRecipes { diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index ef72d5e2b..88cde7916 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -1,8 +1,5 @@ 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.ItemStack; @@ -12,6 +9,9 @@ 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 class ModElvenTradeRecipes { public static RecipeElvenTrade dreamwoodRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 96c5f2f4b..7940f377a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -10,9 +10,6 @@ */ 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; @@ -24,6 +21,9 @@ import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public final class ModManaAlchemyRecipes { public static RecipeManaInfusion leatherRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java index f0a23f2a5..4c5b80114 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -10,9 +10,6 @@ */ 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; @@ -20,6 +17,9 @@ import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; +import java.util.ArrayList; +import java.util.List; + public class ModManaConjurationRecipes { public static RecipeManaInfusion redstoneRecipe; diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 0db0e63f7..5a5ed64f3 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -10,9 +10,6 @@ */ 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; @@ -24,6 +21,9 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public final class ModManaInfusionRecipes { public static List manasteelRecipes; diff --git a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java index a3f180a20..3664f5c09 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModMigrationRecipes.java @@ -1,10 +1,5 @@ package vazkii.botania.common.crafting; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.registry.GameRegistry; -import vazkii.botania.common.item.ModItems; - /** * Migration recipes for things that will be removed in the future */ diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 480b2119d..9a96705a0 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting; -import java.util.Arrays; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; @@ -23,6 +21,8 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; +import java.util.Arrays; + public final class ModPetalRecipes { public static final String white = LibOreDict.PETAL[0], orange = LibOreDict.PETAL[1], magenta = LibOreDict.PETAL[2], lightBlue = LibOreDict.PETAL[3], yellow = LibOreDict.PETAL[4], lime = LibOreDict.PETAL[5], pink = LibOreDict.PETAL[6], gray = LibOreDict.PETAL[7], lightGray = LibOreDict.PETAL[8], cyan = LibOreDict.PETAL[9], purple = LibOreDict.PETAL[10], blue = LibOreDict.PETAL[11], brown = LibOreDict.PETAL[12], green = LibOreDict.PETAL[13], red = LibOreDict.PETAL[14], black = LibOreDict.PETAL[15]; diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index c8d77dc49..b67c2ffae 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -10,10 +10,6 @@ */ 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.ItemStack; @@ -23,6 +19,9 @@ import vazkii.botania.common.crafting.recipe.HeadRecipe; 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/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index b6ef98f27..92c34df54 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import java.util.UUID; - -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -24,6 +20,9 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; +import java.util.UUID; + public class AesirRingRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index 80cd080ef..90b0b73db 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,6 +20,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.IAncientWillContainer; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class AncientWillRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java index 75be5869a..e58ac2e26 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -23,6 +21,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ItemBlackHoleTalisman; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class BlackHoleTalismanExtractRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index 8ebbe53a0..df6ad58e2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; @@ -24,6 +22,8 @@ import vazkii.botania.api.mana.ICompositableLens; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; +import javax.annotation.Nonnull; + public class CompositeLensRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java index 3b89dc302..7f19b64a3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,6 +20,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; +import javax.annotation.Nonnull; + public class CosmeticAttachRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index 440392ea7..5ef552e48 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,6 +20,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; +import javax.annotation.Nonnull; + public class CosmeticRemoveRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 17e77628b..09aa51494 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -25,6 +23,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class HelmRevealingRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 0c1c01541..cb44e35e3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -23,6 +21,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class KeepIvyRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index 7fb3ea2ab..8e8af4bd4 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -27,6 +22,10 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.common.item.lens.ItemLens; import vazkii.botania.common.lib.LibOreDict; +import javax.annotation.Nonnull; +import java.util.Arrays; +import java.util.List; + public class LensDyeingRecipe extends IForgeRegistryEntry.Impl implements IRecipe { private static final List DYES = Arrays.asList("dyeWhite", "dyeOrange", "dyeMagenta", "dyeLightBlue", "dyeYellow", "dyeLime", "dyePink", "dyeGray", "dyeLightGray", "dyeCyan", "dyePurple", "dyeBlue", "dyeBrown", "dyeGreen", "dyeRed", "dyeBlack", LibOreDict.MANA_PEARL); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index edf53f70d..1bf900cba 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,6 +20,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class ManaGunClipRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java index 8358376fc..df21f7d8a 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -23,6 +21,8 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.common.item.ItemManaGun; +import javax.annotation.Nonnull; + public class ManaGunLensRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java index 4c44041b9..208e089ed 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -21,6 +19,8 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ItemManaGun; +import javax.annotation.Nonnull; + public class ManaGunRemoveLensRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java index ed36f2017..3aa0dd193 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java @@ -12,10 +12,8 @@ package vazkii.botania.common.crafting.recipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.oredict.ShapedOreRecipe; import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.common.lib.LibMisc; public class ManaUpgradeRecipe extends ShapedOreRecipe { public ManaUpgradeRecipe(ItemStack output, Object... inputs) { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index 62ae7b113..4be8ec7fa 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,6 +20,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class PhantomInkRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index a2ca621ed..f67f5f114 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,6 +21,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import javax.annotation.Nonnull; + public class SpecialFloatingFlowerRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index 33a2d29b0..d93ac5719 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,6 +20,8 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class SpellClothRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index d607a47e3..d09bdd6c3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.crafting.recipe; -import javax.annotation.Nonnull; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -22,6 +20,8 @@ import net.minecraftforge.registries.IForgeRegistryEntry; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import javax.annotation.Nonnull; + public class TerraPickTippingRecipe extends IForgeRegistryEntry.Impl implements IRecipe { @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 848f2df35..51c751cc5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,14 +22,17 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.relic.ItemKingKey; +import javax.annotation.Nonnull; +import java.util.List; + public class EntityBabylonWeapon extends EntityThrowableCopy { private static final String TAG_CHARGING = "charging"; @@ -111,7 +110,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { setChargeTicks(chargeTime + 1); if(world.rand.nextInt(20) == 0) - world.playSound(null, posX, posY, posZ, BotaniaSoundEvents.babylonSpawn, SoundCategory.PLAYERS, 0.1F, 1F + world.rand.nextFloat() * 3F); + world.playSound(null, posX, posY, posZ, ModSounds.babylonSpawn, SoundCategory.PLAYERS, 0.1F, 1F + world.rand.nextFloat() * 3F); } else { if(liveTime < delay) { motionX = 0; @@ -130,7 +129,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { x = motionVec.x; y = motionVec.y; z = motionVec.z; - world.playSound(null, posX, posY, posZ, BotaniaSoundEvents.babylonAttack, SoundCategory.PLAYERS, 2F, 0.1F + world.rand.nextFloat() * 3F); + world.playSound(null, posX, posY, posZ, ModSounds.babylonAttack, SoundCategory.PLAYERS, 2F, 0.1F + world.rand.nextFloat() * 3F); } setLiveTicks(liveTime + 1); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 63422eded..da87d3e50 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -10,14 +10,7 @@ */ package vazkii.botania.common.entity; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import com.google.common.base.Optional; import com.google.common.base.Predicates; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; @@ -38,6 +31,10 @@ import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final int SCAN_RANGE = 8; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index c2eb64f6b..18758743f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -10,23 +10,7 @@ */ package vazkii.botania.common.entity; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; -import java.util.UUID; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - -import javax.annotation.Nonnull; - -import net.minecraft.entity.monster.EntityWitherSkeleton; -import net.minecraft.item.Item; -import org.lwjgl.opengl.ARBShaderObjects; - import com.google.common.base.Optional; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -41,6 +25,7 @@ import net.minecraft.entity.ai.EntityAISwimming; import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityWitch; +import net.minecraft.entity.monster.EntityWitherSkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -49,7 +34,7 @@ import net.minecraft.init.Items; import net.minecraft.init.MobEffects; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemRecord; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; @@ -78,18 +63,19 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.ARBShaderObjects; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibEntityNames; @@ -97,6 +83,16 @@ import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; +import java.util.UUID; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { public static final float ARENA_RANGE = 12F; @@ -819,7 +815,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { EntityMagicMissile missile = new EntityMagicMissile(this, true); missile.setPosition(posX + (Math.random() - 0.5 * 0.1), posY + 2.4 + (Math.random() - 0.5 * 0.1), posZ + (Math.random() - 0.5 * 0.1)); if(missile.getTarget()) { - playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); + playSound(ModSounds.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); world.spawnEntity(missile); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 7bbedf264..7039a9d4e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -10,13 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.pattern.BlockStateMatcher; @@ -27,6 +20,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + public class EntityEnderAirBottle extends EntityThrowable { public EntityEnderAirBottle(World world) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 119b5aa15..024044cb2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -23,6 +21,8 @@ import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.List; + public class EntityFallingStar extends EntityThrowableCopy { public EntityFallingStar(World world) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 213d0eb9e..6ccc27fb5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -11,10 +11,6 @@ package vazkii.botania.common.entity; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.SoundEvents; @@ -26,6 +22,9 @@ import net.minecraft.world.World; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; +import javax.annotation.Nonnull; +import java.util.List; + public class EntityFlameRing extends Entity { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 3cc630602..0ccaf80d1 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -23,8 +19,11 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; + +import javax.annotation.Nonnull; +import java.util.List; public class EntityMagicLandmine extends Entity { @@ -53,7 +52,7 @@ public class EntityMagicLandmine extends Entity { Botania.proxy.wispFX(posX - range + Math.random() * range * 2, posY, posZ - range + Math.random() * range * 2, r, g, b, 0.4F, -0.015F, 1); if(ticksExisted >= 55) { - world.playSound(null, posX, posY, posZ, BotaniaSoundEvents.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); + world.playSound(null, posX, posY, posZ, ModSounds.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); float m = 0.35F; g = 0.4F; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 73778f176..bdb9cdffa 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.entity; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.base.Predicates; - import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -37,6 +32,9 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; +import java.util.List; + public class EntityMagicMissile extends EntityThrowable { private static final String TAG_TIME = "time"; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 3ca79e024..3b887fde9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -10,19 +10,6 @@ */ package vazkii.botania.common.entity; -import java.awt.Color; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Random; -import java.util.Set; -import java.util.UUID; - -import javax.annotation.Nonnull; - -import com.google.common.base.Optional; - import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -63,6 +50,16 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; +import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Random; +import java.util.Set; +import java.util.UUID; + public class EntityManaBurst extends EntityThrowable implements IManaBurst { private static final String TAG_TICKS_EXISTED = "ticksExisted"; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 8f5e829ee..00c61a12c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.entity; -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -20,6 +18,8 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.lens.ItemLens; +import javax.annotation.Nonnull; + public class EntityManaStorm extends Entity { private static final String TAG_TIME = "time"; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 846f3f9a7..c5c431a10 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -10,20 +10,19 @@ */ package vazkii.botania.common.entity; -import javax.annotation.Nonnull; - import net.minecraft.entity.ai.EntityAIAttackRanged; import net.minecraft.entity.ai.EntityAIHurtByTarget; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class EntityPinkWither extends EntityWither { public EntityPinkWither(World world) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index fc3df1a24..79c6b43ef 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.entity; -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -24,6 +22,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class EntityPixie extends EntityFlying { private static final DataParameter TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 19aa383cf..539ed2124 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -10,14 +10,9 @@ */ package vazkii.botania.common.entity; -import java.awt.Color; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.inventory.Container; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -40,6 +35,9 @@ import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; +import java.awt.Color; + public class EntityPoolMinecart extends EntityMinecart { private static final int TRANSFER_RATE = 10000; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index ff0ee3583..1ca037e80 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.entity; -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumDyeColor; @@ -22,6 +20,8 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.world.World; import vazkii.botania.common.Botania; +import javax.annotation.Nonnull; + public class EntitySignalFlare extends Entity { private static final String COLOR_TAG = "color"; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 8a0aab892..e95b64b8b 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -10,25 +10,11 @@ */ package vazkii.botania.common.entity; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.WeakHashMap; - -import javax.annotation.Nonnull; - import baubles.api.BaublesApi; import gnu.trove.map.hash.TObjectIntHashMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; @@ -51,6 +37,17 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; + public class EntitySpark extends Entity implements ISparkEntity { private static final int TRANSFER_RATE = 1000; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 31f750b10..3b5825240 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.entity; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.BlockLeaves; @@ -35,6 +33,8 @@ import net.minecraft.world.World; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class EntityThornChakram extends EntityThrowable { private static final DataParameter BOUNCES = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.VARINT); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index a724212be..b6acde343 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -34,6 +29,10 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.UUID; + // A copy of the vanilla EntityThrowable class // Doing this because if I didn't do this it'd be an EntityThrowable // And we all know how much mods like deflecting EntityThrowables diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 4b8ea7f44..02248f0b6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.entity; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -26,6 +22,9 @@ import net.minecraft.world.World; import vazkii.botania.common.core.handler.MethodHandles; import vazkii.botania.common.core.helper.Vector3; +import javax.annotation.Nonnull; +import java.util.List; + public class EntityThrownItem extends EntityItem { public EntityThrownItem(World world) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 5056e75b5..d4e5e11e9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.entity; -import java.util.Map; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableMap; - import net.minecraft.block.Block; import net.minecraft.block.BlockVine; import net.minecraft.block.properties.PropertyBool; @@ -36,6 +31,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; +import java.util.Map; + public class EntityVineBall extends EntityThrowable { private static final DataParameter GRAVITY = EntityDataManager.createKey(EntityVineBall.class, DataSerializers.FLOAT); diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java index 8a7441ff0..af5bff654 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java @@ -9,9 +9,6 @@ */ package vazkii.botania.common.integration.corporea; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.wrapper.InvWrapper; @@ -22,6 +19,9 @@ import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.Botania; +import java.util.ArrayList; +import java.util.List; + /** * Wrapper for StorageDrawers compatibility. * diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index 551ac9477..3c728a1a1 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -9,15 +9,15 @@ */ package vazkii.botania.common.integration.corporea; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.item.ItemStack; import vazkii.botania.api.corporea.CorporeaRequest; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; +import java.util.ArrayList; +import java.util.List; + public class WrappedIInventory extends WrappedInventoryBase{ private final InvWithLocation inv; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java index b976f2b4f..8dfbed9cf 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java @@ -9,15 +9,15 @@ */ package vazkii.botania.common.integration.corporea; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import net.minecraft.item.ItemStack; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public abstract class WrappedInventoryBase implements IWrappedInventory { protected ICorporeaSpark spark; diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index cf9556845..5c3d2e63d 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -10,19 +10,16 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; +import javax.annotation.Nonnull; + public class Item16Colors extends ItemMod { public Item16Colors(String name) { diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 670f7a53c..54228edca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -10,28 +10,19 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.List; public class ItemAncientWill extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index ac551698c..973357fe8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -10,12 +10,8 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -26,9 +22,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; -import net.minecraft.util.EnumFacing.Axis; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; @@ -44,6 +40,8 @@ import vazkii.botania.common.item.rod.ItemExchangeRod; import vazkii.botania.common.lib.LibItemNames; import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; public class ItemAstrolabe extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 19467a1f6..273c37f86 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import baubles.api.IBauble; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -37,6 +34,9 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + public class ItemBaubleBox extends ItemMod { private static final String TAG_ITEMS = "InvItems"; diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 9dc2f69dd..b53174eff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -10,18 +10,12 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; @@ -31,25 +25,23 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 44b45c5d1..c555c81e0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -10,16 +10,10 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; @@ -29,12 +23,15 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IManaDissolvable; import vazkii.botania.api.mana.IManaPool; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemBlackLotus extends ItemMod implements IManaDissolvable { private static final int MANA_PER = 8000; @@ -78,7 +75,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } PacketHandler.sendToNearby(item.world, item, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BLACK_LOTUS_DISSOLVE, item.posX, tile.getPos().getY() + 0.5, item.posZ)); - item.playSound(BotaniaSoundEvents.blackLotus, 0.5F, t2 ? 0.1F : 1F); + item.playSound(ModSounds.blackLotus, 0.5F, t2 ? 0.1F : 1F); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 9038f9659..f66ce3ee9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; @@ -46,6 +41,10 @@ import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.Random; + public class ItemBottledMana extends ItemMod { private static final String TAG_SEED = "randomSeed"; diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 7860ef338..99c310762 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.item; -import java.lang.reflect.InvocationTargetException; -import java.util.List; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; @@ -41,14 +35,19 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCacophonium; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.lang.reflect.InvocationTargetException; +import java.util.List; + public class ItemCacophonium extends ItemMod { private static final String TAG_SOUND = "sound"; @@ -155,13 +154,13 @@ public class ItemCacophonium extends ItemMod { SoundEvent sound = getSound(stack); if(sound != null) - world.playSound(null, x, y, z, sound, category, volume, sound == BotaniaSoundEvents.doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); + world.playSound(null, x, y, z, sound, category, volume, sound == ModSounds.doit ? 1F : (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F); } @Nullable private static SoundEvent getSound(ItemStack stack) { if(isDOIT(stack)) - return BotaniaSoundEvents.doit; + return ModSounds.doit; else return SoundEvent.REGISTRY.getObject(new ResourceLocation(ItemNBTHelper.getString(stack, TAG_SOUND, ""))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 7f645e6ed..106ef1c80 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -10,13 +10,8 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; @@ -33,6 +28,8 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemCorporeaSpark extends ItemMod { public ItemCorporeaSpark() { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 74d181de0..ec0f3dfff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -10,13 +10,8 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; @@ -31,6 +26,8 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemCraftPattern extends ItemMod { public ItemCraftPattern() { diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 52f7841d6..c53331898 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; @@ -29,7 +25,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.ContainerWorkbench; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -54,6 +49,7 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemStackHandler; +import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientMethodHandles; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.crafting.InventoryCraftingHalo; @@ -65,6 +61,7 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; import java.util.Arrays; public class ItemCraftingHalo extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index 3b415d140..f95c7e2a5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -29,6 +27,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.rod.ItemExchangeRod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProvider { private static final int COST_PROVIDE = 5; diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 887d5075f..829fcf64c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -10,14 +10,8 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; @@ -28,6 +22,10 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class ItemFertilizer extends ItemMod { public ItemFertilizer() { diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index cbc731acd..0b2b5137c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -50,6 +47,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + public class ItemFlowerBag extends ItemMod { private static final String TAG_ITEMS = "InvItems"; diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 965f34a22..ca164de7b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; @@ -38,6 +36,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemGaiaHead extends ItemMod { public ItemGaiaHead() { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index dce56c765..f344ac4a8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -10,14 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockBush; import net.minecraft.block.state.IBlockState; @@ -28,7 +20,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.SoundEvents; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; @@ -48,6 +39,13 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Random; + public class ItemGrassHorn extends ItemMod { private static final int SUBTYPES = 3; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 0385b7747..2cc4986e1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -10,15 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Random; -import java.util.Set; - -import javax.annotation.Nonnull; - import gnu.trove.map.hash.TIntObjectHashMap; import net.minecraft.block.Block; import net.minecraft.block.BlockDirt; @@ -26,7 +17,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -48,6 +38,14 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.Set; + public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { /** diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index fd33fb7f7..7654131ce 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -10,25 +10,19 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDropsEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.crafting.recipe.KeepIvyRecipe; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import java.util.ArrayList; +import java.util.List; public class ItemKeepIvy extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index ecee5d3c9..16f3db3c4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockFalling; import net.minecraft.block.state.IBlockState; @@ -23,7 +19,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -43,13 +38,16 @@ import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILaputaImmobile; import vazkii.botania.api.mana.ILensEffect; import vazkii.botania.api.mana.ITinyPlanetExcempt; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.ModelHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanetExcempt { private static final String TAG_BLOCK = "_block"; @@ -92,7 +90,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @Override public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(!world.isRemote && pos.getY() < 160 && !world.provider.doesWaterVaporize()) { - world.playSound(null, pos, BotaniaSoundEvents.laputaStart, SoundCategory.BLOCKS, 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F); + world.playSound(null, pos, ModSounds.laputaStart, SoundCategory.BLOCKS, 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F); ItemStack stack = player.getHeldItem(hand); spawnBurstFirst(world, pos, stack); if(stack.getItemDamage() == 19) diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index b4f6f0228..0939b5174 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.block.model.ModelBakery; @@ -49,8 +44,8 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.PlayerHelper; @@ -59,6 +54,10 @@ import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { private static final String TAG_KNOWLEDGE_PREFIX = "knowledge."; @@ -181,7 +180,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { Botania.proxy.setLexiconStack(stack); player.openGui(Botania.instance, LibGuiIDs.LEXICON, world, 0, 0, 0); if(!world.isRemote && !skipSound) - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.lexiconOpen, SoundCategory.PLAYERS, 0.5F, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index b34147c5b..b47e9fd0e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -10,20 +10,13 @@ */ package vazkii.botania.common.item; -import java.util.Locale; - -import javax.annotation.Nonnull; - import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.lib.LibResources; @@ -32,6 +25,9 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.Locale; + public class ItemManaCookie extends ItemFood implements IModelRegister { public ItemManaCookie() { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index b2c41e4c7..26fef7d1c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.block.model.ModelBakery; @@ -31,29 +26,25 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.crafting.recipe.ManaGunClipRecipe; -import vazkii.botania.common.crafting.recipe.ManaGunLensRecipe; -import vazkii.botania.common.crafting.recipe.ManaGunRemoveLensRecipe; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; public class ItemManaGun extends ItemMod implements IManaUsingItem { @@ -93,7 +84,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { EntityManaBurst burst = getBurst(player, stack, true); if(burst != null && ManaItemHandler.requestManaExact(stack, player, burst.getMana(), true)) { if(!world.isRemote) { - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); world.spawnEntity(burst); } else { player.swingArm(hand); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 65ccf441d..d2d724ede 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; @@ -28,12 +26,14 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaTooltipDisplay; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay { private static final String TAG_MANA = "mana"; @@ -83,7 +83,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof IManaPool) { bindPool(player.getHeldItem(hand), tile); - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 1F, 1F); return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 80d07a7ce..3ed2b269a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -10,15 +10,9 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; @@ -32,6 +26,9 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay { public static final int MAX_MANA = 500000; diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index bb2b42be6..f07c23003 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -10,14 +10,11 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.lib.LibResources; @@ -25,6 +22,8 @@ import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public abstract class ItemMod extends Item implements IModelRegister { public ItemMod(String name) { diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 4bc97fce5..835faf39e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -29,6 +26,8 @@ import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemObedienceStick extends ItemMod { public ItemObedienceStick() { diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index d934efee8..aa4e9d50f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,6 +22,8 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemOpenBucket extends ItemMod { public ItemOpenBucket() { diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index e410a4c59..f387eb47a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -27,6 +25,8 @@ import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemOvergrowthSeed extends ItemMod { public ItemOvergrowthSeed() { diff --git a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java index 1e6fe349c..d40e9a745 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java +++ b/src/main/java/vazkii/botania/common/item/ItemPhantomInk.java @@ -10,13 +10,7 @@ */ package vazkii.botania.common.item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; -import vazkii.botania.common.crafting.recipe.PhantomInkRecipe; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; public class ItemPhantomInk extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 0dd361782..64c89ea6d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.boss.EntityWither; @@ -32,6 +28,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemPinkinator extends ItemMod { public ItemPinkinator() { diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index be400e756..d59ea57b6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -10,15 +10,11 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import com.mojang.authlib.GameProfile; - import mods.railcraft.api.core.items.IMinecartItem; import net.minecraft.block.BlockRailBase; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; @@ -29,6 +25,8 @@ import net.minecraftforge.fml.common.Optional; import vazkii.botania.common.entity.EntityPoolMinecart; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + @Optional.Interface(modid = "Railcraft", iface = "mods.railcraft.api.core.items.IMinecartItem", striprefs = true) public class ItemPoolMinecart extends ItemMod implements IMinecartItem { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index cc1ec28f0..e12c29fe1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -10,13 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.EnumMap; -import java.util.Map; - -import javax.annotation.Nonnull; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; @@ -34,6 +27,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -42,6 +36,10 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.EnumMap; +import java.util.Map; + public class ItemSextant extends ItemMod { private static final String TAG_SOURCE_X = "sourceX"; diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index b1ad6ede9..740b4712a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.function.Predicate; - -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -28,6 +24,9 @@ import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.function.Predicate; + public class ItemSlingshot extends ItemMod { private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() == ModItems.vineBall; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index c7fddb28a..c87207a29 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; @@ -27,6 +24,8 @@ import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemSpark extends ItemMod implements IManaGivingItem { public ItemSpark() { diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 08c7c64a5..5f24ed229 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -23,6 +18,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemSparkUpgrade extends ItemMod { public static final int VARIANTS = 4; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 74aa549a9..cdf69d848 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; @@ -37,6 +33,9 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemSpawnerMover extends ItemMod { public static final String TAG_SPAWNER = "spawner"; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java index 441fa717e..462d4ed78 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpellCloth.java @@ -10,16 +10,10 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; -import vazkii.botania.common.crafting.recipe.SpellClothRecipe; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; public class ItemSpellCloth extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 245e6672e..a4a8b30f3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; @@ -30,6 +26,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemTemperanceStone extends ItemMod { public ItemTemperanceStone() { diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 633334389..d9a916e79 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -10,15 +10,9 @@ */ package vazkii.botania.common.item; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; @@ -32,6 +26,8 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.entity.EntityThornChakram; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemThornChakram extends ItemMod { public ItemThornChakram() { diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 19d7b6de1..ec731f392 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item; -import java.awt.Color; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockCommandBlock; import net.minecraft.client.Minecraft; @@ -26,7 +21,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; @@ -43,7 +37,6 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.ITileBound; @@ -54,10 +47,15 @@ import vazkii.botania.common.block.BlockPistonRelay; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.List; + public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { private static final String TAG_COLOR1 = "color1"; @@ -119,7 +117,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(axis != null) { if(!world.isRemote) { world.setBlockState(pos, ModBlocks.enchanter.getDefaultState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, axis), 1 | 2); - world.playSound(null, pos, BotaniaSoundEvents.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F); + world.playSound(null, pos, ModSounds.enchanterForm, SoundCategory.BLOCKS, 0.5F, 0.6F); } else { for(int i = 0; i < 50; i++) { float red = (float) Math.random(); @@ -154,7 +152,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(world.isRemote) { player.swingArm(hand); - player.playSound(BotaniaSoundEvents.ding, 0.11F, 1F); + player.playSound(ModSounds.ding, 0.11F, 1F); } wanded = true; @@ -175,7 +173,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.put(bindPos, currentPos); BlockPistonRelay.WorldData.get(world).markDirty(); - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.ding, SoundCategory.PLAYERS, 1F, 1F); return EnumActionResult.SUCCESS; } @@ -222,7 +220,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { if(player.isSneaking()) { if(!world.isRemote) setBindMode(stack, !getBindMode(stack)); - else player.playSound(BotaniaSoundEvents.ding, 0.1F, 1F); + else player.playSound(ModSounds.ding, 0.1F, 1F); } return ActionResult.newResult(EnumActionResult.SUCCESS, stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 7504f2127..eb695c1fd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -23,6 +21,8 @@ import net.minecraft.world.World; import vazkii.botania.common.entity.EntityVineBall; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemVineBall extends ItemMod { public ItemVineBall() { diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 0be2beeca..94f98a719 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -20,7 +18,6 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; import net.minecraft.entity.passive.AbstractChestHorse; import net.minecraft.entity.passive.AbstractHorse; -import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityLlama; import net.minecraft.entity.passive.EntitySkeletonHorse; import net.minecraft.entity.passive.EntityZombieHorse; @@ -28,7 +25,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; @@ -46,6 +42,8 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; + public class ItemVirus extends ItemMod { private static final int SUBTYPES = 2; diff --git a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java index 0128e7cee..52272c87f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java +++ b/src/main/java/vazkii/botania/common/item/ItemWaterBowl.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -22,6 +20,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemWaterBowl extends ItemMod { public ItemWaterBowl() { diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 5983f6ad6..2421fa4e9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -25,6 +23,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemWorldSeed extends ItemMod { public ItemWorldSeed() { diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 2aef34b28..e945cd13b 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -39,40 +39,7 @@ import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelBoots import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelLegs; -import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; -import vazkii.botania.common.item.equipment.bauble.ItemBalanceCloak; -import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; -import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; -import vazkii.botania.common.item.equipment.bauble.ItemCloudPendant; -import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; -import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; -import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; -import vazkii.botania.common.item.equipment.bauble.ItemGoddessCharm; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing; -import vazkii.botania.common.item.equipment.bauble.ItemHolyCloak; -import vazkii.botania.common.item.equipment.bauble.ItemIcePendant; -import vazkii.botania.common.item.equipment.bauble.ItemInvisibilityCloak; -import vazkii.botania.common.item.equipment.bauble.ItemItemFinder; -import vazkii.botania.common.item.equipment.bauble.ItemKnockbackBelt; -import vazkii.botania.common.item.equipment.bauble.ItemLavaPendant; -import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; -import vazkii.botania.common.item.equipment.bauble.ItemManaRing; -import vazkii.botania.common.item.equipment.bauble.ItemMiningRing; -import vazkii.botania.common.item.equipment.bauble.ItemMonocle; -import vazkii.botania.common.item.equipment.bauble.ItemPixieRing; -import vazkii.botania.common.item.equipment.bauble.ItemReachRing; -import vazkii.botania.common.item.equipment.bauble.ItemSpeedUpBelt; -import vazkii.botania.common.item.equipment.bauble.ItemSuperCloudPendant; -import vazkii.botania.common.item.equipment.bauble.ItemSuperLavaPendant; -import vazkii.botania.common.item.equipment.bauble.ItemSuperTravelBelt; -import vazkii.botania.common.item.equipment.bauble.ItemSwapRing; -import vazkii.botania.common.item.equipment.bauble.ItemThirdEye; -import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; -import vazkii.botania.common.item.equipment.bauble.ItemTravelBelt; -import vazkii.botania.common.item.equipment.bauble.ItemUnholyCloak; -import vazkii.botania.common.item.equipment.bauble.ItemWaterRing; +import vazkii.botania.common.item.equipment.bauble.*; import vazkii.botania.common.item.equipment.tool.ItemEnderDagger; import vazkii.botania.common.item.equipment.tool.ItemGlassPick; import vazkii.botania.common.item.equipment.tool.ItemStarSword; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java index 670612cc7..8e26c9b6d 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockFloatingSpecialFlower.java @@ -10,12 +10,12 @@ */ package vazkii.botania.common.item.block; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; +import javax.annotation.Nonnull; + public class ItemBlockFloatingSpecialFlower extends ItemBlockSpecialFlower { public ItemBlockFloatingSpecialFlower(Block block1) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java index 8412e951d..5ec63c2ce 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java @@ -10,16 +10,13 @@ */ package vazkii.botania.common.item.block; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import vazkii.botania.client.lib.LibResources; +import javax.annotation.Nonnull; + public class ItemBlockMod extends ItemBlock { public ItemBlockMod(Block block) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java index cd10c0532..7e441f4a0 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item.block; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.decor.slabs.BlockModSlab; +import javax.annotation.Nonnull; + public class ItemBlockModSlab extends ItemSlab { public ItemBlockModSlab(Block par1) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 209eea833..d761f9d9e 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -10,14 +10,9 @@ */ package vazkii.botania.common.item.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -26,6 +21,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemBlockPool extends ItemBlockWithMetadataAndName { public ItemBlockPool(Block par2Block) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 3ad71eb80..2607261e5 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -10,15 +10,10 @@ */ package vazkii.botania.common.item.block; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -31,16 +26,16 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IRecipeKeyProvider; import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.api.subtile.signature.SubTileSignature; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyProvider { public ItemBlockSpecialFlower(Block block1) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java index efca8172b..a65d55f0c 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item.block; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.item.ItemMultiTexture; import net.minecraft.item.ItemStack; import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; +import javax.annotation.Nonnull; + public class ItemBlockSpecialQuartz extends ItemMultiTexture { public ItemBlockSpecialQuartz(Block par1) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index c56bf9a79..4ae772616 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.block; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +19,9 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import vazkii.botania.common.core.helper.ItemNBTHelper; +import java.util.Arrays; +import java.util.List; + public class ItemBlockTinyPotato extends ItemBlockMod { private static final List TYPOS = Arrays.asList("vaskii", "vazki", "voskii", "vazkkii", "vazkki", "vazzki", "vaskki", "vozkii", "vazkil", "vaskil", "vazkill", "vaskill", "vaski"); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java index ece0cb7f4..c462dc762 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java @@ -10,15 +10,10 @@ */ package vazkii.botania.common.item.block; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import vazkii.botania.client.lib.LibResources; + +import javax.annotation.Nonnull; public class ItemBlockWithMetadataAndName extends ItemBlockMod { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 12a9601ff..53c141546 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -10,19 +10,13 @@ */ package vazkii.botania.common.item.brew; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; 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.SoundEvents; import net.minecraft.item.EnumAction; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -43,6 +37,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.List; + public abstract class ItemBrewBase extends ItemMod implements IBrewItem { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 7969801b0..84b3ca769 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -10,15 +10,9 @@ */ package vazkii.botania.common.item.brew; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -35,6 +29,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContainer { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 16bc22f02..7e3664106 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -10,13 +10,8 @@ */ package vazkii.botania.common.item.brew; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; @@ -28,6 +23,8 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemVial extends ItemMod implements IBrewContainer { public ItemVial() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 00d89ce8f..71cfc45de 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -1,7 +1,5 @@ package vazkii.botania.common.item.equipment.armor.elementium; -import java.util.List; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -18,6 +16,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; import javax.annotation.Nonnull; +import java.util.List; public abstract class ItemElementiumArmor extends ItemManasteelArmor implements IPixieSpawner { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java index 1ac1810cb..52f67032f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java @@ -1,13 +1,13 @@ package vazkii.botania.common.item.equipment.armor.elementium; -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nullable; + public class ItemElementiumHelm extends ItemElementiumArmor implements IManaDiscountArmor { public ItemElementiumHelm() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index fbc4dc1a6..943c64946 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.model.ModelBiped; @@ -35,7 +29,6 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.items.IRunicArmor; @@ -53,6 +46,11 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IManaUsingItem, IPhantomInkable, IRunicArmor, IModelRegister { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java index 5c0c03210..7720c8178 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelHelm.java @@ -10,14 +10,14 @@ */ package vazkii.botania.common.item.equipment.armor.manasteel; -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nullable; + public class ItemManasteelHelm extends ItemManasteelArmor implements IManaDiscountArmor { public ItemManasteelHelm() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 307bf5e3f..28f9ee1d9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -10,16 +10,11 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -33,6 +28,9 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemManaweaveArmor extends ItemManasteelArmor { public ItemManaweaveArmor(EntityEquipmentSlot type, String name) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index fdd0daac6..7ab82ac51 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; @@ -25,6 +22,9 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscountArmor, IManaProficiencyArmor { private static final int MANA_PER_DAMAGE = 30; diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index e573dc373..af4ba60a3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -10,13 +10,7 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nonnull; - import com.google.common.collect.Multimap; - import net.minecraft.client.model.ModelBiped; import net.minecraft.client.resources.I18n; import net.minecraft.entity.SharedMonsterAttributes; @@ -33,6 +27,10 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.UUID; + public class ItemTerrasteelArmor extends ItemManasteelArmor { public ItemTerrasteelArmor(EntityEquipmentSlot type, String name) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 1e715e499..19379acbf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; -import java.util.List; - -import javax.annotation.Nullable; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -41,6 +37,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nullable; +import java.util.List; + public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer, IManaGivingItem { private static final String TAG_ANCIENT_WILL = "AncientWill"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java index b2c0736df..b91630b3c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java @@ -18,9 +18,9 @@ import net.minecraft.util.SoundCategory; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibItemNames; public class ItemBalanceCloak extends ItemHolyCloak { @@ -42,7 +42,7 @@ public class ItemBalanceCloak extends ItemHolyCloak { if(event.getAmount() > player.getHealth()) event.setAmount(player.getHealth() - 1); - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.holyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 30; i++) { double x = player.posX + Math.random() * player.width * 2 - player.width; double y = player.posY + Math.random() * player.height; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index e22523258..8355b4ceb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nonnull; - import baubles.api.BaublesApi; import baubles.api.IBauble; import baubles.api.cap.IBaublesItemHandler; @@ -37,11 +32,15 @@ import net.minecraftforge.items.ItemHandlerHelper; import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.item.ItemMod; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.UUID; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IRunicArmor") public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAttachable, IPhantomInkable, IRunicArmor { @@ -146,7 +145,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public void onEquipped(ItemStack stack, EntityLivingBase player) { if(player != null) { if(!player.world.isRemote) - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.equipBauble, SoundCategory.PLAYERS, 0.1F, 1.3F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.equipBauble, SoundCategory.PLAYERS, 0.1F, 1.3F); // todo 1.12 advancement trigger for baubles (ideally baubles adds one, not us..) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 003702a81..063de04ff 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -10,19 +10,9 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - import baubles.api.BaubleType; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -33,22 +23,22 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraft.util.NonNullList; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.ICosmeticBauble; import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; -import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.List; public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java index 0b985af24..df5de3fc8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleModifier.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.equipment.bauble; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 9dccc45b5..6eabc0108 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -10,16 +10,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.awt.Color; -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -28,17 +18,20 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; @@ -51,6 +44,9 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import java.awt.Color; +import java.util.List; + public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBrewItem, IManaUsingItem, IBaubleRender { private static final String TAG_BREW_KEY = "brewKey"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index 0b6d388b4..e291c9217 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - import baubles.api.BaubleType; -import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.GlStateManager; @@ -26,22 +21,17 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.item.IBaubleRender.RenderType; -import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketJump; +import java.util.UUID; + public class ItemCloudPendant extends CloudPendantShim implements IBaubleRender { private static int timesJumped; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 921011afb..9c98fe237 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -10,12 +10,9 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - -import com.google.common.base.Predicates; - import baubles.api.BaubleType; import baubles.api.BaublesApi; +import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; @@ -37,12 +34,14 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; +import java.util.List; + public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { public ItemDivaCharm() { @@ -70,7 +69,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble event.getEntityLiving().isDead = false; ManaItemHandler.requestManaExact(amulet, player, cost, true); - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.divaCharm, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.divaCharm, SoundCategory.PLAYERS, 1F, 1F); double x = event.getEntityLiving().posX; double y = event.getEntityLiving().posY; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java index 1761f5ba8..d3d9e93e6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java @@ -18,7 +18,6 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 1e50fd870..c98d4ee1e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -10,16 +10,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.util.NonNullList; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - import baubles.api.BaubleType; import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; @@ -32,24 +22,27 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; +import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.client.core.helper.IconHelper; @@ -58,12 +51,17 @@ import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.StringObfuscator; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaubleRender { private static final ResourceLocation textureHud = new ResourceLocation(LibResources.GUI_HUD_ICONS); @@ -145,7 +143,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(!wasSprting && isSprinting && cooldown == 0) { p.motionX += look.x; p.motionZ += look.z; - p.world.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); + p.world.playSound(null, p.posX, p.posY, p.posZ, ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); } else if(cooldown > 0) { if(maxCd - cooldown < 2) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index 5cceada98..17a4c3877 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -10,15 +10,12 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - import baubles.api.BaubleType; import baubles.api.BaublesApi; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; @@ -28,12 +25,13 @@ import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem, IBaubleRender { public static final int COST = 1000; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 710ecfa79..3378c5f0e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; @@ -27,12 +26,11 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCloak; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; @@ -84,7 +82,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { if(!event.getSource().isMagicDamage()) { event.setCanceled(true); - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.holyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 30; i++) { double x = player.posX + Math.random() * player.width * 2 - player.width; double y = player.posY + Math.random() * player.height; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 807eeef4f..b80787ef7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import baubles.api.BaubleType; import baubles.api.BaublesApi; import gnu.trove.list.array.TIntArrayList; @@ -51,6 +47,10 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ItemItemFinder extends ItemBauble implements IBaubleRender { private static final String TAG_ENTITY_POSITIONS = "highlightPositionsEnt"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index bde39e9d9..1321ac9de 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -10,9 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; -import com.google.common.collect.Multimap; - import baubles.api.BaubleType; +import com.google.common.collect.Multimap; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index f4da7c8e6..6f2c1f607 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -10,15 +10,11 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - -import com.google.common.collect.ImmutableList; - import baubles.api.BaubleType; import baubles.api.BaublesApi; +import com.google.common.collect.ImmutableList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -39,6 +35,8 @@ import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemMagnetRing extends ItemBauble { private static final String TAG_COOLDOWN = "cooldown"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index c6874f6e4..9c7148af3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -10,13 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - -import javax.annotation.Nonnull; - import baubles.api.BaubleType; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; @@ -29,6 +24,8 @@ import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipDisplay { protected static final int MAX_MANA = 500000; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java index 630ff2969..bbee162c4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java @@ -20,8 +20,6 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.item.IBaubleRender.Helper; -import vazkii.botania.api.item.IBaubleRender.RenderType; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index a7ea23275..c84dc864c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - import baubles.api.BaubleType; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -37,6 +35,8 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemThirdEye extends ItemBauble implements IManaUsingItem, IBaubleRender { private static final int COST = 2; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 0e545021b..afb742989 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -10,11 +10,8 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - -import com.google.common.base.Predicates; - import baubles.api.BaubleType; +import com.google.common.base.Predicates; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; @@ -34,6 +31,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { public static final String TAG_ORBIT = "orbit"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 9c3666166..1f977ce05 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.ArrayList; -import java.util.List; - import baubles.api.BaubleType; import baubles.api.BaublesApi; import net.minecraft.block.material.Material; @@ -35,6 +32,9 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; +import java.util.ArrayList; +import java.util.List; + public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUsingItem { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TRAVEL_BELT); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 516d59f7b..a33d6f634 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.item.equipment.bauble; -import java.util.List; - import com.google.common.base.Predicates; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; @@ -26,11 +23,13 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibItemNames; +import java.util.List; + public class ItemUnholyCloak extends ItemHolyCloak { private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_UNHOLY_CLOAK); @@ -51,7 +50,7 @@ public class ItemUnholyCloak extends ItemHolyCloak { entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.getAmount()); } - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.unholyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.unholyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 90; i++) { float rad = i * 4F * (float) Math.PI / 180F; float xMotion = (float) Math.cos(rad) * 0.2F; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 4736f5afe..4820b9b97 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool; -import javax.annotation.Nonnull; - import com.google.common.collect.Multimap; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -28,6 +25,8 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemEnderDagger extends ItemManasteelSword { public ItemEnderDagger() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index dc746a77c..1f8c3ebb6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool; -import javax.annotation.Nonnull; - import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.Item; @@ -23,6 +21,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemGlassPick extends ItemManasteelPick { private static final int MANA_PER_DAMAGE = 160; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index aa7b324bd..9e8653b31 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -10,25 +10,24 @@ */ package vazkii.botania.common.item.equipment.tool; -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityFallingStar; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemStarSword extends ItemManasteelSword { private static final int MANA_PER_DAMAGE = 120; @@ -72,7 +71,7 @@ public class ItemStarSword extends ItemManasteelSword { } ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.starcaller, SoundCategory.PLAYERS, 0.4F, 1.4F); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.starcaller, SoundCategory.PLAYERS, 0.4F, 1.4F); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index 2cc790bf3..4af7c3195 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -10,15 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.function.Predicate; - -import javax.annotation.Nonnull; - import com.google.common.collect.Multimap; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -26,7 +18,6 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; @@ -37,6 +28,12 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.function.Predicate; + public class ItemThunderSword extends ItemManasteelSword { private static final String TAG_LIGHTNING_SEED = "lightningSeed"; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java index 927009a3f..abfcc4f08 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -15,7 +15,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Enchantments; -import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index b5dcf82fc..5bd515aba 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.bow; -import java.util.function.Predicate; - -import javax.annotation.Nonnull; - import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; @@ -36,7 +32,6 @@ import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.event.ForgeEventFactory; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaUsingItem; @@ -50,6 +45,9 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.function.Predicate; + public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModelRegister { private static final Predicate AMMO_FUNC = s -> s != null && s.getItem() instanceof ItemArrow; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index c093e986c..9b8138f89 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -1,13 +1,10 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.Random; - import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.AbstractSkeleton; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityWitherSkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +21,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.lib.LibItemNames; +import java.util.Random; + public class ItemElementiumAxe extends ItemManasteelAxe { public ItemElementiumAxe() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index f47466630..8df4d6ae7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -1,16 +1,9 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import com.google.common.base.Predicates; - import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; import net.minecraft.item.EnumAction; @@ -28,6 +21,9 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemElementiumShears extends ItemManasteelShears { public ItemElementiumShears() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index b434ffcaf..53f134c9e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import java.util.regex.Pattern; - -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -29,7 +25,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -45,6 +40,9 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.regex.Pattern; + public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool, IModelRegister { private static final Pattern SAPLING_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)sapling)|(?:(?:[a-z-_.:]|^)Sapling))(?:[A-Z-_.:]|$)"); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index 30a269b45..7d67ea102 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import java.util.regex.Pattern; - -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -29,7 +25,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -45,6 +40,9 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.regex.Pattern; + public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool, IModelRegister { private static final Pattern TORCH_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)torch)|(?:(?:[a-z-_.:]|^)Torch))(?:[A-Z-_.:]|$)"); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index cfbdee566..0c6cb3410 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.enchantment.EnchantmentHelper; @@ -32,7 +27,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.IShearable; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.mana.IManaUsingItem; @@ -45,6 +39,10 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.Random; + public class ItemManasteelShears extends ItemShears implements IManaUsingItem, IModelRegister { public static final int MANA_PER_DAMAGE = 30; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 0bc87d483..b8cae9624 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -32,7 +30,6 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.fml.common.eventhandler.Event.Result; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -47,6 +44,8 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool, IModelRegister { private static final int MANA_PER_DAMAGE = 60; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java index b7851a9c4..4cd546c80 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.entity.Entity; @@ -23,7 +21,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; @@ -37,6 +34,8 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemManasteelSword extends ItemSword implements IManaUsingItem, IModelRegister { public static final int MANA_PER_DAMAGE = 60; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index b73861882..c17165c98 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -10,16 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import java.util.PriorityQueue; -import java.util.Set; - -import javax.annotation.Nonnull; - import gnu.trove.map.hash.TIntObjectHashMap; import net.minecraft.block.Block; import net.minecraft.enchantment.EnchantmentHelper; @@ -44,6 +34,15 @@ import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.PriorityQueue; +import java.util.Set; + public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 8fa26bcda..3280ba397 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.material.Material; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; @@ -23,7 +18,6 @@ import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; @@ -38,18 +32,14 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3i; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; @@ -57,7 +47,10 @@ import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.item.relic.ItemThorRing; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.Arrays; +import java.util.List; public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequentialBreaker { @@ -115,7 +108,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(level != 0) { setEnabled(stack, !isEnabled(stack)); if(!world.isRemote) - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraPickMode, SoundCategory.PLAYERS, 0.5F, 0.4F); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.terraPickMode, SoundCategory.PLAYERS, 0.5F, 0.4F); } return ActionResult.newResult(EnumActionResult.SUCCESS, stack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 31e574c77..e5f6fd242 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -10,14 +10,9 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; @@ -32,7 +27,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILensEffect; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.item.ModItems; @@ -42,6 +37,9 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketLeftClick; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { private static final String TAG_ATTACKER_USERNAME = "attackerUsername"; @@ -75,7 +73,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { EntityManaBurst burst = getBurst(player, player.getHeldItemMainhand()); player.world.spawnEntity(burst); ToolCommons.damageItem(player.getHeldItemMainhand(), 1, player, MANA_PER_DAMAGE); - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); } } diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index aefee3d9c..55bf39c1d 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.item.interaction.thaumcraft; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.NonNullList; @@ -29,6 +24,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IScribeTools") public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools { diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java index df325e22d..0b80db8ba 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManasteelHelmRevealing.java @@ -13,19 +13,13 @@ package vazkii.botania.common.item.interaction.thaumcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Optional; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import thaumcraft.api.items.IGoggles; import thaumcraft.api.items.IRevealer; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.crafting.recipe.HelmRevealingRecipe; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelHelm; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; @Optional.InterfaceList({ @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.items.IGoggles", striprefs = true), diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index f59d7a98d..256d0be42 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -10,29 +10,18 @@ */ package vazkii.botania.common.item.lens; -import java.awt.Color; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ICompositableLens; @@ -44,11 +33,12 @@ import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; -import vazkii.botania.common.crafting.recipe.LensDyeingRecipe; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.awt.Color; +import java.util.List; public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt { diff --git a/src/main/java/vazkii/botania/common/item/lens/Lens.java b/src/main/java/vazkii/botania/common/item/lens/Lens.java index 9898beded..284f0d290 100644 --- a/src/main/java/vazkii/botania/common/item/lens/Lens.java +++ b/src/main/java/vazkii/botania/common/item/lens/Lens.java @@ -15,7 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.math.RayTraceResult; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.BurstProperties; -import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.mana.IManaSpreader; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index 0c082a5c6..95394ce73 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.util.List; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; @@ -20,6 +18,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; +import java.util.List; + public class LensDamage extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java index a19cdd70b..bab919ee2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.awt.Color; - import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -19,6 +17,8 @@ import net.minecraft.util.math.MathHelper; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.common.Botania; +import java.awt.Color; + public class LensFlare extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 19ed4199a..7a7f988bf 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.item.lens; -import java.util.List; - import com.google.common.base.Predicates; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.item.EntityItem; @@ -25,6 +22,8 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.item.ModItems; +import java.util.List; + public class LensInfluence extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 13fa60a9a..95eac1cb2 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityItem; @@ -29,6 +26,9 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public class LensMine extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 1b8566792..c234b60b0 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.passive.EntitySheep; @@ -28,6 +25,9 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; +import java.util.ArrayList; +import java.util.List; + public class LensPaint extends Lens { @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java b/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java index 4dd893ced..0458ab1a5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.lens; -import java.util.List; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -20,6 +18,8 @@ import net.minecraft.util.math.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaSpreader; +import java.util.List; + public class LensTripwire extends Lens { private static final String TAG_TRIPPED = "botania:triwireLensTripped"; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index 03575e2b8..4ead8ce8f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.item.lens; -import java.util.Map; - import com.google.common.collect.ImmutableMap; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityFallingBlock; @@ -27,6 +24,8 @@ import net.minecraft.world.WorldServer; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.Map; + public class LensWeight extends Lens { private static final Map TECHNICAL_BLOCK_REMAP = ImmutableMap.of( diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index ad05d6eff..328026fce 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.material; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; @@ -31,6 +29,8 @@ import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemDye extends Item16Colors { public ItemDye() { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 77486b2ff..e0762501d 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -10,16 +10,10 @@ */ package vazkii.botania.common.item.material; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; @@ -45,6 +39,8 @@ import vazkii.botania.common.entity.EntityEnderAirBottle; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem { final int types = 24; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 7767cfc8f..22ccce754 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.material; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; @@ -31,6 +29,8 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemPetal extends Item16Colors implements IFlowerComponent { public ItemPetal() { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 60c1a0478..865688408 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.item.material; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -26,6 +21,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemQuartz extends ItemMod implements IElvenItem { private static final int SUBTYPES = 7; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 34b3161ef..15c9430f8 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -10,14 +10,7 @@ */ package vazkii.botania.common.item.material; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; @@ -28,6 +21,8 @@ import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemRune extends ItemMod implements IFlowerComponent { public ItemRune() { diff --git a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java index ac355d79b..038074400 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.record; -import javax.annotation.Nonnull; - import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; @@ -25,6 +23,8 @@ import vazkii.botania.client.render.IModelRegister; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibMisc; +import javax.annotation.Nonnull; + public class ItemModRecord extends ItemRecord implements IModelRegister { private final String file; diff --git a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java index 58091eb25..977c090de 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia1.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item.record; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibItemNames; public class ItemRecordGaia1 extends ItemModRecord { public ItemRecordGaia1() { - super("gaia1", BotaniaSoundEvents.gaiaMusic1, LibItemNames.RECORD_GAIA1); + super("gaia1", ModSounds.gaiaMusic1, LibItemNames.RECORD_GAIA1); } } diff --git a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java index 87b135def..9a4196180 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemRecordGaia2.java @@ -10,13 +10,13 @@ */ package vazkii.botania.common.item.record; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibItemNames; public class ItemRecordGaia2 extends ItemModRecord { public ItemRecordGaia2() { - super("gaia2", BotaniaSoundEvents.gaiaMusic2, LibItemNames.RECORD_GAIA2); + super("gaia2", ModSounds.gaiaMusic2, LibItemNames.RECORD_GAIA2); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 91d39e864..c2ec871b7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -10,35 +10,27 @@ */ package vazkii.botania.common.item.relic; -import java.util.List; -import java.util.UUID; - +import baubles.api.BaubleType; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; - -import baubles.api.BaubleType; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; import vazkii.botania.api.item.IWireframeCoordinateListProvider; import vazkii.botania.common.core.handler.MethodHandles; -import vazkii.botania.common.crafting.recipe.AesirRingRecipe; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; + +import java.util.List; +import java.util.UUID; public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordinateListProvider { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index 1e323c1f5..af9aa00d3 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.relic; -import javax.annotation.Nonnull; - import gnu.trove.list.array.TIntArrayList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -30,6 +28,8 @@ import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemDice extends ItemRelic { private static final int[] SIDES_FOR_MOON_PHASES = { -1, 0, 1, 2, -1, 2, 3, 4 }; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 5fbc4de70..429adce1c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.relic; -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -34,6 +32,8 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUsingItem { public ItemFlugelEye() { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 28beffb84..22c189289 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.Locale; - -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -30,6 +26,9 @@ import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibObfuscation; +import javax.annotation.Nonnull; +import java.util.Locale; + public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { public ItemInfiniteFruit() { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index ec5850086..ca78b8941 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -25,12 +21,15 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class ItemKingKey extends ItemRelic implements IManaUsingItem { private static final String TAG_WEAPONS_SPAWNED = "weaponsSpawned"; @@ -99,7 +98,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { weapon.setRotation(MathHelper.wrapDegrees(-living.rotationYaw + 180)); living.world.spawnEntity(weapon); - weapon.playSound(BotaniaSoundEvents.babylonSpawn, 1F, 1F + living.world.rand.nextFloat() * 3F); + weapon.playSound(ModSounds.babylonSpawn, 1F, 1F + living.world.rand.nextFloat() * 3F); setWeaponsSpawned(stack, spawned + 1); } } 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 8a5277df9..2f63736dd 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -10,28 +10,20 @@ */ package vazkii.botania.common.item.relic; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import com.google.common.collect.ImmutableList; - import baubles.api.BaubleType; import baubles.api.BaublesApi; -import net.minecraft.block.material.Material; +import com.google.common.collect.ImmutableList; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -51,6 +43,10 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinateListProvider, IManaUsingItem { private static final String TAG_CURSOR_LIST = "cursorList"; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 890f3a86e..ff370f86e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -10,19 +10,14 @@ */ package vazkii.botania.common.item.relic; -import java.util.ArrayList; -import java.util.List; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - import baubles.api.BaubleType; import baubles.api.BaublesApi; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; @@ -33,6 +28,9 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import java.util.ArrayList; +import java.util.List; + public class ItemOdinRing extends ItemRelicBauble { private static final List damageNegations = new ArrayList<>(); 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 28d3ae529..955d7fff3 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nonnull; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; @@ -35,6 +30,10 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.UUID; + public class ItemRelic extends ItemMod implements IRelic { private static final String TAG_SOULBIND_NAME = "soulbind"; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 0f8a42059..ccc04ac80 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Nonnull; - import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -28,6 +23,10 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; +import javax.annotation.Nonnull; +import java.util.List; +import java.util.UUID; + public abstract class ItemRelicBauble extends ItemBauble implements IRelic { private final ItemRelic dummy = new ItemRelic("dummy"); // Delegate for relic stuff diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java index 428fa7088..84e1fc11a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.relic; import baubles.api.BaubleType; import baubles.api.BaublesApi; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 82cd9b281..be6117f22 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.rod; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -27,6 +25,8 @@ import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProvider { static final int COST = 150; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index d5ae6a686..4ff59f4c3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -10,14 +10,11 @@ */ package vazkii.botania.common.item.rod; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; @@ -37,6 +34,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemDirtRod extends ItemMod implements IManaUsingItem, IBlockProvider, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_DIRT); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 19ffc4689..794b93a60 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.Random; - -import javax.annotation.Nonnull; - import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -33,12 +29,15 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.Random; + public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_DIVINING); @@ -60,7 +59,7 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW long seedxor = world.rand.nextLong(); doHighlight(world, new BlockPos(p), range, seedxor); p.swingArm(hand); - } else world.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.divinationRod, SoundCategory.PLAYERS, 1F, 1F); + } else world.playSound(null, p.posX, p.posY, p.posZ, ModSounds.divinationRod, SoundCategory.PLAYERS, 1F, 1F); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } 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 bb72a27eb..a317a3253 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -10,13 +10,7 @@ */ package vazkii.botania.common.item.rod; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -25,7 +19,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -55,6 +48,10 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWireframeCoordinateListProvider { private static final int RANGE = 3; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index b302549be..cbfae7890 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.item.rod; -import javax.annotation.Nonnull; - -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; import net.minecraft.item.ItemStack; @@ -34,6 +31,8 @@ import vazkii.botania.common.entity.EntityFlameRing; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_FIRE); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index fe91bc4b9..9bbb0b876 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -40,6 +35,10 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class ItemGravityRod extends ItemMod implements IManaUsingItem { private static final float RANGE = 3F; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index e2e8d8416..5e7402144 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.rod; -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -27,13 +25,15 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.entity.EntityMagicMissile; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_MISSILE); @@ -79,7 +79,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi missile.setPosition(x, y, z); if(missile.getTarget()) { if(!world.isRemote) { - missile.playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); + missile.playSound(ModSounds.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); world.spawnEntity(missile); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index d5ce7d0b4..38bd1181a 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.item.rod; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -34,15 +29,18 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileBifrost; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_RAINBOW); @@ -116,7 +114,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi } if(count > 0) { - world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); + world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); ManaItemHandler.requestManaExactForTool(stack, player, MANA_COST, false); player.getCooldownTracker().setCooldown(this, TIME); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index 172d86357..61f8a6e0e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.item.rod; -import javax.annotation.Nonnull; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -29,6 +27,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemSkyDirtRod extends ItemDirtRod { public ItemSkyDirtRod() { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 895bb7cc2..9ec3aee2e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.Map; -import java.util.WeakHashMap; - -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -38,6 +33,10 @@ import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.Map; +import java.util.WeakHashMap; + public class ItemSmeltRod extends ItemMod implements IManaUsingItem { private static final int TIME = 10; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index f037f3f8c..ed7298335 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -10,13 +10,7 @@ */ package vazkii.botania.common.item.rod; -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - import com.google.common.collect.ImmutableList; - import net.minecraft.block.Block; import net.minecraft.block.BlockFlower; import net.minecraft.block.state.IBlockState; @@ -25,7 +19,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; -import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -46,6 +39,10 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; + public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockProvider { private static final int COST_PER = 55; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 55b36f681..8a18dc026 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item.rod; -import java.util.List; - -import javax.annotation.Nonnull; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -32,14 +28,17 @@ import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.brew.ModPotions; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; +import java.util.List; + public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWieldable { private static final ResourceLocation avatarOverlay = new ResourceLocation(LibResources.MODEL_AVATAR_TORNADO); @@ -76,7 +75,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi player.fallDistance = 0F; player.motionY = IManaProficiencyArmor.Helper.hasProficiency(player, par1ItemStack) ? 1.6 : 1.25; - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); for(int i = 0; i < 5; i++) Botania.proxy.wispFX(player.posX, player.posY, player.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); } @@ -149,7 +148,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi Botania.proxy.wispFX(p.posX, p.posY + i, p.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); if(!world.isRemote) { - p.world.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); + p.world.playSound(null, p.posX, p.posY, p.posZ, ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); p.addPotionEffect(new PotionEffect(ModPotions.featherfeet, 100, 0)); tile.recieveMana(-COST); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index b107232e8..70480dd1d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -1,7 +1,5 @@ package vazkii.botania.common.item.rod; -import javax.annotation.Nonnull; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; @@ -18,6 +16,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemWaterRod extends ItemMod implements IManaUsingItem { public static final int COST = 75; diff --git a/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java index 5b1970f58..9e2f40020 100644 --- a/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/BasicLexiconEntry.java @@ -10,14 +10,14 @@ */ package vazkii.botania.common.lexicon; -import javax.annotation.Nonnull; - import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ITwoNamedPage; import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; +import javax.annotation.Nonnull; + public class BasicLexiconEntry extends LexiconEntry { public BasicLexiconEntry(String unlocalizedName, LexiconCategory category) { diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index fb14fe72a..b0d879786 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -10,48 +10,7 @@ */ package vazkii.botania.common.lexicon; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.brew.IBrewContainer; -import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.ModMultiblocks; -import vazkii.botania.common.brew.ModBrews; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.handler.SheddingHandler; -import vazkii.botania.common.crafting.ModBrewRecipes; -import vazkii.botania.common.crafting.ModCraftingRecipes; -import vazkii.botania.common.crafting.ModElvenTradeRecipes; -import vazkii.botania.common.crafting.ModManaAlchemyRecipes; -import vazkii.botania.common.crafting.ModManaConjurationRecipes; -import vazkii.botania.common.crafting.ModManaInfusionRecipes; -import vazkii.botania.common.crafting.ModPetalRecipes; -import vazkii.botania.common.crafting.ModRuneRecipes; -import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lexicon.page.PageBrew; -import vazkii.botania.common.lexicon.page.PageCraftingRecipe; -import vazkii.botania.common.lexicon.page.PageElvenRecipe; -import vazkii.botania.common.lexicon.page.PageImage; -import vazkii.botania.common.lexicon.page.PageLoreText; -import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe; -import vazkii.botania.common.lexicon.page.PageMultiblock; -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.LibBlockNames; -import vazkii.botania.common.lib.LibLexicon; public final class LexiconData { diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index a3d1c8c8b..01d5c0fd4 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.lexicon; -import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.AdvancementProgress; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java index 5f1393d9d..828a0ecba 100644 --- a/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/WelcomeLexiconEntry.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.lexicon; -import javax.annotation.Nonnull; - import net.minecraft.item.ItemStack; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; @@ -20,6 +18,8 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.page.PageText; import vazkii.botania.common.lib.LibLexicon; +import javax.annotation.Nonnull; + public class WelcomeLexiconEntry extends BasicLexiconEntry { private static final int PAGES = 7; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index c32dbf413..7bed0cb0d 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; @@ -30,6 +27,9 @@ import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public class PageBrew extends PageRecipe implements ITwoNamedPage { final RecipeBrew recipe; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index c9abdc6f2..462ebf641 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -10,14 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import net.minecraft.item.crafting.Ingredient; -import net.minecraftforge.fml.common.registry.ForgeRegistries; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -25,20 +17,27 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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.Collections; +import java.util.List; +import java.util.stream.Collectors; + public class PageCraftingRecipe extends PageRecipe { private static final ResourceLocation craftingOverlay = new ResourceLocation(LibResources.GUI_CRAFTING_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 812ddc7d7..4c40ee47a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -1,11 +1,5 @@ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -17,6 +11,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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; @@ -24,6 +19,10 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.lib.LibResources; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class PageElvenRecipe extends PageRecipe { private static final ResourceLocation elvenTradeOverlay = new ResourceLocation(LibResources.GUI_ELVEN_TRADE_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index 824627a66..815bd3c32 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -10,14 +10,11 @@ */ package vazkii.botania.common.lexicon.page; -import java.lang.reflect.Constructor; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -27,6 +24,8 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; +import java.lang.reflect.Constructor; + public class PageEntity extends LexiconPage{ Entity dummyEntity; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java index b027b7d7b..88a212589 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageGuide.java @@ -10,15 +10,15 @@ */ package vazkii.botania.common.lexicon.page; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.util.text.translation.I18n; +import vazkii.botania.api.internal.IGuiLexiconEntry; + import java.awt.Desktop; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.util.text.translation.I18n; -import vazkii.botania.api.internal.IGuiLexiconEntry; - public class PageGuide extends PageText { GuiButton button; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java index 4de98e4fa..6a35040e4 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageImage.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -19,6 +17,7 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java index fc14eb43c..5f25f7349 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageLoreText.java @@ -10,12 +10,11 @@ */ package vazkii.botania.common.lexicon.page; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 56331ebc6..fcf73e223 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -10,14 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import net.minecraft.init.Items; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -25,6 +17,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.I18n; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -32,6 +25,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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; @@ -43,6 +37,11 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class PageManaInfusionRecipe extends PageRecipe { private static final ResourceLocation manaInfusionOverlay = new ResourceLocation(LibResources.GUI_MANA_INFUSION_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java index fbfe8b7c3..1ef78d6e8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -30,6 +25,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.Multiblock; @@ -37,6 +33,9 @@ import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.lib.LibResources; +import java.util.ArrayList; +import java.util.List; + public class PageMultiblock extends LexiconPage { private static final ResourceLocation multiblockOverlay = new ResourceLocation(LibResources.GUI_MULTIBLOCK_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index 842f3ffba..deb521f4c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -10,12 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; @@ -27,6 +21,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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; @@ -36,6 +31,10 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class PagePetalRecipe extends PageRecipe { private static final ResourceLocation petalOverlay = new ResourceLocation(LibResources.GUI_PETAL_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index 11b05f50b..861ed0748 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -10,25 +10,19 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.LexiconPage; @@ -37,6 +31,11 @@ import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.common.core.helper.PlayerHelper; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class PageRecipe extends LexiconPage { int relativeMouseX, relativeMouseY; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 1b6e3781f..dfa2d6a8c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; @@ -21,12 +17,15 @@ import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +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.mana.TilePool; +import java.util.List; + public class PageRuneRecipe extends PagePetalRecipe { public PageRuneRecipe(String unlocalizedName, List recipes) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 55134739b..50d6e5754 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -10,14 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.client.util.ITooltipFlag; -import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -25,6 +17,7 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.EntityList; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -32,12 +25,18 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.lib.LibResources; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class PageShedding extends PageEntity { private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java index b5fcaedf1..0ed23b6ba 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.List; - -import org.lwjgl.opengl.GL11; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; @@ -24,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; @@ -31,6 +27,9 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; +import java.util.ArrayList; +import java.util.List; + public class PageTerrasteel extends PageRecipe { private static final ResourceLocation terrasteelOverlay = new ResourceLocation(LibResources.GUI_TERRASTEEL_OVERLAY); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index ee9fc26dc..1662ff52b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -10,11 +10,7 @@ */ package vazkii.botania.common.lexicon.page; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Joiner; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; @@ -24,6 +20,9 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.common.core.handler.ConfigHandler; +import java.util.ArrayList; +import java.util.List; + public class PageText extends LexiconPage { public PageText(String unlocalizedName) { diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index 82f4532a1..b96d742c2 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.lexicon.page; -import java.awt.Desktop; -import java.net.URI; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.Style; @@ -24,6 +21,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexicon; +import java.awt.Desktop; +import java.net.URI; + public class PageTutorial extends PageText { // Turn this on once we have an up to date video diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index f4842fef4..9b8392da1 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -1,7 +1,5 @@ package vazkii.botania.common.network; -import java.awt.Color; - import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -18,10 +16,11 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityDoppleganger; +import java.awt.Color; + public class PacketBotaniaEffect implements IMessage { private EffectType type; diff --git a/src/main/java/vazkii/botania/common/network/PacketDodge.java b/src/main/java/vazkii/botania/common/network/PacketDodge.java index 75a3b9563..1474644c8 100644 --- a/src/main/java/vazkii/botania/common/network/PacketDodge.java +++ b/src/main/java/vazkii/botania/common/network/PacketDodge.java @@ -13,7 +13,6 @@ package vazkii.botania.common.network; import baubles.api.BaublesApi; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentString; @@ -21,7 +20,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.items.IItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; @@ -39,7 +38,7 @@ public class PacketDodge implements IMessage { public IMessage onMessage(PacketDodge message, MessageContext ctx) { EntityPlayerMP player = ctx.getServerHandler().player; player.mcServer.addScheduledTask(() -> { - player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); IItemHandler baublesInv = BaublesApi.getBaublesHandler(player); ItemStack ringStack = baublesInv.getStackInSlot(1); diff --git a/src/main/java/vazkii/botania/common/network/PacketJump.java b/src/main/java/vazkii/botania/common/network/PacketJump.java index f51a97066..46263d0a5 100644 --- a/src/main/java/vazkii/botania/common/network/PacketJump.java +++ b/src/main/java/vazkii/botania/common/network/PacketJump.java @@ -13,18 +13,12 @@ package vazkii.botania.common.network; import baubles.api.BaublesApi; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.SoundCategory; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.items.IItemHandler; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.equipment.bauble.CloudPendantShim; -import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemTravelBelt; public class PacketJump implements IMessage { diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index d1527de67..a3026f33c 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -10,10 +10,7 @@ */ package vazkii.botania.common.world; -import java.awt.Color; - import com.google.common.collect.ImmutableSet; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -37,6 +34,8 @@ import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; +import java.awt.Color; + public final class SkyblockWorldEvents { private SkyblockWorldEvents() {} diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 97b6f5765..8c7d1b8a9 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.world; -import javax.annotation.Nonnull; - import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; import net.minecraft.world.WorldServer; @@ -21,6 +19,8 @@ import net.minecraft.world.gen.IChunkGenerator; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nonnull; + public class WorldTypeSkyblock extends WorldType { public WorldTypeSkyblock() {