Fix ender air bottle render, move to java 8, giant import cleanup

This commit is contained in:
Vincent Lee committed 2016-01-10 18:16:30 -06:00
1 parent 404d99445e
commit 84204db587
277 files changed
+249 -1068

No files matched your search

@@ -10,19 +10,13 @@
*/
package vazkii.botania.common.block;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import net.minecraft.block.Block;
import net.minecraft.block.BlockBush;
import net.minecraft.block.BlockDoublePlant;
import net.minecraft.block.IGrowable;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -35,12 +29,10 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.BotaniaCreativeTab;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -119,7 +111,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I
if (this.canSilkHarvest(worldIn, pos, worldIn.getBlockState(pos), player) && EnchantmentHelper.getSilkTouchModifier(player))
{
java.util.ArrayList<ItemStack> items = new java.util.ArrayList<ItemStack>();
java.util.ArrayList<ItemStack> items = new java.util.ArrayList<>();
ItemStack itemstack = this.createStackedBlock(state);
if (itemstack != null)
@@ -179,7 +171,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I
@Override
public List<ItemStack> onSheared(ItemStack item, IBlockAccess world, BlockPos pos, int fortune) {
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
ArrayList<ItemStack> ret = new ArrayList<>();
IBlockState state = world.getBlockState(pos);
IBlockState stateBelow = world.getBlockState(pos.down());