diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 235846f52..f1c2b97c4 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -72,10 +72,10 @@ public final class BotaniaAPI { public static Map knowledgeTypes = new HashMap<>(); - public static Map brewMap = new LinkedHashMap(); + public static Map brewMap = new LinkedHashMap<>(); - public static List disposableBlocks = new ArrayList(); - public static List semiDisposableBlocks = new ArrayList(); + public static List disposableBlocks = new ArrayList<>(); + public static List semiDisposableBlocks = new ArrayList<>(); public static List petalRecipes = new ArrayList<>(); public static List pureDaisyRecipes = new ArrayList<>(); @@ -87,18 +87,18 @@ public final class BotaniaAPI { private static BiMap> subTiles = HashBiMap.> create(); private static Map, SubTileSignature> subTileSignatures = new HashMap<>(); - public static Set subtilesForCreativeMenu = new LinkedHashSet(); + public static Set subtilesForCreativeMenu = new LinkedHashSet<>(); 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 seeds = 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> gravityRodBlacklist = new LinkedHashSet>(); + public static Set> gravityRodBlacklist = new LinkedHashSet<>(); public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18); @@ -328,7 +328,7 @@ public final class BotaniaAPI { * Blacklists an Entity from being affected by the Rod of the Shaded Mesa. * Pass in the class for the Entity, e.g. EntityCow.class */ - public static void blacklistEntityFromGravityRod(Class entity) { + public static void blacklistEntityFromGravityRod(Class entity) { gravityRodBlacklist.add(entity); } @@ -646,7 +646,7 @@ public final class BotaniaAPI { */ public static List getLatestAddedRecipes(int x) { List list = CraftingManager.getInstance().getRecipeList(); - List newList = new ArrayList(); + List newList = new ArrayList<>(); for(int i = x - 1; i >= 0; i--) newList.add(list.get(list.size() - 1 - i)); diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index d0dd6ba4d..4da6fc655 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -42,7 +42,7 @@ public class Brew { this.name = name; this.color = color; this.cost = cost; - this.effects = new ArrayList(Arrays.asList(effects)); + this.effects = new ArrayList<>(Arrays.asList(effects)); } /** diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index c2a1a27e0..128db67da 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -10,7 +10,6 @@ */ package vazkii.botania.api.corporea; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -18,6 +17,7 @@ import java.util.WeakHashMap; import java.util.regex.Pattern; import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableList; import net.minecraft.entity.Entity; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; @@ -31,8 +31,8 @@ import net.minecraftforge.common.MinecraftForge; 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 empty = ImmutableList.of(); + private static final WeakHashMap, List> cachedNetworks = new WeakHashMap<>(); private static final List autoCompleteControllers = new ArrayList<>(); private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); @@ -66,7 +66,7 @@ public final class CorporeaHelper { return cache; } - List inventories = new ArrayList(); + List inventories = new ArrayList<>(); if(network != null) for(ICorporeaSpark otherSpark : network) if(otherSpark != null) { @@ -127,7 +127,7 @@ public final class CorporeaHelper { * called instead if the context for this exists to avoid having to get the value again. */ public static Map getInventoriesWithItemInNetwork(ItemStack stack, List inventories, boolean checkNBT) { - Map countMap = new HashMap(); + Map countMap = new HashMap<>(); for(IInventory inv : inventories) { int count = 0; @@ -172,13 +172,13 @@ public final class CorporeaHelper { * equals or matches (case a regex is passed in) the matcher string. */ public static List requestItem(Object matcher, int itemCount, ICorporeaSpark spark, boolean checkNBT, boolean doit) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); CorporeaRequestEvent event = new CorporeaRequestEvent(matcher, itemCount, spark, checkNBT, doit); if(MinecraftForge.EVENT_BUS.post(event)) return stacks; List inventories = getInventoriesOnNetwork(spark); - Map interceptors = new HashMap(); + Map interceptors = new HashMap<>(); lastRequestMatches = 0; lastRequestExtractions = 0; diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index 4b8cc5ac2..c71656857 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -10,9 +10,9 @@ */ package vazkii.botania.api.internal; -import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.world.World; @@ -39,12 +39,12 @@ public class DummyManaNetwork implements IManaNetwork { @Override public List getAllCollectorsInWorld(World world) { - return new ArrayList(); + return ImmutableList.of(); } @Override public List getAllPoolsInWorld(World world) { - return new ArrayList(); + return ImmutableList.of(); } } diff --git a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java index d2e30699a..78502de4f 100644 --- a/src/main/java/vazkii/botania/api/item/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/api/item/IFloatingFlower.java @@ -22,7 +22,7 @@ public interface IFloatingFlower { public void setIslandType(IslandType type); public class IslandType { - private static HashMap registry = new HashMap(); + private static HashMap registry = new HashMap<>(); public static final IslandType GRASS = new IslandType("GRASS"); public static final IslandType PODZOL = new IslandType("PODZOL"); diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 274bfd6e6..ec907071f 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -31,7 +31,7 @@ public class LexiconEntry implements Comparable { private boolean priority = false; private ItemStack icon = null; - private List extraDisplayedRecipes = new ArrayList(); + private List extraDisplayedRecipes = new ArrayList<>(); /** * @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display. @@ -126,12 +126,12 @@ public class LexiconEntry implements Comparable { } public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(LexiconPage page : pages) { List l = page.getDisplayedRecipes(); if(l != null) { - ArrayList itemsAddedThisPage = new ArrayList(); + ArrayList itemsAddedThisPage = new ArrayList<>(); for(ItemStack s : l) { addItem: { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index 8202a40a7..fc13ea829 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -23,7 +23,7 @@ import vazkii.botania.api.mana.IManaItem; */ public final class LexiconRecipeMappings { - private static Map mappings = new HashMap(); + private static Map mappings = new HashMap<>(); /** * Maps the given stack to the given page of the entry. diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index a4efe59d3..494f98f12 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -23,7 +23,7 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; */ public interface IMultiblockRenderHook { - public static Map renderHooks = new HashMap(); + public static Map renderHooks = new HashMap<>(); public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha); 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 2b4240970..5cd33ed36 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -25,8 +25,8 @@ import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; */ public class Multiblock { - public List components = new ArrayList(); - public List materials = new ArrayList(); + public List components = new ArrayList<>(); + public List materials = new ArrayList<>(); public BlockPos minPos = BlockPos.ORIGIN; public BlockPos maxPos = BlockPos.ORIGIN; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index 95577784e..5dec0cc6e 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -28,7 +28,7 @@ public class RecipeBrew { public RecipeBrew(Brew brew, Object... inputs) { this.brew = brew; - List inputsToSet = new ArrayList(); + List inputsToSet = new ArrayList<>(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); @@ -39,7 +39,7 @@ public class RecipeBrew { } public boolean matches(IInventory inv) { - List inputsMissing = new ArrayList(inputs); + List inputsMissing = new ArrayList<>(inputs); for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -92,7 +92,7 @@ public class RecipeBrew { } public List getInputs() { - return new ArrayList(inputs); + return new ArrayList<>(inputs); } public Brew getBrew() { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index dbea13e86..ed701973e 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -14,7 +14,7 @@ public class RecipeElvenTrade { public RecipeElvenTrade(ItemStack output, Object... inputs) { this.output = output; - List inputsToSet = new ArrayList(); + List inputsToSet = new ArrayList<>(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); @@ -25,8 +25,8 @@ public class RecipeElvenTrade { } public boolean matches(List stacks, boolean remove) { - List inputsMissing = new ArrayList(inputs); - List stacksToRemove = new ArrayList(); + List inputsMissing = new ArrayList<>(inputs); + List stacksToRemove = new ArrayList<>(); for(ItemStack stack : stacks) { if(stack == null) { @@ -84,7 +84,7 @@ public class RecipeElvenTrade { } public List getInputs() { - return new ArrayList(inputs); + return new ArrayList<>(inputs); } public ItemStack getOutput() { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 60e46357f..05f69049a 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -25,7 +25,7 @@ public class RecipePetals { public RecipePetals(ItemStack output, Object... inputs) { this.output = output; - List inputsToSet = new ArrayList(); + List inputsToSet = new ArrayList<>(); for(Object obj : inputs) { if(obj instanceof String || obj instanceof ItemStack) inputsToSet.add(obj); @@ -36,7 +36,7 @@ public class RecipePetals { } public boolean matches(IInventory inv) { - List inputsMissing = new ArrayList(inputs); + List inputsMissing = new ArrayList<>(inputs); for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); @@ -86,7 +86,7 @@ public class RecipePetals { } public List getInputs() { - return new ArrayList(inputs); + return new ArrayList<>(inputs); } public ItemStack getOutput() { diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index c9b5e05ba..5f4965f77 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -24,7 +24,7 @@ import vazkii.botania.api.subtile.SubTileEntity; public class RecipePureDaisy { - private static final Map> oreMap = new HashMap(); + private static final Map> oreMap = new HashMap<>(); Object input; IBlockState outputState; diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 92f49feb0..df620c98c 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -14,7 +14,6 @@ import net.minecraft.block.BlockRailPowered; import net.minecraft.block.BlockRotatedPillar; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index e459bb911..479e66e6e 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -21,7 +21,7 @@ public class WikiHooks { private static final IWikiProvider FALLBACK_PROVIDER = new SimpleWikiProvider("FTB Wiki", "http://ftb.gamepedia.com/%s"); - private static final Map modWikis = new HashMap(); + private static final Map modWikis = new HashMap<>(); public static IWikiProvider getWikiFor(Block block) { ResourceLocation mod = GameData.getBlockRegistry().getNameForObject(block); diff --git a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java index 4e1ba5e31..955727633 100644 --- a/src/main/java/vazkii/botania/client/challenge/ModChallenges.java +++ b/src/main/java/vazkii/botania/client/challenge/ModChallenges.java @@ -25,12 +25,12 @@ import vazkii.botania.common.lib.LibBlockNames; public final class ModChallenges { - public static final EnumMap> challenges = new EnumMap(EnumChallengeLevel.class); - public static final HashMap challengeLookup = new HashMap(); + public static final EnumMap> challenges = new EnumMap<>(EnumChallengeLevel.class); + public static final HashMap challengeLookup = new HashMap<>(); public static void init() { for(EnumChallengeLevel level : EnumChallengeLevel.class.getEnumConstants()) - challenges.put(level, new ArrayList()); + challenges.put(level, new ArrayList<>()); addChallenge(EnumChallengeLevel.EASY, "flowerFarm", new ItemStack(ModBlocks.flower, 1, 6)); addChallenge(EnumChallengeLevel.EASY, "recordFarm", new ItemStack(Items.record_13)); 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 9eaa84e4b..d03c55bc7 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -32,7 +32,6 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public final class BaubleRenderHandler implements LayerRenderer { diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index f2bf0dd69..7708a1f60 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -78,7 +78,7 @@ public class ClientTickHandler { if(player != null) { ItemStack stack = player.getCurrentEquippedItem(); if(stack != null && stack.getItem() instanceof ItemTwigWand) { - List list = new ArrayList(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld)); + List list = new ArrayList<>(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld)); for(TileSignature sig : list) { if(!sig.remoteWorld) continue; diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index a05c7fd9e..235b8ccaf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -86,7 +86,7 @@ public final class ContributorFancinessHandler implements LayerRenderer(); for(String key : props.stringPropertyNames()) { String value = props.getProperty(key); 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 a7e56bb73..567b082e2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -11,12 +11,12 @@ package vazkii.botania.client.core.handler; import java.util.ArrayList; -import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.SortedSet; import java.util.TreeSet; +import com.google.common.collect.ImmutableList; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.GuiScreen; @@ -134,10 +134,10 @@ public class CorporeaAutoCompleteHandler { originalString = inputField.getText(); } - private ArrayList getNames(String prefix) { + private List getNames(String prefix) { String s = prefix.trim(); if(s.isEmpty()) - return new ArrayList(); + return ImmutableList.of(); TreeSet result = new TreeSet<>(); String[] words = s.split(" "); diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index d18576213..d4399ac22 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -13,7 +13,6 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderGameOverlayEvent; diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 023171b73..ce5a21772 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -18,7 +18,6 @@ import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.launchwrapper.Launch; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; 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 f404c130a..0470089d6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -18,7 +18,6 @@ import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; -import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.client.resources.IReloadableResourceManager; @@ -110,7 +109,6 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.TileBellows; -import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ItemManaGun; import vazkii.botania.common.item.ItemSpawnerMover; import vazkii.botania.common.item.ItemTwigWand; diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index fa71c3afc..61458141b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -33,7 +33,7 @@ import vazkii.botania.common.lib.LibObfuscation; public final class RedStringRenderer { - public static final Queue redStringTiles = new ArrayDeque(); + public static final Queue redStringTiles = new ArrayDeque<>(); static float sizeAlpha = 0F; public static void renderAll() { 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 5aa68e18f..f1867e2da 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -64,7 +64,7 @@ public final class TooltipAdditionDisplayHandler { try { tooltip = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips); } catch(Exception e) { - tooltip = new ArrayList(); + tooltip = new ArrayList<>(); } int width = 0; for(String s : tooltip) diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index bd00169f5..1527b7fc5 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -36,8 +36,8 @@ public class FXSparkle extends EntityFX { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES); - public static Queue queuedRenders = new ArrayDeque(); - public static Queue queuedCorruptRenders = new ArrayDeque(); + public static Queue queuedRenders = new ArrayDeque<>(); + public static Queue queuedCorruptRenders = new ArrayDeque<>(); // Queue values float f; diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 6c111d567..d8e7a3c52 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -34,8 +34,8 @@ public class FXWisp extends EntityFX { public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE); - public static Queue queuedRenders = new ArrayDeque(); - public static Queue queuedDepthIgnoringRenders = new ArrayDeque(); + public static Queue queuedRenders = new ArrayDeque<>(); + public static Queue queuedDepthIgnoringRenders = new ArrayDeque<>(); // Queue values float f; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index 81512fa9d..07ad6592e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -71,7 +71,7 @@ public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); public static ItemStack stackUsed; - public static HashMap notes = new HashMap(); + public static HashMap notes = new HashMap<>(); private static final String TAG_TYPE = "type"; @@ -80,11 +80,11 @@ public class GuiLexicon extends GuiScreen { public static final int BOOKMARK_START = 1337; public static final int NOTES_BUTTON_ID = 1336; // random button tho public static final int MAX_BOOKMARK_COUNT = 8; - public static List bookmarks = new ArrayList(); - public static List bookmarkKeys = new ArrayList(); + public static List bookmarks = new ArrayList<>(); + public static List bookmarkKeys = new ArrayList<>(); boolean bookmarksNeedPopulation = false; - public static Queue tutorial = new ArrayDeque(); + public static Queue tutorial = new ArrayDeque<>(); public static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_LEXICON); public static final ResourceLocation textureToff = new ResourceLocation(LibResources.GUI_TOFF); @@ -131,7 +131,7 @@ public class GuiLexicon extends GuiScreen { } public void onInitGui() { - allCategories = new ArrayList(BotaniaAPI.getAllCategories()); + allCategories = new ArrayList<>(BotaniaAPI.getAllCategories()); Collections.sort(allCategories); lastTime = ClientTickHandler.ticksInGame; @@ -486,7 +486,7 @@ public class GuiLexicon extends GuiScreen { } void populateBookmarks() { - List remove = new ArrayList(); + List remove = new ArrayList<>(); List buttons = buttonList; for(GuiButton button : buttons) if(button.id >= BOOKMARK_START) diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java index 159d793a4..ae9b6809e 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java @@ -20,7 +20,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; public class GuiLexiconHistory extends GuiLexiconIndex { - public static List history = new ArrayList(); + public static List history = new ArrayList<>(); public GuiLexiconHistory() { super(null); 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 16ea0b360..5388e985d 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -56,7 +56,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented { LexiconEntry currentEntry; float infoTime; - List entriesToDisplay = new ArrayList(); + List entriesToDisplay = new ArrayList<>(); public GuiLexiconIndex() { parent = new GuiLexicon(); 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 91ef081f1..b4bb1ebd2 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 @@ -36,7 +36,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.achievements")); int tooltipY = (tooltip.size() - 1) * 10; 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 5e282a6f1..cb487887c 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 @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -44,7 +45,7 @@ public class GuiButtonBack extends GuiButtonLexicon { } public List getTooltip() { - return Arrays.asList(StatCollector.translateToLocal("botaniamisc.back")); + return Collections.singletonList(StatCollector.translateToLocal("botaniamisc.back")); } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index ab0c49fcc..5ab60413b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java @@ -24,7 +24,7 @@ public class GuiButtonBookmark extends GuiButtonLexicon { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); if(displayString.equals("+")) tooltip.add(StatCollector.translateToLocal("botaniamisc.clickToAdd")); else { 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 e0b94b4f7..98a6429a3 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 @@ -49,7 +49,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon { } - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(EnumChatFormatting.AQUA + StatCollector.translateToLocal(challenge.unlocalizedName)); int tooltipY = (tooltip.size() - 1) * 10; diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java index 2d7d6fffa..3f687add8 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallengeInfo.java @@ -33,7 +33,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(StatCollector.translateToLocal("botaniamisc.challengeInfo")); int tooltipY = (tooltip.size() + 1) * 5; 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 984f1e175..200021637 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 @@ -44,7 +44,7 @@ public class GuiButtonDoot extends GuiButtonLexicon { GlStateManager.disableLighting(); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(EnumChatFormatting.LIGHT_PURPLE + "Happy Birthday Vazkii!"); tooltip.add(EnumChatFormatting.GRAY + "doot doot"); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java index 98c9780cc..adb6f8eef 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonHistory.java @@ -34,7 +34,7 @@ public class GuiButtonHistory extends GuiButtonLexicon { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(StatCollector.translateToLocal("botaniamisc.historyLong")); tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.historyDesc")); 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 4a56f238a..69a92ea02 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 @@ -39,7 +39,7 @@ public class GuiButtonNotes extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 130 : 120, 191, 10, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); if(GuiLexicon.notesEnabled) tooltip.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("botaniamisc.hideNotes")); else { 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 aa1f822d6..59ca83863 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 @@ -36,7 +36,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 180, 11, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); for(int i = 0; i < 3; i++) tooltip.add((i == 0 ? EnumChatFormatting.RED : EnumChatFormatting.GRAY) + StatCollector.translateToLocal("botaniamisc.lexiconOptions" + i)); 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 866c8de3b..10dce0157 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 @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; +import java.util.Collections; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -39,7 +40,7 @@ public class GuiButtonPage extends GuiButtonLexicon { drawTexturedModalRect(xPosition, yPosition, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10); if(k == 2) - RenderHelper.renderTooltip(par2, par3, Arrays.asList(StatCollector.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); + RenderHelper.renderTooltip(par2, par3, Collections.singletonList(StatCollector.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage"))); } } 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 712e0c0c1..41f327f60 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 @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -43,6 +44,6 @@ public class GuiButtonShare extends GuiButtonLexicon { } public List getTooltip() { - return Arrays.asList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.clickToShare")); + return Collections.singletonList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.clickToShare")); } } 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 320a19ddc..a19718446 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 @@ -43,7 +43,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, red ? 153 : 142, 180, 11, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); String version = PersistentVariableHelper.lastBotaniaVersion; for(int i = 0; i < 6; i++) { tooltip.add(EnumChatFormatting.GRAY + String.format(StatCollector.translateToLocal("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7")); 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 7bfa637d2..50ad9deed 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 @@ -11,6 +11,7 @@ package vazkii.botania.client.gui.lexicon.button; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -36,7 +37,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon { GlStateManager.color(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 41 : 30, 200, 11, 11); - List tooltip = Arrays.asList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.viewOnline")); + List tooltip = Collections.singletonList(EnumChatFormatting.AQUA + StatCollector.translateToLocal("botaniamisc.viewOnline")); int tooltipY = (tooltip.size() - 1) * 10; if(k == 2) RenderHelper.renderTooltip(par2, par3 + tooltipY, tooltip); diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 4a39cead6..163a9cdd3 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -60,6 +60,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { public void drawAnimations(Minecraft minecraft) { } + @SuppressWarnings("unchecked") @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof BreweryRecipeWrapper)) 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 66aea0384..b903eeb33 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 @@ -25,6 +25,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { private final List input; private final List output; + @SuppressWarnings("unchecked") public BreweryRecipeWrapper(RecipeBrew recipeBrew) { ImmutableList.Builder builder = ImmutableList.builder(); builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1))); diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index d9c6b92c6..48c44ef40 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -86,6 +86,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { tess.draw(); } + @SuppressWarnings("unchecked") @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { if(!(recipeWrapper instanceof ElvenTradeRecipeWrapper)) diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index 5c6a99ce3..e6e08d18f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -24,6 +24,7 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { private final List input; private final ItemStack output; + @SuppressWarnings("unchecked") public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { ImmutableList.Builder builder = ImmutableList.builder(); for(Object o : recipe.getInputs()) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index 051b87cc7..1c3694138 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -28,6 +28,7 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { private final ItemStack output; private final int manaUsage; + @SuppressWarnings("unchecked") public RunicAltarRecipeWrapper(RecipeRuneAltar recipe) { ImmutableList.Builder builder = ImmutableList.builder(); for(Object o : recipe.getInputs()) { diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 786074769..d4e0813bd 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -13,7 +13,6 @@ package vazkii.botania.client.model; 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 net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -34,7 +33,6 @@ import vazkii.botania.api.state.enums.PylonVariant; import java.io.IOException; import java.util.List; -import java.util.Set; public class ModelPylon implements IPylonModel { 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 57f3088a4..d53b1a780 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -11,11 +11,9 @@ package vazkii.botania.client.render.entity; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderMinecart; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraftforge.fml.client.registry.RenderingRegistry; import vazkii.botania.api.state.enums.PoolVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.render.tile.RenderTilePool; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index cf273ce9a..244b41faf 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -24,7 +24,6 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; public class RenderTileAlfPortal extends TileEntitySpecialRenderer { 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 ec08f2ca7..2d27a515b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -18,13 +18,8 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelIncensePlate; import vazkii.botania.common.block.tile.TileIncensePlate; import java.util.Map; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index b174f1765..8934fbb6d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -17,18 +17,13 @@ import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.block.model.BakedQuad; 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.client.resources.model.IBakedModel; import net.minecraft.item.EnumDyeColor; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.Attributes; -import net.minecraftforge.client.model.pipeline.LightUtil; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; @@ -38,8 +33,6 @@ import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.model.ModelPool; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; 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 672668597..e67c939bd 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.WorldRenderer; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraftforge.client.model.animation.FastTESR; 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/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index cc342fc0c..09deb6be8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -10,12 +10,9 @@ */ package vazkii.botania.client.render.tile; -import java.util.Map; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer; -import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.tileentity.TileEntitySkull; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; @@ -26,7 +23,6 @@ import vazkii.botania.client.render.entity.RenderDoppleganger; import vazkii.botania.common.block.tile.TileGaiaHead; import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; public class RenderTileSkullOverride extends TileEntitySkullRenderer { diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 8b0c2f039..76feb2e26 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -15,7 +15,6 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java index 7da1fa5f2..1c09a65f8 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementMod.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementMod.java @@ -21,7 +21,7 @@ import vazkii.botania.api.item.IRelic; public class AchievementMod extends Achievement { - public static List achievements = new ArrayList(); + public static List achievements = new ArrayList<>(); public AchievementMod(String name, int x, int y, ItemStack icon, Achievement parent) { super("achievement.botania:" + name, "botania:" + name, x, y, icon, parent); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 57a424607..2e6343f82 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -81,7 +81,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 6; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 44b4f3350..cd8f81078 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -26,7 +26,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumWorldBlockLayer; @@ -120,7 +119,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 9; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index 91b13e03b..2368ce3e5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -84,7 +84,7 @@ public class BlockCacophonium extends BlockModContainer { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList stacks = new ArrayList(); + ArrayList stacks = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCacophonium) { diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 953418ec6..93332ca10 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -37,7 +37,7 @@ public class BlockCell extends BlockModContainer implements ILexiconable { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index c4b7396a8..734acc728 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -72,7 +72,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 035cc0d24..ec5d1f5af 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -10,10 +10,10 @@ */ package vazkii.botania.common.block; -import java.util.ArrayList; import java.util.List; import java.util.Random; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -28,7 +28,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import vazkii.botania.common.block.tile.TileFakeAir; -import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lib.LibBlockNames; public class BlockFakeAir extends BlockModContainer { @@ -114,7 +113,7 @@ public class BlockFakeAir extends BlockModContainer { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); // Empty List + return ImmutableList.of(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 8150fd4bc..1b0f4bb43 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -121,7 +121,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -146,7 +146,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if(tile != null) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index 82e8c8f64..b6c701f1f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -90,7 +90,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } public void pickUpEntities(World world, BlockPos pos) { - List relays = new ArrayList(); + List relays = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = world.getTileEntity(pos.offset(dir)); if(tile instanceof TileLightRelay) { @@ -102,11 +102,11 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { if(!relays.isEmpty()) { AxisAlignedBB aabb = new AxisAlignedBB(pos, pos.add(1, 1, 1)); - List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb); entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb)); if(!entities.isEmpty()) { - for(Entity entity : ((List) entities)) { + for(Entity entity : entities) { TileLightRelay relay = relays.get(world.rand.nextInt(relays.size())); relay.mountEntity(entity); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 8e3f5bddc..aa3f3e9f1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -82,7 +82,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index e76391a55..2cb685f17 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -78,7 +78,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < LivingRockVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index fd685745c..fa2d6c40a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -86,7 +86,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < LivingWoodVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index 1c6fba0c0..bb772e1a1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import com.google.common.collect.ImmutableList; import net.minecraft.block.Block; import net.minecraft.block.BlockDoublePlant; import net.minecraft.block.properties.PropertyEnum; @@ -189,7 +190,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return ImmutableList.of(); } @Override @@ -198,7 +199,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { + public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) { for(int i = 0; i < COUNT; ++i) p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 4cbbb92ac..18313016f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -27,7 +27,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; @@ -97,7 +96,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index e67dce5b8..1cb4f16b1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -106,7 +106,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < CrateVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 1cc24a757..c678dbccd 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -49,12 +49,12 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.Type; public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconable { - public static Map playerPositions = new HashMap(); - public static Map mappedPositions = new HashMap(); + public static Map playerPositions = new HashMap<>(); + public static Map mappedPositions = new HashMap<>(); - static List removeThese = new ArrayList(); - static List checkedCoords = new ArrayList(); - static Map coordsToCheck = new HashMap(); + static List removeThese = new ArrayList<>(); + static List checkedCoords = new ArrayList<>(); + static Map coordsToCheck = new HashMap<>(); public BlockPistonRelay() { super(Material.gourd); @@ -199,7 +199,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl @SubscribeEvent public void tickEnd(TickEvent event) { if(event.type == Type.SERVER && event.phase == Phase.END) { - List coordsToCheckCopy = new ArrayList(coordsToCheck.keySet()); + List coordsToCheckCopy = new ArrayList<>(coordsToCheck.keySet()); for(String s : coordsToCheckCopy) { decrCoords(s); if(checkedCoords.contains(s)) @@ -262,7 +262,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl } // ConcurrentModificationException failsafe - ArrayList remove = new ArrayList(removeThese); + ArrayList remove = new ArrayList<>(removeThese); for(String s : remove) { coordsToCheck.remove(s); if(checkedCoords.contains(s)) diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 4d6a03d90..21c6912ac 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -106,13 +106,13 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < PlatformVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } @Override - public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 04195a659..764059b12 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -86,7 +86,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < PylonVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index fe698ef22..dc366c41e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -203,7 +203,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { par3List.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -237,7 +237,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if(tile != null) { diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 978585d00..f43c286c4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -62,7 +62,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(par1, 1, i)); } 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 709f7c23a..d2a51f914 100644 --- a/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java +++ b/src/main/java/vazkii/botania/common/block/decor/Block18Stone.java @@ -63,7 +63,7 @@ public class Block18Stone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } 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 9a7cf973f..06db61e34 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -79,7 +79,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < CustomBrickVariant.values().length; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 0357122d8..7b4dd1206 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java @@ -63,7 +63,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < EndBrickVariant.values().length; i++) list.add(new ItemStack(item, 1, i)); } 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 5a60613cc..cdaf1fa11 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -183,7 +183,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 16; i++) par3.add(new ItemStack(par1, 1, i)); } 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 02a248ad1..e5d8b2a7e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -67,7 +67,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index ab284497a..3916f307d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -10,9 +10,9 @@ */ package vazkii.botania.common.block.decor; -import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -100,7 +100,7 @@ public class BlockManaFlame extends BlockModContainer implements ILexiconable { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - return new ArrayList(); + return ImmutableList.of(); } @Override 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 076fee7ff..a80889081 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -93,7 +93,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 f700cf333..c73908cb4 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -97,7 +97,7 @@ public class BlockPavement extends BlockMod { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < TYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 61c890d2a..5b26e0532 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -62,7 +62,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java index 95666e451..9862a9471 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java @@ -81,7 +81,7 @@ public class BlockPrismarine extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < TYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 62ab1aca4..a4dccfbf7 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -26,12 +26,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -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.client.core.proxy.ClientProxy; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.tile.TileTinyPotato; @@ -121,7 +118,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if(tile != null) { 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 50ada96da..aa6ffdd1d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java @@ -68,7 +68,7 @@ public class BlockUnstable extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } 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 385f8234e..14c21ed63 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 @@ -40,7 +40,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } 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 783bd30da..989d9b794 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 @@ -123,7 +123,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { + public void getSubBlocks(Item item, CreativeTabs tab, List par3List) { par3List.add(new ItemStack(this, 1, 0)); par3List.add(new ItemStack(this, 1, 1)); par3List.add(new ItemStack(this, 1, 2)); 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 de6383171..dca05ad12 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 @@ -26,7 +26,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable { String name; protected final boolean doubleSlab; - public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); + public static final PropertyEnum DUMMY = PropertyEnum.create("dummy", DummyEnum.class); public BlockModSlab(boolean full, Material mat, String name) { super(mat); 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 c0507111d..1d444ed83 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 @@ -61,7 +61,7 @@ public class Block18StoneWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } 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 92264bf97..bcf90ac43 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 @@ -61,7 +61,7 @@ public class BlockBiomeStoneWall extends BlockModWall { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { for(int i = 0; i < 8; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index efc30fd78..f81c6e2b6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -88,7 +88,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable { } @Override - public void getSubBlocks(Item item, CreativeTabs tabs, List list) { + public void getSubBlocks(Item item, CreativeTabs tabs, List list) { list.add(new ItemStack(item)); } 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 4875a5ccb..39b9388f5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -102,7 +102,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } @@ -119,7 +119,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona else if(!world.isRemote) { int range = 10; List entities = world.getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))); - List shearables = new ArrayList(); + List shearables = new ArrayList<>(); ItemStack stack = new ItemStack(this, 1, 1); for(EntityLiving entity : entities) { 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 fa21162ca..8ea5f3f84 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -71,7 +71,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable } @Override - public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { + public void addCollisionBoxesToList(World par1World, BlockPos pos, IBlockState state, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { if(par7Entity != null && !(par7Entity instanceof IManaBurst)) super.addCollisionBoxesToList(par1World, pos, state, par5AxisAlignedBB, par6List, par7Entity); } 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 0a7650683..aab35689c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -110,7 +110,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList drops = new ArrayList(); + ArrayList drops = new ArrayList<>(); if(!lastFragile) drops.add(new ItemStack(this, 1, state.getBlock().getMetaFromState(state))); @@ -119,7 +119,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { par3.add(new ItemStack(par1, 1, 0)); par3.add(new ItemStack(par1, 1, 2)); par3.add(new ItemStack(par1, 1, 3)); 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 7213a62f5..4abecefe3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -23,7 +23,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.property.ExtendedBlockState; -import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; import vazkii.botania.api.lexicon.ILexiconable; 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 8325eacce..1900da3d6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -41,7 +41,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); list.add(new ItemStack(Blocks.mob_spawner)); } 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 8f4c6bbd1..7ed9c7516 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -92,7 +92,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { + public void getSubBlocks(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < 4; i++) par3.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 5a3a94b1e..b147b9c8f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -51,7 +51,7 @@ public class SubTileClayconia extends SubTileFunctional { } public BlockPos getCoordsToPut() { - List possibleCoords = new ArrayList(); + List possibleCoords = new ArrayList<>(); for(int i = -RANGE; i < RANGE + 1; i++) for(int j = -RANGE_Y; j < RANGE_Y + 1; j++) 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 0badf4ac3..3e13aa328 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 @@ -54,7 +54,7 @@ public class SubTileHopperhock extends SubTileFunctional { private static final int RANGE_MANA_MINI = 2; private static final int RANGE_MINI = 1; - private static Set particled = Collections.newSetFromMap(new WeakHashMap()); + private static Set particled = Collections.newSetFromMap(new WeakHashMap<>()); int filterType = 0; @@ -170,7 +170,7 @@ public class SubTileHopperhock extends SubTileFunctional { } public List getFilterForInventory(IInventory inv, BlockPos pos, boolean recursiveForDoubleChests) { - List filter = new ArrayList(); + List filter = new ArrayList<>(); if(recursiveForDoubleChests) { TileEntity tileEntity = supertile.getWorld().getTileEntity(pos); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index 3e012e90c..6a01101eb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -75,7 +75,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { public ItemStack getStoneToPut(BlockPos coords) { List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords))); - List values = new ArrayList(); + List values = new ArrayList<>(); for(int i = 0; i < 8; i++) { int times = 1; if(types.contains(TYPES[i])) @@ -89,7 +89,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public BlockPos getCoordsToPut() { - List possibleCoords = new ArrayList(); + List possibleCoords = new ArrayList<>(); int range = getRange(); int rangeY = getRangeY(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 5e8feb37b..75f26b3e3 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -68,7 +68,7 @@ public class SubTileOrechid extends SubTileFunctional { } public ItemStack getOreToPut() { - Collection values = new ArrayList(); + Collection values = new ArrayList<>(); Map map = getOreMap(); for(String s : map.keySet()) values.add(new StringRandomItem(map.get(s), s)); @@ -98,7 +98,7 @@ public class SubTileOrechid extends SubTileFunctional { } public BlockPos getCoordsToPut() { - List possibleCoords = new ArrayList(); + List possibleCoords = new ArrayList<>(); Block source = getSourceBlock(); for(int i = -RANGE; i < RANGE + 1; i++) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 9eab4700a..0675644d9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -70,7 +70,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { BlockData filter = getUnderlyingBlock(); boolean scanned = false; - List validPositions = new ArrayList(); + List validPositions = new ArrayList<>(); int rangePlace = getRange(); int rangePlaceY = getRangeY(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 450711da8..28d0a0af6 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -26,7 +26,7 @@ public class SubTileSolegnolia extends SubTileFunctional { private static final double RANGE = 5; private static final double RANGE_MINI = 1; - public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap()); + public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java index 62d3c1111..fced33208 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTigerseye.java @@ -44,8 +44,8 @@ public class SubTileTigerseye extends SubTileFunctional { List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLiving.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE_Y, -RANGE), supertile.getPos().add(RANGE + 1, RANGE_Y + 1, RANGE + 1))); for(EntityLiving entity : entities) { - List entries = new ArrayList(entity.tasks.taskEntries); - entries.addAll(new ArrayList(entity.targetTasks.taskEntries)); + List entries = new ArrayList<>(entity.tasks.taskEntries); + entries.addAll(entity.targetTasks.taskEntries); boolean avoidsOcelots = false; if(shouldAfffect) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 5d42b0904..11e3cf6a7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class SubTileVinculotus extends SubTileFunctional { - public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap()); + public static Set existingFlowers = Collections.newSetFromMap(new WeakHashMap<>()); private static boolean registered = false; private static final int RANGE = 64; @@ -80,7 +80,7 @@ public class SubTileVinculotus extends SubTileFunctional { int cost = 50; if(event.entity instanceof EntityEnderman) { - List possibleFlowers = new ArrayList(); + List possibleFlowers = new ArrayList<>(); for(SubTileVinculotus flower : existingFlowers) { if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.entity.worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) continue; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java index 07841f59a..1c7e21e12 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -52,7 +52,7 @@ public class SubTileDandelifeon extends SubTileGenerating { void runSimulation() { int[][] table = getCellTable(); - List changes = new ArrayList(); + List changes = new ArrayList<>(); new ArrayList(); boolean wipe = false; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index c557bd12d..fec6996ce 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -12,7 +12,6 @@ package vazkii.botania.common.block.subtile.generating; import java.util.List; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java index f4c15b83d..2ca5e6a40 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileMunchdew.java @@ -55,7 +55,7 @@ public class SubTileMunchdew extends SubTileGenerating { int manaPerLeaf = 160; eatLeaves : { if(getMaxMana() - mana >= manaPerLeaf && !supertile.getWorld().isRemote && ticksExisted % 4 == 0) { - List coords = new ArrayList(); + List coords = new ArrayList<>(); BlockPos pos = supertile.getPos(); for(int i = -RANGE; i < RANGE + 1; i++) 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 57bff99ad..4be78e260 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -19,7 +19,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -77,7 +76,7 @@ public class TileAlfPortal extends TileMod { private static final String TAG_STACK = "portalStack"; private static final String TAG_PORTAL_FLAG = "_elvenPortal"; - List stacksIn = new ArrayList(); + List stacksIn = new ArrayList<>(); public int ticksOpen = 0; int ticksSinceLastItem = 0; @@ -289,7 +288,8 @@ public class TileAlfPortal extends TileMod { return checkMultipleConverters(baseConverter) || checkMultipleConverters(CONVERTER_Z_SWAP, baseConverter); } - private boolean checkMultipleConverters(Function... converters) { + @SafeVarargs + private final boolean checkMultipleConverters(Function... converters) { if(!check2DArray(AIR_POSITIONS, Blocks.air.getDefaultState(), true, converters)) return false; if(!check2DArray(LIVINGWOOD_POSITIONS, ModBlocks.livingwood.getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT), false, converters)) @@ -305,7 +305,8 @@ public class TileAlfPortal extends TileMod { return true; } - private void lightPylons(Function... converters) { + @SafeVarargs + private final void lightPylons(Function... converters) { if(ticksOpen < 50) return; 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 ace0f4a03..fd3cc3ed1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -27,7 +27,6 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -154,7 +153,7 @@ public class TileAltar extends TileSimpleInventory implements ISidedInventory, I } public void saveLastRecipe() { - lastRecipe = new ArrayList(); + lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stack = getStackInSlot(i); if(stack == null) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index a2a169c62..29959c5bf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index 57fcd2459..a6889e5bb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; public class TileBifrost extends TileMod { 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 6fd2d81ee..42b2850f2 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -20,7 +20,6 @@ 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.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import vazkii.botania.api.BotaniaAPI; 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 ce5a86a62..2d1149197 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -22,7 +22,6 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; public class TileCocoon extends TileMod { 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 f60b948ed..8b814a1ff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -29,7 +29,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -68,7 +67,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { int mana = 0; public ItemStack itemToEnchant = null; - List enchants = new ArrayList(); + List enchants = new ArrayList<>(); private static final BlockPos[] OBSIDIAN_LOCATIONS = { new BlockPos(0, -1, 0), diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index 917034a47..fdaacca0b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -12,18 +12,15 @@ package vazkii.botania.common.block.tile; import java.util.List; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.WorldServer; import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.equipment.tool.ToolCommons; public class TileEnderEye extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index a2bdc8658..8e13f1a58 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; public class TileForestEye extends TileMod { 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 2456219c3..3edad2b90 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -18,7 +18,6 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index debde0414..afe409951 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.registry.GameData; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 47466a07c..5d75f4826 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -21,7 +21,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; @@ -109,7 +108,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } public BlockPos getEndpoint() { - List pointsPassed = new ArrayList(); + List pointsPassed = new ArrayList<>(); TileLightRelay relay = this; BlockPos lastCoords = null; 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 1f697d583..11a9c10ea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaBeacon.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; public class TileManaBeacon extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 263d43cc9..63a3c625b 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index fca46222d..56853d8ac 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -16,7 +16,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; -import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; 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 6293b142f..97b9d3754 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -21,7 +21,6 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; @@ -177,7 +176,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor } public void saveLastRecipe() { - lastRecipe = new ArrayList(); + lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stack = getStackInSlot(i); if(stack == null) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 6acc2d432..0611990f9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -31,7 +31,7 @@ public class TileSparkChanger extends TileSimpleInventory { return; ItemStack changeStack = getStackInSlot(0); - List attachables = new ArrayList(); + List attachables = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof ISparkAttachable) { 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 5935975a4..ad0a8f308 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -19,7 +19,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.MobSpawnerBaseLogic; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; 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 7aa691c78..7441440c0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -22,7 +22,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index 58707948c..8ab7f4f0f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; import vazkii.botania.common.Botania; public class TileSpiritShrine extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 9c8df7544..48b5b049e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -10,10 +10,8 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; public class TileStarfield extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index eff85c483..b6d381e53 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -19,7 +19,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 1df9195e7..acd6e5173 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.util.ITickable; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index b80cfc69d..579752e6e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; public class TileTinyPotato extends TileMod { diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index d709d2ed2..55cfb963a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -15,7 +15,6 @@ import java.util.List; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import vazkii.botania.api.corporea.CorporeaHelper; import vazkii.botania.api.corporea.ICorporeaRequestor; import vazkii.botania.api.corporea.ICorporeaSpark; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index 11d3798e6..beae3b9e8 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -24,7 +24,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.ChatStyle; @@ -50,9 +49,9 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public static final double RADIUS = 2.5; private static InputHandler input; - public static final Set indexes = Collections.newSetFromMap(new WeakHashMap()); + public static final Set indexes = Collections.newSetFromMap(new WeakHashMap<>()); - private static final Map patterns = new LinkedHashMap(); + private static final Map patterns = new LinkedHashMap<>(); /** * (name) = Item name, or "this" for the name of the item in your hand @@ -285,7 +284,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } public static List getNearbyIndexes(EntityPlayer player) { - List indexList = new ArrayList(); + List indexList = new ArrayList<>(); for(TileCorporeaIndex index : indexes) if(isInRangeOfIndex(player, index) && index.worldObj.isRemote == player.worldObj.isRemote) indexList.add(index); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index b458fd02f..7a72445ea 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -88,11 +88,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } public List getFilter() { - List filter = new ArrayList(); - - final int[] orientationToDir = new int[] { - 3, 4, 2, 5 - }; + List filter = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); 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 ac5c251b0..d7ee9fdeb 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 @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.block.BlockFurnace; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 101db37f4..4c056e423 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block.tile.mana; import java.util.ArrayList; import java.util.List; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import vazkii.botania.api.internal.VanillaPacketDispatcher; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 3f7780184..b89ab3846 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -12,13 +12,11 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.base.Predicates; import net.minecraft.entity.Entity; -import net.minecraft.util.ITickable; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileMod; public class TileManaDetector extends TileMod implements IManaCollisionGhost { 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 64f4d567a..c537922a7 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 @@ -28,7 +28,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.BlockPos; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index 7f25aca3e..798f8063a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -13,12 +13,10 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.collect.ImmutableMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; -import net.minecraft.util.ITickable; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.IAnimationProvider; -import net.minecraftforge.client.model.animation.ITimeValue; import net.minecraftforge.client.model.animation.TimeValues; import net.minecraftforge.common.model.animation.IAnimationStateMachine; import net.minecraftforge.fml.common.FMLCommonHandler; 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 bbb501dcb..923e21b49 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 @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile.mana; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index a4230ff83..b687ac4a7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -16,7 +16,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 76918d040..1e36e4f5c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -12,14 +12,12 @@ package vazkii.botania.common.block.tile.string; import net.minecraft.block.Block; import net.minecraft.init.Blocks; -import net.minecraft.util.ITickable; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.wand.ITileBound; -import vazkii.botania.common.block.string.BlockRedString; import vazkii.botania.common.block.tile.TileMod; public abstract class TileRedString extends TileMod implements ITileBound { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index daf0f777b..ace85b64e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -15,14 +15,13 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ITickable; import net.minecraft.util.BlockPos; import net.minecraft.world.World; import vazkii.botania.api.state.BotaniaStateProps; public class TileRedStringInterceptor extends TileRedString { - public static List interceptors = new ArrayList(); + public static List interceptors = new ArrayList<>(); @Override public void updateEntity() { @@ -40,11 +39,11 @@ public class TileRedStringInterceptor extends TileRedString { } public static void onInteract(EntityPlayer player, World world, BlockPos pos) { - List remove = new ArrayList(); + List remove = new ArrayList<>(); boolean did = false; // CMEs are amazing - List interceptorsCopy = new ArrayList(interceptors); + List interceptorsCopy = new ArrayList<>(interceptors); for(TileRedStringInterceptor inter : interceptorsCopy) { if(!inter.removeFromList()) { diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 03e191859..5f69e8527 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -12,7 +12,6 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.brew.Brew; import vazkii.botania.common.lib.LibBrewNames; diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index 0df286d58..ae0e1e013 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -10,9 +10,6 @@ */ package vazkii.botania.common.brew; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; - import net.minecraft.potion.Potion; import vazkii.botania.common.brew.potion.PotionAllure; import vazkii.botania.common.brew.potion.PotionBloodthirst; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 7e7bdfee7..2787ae62c 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -28,7 +28,7 @@ import vazkii.botania.common.lib.LibMisc; public final class BotaniaCreativeTab extends CreativeTabs { public static BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); - List list; + List list; public BotaniaCreativeTab() { super(LibMisc.MOD_ID); @@ -52,7 +52,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllReleventItems(List list) { + public void displayAllReleventItems(List list) { this.list = list; addItem(ModItems.lexicon); 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 513378357..ceb77abca 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -26,7 +26,6 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import vazkii.botania.common.Botania; import vazkii.botania.common.lib.LibMisc; -import vazkii.botania.common.lib.LibPotionNames; import net.minecraftforge.fml.client.event.ConfigChangedEvent; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; @@ -358,8 +357,8 @@ public final class ConfigHandler { private int lastBuild; private int currentBuild; - private Map> adaptableValues = new HashMap(); - private List changes = new ArrayList(); + private Map> adaptableValues = new HashMap<>(); + private List changes = new ArrayList<>(); public ConfigAdaptor(boolean enabled) { this.enabled = enabled; @@ -408,7 +407,7 @@ public final class ConfigHandler { AdaptableValue adapt = new AdaptableValue<>(version, val); if(!adaptableValues.containsKey(key)) { - ArrayList list = new ArrayList(); + 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 ad7e47b87..ed67b1d4e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/IMCHandler.java @@ -1,7 +1,5 @@ package vazkii.botania.common.core.handler; -import java.util.Iterator; - import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 72225f35d..50f6ba0e1 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -104,12 +104,12 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public LexiconPage petalRecipesPage(String key, List recipes) { - return new PagePetalRecipe(key, recipes); + return new PagePetalRecipe<>(key, recipes); } @Override public LexiconPage petalRecipePage(String key, RecipePetals recipe) { - return new PagePetalRecipe(key, recipe); + return new PagePetalRecipe<>(key, recipe); } @Override diff --git a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java index 564344fe7..0eb8f8009 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ManaNetworkHandler.java @@ -30,8 +30,8 @@ public final class ManaNetworkHandler implements IManaNetwork { public static final ManaNetworkHandler instance = new ManaNetworkHandler(); - public WeakHashMap> manaPools = new WeakHashMap(); - public WeakHashMap> manaCollectors = new WeakHashMap(); + public WeakHashMap> manaPools = new WeakHashMap<>(); + public WeakHashMap> manaCollectors = new WeakHashMap<>(); @SubscribeEvent public void onNetworkEvent(ManaNetworkEvent event) { @@ -124,7 +124,7 @@ public final class ManaNetworkHandler implements IManaNetwork { List tiles; if(!map.containsKey(world)) - map.put(world, new ArrayList()); + map.put(world, new ArrayList<>()); tiles = map.get(world); @@ -144,7 +144,7 @@ public final class ManaNetworkHandler implements IManaNetwork { private List getAllInWorld(Map> map, World world) { if(!map.containsKey(world)) - return new ArrayList(); + return new ArrayList<>(); return map.get(world); } 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 1d3a491ef..5ad5c24a8 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -93,9 +93,7 @@ public final class SheddingHandler { defaultNames.add(pattern.getEntityString()); } - for(Object o : EntityList.stringToClassMapping.entrySet()) { - Entry entry = (Entry) o; - + for(Entry> entry : EntityList.stringToClassMapping.entrySet()) { if(EntityLiving.class.isAssignableFrom(entry.getValue())) { String name = entry.getKey(); if(!defaultNames.contains(name)) diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index c97f68e07..0fff7af5a 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1631,7 +1631,7 @@ public final class ModCraftingRecipes { }); for(int i = 0; i < count; i++) { - List recipe = new ArrayList(); + List recipe = new ArrayList<>(); for(int j = 0; j < 3; j++) { String s = ""; for(int k = 0; k < 3; k++) @@ -1785,8 +1785,8 @@ public final class ModCraftingRecipes { recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); // 1.8 Stone Recipes - recipe18StoneBrick = new ArrayList(); - recipe18StoneChisel = new ArrayList(); + recipe18StoneBrick = new ArrayList<>(); + recipe18StoneChisel = new ArrayList<>(); for(int i = 0; i < 4; i++) { addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 4, i + 8), "SS", "SS", diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index d247b00c2..93a6d4716 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -24,12 +24,12 @@ public class ModElvenTradeRecipes { public static void init() { dreamwoodRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.dreamwood), LibOreDict.LIVING_WOOD); - elementiumRecipes = new ArrayList(); + elementiumRecipes = new ArrayList<>(); elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 7), LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL)); elementiumRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 2), new ItemStack(ModBlocks.storage), new ItemStack(ModBlocks.storage))); pixieDustRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 8), LibOreDict.MANA_PEARL); - dragonstoneRecipes = new ArrayList(); + dragonstoneRecipes = new ArrayList<>(); dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.manaResource, 1, 9), LibOreDict.MANA_DIAMOND)); dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModBlocks.storage, 1, 3))); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java index 5fb553fc4..14ba92411 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -55,7 +55,7 @@ public final class ModManaAlchemyRecipes { public static void init() { leatherRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.leather), new ItemStack(Items.rotten_flesh), 600); - woodRecipes = new ArrayList(); + woodRecipes = new ArrayList<>(); woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 0), new ItemStack(Blocks.log2, 1, 1), 40)); woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 1), new ItemStack(Blocks.log, 1, 0), 40)); woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log, 1, 2), new ItemStack(Blocks.log, 1, 1), 40)); @@ -63,12 +63,12 @@ public final class ModManaAlchemyRecipes { woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log2, 1, 0), new ItemStack(Blocks.log, 1, 3), 40)); woodRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.log2, 1, 1), new ItemStack(Blocks.log2, 1, 0), 40)); - saplingRecipes = new ArrayList(); + saplingRecipes = new ArrayList<>(); for(int i = 0; i < 6; i++) saplingRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.sapling, 1, i == 5 ? 0 : i + 1), new ItemStack(Blocks.sapling, 1, i), 120)); glowstoneDustRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.glowstone_dust, 4), new ItemStack(Blocks.glowstone), 25); - quartzRecipes = new ArrayList(); + quartzRecipes = new ArrayList<>(); quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.quartz, 4), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE), 25)); if(ConfigHandler.darkQuartzEnabled) quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 0), new ItemStack(ModFluffBlocks.darkQuartz, 1, Short.MAX_VALUE), 25)); @@ -81,15 +81,15 @@ public final class ModManaAlchemyRecipes { chiseledBrickRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick), 150); iceRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.ice), new ItemStack(Blocks.snow), 2250); - swampFolliageRecipes = new ArrayList(); + swampFolliageRecipes = new ArrayList<>(); swampFolliageRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.waterlily), new ItemStack(Blocks.vine), 320)); swampFolliageRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.vine), new ItemStack(Blocks.waterlily), 320)); - fishRecipes = new ArrayList(); + fishRecipes = new ArrayList<>(); for(int i = 0; i < 4; i++) fishRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.fish, 1, i == 3 ? 0 : i + 1), new ItemStack(Items.fish, 1, i), 200)); - cropRecipes = new ArrayList(); + cropRecipes = new ArrayList<>(); cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.wheat_seeds), new ItemStack(Items.dye, 1, 3), 6000)); cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.potato), new ItemStack(Items.wheat), 6000)); cropRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.carrot), new ItemStack(Items.potato), 6000)); @@ -100,30 +100,30 @@ public final class ModManaAlchemyRecipes { potatoRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.potato), new ItemStack(Items.poisonous_potato), 1200); netherWartRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.nether_wart), new ItemStack(Items.blaze_rod), 4000); - gunpowderAndFlintRecipes = new ArrayList(); + gunpowderAndFlintRecipes = new ArrayList<>(); gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.flint), new ItemStack(Items.gunpowder), 200)); gunpowderAndFlintRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.gunpowder), new ItemStack(Items.flint), 4000)); nameTagRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.name_tag), new ItemStack(Items.writable_book), 16000); - stringRecipes = new ArrayList(); + stringRecipes = new ArrayList<>(); for(int i = 0; i < 16; i++) stringRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.string, 3), new ItemStack(Blocks.wool, 1, i), 100)); - slimeballCactusRecipes = new ArrayList(); + slimeballCactusRecipes = new ArrayList<>(); slimeballCactusRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.slime_ball), new ItemStack(Blocks.cactus), 1200)); slimeballCactusRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.cactus), new ItemStack(Items.slime_ball), 1200)); enderPearlRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.ender_pearl), new ItemStack(Items.ghast_tear), 28000); - redstoneToGlowstoneRecipes = new ArrayList(); + redstoneToGlowstoneRecipes = new ArrayList<>(); redstoneToGlowstoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.redstone), new ItemStack(Items.glowstone_dust), 300)); redstoneToGlowstoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(Items.redstone), 300)); sandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Blocks.cobblestone), 50); redSandRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Block.getBlockFromName("sand"), 1, 1), new ItemStack(Blocks.hardened_clay), 50); - clayBreakdownRecipes = new ArrayList(); + clayBreakdownRecipes = new ArrayList<>(); clayBreakdownRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.clay_ball, 4), new ItemStack(Blocks.clay), 25)); clayBreakdownRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.brick, 4), new ItemStack(Blocks.brick_block), 25)); @@ -132,19 +132,19 @@ public final class ModManaAlchemyRecipes { prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.prismarine_shard), new ItemStack(Items.quartz), 200); if(ConfigHandler.stones18Enabled) { - stoneRecipes = new ArrayList(); + stoneRecipes = new ArrayList<>(); stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), "stone", 200)); // Stone->Andesite todo 1.8.8 might want to un-OD this? stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 3), new ItemStack(Blocks.stone, 1, 5), 200)); // Andesite->Diorite stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 1), new ItemStack(Blocks.stone, 1, 3), 200)); // Diorite->Granite stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.stone, 1, 5), new ItemStack(Blocks.stone, 1, 1), 200)); // Granite->Andesite } - tallgrassRecipes = new ArrayList(); + tallgrassRecipes = new ArrayList<>(); tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.deadbush), new ItemStack(Blocks.tallgrass, 1, 2), 500)); tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.tallgrass, 1, 1), new ItemStack(Blocks.deadbush), 500)); tallgrassRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.tallgrass, 1, 2), new ItemStack(Blocks.tallgrass, 1, 1), 500)); - flowersRecipes = new ArrayList(); + flowersRecipes = new ArrayList<>(); flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower), new ItemStack(Blocks.yellow_flower), 400)); flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Blocks.red_flower), 400)); flowersRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.red_flower, 1, 2), new ItemStack(Blocks.red_flower, 1, 1), 400)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java index 3923d2df1..998f28901 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -43,7 +43,7 @@ public class ModManaConjurationRecipes { soulSandRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.soul_sand, 2), new ItemStack(Blocks.soul_sand), 1500); gravelRecipe = BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Block.getBlockFromName("gravel"), 2), new ItemStack(Block.getBlockFromName("gravel")), 720); - leavesRecipes = new ArrayList(); + leavesRecipes = new ArrayList<>(); for(int i = 0; i < 4; i++) leavesRecipes.add(BotaniaAPI.registerManaConjurationRecipe(new ItemStack(Blocks.leaves, 2, i), new ItemStack(Blocks.leaves, 1, i), 2000)); for(int i = 0; i < 2; i++) diff --git a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java index 832358cc9..c6defe32f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -44,17 +44,17 @@ public final class ModManaInfusionRecipes { public static RecipeManaInfusion sugarCaneRecipe; public static void init() { - manasteelRecipes = new ArrayList(); + manasteelRecipes = new ArrayList<>(); manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 0), "ingotIron", 3000)); manasteelRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 0), new ItemStack(Blocks.iron_block), 27000)); manaPearlRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 1), new ItemStack(Items.ender_pearl), 6000); - manaDiamondRecipes = new ArrayList(); + manaDiamondRecipes = new ArrayList<>(); manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 2), "gemDiamond", 10000)); manaDiamondRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(Blocks.diamond_block), 90000)); - manaPowderRecipes = new ArrayList(); + manaPowderRecipes = new ArrayList<>(); manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.gunpowder), 500)); manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.redstone), 500)); manaPowderRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.glowstone_dust), 500)); @@ -67,7 +67,7 @@ public final class ModManaInfusionRecipes { grassSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds), new ItemStack(Blocks.tallgrass, 1, 1), 2500); podzolSeedsRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 1), new ItemStack(Blocks.deadbush), 2500); - mycelSeedsRecipes = new ArrayList(); + mycelSeedsRecipes = new ArrayList<>(); mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.red_mushroom), 6500)); mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.brown_mushroom), 6500)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java index defe59666..cd5413d21 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -52,11 +52,11 @@ public final class ModRuneRecipes { recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 0), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.dye, 1, 15), new ItemStack(Items.reeds), new ItemStack(Items.fishing_rod)); recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 1), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.netherbrick), new ItemStack(Items.gunpowder), new ItemStack(Items.nether_wart)); - recipesEarthRune = new ArrayList(); + recipesEarthRune = new ArrayList<>(); recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", new ItemStack(Blocks.coal_block), new ItemStack(Blocks.brown_mushroom))); recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", new ItemStack(Blocks.coal_block), new ItemStack(Blocks.red_mushroom))); - recipesAirRune = new ArrayList(); + recipesAirRune = new ArrayList<>(); for(int i = 0; i < 16; i++) recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 3), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Blocks.carpet, 1, i), new ItemStack(Items.feather), new ItemStack(Items.string))); @@ -64,7 +64,7 @@ public final class ModRuneRecipes { recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 5), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Block.getBlockFromName("sand")), new ItemStack(Items.slime_ball), new ItemStack(Items.melon)); recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 6), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.spider_eye)); - recipesWinterRune = new ArrayList(); + recipesWinterRune = new ArrayList<>(); for(int i = 0; i < 16; i++) recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 7), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[2], new ItemStack(Blocks.snow), new ItemStack(Blocks.snow), new ItemStack(Blocks.wool, 1, i), new ItemStack(Items.cake))); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 2e8a5251e..e43ed9d48 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -37,9 +37,9 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final String TAG_INVIS = "invis"; ICorporeaSpark master; - List connections = new ArrayList(); - List connectionsClient = new ArrayList(); - List relatives = new ArrayList(); + List connections = new ArrayList<>(); + List connectionsClient = new ArrayList<>(); + List relatives = new ArrayList<>(); boolean firstUpdateClient = true; boolean firstUpdateServer = true; @@ -138,15 +138,15 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { void restartNetwork() { if(worldObj.isRemote) - connectionsClient = new ArrayList(); - else connections = new ArrayList(); - relatives = new ArrayList(); + connectionsClient = new ArrayList<>(); + else connections = new ArrayList<>(); + relatives = new ArrayList<>(); if(master != null) { ICorporeaSpark oldMaster = master; master = null; - oldMaster.registerConnections(oldMaster, this, new ArrayList()); + oldMaster.registerConnections(oldMaster, this, new ArrayList<>()); } } @@ -266,7 +266,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { player.swingItem(); return true; } else { - displayRelatives(new ArrayList(), master); + displayRelatives(new ArrayList<>(), master); return true; } } else if(stack.getItem() == ModItems.dye) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 049bfdddf..68f680749 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -42,7 +42,6 @@ import net.minecraft.item.ItemRecord; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.pathfinding.PathNavigateGround; -import net.minecraft.pathfinding.PathNavigateSwimmer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntityBeacon; @@ -70,8 +69,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; -import vazkii.botania.common.lib.LibObfuscation; -import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -104,16 +101,14 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi new BlockPos(-4, 1, -4) }; - private static final List CHEATY_BLOCKS = Arrays.asList(new String[] { - "OpenBlocks:beartrap", - "ThaumicTinkerer:magnet" - }); + private static final List CHEATY_BLOCKS = Arrays.asList("OpenBlocks:beartrap", + "ThaumicTinkerer:magnet"); boolean spawnLandmines = false; boolean spawnPixies = false; boolean anyWithArmor = false; - List playersWhoAttacked = new ArrayList(); + List playersWhoAttacked = new ArrayList<>(); private static boolean isPlayingMusic = false; @@ -578,7 +573,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(player.inventory.armorInventory[0] != null || player.inventory.armorInventory[1] != null || player.inventory.armorInventory[2] != null || player.inventory.armorInventory[3] != null) anyWithArmor = true; - List remove = new ArrayList(); + List remove = new ArrayList<>(); Collection active = player.getActivePotionEffects(); for(PotionEffect effect : active) if(effect.getDuration() < 200 && effect.getIsAmbient() && !GameData.getPotionRegistry().getObjectById(effect.getPotionID()).isBadEffect()) diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 2924cc428..16b253f9e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -48,8 +48,8 @@ public class EntityEnderAirBottle extends EntityThrowable { } public List getCoordsToPut(BlockPos pos) { - List possibleCoords = new ArrayList(); - List selectedCoords = new ArrayList(); + List possibleCoords = new ArrayList<>(); + List selectedCoords = new ArrayList<>(); int range = 4; int rangeY = 4; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 6ca86b952..3956c1450 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -74,14 +74,14 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { final int dataWatcherEntries = 10; final int dataWatcherStart = 32 - dataWatcherEntries; - List alreadyCollidedAt = new ArrayList(); + List alreadyCollidedAt = new ArrayList<>(); boolean fullManaLastTick = true; UUID shooterIdentity = null; int _ticksExisted = 0; boolean scanBeam = false; - public List propsList = new ArrayList(); + public List propsList = new ArrayList<>(); public EntityManaBurst(World world) { super(world); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 44f9b5320..d81c5892c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -46,7 +46,7 @@ public class EntitySpark extends Entity implements ISparkEntity { private static final String TAG_INVIS = "invis"; public static final int INVISIBILITY_DATA_WATCHER_KEY = 27; - Set transfers = Collections.newSetFromMap(new WeakHashMap()); + Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); int removeTransferants = 2; boolean firstTick = false; @@ -93,11 +93,11 @@ public class EntitySpark extends Entity implements ISparkEntity { case 1 : { // Dispersive List players = SparkHelper.getEntitiesAround(EntityPlayer.class, worldObj, posX, posY, posZ); - Map> receivingPlayers = new HashMap(); + Map> receivingPlayers = new HashMap<>(); ItemStack input = new ItemStack(ModItems.spark); for(EntityPlayer player : players) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); stacks.addAll(Arrays.asList(player.inventory.mainInventory)); stacks.addAll(Arrays.asList(player.inventory.armorInventory)); stacks.addAll(Arrays.asList(PlayerHandler.getPlayerBaubles(player).stackList)); @@ -108,11 +108,11 @@ public class EntitySpark extends Entity implements ISparkEntity { IManaItem manaItem = (IManaItem) stack.getItem(); if(manaItem.canReceiveManaFromItem(stack, input)) { - Map receivingStacks; + Map receivingStacks; boolean add = false; if(!receivingPlayers.containsKey(player)) { add = true; - receivingStacks = new HashMap(); + receivingStacks = new HashMap<>(); } else receivingStacks = receivingPlayers.get(player); int recv = Math.min(getAttachedTile().getCurrentMana(), Math.min(TRANSFER_RATE, manaItem.getMaxMana(stack) - manaItem.getMana(stack))); @@ -126,7 +126,7 @@ public class EntitySpark extends Entity implements ISparkEntity { } if(!receivingPlayers.isEmpty()) { - List keys = new ArrayList(receivingPlayers.keySet()); + List keys = new ArrayList<>(receivingPlayers.keySet()); Collections.shuffle(keys); EntityPlayer player = keys.iterator().next(); @@ -142,7 +142,7 @@ public class EntitySpark extends Entity implements ISparkEntity { break; } case 2 : { // Dominant - List validSparks = new ArrayList(); + List validSparks = new ArrayList<>(); for(ISparkEntity spark : allSparks) { if(spark == this) continue; @@ -333,7 +333,7 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override public Collection getTransfers() { - Collection removals = new ArrayList(); + Collection removals = new ArrayList<>(); for(ISparkEntity e : transfers) { ISparkEntity spark = e; diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 3917aa036..fd422919c 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -34,7 +34,7 @@ public class Item16Colors extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index de7c4e33c..a143b341a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -37,13 +37,13 @@ public class ItemAncientWill extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), list); addStringToTooltip(StatCollector.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 0cafad050..135f2779b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -224,7 +224,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { Block block = getBlock(par1ItemStack); if(block != null && block != Blocks.air) { int count = getBlockCount(par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 15bde98a7..5e6fd8dca 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -36,7 +36,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -82,7 +82,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { list.add(StatCollector.translateToLocal("botaniamisc.lotusDesc")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 3f2fd30b2..70a4e2032 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -197,7 +197,7 @@ public class ItemBottledMana extends ItemMod { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { par3List.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index a6b1e36b5..29fc6cf3b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -107,7 +107,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(isDOIT(stack)) list.add(StatCollector.translateToLocal("botaniamisc.justDoIt")); else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false)) diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index f9e8cf8b7..4e7441146 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -33,7 +33,7 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index a8c95b7d2..d143cadfc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -43,7 +43,7 @@ public class ItemCraftPattern extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index d5a8db219..57b6f76c0 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -35,7 +35,7 @@ public class ItemFertilizer extends ItemMod { public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, BlockPos pos, EnumFacing side, float par8, float par9, float par10) { final int range = 3; if(!par3World.isRemote) { - List validCoords = new ArrayList(); + List validCoords = new ArrayList<>(); for(int i = -range - 1; i < range; i++) for(int j = -range - 1; j < range; j++) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 4c51a6cdc..51762dce2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -46,7 +46,7 @@ public class ItemGrassHorn extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -90,7 +90,7 @@ public class ItemGrassHorn extends ItemMod { Random rand = new Random(srcPos.hashCode()); int range = 12 - stackDmg * 3; int rangeY = 3 + stackDmg * 4; - List coords = new ArrayList(); + List coords = new ArrayList<>(); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) @@ -106,7 +106,7 @@ public class ItemGrassHorn extends ItemMod { int count = Math.min(coords.size(), 32 + stackDmg * 16); for(int i = 0; i < count; i++) { BlockPos currCoords = coords.get(i); - List items = new ArrayList(); + List items = new ArrayList<>(); IBlockState state = world.getBlockState(currCoords); Block block = state.getBlock(); items.addAll(block.getDrops(world, currCoords, state, 0)); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 63a8a6330..e0a0d8f9e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -47,7 +47,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static Map> blockSwappers = new HashMap>(); + private static Map> blockSwappers = new HashMap<>(); private static final IslandType[] ISLAND_TYPES = { IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, @@ -65,7 +65,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - public void getSubItems(Item par1, CreativeTabs par2, List par3) { + public void getSubItems(Item par1, CreativeTabs par2, List par3) { for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(par1, 1, i)); } @@ -199,7 +199,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { // If a set for the dimension doesn't exist, create it. int dim = world.provider.getDimensionId(); if(!blockSwappers.containsKey(dim)) - blockSwappers.put(dim, new HashSet()); + blockSwappers.put(dim, new HashSet<>()); // Add the block swapper blockSwappers.get(dim).add(swapper); @@ -294,7 +294,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * @param pos The positions to use. */ public void tickBlock(BlockPos pos) { - List validCoords = new ArrayList(); + List validCoords = new ArrayList<>(); // Go around this block and aggregate valid blocks. for(int xOffset = -TICK_RANGE; xOffset <= TICK_RANGE; xOffset++) { diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index e680c1be1..34fffa71d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -47,7 +47,7 @@ public class ItemKeepIvy extends ItemMod { @SubscribeEvent public void onPlayerDrops(PlayerDropsEvent event) { - List keeps = new ArrayList(); + List keeps = new ArrayList<>(); for(EntityItem item : event.drops) { ItemStack stack = item.getEntityItem(); if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 70fbde749..c7d46fd6c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -62,14 +62,14 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { list.add(String.format(StatCollector.translateToLocal("botaniamisc.shardLevel"), StatCollector.translateToLocal("botania.roman" + (stack.getItemDamage() + 1)))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 696f9a5f9..21a1e5944 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -77,7 +77,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { @@ -88,13 +88,13 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) { String edition = EnumChatFormatting.GOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), getEdition()); if(!edition.isEmpty()) par3List.add(edition); - List typesKnown = new ArrayList(); + List typesKnown = new ArrayList<>(); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { KnowledgeType type = BotaniaAPI.knowledgeTypes.get(s); if(isKnowledgeUnlocked(par1ItemStack, type)) diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 82d8de850..26d28ed09 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -180,7 +180,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { boolean clip = hasClip(par1ItemStack); if(clip && !GuiScreen.isShiftKeyDown()) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 69419cd8d..2d7369f0d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -43,7 +43,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { // Empty tablet par3List.add(new ItemStack(par1, 1)); @@ -76,7 +76,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(isStackCreative(par1ItemStack)) par3List.add(StatCollector.translateToLocal("botaniamisc.creative")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 51567f8b3..6138ca16b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -55,7 +55,7 @@ public class ItemPinkinator extends ItemMod { } @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { + public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) { p_77624_3_.add(StatCollector.translateToLocal("botaniamisc.pinkinatorDesc")); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java index bec50e261..2a8b94993 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java +++ b/src/main/java/vazkii/botania/common/item/ItemSignalFlare.java @@ -97,13 +97,13 @@ public class ItemSignalFlare extends ItemMod { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColor(i)); } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { int storedColor = getColor(par1ItemStack); par3List.add(String.format(StatCollector.translateToLocal("botaniamisc.flareColor"), StatCollector.translateToLocal("botania.color" + storedColor))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index db69ce687..95169e6f2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -27,7 +27,7 @@ public class ItemSparkUpgrade extends ItemMod { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 47f282b1f..cbe2e2e11 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -72,7 +72,7 @@ public class ItemSpawnerMover extends ItemMod { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { + public void addInformation(ItemStack stack, EntityPlayer player, List infoList, boolean advancedTooltips) { String id = getEntityId(stack); if (id != null) infoList.add(StatCollector.translateToLocal("entity." + id + ".name")); diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index e7365891b..c125c1d81 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -40,7 +40,7 @@ public class ItemTemperanceStone extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), par3List); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), par3List); diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index d1fc209f9..74de38345 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -32,7 +32,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 454f7fdd1..4c4a995e4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -201,7 +201,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(forColors(i, i)); } @@ -212,7 +212,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer p, List list, boolean adv) { list.add(StatCollector.translateToLocal(getModeString(stack))); } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index ab685bff4..04a13bb31 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -80,7 +80,7 @@ public class ItemVirus extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } 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 ad777e43e..17090a3f5 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -29,7 +29,7 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName { } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(par1ItemStack.getItemDamage() == 1) for(int i = 0; i < 2; i++) par3List.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i)); 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 9071aef24..76aa07c3b 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -72,7 +72,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { String type = getType(par1ItemStack); SubTileSignature sig = BotaniaAPI.getSignatureForName(type); 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 c320af626..9508d5955 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -106,7 +106,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); setBrew(stack, s); @@ -135,7 +135,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); for(PotionEffect effect : brew.getPotionEffects(stack)) { Potion potion = GameData.getPotionRegistry().getObjectById(effect.getPotionID()); 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 586fe4af1..1e4cb9507 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -42,7 +42,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); @@ -71,7 +71,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { Brew brew = getBrew(stack); if(brew == BotaniaAPI.fallbackBrew) { addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), list); 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 886bacd8a..e257763e7 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -33,7 +33,7 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } 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 8beb0f3ea..08b72458c 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 @@ -153,13 +153,13 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(GuiScreen.isShiftKeyDown()) addInformationAfterShift(stack, player, list, adv); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), list); } - public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { addStringToTooltip(getArmorSetTitle(player), list); addArmorSetDescription(stack, list); ItemStack[] stacks = getArmorSetStacks(); 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 9bbe8b5eb..d3079f326 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 @@ -99,7 +99,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi } @Override - public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addInformationAfterShift(ItemStack stack, EntityPlayer player, List list, boolean adv) { if(ClientProxy.jingleTheBells) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.santaweaveInfo"), list); addStringToTooltip("", list); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 65b844d6c..9d1fe1633 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -55,8 +55,8 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { } @Override - public Multimap getItemAttributeModifiers() { - Multimap multimap = HashMultimap.create(); + public Multimap getAttributeModifiers(ItemStack stack) { + Multimap multimap = HashMultimap.create(); UUID uuid = new UUID(getUnlocalizedName().hashCode(), 0); multimap.put(SharedMonsterAttributes.knockbackResistance.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type) / 20, 0)); return multimap; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 9c8cf32b7..acf038103 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -82,13 +82,13 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { if(GuiScreen.isShiftKeyDown()) addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), par3List); } - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { BaubleType type = getBaubleType(par1ItemStack); addStringToTooltip(StatCollector.translateToLocal("botania.baubletype." + type.name().toLowerCase()), par3List); 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 9c7c78337..a4f9ccd5e 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 @@ -21,7 +21,6 @@ import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.creativetab.CreativeTabs; @@ -59,7 +58,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -70,7 +69,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { addStringToTooltip(StatCollector.translateToLocal("botaniamisc.cosmeticBauble"), par3List); super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); } 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 9a74b33c8..e17235e9c 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 @@ -57,7 +57,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); @@ -86,7 +86,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { + public void addHiddenTooltip(ItemStack stack, EntityPlayer player, List list, boolean adv) { super.addHiddenTooltip(stack, player, list, adv); Brew brew = getBrew(stack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index b70fc9c63..6c48d4a49 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -97,13 +97,13 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); } @Override - public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addHiddenTooltip(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { super.addHiddenTooltip(par1ItemStack, par2EntityPlayer, par3List, par4); par3List.add(StatCollector.translateToLocal("botania.wings" + par1ItemStack.getItemDamage())); } 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 276cfc93c..a179de7a7 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 @@ -38,7 +38,7 @@ import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { - public static Map> playerIceBlocks = new HashMap(); + public static Map> playerIceBlocks = new HashMap<>(); public ItemIcePendant() { super(LibItemNames.ICE_PENDANT); @@ -79,7 +79,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { private void addIceBlock(EntityPlayer player, BlockPos coords) { String user = player.getName(); if(!playerIceBlocks.containsKey(user)) - playerIceBlocks.put(user, new ArrayList()); + playerIceBlocks.put(user, new ArrayList<>()); List ice = playerIceBlocks.get(user); if(player.worldObj.getBlockState(coords).getBlock() == Blocks.water && player.worldObj.getBlockState(coords).getValue(BlockLiquid.LEVEL) == 0) { 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 900336d00..a24717512 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 @@ -18,6 +18,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.BlockPos; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import vazkii.botania.api.BotaniaAPI; @@ -39,9 +40,7 @@ public class ItemMagnetRing extends ItemBauble { private static final String TAG_COOLDOWN = "cooldown"; - private static final List BLACKLIST = Arrays.asList(new String[] { - "appliedenergistics2:item.ItemCrystalSeed", - }); + private static final List BLACKLIST = Arrays.asList(new ResourceLocation("appliedenergistics2", "item.ItemCrystalSeed")); int range; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index adea2709d..b0a5569d5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -46,7 +46,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 10000)); } 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 30898c6e6..fe8e29dd0 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 @@ -45,7 +45,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs private static final int COST = 1; private static final int COST_INTERVAL = 10; - public static List playersWithStepup = new ArrayList(); + public static List playersWithStepup = new ArrayList<>(); final float speed; final float jump; 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 270645409..9649a30b8 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 @@ -45,7 +45,7 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase attacker) { if(!(entity instanceof EntityPlayer) && entity != null) { double range = 8; - final List alreadyTargetedEntities = new ArrayList(); + final List alreadyTargetedEntities = new ArrayList<>(); int dmg = 5; long lightningSeed = ItemNBTHelper.getLong(stack, TAG_LIGHTNING_SEED, 0); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 750709fc5..0ae64d402 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -1,8 +1,5 @@ package vazkii.botania.common.item.equipment.tool.elementium; -import java.util.Arrays; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; 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 d33594057..3d922372b 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 @@ -70,7 +70,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static Map> blockSwappers = new HashMap>(); + private static Map> blockSwappers = new HashMap<>(); public ItemTerraAxe() { super(BotaniaAPI.terrasteelToolMaterial, LibItemNames.TERRA_AXE); @@ -159,7 +159,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker // If the mapping for this dimension doesn't exist, create it. int dim = world.provider.getDimensionId(); if(!blockSwappers.containsKey(dim)) - blockSwappers.put(dim, new HashSet()); + blockSwappers.put(dim, new HashSet<>()); // Add the swapper blockSwappers.get(dim).add(swapper); @@ -250,8 +250,8 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker this.range = range; this.treatLeavesSpecial = leaves; - this.candidateQueue = new PriorityQueue(); - this.completedCoords = new HashSet(); + this.candidateQueue = new PriorityQueue<>(); + this.completedCoords = new HashSet<>(); // Add the origin to our candidate queue with the original range candidateQueue.offer(new SwapCandidate(this.origin, this.range)); @@ -325,7 +325,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } public List adjacent(BlockPos original) { - List coords = new ArrayList(); + List coords = new ArrayList<>(); // Visit all the surrounding blocks in the provided radius. // Gotta love these nested loops, right? for(int dx = -SINGLE_BLOCK_RADIUS; dx <= SINGLE_BLOCK_RADIUS; dx++) 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 9ebad941f..9fd919201 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 @@ -69,7 +69,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); setMana(stack, mana); @@ -78,7 +78,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { String rankFormat = StatCollector.translateToLocal("botaniamisc.toolRank"); String rank = StatCollector.translateToLocal("botania.rank" + getLevel(par1ItemStack)); par3List.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7")); diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index 89fc14312..fb8ab01cd 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -41,7 +41,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); } 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 e166998cb..a15aa7d02 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -144,26 +144,12 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens RecipeSorter.register("botania:lensDying", LensDyeingRecipe.class, Category.SHAPELESS, ""); } -// @Override todo 1.8 -// public void registerIcons(IIconRegister par1IconRegister) { -// iconGlass = IconHelper.forName(par1IconRegister, "lensInside"); -// -// ringIcons = new IIcon[SUBTYPES]; -// for(int i = 0; i < ringIcons.length; i++) -// ringIcons[i] = IconHelper.forName(par1IconRegister, LibItemNames.LENS_NAMES[i]); -// } - @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < SUBTYPES; i++) par3List.add(new ItemStack(par1, 1, i)); } -// @Override todo 1.8 -// public IIcon getIconFromDamageForRenderPass(int par1, int par2) { -// return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass; -// } - @Override public int getColorFromItemStack(ItemStack par1ItemStack, int par2) { return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 97343ee5d..54ffc4648 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -58,7 +58,7 @@ public class LensMine extends Lens { BlockPos coords = burst.getBurstSourceBlockPos(); if(!coords.equals(pos.getBlockPos()) && !(tile instanceof IManaBlock) && neededHarvestLevel <= harvestLevel && hardness != -1 && hardness < 50F && (burst.isFake() || mana >= 24)) { - List items = new ArrayList(); + List items = new ArrayList<>(); items.addAll(block.getDrops(world, pos_, world.getBlockState(pos_), 0)); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 4c284ed28..972ae6a21 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -46,14 +46,14 @@ public class LensPaint extends Lens { Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); if(BotaniaAPI.paintableBlocks.containsKey(block)) { IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); - List coordsToPaint = new ArrayList(); - List coordsFound = new ArrayList(); + List coordsToPaint = new ArrayList<>(); + List coordsFound = new ArrayList<>(); BlockPos theseCoords = pos.getBlockPos(); coordsFound.add(theseCoords); do { - List iterCoords = new ArrayList(coordsFound); + List iterCoords = new ArrayList<>(coordsFound); for(BlockPos coords : iterCoords) { coordsFound.remove(coords); coordsToPaint.add(coords); 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 7b82a977d..bd90b4008 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -117,7 +117,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < types; i++) if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) par3List.add(new ItemStack(par1, 1, i)); 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 52986ec16..2bbab22f0 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -30,7 +30,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } 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 43080b9a4..71bc42e17 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -34,7 +34,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev } @Override - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { for(int i = 0; i < 16; i++) par3List.add(new ItemStack(par1, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index bb5ca4be1..54f61b200 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -54,8 +54,8 @@ public class ItemDice extends ItemRelic { int side = SIDES_FOR_MOON_PHASES[moonPhase]; int relic = side; if(hasRelicAlready(player, relic)) { - List possible = new ArrayList(); - List alreadyHas = new ArrayList(); + List possible = new ArrayList<>(); + List alreadyHas = new ArrayList<>(); for(int i = 0; i < 6; i++) if(hasRelicAlready(player, i)) alreadyHas.add(i); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index f490db37c..629b7910d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -222,7 +222,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC private static List getCursorList(ItemStack stack) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_CURSOR_LIST, false); - List cursors = new ArrayList(); + List cursors = new ArrayList<>(); int count = cmp.getInteger(TAG_CURSOR_COUNT); for(int i = 0; i < count; i++) { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index a54fa2d2b..6e2a4f20e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -35,7 +35,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class ItemOdinRing extends ItemRelicBauble { - public static List damageNegations = new ArrayList(); + public static List damageNegations = new ArrayList<>(); Multimap attributes = HashMultimap.create(); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 88f93bfeb..39a8ef95c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -50,7 +50,7 @@ public class ItemRelic extends ItemMod implements IRelic { addBindInfo(p_77624_3_, p_77624_1_, p_77624_2_); } - public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { + public static void addBindInfo(List list, ItemStack stack, EntityPlayer player) { if(GuiScreen.isShiftKeyDown()) { String bind = getSoulbindUsernameS(stack); if(bind.isEmpty()) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 61f77f8d4..1dbfcf32e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -162,7 +162,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } // Our result list - List coordsList = new ArrayList(); + List coordsList = new ArrayList<>(); // We subtract 1 from the effective range as the center tile is included // So, with a range of 3, we are visiting tiles at -2, -1, 0, 1, 2 @@ -242,7 +242,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra } public static ItemStack removeFromInventory(EntityPlayer player, IInventory inv, ItemStack stack, Block block, int meta, boolean doit) { - List providers = new ArrayList(); + List providers = new ArrayList<>(); for(int i = inv.getSizeInventory() - 1; i >= 0; i--) { ItemStack invStack = inv.getStackInSlot(i); if(invStack == null) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 21eac8fbb..28a98d654 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -36,7 +36,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { private static final int COST = 300; private static final int COST_PER_TICK = COST / TIME; - public static Map playerData = new WeakHashMap(); + public static Map playerData = new WeakHashMap<>(); public ItemSmeltRod() { setUnlocalizedName(LibItemNames.SMELT_ROD); @@ -88,7 +88,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { p.worldObj.playSoundAtEntity(p, "fire.fire", 1F, 1F); ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, true); - playerData.remove(p.getGameProfile().getName()); + playerData.remove(p); decremented = false; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 91708249d..fe354c105 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -108,7 +108,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP int yStart = yCenter + range; - List blocks = new ArrayList(); + List blocks = new ArrayList<>(); for(int i = -range; i < range + 1; i++) for(int j = -range; j < range + 1; j++) { @@ -124,7 +124,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP for(int id : ids) if(validBlocks.contains(OreDictionary.getOreName(id))) { boolean hasAir = false; - List airBlocks = new ArrayList(); + List airBlocks = new ArrayList<>(); for(EnumFacing dir : LibMisc.CARDINAL_DIRECTIONS) { BlockPos pos_ = pos.offset(dir); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index cbda1bf31..9ded7b9af 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -1,10 +1,6 @@ package vazkii.botania.common.item.rod; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemBucket; import net.minecraft.item.ItemStack; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index c7f1083e3..36fdcb9b5 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -22,7 +22,6 @@ 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; @@ -901,7 +900,7 @@ public final class LexiconData { cosmeticBaubles = new BLexiconEntry(LibLexicon.BAUBLE_COSMETIC, categoryBaubles); { - List pages = new ArrayList(); + List pages = new ArrayList<>(); pages.add(new PageText("0")); pages.add(new PageText("1")); for(int i = 0; i < 32; i++) diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index d238ce118..9714d0e79 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -64,7 +64,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { int i = 0; y = gui.getTop() + gui.getHeight() - 54; - List inputs = new ArrayList(recipe.getInputs()); + List inputs = new ArrayList<>(recipe.getInputs()); int offset = gui.getWidth() / 2 - inputs.size() * 9; for(Object input : inputs) { @@ -98,7 +98,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(recipe.getOutput(new ItemStack(ModItems.vial))); return list; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java index 231e00020..026cb8d22 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -54,7 +55,7 @@ public class PageCraftingRecipe extends PageRecipe { } public PageCraftingRecipe(String unlocalizedName, IRecipe recipe) { - this(unlocalizedName, Arrays.asList(recipe)); + this(unlocalizedName, Collections.singletonList(recipe)); } @Override @@ -89,7 +90,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 0, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Arrays.asList(StatCollector.translateToLocal("botaniamisc.shapeless"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(StatCollector.translateToLocal("botaniamisc.shapeless"))); iconY += 20; } @@ -101,7 +102,7 @@ public class PageCraftingRecipe extends PageRecipe { ((GuiScreen) gui).drawTexturedModalRect(iconX, iconY, 240, 16, 16, 16); if(mx >= iconX && my >= iconY && mx < iconX + 16 && my < iconY + 16) - RenderHelper.renderTooltip(mx, my, Arrays.asList(StatCollector.translateToLocal("botaniamisc.oredict"))); + RenderHelper.renderTooltip(mx, my, Collections.singletonList(StatCollector.translateToLocal("botaniamisc.oredict"))); } GlStateManager.disableBlend(); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index 60bddbfaf..29ab0746c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -2,6 +2,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -39,7 +40,7 @@ public class PageElvenRecipe extends PageRecipe { } public PageElvenRecipe(String unlocalizedName, RecipeElvenTrade recipe) { - this(unlocalizedName, Arrays.asList(recipe)); + this(unlocalizedName, Collections.singletonList(recipe)); } @Override @@ -114,7 +115,7 @@ public class PageElvenRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(RecipeElvenTrade r : recipes) list.add(r.getOutput()); 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 a2e7745b3..9d115f811 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -39,7 +39,7 @@ public class PageEntity extends LexiconPage{ Class EntityClass = (Class) EntityList.stringToClassMapping.get(entity); this.size = size; try { - entityConstructor = EntityClass.getConstructor(new Class[] {World.class}); + entityConstructor = EntityClass.getConstructor(World.class); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index c56a06618..523955f04 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -55,7 +56,7 @@ public class PageManaInfusionRecipe extends PageRecipe { } public PageManaInfusionRecipe(String unlocalizedName, RecipeManaInfusion recipe) { - this(unlocalizedName, Arrays.asList(recipe)); + this(unlocalizedName, Collections.singletonList(recipe)); } @Override @@ -154,7 +155,7 @@ public class PageManaInfusionRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(RecipeManaInfusion r : recipes) list.add(r.getOutput()); 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 ddbbcd94c..ac07018e7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -103,7 +103,7 @@ public class PageMultiblock extends LexiconPage { GlStateManager.pushMatrix(); GlStateManager.translate(0F, 0F, 200F); if(mx >= x && mx < x + 16 && my >= y && my < y + 16) { - List mats = new ArrayList(); + List mats = new ArrayList<>(); mats.add(StatCollector.translateToLocal("botaniamisc.materialsRequired")); for(ItemStack stack : mb.materials) { String size = "" + stack.stackSize; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java index ba3ca60c1..709286060 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -51,7 +52,7 @@ public class PagePetalRecipe extends PageRecipe { } public PagePetalRecipe(String unlocalizedName, T recipe) { - this(unlocalizedName, Arrays.asList(recipe)); + this(unlocalizedName, Collections.singletonList(recipe)); } @Override @@ -133,7 +134,7 @@ public class PagePetalRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(T r : recipes) list.add(r.getOutput()); 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 c3c03cb7f..54aaef122 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -63,7 +64,7 @@ public class PageRecipe extends LexiconPage { if(tooltipStack != null) { List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); - List parsedTooltip = new ArrayList(); + List parsedTooltip = new ArrayList<>(); boolean first = true; for(String s : tooltipData) { @@ -79,7 +80,7 @@ public class PageRecipe extends LexiconPage { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Arrays.asList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); tooltipY += 18; } 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 dd7f67494..f04d63823 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -12,6 +12,7 @@ package vazkii.botania.common.lexicon.page; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import net.minecraft.client.Minecraft; @@ -79,7 +80,7 @@ public class PageShedding extends PageEntity { if(tooltipStack != null) { List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); - List parsedTooltip = new ArrayList(); + List parsedTooltip = new ArrayList<>(); boolean first = true; for(String s : tooltipData) { @@ -95,12 +96,12 @@ public class PageShedding extends PageEntity { int tooltipY = 8 + tooltipData.size() * 11; if(tooltipEntry) { - vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Arrays.asList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); + vazkii.botania.client.core.helper.RenderHelper.renderTooltipOrange(mx, my + tooltipY, Collections.singletonList(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToRecipe"))); tooltipY += 18; } } else if(tooltipEntity) { - List parsedTooltip = new ArrayList(); + List parsedTooltip = new ArrayList<>(); parsedTooltip.add(EntityList.getEntityString(dummyEntity)); vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, parsedTooltip); } @@ -147,7 +148,7 @@ public class PageShedding extends PageEntity { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(shedStack); return list; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java index 1dc170972..5a14d194b 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -91,7 +91,7 @@ public class PageTerrasteel extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(new ItemStack(ModItems.manaResource, 1, 4)); return list; } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java index da05a5159..70c80a625 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageText.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageText.java @@ -57,11 +57,11 @@ public class PageText extends LexiconPage { String text = StatCollector.translateToLocal(unlocalizedText).replaceAll("&", "\u00a7"); String[] textEntries = text.split("
"); - List> lines = new ArrayList(); + List> lines = new ArrayList<>(); String controlCodes = ""; for(String s : textEntries) { - List words = new ArrayList(); + List words = new ArrayList<>(); String lineStr = ""; String[] tokens = s.split(" "); for(String token : tokens) { @@ -73,7 +73,7 @@ public class PageText extends LexiconPage { if(font.getStringWidth(lineStr) > width) { lines.add(words); lineStr = controlCodes + spaced; - words = new ArrayList(); + words = new ArrayList<>(); } words.add(controlCodes + token); @@ -81,7 +81,7 @@ public class PageText extends LexiconPage { if(!lineStr.isEmpty()) lines.add(words); - lines.add(new ArrayList()); + lines.add(new ArrayList<>()); } int i = 0;