Lots of name substitutions

This commit is contained in:
Vincent Lee committed 2016-03-18 10:42:42 -05:00
1 parent 316363d729
commit 5821ede5e6
512 files changed
+1585 -1568

No files matched your search

@@ -14,7 +14,7 @@ import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDoublePlant;
import net.minecraft.block.properties.PropertyEnum;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -26,9 +26,9 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.StatList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -65,7 +65,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I
}
@Override
public abstract BlockState createBlockState();
public abstract BlockStateContainer createBlockState();
@Override
public abstract int getMetaFromState(IBlockState state);
@@ -236,7 +236,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) {
public ItemStack getPickBlock(RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
IBlockState state = world.getBlockState(pos);
state = state.getBlock().getActualState(state, world, pos);
PropertyEnum<EnumDyeColor> prop = second ? BotaniaStateProps.DOUBLEFLOWER_VARIANT_2 : BotaniaStateProps.DOUBLEFLOWER_VARIANT_1;