From 626d0d8fb5e4f0ff8cac88533f16ca396282b87d Mon Sep 17 00:00:00 2001 From: mezz Date: Fri, 4 Mar 2016 00:36:47 -0800 Subject: [PATCH] Use the generic types now available in 1.8+. remove warning suppressions --- .../java/forestry/apiculture/blocks/BlockAlveary.java | 8 +------- .../java/forestry/apiculture/blocks/BlockBeehives.java | 3 +-- .../java/forestry/apiculture/blocks/BlockCandle.java | 3 +-- .../java/forestry/apiculture/blocks/BlockStump.java | 3 +-- .../apiculture/genetics/alleles/AlleleEffect.java | 3 +-- src/main/java/forestry/apiculture/items/ItemBeeGE.java | 9 +++------ .../forestry/apiculture/items/ItemHabitatLocator.java | 3 +-- .../java/forestry/apiculture/items/ItemHoneycomb.java | 3 +-- .../apiculture/items/ItemMinecartBeehouse.java | 3 +-- .../forestry/apiculture/worldgen/HiveDecorator.java | 1 - .../forestry/arboriculture/blocks/BlockArbFence.java | 3 +-- .../forestry/arboriculture/blocks/BlockArbStairs.java | 3 +-- .../arboriculture/blocks/BlockForestryLeaves.java | 3 +-- .../java/forestry/arboriculture/blocks/BlockLog.java | 4 ++-- .../forestry/arboriculture/blocks/BlockPlanks.java | 4 ++-- .../java/forestry/arboriculture/blocks/BlockSlab.java | 3 +-- .../java/forestry/core/blocks/BlockResourceOre.java | 4 +--- .../forestry/core/blocks/BlockResourceStorage.java | 3 +-- src/main/java/forestry/core/blocks/BlockSoil.java | 1 - .../java/forestry/core/circuits/GuiSolderingIron.java | 2 -- .../java/forestry/core/circuits/ItemCircuitBoard.java | 6 ++---- .../java/forestry/core/commands/CommandHelpers.java | 1 - src/main/java/forestry/core/genetics/ItemGE.java | 3 +-- .../java/forestry/core/genetics/ItemResearchNote.java | 3 +-- .../java/forestry/core/gui/ContainerLiquidTanks.java | 1 - .../core/gui/ContainerLiquidTanksSocketed.java | 1 - .../java/forestry/core/gui/GuiNaturalistInventory.java | 1 - src/main/java/forestry/core/gui/GuiTextBox.java | 1 - .../java/forestry/core/gui/widgets/SocketWidget.java | 1 - src/main/java/forestry/core/items/ItemBlockNBT.java | 3 +-- src/main/java/forestry/core/items/ItemBlockTyped.java | 1 - .../java/forestry/core/items/ItemCraftingMaterial.java | 3 +-- .../java/forestry/core/items/ItemElectronTube.java | 10 ++++------ src/main/java/forestry/core/items/ItemFruit.java | 3 +-- src/main/java/forestry/core/items/ItemOverlay.java | 3 +-- src/main/java/forestry/core/items/ItemPipette.java | 3 +-- src/main/java/forestry/core/recipes/RecipeUtil.java | 3 --- src/main/java/forestry/core/utils/EntityUtil.java | 10 ---------- src/main/java/forestry/energy/blocks/BlockEngine.java | 1 - .../forestry/energy/gui/ContainerEngineBiogas.java | 5 ++--- .../java/forestry/energy/gui/ContainerEnginePeat.java | 4 ++-- .../java/forestry/factory/gui/ContainerFabricator.java | 5 ++--- .../java/forestry/factory/gui/ContainerFermenter.java | 5 ++--- .../java/forestry/factory/gui/ContainerMoistener.java | 5 ++--- .../java/forestry/factory/gui/ContainerRaintank.java | 5 ++--- src/main/java/forestry/factory/gui/GuiWorktable.java | 1 - src/main/java/forestry/farming/blocks/BlockFarm.java | 3 +-- .../java/forestry/farming/blocks/BlockMushroom.java | 3 +-- .../forestry/farming/circuits/CircuitFarmLogic.java | 1 - .../java/forestry/farming/items/ItemBlockFarm.java | 3 +-- src/main/java/forestry/farming/logic/FarmLogic.java | 3 +-- src/main/java/forestry/food/items/ItemBeverage.java | 6 ++---- .../lepidopterology/items/ItemButterflyGE.java | 3 +-- .../java/forestry/mail/gui/ContainerCatalogue.java | 3 +-- src/main/java/forestry/mail/gui/GuiCatalogue.java | 1 - src/main/java/forestry/mail/items/ItemLetter.java | 3 +-- src/main/java/forestry/plugins/PluginApiculture.java | 1 - .../java/forestry/plugins/PluginLepidopterology.java | 1 - src/main/java/forestry/plugins/PluginStorage.java | 2 -- src/main/java/forestry/storage/items/ItemBackpack.java | 3 +-- 60 files changed, 56 insertions(+), 137 deletions(-) diff --git a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java index 87abaf4a4..7d423c1ef 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockAlveary.java +++ b/src/main/java/forestry/apiculture/blocks/BlockAlveary.java @@ -100,10 +100,9 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister setDefaultState(this.blockState.getBaseState().withProperty(TYPE, AlvearyType.PLAIN).withProperty(STATE, State.OFF).withProperty(LEVEL, AlvearyLevel.MIDDLE)); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int i = 0; i < 8; i++) { if (i == 1) { continue; @@ -111,11 +110,6 @@ public class BlockAlveary extends BlockStructure implements IStateMapperRegister list.add(new ItemStack(item, 1, i)); } } - - @Override - public int getRenderType() { - return 3; - } @Override public boolean isNormalCube() { diff --git a/src/main/java/forestry/apiculture/blocks/BlockBeehives.java b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java index 816a23ae8..872a006dd 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockBeehives.java +++ b/src/main/java/forestry/apiculture/blocks/BlockBeehives.java @@ -172,9 +172,8 @@ public class BlockBeehives extends BlockContainer implements IItemModelRegister return null; } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { itemList.add(new ItemStack(this, 1, 1)); itemList.add(new ItemStack(this, 1, 2)); itemList.add(new ItemStack(this, 1, 3)); diff --git a/src/main/java/forestry/apiculture/blocks/BlockCandle.java b/src/main/java/forestry/apiculture/blocks/BlockCandle.java index 66b6316a3..2bac9986e 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockCandle.java +++ b/src/main/java/forestry/apiculture/blocks/BlockCandle.java @@ -147,9 +147,8 @@ public class BlockCandle extends BlockTorch implements IItemModelRegister { return ((TileCandle) worldIn.getTileEntity(pos)).getColour(); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { itemList.add(new ItemStack(this, 1, 0)); } diff --git a/src/main/java/forestry/apiculture/blocks/BlockStump.java b/src/main/java/forestry/apiculture/blocks/BlockStump.java index f8ca6c3ef..96884fdd9 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockStump.java +++ b/src/main/java/forestry/apiculture/blocks/BlockStump.java @@ -52,9 +52,8 @@ public class BlockStump extends BlockTorch implements IItemModelRegister { manager.registerItemModel(item, 0, "stump"); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { itemList.add(new ItemStack(this, 1, 0)); } diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java index 970cefae2..e491221a4 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffect.java @@ -29,7 +29,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IEffectData; import forestry.core.genetics.alleles.AlleleCategorized; import forestry.core.proxy.Proxies; -import forestry.core.utils.EntityUtil; import forestry.core.utils.vect.MutableVect; import forestry.core.utils.vect.Vect; @@ -155,6 +154,6 @@ public abstract class AlleleEffect extends AlleleCategorized implements IAlleleB public static List getEntitiesInRange(IBeeGenome genome, IBeeHousing housing, Class entityClass) { AxisAlignedBB boundingBox = getBounding(genome, housing); - return EntityUtil.getEntitiesWithinAABB(housing.getWorld(), entityClass, boundingBox); + return housing.getWorld().getEntitiesWithinAABB(entityClass, boundingBox); } } diff --git a/src/main/java/forestry/apiculture/items/ItemBeeGE.java b/src/main/java/forestry/apiculture/items/ItemBeeGE.java index b04082cdc..2e1bb9386 100755 --- a/src/main/java/forestry/apiculture/items/ItemBeeGE.java +++ b/src/main/java/forestry/apiculture/items/ItemBeeGE.java @@ -88,9 +88,8 @@ public class ItemBeeGE extends ItemGE { return beeGrammar.replaceAll("%SPECIES", beeSpecies).replaceAll("%TYPE", beeType); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { if (!itemstack.hasTagCompound()) { return; } @@ -107,14 +106,12 @@ public class ItemBeeGE extends ItemGE { super.addInformation(itemstack, player, list, flag); } - @SuppressWarnings("rawtypes") @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { addCreativeItems(itemList, true); } - @SuppressWarnings({"rawtypes", "unchecked"}) - public void addCreativeItems(List itemList, boolean hideSecrets) { + public void addCreativeItems(List itemList, boolean hideSecrets) { for (IBee bee : BeeManager.beeRoot.getIndividualTemplates()) { // Don't show secret bees unless ordered to. if (hideSecrets && bee.isSecret() && !Config.isDebug) { diff --git a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java index e3b191dd6..05e7bb317 100644 --- a/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java +++ b/src/main/java/forestry/apiculture/items/ItemHabitatLocator.java @@ -62,9 +62,8 @@ public class ItemHabitatLocator extends ItemWithGui { Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(iconName, texture); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { BiomeGenBase currentBiome = player.worldObj.getBiomeGenForCoords(player.getPosition()); float temperatureValue = currentBiome.getFloatTemperature(player.getPosition()); diff --git a/src/main/java/forestry/apiculture/items/ItemHoneycomb.java b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java index 6e3b1c0ef..d361b6bb2 100755 --- a/src/main/java/forestry/apiculture/items/ItemHoneycomb.java +++ b/src/main/java/forestry/apiculture/items/ItemHoneycomb.java @@ -68,9 +68,8 @@ public class ItemHoneycomb extends ItemForestry { } } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < EnumHoneyComb.VALUES.length; i++) { EnumHoneyComb honeyComb = EnumHoneyComb.VALUES[i]; if (!honeyComb.isSecret() || Config.isDebug) { diff --git a/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java b/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java index 08bcc1e6b..605c9f6fc 100644 --- a/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java +++ b/src/main/java/forestry/apiculture/items/ItemMinecartBeehouse.java @@ -98,9 +98,8 @@ public class ItemMinecartBeehouse extends ItemMinecart implements IItemModelRegi } } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < definition.length; i++) { itemList.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java index 44cbcc1ab..61bdc5fea 100755 --- a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java @@ -33,7 +33,6 @@ import forestry.plugins.PluginApiculture; public abstract class HiveDecorator { - @SuppressWarnings("rawtypes") private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_HIVES", new Class[0], new Object[0]); public static void decorateHives(IChunkProvider chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) { diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java index eabd94a63..a12191490 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbFence.java @@ -93,9 +93,8 @@ public class BlockArbFence extends BlockFence implements IWoodTyped, IItemModelR return super.getActualState(state, world, pos); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List list) { + public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List list) { for (EnumWoodType woodType : EnumWoodType.VALUES) { list.add(TreeManager.woodItemAccess.getFence(woodType, fireproof)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java index bfb980703..f5b863fa9 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockArbStairs.java @@ -89,10 +89,9 @@ public class BlockArbStairs extends BlockStairs implements IWoodTyped, IItemMode return super.getActualState(state, world, pos); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (EnumWoodType woodType : EnumWoodType.VALUES) { list.add(TreeManager.woodItemAccess.getStairs(woodType, fireproof)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java index a452b82b0..f6ee428fa 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockForestryLeaves.java @@ -107,8 +107,7 @@ public class BlockForestryLeaves extends BlockLeavesBase implements ITileEntityP @SideOnly(Side.CLIENT) @Override - @SuppressWarnings({"unchecked", "rawtypes"}) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (ITree tree : TreeManager.treeRoot.getIndividualTemplates()) { TileLeaves leaves = new TileLeaves(); diff --git a/src/main/java/forestry/arboriculture/blocks/BlockLog.java b/src/main/java/forestry/arboriculture/blocks/BlockLog.java index 3ff8587a6..5e5416a17 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockLog.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockLog.java @@ -18,6 +18,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; @@ -114,9 +115,8 @@ public class BlockLog extends BlockWood { return getStateFromMeta(b0); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (EnumWoodType woodType : EnumWoodType.VALUES) { list.add(TreeManager.woodItemAccess.getLog(woodType, isFireproof())); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java b/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java index e790443af..12afc78fd 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockPlanks.java @@ -14,6 +14,7 @@ import java.util.List; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import forestry.api.arboriculture.EnumWoodType; import forestry.api.arboriculture.TreeManager; @@ -26,9 +27,8 @@ public class BlockPlanks extends BlockWood { setHarvestLevel("axe", 0); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List list) { + public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List list) { for (EnumWoodType woodType : EnumWoodType.VALUES) { list.add(TreeManager.woodItemAccess.getPlanks(woodType, isFireproof())); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockSlab.java b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java index 6fad7a8b0..d22fa07f1 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockSlab.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockSlab.java @@ -133,9 +133,8 @@ public class BlockSlab extends net.minecraft.block.BlockSlab implements IWoodTyp return "SomeSlab"; } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List list) { + public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List list) { if (isDouble()) { for (EnumWoodType woodType : EnumWoodType.VALUES) { list.add(TreeManager.woodItemAccess.getSlab(woodType, fireproof)); diff --git a/src/main/java/forestry/core/blocks/BlockResourceOre.java b/src/main/java/forestry/core/blocks/BlockResourceOre.java index 21fd7ffc7..e0735dfb0 100644 --- a/src/main/java/forestry/core/blocks/BlockResourceOre.java +++ b/src/main/java/forestry/core/blocks/BlockResourceOre.java @@ -128,10 +128,8 @@ public class BlockResourceOre extends Block implements IItemModelRegister { return getMetaFromState(state); } - // / CREATIVE INVENTORY - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (ResourceType resourceType : ResourceType.values()) { ItemStack stack = get(resourceType, 1); itemList.add(stack); diff --git a/src/main/java/forestry/core/blocks/BlockResourceStorage.java b/src/main/java/forestry/core/blocks/BlockResourceStorage.java index 57151599d..c1368c125 100644 --- a/src/main/java/forestry/core/blocks/BlockResourceStorage.java +++ b/src/main/java/forestry/core/blocks/BlockResourceStorage.java @@ -60,9 +60,8 @@ public class BlockResourceStorage extends Block implements IItemModelRegister { return getDefaultState().withProperty(RESOURCE, ResourceType.values()[meta]); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubBlocks(Item item, CreativeTabs creativeTabs, List itemList) { + public void getSubBlocks(Item item, CreativeTabs creativeTabs, List itemList) { for (ResourceType resourceType : ResourceType.values()) { ItemStack stack = get(resourceType); itemList.add(stack); diff --git a/src/main/java/forestry/core/blocks/BlockSoil.java b/src/main/java/forestry/core/blocks/BlockSoil.java index cab8063b4..0d65d6bda 100644 --- a/src/main/java/forestry/core/blocks/BlockSoil.java +++ b/src/main/java/forestry/core/blocks/BlockSoil.java @@ -255,7 +255,6 @@ public class BlockSoil extends Block implements IItemTyped, IItemModelRegister { } } - // / CREATIVE INVENTORY @Override public void getSubBlocks(Item item, CreativeTabs par2CreativeTabs, List itemList) { itemList.add(new ItemStack(this, 1, 0)); diff --git a/src/main/java/forestry/core/circuits/GuiSolderingIron.java b/src/main/java/forestry/core/circuits/GuiSolderingIron.java index c6d3027f5..1b34ec469 100755 --- a/src/main/java/forestry/core/circuits/GuiSolderingIron.java +++ b/src/main/java/forestry/core/circuits/GuiSolderingIron.java @@ -72,14 +72,12 @@ public class GuiSolderingIron extends GuiForestry")); - } @Override diff --git a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java index e5b2e3900..d4f7ab83d 100755 --- a/src/main/java/forestry/core/circuits/ItemCircuitBoard.java +++ b/src/main/java/forestry/core/circuits/ItemCircuitBoard.java @@ -37,9 +37,8 @@ public class ItemCircuitBoard extends ItemForestry { setHasSubtypes(true); } - @SuppressWarnings({"unchecked", "rawtypes"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { itemList.add(createCircuitboard(EnumCircuitBoardType.BASIC, null, new ICircuit[]{})); itemList.add(createCircuitboard(EnumCircuitBoardType.ENHANCED, null, new ICircuit[]{})); itemList.add(createCircuitboard(EnumCircuitBoardType.REFINED, null, new ICircuit[]{})); @@ -79,9 +78,8 @@ public class ItemCircuitBoard extends ItemForestry { return "item.for.circuitboard." + type.toString().toLowerCase(Locale.ENGLISH); } - @SuppressWarnings({"unchecked", "rawtypes"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { ICircuitBoard circuitboard = ChipsetManager.circuitRegistry.getCircuitBoard(itemstack); if (circuitboard != null) { circuitboard.addTooltip(list); diff --git a/src/main/java/forestry/core/commands/CommandHelpers.java b/src/main/java/forestry/core/commands/CommandHelpers.java index 767c606e2..b93e528b0 100644 --- a/src/main/java/forestry/core/commands/CommandHelpers.java +++ b/src/main/java/forestry/core/commands/CommandHelpers.java @@ -157,7 +157,6 @@ public class CommandHelpers { return false; } - @SuppressWarnings("unchecked") public static List getListOfStringsMatchingLastWord(String[] strings, String... lastWords) { return CommandBase.getListOfStringsMatchingLastWord(strings, lastWords); } diff --git a/src/main/java/forestry/core/genetics/ItemGE.java b/src/main/java/forestry/core/genetics/ItemGE.java index c855c8d9f..7712d6d50 100755 --- a/src/main/java/forestry/core/genetics/ItemGE.java +++ b/src/main/java/forestry/core/genetics/ItemGE.java @@ -63,9 +63,8 @@ public abstract class ItemGE extends ItemForestry { return species != null && species.hasEffect(); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { if (!itemstack.hasTagCompound()) { return; } diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index 0c7e0b3c1..3a351612c 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -272,9 +272,8 @@ public class ItemResearchNote extends ItemForestry { return StringUtil.localizeAndFormatRaw(getUnlocalizedName(itemstack) + ".name", researcherName); } - @SuppressWarnings({"unchecked", "rawtypes"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { ResearchNote note = new ResearchNote(itemstack.getTagCompound()); note.addTooltip(list); } diff --git a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java index 947851586..8eb985277 100755 --- a/src/main/java/forestry/core/gui/ContainerLiquidTanks.java +++ b/src/main/java/forestry/core/gui/ContainerLiquidTanks.java @@ -40,7 +40,6 @@ public abstract class ContainerLiquidTanks lines = fontRendererObj.listFormattedStringToWidth(text, width); maxLines = lines.size(); diff --git a/src/main/java/forestry/core/gui/widgets/SocketWidget.java b/src/main/java/forestry/core/gui/widgets/SocketWidget.java index eebed35a7..bcee59ddc 100755 --- a/src/main/java/forestry/core/gui/widgets/SocketWidget.java +++ b/src/main/java/forestry/core/gui/widgets/SocketWidget.java @@ -50,7 +50,6 @@ public class SocketWidget extends Widget { } private final ToolTip toolTip = new ToolTip(250) { - @SuppressWarnings("unchecked") @Override public void refresh() { toolTip.clear(); diff --git a/src/main/java/forestry/core/items/ItemBlockNBT.java b/src/main/java/forestry/core/items/ItemBlockNBT.java index b446aed33..ea78386fa 100644 --- a/src/main/java/forestry/core/items/ItemBlockNBT.java +++ b/src/main/java/forestry/core/items/ItemBlockNBT.java @@ -22,9 +22,8 @@ public class ItemBlockNBT extends ItemBlockForestry { super(block); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List info, boolean par4) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List info, boolean par4) { if (!itemstack.hasTagCompound()) { return; } diff --git a/src/main/java/forestry/core/items/ItemBlockTyped.java b/src/main/java/forestry/core/items/ItemBlockTyped.java index 9271a9128..f49ebfae4 100644 --- a/src/main/java/forestry/core/items/ItemBlockTyped.java +++ b/src/main/java/forestry/core/items/ItemBlockTyped.java @@ -26,7 +26,6 @@ public class ItemBlockTyped extends ItemBlockForestry { } @Override - @SuppressWarnings("rawtypes") public String getUnlocalizedName(ItemStack itemstack) { Block block = getBlock(); if (block instanceof IItemTyped) { diff --git a/src/main/java/forestry/core/items/ItemCraftingMaterial.java b/src/main/java/forestry/core/items/ItemCraftingMaterial.java index 5d93c796e..78ce0049b 100644 --- a/src/main/java/forestry/core/items/ItemCraftingMaterial.java +++ b/src/main/java/forestry/core/items/ItemCraftingMaterial.java @@ -59,9 +59,8 @@ public class ItemCraftingMaterial extends ItemForestry { } } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < 7; i++) { itemList.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/forestry/core/items/ItemElectronTube.java b/src/main/java/forestry/core/items/ItemElectronTube.java index a088c6dcf..63523abe8 100644 --- a/src/main/java/forestry/core/items/ItemElectronTube.java +++ b/src/main/java/forestry/core/items/ItemElectronTube.java @@ -37,11 +37,10 @@ public class ItemElectronTube extends ItemOverlay { super(CreativeTabForestry.tabForestry, EnumElectronTube.VALUES); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { Multimap circuits = getCircuits(itemstack); - if (circuits.size() > 0) { + if (!circuits.isEmpty()) { if (Proxies.common.isShiftDown()) { for (ICircuitLayout circuitLayout : circuits.keys()) { String circuitLayoutName = circuitLayout.getUsage(); @@ -58,13 +57,12 @@ public class ItemElectronTube extends ItemOverlay { } } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < overlays.length; i++) { if (Config.isDebug || !overlays[i].isSecret()) { ItemStack itemStack = new ItemStack(this, 1, i); - if (Config.isDebug || getCircuits(itemStack).size() > 0) { + if (Config.isDebug || !getCircuits(itemStack).isEmpty()) { itemList.add(itemStack); } } diff --git a/src/main/java/forestry/core/items/ItemFruit.java b/src/main/java/forestry/core/items/ItemFruit.java index 57c9096da..ed066b127 100755 --- a/src/main/java/forestry/core/items/ItemFruit.java +++ b/src/main/java/forestry/core/items/ItemFruit.java @@ -78,9 +78,8 @@ public class ItemFruit extends ItemForestryFood { EnumFruit.registerModel(item, manager); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < EnumFruit.values().length; i++) { itemList.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/forestry/core/items/ItemOverlay.java b/src/main/java/forestry/core/items/ItemOverlay.java index 399266d92..715f9a87d 100755 --- a/src/main/java/forestry/core/items/ItemOverlay.java +++ b/src/main/java/forestry/core/items/ItemOverlay.java @@ -53,9 +53,8 @@ public class ItemOverlay extends ItemForestry { return false; } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < overlays.length; i++) { if (Config.isDebug || !overlays[i].isSecret()) { itemList.add(new ItemStack(this, 1, i)); diff --git a/src/main/java/forestry/core/items/ItemPipette.java b/src/main/java/forestry/core/items/ItemPipette.java index 8bb40a6c2..178190365 100755 --- a/src/main/java/forestry/core/items/ItemPipette.java +++ b/src/main/java/forestry/core/items/ItemPipette.java @@ -96,9 +96,8 @@ public class ItemPipette extends ItemForestry implements IToolPipette { return filled; } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { PipetteContents contained = PipetteContents.create(itemstack); if (contained != null) { contained.addTooltip(list); diff --git a/src/main/java/forestry/core/recipes/RecipeUtil.java b/src/main/java/forestry/core/recipes/RecipeUtil.java index 35be5b01c..74f6ab4a2 100644 --- a/src/main/java/forestry/core/recipes/RecipeUtil.java +++ b/src/main/java/forestry/core/recipes/RecipeUtil.java @@ -211,12 +211,10 @@ public abstract class RecipeUtil { addRecipe(new ItemStack(item), obj); } - @SuppressWarnings("unchecked") public static void addRecipe(ItemStack itemstack, Object... obj) { CraftingManager.getInstance().getRecipeList().add(new ShapedRecipeCustom(itemstack, obj)); } - @SuppressWarnings("unchecked") public static void addPriorityRecipe(ItemStack itemStack, Object... obj) { CraftingManager.getInstance().getRecipeList().add(0, new ShapedRecipeCustom(itemStack, obj)); } @@ -225,7 +223,6 @@ public abstract class RecipeUtil { addShapelessRecipe(new ItemStack(item), obj); } - @SuppressWarnings("unchecked") public static void addShapelessRecipe(ItemStack itemstack, Object... obj) { CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(itemstack, obj)); } diff --git a/src/main/java/forestry/core/utils/EntityUtil.java b/src/main/java/forestry/core/utils/EntityUtil.java index 017abad2b..c400008dc 100644 --- a/src/main/java/forestry/core/utils/EntityUtil.java +++ b/src/main/java/forestry/core/utils/EntityUtil.java @@ -52,16 +52,6 @@ public abstract class EntityUtil { Log.debug("Registered entity %s (%s) with id %s.", ident, entityClass.toString(), id); } - @SuppressWarnings("unchecked") - public static List getEntitiesWithinAABB(World world, Class entityClass, AxisAlignedBB boundingBox) { - return world.getEntitiesWithinAABB(entityClass, boundingBox); - } - - @SuppressWarnings("unchecked") - public static List selectEntitiesWithinAABB(World world, EntitySelector entitySelector, AxisAlignedBB boundingBox) { - return world.getEntitiesWithinAABB(entitySelector.getEntityClass(), boundingBox, entitySelector); - } - private static E createEntity(World world, Class entityClass) { if (!EntityList.classToStringMapping.containsKey(entityClass)) { return null; diff --git a/src/main/java/forestry/energy/blocks/BlockEngine.java b/src/main/java/forestry/energy/blocks/BlockEngine.java index a9ec59a46..49d262465 100644 --- a/src/main/java/forestry/energy/blocks/BlockEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockEngine.java @@ -57,7 +57,6 @@ public class BlockEngine extends BlockBase { } @Override - @SuppressWarnings("unchecked") public void addCollisionBoxesToList(World world, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity) { TileEngine tile = TileUtil.getTile(world, pos, TileEngine.class); if (tile == null) { diff --git a/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java b/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java index 82b748cff..7fa756d32 100644 --- a/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java +++ b/src/main/java/forestry/energy/gui/ContainerEngineBiogas.java @@ -34,12 +34,11 @@ public class ContainerEngineBiogas extends ContainerLiquidTanks { public void detectAndSendChanges() { super.detectAndSendChanges(); - for (Object crafter : crafters) { - tile.sendGUINetworkData(this, (ICrafting) crafter); + for (ICrafting crafter : crafters) { + tile.sendGUINetworkData(this, crafter); } } } diff --git a/src/main/java/forestry/factory/gui/ContainerFabricator.java b/src/main/java/forestry/factory/gui/ContainerFabricator.java index 92b92c627..41f8c2c7c 100755 --- a/src/main/java/forestry/factory/gui/ContainerFabricator.java +++ b/src/main/java/forestry/factory/gui/ContainerFabricator.java @@ -66,12 +66,11 @@ public class ContainerFabricator extends ContainerLiquidTanks im } @Override - @SuppressWarnings("unchecked") public void detectAndSendChanges() { super.detectAndSendChanges(); - for (Object crafter : crafters) { - tile.sendGUINetworkData(this, (ICrafting) crafter); + for (ICrafting crafter : crafters) { + tile.sendGUINetworkData(this, crafter); } } } diff --git a/src/main/java/forestry/factory/gui/ContainerFermenter.java b/src/main/java/forestry/factory/gui/ContainerFermenter.java index 98398f4f6..c40e5748f 100755 --- a/src/main/java/forestry/factory/gui/ContainerFermenter.java +++ b/src/main/java/forestry/factory/gui/ContainerFermenter.java @@ -39,12 +39,11 @@ public class ContainerFermenter extends ContainerLiquidTanks { } @Override - @SuppressWarnings("unchecked") public void detectAndSendChanges() { super.detectAndSendChanges(); - for (Object crafter : crafters) { - tile.sendGUINetworkData(this, (ICrafting) crafter); + for (ICrafting crafter : crafters) { + tile.sendGUINetworkData(this, crafter); } } } diff --git a/src/main/java/forestry/factory/gui/ContainerMoistener.java b/src/main/java/forestry/factory/gui/ContainerMoistener.java index ea9de6197..9526da581 100755 --- a/src/main/java/forestry/factory/gui/ContainerMoistener.java +++ b/src/main/java/forestry/factory/gui/ContainerMoistener.java @@ -60,12 +60,11 @@ public class ContainerMoistener extends ContainerLiquidTanks impl } @Override - @SuppressWarnings("unchecked") public void detectAndSendChanges() { super.detectAndSendChanges(); - for (Object crafter : crafters) { - tile.sendGUINetworkData(this, (ICrafting) crafter); + for (ICrafting crafter : crafters) { + tile.sendGUINetworkData(this, crafter); } } } diff --git a/src/main/java/forestry/factory/gui/ContainerRaintank.java b/src/main/java/forestry/factory/gui/ContainerRaintank.java index 3e613fc55..5ace30fda 100755 --- a/src/main/java/forestry/factory/gui/ContainerRaintank.java +++ b/src/main/java/forestry/factory/gui/ContainerRaintank.java @@ -36,12 +36,11 @@ public class ContainerRaintank extends ContainerLiquidTanks { } @Override - @SuppressWarnings("unchecked") public void detectAndSendChanges() { super.detectAndSendChanges(); - for (Object crafter : crafters) { - tile.sendGUINetworkData(this, (ICrafting) crafter); + for (ICrafting crafter : crafters) { + tile.sendGUINetworkData(this, crafter); } } } diff --git a/src/main/java/forestry/factory/gui/GuiWorktable.java b/src/main/java/forestry/factory/gui/GuiWorktable.java index 44d4af42b..fb75d16f9 100755 --- a/src/main/java/forestry/factory/gui/GuiWorktable.java +++ b/src/main/java/forestry/factory/gui/GuiWorktable.java @@ -62,7 +62,6 @@ public class GuiWorktable extends GuiForestryTitled list) { for (int i = 0; i < 6; i++) { if (i == 1) { continue; diff --git a/src/main/java/forestry/farming/blocks/BlockMushroom.java b/src/main/java/forestry/farming/blocks/BlockMushroom.java index db7ccb929..5bd1e7028 100644 --- a/src/main/java/forestry/farming/blocks/BlockMushroom.java +++ b/src/main/java/forestry/farming/blocks/BlockMushroom.java @@ -154,10 +154,9 @@ public class BlockMushroom extends BlockBush implements IItemTyped, IItemModelRe } /* ICONS */ - @SuppressWarnings({"unchecked", "rawtypes"}) @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, 0)); list.add(new ItemStack(item, 1, 1)); } diff --git a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java index cc402c35a..029b8e2a1 100755 --- a/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java +++ b/src/main/java/forestry/farming/circuits/CircuitFarmLogic.java @@ -44,7 +44,6 @@ public class CircuitFarmLogic extends Circuit { } @Override - @SuppressWarnings("rawtypes") public void onInsertion(int slot, Object tile) { IFarmHousing housing = getCircuitable(tile); if (housing == null) { diff --git a/src/main/java/forestry/farming/items/ItemBlockFarm.java b/src/main/java/forestry/farming/items/ItemBlockFarm.java index f1344fc04..24b880a1c 100644 --- a/src/main/java/forestry/farming/items/ItemBlockFarm.java +++ b/src/main/java/forestry/farming/items/ItemBlockFarm.java @@ -31,9 +31,8 @@ public class ItemBlockFarm extends ItemBlock { return i; } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List info, boolean par4) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List info, boolean par4) { if (!itemstack.hasTagCompound()) { return; } diff --git a/src/main/java/forestry/farming/logic/FarmLogic.java b/src/main/java/forestry/farming/logic/FarmLogic.java index a399bc6c6..8b519237b 100755 --- a/src/main/java/forestry/farming/logic/FarmLogic.java +++ b/src/main/java/forestry/farming/logic/FarmLogic.java @@ -34,7 +34,6 @@ import forestry.api.farming.IFarmLogic; import forestry.core.config.Constants; import forestry.core.entities.EntitySelector; import forestry.core.utils.BlockUtil; -import forestry.core.utils.EntityUtil; import forestry.core.utils.vect.Vect; public abstract class FarmLogic implements IFarmLogic { @@ -118,7 +117,7 @@ public abstract class FarmLogic implements IFarmLogic { protected List collectEntityItems(boolean toWorldHeight) { AxisAlignedBB harvestBox = getHarvestBox(housing, toWorldHeight); - List entityItems = EntityUtil.selectEntitiesWithinAABB(housing.getWorld(), entitySelectorFarm, harvestBox); + List entityItems = housing.getWorld().getEntitiesWithinAABB(entitySelectorFarm.getEntityClass(), harvestBox, entitySelectorFarm); List stacks = new ArrayList<>(); for (EntityItem entity : entityItems) { ItemStack contained = entity.getEntityItem(); diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index 79e3a6a9d..fb7819984 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -111,9 +111,8 @@ public class ItemBeverage extends ItemForestryFood { return itemstack; } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { for (int i = 0; i < beverages.length; i++) { if (Config.isDebug || !beverages[i].isSecret()) { itemList.add(new ItemStack(this, 1, i)); @@ -121,9 +120,8 @@ public class ItemBeverage extends ItemForestryFood { } } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { List effects = BeverageEffect.loadEffects(itemstack); for (IBeverageEffect effect : effects) { diff --git a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java index aa4d4ebb0..abe971b40 100755 --- a/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java +++ b/src/main/java/forestry/lepidopterology/items/ItemButterflyGE.java @@ -92,9 +92,8 @@ public class ItemButterflyGE extends ItemGE { return butterfly.getDisplayName(); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List itemList) { addCreativeItems(itemList, true); } diff --git a/src/main/java/forestry/mail/gui/ContainerCatalogue.java b/src/main/java/forestry/mail/gui/ContainerCatalogue.java index 4b49c5b96..1eb5e9a60 100755 --- a/src/main/java/forestry/mail/gui/ContainerCatalogue.java +++ b/src/main/java/forestry/mail/gui/ContainerCatalogue.java @@ -179,8 +179,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe super.detectAndSendChanges(); if (needsSynch) { - for (Object crafter1 : crafters) { - ICrafting crafter = (ICrafting) crafter1; + for (ICrafting crafter : crafters) { crafter.sendProgressBarUpdate(this, 0, stationIndex); crafter.sendProgressBarUpdate(this, 1, stations.size()); crafter.sendProgressBarUpdate(this, 2, currentFilter); diff --git a/src/main/java/forestry/mail/gui/GuiCatalogue.java b/src/main/java/forestry/mail/gui/GuiCatalogue.java index fe7c68e7f..f1f2a1f6b 100755 --- a/src/main/java/forestry/mail/gui/GuiCatalogue.java +++ b/src/main/java/forestry/mail/gui/GuiCatalogue.java @@ -45,7 +45,6 @@ public class GuiCatalogue extends GuiForestry { this.ySize = 192; } - @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); diff --git a/src/main/java/forestry/mail/items/ItemLetter.java b/src/main/java/forestry/mail/items/ItemLetter.java index 4aa754726..dc09f1d89 100755 --- a/src/main/java/forestry/mail/items/ItemLetter.java +++ b/src/main/java/forestry/mail/items/ItemLetter.java @@ -63,9 +63,8 @@ public class ItemLetter extends ItemWithGui { LetterProperties.registerModel(item, manager); } - @SuppressWarnings({"unchecked", "rawtypes"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { NBTTagCompound nbttagcompound = itemstack.getTagCompound(); if (nbttagcompound == null) { list.add('<' + StringUtil.localize("gui.blank") + '>'); diff --git a/src/main/java/forestry/plugins/PluginApiculture.java b/src/main/java/forestry/plugins/PluginApiculture.java index f99268c2a..6bcfac848 100644 --- a/src/main/java/forestry/plugins/PluginApiculture.java +++ b/src/main/java/forestry/plugins/PluginApiculture.java @@ -139,7 +139,6 @@ public class PluginApiculture extends BlankForestryPlugin { private final Map defaultPlantableFlowers = new HashMap<>(); @Override - @SuppressWarnings({"unchecked"}) public void setupAPI() { super.setupAPI(); diff --git a/src/main/java/forestry/plugins/PluginLepidopterology.java b/src/main/java/forestry/plugins/PluginLepidopterology.java index cfc8e1423..1d2fca7d8 100755 --- a/src/main/java/forestry/plugins/PluginLepidopterology.java +++ b/src/main/java/forestry/plugins/PluginLepidopterology.java @@ -127,7 +127,6 @@ public class PluginLepidopterology extends BlankForestryPlugin { config.save(); } - @SuppressWarnings("unchecked") @Override public void registerRecipes() { CraftingManager.getInstance().getRecipeList().add(new MatingRecipe()); diff --git a/src/main/java/forestry/plugins/PluginStorage.java b/src/main/java/forestry/plugins/PluginStorage.java index 45d93626b..2ee5d0265 100755 --- a/src/main/java/forestry/plugins/PluginStorage.java +++ b/src/main/java/forestry/plugins/PluginStorage.java @@ -103,7 +103,6 @@ public class PluginStorage extends BlankForestryPlugin { public static ItemRegistryStorage items; @Override - @SuppressWarnings({"unchecked", "rawtypes"}) public void setupAPI() { super.setupAPI(); @@ -153,7 +152,6 @@ public class PluginStorage extends BlankForestryPlugin { } @Override - @SuppressWarnings({"unchecked", "rawtypes"}) public void disabledSetupAPI() { BackpackManager.backpackItems = new ArrayList[6]; BackpackManager.backpackItems[0] = minerItems; diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index a490481bc..ee6ddf9c5 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -207,9 +207,8 @@ public class ItemBackpack extends ItemWithGui { return getSlotsForType(type); } - @SuppressWarnings({"rawtypes", "unchecked"}) @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean flag) { int occupied = ItemInventory.getOccupiedSlotCount(itemstack); BackpackMode mode = getMode(itemstack);