diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index a836d409c..a8aa8455b 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -298,8 +298,6 @@ public class PluginApiculture extends BlankForestryPlugin { ); } - proxy.initializeRendering(); - blocks.apiary.init(); blocks.beeHouse.init(); blocks.beeChest.init(); diff --git a/src/main/java/forestry/apiculture/VillagerApiaristTrades.java b/src/main/java/forestry/apiculture/VillagerApiaristTrades.java index db78334bc..79e6c4dcb 100644 --- a/src/main/java/forestry/apiculture/VillagerApiaristTrades.java +++ b/src/main/java/forestry/apiculture/VillagerApiaristTrades.java @@ -1,5 +1,6 @@ package forestry.apiculture; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.Random; @@ -24,7 +25,7 @@ public class VillagerApiaristTrades { } @Override - public void modifyMerchantRecipeList(MerchantRecipeList recipeList, Random random) { + public void modifyMerchantRecipeList(@Nonnull MerchantRecipeList recipeList, @Nonnull Random random) { int sellAmount = 1; if (this.priceInfo != null) { sellAmount = this.priceInfo.getPrice(random); diff --git a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java index 2acfc2689..ca0c79a19 100644 --- a/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java +++ b/src/main/java/forestry/apiculture/genetics/alleles/AlleleEffectCreeper.java @@ -85,7 +85,7 @@ public class AlleleEffectCreeper extends AlleleEffectThrottled { } float pitch = (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F; - world.playSound((EntityPlayer)null, housingCoords.getX(), housingCoords.getY(), housingCoords.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, pitch); + world.playSound(null, housingCoords.getX(), housingCoords.getY(), housingCoords.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 4.0F, pitch); storedData.setInteger(indexExplosionTimer, 2); // Set explosion timer } diff --git a/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java index 9ff0cdb44..15b47a346 100755 --- a/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApiculture.java @@ -12,7 +12,4 @@ package forestry.apiculture.proxy; public class ProxyApiculture { - public void initializeRendering() { - } - } diff --git a/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java index 45e3e0c9e..adce14d32 100644 --- a/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java +++ b/src/main/java/forestry/apiculture/proxy/ProxyApicultureClient.java @@ -16,8 +16,4 @@ public class ProxyApicultureClient extends ProxyApiculture { public static TextureAtlasSprite beeSprite; - @Override - public void initializeRendering() { - // TODO: remove unused bee entity model completely - } } diff --git a/src/main/java/forestry/apiculture/render/ModelBee.java b/src/main/java/forestry/apiculture/render/ModelBee.java index 463761fec..a7ad29c9d 100755 --- a/src/main/java/forestry/apiculture/render/ModelBee.java +++ b/src/main/java/forestry/apiculture/render/ModelBee.java @@ -160,9 +160,4 @@ public class ModelBee extends ModelBase { model.rotateAngleZ = z; } - @Override - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity entity) { - super.setRotationAngles(f, f1, f2, f3, f4, f5, entity); - } - } diff --git a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java index 57193ce5f..120fde160 100755 --- a/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java +++ b/src/main/java/forestry/apiculture/worldgen/HiveDecorator.java @@ -34,7 +34,7 @@ import forestry.core.utils.Log; public abstract class HiveDecorator { - private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_HIVES", new Class[0], new Object[0]); + private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_HIVES", new Class[0]); public static void decorateHives(IChunkGenerator chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) { if (!TerrainGen.populate(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated, EVENT_TYPE)) { diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 03b2c2d01..cf0857248 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -71,7 +71,6 @@ import forestry.arboriculture.genetics.alleles.AlleleFruit; import forestry.arboriculture.genetics.alleles.AlleleGrowth; import forestry.arboriculture.genetics.alleles.AlleleLeafEffect; import forestry.arboriculture.items.ItemCharcoal; -import forestry.arboriculture.items.ItemGermlingGE; import forestry.arboriculture.items.ItemRegistryArboriculture; import forestry.arboriculture.models.TextureLeaves; import forestry.arboriculture.network.PacketRegistryArboriculture; diff --git a/src/main/java/forestry/arboriculture/blocks/BlockPile.java b/src/main/java/forestry/arboriculture/blocks/BlockPile.java index 87533b56c..138da742b 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockPile.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockPile.java @@ -47,7 +47,6 @@ import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.EnumPileType; import forestry.api.arboriculture.IAlleleTreeSpecies; import forestry.api.arboriculture.ITree; @@ -192,7 +191,7 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro @Override public RayTraceResult collisionRayTrace(IBlockState blockState, World worldIn, BlockPos pos, Vec3d start, Vec3d end){ - List list = Lists.newArrayList(); + List list = Lists.newArrayList(); for (AxisAlignedBB axisalignedbb : getCollisionBoxList(this.getActualState(blockState, worldIn, pos))) { @@ -229,7 +228,7 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro } private static List getCollisionBoxList(IBlockState state){ - List list = Lists.newArrayList(); + List list = Lists.newArrayList(); EnumPilePosition position = state.getValue(PILE_POSITION); if(position != EnumPilePosition.INTERIOR){ @@ -312,15 +311,15 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro float f2 = pos.getZ() + 0.5F; float f3 = 0.52F; float f4 = rand.nextFloat() * 0.6F - 0.3F; - world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, f + f3 - 0.5, f1 + 0.5, f2 + f4, 0.0D, 0.0D, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, f + f3 - 0.5, f1 + 0.5, f2 + f4, 0.0D, 0.0D, 0.0D); } } @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { if(getPileType() == EnumPileType.WOOD){ - List woodPiles = new ArrayList(); + List woodPiles = new ArrayList<>(); for(ITree tree : TreeManager.treeRoot.getIndividualTemplates()) { woodPiles.add(createWoodPile(tree)); } @@ -407,7 +406,7 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro @Nonnull private List getPileDrop(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - ArrayList list = new ArrayList(); + List list = new ArrayList<>(); TileEntity tile = world.getTileEntity(pos); if (tile instanceof ICharcoalPileComponent) { ICharcoalPileComponent pile = (ICharcoalPileComponent) tile; diff --git a/src/main/java/forestry/arboriculture/items/ItemCharcoal.java b/src/main/java/forestry/arboriculture/items/ItemCharcoal.java index 6176700eb..682e5746e 100644 --- a/src/main/java/forestry/arboriculture/items/ItemCharcoal.java +++ b/src/main/java/forestry/arboriculture/items/ItemCharcoal.java @@ -2,11 +2,8 @@ package forestry.arboriculture.items; import java.util.List; -import forestry.api.arboriculture.ITree; -import forestry.api.arboriculture.TreeManager; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; -import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.items.ItemForestry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java index 75390e354..63b1d02a4 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenBalsa.java @@ -29,13 +29,6 @@ public class WorldGenBalsa extends WorldGenTree { super(tree, 6, 6); } - @Nonnull - @Override - public Set generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) { - WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0); - return Collections.emptySet(); - } - @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { BlockPos.MutableBlockPos leafCenter = new BlockPos.MutableBlockPos(startPos.add(0, height, 0)); diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java index dcc6fc88a..bbe763bf4 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenDate.java @@ -28,13 +28,6 @@ public class WorldGenDate extends WorldGenTree { super(tree, 6, 2); } - @Nonnull - @Override - public Set generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) { - WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0); - return Collections.emptySet(); - } - @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java index 26a7f38b2..0a4327c51 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLarch.java @@ -28,13 +28,6 @@ public class WorldGenLarch extends WorldGenTree { super(tree, 6, 5); } - @Nonnull - @Override - public Set generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) { - WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0); - return Collections.emptySet(); - } - @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java index de956862e..a126da5a9 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenLemon.java @@ -28,13 +28,6 @@ public class WorldGenLemon extends WorldGenTree { super(tree, 6, 3); } - @Nonnull - @Override - public Set generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) { - WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0); - return Collections.emptySet(); - } - @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int yCenter = height - girth; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java index a2bf26898..f9992d013 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPlum.java @@ -28,13 +28,6 @@ public class WorldGenPlum extends WorldGenTree { super(tree, 6, 3); } - @Nonnull - @Override - public Set generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) { - WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0); - return Collections.emptySet(); - } - @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int yCenter = height - girth; diff --git a/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java index fb68a6540..abfbe9887 100755 --- a/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java +++ b/src/main/java/forestry/arboriculture/worldgen/WorldGenPoplar.java @@ -28,13 +28,6 @@ public class WorldGenPoplar extends WorldGenTree { super(tree, 8, 3); } - @Nonnull - @Override - public Set generateTrunk(World world, Random rand, TreeBlockTypeLog wood, BlockPos startPos) { - WorldGenHelper.generateTreeTrunk(world, rand, wood, startPos, height, girth, 0, 0, null, 0); - return Collections.emptySet(); - } - @Override protected void generateLeaves(World world, Random rand, TreeBlockTypeLeaf leaf, List branchEnds, BlockPos startPos) { int leafSpawn = height + 1; diff --git a/src/main/java/forestry/core/blocks/BlockRegistry.java b/src/main/java/forestry/core/blocks/BlockRegistry.java index 30c640fa4..989136a76 100644 --- a/src/main/java/forestry/core/blocks/BlockRegistry.java +++ b/src/main/java/forestry/core/blocks/BlockRegistry.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.core.blocks; -import javax.annotation.Nonnull; - import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -20,7 +18,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import forestry.core.proxy.Proxies; -import forestry.core.utils.OreDictUtil; import forestry.plugins.PluginManager; public abstract class BlockRegistry { diff --git a/src/main/java/forestry/core/blocks/BlockResourceOre.java b/src/main/java/forestry/core/blocks/BlockResourceOre.java index 9b91c1fbd..e324b2d7e 100644 --- a/src/main/java/forestry/core/blocks/BlockResourceOre.java +++ b/src/main/java/forestry/core/blocks/BlockResourceOre.java @@ -35,7 +35,6 @@ import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; import forestry.core.PluginCore; -import forestry.core.utils.OreDictUtil; public class BlockResourceOre extends Block implements IItemModelRegister, IBlockWithMeta { public static final PropertyEnum ORE_RESOURCES = PropertyEnum.create("resource", EnumResourceType.class, new Predicate(){ diff --git a/src/main/java/forestry/core/entities/EntitySelector.java b/src/main/java/forestry/core/entities/EntitySelector.java index 4eab6e1dd..c0ce87257 100644 --- a/src/main/java/forestry/core/entities/EntitySelector.java +++ b/src/main/java/forestry/core/entities/EntitySelector.java @@ -33,11 +33,6 @@ public abstract class EntitySelector implements Predicate { T castEntity = entityClass.cast(entity); return isEntityApplicableTyped(castEntity); } - - @Override - public boolean equals(Object obj) { - return super.equals(obj); - } protected abstract boolean isEntityApplicableTyped(T entity); } diff --git a/src/main/java/forestry/core/fluids/TankManager.java b/src/main/java/forestry/core/fluids/TankManager.java index e4e71f905..795f921c6 100644 --- a/src/main/java/forestry/core/fluids/TankManager.java +++ b/src/main/java/forestry/core/fluids/TankManager.java @@ -275,6 +275,7 @@ public class TankManager implements ITankManager, ITankUpdateHandler, IStreamabl return tank.drain(maxDrain, doDrain); } + @Override public FluidStack drain(FluidStack resource, boolean doDrain) { for (StandardTank tank : tanks) { if (tankCanDrainFluid(tank, resource)) { diff --git a/src/main/java/forestry/core/items/ItemFluidContainerForestry.java b/src/main/java/forestry/core/items/ItemFluidContainerForestry.java index f78c46e9f..37481bc3c 100644 --- a/src/main/java/forestry/core/items/ItemFluidContainerForestry.java +++ b/src/main/java/forestry/core/items/ItemFluidContainerForestry.java @@ -132,7 +132,7 @@ public class ItemFluidContainerForestry extends ItemForestry implements IColored if (!worldIn.isRemote) { FoodStats foodStats = player.getFoodStats(); foodStats.addStats(drinkProperties.getHealAmount(), drinkProperties.getSaturationModifier()); - worldIn.playSound((EntityPlayer) null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F); + worldIn.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F); } player.addStat(StatList.getObjectUseStats(this)); diff --git a/src/main/java/forestry/core/models/ModelCrate.java b/src/main/java/forestry/core/models/ModelCrate.java index e5f7077e6..e9c820131 100644 --- a/src/main/java/forestry/core/models/ModelCrate.java +++ b/src/main/java/forestry/core/models/ModelCrate.java @@ -178,7 +178,7 @@ public class ModelCrate extends BlankItemModel { * Bake the crate model. */ private List bakeModel(ItemCrated crateItem, IBakedModel crateModel) { - List models = new ArrayList(); + List models = new ArrayList<>(); IBakedModel containedModel = getModel(crateItem.getContained()); @@ -235,7 +235,7 @@ public class ModelCrate extends BlankItemModel { @Override public List getQuads(IBlockState state, EnumFacing side, long rand) { - List quads = new ArrayList(); + List quads = new ArrayList<>(); for(IBakedModel bakedModel : models){ quads.addAll(bakedModel.getQuads(null, side, rand++)); } diff --git a/src/main/java/forestry/core/models/baker/ModelBakerModel.java b/src/main/java/forestry/core/models/baker/ModelBakerModel.java index f138d3912..36b948b1a 100644 --- a/src/main/java/forestry/core/models/baker/ModelBakerModel.java +++ b/src/main/java/forestry/core/models/baker/ModelBakerModel.java @@ -11,6 +11,7 @@ package forestry.core.models.baker; import java.util.ArrayList; +import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -56,14 +57,14 @@ public class ModelBakerModel implements IModelBakerModel { public ModelBakerModel(IModelState modelState) { models = new ArrayList<>(); - faceQuads = new HashMap<>(); + faceQuads = new EnumMap<>(EnumFacing.class); generalQuads = new ArrayList<>(); isGui3d = true; isAmbientOcclusion = false; setModelState(modelState); for(EnumFacing face : EnumFacing.VALUES){ - faceQuads.put(face, new ArrayList()); + faceQuads.put(face, new ArrayList<>()); } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java index e393cac5b..150cee2f0 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java @@ -194,7 +194,7 @@ public abstract class MultiblockTileEntityForestry e } /* IMultiblockComponent */ - @Nullable + @Nonnull @Override public final GameProfile getOwner() { return owner; diff --git a/src/main/java/forestry/core/proxy/ProxyRender.java b/src/main/java/forestry/core/proxy/ProxyRender.java index e11be2fb1..2eec17ddb 100644 --- a/src/main/java/forestry/core/proxy/ProxyRender.java +++ b/src/main/java/forestry/core/proxy/ProxyRender.java @@ -23,7 +23,6 @@ import net.minecraft.client.resources.IResourceManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; import net.minecraftforge.common.animation.ITimeValue; diff --git a/src/main/java/forestry/core/tiles/TileNaturalistChest.java b/src/main/java/forestry/core/tiles/TileNaturalistChest.java index 3005c423c..33d3f5c33 100644 --- a/src/main/java/forestry/core/tiles/TileNaturalistChest.java +++ b/src/main/java/forestry/core/tiles/TileNaturalistChest.java @@ -89,7 +89,7 @@ public abstract class TileNaturalistChest extends TileBase implements IPagedInve } private void playLidSound(String sound) { - this.worldObj.playSound((EntityPlayer)null, getPos(), SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); + this.worldObj.playSound(null, getPos(), SoundEvents.BLOCK_CHEST_OPEN, SoundCategory.BLOCKS, 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); } @Override diff --git a/src/main/java/forestry/core/utils/OreDictUtil.java b/src/main/java/forestry/core/utils/OreDictUtil.java index 114c0e5e0..73b0baaac 100644 --- a/src/main/java/forestry/core/utils/OreDictUtil.java +++ b/src/main/java/forestry/core/utils/OreDictUtil.java @@ -1,12 +1,5 @@ package forestry.core.utils; -import javax.annotation.Nullable; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import net.minecraftforge.oredict.OreDictionary; - public class OreDictUtil { public static final String ORE_COPPER = "oreCopper"; public static final String ORE_TIN = "oreTin"; diff --git a/src/main/java/forestry/factory/tiles/TileMillRainmaker.java b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java index cb199d034..3dad33d8b 100644 --- a/src/main/java/forestry/factory/tiles/TileMillRainmaker.java +++ b/src/main/java/forestry/factory/tiles/TileMillRainmaker.java @@ -90,7 +90,7 @@ public class TileMillRainmaker extends TileMill { @Override public void activate() { if (Proxies.render.hasRendering()) { - worldObj.playSound((EntityPlayer)null, getPos(), SoundEvents.ENTITY_LIGHTNING_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + worldObj.rand.nextFloat() * 0.2F); + worldObj.playSound(null, getPos(), SoundEvents.ENTITY_LIGHTNING_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + worldObj.rand.nextFloat() * 0.2F); float f = getPos().getX() + 0.5F; float f1 = getPos().getY() + 0.0F + worldObj.rand.nextFloat() * 6F / 16F; diff --git a/src/main/java/forestry/farming/multiblock/FarmController.java b/src/main/java/forestry/farming/multiblock/FarmController.java index cfd00f658..575a608ee 100644 --- a/src/main/java/forestry/farming/multiblock/FarmController.java +++ b/src/main/java/forestry/farming/multiblock/FarmController.java @@ -37,7 +37,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -142,8 +141,6 @@ public class FarmController extends RectangularMultiblockControllerBase implemen // tick updates can come from multiple gearboxes so keep track of them here private int farmWorkTicks = 0; - private Biome cachedBiome; - public FarmController(World world) { super(world, FarmMultiblockSizeLimits.instance); @@ -180,14 +177,6 @@ public class FarmController extends RectangularMultiblockControllerBase implemen return tankManager; } - private Biome getBiome() { - if (cachedBiome == null) { - BlockPos coords = getReferenceCoord(); - cachedBiome = worldObj.getBiome(coords); - } - return cachedBiome; - } - @Override public void onAttachedPartWithMultiblockData(IMultiblockComponent part, NBTTagCompound data) { this.readFromNBT(data); diff --git a/src/main/java/forestry/food/items/ItemBeverage.java b/src/main/java/forestry/food/items/ItemBeverage.java index 80ac5ebd2..9adc33678 100755 --- a/src/main/java/forestry/food/items/ItemBeverage.java +++ b/src/main/java/forestry/food/items/ItemBeverage.java @@ -73,7 +73,7 @@ public class ItemBeverage extends ItemForestryFood implements IColoredItem { if (entityLiving instanceof EntityPlayer) { EntityPlayer entityplayer = (EntityPlayer) entityLiving; entityplayer.getFoodStats().addStats(this, stack); - worldIn.playSound((EntityPlayer)null, entityplayer.posX, entityplayer.posY, entityplayer.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F); + worldIn.playSound(null, entityplayer.posX, entityplayer.posY, entityplayer.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F); if (worldIn.isRemote) { return stack; diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java index dd9012211..00b2f28a3 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseDoor.java @@ -174,7 +174,7 @@ public class BlockGreenhouseDoor extends BlockGreenhouse implements IStateMapper if (flag != state.getValue(OPEN)) { worldIn.setBlockState(pos, state.withProperty(OPEN, flag), 2); worldIn.markBlockRangeForRenderUpdate(pos, pos); - worldIn.playEvent((EntityPlayer) null, flag ? 1003 : 1006, pos, 0); + worldIn.playEvent(null, flag ? 1003 : 1006, pos, 0); } } } diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java index d5d2a3546..2c1c718c9 100755 --- a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java @@ -93,9 +93,4 @@ public class ModelButterfly extends ModelBase { model.rotateAngleZ = z; } - @Override - public void setRotationAngles(float f, float f1, float swing, float f3, float f4, float f5, Entity entity) { - super.setRotationAngles(f, f1, swing, f3, f4, f5, entity); - } - } diff --git a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java index 0d7527d12..4232d7ec1 100644 --- a/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java +++ b/src/main/java/forestry/lepidopterology/worldgen/CocoonDecorator.java @@ -38,7 +38,7 @@ import forestry.lepidopterology.tiles.TileCocoon; public abstract class CocoonDecorator { - private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_COCOONS", new Class[0], new Object[0]); + private static final EventType EVENT_TYPE = EnumHelper.addEnum(EventType.class, "FORESTRY_COCOONS", new Class[0]); public static void decorateCocoons(IChunkGenerator chunkProvider, World world, Random rand, int chunkX, int chunkZ, boolean hasVillageGenerated) { if (!TerrainGen.populate(chunkProvider, world, rand, chunkX, chunkZ, hasVillageGenerated, EVENT_TYPE)) { diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index 5210764e4..5481da891 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -14,16 +14,13 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.event.FMLInterModComms; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; -import forestry.api.apiculture.FlowerManager; import forestry.api.core.ForestryAPI; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; diff --git a/src/main/java/forestry/storage/CrateRegistry.java b/src/main/java/forestry/storage/CrateRegistry.java index d409e158c..b68a506cc 100644 --- a/src/main/java/forestry/storage/CrateRegistry.java +++ b/src/main/java/forestry/storage/CrateRegistry.java @@ -25,7 +25,6 @@ import forestry.core.items.ItemCrated; import forestry.core.proxy.Proxies; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; -import forestry.core.utils.OreDictUtil; public class CrateRegistry implements ICrateRegistry {