diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 77c00e022..21e3f4d40 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -62,34 +62,34 @@ import net.minecraftforge.fml.common.Loader; public final class BotaniaAPI { - private static List categories = new ArrayList(); - private static List allEntries = new ArrayList(); + private static List categories = new ArrayList<>(); + private static List allEntries = new ArrayList<>(); - public static Map knowledgeTypes = new HashMap(); + public static Map knowledgeTypes = new HashMap<>(); - public static Map brewMap = new LinkedHashMap(); + public static Map brewMap = new LinkedHashMap<>(); - public static List petalRecipes = new ArrayList(); - public static List pureDaisyRecipes = new ArrayList(); - public static List manaInfusionRecipes = new ArrayList(); - public static List runeAltarRecipes = new ArrayList(); - public static List elvenTradeRecipes = new ArrayList(); - public static List brewRecipes = new ArrayList(); - public static List miniFlowerRecipes = new ArrayList(); + public static List petalRecipes = new ArrayList<>(); + public static List pureDaisyRecipes = new ArrayList<>(); + public static List manaInfusionRecipes = new ArrayList<>(); + public static List runeAltarRecipes = new ArrayList<>(); + public static List elvenTradeRecipes = new ArrayList<>(); + public static List brewRecipes = new ArrayList<>(); + public static List miniFlowerRecipes = new ArrayList<>(); private static BiMap> subTiles = HashBiMap.> create(); - private static Map, SubTileSignature> subTileSignatures = new HashMap, SubTileSignature>(); + private static Map, SubTileSignature> subTileSignatures = new HashMap<>(); public static Set subtilesForCreativeMenu = new LinkedHashSet(); - public static Map subTileMods = new HashMap(); + public static Map subTileMods = new HashMap<>(); public static BiMap miniFlowers = HashBiMap. create(); - public static Map oreWeights = new HashMap(); - public static Map oreWeightsNether = new HashMap(); + public static Map oreWeights = new HashMap<>(); + public static Map oreWeightsNether = new HashMap<>(); public static Map seeds = new HashMap(); - public static Set looniumBlacklist = new LinkedHashSet(); - public static Map> paintableBlocks = new LinkedHashMap>(); - public static Set magnetBlacklist = new LinkedHashSet(); + public static Set looniumBlacklist = new LinkedHashSet<>(); + public static Map> paintableBlocks = new LinkedHashMap<>(); + public static Set magnetBlacklist = new LinkedHashSet<>(); public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18); diff --git a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java index cbf501dd2..7e0fab467 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPIClient.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPIClient.java @@ -1,6 +1,5 @@ package vazkii.botania.api; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index b3601d37f..c2a1a27e0 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -33,7 +33,7 @@ public final class CorporeaHelper { private static final List empty = Collections.unmodifiableList(new ArrayList()); private static final WeakHashMap, List> cachedNetworks = new WeakHashMap(); - private static final List autoCompleteControllers = new ArrayList(); + private static final List autoCompleteControllers = new ArrayList<>(); private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index 667f51895..a6a8fb857 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -13,8 +13,6 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -28,8 +26,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.boss.IBotaniaBoss; import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; diff --git a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java index d1a8a26c3..655cd8eeb 100644 --- a/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java @@ -13,8 +13,6 @@ package vazkii.botania.api.internal; import java.util.List; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/api/item/IBaubleRender.java b/src/main/java/vazkii/botania/api/item/IBaubleRender.java index 176d4e968..2ef376071 100644 --- a/src/main/java/vazkii/botania/api/item/IBaubleRender.java +++ b/src/main/java/vazkii/botania/api/item/IBaubleRender.java @@ -10,14 +10,11 @@ */ package vazkii.botania.api.item; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index 06f678d0d..ec30651b7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -20,7 +20,7 @@ public class LexiconCategory implements Comparable { private static int count = 0; public final String unlocalizedName; - public final List entries = new ArrayList(); + public final List entries = new ArrayList<>(); private final int sortingId; private ResourceLocation icon; private int priority = 5; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 222eb806c..274bfd6e6 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -27,7 +27,7 @@ public class LexiconEntry implements Comparable { private KnowledgeType type = BotaniaAPI.basicKnowledge; - public List pages = new ArrayList(); + public List pages = new ArrayList<>(); private boolean priority = false; private ItemStack icon = null; 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 38271b2a8..2b4240970 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -12,7 +12,6 @@ package vazkii.botania.api.lexicon.multiblock; import java.util.*; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; @@ -33,7 +32,7 @@ public class Multiblock { public BlockPos maxPos = BlockPos.ORIGIN; public BlockPos offPos = BlockPos.ORIGIN; - public HashMap locationCache = new HashMap(); + public HashMap locationCache = new HashMap<>(); /** * Adds a multiblock component to this multiblock. The component's x y z @@ -125,7 +124,7 @@ public class Multiblock { * orientations. */ public Map createRotations() { - Map ret = new EnumMap(EnumFacing.class); + Map ret = new EnumMap<>(EnumFacing.class); ret.put(EnumFacing.SOUTH, this); 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 100e286cb..ebc675e1a 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java @@ -12,7 +12,6 @@ package vazkii.botania.api.lexicon.multiblock; import net.minecraft.entity.Entity; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import java.util.Collections; import java.util.Map; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index 4ca2ae01e..451a184ac 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -10,7 +10,6 @@ */ package vazkii.botania.api.lexicon.multiblock.component; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java index 4e1ec47f3..4427ccbc1 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java @@ -1,8 +1,6 @@ package vazkii.botania.api.lexicon.multiblock.component; import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 89f93cca4..6b3e3e5a1 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -65,12 +65,9 @@ public class BotaniaStateProps { public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class); // Block18StoneWall - public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate() { - @Override - public boolean apply(FutureStoneVariant variant) { - // Just the four kinds (no polished, chiseled, etc.) - return variant.ordinal() >= 0 && variant.ordinal() <= 3; - } + public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, variant -> { + // Just the four kinds (no polished, chiseled, etc.) + return variant.ordinal() >= 0 && variant.ordinal() <= 3; }); // BlockAlfPortal @@ -89,12 +86,7 @@ public class BotaniaStateProps { public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class); // BlockBiomeStoneWall - public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate() { - @Override - public boolean apply(BiomeStoneVariant input) { - return input.getName().contains("cobble"); - } - }); + public static final PropertyEnum BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, input -> input.getName().contains("cobble")); // BlockCustomBrick public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class); @@ -120,36 +112,21 @@ public class BotaniaStateProps { // BlockLivingRock public static final PropertyEnum LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class); - // BlockModDoubleFlower - public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { - @Override - public boolean apply(EnumDyeColor input) { - // White to gray - return input.ordinal() >= 0 && input.ordinal() <= 7; - } - }); + // BlockModDoubleFlower (white to gray) + public static final PropertyEnum DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 0 && input.ordinal() <= 7); - public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate() { - @Override - public boolean apply(EnumDyeColor input) { - // Silver to black - return input.ordinal() >= 8 && input.ordinal() <= 15; - } - }); + // (silver to black) + public static final PropertyEnum DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 8 && input.ordinal() <= 15); // BlockOpenCrate public static final PropertyEnum CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class); public static final PropertyEnum CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class); // BlockPavement - public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate() { - @Override - public boolean apply(EnumDyeColor color) { - return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK - || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED - || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN; - } - }); + public static final PropertyEnum PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, color -> + color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK + || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED + || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN); // BlockPlatform public static final PropertyEnum PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class); diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index 718cc889f..a75aefb1a 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -10,13 +10,11 @@ */ package vazkii.botania.api.subtile; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 04542ab11..f23687453 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -11,7 +11,6 @@ package vazkii.botania.api.subtile; import java.awt.Color; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; 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 949f0c8e6..11833c014 100644 --- a/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java +++ b/src/main/java/vazkii/botania/api/subtile/signature/SubTileSignature.java @@ -12,8 +12,6 @@ package vazkii.botania.api.subtile.signature; import java.util.List; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; 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 5d8d04c81..e0233a241 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -10,13 +10,9 @@ */ package vazkii.botania.client.core.handler; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; @@ -25,8 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraftforge.client.event.RenderPlayerEvent; -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; 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 97fad752f..a7e56bb73 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -21,7 +21,6 @@ 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.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; @@ -39,23 +38,17 @@ public class CorporeaAutoCompleteHandler { boolean isAutoCompleted = false; String originalString = ""; - List completions = new ArrayList(); + List completions = new ArrayList<>(); int position; - static TreeSet itemNames = new TreeSet( - new Comparator() { - @Override - public int compare(String arg0, String arg1) { - return arg0.compareToIgnoreCase(arg1); - } - }); + static TreeSet itemNames = new TreeSet<>(String::compareToIgnoreCase); private boolean tabLastTick = false; public static void updateItemList() { itemNames.clear(); Iterator iterator = Item.itemRegistry.iterator(); - ArrayList curList = new ArrayList(); + ArrayList curList = new ArrayList<>(); while(iterator.hasNext()) { Item item = iterator.next(); @@ -146,7 +139,7 @@ public class CorporeaAutoCompleteHandler { if(s.isEmpty()) return new ArrayList(); - TreeSet result = new TreeSet(); + TreeSet result = new TreeSet<>(); String[] words = s.split(" "); int i = words.length - 1; String curPrefix = words[i]; @@ -156,11 +149,11 @@ public class CorporeaAutoCompleteHandler { if(i >= 0) curPrefix = words[i] + " " + curPrefix; } - return new ArrayList(result); + return new ArrayList<>(result); } private List getNamesStartingWith(String prefix) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); int length = prefix.length(); SortedSet after = itemNames.tailSet(prefix); for(String str : after) { 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 805ac287b..f412c7f90 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -21,7 +21,6 @@ import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiIngame; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -36,7 +35,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; 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 55c951968..46dcea7eb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -16,13 +16,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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 884cdf873..ebca3690c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -177,11 +177,11 @@ public class LightningHandler { public static class LightningBolt { - public ArrayList segments = new ArrayList(); + public ArrayList segments = new ArrayList<>(); public Vector3 start; public Vector3 end; BlockPos target; - HashMap splitparents = new HashMap(); + HashMap splitparents = new HashMap<>(); public double length; public int numsegments0; @@ -198,7 +198,7 @@ public class LightningHandler { private World world; private Entity source; - public static ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue(); + public static ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue<>(); public float speed = 1.5F; public static final int fadetime = 20; @@ -350,7 +350,7 @@ public class LightningHandler { return; ArrayList oldsegments = segments; - segments = new ArrayList(); + segments = new ArrayList<>(); Segment prev = null; @@ -431,7 +431,7 @@ public class LightningHandler { } private void calculateCollisionAndDiffs() { - HashMap lastactivesegment = new HashMap(); + HashMap lastactivesegment = new HashMap<>(); Collections.sort(segments, new SegmentSorter()); 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 cd1cec77f..c144b5052 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -168,165 +168,116 @@ public final class ModelHandler { ModelLoader.registerItemVariants(infiniteFruit, new ModelResourceLocation("botania:infiniteFruit", "inventory"), new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")); - ModelLoader.setCustomMeshDefinition(infiniteFruit, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemInfiniteFruit.isBoot(stack) ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") - : new ModelResourceLocation("botania:infiniteFruit", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(infiniteFruit, stack -> + ItemInfiniteFruit.isBoot(stack) + ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory") + : new ModelResourceLocation("botania:infiniteFruit", "inventory")); ModelLoader.registerItemVariants(magnetRing, new ModelResourceLocation("botania:magnetRingOn", "inventory"), new ModelResourceLocation("botania:magnetRingOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRing, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingOn", "inventory") - : new ModelResourceLocation("botania:magnetRingOff", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(magnetRing, stack -> + ItemMagnetRing.getCooldown(stack) <= 0 + ? new ModelResourceLocation("botania:magnetRingOn", "inventory") + : new ModelResourceLocation("botania:magnetRingOff", "inventory")); ModelLoader.registerItemVariants(magnetRingGreater, new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"), new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); - ModelLoader.setCustomMeshDefinition(magnetRingGreater, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") - : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(magnetRingGreater, stack -> + ItemMagnetRing.getCooldown(stack) <= 0 + ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory") + : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory")); ModelLoader.registerItemVariants(manaGun, new ModelResourceLocation("botania:manaGun", "inventory"), new ModelResourceLocation("botania:manaGunClip", "inventory"), new ModelResourceLocation("botania:desuGun", "inventory"), new ModelResourceLocation("botania:desuGunClip", "inventory")); - ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String name; - if (((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack)) { - name = ItemManaGun.hasClip(stack) ? "botania:desuGunClip" : "botania:desuGun"; - } else { - name = ItemManaGun.hasClip(stack) ? "botania:manaGunClip": "botania:manaGun"; - } - return new ModelResourceLocation(name, "inventory"); - } + ModelLoader.setCustomMeshDefinition(manaGun, stack -> { + String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun"; + return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory"); }); ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod", "inventory"), new ModelResourceLocation("botania:tornadoRod_flying", "inventory")); - ModelLoader.setCustomMeshDefinition(tornadoRod, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(tornadoRod, stack -> + ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) + ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") + : new ModelResourceLocation("botania:tornadoRod", "inventory")); ModelLoader.registerItemVariants(twigWand, new ModelResourceLocation("botania:twigWand", "inventory"), new ModelResourceLocation("botania:twigWand_bind", "inventory")); - ModelLoader.setCustomMeshDefinition(twigWand, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String path = "botania:twigWand"; - return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); - } + ModelLoader.setCustomMeshDefinition(twigWand, stack -> { + String path = "botania:twigWand"; + return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory"); }); ModelLoader.registerItemVariants(manaweaveBoots, new ModelResourceLocation("botania:manaweaveBoots", "inventory"), new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveBoots, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveBoots", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveBoots, stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveBoots", "inventory")); ModelLoader.registerItemVariants(manaweaveChest, new ModelResourceLocation("botania:manaweaveChest", "inventory"), new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveChest, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveChest", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveChest, stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveChest", "inventory")); ModelLoader.registerItemVariants(manaweaveHelm, new ModelResourceLocation("botania:manaweaveHelm", "inventory"), new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveHelm, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveHelm", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveHelm, stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveHelm", "inventory")); ModelLoader.registerItemVariants(manaweaveLegs, new ModelResourceLocation("botania:manaweaveLegs", "inventory"), new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); - ModelLoader.setCustomMeshDefinition(manaweaveLegs, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") - : new ModelResourceLocation("botania:manaweaveLegs", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manaweaveLegs, stack -> + ClientProxy.jingleTheBells + ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveLegs", "inventory")); ModelLoader.registerItemVariants(manasteelSword, new ModelResourceLocation("botania:manasteelSword", "inventory"), new ModelResourceLocation("botania:elucidator", "inventory")); - ModelLoader.setCustomMeshDefinition(manasteelSword, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? new ModelResourceLocation("botania:elucidator", "inventory") - : new ModelResourceLocation("botania:manasteelSword", "inventory"); - } - }); + ModelLoader.setCustomMeshDefinition(manasteelSword, stack -> + "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) + ? new ModelResourceLocation("botania:elucidator", "inventory") + : new ModelResourceLocation("botania:manasteelSword", "inventory")); ModelLoader.registerItemVariants(spawnerMover, new ModelResourceLocation("botania:spawnerMover", "inventory"), new ModelResourceLocation("botania:spawnerMoverFull", "inventory")); - ModelLoader.setCustomMeshDefinition(spawnerMover, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - if (ItemSpawnerMover.hasData(stack)) { - return new ModelResourceLocation("botania:spawnerMoverFull", "inventory"); - } else { - return new ModelResourceLocation("botania:spawnerMover", "inventory"); - } - } - }); + ModelLoader.setCustomMeshDefinition(spawnerMover, stack -> new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory")); ModelLoader.registerItemVariants(terraPick, new ModelResourceLocation("botania:terraPick", "inventory"), new ModelResourceLocation("botania:terraPickEnabled", "inventory"), new ModelResourceLocation("botania:terraPickTipped", "inventory"), new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory")); - ModelLoader.setCustomMeshDefinition(terraPick, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - String name = "botania:terraPick"; - if (ItemTerraPick.isTipped(stack)) { - name += "Tipped"; - } - if (ItemTerraPick.isEnabled(stack)) { - name += "Enabled"; - } - return new ModelResourceLocation(name, "inventory"); + ModelLoader.setCustomMeshDefinition(terraPick, stack -> { + String name = "botania:terraPick"; + if (ItemTerraPick.isTipped(stack)) { + name += "Tipped"; } + if (ItemTerraPick.isEnabled(stack)) { + name += "Enabled"; + } + return new ModelResourceLocation(name, "inventory"); }); } @@ -692,24 +643,18 @@ public final class ModelHandler { ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewFlask, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); - return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); - } + ModelLoader.setCustomMeshDefinition(brewFlask, stack -> { + int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack); + return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory"); }); for (int i = 0; i < 4; i++) { ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory")); } - ModelLoader.setCustomMeshDefinition(brewVial, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); - return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); - } + ModelLoader.setCustomMeshDefinition(brewVial, stack -> { + int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack); + return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory"); }); } 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 a854031a5..6a8e28e17 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.core.handler; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; 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 28923adcb..b4384a73d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -10,17 +10,14 @@ */ package vazkii.botania.client.core.handler; -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.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; @@ -37,7 +34,6 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibObfuscation; 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 081742fa2..90d136073 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -21,7 +21,6 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; 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 6b7424553..5ca7e279d 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.settings.KeyBinding; import net.minecraft.item.ItemStack; 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 16ac0a542..6b844e51b 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -72,6 +72,7 @@ import vazkii.botania.client.render.entity.RenderManaStorm; import vazkii.botania.client.render.entity.RenderPinkWither; 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.entity.RenderThornChakram; import vazkii.botania.client.render.tile.RenderTileAlfPortal; @@ -255,17 +256,18 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride()); - RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); - RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); - RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); - RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, new RenderBabylonWeapon(Minecraft.getMinecraft().getRenderManager())); + RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new); + RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new); + RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new); + RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, RenderThornChakram::new); + RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, RenderCorporeaSpark::new); + RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, RenderPoolMinecart::new); + RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, RenderPinkWither::new); + RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new); + RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new); + + RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball(renderManager, ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); + RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack(renderManager, new ItemStack(ModItems.manaResource, 1, 15), Minecraft.getMinecraft().getRenderItem())); ShaderHelper.initShaders(); diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 064b568ce..89b68a463 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -20,7 +20,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java index 7fbc8ef3e..587e5ac1c 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java +++ b/src/main/java/vazkii/botania/client/gui/GuiAchievementsHacky.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatFileWriter; 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 b6efd239b..3e8fc66b5 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; @@ -23,8 +22,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; 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 642b1bca1..d875c5f3d 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -17,8 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.lib.LibResources; public class GuiBaubleBox extends InventoryEffectRenderer { diff --git a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java index 87f867476..693d65910 100644 --- a/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java +++ b/src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java @@ -17,8 +17,6 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - // This is pretty much a copypasta of GuiCrafting >_> public class GuiCraftingHalo extends GuiContainer { 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 6adb773c2..5c51c4d5e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java @@ -13,14 +13,10 @@ package vazkii.botania.client.gui.lexicon; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.challenge.Challenge; import vazkii.botania.client.challenge.ModChallenges; import vazkii.botania.client.core.handler.ClientTickHandler; 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 d456eab8b..76bfc90ed 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -19,7 +19,6 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -27,8 +26,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; 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 d08029cfa..91ef081f1 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 @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 ec22e8424..5e282a6f1 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 @@ -17,8 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 4031f8f03..e0b94b4f7 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 @@ -16,13 +16,9 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.challenge.Challenge; public class GuiButtonChallengeIcon extends GuiButtonLexicon { 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 fa7797212..b90c97758 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 @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 786d27b60..984f1e175 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 @@ -15,14 +15,11 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.item.ModItems; 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 5d0766590..de39d3a0d 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 @@ -13,13 +13,11 @@ package vazkii.botania.client.gui.lexicon.button; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.PersistentVariableHelper; 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 bb3e50bbf..4a56f238a 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 @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 d6141d21a..aa1f822d6 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 @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 74f725f0c..866c8de3b 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 @@ -16,8 +16,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 3fba77c56..712e0c0c1 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 @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 3c3881484..320a19ddc 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 @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -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.RenderHelper; 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 2fc32fcdf..7bfa637d2 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 @@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.gui.lexicon.GuiLexicon; 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 d9bb0464e..8bfbd619b 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 @@ -15,7 +15,6 @@ 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.block.ModBlocks; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; 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 1525d35cc..61e54d303 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 @@ -20,8 +20,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.awt.*; 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 84012a2c2..e38084158 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 @@ -10,7 +10,6 @@ package vazkii.botania.client.integration.jei.puredaisy; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; -import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 09541e561..d33a0a922 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -12,7 +12,6 @@ import com.google.common.base.Function; import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import com.google.common.collect.Table; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -36,7 +35,6 @@ 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.property.IExtendedBlockState; -import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.BlockFloatingFlower; @@ -47,7 +45,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import javax.vecmath.Vector3f; import javax.vecmath.Vector4f; import java.util.List; -import java.util.Map; +import java.util.stream.Collectors; public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener { @@ -164,9 +162,7 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I } for (EnumFacing e : EnumFacing.VALUES) { - genBuilder.addAll(Iterables.transform(flower.getFaceQuads(e), new Function() { - @Override public BakedQuad apply(BakedQuad input) { return transform(input, transform); } - })); + genBuilder.addAll(flower.getFaceQuads(e).stream().map(input -> transform(input, transform)).collect(Collectors.toList())); } // Add island quads diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 764b8b28b..15976ddc6 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.opengl.GL11; public class ModelBellows extends ModelBase { diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index fadb4b32d..c32f11f6f 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; -import org.lwjgl.opengl.GL11; import vazkii.botania.client.render.tile.RenderTileBrewery; diff --git a/src/main/java/vazkii/botania/client/model/ModelPump.java b/src/main/java/vazkii/botania/client/model/ModelPump.java index e869a3d5e..3f5e9dd97 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPump.java +++ b/src/main/java/vazkii/botania/client/model/ModelPump.java @@ -17,10 +17,10 @@ import net.minecraft.client.model.ModelRenderer; public class ModelPump extends ModelBase{ - private ArrayList parts = new ArrayList(); + private ArrayList parts = new ArrayList<>(); - private ArrayList innerRing = new ArrayList(); - private ArrayList outerRing = new ArrayList(); + private ArrayList innerRing = new ArrayList<>(); + private ArrayList outerRing = new ArrayList<>(); public ModelPump() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 503de6719..f90fcb282 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -14,7 +14,6 @@ import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -22,7 +21,6 @@ import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.crash.CrashReport; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; @@ -52,12 +50,7 @@ public class ModelPylon implements IPylonModel { private IFlexibleBakedModel gaiaRingsAndPanes; private IFlexibleBakedModel gaiaGems; - private static final Function TEXTUREGETTER = new Function() { - @Override - public TextureAtlasSprite apply(ResourceLocation input) { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - } - }; + private static final Function TEXTUREGETTER = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); private static final Set GROUP_NAMES = ImmutableSet.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java index 3988f6061..bb9f45634 100644 --- a/src/main/java/vazkii/botania/client/model/PylonItemModel.java +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -31,7 +31,6 @@ import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import org.apache.http.annotation.Immutable; import org.apache.logging.log4j.Level; import javax.vecmath.Matrix4f; @@ -83,12 +82,7 @@ public class PylonItemModel implements ISmartItemModel { // All groups are off by default // OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group - final Function textureGetter = new Function() { - @Override - public TextureAtlasSprite apply(ResourceLocation input) { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); - } - }; + final Function textureGetter = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); ImmutableList standardGroups = ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", 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 fae42a6fe..b7ad3f037 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -10,13 +10,10 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.client.Minecraft; -import net.minecraft.client.model.ModelBiped; 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.entity.Entity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; 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 460c0ae3f..bb781be4f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -13,12 +13,8 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; 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 59e6f678c..3b576dfc5 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java @@ -12,7 +12,6 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderWither; -import net.minecraft.entity.Entity; import net.minecraft.entity.boss.BossStatus; import net.minecraft.entity.boss.EntityWither; import net.minecraft.util.ResourceLocation; 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 216fe9ff9..728d4ec8f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -10,12 +10,10 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; +import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; @@ -43,8 +41,8 @@ public class RenderPixie extends RenderLiving { } }; - public RenderPixie() { - super(Minecraft.getMinecraft().getRenderManager(), new ModelPixie(), 0.25F); + public RenderPixie(RenderManager renderManager) { + super(renderManager, new ModelPixie(), 0.25F); //setRenderPassModel(new ModelPixie()); shadowSize = 0.0F; } 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 7b9d2df98..4fdeb8eb6 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -10,11 +10,9 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; -import net.minecraft.entity.item.EntityMinecart; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.entity.EntityPoolMinecart; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java new file mode 100644 index 000000000..d3a69cbd0 --- /dev/null +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -0,0 +1,32 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.client.render.entity; + +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; + +// Same as RenderSnowball, but ItemStack sensitive +public class RenderSnowballStack extends RenderSnowball { + + private final ItemStack stack; + + public RenderSnowballStack(RenderManager renderManagerIn, ItemStack stack, RenderItem render) { + super(renderManagerIn, stack.getItem(), render); + this.stack = stack; + } + + @Override + public ItemStack func_177082_d(T entity) { + return stack; + } + +} diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java index 918ff8232..285db6cfe 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -17,14 +17,11 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.common.entity.EntityThornChakram; -import vazkii.botania.common.item.ModItems; // Basically a bit of an extension of RenderSnowball public class RenderThornChakram extends Render { 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 b39413a24..e1f3b80e6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -10,28 +10,20 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.RenderItem; 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.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; 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 9250f4b7d..ba84c4033 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -10,22 +10,16 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.client.core.handler.ClientTickHandler; 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 0e2b85cfb..5df13f445 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -13,12 +13,8 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.tile.mana.TileBellows; 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 8c04d7076..f9d47bee4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -10,25 +10,13 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.ForgeHooksClient; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; 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 0ef53fb41..0ee6aafc0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -13,11 +13,9 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCocoon; 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 73eeb4d10..d5c18e13b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -13,18 +13,15 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; 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 b89703d8e..00612b80d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java @@ -14,11 +14,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelEnderCrystal; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; 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 6cc751810..c3d4e41f5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -16,24 +16,15 @@ 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.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.resources.model.IBakedModel; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockPos; -import net.minecraftforge.client.model.ISmartBlockModel; -import org.lwjgl.opengl.GL11; - import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.ModelMiniIsland; import vazkii.botania.common.block.decor.IFloatingFlower; -import vazkii.botania.common.block.tile.TileFloatingFlower; public class RenderTileFloatingFlower extends TileEntitySpecialRenderer { 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 b1af2c419..ef39061b1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -16,7 +16,6 @@ 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.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; 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 f05612bc5..28dc78357 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -10,22 +10,16 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibResources; 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 99b2065d8..fc213c7a4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -16,9 +16,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index b57406bab..ae77944ba 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -13,12 +13,8 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPump; import vazkii.botania.common.block.tile.mana.TilePump; 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 013715e87..68e2077a6 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -17,13 +17,9 @@ 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.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PylonVariant; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 1e46a1ade..6ea9a7c57 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -11,7 +11,6 @@ package vazkii.botania.client.render.tile; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import vazkii.botania.client.core.handler.RedStringRenderer; import vazkii.botania.common.block.tile.string.TileRedString; 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 485122928..3bce25066 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -10,23 +10,12 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - -import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.client.ForgeHooksClient; - -import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index d3c0e74e5..30cb9f1a0 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -13,18 +13,13 @@ package vazkii.botania.client.render.tile; import java.util.Map; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; import net.minecraft.client.resources.DefaultPlayerSkin; -import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.model.ModelSkullOverride; import vazkii.botania.client.render.entity.RenderDoppleganger; 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 a6a9dadb1..489326aff 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -10,19 +10,12 @@ */ package vazkii.botania.client.render.tile; -import java.awt.Color; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileSparkChanger; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java index 32032b735..cedc6db5a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java @@ -16,9 +16,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelSpawnerClaw; 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 f188dc490..e32dd3492 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -13,7 +13,6 @@ package vazkii.botania.client.render.tile; import java.awt.Color; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; @@ -24,12 +23,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; 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 0af40dcfb..56e7d689a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -18,11 +18,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityEndPortal; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; import vazkii.botania.common.block.tile.TileStarfield; // THIS CODE WAS STOLEN FROM THE END PORTAL 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 2e5d6cae2..037f567b5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -15,11 +15,9 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java index 5a4f009f3..82b35316b 100644 --- a/src/main/java/vazkii/botania/common/achievement/ModAchievements.java +++ b/src/main/java/vazkii/botania/common/achievement/ModAchievements.java @@ -22,7 +22,6 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibAchievementNames; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; -import net.minecraftforge.fml.common.FMLCommonHandler; public final class ModAchievements { diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 8cc87e9c4..47d93e231 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -21,15 +20,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 9e4d19e3b..0ec470fb1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -42,7 +42,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltarVariant; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index c055ba4b4..a6407eef0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -15,7 +15,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -25,18 +24,13 @@ import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lexicon.page.PageBrew; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockBifrost extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 4da8c9fd9..91b13e03b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -25,7 +25,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 5c06d34c5..2b299f91f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.block; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.block.BlockDirectional; import net.minecraft.block.material.Material; diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 062691f8d..54695cb2e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -16,7 +16,6 @@ import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 0dec520f9..1629ff832 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -19,8 +19,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -33,15 +31,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -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; @@ -51,7 +43,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.decor.IFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index 690b6efe7..6cdce7f1b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -18,7 +18,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 1243623d4..32021cc9d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -17,7 +17,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -27,7 +26,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileGaiaHead; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -54,7 +52,7 @@ public class BlockGaiaHead extends BlockSkull { @Override public List getDrops(IBlockAccess p_149749_1_, BlockPos pos, IBlockState state, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); if(!state.getValue(NODROP)) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 6bd622ad1..763bace3b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockRailBase; import net.minecraft.block.BlockRailPowered; import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -27,15 +26,12 @@ import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; 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 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; public class BlockGhostRail extends BlockRailBase implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index c46586e1c..d352295d8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index f1ef4a45e..0aab68bd4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -26,7 +26,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index d45842da2..8e3f5bddc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -17,7 +17,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -28,18 +27,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -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.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileLightRelay; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index 791ed8850..6a95f77f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -13,13 +13,10 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockElven; import vazkii.botania.common.item.block.ItemBlockMod; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockMod extends Block { diff --git a/src/main/java/vazkii/botania/common/block/BlockModContainer.java b/src/main/java/vazkii/botania/common/block/BlockModContainer.java index 5480eb915..dfb4905b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModContainer.java +++ b/src/main/java/vazkii/botania/common/block/BlockModContainer.java @@ -15,12 +15,9 @@ import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModContainer extends BlockContainer { diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 3ce73dbac..a3d12724b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,19 +10,13 @@ */ package vazkii.botania.common.block; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import net.minecraft.block.Block; -import net.minecraft.block.BlockBush; import net.minecraft.block.BlockDoublePlant; -import net.minecraft.block.IGrowable; -import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -35,12 +29,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; 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; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; @@ -119,7 +111,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I if (this.canSilkHarvest(worldIn, pos, worldIn.getBlockState(pos), player) && EnchantmentHelper.getSilkTouchModifier(player)) { - java.util.ArrayList items = new java.util.ArrayList(); + java.util.ArrayList items = new java.util.ArrayList<>(); ItemStack itemstack = this.createStackedBlock(state); if (itemstack != null) @@ -179,7 +171,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public List onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); IBlockState state = world.getBlockState(pos); IBlockState stateBelow = world.getBlockState(pos.down()); diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index c31dde952..586cc9d5b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -31,7 +31,6 @@ import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 8bf6e2463..e67dce5b8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -24,7 +24,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -35,9 +34,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -45,7 +41,6 @@ import vazkii.botania.api.state.enums.CratePattern; import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileOpenCrate; import vazkii.botania.common.block.tile.TileSimpleInventory; diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index bbb07afc5..1cc24a757 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -42,7 +42,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 8b94277e8..4d6a03d90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -34,10 +34,8 @@ import net.minecraftforge.common.property.IUnlistedProperty; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.CrateVariant; import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCamo; import vazkii.botania.common.block.tile.TilePlatform; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 2daf501b8..04195a659 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -18,7 +18,6 @@ import net.minecraft.block.state.BlockState; 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; @@ -28,9 +27,7 @@ import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PlatformVariant; import vazkii.botania.api.state.enums.PylonVariant; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index bf678aa51..e9d533f93 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -25,7 +25,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.item.block.ItemBlockMod; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index c188a83b3..8b1b84a90 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -28,7 +28,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.TileSparkChanger; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index d47743fd4..978585d00 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -27,13 +27,10 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.block.ItemBlockStorage; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockStorage extends BlockMod implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 2a27dbb61..8be2ffa55 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -83,8 +83,6 @@ import vazkii.botania.common.block.decor.walls.living.BlockLivingwoodWall; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibBlockNames; -import java.util.Arrays; -import java.util.Collection; import java.util.Locale; import java.util.Set; 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 6cdce12ab..87c1b383d 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -16,13 +16,11 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MathHelper; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -30,7 +28,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; 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 dd0884a7f..253723730 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -21,7 +21,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaFunnel; import vazkii.botania.common.lexicon.LexiconData; 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 e0a1e8b01..ddbc4eedd 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.StorageVariant; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; 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 3848b56ad..4bbe34cff 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -24,7 +24,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.corporea.TileCorporeaBase; import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java index c6c762697..709f7c23a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.FutureStoneVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; 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 8ab9f26e1..9df2c365b 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -12,16 +12,13 @@ package vazkii.botania.common.block.decor; import java.util.Random; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; 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 4d89c6956..9a7cf973f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.CustomBrickVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java index 0d7b73aee..0357122d8 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -27,7 +27,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.EndBrickVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; 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 df74ecbc3..bd6f28a9f 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -18,15 +18,10 @@ import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.particle.EntityDiggingFX; -import net.minecraft.client.resources.FallbackResourceManager; -import net.minecraft.client.resources.IReloadableResourceManager; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -37,12 +32,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -50,8 +42,6 @@ import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java index 361dadb44..02a248ad1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.awt.Color; import java.util.List; import net.minecraft.block.Block; @@ -18,7 +17,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -30,11 +28,9 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileManaBeacon; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; 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 22969c520..076fee7ff 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -19,7 +19,6 @@ import net.minecraft.block.BlockMushroom; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; @@ -34,7 +33,6 @@ import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.core.handler.ConfigHandler; @@ -44,8 +42,6 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; 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; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable { 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 d254c16bc..f700cf333 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -25,13 +25,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockPavement extends BlockMod { 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 b05e3fc21..61c890d2a 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor; -import java.awt.Color; import java.util.List; import net.minecraft.block.Block; @@ -18,7 +17,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -31,7 +29,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; 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 402ccaa6c..59effbf09 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java @@ -10,10 +10,8 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.world.IBlockAccess; @@ -22,8 +20,6 @@ import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.PrismarineVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModFlower; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; 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 16ce01c95..50b6c6443 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -22,7 +22,6 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.lexicon.LexiconData; 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 61537ab19..6d6e7c944 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -19,13 +19,11 @@ import net.minecraft.block.state.BlockState; 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.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -34,9 +32,7 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PotatoVariant; -import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileTinyPotato; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java index dce351107..50ada96da 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -19,7 +19,6 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -34,7 +33,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor; -import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import net.minecraftforge.fml.common.registry.GameRegistry; 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 1bda5d990..385f8234e 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 @@ -24,7 +24,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; 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 305ec2776..3fa1779ee 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 @@ -14,7 +14,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.BiomeBrickVariant; -import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.common.lib.LibBlockNames; public class BlockBiomeStoneB extends BlockBiomeStone { 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 0d7d13d65..6378311a0 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 @@ -16,13 +16,10 @@ import net.minecraft.block.material.Material; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockMod; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockModPane extends BlockPane { 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 89607cb79..783bd30da 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 @@ -28,7 +28,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.QuartzVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.item.block.ItemBlockSpecialQuartz; 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 65d6f8afb..bd2e90848 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 @@ -15,7 +15,6 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -27,8 +26,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class BlockSpecialQuartzSlab extends BlockModSlab { diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java index 0b5c5ce15..4579fc93e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockBiomeStoneSlab.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.decor.slabs; -import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java index 5a0a65de1..d2b6f0ec1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java @@ -1,9 +1,6 @@ package vazkii.botania.common.block.decor.slabs; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockLivingSlab extends BlockModSlab { 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 460c1dc94..de6383171 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 @@ -21,8 +21,6 @@ import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.block.ItemBlockModSlab; import vazkii.botania.common.lexicon.LexiconData; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockModSlab extends BlockSlab implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java index 4c03846fc..5850709e2 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java @@ -1,6 +1,5 @@ package vazkii.botania.common.block.decor.stairs; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; public class BlockLivingStairs extends BlockModStairs { diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index f6e98269e..c0507111d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; 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 e6ae28e1b..92264bf97 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 @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.api.lexicon.LexiconEntry; 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 4fff32f19..e8415b455 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.dispenser; -import net.minecraft.block.Block; import net.minecraft.block.BlockDispenser; import net.minecraft.block.BlockRailBase; import net.minecraft.block.material.Material; 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 d6d5e1a0c..d64658100 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -19,14 +19,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.MathHelper; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileBellows; import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lexicon.LexiconData; 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 744d01f9a..2be8db81a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -19,7 +19,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -37,8 +36,6 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -import javax.swing.text.html.ObjectView; - public class BlockBrewery extends BlockModContainer implements ILexiconable, IWandHUD { Random random; 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 cf1bb11ad..7358f227d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -18,9 +18,7 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; 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 f33be0a81..4b69efb76 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -13,12 +13,10 @@ package vazkii.botania.common.block.mana; import java.util.Random; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.PropertyDirection; import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -31,17 +29,11 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -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.api.state.BotaniaStateProps; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.item.ModItems; 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 4bb8e57a1..fca4ea170 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -37,7 +37,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.DrumVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockMod; import vazkii.botania.common.item.ItemGrassHorn; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; 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 7519453f6..fa21162ca 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -29,7 +29,6 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; 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 a82ebae64..0a7650683 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -19,7 +19,6 @@ import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -34,11 +33,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; @@ -47,13 +41,9 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.achievement.ICraftAchievement; -import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; 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 deef965ba..bfbe9a649 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -34,7 +34,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.block.tile.mana.TilePrism; 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 da966197d..e4548f1a3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -26,7 +26,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; 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 3dac4408f..a71649683 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -14,8 +14,6 @@ import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -28,7 +26,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSimpleInventory; 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 1e77e0a0b..8325eacce 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -23,7 +23,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.lexicon.LexiconData; 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 f5dc4ba1d..8f4c6bbd1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -41,9 +41,7 @@ import vazkii.botania.api.state.enums.SpreaderVariant; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; -import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.BlockModContainer; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; 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 cc36f1387..7cc4acca2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -21,16 +20,10 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.item.ModItems; 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 cd6eb5501..8b0d46fa1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -23,7 +23,6 @@ import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.lexicon.LexiconData; 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 0394f774d..0a3e75cc1 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -22,13 +22,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.string.TileRedString; import vazkii.botania.common.lexicon.LexiconData; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class BlockRedString extends BlockModContainer implements ILexiconable { diff --git a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java index 8cf7d5c41..b0ac7b20d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java +++ b/src/main/java/vazkii/botania/common/block/subtile/SubTilePureDaisy.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; 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 fcd2a5f16..b47cde68d 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 @@ -84,14 +84,7 @@ public class SubTileBellethorn extends SubTileFunctional { } public Predicate getSelector() { - return new Predicate() { - - @Override - public boolean apply(Entity entity) { - return !(entity instanceof EntityPlayer); - } - - }; + return entity -> !(entity instanceof EntityPlayer); } @Override 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 4352c2ea2..22b5aca94 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 @@ -25,14 +25,7 @@ public class SubTileDreadthorn extends SubTileBellethorn { @Override public Predicate getSelector() { - return new Predicate() { - - @Override - public boolean apply(Entity var1) { - return var1 instanceof EntityAnimal && ((EntityAnimal) var1).getGrowingAge() == 0; - } - - }; + return var1 -> var1 instanceof EntityAnimal && ((EntityAnimal) var1).getGrowingAge() == 0; } @Override 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 a632c6e7f..6f9167c8e 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 @@ -36,7 +36,6 @@ import net.minecraft.util.StatCollector; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; -import scala.reflect.internal.util.WeakHashSet; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; 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 7270a9786..b0039c991 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 @@ -19,7 +19,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.*; -import net.minecraft.util.BlockPos; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java index 16b7696e1..48cc7fce7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDaybloom.java @@ -10,14 +10,11 @@ */ package vazkii.botania.common.block.subtile.generating; -import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.EnumFacing; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.signature.PassiveFlower; import vazkii.botania.common.lexicon.LexiconData; 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 5aed0fe56..f6fb2a8cb 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 @@ -23,7 +23,6 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibObfuscation; 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 11895e3a9..e002877df 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 @@ -16,7 +16,6 @@ import net.minecraft.entity.item.EntityTNTPrimed; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.MathHelper; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; @@ -65,7 +64,7 @@ public class SubTileEntropinnyum extends SubTileGenerating { @Override public RadiusDescriptor getRadius() { return new RadiusDescriptor.Square(toBlockPos(), RANGE); - }; + } @Override public LexiconEntry getEntry() { 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 f4f288e52..f9e249781 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 @@ -21,7 +21,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; 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 0847f5b80..c97a5e405 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 @@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; 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 9d74ac818..13be55318 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -84,26 +84,11 @@ public class TileAlfPortal extends TileMod implements ITickable { private boolean closeNow = false; private boolean hasUnloadedParts = false; - private static final Function CONVERTER_X_Z = new Function() { - @Override - public BlockPos apply(BlockPos input) { - return new BlockPos(input.getZ(), input.getY(), input.getX()); - } - }; + private static final Function CONVERTER_X_Z = input -> new BlockPos(input.getZ(), input.getY(), input.getX()); - private static final Function CONVERTER_X_Z_FP = new Function() { - @Override - public double[] apply(double[] input) { - return new double[] { input[2], input[1], input[0] }; - } - }; + private static final Function CONVERTER_X_Z_FP = input -> new double[] { input[2], input[1], input[0] }; - private static final Function CONVERTER_Z_SWAP = new Function() { - @Override - public BlockPos apply(BlockPos input) { - return new BlockPos(input.getX(), input.getY(), -input.getZ()); - } - }; + private static final Function CONVERTER_Z_SWAP = input -> new BlockPos(input.getX(), input.getY(), -input.getZ()); public static MultiblockSet makeMultiblockSet() { Multiblock mb = new Multiblock(); 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 3e66dfe66..0468b5c3e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -17,7 +17,6 @@ import java.util.regex.Pattern; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; 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 7af25e51d..12f061455 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile; import java.awt.Color; import java.util.List; -import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.item.EntityItem; @@ -21,11 +20,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.BlockPos; import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; 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 c3600b9b1..b5d0f35af 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -23,7 +23,6 @@ import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ITickable; -import net.minecraftforge.fml.common.registry.VillagerRegistry; public class TileCocoon extends TileMod implements ITickable { 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 cd348ad3f..4d9b63b5b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.Map; import com.google.common.base.Predicates; -import com.google.common.collect.Maps; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -80,7 +79,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl new BlockPos(-2, -1, 0), new BlockPos(-2, -1, 1), new BlockPos(-2, -1, -1) }; - private static final Map PYLON_LOCATIONS = new EnumMap(EnumFacing.Axis.class); + private static final Map PYLON_LOCATIONS = new EnumMap<>(EnumFacing.Axis.class); static { PYLON_LOCATIONS.put(EnumFacing.Axis.X, new BlockPos[] { new BlockPos(-5, 1, 0), new BlockPos(5, 1, 0), new BlockPos(-4, 1, 3), new BlockPos(4, 1, 3), new BlockPos(-4, 1, -3 ), new BlockPos(4, 1, -3) }); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 25adb17d8..b83d649f5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -14,7 +14,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,9 +22,6 @@ import net.minecraft.util.ITickable; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.lib.LibBlockNames; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java index 41c28d03e..5ac481572 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -10,8 +10,6 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.entity.passive.EntitySheep; -import net.minecraft.item.EnumDyeColor; import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; 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 e431c1a01..3a02bfacd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -13,8 +13,6 @@ package vazkii.botania.common.block.tile; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.entity.passive.EntitySheep; -import net.minecraft.item.EnumDyeColor; import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; 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 5c25b6c26..cb18e5605 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; 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 26e66a514..9ba37e846 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.sql.Ref; import java.util.List; import net.minecraft.entity.Entity; @@ -115,9 +114,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable if (flag) resetTimer(logic); } - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { + } catch (IllegalAccessException | InvocationTargetException e) { e.printStackTrace(); } } 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 bf25397fe..dd1e63285 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.BlockDirt; 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 97a850de3..2be51938e 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,7 +19,6 @@ import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.subtile.functional.SubTileExoflame; import vazkii.botania.common.block.tile.TileMod; 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 79f863dd9..8b5999da9 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 @@ -19,7 +19,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; 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 d75fdfea6..675407b14 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 @@ -112,7 +112,7 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo if(tile instanceof IEnergyReceiver && ((IEnergyReceiver)tile).canConnectEnergy(side)) { if(receiverCache == null) - receiverCache = new EnumMap(EnumFacing.class); + receiverCache = new EnumMap<>(EnumFacing.class); receiverCache.put(side, (IEnergyReceiver)tile); } } 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 6a7e9ec9f..781124006 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 @@ -19,17 +19,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; 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 f13369a65..41bea1849 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityFishHook; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index 950576e3a..b30680ddd 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -18,7 +18,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.brew.ModPotions; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; 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 35c4bbfa6..efbe3a091 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; public class PotionClear extends PotionMod { diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 310370dc5..3614d8c7a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.Event.Result; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; 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 594b2ba84..11eb1e2d0 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -13,7 +13,6 @@ package vazkii.botania.common.brew.potion; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index de36f5a22..8706bf491 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; 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 b1e6c4bbd..cd4120160 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -406,7 +406,7 @@ public final class ConfigHandler { if(!enabled) return; - AdaptableValue adapt = new AdaptableValue(version, val); + AdaptableValue adapt = new AdaptableValue<>(version, val); if(!adaptableValues.containsKey(key)) { ArrayList list = new ArrayList(); adaptableValues.put(key, list); 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 5cf46f4b6..ad7e47b87 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -12,10 +12,8 @@ import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage; public final class IMCHandler { public static void processMessages(ImmutableList messageList) { - Iterator iterator = messageList.iterator(); - while(iterator.hasNext()) { - IMCMessage message = iterator.next(); - if(message != null && message.key != null && message.key.equals(LibMisc.BLACKLIST_ITEM) && message.isStringMessage()) { + for (IMCMessage message : messageList) { + if (message != null && message.key != null && message.key.equals(LibMisc.BLACKLIST_ITEM) && message.isStringMessage()) { String value = message.getStringValue(); ItemMagnetRing.addItemToBlackList(value); } 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 4dd76a3a0..1d3a491ef 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -37,8 +37,8 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { - public static ArrayList patterns = new ArrayList(); - public static ArrayList defaultPatterns = new ArrayList(); + public static ArrayList patterns = new ArrayList<>(); + public static ArrayList defaultPatterns = new ArrayList<>(); @SubscribeEvent public void onLivingUpdate(LivingUpdateEvent event) { @@ -86,7 +86,7 @@ public final class SheddingHandler { defaultPatterns.add(new ShedPattern(EntitySkeleton.class, new ItemStack(Items.bone), 36000, 40)); defaultPatterns.add(new ShedPattern(EntitySlime.class, new ItemStack(Items.slime_ball), 21000, 40)); - ArrayList defaultNames = new ArrayList(); + ArrayList defaultNames = new ArrayList<>(); for(ShedPattern pattern : defaultPatterns) { loadFromConfig(config, pattern.getEntityString(), pattern); diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 1983fdd86..cb5821ac6 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -100,7 +100,7 @@ public class InventoryHelper { attemptSlots[a] = a; } if(intoSlot > -1) { - Set x = new HashSet(); + Set x = new HashSet<>(); for(int attemptedSlot : attemptSlots) x.add(attemptedSlot); diff --git a/src/main/java/vazkii/botania/common/core/helper/Quat.java b/src/main/java/vazkii/botania/common/core/helper/Quat.java index c3268e470..7ae3c753c 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Quat.java +++ b/src/main/java/vazkii/botania/common/core/helper/Quat.java @@ -108,8 +108,8 @@ public class Quat { public String toString() { StringBuilder stringbuilder = new StringBuilder(); Formatter formatter = new Formatter(stringbuilder, Locale.US); - formatter.format("Quaternion:\n", new Object[0]); - formatter.format(" < %f %f %f %f >\n", Double.valueOf(s), Double.valueOf(x), Double.valueOf(y), Double.valueOf(z)); + formatter.format("Quaternion:\n"); + formatter.format(" < %f %f %f %f >\n", s, x, y, z); formatter.close(); return stringbuilder.toString(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 719cc4b37..8dc9e8146 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -22,7 +22,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityCreature; @@ -51,8 +50,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import org.lwjgl.opengl.ARBShaderObjects; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.boss.IBotaniaBossWithShader; import vazkii.botania.api.internal.ShaderCallback; @@ -935,7 +932,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi @Override public boolean matches(World world, BlockPos pos) { return world.getBlockState(pos).getBlock().isBeaconBase(world, pos, pos.add(new BlockPos(-relPos.getX(), -relPos.getY(), -relPos.getZ()))); - }; + } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 7dbc0649b..6ca86b952 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -29,7 +29,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index b608564cd..f82c867d0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -11,7 +11,6 @@ package vazkii.botania.common.entity; import net.minecraft.entity.Entity; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index c417584d6..a5e3e53b0 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -5,7 +5,6 @@ import java.util.Collection; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.mana.IManaBlock; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.block.tile.TileRuneAltar; @@ -39,14 +38,14 @@ public class StatementAPIPlugin implements ITriggerProvider { @Override public Collection getInternalTriggers(IStatementContainer container) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(triggerManaDetector); return list; } @Override public Collection getExternalTriggers(EnumFacing side, TileEntity tile) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (tile instanceof IManaBlock) { list.add(triggerManaEmpty); diff --git a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java index 43b13df5d..6fda3e7fc 100644 --- a/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java +++ b/src/main/java/vazkii/botania/common/integration/coloredlights/ColoredLightHelper.java @@ -63,7 +63,7 @@ public class ColoredLightHelper { } private static void initPackedColors() { - packedColors = new EnumMap(EnumDyeColor.class); + packedColors = new EnumMap<>(EnumDyeColor.class); for(EnumDyeColor color : EnumDyeColor.values()) { packedColors.put(color, new int[16]); for(int j = 0; j < 16; j++) diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 6ba258099..3917aa036 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.item; -import java.awt.Color; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 89c7cc624..de7c4e33c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.crafting.recipe.AncientWillRecipe; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 765f8bff2..925627a2a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -15,13 +15,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemBaubleBox extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 48369d8e7..0cafad050 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -30,7 +30,6 @@ 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.helper.IconHelper; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.BlackHoleTalismanExtractRecipe; diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index fb518cdb4..3f2fd30b2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -27,7 +27,6 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.util.*; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 9eaf26dfc..f9e8cf8b7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -22,13 +21,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.corporea.CorporeaHelper; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.entity.EntityCorporeaSpark; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index b1803fcdb..a8c95b7d2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -20,7 +20,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 6d966b1c5..b07b68f38 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -10,18 +10,13 @@ */ package vazkii.botania.common.item; -import java.awt.Color; - -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -44,7 +39,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.gui.crafting.InventoryCraftingHalo; diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 389b7d65f..9c37bef29 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -10,15 +10,12 @@ */ package vazkii.botania.common.item; -import com.mojang.authlib.GameProfile; import net.minecraft.block.Block; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTUtil; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.BlockPos; @@ -28,8 +25,6 @@ import net.minecraft.world.World; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibItemNames; -import java.util.UUID; - 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 e502855ce..d47eadbaf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -31,7 +31,6 @@ import vazkii.botania.api.item.IGrassHornExcempt; import vazkii.botania.api.item.IHornHarvestable; import vazkii.botania.api.item.IHornHarvestable.EnumHornType; import vazkii.botania.api.subtile.ISpecialFlower; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index f168c0f5c..489d61434 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -30,17 +30,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemGrassSeeds extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java index 60b40037d..363dbb21d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaCookie.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaCookie.java @@ -16,14 +16,11 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaCookie extends ItemFood { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index dcbbd5bd8..82d8de850 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -32,7 +32,6 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.ManaGunClipRecipe; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index 9ba61cb97..58259b6e3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -18,14 +18,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.api.wand.ICoordBoundItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 908560de0..95e65b621 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -23,7 +23,6 @@ import net.minecraft.world.World; import vazkii.botania.api.mana.ICreativeManaProvider; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemMod.java b/src/main/java/vazkii/botania/common/item/ItemMod.java index ce7b9a5ff..0617b8b95 100644 --- a/src/main/java/vazkii/botania/common/item/ItemMod.java +++ b/src/main/java/vazkii/botania/common/item/ItemMod.java @@ -12,12 +12,9 @@ package vazkii.botania.common.item; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMod extends Item { diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index 0ee5f41d2..861dcd601 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item; -import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -18,7 +17,6 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; import vazkii.botania.common.lib.LibItemNames; public class ItemOpenBucket extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index b2d6e1267..6f7f49762 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -170,7 +170,7 @@ public class ItemSextant extends ItemMod { @Override public Map createRotations() { - Map ret = new EnumMap(EnumFacing.class); + Map ret = new EnumMap<>(EnumFacing.class); for (EnumFacing e : EnumFacing.HORIZONTALS) { ret.put(e, this); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index cda0156a9..bec50e261 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -10,13 +10,11 @@ */ package vazkii.botania.common.item; -import java.awt.Color; import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; @@ -27,7 +25,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntitySignalFlare; diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 2d102ff58..518c615ea 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -14,7 +14,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.subtile.generating.SubTileNarslimmus; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index ead1b12c1..d2ceddd06 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -19,15 +18,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.spark.ISparkAttachable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntitySpark; diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 38c400024..db69ce687 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -12,16 +12,9 @@ package vazkii.botania.common.item; import java.util.List; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; public class ItemSparkUpgrade extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 206230dc7..47f282b1f 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -25,7 +25,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 3b5b7d3c8..e7365891b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -17,7 +17,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index af05f309a..c3778b99e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -18,7 +18,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ICraftAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.entity.EntityThornChakram; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index a85eb647e..454f7fdd1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -17,7 +17,6 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; @@ -26,7 +25,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; -import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.state.BotaniaStateProps; @@ -34,7 +32,6 @@ import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.ITileBound; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockPistonRelay; diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 5fec84388..ab685bff4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -26,7 +26,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; 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 05e195ea1..ad777e43e 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -12,12 +12,10 @@ package vazkii.botania.common.item.block; import java.awt.*; import java.util.List; -import java.util.Random; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.StatCollector; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; 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 b83e6d3a1..9071aef24 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -14,8 +14,6 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.statemap.StateMapperBase; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -26,17 +24,10 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -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.signature.SubTileSignature; -import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileSpecialFlower; @@ -120,22 +111,24 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr @Override public Achievement getAchievementOnPickup(ItemStack stack, EntityPlayer player, EntityItem item) { String type = getType(stack); - if(type.equals(LibBlockNames.SUBTILE_DAYBLOOM)) - return ModAchievements.daybloomPickup; - else if(type.equals(LibBlockNames.SUBTILE_ENDOFLAME)) - return ModAchievements.endoflamePickup; - else if(type.equals(LibBlockNames.SUBTILE_KEKIMURUS)) - return ModAchievements.kekimurusPickup; - else if(type.equals(LibBlockNames.SUBTILE_HEISEI_DREAM)) - return ModAchievements.heiseiDreamPickup; - else if(type.equals(LibBlockNames.SUBTILE_POLLIDISIAC)) - return ModAchievements.pollidisiacPickup; - else if(type.equals(LibBlockNames.SUBTILE_BUBBELL)) - return ModAchievements.bubbellPickup; - else if(type.equals(LibBlockNames.SUBTILE_DANDELIFEON)) - return ModAchievements.dandelifeonPickup; - else if(type.equals("")) - return ModAchievements.nullFlower; + switch (type) { + case LibBlockNames.SUBTILE_DAYBLOOM: + return ModAchievements.daybloomPickup; + case LibBlockNames.SUBTILE_ENDOFLAME: + return ModAchievements.endoflamePickup; + case LibBlockNames.SUBTILE_KEKIMURUS: + return ModAchievements.kekimurusPickup; + case LibBlockNames.SUBTILE_HEISEI_DREAM: + return ModAchievements.heiseiDreamPickup; + case LibBlockNames.SUBTILE_POLLIDISIAC: + return ModAchievements.pollidisiacPickup; + case LibBlockNames.SUBTILE_BUBBELL: + return ModAchievements.bubbellPickup; + case LibBlockNames.SUBTILE_DANDELIFEON: + return ModAchievements.dandelifeonPickup; + case "": + return ModAchievements.nullFlower; + } return null; } 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 1e4d4e6b6..4da725da3 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -29,7 +29,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; 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 f52d70459..29f1166f8 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -26,7 +26,6 @@ import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; 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 65296ca4d..886bacd8a 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -17,7 +17,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.brew.Brew; import vazkii.botania.api.brew.IBrewContainer; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; 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 28cc5ce41..8beb0f3ea 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 @@ -30,7 +30,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorManasteel; import vazkii.botania.common.core.BotaniaCreativeTab; 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 a48a58c48..9bbe8b5eb 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 @@ -13,14 +13,12 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import java.util.List; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.armor.ModelArmorManaweave; 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 91e2298a3..7069ba26e 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 @@ -12,12 +12,7 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -30,10 +25,7 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IAncientWillContainer; -import vazkii.botania.api.item.IBaubleRender.Helper; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.ManaItemHandler; 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 048b424fa..ddc1c4c6c 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 @@ -14,8 +14,6 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +27,6 @@ import net.minecraftforge.oredict.RecipeSorter.Category; import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.ICosmeticBauble; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.crafting.recipe.CosmeticAttachRecipe; import vazkii.botania.common.crafting.recipe.CosmeticRemoveRecipe; import vazkii.botania.common.lib.LibItemNames; 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 247c44c64..85f21e032 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 @@ -15,9 +15,7 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -40,7 +38,6 @@ import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; 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 94a28e36c..bb93acc2c 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 @@ -13,11 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.List; import com.google.common.base.Predicates; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityCreeper; @@ -29,8 +24,6 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java index c8ed82fb2..864c9b99b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java @@ -10,11 +10,6 @@ */ package vazkii.botania.common.item.equipment.bauble; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -24,8 +19,6 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDeathEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; 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 b88b0a717..26cf6074b 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 @@ -21,8 +21,6 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 0fb82c8e3..2555adfce 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -17,11 +17,6 @@ import java.util.Map; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -31,10 +26,7 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; @@ -105,7 +97,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { return; List removers = playerIceBlocks.get(user); - for(IceRemover ice : new ArrayList(removers)) + for(IceRemover ice : new ArrayList<>(removers)) ice.tick(player.worldObj, removers); } 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 34917a261..2687981c0 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 @@ -13,11 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.ArrayList; import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -31,14 +26,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.village.MerchantRecipe; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; 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 0aa51a8b9..e31afe3f0 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 @@ -19,8 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.lib.LibItemNames; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 14230cfb9..39930441c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -10,18 +10,11 @@ */ package vazkii.botania.common.item.equipment.bauble; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; 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 6e2442e8c..900336d00 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 @@ -13,7 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import java.util.Arrays; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -24,7 +23,6 @@ import net.minecraftforge.event.entity.item.ItemTossEvent; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; import vazkii.botania.common.core.handler.ConfigHandler; @@ -36,8 +34,6 @@ import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMagnetRing extends ItemBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index cfb640808..8d669d01b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -13,11 +13,6 @@ package vazkii.botania.common.item.equipment.bauble; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -27,8 +22,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 9db5d72d8..a1367c2a7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -10,20 +10,12 @@ */ package vazkii.botania.common.item.equipment.bauble; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import baubles.api.BaubleType; 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 8bfd298bf..9491c25e3 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 @@ -24,8 +24,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderPlayerEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.ITinyPlanetExcempt; 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 e6e183f13..8bac12fb0 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 @@ -25,8 +25,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; -import org.lwjgl.opengl.GL11; - import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; 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 02ee3db55..9ed324536 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 @@ -21,7 +21,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; import vazkii.botania.common.lib.LibItemNames; 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 50d414f38..270645409 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 @@ -49,14 +49,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev int dmg = 5; long lightningSeed = ItemNBTHelper.getLong(stack, TAG_LIGHTNING_SEED, 0); - Predicate selector = new Predicate() { - - @Override - public boolean apply(Entity e) { - return e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e); - } - - }; + Predicate selector = e -> e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e); Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; 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 220c8bf4e..49b1a6aca 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 @@ -27,7 +27,6 @@ import net.minecraftforge.event.entity.player.ArrowNockEvent; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; 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 fc2d14204..c101056b0 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,6 +1,5 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -16,12 +15,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.IShearable; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShears; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemElementiumShears extends ItemManasteelShears { 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 39264e3aa..d7aae0654 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 @@ -28,15 +28,12 @@ import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortableTool { 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 0d1dec470..29c93f960 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 @@ -28,15 +28,12 @@ import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, ISortableTool { 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 fceac2ca5..b9b2a3775 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,7 +10,6 @@ */ package vazkii.botania.common.item.equipment.tool.manasteel; -import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -31,16 +30,12 @@ import net.minecraftforge.common.IShearable; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; -import vazkii.botania.common.core.helper.ObfuscationHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.lib.LibObfuscation; public class ItemManasteelShears extends ItemShears implements IManaUsingItem { 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 bdd70d63a..a59737cea 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 @@ -27,7 +27,6 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISortableTool; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; @@ -35,8 +34,6 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; 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; public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, ISortableTool { 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 a467f0a11..5f3a034f0 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 @@ -22,15 +22,12 @@ import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManasteelSword extends ItemSword implements IManaUsingItem { 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 816e424e0..bf5b83221 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 @@ -27,18 +27,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelAxe; import vazkii.botania.common.item.relic.ItemLokiRing; import vazkii.botania.common.lib.LibItemNames; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; 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 9e14866b4..3d9698fed 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 @@ -29,15 +29,11 @@ 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.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; -import vazkii.botania.common.item.ItemSpark; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; 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 6fee98a2f..e166998cb 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -14,7 +14,6 @@ import java.awt.Color; import java.util.List; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.EnumDyeColor; @@ -32,7 +31,6 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.api.mana.ILensControl; import vazkii.botania.api.mana.IManaSpreader; import vazkii.botania.api.mana.ITinyPlanetExcempt; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.CompositeLensRecipe; 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 756351f36..5a72e4947 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFlare.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFlare.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.lens; import java.awt.Color; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index 220a590fa..8131705d5 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -13,7 +13,6 @@ package vazkii.botania.common.item.lens; import net.minecraft.block.Block; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.item.ItemStack; -import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.block.BlockPistonRelay; 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 f0f01db83..e46bdcbf0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -14,7 +14,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockCarpet; import net.minecraft.block.BlockColored; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -24,10 +23,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IDyablePool; -import vazkii.botania.api.item.IManaDissolvable; -import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; 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 412a669da..e944f1e90 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -12,10 +12,7 @@ package vazkii.botania.common.item.material; import java.awt.Color; import java.util.List; -import java.util.Locale; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -27,17 +24,11 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import net.minecraftforge.client.event.ModelBakeEvent; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.client.model.ModelLoaderRegistry; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; @@ -49,7 +40,6 @@ import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.common.lib.LibMisc; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java index 93495033e..125964056 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.item.material; -import net.minecraft.item.ItemStack; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; 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 460a07374..52986ec16 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -16,7 +16,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.recipe.IElvenItem; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; 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 fa1711559..43080b9a4 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -20,7 +20,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import vazkii.botania.api.recipe.IFlowerComponent; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.IPickupAchievement; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.item.ItemMod; 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 abe4b4b81..ba4f0daec 100644 --- a/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java +++ b/src/main/java/vazkii/botania/common/item/record/ItemModRecord.java @@ -14,12 +14,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.BotaniaCreativeTab; import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemModRecord extends ItemRecord { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index 528dfa26a..a0603d2c9 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -10,41 +10,6 @@ */ package vazkii.botania.common.item.relic; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.boss.IBossDisplayData; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.server.MinecraftServer; -import net.minecraft.stats.Achievement; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.common.util.EnumHelper; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.internal.IManaBurst; -import vazkii.botania.api.item.IRelic; -import vazkii.botania.api.mana.BurstProperties; -import vazkii.botania.api.mana.ILensEffect; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.entity.EntityManaBurst; -import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelSword; -import vazkii.botania.common.lib.LibItemNames; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - /* public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEffect { 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 3590a6e1c..16fd5940c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -16,7 +16,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; 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 db46b91ce..b3c98677a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -16,12 +16,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.lib.LibItemNames; import vazkii.botania.common.lib.LibObfuscation; import net.minecraftforge.fml.relauncher.ReflectionHelper; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { 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 9ba124565..5cff6a37c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -12,17 +12,13 @@ package vazkii.botania.common.item.relic; import java.util.Random; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityBabylonWeapon; 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 170961de8..be2c3986d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -12,13 +12,11 @@ package vazkii.botania.common.item.rod; import java.util.Random; -import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; 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 cf9a4fc08..737493ebe 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -89,7 +89,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); @@ -107,7 +107,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(item == null) { Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); @@ -193,7 +193,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); 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 1d40ebe4d..ea2aebf58 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -12,7 +12,6 @@ package vazkii.botania.common.item.rod; import java.util.List; -import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -27,7 +26,6 @@ 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.client.core.helper.IconHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.brew.ModPotions; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index cdec44edd..223a743f4 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -22,6 +22,7 @@ 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.api.recipe.RecipePetals; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; @@ -335,7 +336,7 @@ public final class LexiconData { wand.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipesTwigWand)); pureDaisy = new BLexiconEntry(LibLexicon.BASICS_PURE_DAISY, categoryBasics); - pureDaisy.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), new PagePetalRecipe("3", ModPetalRecipes.pureDaisyRecipe)).setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + pureDaisy.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), new PagePetalRecipe<>("3", ModPetalRecipes.pureDaisyRecipe)).setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingwood)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingrock)); LexiconRecipeMappings.map(new ItemStack(ModBlocks.livingwood), pureDaisy, 1); @@ -424,7 +425,7 @@ public final class LexiconData { redstoneSpreader.setPriority().setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeRedstoneSpreader)); manastar = new BLexiconEntry(LibLexicon.MANA_MANASTAR, categoryMana); - manastar.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.manastarRecipe)); + manastar.setPriority().setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.manastarRecipe)); dreamwoodSpreader = new ALexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana); dreamwoodSpreader.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipesDreamwoodSpreader), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeUltraSpreader)); @@ -457,83 +458,83 @@ public final class LexiconData { flowerSpeed.setIcon(new ItemStack(Blocks.dirt, 1, 2)); jadedAmaranthus = new BLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); - jadedAmaranthus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); + jadedAmaranthus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); bellethorne = new BLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); - bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bellethorneRecipe)); + bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bellethorneRecipe)); dreadthorne = new BLexiconEntry(LibLexicon.FFLOWER_DREADTHORNE, categoryFunctionalFlowers); - dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.dreadthorneRecipe)); + dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.dreadthorneRecipe)); heiseiDream = new ALexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); - heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.heiseiDreamRecipe)); + heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.heiseiDreamRecipe)); tigerseye = new BLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers); - tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tigerseyeRecipe)); + tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tigerseyeRecipe)); orechid = Botania.gardenOfGlassLoaded ? new BLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers) : new ALexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers); - orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.orechidRecipe)); + orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidRecipe)); if(Botania.gardenOfGlassLoaded) orechid.setPriority(); orechidIgnem = new ALexiconEntry(LibLexicon.FFLOWER_ORECHID_IGNEM, categoryFunctionalFlowers); - orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.orechidIgnemRecipe)); + orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidIgnemRecipe)); if(ConfigHandler.fallenKanadeEnabled) { fallenKanade = new BLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers); - fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe("1", ModPetalRecipes.fallenKanadeRecipe)); + fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), new PagePetalRecipe<>("1", ModPetalRecipes.fallenKanadeRecipe)); } exoflame = new BLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers); - exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.exoflameRecipe)); + exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.exoflameRecipe)); agricarnation = new BLexiconEntry(LibLexicon.FFLOWER_AGRICARNATION, categoryFunctionalFlowers); - agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.agricarnationRecipe)); + agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.agricarnationRecipe)); hopperhock = new BLexiconEntry(LibLexicon.FFLOWER_HOPPERHOCK, categoryFunctionalFlowers); - hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.hopperhockRecipe)); + hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.hopperhockRecipe)); tangleberrie = new BLexiconEntry(LibLexicon.FFLOWER_TANGLEBERRIE, categoryFunctionalFlowers); - tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tangleberrieRecipe)); + tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tangleberrieRecipe)); jiyuulia = new BLexiconEntry(LibLexicon.FFLOWER_JIYUULIA, categoryFunctionalFlowers); - jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jiyuuliaRecipe)); + jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.jiyuuliaRecipe)); rannuncarpus = new BLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); - rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.rannuncarpusRecipe)); + rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.rannuncarpusRecipe)); hyacidus = new BLexiconEntry(LibLexicon.FFLOWER_HYACIDUS, categoryFunctionalFlowers); - hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.hyacidusRecipe)); + hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.hyacidusRecipe)); pollidisiac = new BLexiconEntry(LibLexicon.FFLOWER_POLLIDISIAC, categoryFunctionalFlowers); - pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.pollidisiacRecipe)); + pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.pollidisiacRecipe)); clayconia = new BLexiconEntry(LibLexicon.FFLOWER_CLAYCONIA, categoryFunctionalFlowers); - clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.clayconiaRecipe)); + clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.clayconiaRecipe)); loonium = new ALexiconEntry(LibLexicon.FFLOWER_LOONIUM, categoryFunctionalFlowers); - loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.looniumRecipe)); + loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.looniumRecipe)); daffomill = new BLexiconEntry(LibLexicon.FFLOWER_DAFFOMILL, categoryFunctionalFlowers); - daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.daffomillRecipe)); + daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.daffomillRecipe)); vinculotus = new BLexiconEntry(LibLexicon.FFLOWER_VINCULOTUS, categoryFunctionalFlowers); - vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.vinculotusRecipe)); + vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.vinculotusRecipe)); spectranthemum = new ALexiconEntry(LibLexicon.FFLOWER_SPECTRANTHEMUN, categoryFunctionalFlowers); - spectranthemum.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.spectranthemumRecipe)); + spectranthemum.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe<>("3", ModPetalRecipes.spectranthemumRecipe)); medumone = new BLexiconEntry(LibLexicon.FFLOWER_MEDUMONE, categoryFunctionalFlowers); - medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.medumoneRecipe)); + medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.medumoneRecipe)); marimorphosis = new BLexiconEntry(LibLexicon.FFLOWER_MARIMORPHOSIS, categoryFunctionalFlowers); - marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), new PagePetalRecipe("2", ModPetalRecipes.marimorphosisRecipe), new PageCraftingRecipe("3", ModCraftingRecipes.recipesAltarMeta)); + marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), new PagePetalRecipe<>("2", ModPetalRecipes.marimorphosisRecipe), new PageCraftingRecipe("3", ModCraftingRecipes.recipesAltarMeta)); bubbell = new ALexiconEntry(LibLexicon.FFLOWER_BUBBELL, categoryFunctionalFlowers); - bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bubbellRecipe)); + bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bubbellRecipe)); solegnolia = new BLexiconEntry(LibLexicon.FFLOWER_SOLEGNOLIA, categoryFunctionalFlowers); - solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.solegnoliaRecipe)); + solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.solegnoliaRecipe)); // GENERATING FLOWERS ENTRIES generatingIntro = new BLexiconEntry(LibLexicon.GFLOWER_INTRO, categoryGenerationFlowers); @@ -549,46 +550,46 @@ public final class LexiconData { primusLoci.addExtraDisplayedRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE_PRIME)); daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); - daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.daybloomRecipe)); + daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.daybloomRecipe)); nightshade = new BLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers); - nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.nightshadeRecipe)); + nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.nightshadeRecipe)); endoflame = new BLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); - endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PagePetalRecipe("2", ModPetalRecipes.endoflameRecipe)); + endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PagePetalRecipe<>("2", ModPetalRecipes.endoflameRecipe)); hydroangeas = new BLexiconEntry(LibLexicon.GFLOWER_HYDROANGEAS, categoryGenerationFlowers); - hydroangeas.setLexiconPages(new PageText("0"), new PageImage("2", LibResources.ENTRY_HYDROANGEAS), new PagePetalRecipe("1", ModPetalRecipes.hydroangeasRecipe)); + hydroangeas.setLexiconPages(new PageText("0"), new PageImage("2", LibResources.ENTRY_HYDROANGEAS), new PagePetalRecipe<>("1", ModPetalRecipes.hydroangeasRecipe)); thermalily = new BLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); - thermalily.setLexiconPages(new PageText("0"), new PageText("2"), new PageText("3"), new PagePetalRecipe("1", ModPetalRecipes.thermalilyRecipe)); + thermalily.setLexiconPages(new PageText("0"), new PageText("2"), new PageText("3"), new PagePetalRecipe<>("1", ModPetalRecipes.thermalilyRecipe)); arcaneRose = new BLexiconEntry(LibLexicon.GFLOWER_ARCANE_ROSE, categoryGenerationFlowers); - arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.arcaneRoseRecipe)); + arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.arcaneRoseRecipe)); munchdew = new BLexiconEntry(LibLexicon.GFLOWER_MUNCHDEW, categoryGenerationFlowers); - munchdew.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.munchdewRecipe)); + munchdew.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.munchdewRecipe)); entropinnyum = new BLexiconEntry(LibLexicon.GFLOWER_ENTROPINNYUM, categoryGenerationFlowers); - entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.entropinnyumRecipe)); + entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.entropinnyumRecipe)); kekimurus = new ALexiconEntry(LibLexicon.GFLOWER_KEKIMURUS, categoryGenerationFlowers); - kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.kekimurusRecipe)); + kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.kekimurusRecipe)); gourmaryllis = new BLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); - gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe("3", ModPetalRecipes.gourmaryllisRecipe)); + gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PagePetalRecipe<>("3", ModPetalRecipes.gourmaryllisRecipe)); narslimmus = new BLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers); - narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.narslimmusRecipe)); + narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.narslimmusRecipe)); spectrolus = new ALexiconEntry(LibLexicon.GFLOWER_SPECTROLUS, categoryGenerationFlowers); - spectrolus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe("2", ModPetalRecipes.spectrolusRecipe)); + spectrolus.setLexiconPages(new PageText("0"), new PageText("1"), new PagePetalRecipe<>("2", ModPetalRecipes.spectrolusRecipe)); rafflowsia = new ALexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers); - rafflowsia.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PagePetalRecipe("4", ModPetalRecipes.rafflowsiaRecipe)); + rafflowsia.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PagePetalRecipe<>("4", ModPetalRecipes.rafflowsiaRecipe)); dandelifeon = new ALexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers); - dandelifeon.setLexiconPages(new PageText("_w"), new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageText("10"), new PageText("7"), new PagePetalRecipe("8", ModPetalRecipes.dandelifeonRecipe), new PageCraftingRecipe("9", ModCraftingRecipes.recipeCellBlock)); + dandelifeon.setLexiconPages(new PageText("_w"), new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageText("10"), new PageText("7"), new PagePetalRecipe<>("8", ModPetalRecipes.dandelifeonRecipe), new PageCraftingRecipe("9", ModCraftingRecipes.recipeCellBlock)); // DEVICES ENTRIES pylon = new BLexiconEntry(LibLexicon.DEVICE_PYLON, categoryDevices); 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 5e58bbbe6..13798efd8 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -16,15 +16,11 @@ 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.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; import net.minecraftforge.fml.relauncher.Side; 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 ceb53842c..ddbbcd94c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -28,7 +28,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; 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 e553d5000..c3c03cb7f 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -25,7 +25,6 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.ILexicon; 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 dca49b71c..dd7f67494 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -29,7 +29,6 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 673e3a708..0f499285c 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -14,7 +14,6 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -24,12 +23,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.BlockPos; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderWorldEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; -import vazkii.botania.client.render.world.SkyblockSkyRenderer; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 993477ed9..cd76af252 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -14,7 +14,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; -import net.minecraftforge.common.MinecraftForge; public class WorldTypeSkyblock extends WorldType {