From e8fb04df37c60c759a0f9541a576d1b78decdc18 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Mon, 13 Jan 2025 07:13:56 +0100 Subject: [PATCH] Small Cleanup (#68) Co-authored-by: Martin Robertz --- dependencies.gradle | 8 +- .../java/vazkii/botania/api/BotaniaAPI.java | 52 +- .../java/vazkii/botania/api/brew/Brew.java | 2 +- .../botania/api/corporea/CorporeaHelper.java | 14 +- .../api/internal/DummyManaNetwork.java | 4 +- .../api/internal/VanillaPacketDispatcher.java | 2 +- .../botania/api/lexicon/LexiconCategory.java | 2 +- .../botania/api/lexicon/LexiconEntry.java | 8 +- .../api/lexicon/LexiconRecipeMappings.java | 2 +- .../multiblock/IMultiblockRenderHook.java | 2 +- .../api/lexicon/multiblock/Multiblock.java | 6 +- .../component/MultiblockComponent.java | 2 +- .../vazkii/botania/api/recipe/RecipeBrew.java | 6 +- .../botania/api/recipe/RecipeElvenTrade.java | 8 +- .../botania/api/recipe/RecipePetals.java | 6 +- .../vazkii/botania/api/wiki/WikiHooks.java | 2 +- .../client/challenge/ModChallenges.java | 6 +- .../core/handler/ClientTickHandler.java | 2 +- .../handler/ContributorFancinessHandler.java | 2 +- .../handler/CorporeaAutoCompleteHandler.java | 14 +- .../client/core/handler/HUDHandler.java | 2 +- .../client/core/handler/LightningHandler.java | 10 +- .../core/handler/RedStringRenderer.java | 2 +- .../TooltipAdditionDisplayHandler.java | 2 +- .../client/core/proxy/ClientProxy.java | 1 - .../vazkii/botania/client/fx/FXSparkle.java | 4 +- .../java/vazkii/botania/client/fx/FXWisp.java | 4 +- .../botania/client/gui/GuiBotaniaConfig.java | 2 +- .../client/gui/bags/SlotMagicPlant.java | 1 - .../client/gui/lexicon/GuiLexicon.java | 12 +- .../client/gui/lexicon/GuiLexiconHistory.java | 2 +- .../client/gui/lexicon/GuiLexiconIndex.java | 2 +- .../lexicon/button/GuiButtonAchievement.java | 2 +- .../gui/lexicon/button/GuiButtonBookmark.java | 2 +- .../button/GuiButtonChallengeIcon.java | 2 +- .../button/GuiButtonChallengeInfo.java | 2 +- .../lexicon/button/GuiButtonChallenges.java | 2 +- .../gui/lexicon/button/GuiButtonDoot.java | 2 +- .../gui/lexicon/button/GuiButtonHistory.java | 2 +- .../gui/lexicon/button/GuiButtonNotes.java | 2 +- .../gui/lexicon/button/GuiButtonOptions.java | 2 +- .../button/GuiButtonUpdateWarning.java | 2 +- .../integration/nei/NEIInputHandler.java | 7 +- .../nei/recipe/RecipeHandlerBrewery.java | 2 +- .../nei/recipe/RecipeHandlerElvenTrade.java | 2 +- .../recipe/RecipeHandlerFloatingFlowers.java | 2 +- .../recipe/RecipeHandlerLexicaBotania.java | 19 +- .../nei/recipe/RecipeHandlerManaPool.java | 6 +- .../recipe/RecipeHandlerPetalApothecary.java | 2 +- .../nei/recipe/RecipeHandlerPureDaisy.java | 6 +- .../botania/client/model/ModelPump.java | 6 +- .../render/tile/RenderTileSkullOverride.java | 2 +- .../render/world/SkyblockRenderEvents.java | 1 - .../render/world/SkyblockSkyRenderer.java | 3 - .../botania/common/CustomBotaniaAPI.java | 3 +- .../common/achievement/AchievementMod.java | 2 +- .../botania/common/block/BlockAlfPortal.java | 5 +- .../botania/common/block/BlockAltar.java | 4 +- .../botania/common/block/BlockAvatar.java | 5 +- .../botania/common/block/BlockBifrost.java | 5 +- .../common/block/BlockCacophonium.java | 6 +- .../botania/common/block/BlockCell.java | 7 +- .../botania/common/block/BlockCocoon.java | 7 +- .../botania/common/block/BlockEnderEye.java | 5 +- .../botania/common/block/BlockFakeAir.java | 7 +- .../block/BlockFloatingSpecialFlower.java | 5 +- .../botania/common/block/BlockForestEye.java | 5 +- .../botania/common/block/BlockGaiaHead.java | 2 +- .../botania/common/block/BlockHourglass.java | 5 +- .../common/block/BlockIncensePlate.java | 5 +- .../common/block/BlockLightLauncher.java | 2 +- .../botania/common/block/BlockLightRelay.java | 5 +- .../common/block/BlockModDoubleFlower.java | 6 +- .../botania/common/block/BlockOpenCrate.java | 4 +- .../common/block/BlockPistonRelay.java | 14 +- .../botania/common/block/BlockPylon.java | 5 +- .../common/block/BlockSparkChanger.java | 5 +- .../common/block/BlockSpecialFlower.java | 6 +- .../common/block/BlockTeruTeruBozu.java | 5 +- .../botania/common/block/BlockTinyPlanet.java | 5 +- .../botania/common/block/ModBlocks.java | 2 +- .../block/corporea/BlockCorporeaRetainer.java | 5 +- .../block/decor/BlockFloatingFlower.java | 6 +- .../common/block/decor/BlockManaBeacon.java | 5 +- .../common/block/decor/BlockManaFlame.java | 7 +- .../common/block/decor/BlockStarfield.java | 5 +- .../common/block/decor/BlockTinyPotato.java | 6 +- .../common/block/decor/IFloatingFlower.java | 2 +- .../common/block/mana/BlockBellows.java | 5 +- .../common/block/mana/BlockBrewery.java | 5 +- .../common/block/mana/BlockDistributor.java | 5 +- .../common/block/mana/BlockEnchanter.java | 5 +- .../common/block/mana/BlockForestDrum.java | 2 +- .../common/block/mana/BlockManaDetector.java | 5 +- .../common/block/mana/BlockManaVoid.java | 5 +- .../botania/common/block/mana/BlockPool.java | 6 +- .../botania/common/block/mana/BlockPrism.java | 4 +- .../botania/common/block/mana/BlockPump.java | 5 +- .../common/block/mana/BlockRFGenerator.java | 4 +- .../common/block/mana/BlockRuneAltar.java | 5 +- .../common/block/mana/BlockSpawnerClaw.java | 5 +- .../common/block/mana/BlockSpreader.java | 4 +- .../common/block/mana/BlockTerraPlate.java | 5 +- .../common/block/mana/BlockTurntable.java | 5 +- .../subtile/functional/SubTileClayconia.java | 2 +- .../functional/SubTileHeiseiDream.java | 4 +- .../subtile/functional/SubTileHopperhock.java | 5 +- .../functional/SubTileMarimorphosis.java | 4 +- .../subtile/functional/SubTileOrechid.java | 4 +- .../functional/SubTileRannuncarpus.java | 3 +- .../subtile/functional/SubTileSolegnolia.java | 2 +- .../subtile/functional/SubTileTigerseye.java | 4 +- .../subtile/functional/SubTileVinculotus.java | 4 +- .../generating/SubTileDandelifeon.java | 3 +- .../subtile/generating/SubTileEndoflame.java | 1 - .../subtile/generating/SubTileMunchdew.java | 2 +- .../botania/common/block/tile/TileAltar.java | 2 +- .../common/block/tile/TileEnchanter.java | 2 +- .../common/block/tile/TileLightRelay.java | 2 +- .../common/block/tile/TileSparkChanger.java | 4 +- .../common/block/tile/TileSpawnerClaw.java | 2 +- .../tile/corporea/TileCorporeaFunnel.java | 2 +- .../tile/corporea/TileCorporeaIndex.java | 6 +- .../corporea/TileCorporeaInterceptor.java | 2 +- .../block/tile/mana/TileDistributor.java | 2 +- .../tile/string/TileRedStringInterceptor.java | 6 +- .../common/brew/potion/PotionBloodthirst.java | 1 - .../common/brew/potion/PotionEmptiness.java | 1 - .../common/core/BotaniaCreativeTab.java | 2 +- .../common/core/handler/ConfigHandler.java | 11 +- .../core/handler/InternalMethodHandler.java | 6 +- .../common/core/handler/SheddingHandler.java | 8 +- .../common/core/helper/InventoryHelper.java | 2 +- .../common/crafting/ModCraftingRecipes.java | 8 +- .../common/crafting/ModElvenTradeRecipes.java | 4 +- .../crafting/ModManaAlchemyRecipes.java | 28 +- .../crafting/ModManaConjurationRecipes.java | 2 +- .../crafting/ModManaInfusionRecipes.java | 8 +- .../common/crafting/ModRuneRecipes.java | 6 +- .../common/entity/EntityCorporeaSpark.java | 16 +- .../common/entity/EntityDoppleganger.java | 4 +- .../common/entity/EntityEnderAirBottle.java | 4 +- .../common/entity/EntityMagicMissile.java | 2 +- .../common/entity/EntityManaBurst.java | 6 +- .../botania/common/entity/EntitySpark.java | 16 +- .../common/entity/EntityThrowableCopy.java | 2 +- .../common/entity/EntityThrownItem.java | 2 +- .../buildcraft/StatementAPIPlugin.java | 4 +- .../corporea/WrappedDeepStorage.java | 2 +- .../corporea/WrappedIInventory.java | 2 +- .../corporea/WrappedInventoryBase.java | 2 +- .../corporea/WrappedStorageDrawers.java | 2 +- .../multipart/MultipartHandler.java | 5 - .../botania/common/item/ItemCraftingHalo.java | 2 +- .../botania/common/item/ItemFertilizer.java | 2 +- .../botania/common/item/ItemGrassHorn.java | 5 +- .../botania/common/item/ItemGrassSeeds.java | 6 +- .../botania/common/item/ItemKeepIvy.java | 2 +- .../botania/common/item/ItemLexicon.java | 4 +- .../botania/common/item/ItemOpenBucket.java | 1 - .../botania/common/item/bag/ItemBagBase.java | 3 - .../armor/terrasteel/ItemTerrasteelArmor.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 2 +- .../item/equipment/bauble/ItemIcePendant.java | 6 +- .../item/equipment/bauble/ItemTravelBelt.java | 2 +- .../item/equipment/tool/ItemThunderSword.java | 2 +- .../tool/elementium/ItemElementiumPick.java | 3 - .../tool/terrasteel/ItemTerraAxe.java | 10 +- .../tool/terrasteel/ItemTerraPick.java | 3 - .../botania/common/item/lens/LensMine.java | 2 +- .../botania/common/item/lens/LensPaint.java | 6 +- .../botania/common/item/material/ItemDye.java | 5 - .../botania/common/item/relic/ItemDice.java | 4 +- .../common/item/relic/ItemLokiRing.java | 14 +- .../common/item/relic/ItemOdinRing.java | 2 +- .../common/item/rod/ItemExchangeRod.java | 4 +- .../common/item/rod/ItemGravityRod.java | 6 +- .../botania/common/item/rod/ItemSmeltRod.java | 2 +- .../common/item/rod/ItemTerraformRod.java | 4 +- .../botania/common/lexicon/LexiconData.java | 85 ++-- .../botania/common/lexicon/page/PageBrew.java | 4 +- .../lexicon/page/PageCraftingRecipe.java | 2 +- .../common/lexicon/page/PageElvenRecipe.java | 2 +- .../common/lexicon/page/PageEntity.java | 4 +- .../lexicon/page/PageManaInfusionRecipe.java | 2 +- .../common/lexicon/page/PageMultiblock.java | 2 +- .../common/lexicon/page/PagePetalRecipe.java | 2 +- .../common/lexicon/page/PageRecipe.java | 6 +- .../common/lexicon/page/PageShedding.java | 6 +- .../common/lexicon/page/PageTerrasteel.java | 2 +- .../botania/common/lexicon/page/PageText.java | 8 +- .../common/network/PacketLokiClear.java | 1 - .../common/network/PacketLokiMirror.java | 1 - .../common/world/SkyblockWorldEvents.java | 5 - .../common/world/WorldTypeSkyblock.java | 1 - .../resources/assets/botania/lang/en_US.lang | 449 ++++++++++++++++++ 196 files changed, 887 insertions(+), 543 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index ae0db7b82..b84cc33b4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,13 +7,13 @@ dependencies { compileOnly('com.github.GTNewHorizons:Railcraft:9.16.0:api') {transitive=false} compileOnly('com.github.GTNewHorizons:StorageDrawers:2.0.5-GTNH:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev') - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.1:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.8-GTNH:dev') + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.40:api') {transitive=false} api('com.github.GTNewHorizons:GTNHLib:0.6.0:dev') compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') - devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev') + devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.8-GTNH:dev') } diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 2fc841b3b..11cfd8d29 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -60,37 +60,37 @@ import cpw.mods.fml.common.Loader; public final class BotaniaAPI { - private static List categories = new ArrayList(); - private static List allEntries = new ArrayList(); + private static List categories = new ArrayList<>(); + private static List allEntries = new ArrayList<>(); - public static Map knowledgeTypes = new HashMap(); + public static Map knowledgeTypes = new HashMap<>(); - public static Map brewMap = new LinkedHashMap(); + public static Map brewMap = new LinkedHashMap<>(); - public static List 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(); - public static List manaInfusionRecipes = new ArrayList(); - public static List runeAltarRecipes = new ArrayList(); - public static List elvenTradeRecipes = new ArrayList(); - public static List brewRecipes = new ArrayList(); - public static List miniFlowerRecipes = new ArrayList(); + public static List petalRecipes = new ArrayList<>(); + public static List pureDaisyRecipes = new ArrayList<>(); + public static List manaInfusionRecipes = new ArrayList<>(); + public static List runeAltarRecipes = new ArrayList<>(); + public static List elvenTradeRecipes = new ArrayList<>(); + public static List brewRecipes = new ArrayList<>(); + public static List miniFlowerRecipes = new ArrayList<>(); private static BiMap> subTiles = HashBiMap.> create(); - private static Map, SubTileSignature> subTileSignatures = new HashMap, SubTileSignature>(); - public static Set subtilesForCreativeMenu = new LinkedHashSet(); - public static Map subTileMods = new HashMap(); + private static Map, SubTileSignature> subTileSignatures = new HashMap<>(); + public static Set subtilesForCreativeMenu = new LinkedHashSet<>(); + public static Map subTileMods = new HashMap<>(); public static BiMap miniFlowers = HashBiMap. create(); - public static Map oreWeights = new HashMap(); - public static Map oreWeightsNether = new HashMap(); - public static Map seeds = new HashMap(); - public static Set looniumBlacklist = new LinkedHashSet(); - public static Set paintableBlocks = new LinkedHashSet(); - public static Set magnetBlacklist = new LinkedHashSet(); - public static Set> gravityRodBlacklist = new LinkedHashSet>(); + public static Map oreWeights = new HashMap<>(); + public static Map oreWeightsNether = new HashMap<>(); + public static Map seeds = new HashMap<>(); + public static Set looniumBlacklist = new LinkedHashSet<>(); + public static Set paintableBlocks = new LinkedHashSet<>(); + public static Set magnetBlacklist = new LinkedHashSet<>(); + public static Set> gravityRodBlacklist = new LinkedHashSet<>(); public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", 16, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); @@ -317,7 +317,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); } @@ -325,7 +325,7 @@ public final class BotaniaAPI { * Checks if the provided Entity is contained in the Blacklist. * Pass in the class for the Entity, e.g. entity.getClass() */ - public static boolean isEntityBlacklistedFromGravityRod(Class entity) { + public static boolean isEntityBlacklistedFromGravityRod(Class entity) { return gravityRodBlacklist.contains(entity); } @@ -634,7 +634,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 d4934d7da..afa0e9f98 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -29,9 +29,9 @@ import vazkii.botania.api.BotaniaAPI; public final class CorporeaHelper { - private static final List empty = Collections.unmodifiableList(new ArrayList()); - private static final WeakHashMap, List> cachedNetworks = new WeakHashMap(); - private static final List autoCompleteControllers = new ArrayList(); + private static final List empty = Collections.unmodifiableList(new ArrayList<>()); + 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]"); @@ -64,7 +64,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) { @@ -125,7 +125,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<>(); List wrappedInventories = BotaniaAPI.internalHandler.wrapInventory(inventories); for (IWrappedInventory inv : wrappedInventories) { CorporeaRequest request = new CorporeaRequest(stack, checkNBT, -1); @@ -166,14 +166,14 @@ public final class CorporeaHelper { * purposes of counting huge amounts. */ 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); List inventoriesW = BotaniaAPI.internalHandler.wrapInventory(inventories); - Map interceptors = new HashMap(); + Map interceptors = new HashMap<>(); CorporeaRequest request = new CorporeaRequest(matcher, checkNBT, itemCount); for(IWrappedInventory inv : inventoriesW) { diff --git a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java index f74d0cac9..353687d3b 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java @@ -39,12 +39,12 @@ public class DummyManaNetwork implements IManaNetwork { @Override public List getAllCollectorsInWorld(World world) { - return new ArrayList(); + return new ArrayList<>(); } @Override public List getAllPoolsInWorld(World world) { - return new ArrayList(); + return new ArrayList<>(); } } diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index dff8b9636..bd01808e5 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -20,7 +20,7 @@ public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { World world = tile.getWorldObj(); - List players = world.playerEntities; + List players = world.playerEntities; for(Object player : players) if(player instanceof EntityPlayerMP) { EntityPlayerMP mp = (EntityPlayerMP) player; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java index 06f678d0d..ec30651b7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconCategory.java @@ -20,7 +20,7 @@ public class LexiconCategory implements Comparable { private static int count = 0; public final String unlocalizedName; - public final List entries = new ArrayList(); + public final List entries = new ArrayList<>(); private final int sortingId; private ResourceLocation icon; private int priority = 5; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 2bc025065..3a894ab14 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -27,11 +27,11 @@ public class LexiconEntry implements Comparable { private KnowledgeType type = BotaniaAPI.basicKnowledge; - public List pages = new ArrayList(); + public List pages = new ArrayList<>(); private boolean priority = false; private ItemStack icon = null; - 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 9d05c40d9..cac06ba20 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, Block block, int meta, RenderBlocks renderBlocks, 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 4cf34b858..02671146f 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -27,12 +27,12 @@ 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 int minX, minY, minZ, maxX, maxY, maxZ, offX, offY, offZ; - public HashMap, MultiblockComponent> locationCache = new HashMap, MultiblockComponent>(); + public HashMap, MultiblockComponent> locationCache = new HashMap<>(); /** * Adds a multiblock component to this multiblock. The component's x y z diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index b1a7d895f..350b9d6e7 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -39,7 +39,7 @@ public class MultiblockComponent { } public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, TileEntity tileEntity) { - this(relPos, block, meta, block.hasTileEntity() == (tileEntity != null), tileEntity); + this(relPos, block, meta, block.hasTileEntity(0) == (tileEntity != null), tileEntity); } public MultiblockComponent(ChunkCoordinates relPos, Block block, int meta, boolean doFancyRender, TileEntity tileEntity) { 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 312b65cc5..72851919b 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) { @@ -80,7 +80,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/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index ae42fd82e..ecdae1962 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) { UniqueIdentifier mod = GameRegistry.findUniqueIdentifierFor(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/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 3f88f926a..9604d443d 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 2a652019b..e6010c8f3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -68,7 +68,7 @@ public final class ContributorFancinessHandler { } public static void load(Properties props) { - flowerMap = new HashMap(); + flowerMap = new HashMap<>(); 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 b33560e04..e11f53992 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -39,10 +39,10 @@ public class CorporeaAutoCompleteHandler { boolean isAutoCompleted = false; String originalString = ""; - List completions = new ArrayList(); + List completions = new ArrayList<>(); int position; - static TreeSet itemNames = new TreeSet( + static TreeSet itemNames = new TreeSet<>( new Comparator() { @Override public int compare(String arg0, String arg1) { @@ -55,7 +55,7 @@ public class CorporeaAutoCompleteHandler { public static void updateItemList() { itemNames.clear(); Iterator iterator = Item.itemRegistry.iterator(); - ArrayList curList = new ArrayList(); + ArrayList curList = new ArrayList<>(); while(iterator.hasNext()) { Item item = iterator.next(); @@ -144,9 +144,9 @@ public class CorporeaAutoCompleteHandler { private ArrayList getNames(String prefix) { String s = prefix.trim(); if(s.isEmpty()) - return new ArrayList(); + return new ArrayList<>(); - TreeSet result = new TreeSet(); + TreeSet result = new TreeSet<>(); String[] words = s.split(" "); int i = words.length - 1; String curPrefix = words[i]; @@ -156,11 +156,11 @@ public class CorporeaAutoCompleteHandler { if(i >= 0) curPrefix = words[i] + " " + curPrefix; } - return new ArrayList(result); + return new ArrayList<>(result); } private List getNamesStartingWith(String prefix) { - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); int length = prefix.length(); SortedSet after = itemNames.tailSet(prefix); for(String str : after) { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 576ae446e..879275ab6 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -128,7 +128,7 @@ public final class HUDHandler { renderCrystalCubeHUD(event.resolution, (TileCorporeaCrystalCube) tile); } - if(!TileCorporeaIndex.getInputHandler().getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { + if(!TileCorporeaIndex.InputHandler.getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { profiler.startSection("nearIndex"); renderNearIndexDisplay(event.resolution); profiler.endSection(); diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index d66b638a3..399292fc0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -174,11 +174,11 @@ public class LightningHandler { public static class LightningBolt { - public ArrayList segments = new ArrayList(); + public ArrayList segments = new ArrayList<>(); public Vector3 start; public Vector3 end; ChunkCoordinates target; - HashMap splitparents = new HashMap(); + HashMap splitparents = new HashMap<>(); public double length; public int numsegments0; @@ -195,7 +195,7 @@ public class LightningHandler { private World world; private Entity source; - public static ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue(); + public static ConcurrentLinkedQueue boltlist = new ConcurrentLinkedQueue<>(); public float speed = 1.5F; public static final int fadetime = 20; @@ -347,7 +347,7 @@ public class LightningHandler { return; ArrayList oldsegments = segments; - segments = new ArrayList(); + segments = new ArrayList<>(); Segment prev = null; @@ -428,7 +428,7 @@ public class LightningHandler { } private void calculateCollisionAndDiffs() { - HashMap lastactivesegment = new HashMap(); + HashMap lastactivesegment = new HashMap<>(); Collections.sort(segments, new SegmentSorter()); diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index fdcd0a268..ce671ce0a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -29,7 +29,7 @@ import vazkii.botania.common.item.ModItems; 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 e7e7b8337..4bc557db3 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/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index b21b86732..0d6ea988d 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -124,7 +124,6 @@ import vazkii.botania.client.render.tile.RenderTileTerraPlate; import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu; import vazkii.botania.client.render.tile.RenderTileTinyPotato; import vazkii.botania.client.render.world.SkyblockRenderEvents; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.block.tile.TileAltar; diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 61a563631..a9271060c 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -31,8 +31,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 05ad91c98..7e5d9e73e 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -31,8 +31,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/GuiBotaniaConfig.java b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java index 4f9d20e1b..07e690712 100644 --- a/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java +++ b/src/main/java/vazkii/botania/client/gui/GuiBotaniaConfig.java @@ -20,7 +20,7 @@ import cpw.mods.fml.client.config.GuiConfig; public class GuiBotaniaConfig extends GuiConfig { public GuiBotaniaConfig(GuiScreen parentScreen) { - super(parentScreen, new ConfigElement(ConfigHandler.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), LibMisc.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath(ConfigHandler.config.toString())); + super(parentScreen, new ConfigElement<>(ConfigHandler.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), LibMisc.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath(ConfigHandler.config.toString())); } } diff --git a/src/main/java/vazkii/botania/client/gui/bags/SlotMagicPlant.java b/src/main/java/vazkii/botania/client/gui/bags/SlotMagicPlant.java index 6f8b351ec..e347cce49 100644 --- a/src/main/java/vazkii/botania/client/gui/bags/SlotMagicPlant.java +++ b/src/main/java/vazkii/botania/client/gui/bags/SlotMagicPlant.java @@ -5,7 +5,6 @@ import net.minecraft.block.Block; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import vazkii.botania.common.block.ModBlocks; public abstract class SlotMagicPlant extends Slot { 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 e329a7122..3d134bd2b 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -70,7 +70,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"; @@ -79,11 +79,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); @@ -130,7 +130,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; @@ -483,7 +483,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 2f1d23054..79511b263 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java @@ -57,7 +57,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 822add343..9a0ebeb28 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 @@ -37,7 +37,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon { GL11.glColor4f(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/GuiButtonBookmark.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonBookmark.java index 8f972bb1e..768513833 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 { field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(field_146123_n); - 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 b75da43aa..46d7c4d06 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 @@ -52,7 +52,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 0dd4fe65a..5aafcb3e9 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 { field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(field_146123_n); - 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/GuiButtonChallenges.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java index 826dfa2c5..e6e2803be 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonChallenges.java @@ -37,7 +37,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon { GL11.glColor4f(1F, 1F, 1F, 1F); drawTexturedModalRect(xPosition, yPosition, k == 2 ? 131 : 120, 180, 11, 11); - List tooltip = new ArrayList(); + List tooltip = new ArrayList<>(); tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.challenges")); int tooltipY = (tooltip.size() - 1) * 10; 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 1b2646b9e..c0744bba0 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 @@ -46,7 +46,7 @@ public class GuiButtonDoot extends GuiButtonLexicon { GL11.glDisable(GL11.GL_LIGHTING); - 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 b5f1fd75e..78235273b 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 { field_146123_n = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(field_146123_n); - 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 28729ab7d..761d7e7c3 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 @@ -40,7 +40,7 @@ public class GuiButtonNotes extends GuiButtonLexicon { GL11.glColor4f(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 013f9bceb..53786d1ba 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 @@ -37,7 +37,7 @@ public class GuiButtonOptions extends GuiButtonLexicon { GL11.glColor4f(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/GuiButtonUpdateWarning.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonUpdateWarning.java index 7f50bc672..8a1cbbaab 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 @@ -44,7 +44,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon { GL11.glColor4f(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/integration/nei/NEIInputHandler.java b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java index e1ea06188..3025c4ec2 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java +++ b/src/main/java/vazkii/botania/client/integration/nei/NEIInputHandler.java @@ -16,7 +16,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; -import net.minecraft.util.MathHelper; import codechicken.nei.LayoutManager; import codechicken.nei.NEIClientConfig; import codechicken.nei.guihook.GuiContainerManager; @@ -39,11 +38,11 @@ public class NEIInputHandler implements IContainerInputHandler { if(stack != null && stack.getItem() != null) { int count = 1; int max = stack.getMaxStackSize(); - if(gui.isShiftKeyDown()) { + if(GuiScreen.isShiftKeyDown()) { count = max; - if(gui.isCtrlKeyDown()) + if(GuiScreen.isCtrlKeyDown()) count /= 4; - } else if(gui.isCtrlKeyDown()) + } else if(GuiScreen.isCtrlKeyDown()) count = max / 2; if(count > 0) { diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java index 0f4a091e9..64e3bfe15 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerBrewery.java @@ -25,7 +25,7 @@ public class RecipeHandlerBrewery extends TemplateRecipeHandler { public class CachedBreweryRecipe extends CachedRecipe { - public List inputs = new ArrayList(); + public List inputs = new ArrayList<>(); public PositionedStack output; public int mana; diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java index 1b3e39fed..81a744c5b 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerElvenTrade.java @@ -28,7 +28,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { public class CachedElvenTradeRecipe extends CachedRecipe { - public List inputs = new ArrayList(); + public List inputs = new ArrayList<>(); public PositionedStack output; public CachedElvenTradeRecipe(RecipeElvenTrade recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java index d1a1f397a..9801c436d 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerFloatingFlowers.java @@ -19,7 +19,7 @@ public class RecipeHandlerFloatingFlowers extends TemplateRecipeHandler { public class CachedFloatingFlowerRecipe extends CachedRecipe { - public List inputs = new ArrayList(); + public List inputs = new ArrayList<>(); public PositionedStack output; public CachedFloatingFlowerRecipe(ItemStack floatingFlower, ItemStack specialFlower, ItemStack output) { diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java index ea1933074..fe5d660c3 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerLexicaBotania.java @@ -18,36 +18,19 @@ import java.util.List; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; - -import org.lwjgl.opengl.GL11; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.api.recipe.RecipeManaInfusion; -import vazkii.botania.client.core.handler.HUDHandler; -import vazkii.botania.client.integration.nei.recipe.RecipeHandlerManaPool.CachedManaPoolRecipe; import vazkii.botania.client.lib.LibResources; -import vazkii.botania.client.render.tile.RenderTilePool; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.mana.TilePool; -import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lexicon.page.PageRecipe; import vazkii.botania.common.lexicon.page.PageText; -import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe; -import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect; public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { @@ -55,7 +38,7 @@ public class RecipeHandlerLexicaBotania extends TemplateRecipeHandler { public LexiconEntry entry; public PositionedStack item; - public List otherStacks = new ArrayList(); + public List otherStacks = new ArrayList<>(); public CachedLexicaBotaniaRecipe(ItemStack stack, LexiconEntry entry) { otherStacks.add(new PositionedStack(new ItemStack(ModItems.lexicon), 51, 5)); diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java index fe9192188..6f5af8490 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerManaPool.java @@ -2,7 +2,6 @@ package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import net.minecraft.client.Minecraft; @@ -23,7 +22,6 @@ import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -32,9 +30,9 @@ public class RecipeHandlerManaPool extends TemplateRecipeHandler { public class CachedManaPoolRecipe extends CachedRecipe { - public List inputs = new ArrayList(); + public List inputs = new ArrayList<>(); public PositionedStack output; - public List otherStacks = new ArrayList(); + public List otherStacks = new ArrayList<>(); public int mana; public CachedManaPoolRecipe(RecipeManaInfusion recipe) { diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java index f085bfb57..80196b8a7 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPetalApothecary.java @@ -25,7 +25,7 @@ public class RecipeHandlerPetalApothecary extends TemplateRecipeHandler { public class CachedPetalApothecaryRecipe extends CachedRecipe { - public List inputs = new ArrayList(); + public List inputs = new ArrayList<>(); public PositionedStack output; public CachedPetalApothecaryRecipe(RecipePetals recipe, boolean addCenterItem) { diff --git a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java index a4a49890a..f02d24a09 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java +++ b/src/main/java/vazkii/botania/client/integration/nei/recipe/RecipeHandlerPureDaisy.java @@ -2,7 +2,6 @@ package vazkii.botania.client.integration.nei.recipe; import java.awt.Rectangle; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import net.minecraft.block.Block; @@ -19,7 +18,6 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import codechicken.lib.gui.GuiDraw; -import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; @@ -27,9 +25,9 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { public class CachedPureDaisyRecipe extends CachedRecipe { - public List inputs = new ArrayList(); + public List inputs = new ArrayList<>(); public PositionedStack output; - public List otherStacks = new ArrayList(); + public List otherStacks = new ArrayList<>(); public CachedPureDaisyRecipe(RecipePureDaisy recipe) { if(recipe == null) diff --git a/src/main/java/vazkii/botania/client/model/ModelPump.java b/src/main/java/vazkii/botania/client/model/ModelPump.java index e869a3d5e..3f5e9dd97 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPump.java +++ b/src/main/java/vazkii/botania/client/model/ModelPump.java @@ -17,10 +17,10 @@ import net.minecraft.client.model.ModelRenderer; public class ModelPump extends ModelBase{ - private ArrayList parts = new ArrayList(); + private ArrayList parts = new ArrayList<>(); - private ArrayList innerRing = new ArrayList(); - private ArrayList outerRing = new ArrayList(); + private ArrayList innerRing = new ArrayList<>(); + private ArrayList outerRing = new ArrayList<>(); public ModelPump() { textureWidth = 64; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java index 5d49f06fe..cf6705e05 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java @@ -46,7 +46,7 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer { if(gaia) resourcelocation = minecraft.thePlayer.getLocationSkin(); else if(gameProfile != null) { - Map map = minecraft.func_152342_ad().func_152788_a(gameProfile); + Map map = minecraft.func_152342_ad().func_152788_a(gameProfile); if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) { resourcelocation = minecraft.func_152342_ad().func_152792_a((MinecraftProfileTexture)map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN); diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index 3f4ba4ca2..7cd711a55 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -16,7 +16,6 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.world.WorldTypeSkyblock; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import java.util.stream.IntStream; public final class SkyblockRenderEvents { 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 39cc7a216..90c677133 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -52,7 +52,6 @@ public class SkyblockSkyRenderer extends IRenderHandler { return; int glSkyList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST); - int glSkyList2 = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.GL_SKY_LIST2); // Horizon line. We don't have it here int starGLCallList = ReflectionHelper.getPrivateValue(RenderGlobal.class, mc.renderGlobal, LibObfuscation.STAR_GL_CALL_LIST); GL11.glDisable(GL11.GL_TEXTURE_2D); @@ -181,8 +180,6 @@ public class SkyblockSkyRenderer extends IRenderHandler { GL11.glRotatef(220F, 1F, 0F, 0F); GL11.glColor4f(1F, 1F, 1F, a); int angles = 90; - float s = 3F; - float m = 1F; float y = 2F; float y0 = 0F; float uPer = 1F / 360F; diff --git a/src/main/java/vazkii/botania/common/CustomBotaniaAPI.java b/src/main/java/vazkii/botania/common/CustomBotaniaAPI.java index 0bf1db8bc..eb91ba345 100644 --- a/src/main/java/vazkii/botania/common/CustomBotaniaAPI.java +++ b/src/main/java/vazkii/botania/common/CustomBotaniaAPI.java @@ -5,8 +5,7 @@ import vazkii.botania.api.recipe.IFlowerComponent; import java.util.HashMap; import java.util.Map; -import java.util.Set; public class CustomBotaniaAPI { - public static Map extraFlowerComponents = new HashMap(); + public static Map extraFlowerComponents = new HashMap<>(); } 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/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 2e8245885..4fa921ada 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -14,7 +14,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -27,7 +26,7 @@ import vazkii.botania.common.block.tile.TileAlfPortal; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { +public class BlockAlfPortal extends BlockModContainer implements IWandable, ILexiconable { IIcon iconOff, iconOn; public static IIcon portalTex; @@ -52,7 +51,7 @@ public class BlockAlfPortal extends BlockModContainer implements IWandable, ILex } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileAlfPortal createNewTileEntity(World world, int meta) { return new TileAlfPortal(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 01abb60f4..443c1bc15 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -48,7 +48,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockAltar extends BlockModContainer implements ILexiconable { +public class BlockAltar extends BlockModContainer implements ILexiconable { Random random; @@ -230,7 +230,7 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileAltar createNewTileEntity(World world, int meta) { return new TileAltar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index f6eed4756..6f696acf2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -21,7 +21,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.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -37,7 +36,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockAvatar extends BlockModContainer implements ILexiconable { +public class BlockAvatar extends BlockModContainer implements ILexiconable { private static final int[] META_ROTATIONS = new int[] { 2, 5, 3, 4 }; @@ -166,7 +165,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileAvatar createNewTileEntity(World world, int meta) { return new TileAvatar(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 8f2736bd7..2b57c5341 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -35,7 +34,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class BlockBifrost extends BlockModContainer implements ILexiconable { +public class BlockBifrost extends BlockModContainer implements ILexiconable { public BlockBifrost() { super(Material.glass); @@ -100,7 +99,7 @@ public class BlockBifrost extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileBifrost createNewTileEntity(World world, int meta) { return new TileBifrost(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index d0129c4fa..aaf9a7573 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -25,7 +25,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.block.tile.TileCacophonium; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCacophonium extends BlockModContainer { +public class BlockCacophonium extends BlockModContainer { IIcon top; @@ -79,7 +79,7 @@ public class BlockCacophonium extends BlockModContainer { @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList stacks = new ArrayList(); + ArrayList stacks = new ArrayList<>(); TileEntity tile = world.getTileEntity(x, y, z); if(tile != null && tile instanceof TileCacophonium) { @@ -93,7 +93,7 @@ public class BlockCacophonium extends BlockModContainer { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileCacophonium createNewTileEntity(World world, int meta) { return new TileCacophonium(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index b538b2372..a1a7939b4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -23,7 +22,7 @@ import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCell extends BlockModContainer implements ILexiconable { +public class BlockCell extends BlockModContainer implements ILexiconable { public BlockCell() { super(Material.gourd); @@ -33,11 +32,11 @@ public class BlockCell extends BlockModContainer implements ILexiconable { @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileCell createNewTileEntity(World world, int meta) { return new TileCell(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index bcf82a503..5f090fcd8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -18,7 +18,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -28,7 +27,7 @@ import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCocoon extends BlockModContainer implements ILexiconable { +public class BlockCocoon extends BlockModContainer implements ILexiconable { protected BlockCocoon() { super(Material.cloth); @@ -81,7 +80,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override @@ -90,7 +89,7 @@ public class BlockCocoon extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileCocoon createNewTileEntity(World world, int meta) { return new TileCocoon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java index 5ea86885a..2de1fb3fb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnderEye.java @@ -14,7 +14,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -25,7 +24,7 @@ import vazkii.botania.common.block.tile.TileEnderEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockEnderEye extends BlockModContainer implements ILexiconable { +public class BlockEnderEye extends BlockModContainer implements ILexiconable { IIcon iconOff, iconOn; @@ -59,7 +58,7 @@ public class BlockEnderEye extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileEnderEye createNewTileEntity(World world, int meta) { return new TileEnderEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index e55e11295..f6814ef51 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -18,7 +18,6 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; @@ -26,7 +25,7 @@ import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; -public class BlockFakeAir extends BlockModContainer { +public class BlockFakeAir extends BlockModContainer { public BlockFakeAir() { super(Material.air); @@ -93,7 +92,7 @@ public class BlockFakeAir extends BlockModContainer { @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - return new ArrayList(); // Empty List + return new ArrayList<>(); // Empty List } @Override @@ -107,7 +106,7 @@ public class BlockFakeAir extends BlockModContainer { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileFakeAir createNewTileEntity(World world, int meta) { return new TileFakeAir(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index c50430429..b9105a43b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -35,6 +35,7 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.tile.TileFloatingSpecialFlower; +import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.block.tile.TileSpecialFlower; import vazkii.botania.common.crafting.recipe.SpecialFloatingFlowerRecipe; import vazkii.botania.common.integration.coloredlights.LightHelper; @@ -115,7 +116,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(x, y, z); if(tile != null) { @@ -165,7 +166,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileMod createNewTileEntity(World world, int meta) { return new TileFloatingSpecialFlower(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockForestEye.java b/src/main/java/vazkii/botania/common/block/BlockForestEye.java index aa03b96cc..0434b85cf 100644 --- a/src/main/java/vazkii/botania/common/block/BlockForestEye.java +++ b/src/main/java/vazkii/botania/common/block/BlockForestEye.java @@ -14,7 +14,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -24,7 +23,7 @@ import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockForestEye extends BlockModContainer implements ILexiconable { +public class BlockForestEye extends BlockModContainer implements ILexiconable { IIcon[] icons; @@ -71,7 +70,7 @@ public class BlockForestEye extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileForestEye createNewTileEntity(World world, int meta) { return new TileForestEye(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 9b49819a9..6200f9e1c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -57,7 +57,7 @@ public class BlockGaiaHead extends BlockSkull { @Override public ArrayList getDrops(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, int p_149749_6_, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); if((p_149749_6_ & 8) == 0) { ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 99c51a1d5..9c16f4811 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.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.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -40,7 +39,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockHourglass extends BlockModContainer implements IManaTrigger, IWandable, IWandHUD, ILexiconable { +public class BlockHourglass extends BlockModContainer implements IManaTrigger, IWandable, IWandHUD, ILexiconable { Random random; @@ -173,7 +172,7 @@ public class BlockHourglass extends BlockModContainer implements IManaTrigger, I } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileHourglass createNewTileEntity(World world, int meta) { return new TileHourglass(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 1a44465f0..0b27be55f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -17,7 +17,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -32,7 +31,7 @@ import vazkii.botania.common.block.tile.TileIncensePlate; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockIncensePlate extends BlockModContainer implements ILexiconable { +public class BlockIncensePlate extends BlockModContainer implements ILexiconable { private static final int[] META_ROTATIONS = new int[] { 2, 5, 3, 4 }; @@ -142,7 +141,7 @@ public class BlockIncensePlate extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileIncensePlate createNewTileEntity(World world, int meta) { return new TileIncensePlate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index dc0d407fa..db8bc7c9c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -71,7 +71,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } public void pickUpEntities(World world, int x, int y, int z) { - List relays = new ArrayList(); + List relays = new ArrayList<>(); for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = world.getTileEntity(x + dir.offsetX, y, z + dir.offsetZ); if(tile instanceof TileLightRelay) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 04e0d77c2..0cfe5dc2a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -20,7 +20,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -36,7 +35,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { +public class BlockLightRelay extends BlockModContainer implements IWandable, ILexiconable { public static IIcon invIcon, worldIcon, invIconRed, worldIconRed; @@ -139,7 +138,7 @@ public class BlockLightRelay extends BlockModContainer implements IWandable, ILe } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileLightRelay createNewTileEntity(World world, int meta) { return new TileLightRelay(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index bdbe1ae81..ab972c242 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -114,7 +114,7 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab p_149636_2_.addExhaustion(0.025F); if(this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) { - ArrayList items = new ArrayList(); + ArrayList items = new ArrayList<>(); ItemStack itemstack = createStackedBlock(p_149636_6_); if(itemstack != null) @@ -164,14 +164,14 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab @Override public ArrayList onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) { - ArrayList ret = new ArrayList(); + ArrayList ret = new ArrayList<>(); ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z) & 7)); return ret; } @Override public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 0a3fdc462..b7f35cb95 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -47,7 +47,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockOpenCrate extends BlockModContainer implements ILexiconable, IWandable, IWandHUD { +public class BlockOpenCrate extends BlockModContainer implements ILexiconable, IWandable, IWandHUD { IIcon iconSide; IIcon iconBottom; @@ -168,7 +168,7 @@ public class BlockOpenCrate extends BlockModContainer implements ILexiconable, I } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileOpenCrate createNewTileEntity(World world, int meta) { return meta == 0 ? new TileOpenCrate() : new TileCraftCrate(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 80dfcdfe4..04ac6f6a7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -46,12 +46,12 @@ import cpw.mods.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); @@ -197,7 +197,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)) @@ -259,7 +259,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/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index c6ed2b133..a6b00e550 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -20,7 +20,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import thaumcraft.api.crafting.IInfusionStabiliser; @@ -36,7 +35,7 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockPylon extends BlockModContainer implements ILexiconable, IInfusionStabiliser { +public class BlockPylon extends BlockModContainer implements ILexiconable, IInfusionStabiliser { public BlockPylon() { super(Material.iron); @@ -101,7 +100,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TilePylon createNewTileEntity(World world, int meta) { return new TilePylon(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index f8a69fe9f..9af5b9853 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -19,7 +19,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.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -32,7 +31,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockSparkChanger extends BlockModContainer implements ILexiconable { +public class BlockSparkChanger extends BlockModContainer implements ILexiconable { IIcon[] icons; Random random; @@ -168,7 +167,7 @@ public class BlockSparkChanger extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileSparkChanger createNewTileEntity(World world, int meta) { return new TileSparkChanger(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 3620ab67d..023194f98 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -51,8 +51,8 @@ import cpw.mods.fml.common.registry.GameRegistry; public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvider, ISpecialFlower, IWandable, ILexiconable, IWandHUD { - public static Map icons = new HashMap(); - public static Map iconsAlt = new HashMap(); + public static Map icons = new HashMap<>(); + public static Map iconsAlt = new HashMap<>(); static { BotaniaAPI.subtilesForCreativeMenu.addAll(Arrays.asList(new String[] { @@ -207,7 +207,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(x, y, z); if(tile != null) { diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 30e15f717..f8fb0e677 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -18,7 +18,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -28,7 +27,7 @@ import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable { +public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable { public BlockTeruTeruBozu() { super(Material.cloth); @@ -122,7 +121,7 @@ public class BlockTeruTeruBozu extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileTeruTeruBozu createNewTileEntity(World world, int meta) { return new TileTeruTeruBozu(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java index 6720700cf..91dc15c26 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/BlockTinyPlanet.java @@ -13,7 +13,6 @@ package vazkii.botania.common.block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -21,7 +20,7 @@ import vazkii.botania.common.block.tile.TileTinyPlanet; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { +public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { protected BlockTinyPlanet() { super(Material.rock); @@ -44,7 +43,7 @@ public class BlockTinyPlanet extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileTinyPlanet createNewTileEntity(World world, int meta) { return new TileTinyPlanet(); } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 075722c82..249906124 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -516,7 +516,7 @@ public final class ModBlocks { public static void registerMultiparts() { if(Loader.isModLoaded("ForgeMultipart")) { try { - Class clazz = Class.forName("vazkii.botania.common.integration.multipart.MultipartHandler"); + Class clazz = Class.forName("vazkii.botania.common.integration.multipart.MultipartHandler"); clazz.newInstance(); } catch(Throwable e) {} } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 2d804b714..4dab0fd68 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -16,7 +16,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -27,7 +26,7 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaRetainer; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockCorporeaRetainer extends BlockModContainer implements ILexiconable, ICraftAchievement { +public class BlockCorporeaRetainer extends BlockModContainer implements ILexiconable, ICraftAchievement { public BlockCorporeaRetainer() { super(Material.iron); @@ -60,7 +59,7 @@ public class BlockCorporeaRetainer extends BlockModContainer implements ILexicon } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileCorporeaRetainer createNewTileEntity(World world, int meta) { return new TileCorporeaRetainer(); } 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 0d69eae4e..5d05a1158 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -22,7 +22,6 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -35,6 +34,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.BlockModContainer; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.block.tile.TileFloatingFlower; +import vazkii.botania.common.block.tile.TileMod; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.integration.coloredlights.ColoredLightHelper; import vazkii.botania.common.item.IFloatingFlowerVariant; @@ -46,7 +46,7 @@ import java.util.List; import java.util.Random; @Optional.Interface(modid = "Thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) -public class BlockFloatingFlower extends BlockModContainer implements ILexiconable, IInfusionStabiliser { +public class BlockFloatingFlower extends BlockModContainer implements ILexiconable, IInfusionStabiliser { public BlockFloatingFlower() { this(LibBlockNames.MINI_ISLAND); @@ -158,7 +158,7 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileMod createNewTileEntity(World world, int meta) { return new TileFloatingFlower(); } 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 90d3d7a11..6d51bc462 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java @@ -21,7 +21,6 @@ import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -35,7 +34,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockManaBeacon extends BlockModContainer implements ILexiconable { +public class BlockManaBeacon extends BlockModContainer implements ILexiconable { IIcon[] icons; @@ -110,7 +109,7 @@ public class BlockManaBeacon extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileManaBeacon createNewTileEntity(World world, int meta) { return new TileManaBeacon(); } } 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 fdf5c95b6..148b028e1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -18,7 +18,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -33,7 +32,7 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.world.WorldTypeSkyblock; import cpw.mods.fml.common.Optional; -public class BlockManaFlame extends BlockModContainer implements ILexiconable { +public class BlockManaFlame extends BlockModContainer implements ILexiconable { public BlockManaFlame() { super(Material.cloth); @@ -108,11 +107,11 @@ public class BlockManaFlame extends BlockModContainer implements ILexiconable { @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - return new ArrayList(); + return new ArrayList<>(); } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileManaFlame createNewTileEntity(World world, int meta) { return new TileManaFlame(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java index bbde621f0..21f071cdf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java @@ -14,7 +14,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -25,7 +24,7 @@ import vazkii.botania.common.block.tile.TileStarfield; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockStarfield extends BlockModContainer implements ILexiconable { +public class BlockStarfield extends BlockModContainer implements ILexiconable { IIcon[] icons; @@ -62,7 +61,7 @@ public class BlockStarfield extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileStarfield createNewTileEntity(World world, int meta) { return new TileStarfield(); } 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 6c3a99b0f..cabc92766 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -34,7 +34,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockTinyPotato extends BlockModContainer implements ILexiconable { +public class BlockTinyPotato extends BlockModContainer implements ILexiconable { public BlockTinyPotato() { super(Material.cloth); @@ -93,7 +93,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); TileEntity tile = world.getTileEntity(x, y, z); if(tile != null) { @@ -123,7 +123,7 @@ public class BlockTinyPotato extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileTinyPotato createNewTileEntity(World world, int meta) { return new TileTinyPotato(); } diff --git a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java index 1240b9eae..363b41c54 100644 --- a/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/IFloatingFlower.java @@ -25,7 +25,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", LibResources.MODEL_MINI_ISLAND); public static final IslandType PODZOL = new IslandType("PODZOL", LibResources.MODEL_MINI_ISLAND_PODZOL); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 341061899..e26dbf736 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; @@ -29,7 +28,7 @@ import vazkii.botania.common.entity.EntityDoppleganger; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockBellows extends BlockModContainer implements ILexiconable { +public class BlockBellows extends BlockModContainer implements ILexiconable { private static final int[] META_ROTATIONS = new int[] { 3, 4, 2, 5 }; @@ -82,7 +81,7 @@ public class BlockBellows extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileBellows createNewTileEntity(World world, int meta) { return new TileBellows(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 1c83b153c..1d3d892a5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.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.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -35,7 +34,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockBrewery extends BlockModContainer implements ILexiconable, IWandHUD { +public class BlockBrewery extends BlockModContainer implements ILexiconable, IWandHUD { Random random; @@ -151,7 +150,7 @@ public class BlockBrewery extends BlockModContainer implements ILexiconable, IWa } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileBrewery createNewTileEntity(World world, int meta) { return new TileBrewery(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java index f5b8aba15..ac83af660 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java @@ -14,7 +14,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -26,7 +25,7 @@ import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockDistributor extends BlockModContainer implements ILexiconable { +public class BlockDistributor extends BlockModContainer implements ILexiconable { IIcon iconSide, iconTop; @@ -50,7 +49,7 @@ public class BlockDistributor extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileDistributor createNewTileEntity(World world, int meta) { return new TileDistributor(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 2318fc4cb..83ddca6f2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -24,7 +24,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -39,7 +38,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD { +public class BlockEnchanter extends BlockModContainer implements IWandable, ILexiconable, IWandHUD { Random random; public static IIcon overlay; @@ -67,7 +66,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable, ILex } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileEnchanter createNewTileEntity(World world, int meta) { return new TileEnchanter(); } 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 3893d556c..778e6c99d 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -118,7 +118,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona else if(!world.isRemote) { int range = 10; List entities = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range + 1, y + range + 1, z + 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 2487ce7b4..c90a6f1b0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -32,7 +31,7 @@ import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockManaDetector extends BlockModContainer implements ILexiconable { +public class BlockManaDetector extends BlockModContainer implements ILexiconable { IIcon[] icons; @@ -73,7 +72,7 @@ public class BlockManaDetector extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileManaDetector createNewTileEntity(World world, int meta) { return new TileManaDetector(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java index 622375863..abae526ea 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java @@ -15,7 +15,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -27,7 +26,7 @@ import vazkii.botania.common.block.tile.mana.TileManaVoid; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockManaVoid extends BlockModContainer implements ILexiconable, IPoolOverlayProvider { +public class BlockManaVoid extends BlockModContainer implements ILexiconable, IPoolOverlayProvider { IIcon overlay; @@ -46,7 +45,7 @@ public class BlockManaVoid extends BlockModContainer implements ILexiconable, IP } @Override - public TileEntity createNewTileEntity(World world, int id) { + public TileManaVoid createNewTileEntity(World world, int id) { return new TileManaVoid(); } 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 b3b1dab71..3fe81922f 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -51,7 +51,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, ILexiconable, ICraftAchievement { +public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, ILexiconable, ICraftAchievement { boolean lastFragile = false; @@ -100,7 +100,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList drops = new ArrayList(); + ArrayList drops = new ArrayList<>(); if(!lastFragile) drops.add(new ItemStack(this, 1, metadata)); @@ -117,7 +117,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TilePool createNewTileEntity(World world, int meta) { return new TilePool(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index 0748d9321..162b2cd1e 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -35,7 +35,7 @@ import vazkii.botania.common.block.tile.mana.TilePrism; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexiconable { +public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexiconable { Random random; IIcon[] icons; @@ -172,7 +172,7 @@ public class BlockPrism extends BlockModContainer implements IManaTrigger, ILexi } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TilePrism createNewTileEntity(World world, int meta) { return new TilePrism(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index aa4a4c6e6..7cade9be1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -16,7 +16,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -32,7 +31,7 @@ import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockPump extends BlockModContainer implements ILexiconable { +public class BlockPump extends BlockModContainer implements ILexiconable { private static final int[] META_ROTATIONS = new int[] { 2, 5, 3, 4 }; @@ -108,7 +107,7 @@ public class BlockPump extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TilePump createNewTileEntity(World world, int meta) { return new TilePump(); } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 79e7e35db..5b4e64ab9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -24,7 +24,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.Optional; -public class BlockRFGenerator extends BlockModContainer implements ILexiconable { +public class BlockRFGenerator extends BlockModContainer implements ILexiconable { public BlockRFGenerator() { super(Material.rock); @@ -43,7 +43,7 @@ public class BlockRFGenerator extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileRFGenerator createNewTileEntity(World world, int meta) { return new TileRFGenerator(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 23ef4ef8e..22d96c5a9 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -19,7 +19,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.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -33,7 +32,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockRuneAltar extends BlockModContainer implements IWandable, ILexiconable { +public class BlockRuneAltar extends BlockModContainer implements IWandable, ILexiconable { Random random; IIcon[] icons; @@ -137,7 +136,7 @@ public class BlockRuneAltar extends BlockModContainer implements IWandable, ILex } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileRuneAltar createNewTileEntity(World world, int meta) { return new TileRuneAltar(); } 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 c21a20fb5..bc4ef40ff 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -19,7 +19,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -29,7 +28,7 @@ import vazkii.botania.common.block.tile.TileSpawnerClaw; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable { +public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable { public BlockSpawnerClaw() { super(Material.iron); @@ -68,7 +67,7 @@ public class BlockSpawnerClaw extends BlockModContainer implements ILexiconable } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileSpawnerClaw createNewTileEntity(World world, int meta) { return new TileSpawnerClaw(); } 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 8227d736f..de03e3525 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -47,7 +47,7 @@ import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import cpw.mods.fml.common.registry.GameRegistry; -public class BlockSpreader extends BlockModContainer implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { +public class BlockSpreader extends BlockModContainer implements IWandable, IWandHUD, ILexiconable, IWireframeAABBProvider { Random random; @@ -229,7 +229,7 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileSpreader createNewTileEntity(World world, int meta) { return new TileSpreader(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index c5579a682..c9d979663 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -15,7 +15,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -29,7 +28,7 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTerraPlate extends BlockModContainer implements ILexiconable { +public class BlockTerraPlate extends BlockModContainer implements ILexiconable { public static IIcon overlay; IIcon[] icons; @@ -98,7 +97,7 @@ public class BlockTerraPlate extends BlockModContainer implements ILexiconable { } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileTerraPlate createNewTileEntity(World world, int meta) { return new TileTerraPlate(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index ea88ef91c..03ab0e220 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -16,7 +16,6 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; @@ -29,7 +28,7 @@ import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; -public class BlockTurntable extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { +public class BlockTurntable extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { IIcon[] icons; @@ -53,7 +52,7 @@ public class BlockTurntable extends BlockModContainer implements IWandable, IWan } @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileTurntable createNewTileEntity(World world, int meta) { return new TileTurntable(); } 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 11e645f5b..7934b4b39 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 @@ -53,7 +53,7 @@ public class SubTileClayconia extends SubTileFunctional { } public ChunkCoordinates 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/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 0c66e7fdc..80510f8c9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -61,8 +61,8 @@ public class SubTileHeiseiDream extends SubTileFunctional { while(newTarget == entity); if(newTarget instanceof EntityLiving) { - List entries = new ArrayList(entity.tasks.taskEntries); - entries.addAll(new ArrayList(entity.targetTasks.taskEntries)); + List entries = new ArrayList<>(entity.tasks.taskEntries); + entries.addAll(new ArrayList<>(entity.targetTasks.taskEntries)); for(EntityAITaskEntry entry : entries) if(entry.action instanceof EntityAINearestAttackableTarget) { 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 29c8dd526..d4241736a 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 @@ -34,7 +34,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; -import scala.reflect.internal.util.WeakHashSet; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -52,7 +51,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; @@ -171,7 +170,7 @@ public class SubTileHopperhock extends SubTileFunctional { } public static List getFilterForInventory(World world, IInventory inv, int x, int y, int z, boolean recursiveForDoubleChests) { - List filter = new ArrayList(); + List filter = new ArrayList<>(); if(recursiveForDoubleChests) { TileEntity tileEntity = world.getTileEntity(x, y, z); 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 fb2d58a89..22cbd33a7 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 @@ -74,7 +74,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { public ItemStack getStoneToPut(ChunkCoordinates coords) { List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorldObj().getBiomeGenForCoords(coords.posX, coords.posZ))); - List values = new ArrayList(); + List values = new ArrayList<>(); for(int i = 0; i < 8; i++) { int times = 1; if(types.contains(TYPES[i])) @@ -88,7 +88,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public ChunkCoordinates 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 8a027957b..65d4a3273 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 @@ -67,7 +67,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)); @@ -97,7 +97,7 @@ public class SubTileOrechid extends SubTileFunctional { } public ChunkCoordinates 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 37702488a..7469adf09 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 @@ -68,7 +68,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(); @@ -78,7 +78,6 @@ public class SubTileRannuncarpus extends SubTileFunctional { int z = supertile.zCoord; List items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - RANGE, y - RANGE_Y, z - RANGE, x + RANGE + 1, y + RANGE_Y, z + RANGE + 1)); - List itemFilter = SubTileHopperhock.getFilterForInventory(supertile.getWorldObj(), null,x,y-(supertile instanceof IFloatingFlower?1:2),z, false); int slowdown = getSlowdownFactor(); for(EntityItem item : items) { if(item.age < (60 + slowdown) || item.isDead) 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 9ad426e52..386627d7f 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 07b01ed5f..4dcbe172f 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.getWorldObj().getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord - RANGE_Y, supertile.zCoord - RANGE, supertile.xCoord + RANGE + 1, supertile.yCoord + RANGE_Y + 1, supertile.zCoord + 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(new ArrayList<>(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 74110d252..d09f14e8c 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 cpw.mods.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.getWorldObj() != event.entity.worldObj || flower.supertile.getWorldObj().getTileEntity(flower.supertile.xCoord, flower.supertile.yCoord, flower.supertile.zCoord) != 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 a6adf90b3..5ed73b51c 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 @@ -51,8 +51,7 @@ public class SubTileDandelifeon extends SubTileGenerating { void runSimulation() { int[][] table = getCellTable(); - List changes = new ArrayList(); - new ArrayList(); + List changes = new ArrayList<>(); boolean wipe = false; for(int i = 0; i < table.length; i++) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 9210b93e6..9129e9f22 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -21,7 +21,6 @@ import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; -import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lexicon.LexiconData; 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 0b7a66f58..563801074 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 @@ -54,7 +54,7 @@ public class SubTileMunchdew extends SubTileGenerating { int manaPerLeaf = 160; eatLeaves : { if(getMaxMana() - mana >= manaPerLeaf && !supertile.getWorldObj().isRemote && ticksExisted % 4 == 0) { - List coords = new ArrayList(); + List coords = new ArrayList<>(); int x = supertile.xCoord; int y = supertile.yCoord; int z = supertile.zCoord; 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 483e49021..d50595a88 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -162,7 +162,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/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index e615e2267..459f770e6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -61,7 +61,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 int[][] OBSIDIAN_LOCATIONS = new int[][] { { 0, -1, 0 }, 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 063526503..7a4d33afe 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -104,7 +104,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } public ChunkCoordinates getEndpoint() { - List pointsPassed = new ArrayList(); + List pointsPassed = new ArrayList<>(); TileLightRelay relay = this; ChunkCoordinates lastCoords = 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 8b37e9c67..30ff9bb0e 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(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { TileEntity tile = worldObj.getTileEntity(xCoord + dir.offsetX, yCoord, zCoord + dir.offsetZ); if(tile != null && tile instanceof ISparkAttachable) { @@ -53,7 +53,7 @@ public class TileSparkChanger extends TileSimpleInventory { ItemStack sparkStack = upg == 0 ? null : new ItemStack(ModItems.sparkUpgrade, 1, upg - 1); int newUpg = changeStack == null ? 0 : changeStack.getItemDamage() + 1; spark.setUpgrade(newUpg); - Collection transfers = spark.getTransfers(); + Collection transfers = spark.getTransfers(); if(transfers != null) transfers.clear(); setInventorySlotContents(0, sparkStack); 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 81e97bb4e..b8117924e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -106,7 +106,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { private void resetTimer(MobSpawnerBaseLogic logic) { int maxSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MAX_SPAWN_DELAY); int minSpawnDelay = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.MIN_SPAWN_DELAY); - List potentialEntitySpawns = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); + List potentialEntitySpawns = ReflectionHelper.getPrivateValue(MobSpawnerBaseLogic.class, logic, LibObfuscation.POTENTIAL_ENTITY_SPAWNS); if(maxSpawnDelay <= minSpawnDelay) logic.spawnDelay = minSpawnDelay; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 569251738..76423355d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -42,7 +42,7 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq } public List getFilter() { - List filter = new ArrayList(); + List filter = new ArrayList<>(); final int[] orientationToDir = new int[] { 3, 4, 2, 5 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 11875e1f0..8f7550df2 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 @@ -49,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 @@ -286,7 +286,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 bfc5734c9..a8be8baa2 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 @@ -87,7 +87,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } public List getFilter() { - List filter = new ArrayList(); + List filter = new ArrayList<>(); final int[] orientationToDir = new int[] { 3, 4, 2, 5 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 e0aa3d60f..d888fd20f 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 @@ -23,7 +23,7 @@ import vazkii.botania.common.lib.LibMisc; public class TileDistributor extends TileMod implements IManaReceiver { - List validPools = new ArrayList(); + List validPools = new ArrayList<>(); @Override public void updateEntity() { 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 39d0c375b..c569ee434 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 @@ -20,7 +20,7 @@ import net.minecraft.world.World; public class TileRedStringInterceptor extends TileRedString { - public static List interceptors = new ArrayList(); + public static List interceptors = new ArrayList<>(); @Override public void updateEntity() { @@ -40,11 +40,11 @@ public class TileRedStringInterceptor extends TileRedString { } public static void onInteract(EntityPlayer player, World world, int x, int y, int z) { - 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/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index 075ce7cb0..1fe6463b0 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -15,7 +15,6 @@ import java.util.stream.Collectors; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.brew.ModPotions; diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index 3217a3d43..c18cc190c 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -15,7 +15,6 @@ import java.util.stream.Collectors; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import vazkii.botania.common.core.handler.ConfigHandler; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 7e7bdfee7..966ea1b5a 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); 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 5beb4fd81..7276e58e0 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -70,7 +70,8 @@ public final class ConfigHandler { public static boolean enableFancySkybox = true; public static boolean enableFancySkyboxInNormalWorlds = false; public static boolean enableFancySkyboxInDimension = false; - public static HashSet fancySkyboxDimensions = new HashSet() {}; + public static HashSet fancySkyboxDimensions = new HashSet() { + private static final long serialVersionUID = 4727513002140033784L;}; public static int manaBarHeight = 29; public static int flightBarHeight = 49; @@ -417,8 +418,8 @@ public final class ConfigHandler { private boolean enabled; - 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; @@ -454,9 +455,9 @@ public final class ConfigHandler { if(!enabled) return; - AdaptableValue adapt = new AdaptableValue(version, val); + AdaptableValue adapt = new AdaptableValue<>(version, val); if(!adaptableValues.containsKey(key)) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); adaptableValues.put(key, list); } 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 d157b494f..65b6871af 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -117,12 +117,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 @@ -271,7 +271,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public List wrapInventory(List inventories) { - ArrayList arrayList = new ArrayList(); + ArrayList arrayList = new ArrayList<>(); for(IInventory inv : inventories) { ICorporeaSpark spark = CorporeaHelper.getSparkForInventory(inv); IWrappedInventory wrapped = null; 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 aef3cbdd6..28336443e 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -36,8 +36,8 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class SheddingHandler { - public static ArrayList patterns = new ArrayList(); - public static ArrayList defaultPatterns = new ArrayList(); + public static ArrayList patterns = new ArrayList<>(); + public static ArrayList defaultPatterns = new ArrayList<>(); @SubscribeEvent public void onLivingUpdate(LivingUpdateEvent event) { @@ -85,7 +85,7 @@ public final class SheddingHandler { defaultPatterns.add(new ShedPattern(EntitySkeleton.class, new ItemStack(Items.bone), 36000, 40)); defaultPatterns.add(new ShedPattern(EntitySlime.class, new ItemStack(Items.slime_ball), 21000, 40)); - ArrayList defaultNames = new ArrayList(); + ArrayList defaultNames = new ArrayList<>(); for(ShedPattern pattern : defaultPatterns) { loadFromConfig(config, pattern.getEntityString(), pattern); @@ -93,7 +93,7 @@ public final class SheddingHandler { } for(Object o : EntityList.stringToClassMapping.entrySet()) { - Entry entry = (Entry) o; + Entry> entry = (Entry>) o; if(EntityLiving.class.isAssignableFrom(entry.getValue())) { String name = entry.getKey(); diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index 30187ff91..d24ce3dc4 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -97,7 +97,7 @@ public class InventoryHelper { attemptSlots[a] = a; } if(intoSlot > -1) { - Set x = new HashSet(); + Set x = new HashSet<>(); for(int attemptedSlot : attemptSlots) x.add(attemptedSlot); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index bb226a4f7..805037869 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -1649,7 +1649,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++) @@ -1810,9 +1810,9 @@ public final class ModCraftingRecipes { recipeBlackHoleTalisman = BotaniaAPI.getLatestAddedRecipe(); // 1.8 Stone Recipes - recipe18StonePolish = new ArrayList(); - recipe18StoneBrick = new ArrayList(); - recipe18StoneChisel = new ArrayList(); + recipe18StonePolish = new ArrayList<>(); + recipe18StoneBrick = new ArrayList<>(); + recipe18StoneChisel = new ArrayList<>(); for(int i = 0; i < 4; i++) { addOreDictRecipe(new ItemStack(ModFluffBlocks.stone, 8, i + 4), "SSS", "S S", "SSS", diff --git a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java index c5dbb2c22..cd57b0c60 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModElvenTradeRecipes.java @@ -27,12 +27,12 @@ public class ModElvenTradeRecipes { 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 f2e9617a5..d19ba3152 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaAlchemyRecipes.java @@ -57,7 +57,7 @@ public final class ModManaAlchemyRecipes { 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)); @@ -65,12 +65,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)); @@ -83,15 +83,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)); @@ -102,30 +102,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)); @@ -134,18 +134,18 @@ public final class ModManaAlchemyRecipes { prismarineRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.quartz), 200); if(ConfigHandler.stones18Enabled) { - stoneRecipes = new ArrayList(); + stoneRecipes = new ArrayList<>(); stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone), "stone", 200)); for(int i = 0; i < 4; i++) stoneRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModFluffBlocks.stone, 1, i), new ItemStack(ModFluffBlocks.stone, 1, i == 0 ? 3 : i - 1), 200)); } - 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 a25c4ac66..59410f426 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaConjurationRecipes.java @@ -46,7 +46,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 1fecfb04e..8b9e81fc4 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModManaInfusionRecipes.java @@ -46,17 +46,17 @@ public final class ModManaInfusionRecipes { public static void init() { if (!ConfigHandler.enableDefaultRecipes) return; - 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)); @@ -69,7 +69,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 11510020e..d8ec79d8c 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModRuneRecipes.java @@ -55,11 +55,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))); @@ -67,7 +67,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 62f89441b..ee0586a0d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -35,9 +35,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; @@ -135,15 +135,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<>()); } } @@ -263,7 +263,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 fcf87b340..5e632b023 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -116,7 +116,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi boolean spawnPixies = false; boolean anyWithArmor = false; - List playersWhoAttacked = new ArrayList(); + List playersWhoAttacked = new ArrayList<>(); private static boolean isPlayingMusic = false; @@ -584,7 +584,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() && !ReflectionHelper.getPrivateValue(Potion.class, Potion.potionTypes[effect.getPotionID()], LibObfuscation.IS_BAD_EFFECT)) diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 0a470bc23..8e7cb2d9e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -47,8 +47,8 @@ public class EntityEnderAirBottle extends EntityThrowable { } public List getCoordsToPut(int xCoord, int yCoord, int zCoord) { - 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/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 88fda7c89..b12adf2ee 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -162,7 +162,7 @@ public class EntityMagicMissile extends EntityThrowable { setTarget(null); double range = 12; - List entities = worldObj.getEntitiesWithinAABB(isEvil() ? EntityPlayer.class : IMob.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + List entities = worldObj.getEntitiesWithinAABB(isEvil() ? EntityPlayer.class : IMob.class, AxisAlignedBB.getBoundingBox(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); while(entities.size() > 0) { Entity e = (Entity) entities.get(worldObj.rand.nextInt(entities.size())); if(!(e instanceof EntityLivingBase) || e.isDead) { // Just in case... diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index c51478a19..709639076 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -77,14 +77,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); @@ -162,7 +162,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(!worldObj.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; EntityLivingBase entitylivingbase = getThrower(); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index e89206d3e..68f17a649 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -45,7 +45,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; @@ -92,11 +92,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)); @@ -107,11 +107,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))); @@ -125,7 +125,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(); @@ -141,7 +141,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; @@ -332,7 +332,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/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 38202c607..9c947fafd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -201,7 +201,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (!worldObj.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; EntityLivingBase entitylivingbase = getThrower(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index dff1c91c6..9224c806d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -56,7 +56,7 @@ public class EntityThrownItem extends EntityItem { if (!worldObj.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); + List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); double d0 = 0.0D; for (int j = 0; j < list.size(); ++j) diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index 49b424d97..e2b81ac65 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -38,14 +38,14 @@ public class StatementAPIPlugin implements ITriggerProvider { @Override public Collection getInternalTriggers(IStatementContainer container) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(triggerManaDetector); return list; } @Override public Collection getExternalTriggers(ForgeDirection side, TileEntity tile) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (tile instanceof IManaBlock) { list.add(triggerManaEmpty); diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java index 896be8bf9..a4f153bc0 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java @@ -54,7 +54,7 @@ public class WrappedDeepStorage extends WrappedInventoryBase { } private List iterateOverStacks(CorporeaRequest request, boolean doit) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); boolean removedAny = false; ItemStack prototype = inv.getStoredItemType(); diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index 216ee8430..89e3bf5ed 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -44,7 +44,7 @@ public class WrappedIInventory extends WrappedInventoryBase{ } private List iterateOverSlots(CorporeaRequest request, boolean doit) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); boolean removedAny = false; for (int i = inv.getSizeInventory() - 1; i >= 0; i--) { diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java index 2410863ad..5265506bb 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java @@ -33,7 +33,7 @@ public abstract class WrappedInventoryBase implements IWrappedInventory { } protected Collection breakDownBigStack(ItemStack stack) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); int additionalStacks = stack.stackSize / stack.getMaxStackSize(); int lastStackSize = stack.stackSize % stack.getMaxStackSize(); if(additionalStacks > 0) { diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index a2d9c1067..9783e3647 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -50,7 +50,7 @@ public class WrappedStorageDrawers extends WrappedInventoryBase { } private List iterateOverStacks(CorporeaRequest request, boolean doit) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); boolean removedAny = false; for(int i = 0; i < inv.getDrawerCount(); i++) { diff --git a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java index de6ef54c6..b80f45c91 100644 --- a/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java +++ b/src/main/java/vazkii/botania/common/integration/multipart/MultipartHandler.java @@ -10,12 +10,7 @@ */ package vazkii.botania.common.integration.multipart; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import codechicken.microblock.BlockMicroMaterial; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index bad194d54..775909ae1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -198,7 +198,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack stackAt = inv.getStackInSlot(i); if(stackAt != null && stack.isItemEqual(stackAt) && ItemStack.areItemStackTagsEqual(stack, stackAt)) { boolean consume = true; - if(stackAt.getItem().hasContainerItem()) { + if(stackAt.getItem().hasContainerItem(stackAt)) { //there are monsters in this world that will return false above but not null below ItemStack container = stackAt.getItem().getContainerItem(stackAt); if (container != null) { diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 6940d2d04..e7912fff3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -32,7 +32,7 @@ public class ItemFertilizer extends ItemMod { public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, 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 dec75518f..7e38c1451 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -36,6 +36,7 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibItemNames; +@SuppressWarnings("deprecation") public class ItemGrassHorn extends ItemMod { private static final int SUBTYPES = 3; @@ -117,7 +118,7 @@ public class ItemGrassHorn extends ItemMod { Random rand = new Random(srcx ^ srcy ^ srcz); 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++) @@ -136,7 +137,7 @@ public class ItemGrassHorn extends ItemMod { int count = Math.min(coords.size(), 32 + stackDmg * 16); for(int i = 0; i < count; i++) { ChunkCoordinates currCoords = coords.get(i); - List items = new ArrayList(); + List items = new ArrayList<>(); Block block = world.getBlock(currCoords.posX, currCoords.posY, currCoords.posZ); int meta = world.getBlockMetadata(currCoords.posX, currCoords.posY, currCoords.posZ); items.addAll(block.getDrops(world, currCoords.posX, currCoords.posY, currCoords.posZ, meta, 0)); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index b63033154..f266f7f7e 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, @@ -217,7 +217,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { // If a set for the dimension doesn't exist, create it. int dim = world.provider.dimensionId; if(!blockSwappers.containsKey(dim)) - blockSwappers.put(dim, new HashSet()); + blockSwappers.put(dim, new HashSet<>()); // Add the block swapper blockSwappers.get(dim).add(swapper); @@ -320,7 +320,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { * @param z The z-coordinate to use. */ public void tickBlock(int x, int y, int z) { - 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 663dd323a..4d0457f92 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/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index a2a442868..77cc61cfd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -37,11 +37,9 @@ import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.common.Botania; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.item.relic.ItemDice; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; -import vazkii.botania.common.lib.LibMisc; public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @@ -99,7 +97,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { 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/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index 8acc06d90..5388f1bba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -15,7 +15,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; import vazkii.botania.common.lib.LibItemNames; public class ItemOpenBucket extends ItemMod { diff --git a/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java b/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java index d842f6bc3..b1303a887 100644 --- a/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java +++ b/src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java @@ -15,12 +15,9 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; -import vazkii.botania.common.lib.LibGuiIDs; -import vazkii.botania.common.lib.LibItemNames; public abstract class ItemBagBase extends ItemMod { 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 7dcb7b24e..6b2d73232 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 @@ -57,7 +57,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override public Multimap getItemAttributeModifiers() { - Multimap multimap = HashMultimap.create(); + 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/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index af3b711b4..f40db2a4b 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 @@ -78,7 +78,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub private static final String TAG_DASH_COOLDOWN = "dashCooldown"; private static final String TAG_IS_SPRINTING = "isSprinting"; - public static List playersWithFlight = new ArrayList(); + public static List playersWithFlight = new ArrayList<>(); private static final int COST = 35; private static final int COST_OVERKILL = COST * 3; private static final int MAX_FLY_TIME = 1200; 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 881113eaf..40bbcc027 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 @@ -41,7 +41,7 @@ import baubles.api.BaubleType; public class ItemIcePendant extends ItemBauble implements IBaubleRender { IIcon gemIcon; - public static Map> playerIceBlocks = new HashMap(); + public static Map> playerIceBlocks = new HashMap<>(); public ItemIcePendant() { super(LibItemNames.ICE_PENDANT); @@ -88,7 +88,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { private void addIceBlock(EntityPlayer player, ChunkCoordinates coords) { String user = player.getCommandSenderName(); if(!playerIceBlocks.containsKey(user)) - playerIceBlocks.put(user, new ArrayList()); + playerIceBlocks.put(user, new ArrayList<>()); List ice = playerIceBlocks.get(user); if(player.worldObj.getBlock(coords.posX, coords.posY, coords.posZ) == Blocks.water && player.worldObj.getBlockMetadata(coords.posX, coords.posY, coords.posZ) == 0) { @@ -105,7 +105,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { return; List removers = playerIceBlocks.get(user); - for(IceRemover ice : new ArrayList(removers)) + for(IceRemover ice : new ArrayList<>(removers)) ice.tick(player.worldObj, removers); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 1cae596c8..adf583350 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 @@ -47,7 +47,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 27d6d41f4..619c82221 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 bead2f8fc..e2a19b097 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 11ad6a5bf..8f5f82152 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 @@ -74,7 +74,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<>(); IIcon iconOn, iconOff; @@ -183,7 +183,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker // If the mapping for this dimension doesn't exist, create it. int dim = world.provider.dimensionId; if(!blockSwappers.containsKey(dim)) - blockSwappers.put(dim, new HashSet()); + blockSwappers.put(dim, new HashSet<>()); // Add the swapper blockSwappers.get(dim).add(swapper); @@ -274,8 +274,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)); @@ -349,7 +349,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } public List adjacent(ChunkCoordinates 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 58f01a2c3..618fb1252 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 @@ -38,11 +38,8 @@ import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.crafting.recipe.TerraPickTippingRecipe; -import vazkii.botania.common.item.ItemSpark; import vazkii.botania.common.item.ItemTemperanceStone; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; -import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelPick; import vazkii.botania.common.item.relic.ItemLokiRing; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 72020182f..5dcae4a76 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -54,7 +54,7 @@ public class LensMine extends Lens { ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates(); if((coords.posX != x || coords.posY != y || coords.posZ != z) && !(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, x, y, z, meta, 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 03afaeb11..7ba496332 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -44,14 +44,14 @@ public class LensPaint extends Lens { Block block = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); if(BotaniaAPI.paintableBlocks.contains(block)) { int meta = entity.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); - List coordsToPaint = new ArrayList(); - List coordsFound = new ArrayList(); + List coordsToPaint = new ArrayList<>(); + List coordsFound = new ArrayList<>(); ChunkCoordinates theseCoords = new ChunkCoordinates(pos.blockX, pos.blockY, pos.blockZ); coordsFound.add(theseCoords); do { - List iterCoords = new ArrayList(coordsFound); + List iterCoords = new ArrayList<>(coordsFound); for(ChunkCoordinates coords : iterCoords) { coordsFound.remove(coords); coordsToPaint.add(coords); diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index c209a0a83..fb5d02d55 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -12,17 +12,13 @@ package vazkii.botania.common.item.material; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IDyablePool; -import vazkii.botania.api.item.IManaDissolvable; -import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.item.Item16Colors; import vazkii.botania.common.lib.LibItemNames; @@ -45,7 +41,6 @@ public class ItemDye extends Item16Colors { TileEntity tile = par3World.getTileEntity(par4, par5, par6); if(tile instanceof IDyablePool) { IDyablePool dyable = (IDyablePool) tile; - int itemMeta = par1ItemStack.getItemDamage(); if(meta != dyable.getColor()) { dyable.setColor(meta); par1ItemStack.stackSize--; 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 a0594132b..ce430ad27 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 ca43cb7ed..9665e9c45 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -55,7 +55,6 @@ import vazkii.botania.common.lib.LibItemNames; import baubles.api.BaubleType; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketHandler; import baubles.common.network.PacketSyncBauble; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; @@ -108,16 +107,6 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC if (lokiRing == null || player.worldObj.isRemote) return; - int slot = -1; - InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); - for(int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack stack = inv.getStackInSlot(i); - if(stack == lokiRing) { - slot = i; - break; - } - } - ItemStack heldItemStack = player.getCurrentEquippedItem(); ChunkCoordinates originCoords = getOriginPos(lokiRing); MovingObjectPosition lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); @@ -394,7 +383,6 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC World world = player.worldObj; boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantment.silkTouch.effectId, stack) > 0; int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, stack); - boolean dispose = breaker == null? true : breaker.disposeOfTrashBlocks(stack); ChunkCoordinates originCoords = getOriginPos(lokiRing); @@ -547,7 +535,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 3eaa7da18..ec0d635e6 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 cpw.mods.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/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 01369ff1c..e4c66e254 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -165,7 +165,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 @@ -246,7 +246,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/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 08e2b8f13..6d09db235 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -89,7 +89,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); @@ -107,7 +107,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { if(item == null) { Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); @@ -199,7 +199,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); - List entities = new ArrayList(); + List entities = new ArrayList<>(); int distance = 1; while(entities.size() == 0 && distance < 25) { target.add(new Vector3(player.getLookVec()).multiply(distance)); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 6a72d4671..c3c5f02c2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -35,7 +35,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); 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 c9e90d09d..d475b1188 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -107,7 +107,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++) { @@ -127,7 +127,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(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) { int x_ = x + dir.offsetX; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index be7a30ed0..e86c49f45 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -13,7 +13,6 @@ package vazkii.botania.common.lexicon; import java.util.ArrayList; import java.util.List; -import baubles.common.Config; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -356,7 +355,7 @@ public final class LexiconData { pureDaisy.setPriority() .setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_PURE_DAISY), new PageCraftingRecipe("2", ModCraftingRecipes.recipeLivingwoodTwig), new PageText("4"), - new PagePetalRecipe("3", ModPetalRecipes.pureDaisyRecipe)) + new PagePetalRecipe<>("3", ModPetalRecipes.pureDaisyRecipe)) .setIcon(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingwood)); pureDaisy.addExtraDisplayedRecipe(new ItemStack(ModBlocks.livingrock)); @@ -498,7 +497,7 @@ public final class LexiconData { manastar = new BLexiconEntry(LibLexicon.MANA_MANASTAR, categoryMana); manastar.setPriority().setLexiconPages(new PageText("0"), - new PagePetalRecipe("1", ModPetalRecipes.manastarRecipe)); + new PagePetalRecipe<>("1", ModPetalRecipes.manastarRecipe)); dreamwoodSpreader = new ALexiconEntry(LibLexicon.MANA_DREAMWOOD_SPREADER, categoryMana); dreamwoodSpreader.setLexiconPages(new PageText("0"), @@ -549,90 +548,90 @@ public final class LexiconData { jadedAmaranthus = new BLexiconEntry(LibLexicon.FFLOWER_JADED_AMARANTHUS, categoryFunctionalFlowers); jadedAmaranthus.setLexiconPages(new PageText("0"), - new PagePetalRecipe("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); + new PagePetalRecipe<>("1", ModPetalRecipes.jadedAmaranthusRecipe), new PageText("2")); bellethorne = new BLexiconEntry(LibLexicon.FFLOWER_BELLETHORNE, categoryFunctionalFlowers); - bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bellethorneRecipe)); + bellethorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bellethorneRecipe)); dreadthorne = new BLexiconEntry(LibLexicon.FFLOWER_DREADTHORNE, categoryFunctionalFlowers); - dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.dreadthorneRecipe)); + dreadthorne.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.dreadthorneRecipe)); heiseiDream = new ALexiconEntry(LibLexicon.FFLOWER_HEISEI_DREAM, categoryFunctionalFlowers); - heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.heiseiDreamRecipe)); + heiseiDream.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.heiseiDreamRecipe)); tigerseye = new BLexiconEntry(LibLexicon.FFLOWER_TIGERSEYE, categoryFunctionalFlowers); - tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tigerseyeRecipe)); + tigerseye.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tigerseyeRecipe)); orechid = Botania.gardenOfGlassLoaded ? new BLexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers) : new ALexiconEntry(LibLexicon.FFLOWER_ORECHID, categoryFunctionalFlowers); - orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.orechidRecipe)); + orechid.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidRecipe)); if (Botania.gardenOfGlassLoaded) orechid.setPriority(); orechidIgnem = new ALexiconEntry(LibLexicon.FFLOWER_ORECHID_IGNEM, categoryFunctionalFlowers); - orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.orechidIgnemRecipe)); + orechidIgnem.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.orechidIgnemRecipe)); if (ConfigHandler.fallenKanadeEnabled) { fallenKanade = new BLexiconEntry(LibLexicon.FFLOWER_FALLEN_KANADE, categoryFunctionalFlowers); fallenKanade.setLexiconPages(new PageText(Botania.bloodMagicLoaded ? "0a" : "0"), - new PagePetalRecipe("1", ModPetalRecipes.fallenKanadeRecipe)); + new PagePetalRecipe<>("1", ModPetalRecipes.fallenKanadeRecipe)); } exoflame = new BLexiconEntry(LibLexicon.FFLOWER_EXOFLAME, categoryFunctionalFlowers); - exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.exoflameRecipe)); + exoflame.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.exoflameRecipe)); agricarnation = new BLexiconEntry(LibLexicon.FFLOWER_AGRICARNATION, categoryFunctionalFlowers); - agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.agricarnationRecipe)); + agricarnation.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.agricarnationRecipe)); hopperhock = new BLexiconEntry(LibLexicon.FFLOWER_HOPPERHOCK, categoryFunctionalFlowers); hopperhock.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe("2", ModPetalRecipes.hopperhockRecipe)); + new PagePetalRecipe<>("2", ModPetalRecipes.hopperhockRecipe)); tangleberrie = new BLexiconEntry(LibLexicon.FFLOWER_TANGLEBERRIE, categoryFunctionalFlowers); - tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.tangleberrieRecipe)); + tangleberrie.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.tangleberrieRecipe)); jiyuulia = new BLexiconEntry(LibLexicon.FFLOWER_JIYUULIA, categoryFunctionalFlowers); - jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.jiyuuliaRecipe)); + jiyuulia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.jiyuuliaRecipe)); rannuncarpus = new BLexiconEntry(LibLexicon.FFLOWER_RANNUNCARPUS, categoryFunctionalFlowers); rannuncarpus.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe("2", ModPetalRecipes.rannuncarpusRecipe)); + new PagePetalRecipe<>("2", ModPetalRecipes.rannuncarpusRecipe)); hyacidus = new BLexiconEntry(LibLexicon.FFLOWER_HYACIDUS, categoryFunctionalFlowers); - hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.hyacidusRecipe)); + hyacidus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.hyacidusRecipe)); pollidisiac = new BLexiconEntry(LibLexicon.FFLOWER_POLLIDISIAC, categoryFunctionalFlowers); - pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.pollidisiacRecipe)); + pollidisiac.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.pollidisiacRecipe)); clayconia = new BLexiconEntry(LibLexicon.FFLOWER_CLAYCONIA, categoryFunctionalFlowers); - clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.clayconiaRecipe)); + clayconia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.clayconiaRecipe)); loonium = new ALexiconEntry(LibLexicon.FFLOWER_LOONIUM, categoryFunctionalFlowers); - loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.looniumRecipe)); + loonium.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.looniumRecipe)); daffomill = new BLexiconEntry(LibLexicon.FFLOWER_DAFFOMILL, categoryFunctionalFlowers); - daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.daffomillRecipe)); + daffomill.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.daffomillRecipe)); vinculotus = new BLexiconEntry(LibLexicon.FFLOWER_VINCULOTUS, categoryFunctionalFlowers); - vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.vinculotusRecipe)); + vinculotus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.vinculotusRecipe)); spectranthemum = new ALexiconEntry(LibLexicon.FFLOWER_SPECTRANTHEMUN, categoryFunctionalFlowers); spectranthemum.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PagePetalRecipe("3", ModPetalRecipes.spectranthemumRecipe)); + new PagePetalRecipe<>("3", ModPetalRecipes.spectranthemumRecipe)); medumone = new BLexiconEntry(LibLexicon.FFLOWER_MEDUMONE, categoryFunctionalFlowers); - medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.medumoneRecipe)); + medumone.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.medumoneRecipe)); marimorphosis = new BLexiconEntry(LibLexicon.FFLOWER_MARIMORPHOSIS, categoryFunctionalFlowers); marimorphosis.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_METAMORPHIC_STONES), - new PagePetalRecipe("2", ModPetalRecipes.marimorphosisRecipe), + new PagePetalRecipe<>("2", ModPetalRecipes.marimorphosisRecipe), new PageCraftingRecipe("3", ModCraftingRecipes.recipesAltarMeta)); bubbell = new ALexiconEntry(LibLexicon.FFLOWER_BUBBELL, categoryFunctionalFlowers); - bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.bubbellRecipe)); + bubbell.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.bubbellRecipe)); solegnolia = new BLexiconEntry(LibLexicon.FFLOWER_SOLEGNOLIA, categoryFunctionalFlowers); - solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.solegnoliaRecipe)); + solegnolia.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.solegnoliaRecipe)); // GENERATING FLOWERS ENTRIES if (ConfigHandler.hardcorePassiveGeneration > 0) { @@ -652,55 +651,55 @@ public final class LexiconData { daybloom = new BLexiconEntry(LibLexicon.GFLOWER_DAYBLOOM, categoryGenerationFlowers); daybloom.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe("2", ModPetalRecipes.daybloomRecipe)); + new PagePetalRecipe<>("2", ModPetalRecipes.daybloomRecipe)); nightshade = new BLexiconEntry(LibLexicon.GFLOWER_NIGHTSHADE, categoryGenerationFlowers); - nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.nightshadeRecipe)); + nightshade.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.nightshadeRecipe)); endoflame = new BLexiconEntry(LibLexicon.GFLOWER_ENDOFLAME, categoryGenerationFlowers); endoflame.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), - new PagePetalRecipe("2", ModPetalRecipes.endoflameRecipe)); + new PagePetalRecipe<>("2", ModPetalRecipes.endoflameRecipe)); hydroangeas = new BLexiconEntry(LibLexicon.GFLOWER_HYDROANGEAS, categoryGenerationFlowers); hydroangeas.setLexiconPages(new PageText("0"), new PageImage("2", LibResources.ENTRY_HYDROANGEAS), - new PagePetalRecipe("1", ModPetalRecipes.hydroangeasRecipe)); + new PagePetalRecipe<>("1", ModPetalRecipes.hydroangeasRecipe)); thermalily = new BLexiconEntry(LibLexicon.GFLOWER_THERMALILY, categoryGenerationFlowers); thermalily.setLexiconPages(new PageText("0"), new PageText("2"), new PageText("3"), - new PagePetalRecipe("1", ModPetalRecipes.thermalilyRecipe)); + new PagePetalRecipe<>("1", ModPetalRecipes.thermalilyRecipe)); arcaneRose = new BLexiconEntry(LibLexicon.GFLOWER_ARCANE_ROSE, categoryGenerationFlowers); - arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.arcaneRoseRecipe)); + arcaneRose.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.arcaneRoseRecipe)); munchdew = new BLexiconEntry(LibLexicon.GFLOWER_MUNCHDEW, categoryGenerationFlowers); munchdew.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe("2", ModPetalRecipes.munchdewRecipe)); + new PagePetalRecipe<>("2", ModPetalRecipes.munchdewRecipe)); entropinnyum = new BLexiconEntry(LibLexicon.GFLOWER_ENTROPINNYUM, categoryGenerationFlowers); - entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.entropinnyumRecipe)); + entropinnyum.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.entropinnyumRecipe)); kekimurus = new ALexiconEntry(LibLexicon.GFLOWER_KEKIMURUS, categoryGenerationFlowers); - kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.kekimurusRecipe)); + kekimurus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.kekimurusRecipe)); gourmaryllis = new BLexiconEntry(LibLexicon.GFLOWER_GOURMARYLLIS, categoryGenerationFlowers); gourmaryllis.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), - new PagePetalRecipe("3", ModPetalRecipes.gourmaryllisRecipe)); + new PagePetalRecipe<>("3", ModPetalRecipes.gourmaryllisRecipe)); narslimmus = new BLexiconEntry(LibLexicon.GFLOWER_NARSLIMMUS, categoryGenerationFlowers); - narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe("1", ModPetalRecipes.narslimmusRecipe)); + narslimmus.setLexiconPages(new PageText("0"), new PagePetalRecipe<>("1", ModPetalRecipes.narslimmusRecipe)); spectrolus = new ALexiconEntry(LibLexicon.GFLOWER_SPECTROLUS, categoryGenerationFlowers); spectrolus.setLexiconPages(new PageText("0"), new PageText("1"), - new PagePetalRecipe("2", ModPetalRecipes.spectrolusRecipe)); + new PagePetalRecipe<>("2", ModPetalRecipes.spectrolusRecipe)); rafflowsia = new ALexiconEntry(LibLexicon.GFLOWER_RAFFLOWSIA, categoryGenerationFlowers); rafflowsia.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), - new PagePetalRecipe("4", ModPetalRecipes.rafflowsiaRecipe)); + new PagePetalRecipe<>("4", ModPetalRecipes.rafflowsiaRecipe)); dandelifeon = new ALexiconEntry(LibLexicon.GFLOWER_DANDELIFEON, categoryGenerationFlowers); dandelifeon.setLexiconPages(new PageText("_w"), new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"), new PageText("10"), - new PageText("7"), new PagePetalRecipe("8", ModPetalRecipes.dandelifeonRecipe), + new PageText("7"), new PagePetalRecipe<>("8", ModPetalRecipes.dandelifeonRecipe), new PageCraftingRecipe("9", ModCraftingRecipes.recipeCellBlock)); // DEVICES ENTRIES @@ -1166,7 +1165,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")); if (ModCraftingRecipes.recipesCosmeticItems != null) { 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 f064ad0de..b531a996c 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<>(); if (recipe != null) { list.add(recipe.getOutput(new ItemStack(ModItems.vial))); } 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 01126832d..9b3b68768 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageCraftingRecipe.java @@ -187,7 +187,7 @@ public class PageCraftingRecipe extends PageRecipe { @Override public List getDisplayedRecipes() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for(IRecipe r : recipes) list.add(r.getRecipeOutput()); 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 86a525264..457055bb7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -117,7 +117,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 89fba690d..ca0dc2038 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -35,11 +35,11 @@ public class PageEntity extends LexiconPage{ int relativeMouseX, relativeMouseY; boolean tooltipEntity; int size; - Constructor entityConstructor; + Constructor entityConstructor; public PageEntity(String unlocalizedName, String entity, int size) { super(unlocalizedName); - Class EntityClass = (Class) EntityList.stringToClassMapping.get(entity); + Class EntityClass = (Class) EntityList.stringToClassMapping.get(entity); this.size = size; try { entityConstructor = EntityClass.getConstructor(new Class[] {World.class}); 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 0240a4e92..a4d2265a6 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -156,7 +156,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 e7a7a612d..d48bf3fcf 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 { GL11.glPushMatrix(); GL11.glTranslatef(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 3b3b9b482..276055c66 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PagePetalRecipe.java @@ -140,7 +140,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 8ee6f8669..f755b68f7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -63,7 +63,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) { @@ -172,8 +172,8 @@ public class PageRecipe extends LexiconPage { } public static List filterRecipes(List list) { - if (list == null) return new ArrayList(); - ArrayList filtered = new ArrayList(); + if (list == null) return new ArrayList<>(); + ArrayList filtered = new ArrayList<>(); for (T entry: list) { if (entry != null) filtered.add(entry); } 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 7ba683c6d..a6033f56a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -79,7 +79,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) { @@ -100,7 +100,7 @@ public class PageShedding extends PageEntity { } } 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 +147,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 8f9d313ea..4e893dcf1 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTerrasteel.java @@ -90,7 +90,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 a9a221445..3f1014bb0 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; diff --git a/src/main/java/vazkii/botania/common/network/PacketLokiClear.java b/src/main/java/vazkii/botania/common/network/PacketLokiClear.java index ca570e8a1..d127a7193 100644 --- a/src/main/java/vazkii/botania/common/network/PacketLokiClear.java +++ b/src/main/java/vazkii/botania/common/network/PacketLokiClear.java @@ -1,6 +1,5 @@ package vazkii.botania.common.network; -import baubles.common.network.PacketSyncBauble; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/vazkii/botania/common/network/PacketLokiMirror.java b/src/main/java/vazkii/botania/common/network/PacketLokiMirror.java index ec9aa3dd6..ab48b5800 100644 --- a/src/main/java/vazkii/botania/common/network/PacketLokiMirror.java +++ b/src/main/java/vazkii/botania/common/network/PacketLokiMirror.java @@ -1,6 +1,5 @@ package vazkii.botania.common.network; -import baubles.common.network.PacketSyncBauble; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 5d84c8233..5675adb33 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -14,7 +14,6 @@ import java.awt.Color; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -24,19 +23,15 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.client.event.RenderWorldEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; -import vazkii.botania.client.render.world.SkyblockSkyRenderer; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public final class SkyblockWorldEvents { diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 98d7f4ee5..6ae06c7c5 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -14,7 +14,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.ChunkProviderFlat; -import net.minecraftforge.common.MinecraftForge; public class WorldTypeSkyblock extends WorldType { diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 2199d4c15..5f032b2d9 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1988,6 +1988,455 @@ botania.category.ender=Ender Artefacts botania.category.alfhomancy=Alfhomancy botania.category.misc=Miscellaneous +# LOCALIIZATIONS WITHOUT MODID +item.aesirRing.name=Ring of the Aesir +item.ancientWill.name=Will +item.auraRing.name=Band of Aura +item.auraRingGreater.name=Greater Band of Aura +item.autocraftingHalo.name=Manufactory Halo +item.baubleBox.name=Bauble Case +item.blackHoleTalisman.name=Black Hole Talisman +item.blackLotus.name=Black Lotus +item.bloodPendant.name=Tainted Blood Pendant +item.brewFlask.name=Flask +item.brewVial.name=Vial +item.cacophonium.name=Cacophonium +item.clip.name=Lens Clip +item.cobbleRod.name=Rod of the Depths +item.corporeaSpark.name=Corporea Spark +item.cosmetic.name=Cosmetic +item.craftingHalo.name=Assembly Halo +item.craftPattern.name=Crafting Pattern +item.crystalBow.name=Crystal Bow +item.dice.name=Dice of Fate +item.dirtRod.name=Rod of the Lands +item.divaCharm.name=Charm of the Diva +item.diviningRod.name=Rod of the Plentiful Mantle +item.dye.name=Floral Powder +item.elementiumAxe.name=Elementium Axe +item.elementiumBoots.name=Elementium Boots +item.elementiumChest.name=Elementium Chestplate +item.elementiumHelm.name=Elementium Helmet +item.elementiumHelmReveal.name=Elementium Helmet of Revealing +item.elementiumLegs.name=Elementium Leggings +item.elementiumPick.name=Elementium Pickaxe +item.elementiumShears.name=Elementium Shears +item.elementiumShovel.name=Elementium Shovel +item.elementiumSword.name=Elementium Sword +item.enderDagger.name=Soulscribe +item.enderHand.name=Hand of Ender +item.exchangeRod.name=Rod of the Shifting Crust +item.fertilizer.name=Floral Fertilizer +item.fireRod.name=Rod of the Hells +item.flightTiara.name=Flügel Tiara +item.flowerBag.name=Flower Pouch +item.flugelEye.name=Eye of the Flügel +item.gaiaHead.name=Gaia Guardian's Head +item.glassPick.name=Vitreous Pickaxe +item.goldenLaurel.name=Golden Laurel Crown +item.grassHorn.name=Horn of the Wild +item.grassSeeds.name=Seeds +item.gravityRod.name=Rod of the Shaded Mesa +item.holyCloak.name=Cloak of Virtue +item.icePendant.name=Snowflake Pendant +item.incenseStick.name=Incense Stick +item.infiniteFruit.name=The Fruit of Grisaia +item.itemFinder.name=The Spectator +item.keepIvy.name=Resolute Ivy +item.kingKey.name=Key of the King's Law +item.knockbackBelt.name=Tectonic Girdle +item.laputaShard.name=Shard of Laputa +item.lavaPendant.name=Pyroclast Pendant +item.lens.name=Mana Lens +item.lexicon.name=Lexica Botania +item.livingwoodBow.name=Livingwood Bow +item.lokiRing.name=Ring of Loki +item.magnetRing.name=Ring of Magnetization +item.magnetRingGreater.name=Greater Ring of Magnetization +item.manaBottle.name=Mana in a Bottle +item.manaCookie.name=Biscuit of Totality +item.manaGun.name=Mana Blaster +item.manaInkwell.name=Botanurgist's Inkwell +item.manaMirror.name=Mana Mirror +item.manaResource.name=Mana Resource +item.manaRing.name=Band of Mana +item.manaRingGreater.name=Greater Band of Mana +item.manasteelAxe.name=Manasteel Axe +item.manasteelBoots.name=Manasteel Boots +item.manasteelChest.name=Manasteel Chestplate +item.manasteelHelm.name=Manasteel Helmet +item.manasteelHelmReveal.name=Manasteel Helmet of Revealing +item.manasteelLegs.name=Manasteel Leggings +item.manasteelPick.name=Manasteel Pickaxe +item.manasteelShears.name=Manasteel Shears +item.manasteelShovel.name=Manasteel Shovel +item.manasteelSword.name=Manasteel Sword +item.manaTablet.name=Mana Tablet +item.manaweaveBoots.name=Santaweave Boots +item.manaweaveChest.name=Santaweave Robe Top +item.manaweaveHelm.name=Santaweave Cowl +item.manaweaveLegs.name=Santaweave Robe Bottom +item.miningRing.name=Ring of the Mantle +item.missileRod.name=Rod of the Unstable Reservoir +item.monocle.name=Manaseer Monocle +item.obedienceStick.name=Floral Obedience Stick +item.odinRing.name=Ring of Odin +item.openBucket.name=Extrapolated Bucket +item.overgrowthSeed.name=Overgrowth Seed +item.pestleAndMortar.name=Pestle and Mortar +item.petal.name=Mystical Petal +item.phantomInk.name=Phantom Ink +item.pinkinator.name=The Pinkinator +item.pixieRing.name=Great Fairy Ring +item.poolMinecart.name=Minecart with Mana Pool +item.quartz.name=Quartz +item.rainbowRod.name=Rod of the Bifrost +item.reachRing.name=Ring of Far Reach +item.recordGaia1.name=Scathed Music Disc +item.recordGaia2.name=Scathed Music Disc +item.regenIvy.name=Timeless Ivy +item.rune.name=Rune +item.sextant.name=Worldshaper's Sextant +item.shroomBag.name=Mushroom Pouch +item.signalFlare.name=Signal Flare +item.skyDirtRod.name=Rod of the Highlands +item.slimeBottle.name=Slime in a Bottle +item.slingshot.name=Livingwood Slingshot +item.smeltRod.name=Rod of the Molten Core +item.spark.name=Spark +item.sparkUpgrade.name=Spark Augment: Dispersive +item.spawnerMover.name=Life Aggregator +item.speedUpBelt.name=Planestrider's Sash +item.starSword.name=Starcaller +item.superLavaPendant.name=Crimson Pendant +item.superTravelBelt.name=Globetrotter's Sash +item.swapRing.name=Ring of Correction +item.temperanceStone.name=Stone of Temperance +item.terraAxe.name=Terra Truncator +item.terraformRod.name=Rod of the Terra Firma +item.terraPick.name=Terra Shatterer +item.terrasteelBoots.name=Terrasteel Boots +item.terrasteelChest.name=Terrasteel Chestplate +item.terrasteelHelm.name=Terrasteel Helmet +item.terrasteelHelmReveal.name=Terrasteel Helmet of Revealing +item.terrasteelLegs.name=Terrasteel Leggings +item.terraSword.name=Terra Blade +item.thornChakram.name=Thorn Chakram +item.thorRing.name=Ring of Thor +item.thunderSword.name=Thundercaller +item.tinyPlanet.name=Tiny Planet +item.tornadoRod.name=Rod of the Skies +item.travelBelt.name=Soujourner's Sash +item.twigWand.name=Wand of the Forest +item.unholyCloak.name=Cloak of Sin +item.vial.name=Managlass Vial +item.vineBall.name=Vine Ball +item.virus.name=Necrodermal Virus +item.waterBowl.name=Bowl of Water +item.waterRing.name=Ring of Chordata +item.waterRod.name=Rod of the Seas +item.worldSeed.name=World Seed +tile.alchemyCatalyst.name=Alchemy Catalyst +tile.alfheimPortal.name=Elven Gateway Core +tile.altar.name=Petal Apothecary +tile.altGrass.name=Grass +tile.avatar.name=Livingwood Avatar +tile.bellows.name=Manatide Bellows +tile.bifrost.name=Temporary Bifrost Block +tile.bifrostPerm.name=Bifrost Block +tile.bifrostPermPane.name=Bifrost Pane +tile.biomeStoneA.name=Metamorphic Forest Stone +tile.biomeStoneA0Slab.name=Metamorphic Forest Stone Slab +tile.biomeStoneA0SlabFull.name=Metamorphic Forest Stone Slab +tile.biomeStoneA0Stairs.name=Metamorphic Forest Stone Stairs +tile.biomeStoneA0Wall.name=Metamorphic Forest Cobblestone Wall +tile.biomeStoneA10Slab.name=Metamorphic Mountain Cobblestone Slab +tile.biomeStoneA10SlabFull.name=Metamorphic Mountain Cobblestone Slab +tile.biomeStoneA10Stairs.name=Metamorphic Mountain Cobblestone Stairs +tile.biomeStoneA11Slab.name=Metamorphic Fungal Cobblestone Slab +tile.biomeStoneA11SlabFull.name=Metamorphic Fungal Cobblestone Slab +tile.biomeStoneA11Stairs.name=Metamorphic Fungal Cobblestone Stairs +tile.biomeStoneA12Slab.name=Metamorphic Swamp Cobblestone Slab +tile.biomeStoneA12SlabFull.name=Metamorphic Swamp Cobblestone Slab +tile.biomeStoneA12Stairs.name=Metamorphic Swamp Cobblestone Stairs +tile.biomeStoneA13Slab.name=Metamorphic Desert Cobblestone Slab +tile.biomeStoneA13SlabFull.name=Metamorphic Desert Cobblestone Slab +tile.biomeStoneA13Stairs.name=Metamorphic Desert Cobblestone Stairs +tile.biomeStoneA14Slab.name=Metamorphic Taiga Cobblestone Slab +tile.biomeStoneA14SlabFull.name=Metamorphic Taiga Cobblestone Slab +tile.biomeStoneA14Stairs.name=Metamorphic Taiga Cobblestone Stairs +tile.biomeStoneA15Slab.name=Metamorphic Mesa Cobblestone Slab +tile.biomeStoneA15SlabFull.name=Metamorphic Mesa Cobblestone Slab +tile.biomeStoneA15Stairs.name=Metamorphic Mesa Cobblestone Stairs +tile.biomeStoneA1Slab.name=Metamorphic Plains Stone Slab +tile.biomeStoneA1SlabFull.name=Metamorphic Plains Stone Slab +tile.biomeStoneA1Stairs.name=Metamorphic Plains Stone Stairs +tile.biomeStoneA2Slab.name=Metamorphic Mountain Stone Slab +tile.biomeStoneA2SlabFull.name=Metamorphic Mountain Stone Slab +tile.biomeStoneA2Stairs.name=Metamorphic Mountain Stone Stairs +tile.biomeStoneA3Slab.name=Metamorphic Fungal Stone Slab +tile.biomeStoneA3SlabFull.name=Metamorphic Fungal Stone Slab +tile.biomeStoneA3Stairs.name=Metamorphic Fungal Stone Stairs +tile.biomeStoneA4Slab.name=Metamorphic Swamp Stone Slab +tile.biomeStoneA4SlabFull.name=Metamorphic Swamp Stone Slab +tile.biomeStoneA4Stairs.name=Metamorphic Swamp Stone Stairs +tile.biomeStoneA5Slab.name=Metamorphic Desert Stone Slab +tile.biomeStoneA5SlabFull.name=Metamorphic Desert Stone Slab +tile.biomeStoneA5Stairs.name=Metamorphic Desert Stone Stairs +tile.biomeStoneA6Slab.name=Metamorphic Taiga Stone Slab +tile.biomeStoneA6SlabFull.name=Metamorphic Taiga Stone Slab +tile.biomeStoneA6Stairs.name=Metamorphic Taiga Stone Stairs +tile.biomeStoneA7Slab.name=Metamorphic Mesa Stone Slab +tile.biomeStoneA7SlabFull.name=Metamorphic Mesa Stone Slab +tile.biomeStoneA7Stairs.name=Metamorphic Mesa Stone Stairs +tile.biomeStoneA8Slab.name=Metamorphic Forest Cobblestone Slab +tile.biomeStoneA8SlabFull.name=Metamorphic Forest Cobblestone Slab +tile.biomeStoneA8Stairs.name=Metamorphic Forest Cobblestone Stairs +tile.biomeStoneA9Slab.name=Metamorphic Plains Cobblestone Slab +tile.biomeStoneA9SlabFull.name=Metamorphic Plains Cobblestone Slab +tile.biomeStoneA9Stairs.name=Metamorphic Plains Cobblestone Stairs +tile.biomeStoneB.name=Metamorphic Forest Stone Bricks +tile.biomeStoneB0Slab.name=Metamorphic Forest Stone Brick Slab +tile.biomeStoneB0SlabFull.name=Metamorphic Forest Stone Brick Slab +tile.biomeStoneB0Stairs.name=Metamorphic Forest Stone Brick Stairs +tile.biomeStoneB1Slab.name=Metamorphic Plains Stone Brick Slab +tile.biomeStoneB1SlabFull.name=Metamorphic Plains Stone Brick Slab +tile.biomeStoneB1Stairs.name=Metamorphic Plains Stone Brick Stairs +tile.biomeStoneB2Slab.name=Metamorphic Mountain Stone Brick Slab +tile.biomeStoneB2SlabFull.name=Metamorphic Mountain Stone Brick Slab +tile.biomeStoneB2Stairs.name=Metamorphic Mountain Stone Brick Stairs +tile.biomeStoneB3Slab.name=Metamorphic Fungal Stone Brick Slab +tile.biomeStoneB3SlabFull.name=Metamorphic Fungal Stone Brick Slab +tile.biomeStoneB3Stairs.name=Metamorphic Fungal Stone Brick Stairs +tile.biomeStoneB4Slab.name=Metamorphic Swamp Stone Brick Slab +tile.biomeStoneB4SlabFull.name=Metamorphic Swamp Stone Brick Slab +tile.biomeStoneB4Stairs.name=Metamorphic Swamp Stone Brick Stairs +tile.biomeStoneB5Slab.name=Metamorphic Desert Stone Brick Slab +tile.biomeStoneB5SlabFull.name=Metamorphic Desert Stone Brick Slab +tile.biomeStoneB5Stairs.name=Metamorphic Desert Stone Brick Stairs +tile.biomeStoneB6Slab.name=Metamorphic Taiga Stone Brick Slab +tile.biomeStoneB6SlabFull.name=Metamorphic Taiga Stone Brick Slab +tile.biomeStoneB6Stairs.name=Metamorphic Taiga Stone Brick Stairs +tile.biomeStoneB7Slab.name=Metamorphic Mesa Stone Bricks Slab +tile.biomeStoneB7SlabFull.name=Metamorphic Mesa Stone Bricks Slab +tile.biomeStoneB7Stairs.name=Metamorphic Mesa Stone Bricks Stairs +tile.blazeBlock.name=Blaze Lamp +tile.brewery.name=Botanical Brewery +tile.buriedPetals.name=Buried Petal +tile.cacophoniumBlock.name=Cacophonium Block +tile.cellBlock.name=Cellular Block +tile.cocoon.name=Cocoon of Caprice +tile.conjurationCatalyst.name=Conjuration Catalyst +tile.corporeaCrystalCube.name=Corporea Crystal Cube +tile.corporeaFunnel.name=Corporea Funnel +tile.corporeaIndex.name=Corporea Index +tile.corporeaInterceptor.name=Corporea Interceptor +tile.corporeaRetainer.name=Corporea Retainer +tile.customBrick.name=Hellish Brick +tile.customBrick0Slab.name=Hellish Brick Slab +tile.customBrick0SlabFull.name=Hellish Brick Slab +tile.customBrick0Stairs.name=Hellish Brick Stairs +tile.customBrick1Slab.name=Soul Brick Slab +tile.customBrick1SlabFull.name=Soul Brick Slab +tile.customBrick1Stairs.name=Soul Brick Stairs +tile.customBrick2Slab.name=Frosty Brick Slab +tile.customBrick2SlabFull.name=Frosty Brick Slab +tile.customBrick2Stairs.name=Frosty Brick Stairs +tile.customBrick3Slab.name=Roof Tile Slab +tile.customBrick3SlabFull.name=Roof Tile Slab +tile.customBrick3Stairs.name=Roof Tile Stairs +tile.dirtPath.name=Trodden Dirt +tile.dirtPath0Slab.name=Trodden Dirt Slab +tile.dirtPath0SlabFull.name=Trodden Dirt Slab +tile.doubleFlower1.name=Tall Mystical Flower +tile.doubleFlower2.name=Tall Mystical Flower +tile.dreamwood.name=Dreamwood +tile.dreamwood0Slab.name=Dreamwood Slab +tile.dreamwood0SlabFull.name=Dreamwood Slab +tile.dreamwood0Stairs.name=Dreamwood Stairs +tile.dreamwood0Wall.name=Dreamwood Wall +tile.dreamwood1Slab.name=Dreamwood Plank Slab +tile.dreamwood1SlabFull.name=Dreamwood Plank Slab +tile.dreamwood1Stairs.name=Dreamwood Plank Stairs +tile.elfGlass.name=Alfglass +tile.elfGlassPane.name=Alfglass Pane +tile.enchantedSoil.name=Enchanted Soil +tile.enderEyeBlock.name=Ender Overseer +tile.endStoneBrick.name=End Stone Bricks +tile.endStoneBrick0Slab.name=End Stone Brick Slab +tile.endStoneBrick0SlabFull.name=End Stone Brick Slab +tile.endStoneBrick0Stairs.name=End Stone Brick Stairs +tile.endStoneBrick2Slab.name=Ender Brick Slab +tile.endStoneBrick2SlabFull.name=Ender Brick Slab +tile.endStoneBrick2Stairs.name=Ender Brick Stairs +tile.fakeAir.name=Fake Air +tile.felPumpkin.name=Fel Pumpkin +tile.floatingSpecialFlower.name=Floating Flower +tile.flower.name=Mystical Flower +tile.forestDrum.name=Drum +tile.forestEye.name=Eye of the Ancients +tile.gaiaHeadBlock.name=Gaia Guardian's Head +tile.ghostRail.name=Spectral Rail +tile.hourglass.name=Hovering Hourglass +tile.incensePlate.name=Incense Plate +tile.lightLauncher.name=Luminizer Launcher +tile.lightRelay.name=Luminizer +tile.livingrock.name=Livingrock +tile.livingrock0Slab.name=Livingrock Slab +tile.livingrock0SlabFull.name=Livingrock Slab +tile.livingrock0Stairs.name=Livingrock Stairs +tile.livingrock0Wall.name=Livingrock Wall +tile.livingrock1Slab.name=Livingrock Brick Slab +tile.livingrock1SlabFull.name=Livingrock Brick Slab +tile.livingrock1Stairs.name=Livingrock Brick Stairs +tile.livingwood.name=Livingwood +tile.livingwood0Slab.name=Livingwood Slab +tile.livingwood0SlabFull.name=Livingwood Slab +tile.livingwood0Stairs.name=Livingwood Stairs +tile.livingwood0Wall.name=Livingwood Wall +tile.livingwood1Slab.name=Livingwood Plank Slab +tile.livingwood1SlabFull.name=Livingwood Plank Slab +tile.livingwood1Stairs.name=Livingwood Plank Stairs +tile.manaBeacon.name=Unstable Beacon +tile.manaBomb.name=Manastorm Charge +tile.manaDetector.name=Mana Detector +tile.manaFlame.name=Mana Flash +tile.manaGlass.name=Managlass +tile.manaGlassPane.name=Managlass Pane +tile.manaVoid.name=Mana Void +tile.miniIsland.name=Floating Flower +tile.openCrate.name=Open Crate +tile.pavement.name=White Portuguese Pavement +tile.pavement0Slab.name=White Portuguese Pavement Slab +tile.pavement0SlabFull.name=White Portuguese Pavement Slab +tile.pavement0Stairs.name=White Portuguese Pavement Stairs +tile.pavement1Slab.name=Black Portuguese Pavement Slab +tile.pavement1SlabFull.name=Black Portuguese Pavement Slab +tile.pavement1Stairs.name=Black Portuguese Pavement Stairs +tile.pavement2Slab.name=Blue Portuguese Pavement Slab +tile.pavement2SlabFull.name=Blue Portuguese Pavement Slab +tile.pavement2Stairs.name=Blue Portuguese Pavement Stairs +tile.pavement3Slab.name=Red Portuguese Pavement Slab +tile.pavement3SlabFull.name=Red Portuguese Pavement Slab +tile.pavement3Stairs.name=Red Portuguese Pavement Stairs +tile.pavement4Slab.name=Yellow Portuguese Pavement Slab +tile.pavement4SlabFull.name=Yellow Portuguese Pavement Slab +tile.pavement4Stairs.name=Yellow Portuguese Pavement Stairs +tile.pavement5Slab.name=Green Portuguese Pavement Slab +tile.pavement5SlabFull.name=Green Portuguese Pavement Slab +tile.pavement5Stairs.name=Green Portuguese Pavement Stairs +tile.petalBlock.name=Petal Block +tile.pistonRelay.name=Force Relay +tile.pool.name=Mana Pool +tile.prism.name=Mana Prism +tile.prismarine.name=Prismarine +tile.prismarine0Slab.name=Prismarine Slab +tile.prismarine0SlabFull.name=Prismarine Slab +tile.prismarine0Stairs.name=Prismarine Stairs +tile.prismarine0Wall.name=Prismarine Wall +tile.prismarine1Slab.name=Prismarine Brick Slab +tile.prismarine1SlabFull.name=Prismarine Brick Slab +tile.prismarine1Stairs.name=Prismarine Brick Stairs +tile.prismarine2Slab.name=Dark Prismarine Slab +tile.prismarine2SlabFull.name=Dark Prismarine Slab +tile.prismarine2Stairs.name=Dark Prismarine Stairs +tile.pump.name=Mana Pump +tile.pylon.name=Mana Pylon +tile.quartzSlabBlazeFull.name=Blaze Quartz Slab +tile.quartzSlabBlazeHalf.name=Blaze Quartz Slab +tile.quartzSlabDarkFull.name=Smokey Quartz Slab +tile.quartzSlabDarkHalf.name=Smokey Quartz Slab +tile.quartzSlabElfFull.name=Elven Quartz Slab +tile.quartzSlabElfHalf.name=Elven Quartz Slab +tile.quartzSlabLavenderFull.name=Lavender Quartz Slab +tile.quartzSlabLavenderHalf.name=Lavender Quartz Slab +tile.quartzSlabManaFull.name=Mana Quartz Slab +tile.quartzSlabManaHalf.name=Mana Quartz Slab +tile.quartzSlabRedFull.name=Redquartz Slab +tile.quartzSlabRedHalf.name=Redquartz Slab +tile.quartzSlabSunnyFull.name=Sunny Quartz Slab +tile.quartzSlabSunnyHalf.name=Sunny Quartz Slab +tile.quartzStairsBlaze.name=Blaze Quartz Stairs +tile.quartzStairsDark.name=Smokey Quartz Stairs +tile.quartzStairsElf.name=Elven Quartz Stairs +tile.quartzStairsLavender.name=Lavender Quartz Stairs +tile.quartzStairsMana.name=Mana Quartz Stairs +tile.quartzStairsRed.name=Redquartz Stairs +tile.quartzStairsSunny.name=Sunny Quartz Stairs +tile.quartzTypeBlaze.name=Block of Blaze Quartz +tile.quartzTypeDark.name=Block of Smokey Quartz +tile.quartzTypeElf.name=Block of Elven Quartz +tile.quartzTypeLavender.name=Block of Lavender Quartz +tile.quartzTypeMana.name=Block of Mana Quartz +tile.quartzTypeRed.name=Block of Redquartz +tile.quartzTypeSunny.name=Block of Sunny Quartz +tile.redStringComparator.name=Red Stringed Comparator +tile.redStringContainer.name=Red Stringed Container +tile.redStringDispenser.name=Red Stringed Dispenser +tile.redStringFertilizer.name=Red Stringed Nutrifier +tile.redStringInterceptor.name=Red Stringed Interceptor +tile.redStringRelay.name=Red Stringed Spoofer +tile.reedBlock.name=Reed Block +tile.reedBlock0Slab.name=Reed Slab +tile.reedBlock0SlabFull.name=Reed Slab +tile.reedBlock0Stairs.name=Reed Stairs +tile.reedBlock0Wall.name=Reed Block Wall +tile.rfGenerator.name=Mana Fluxfield +tile.root.name=Living Root +tile.runeAltar.name=Runic Altar +tile.seaLamp.name=Sea Lantern +tile.shimmerrock.name=Shimmerrock +tile.shimmerrock0Slab.name=Shimmerrock Slab +tile.shimmerrock0SlabFull.name=Shimmerrock Slab +tile.shimmerrock0Stairs.name=Shimmerrock Stairs +tile.shimmerwoodPlanks.name=Shimmerwood Planks +tile.shimmerwoodPlanks0Slab.name=Shimmerwood Plank Slab +tile.shimmerwoodPlanks0SlabFull.name=Shimmerwood Plank Slab +tile.shimmerwoodPlanks0Stairs.name=Shimmerwood Plank Stairs +tile.shinyFlower.name=Glimmering Flower +tile.solidVine.name=Vine +tile.sparkChanger.name=Spark Tinkerer +tile.spawnerClaw.name=Life Imbuer +tile.specialFlower.name=Botania Flower +tile.spreader.name=Mana Spreader +tile.starfield.name=Starfield Creator +tile.stone0Slab.name=Andesite Slab +tile.stone0SlabFull.name=Andesite Slab +tile.stone0Stairs.name=Andesite Stairs +tile.stone0Wall.name=Andesite Wall +tile.stone10Slab.name=Diorite Brick Slab +tile.stone10SlabFull.name=Diorite Brick Slab +tile.stone10Stairs.name=Diorite Brick Stairs +tile.stone11Slab.name=Granite Brick Slab +tile.stone11SlabFull.name=Granite Brick Slab +tile.stone11Stairs.name=Granite Brick Stairs +tile.stone1Slab.name=Basalt Slab +tile.stone1SlabFull.name=Basalt Slab +tile.stone1Stairs.name=Basalt Stairs +tile.stone2Slab.name=Diorite Slab +tile.stone2SlabFull.name=Diorite Slab +tile.stone2Stairs.name=Diorite Stairs +tile.stone3Slab.name=Granite Slab +tile.stone3SlabFull.name=Granite Slab +tile.stone3Stairs.name=Granite Stairs +tile.stone8Slab.name=Andesite Brick Slab +tile.stone8SlabFull.name=Andesite Brick Slab +tile.stone8Stairs.name=Andesite Brick Stairs +tile.stone9Slab.name=Basalt Brick Slab +tile.stone9SlabFull.name=Basalt Brick Slab +tile.stone9Stairs.name=Basalt Brick Stairs +tile.storage.name=Resource Block +tile.terraPlate.name=Terrestrial Agglomeration Plate +tile.teruTeruBozu.name=Teru Teru Bozu +tile.thatch.name=Thatch +tile.thatch0Slab.name=Thatch Slab +tile.thatch0SlabFull.name=Thatch Slab +tile.thatch0Stairs.name=Thatch Stairs +tile.tinyPlanetBlock.name=Tiny Planet +tile.tinyPotato.name=Tiny Potato +tile.turntable.name=Spreader Turntable +tile.unstableBlock.name=Unstable Cube + # LEXICON ENTRIES # - BASIC