Initial 1.11-pre1 update

This commit is contained in:
cpw committed 2016-11-13 17:09:55 -05:00
1 parent c177219ff3
commit 4e6a774075
294 files changed
+3099 -2846

No files matched your search

@@ -21,6 +21,7 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.EnumFacing;
@@ -187,8 +188,9 @@ public class DynBucketTest
public static class TestItem extends Item {
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand)
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand)
{
ItemStack itemStackIn = playerIn.getHeldItem(hand);
if(worldIn.isRemote)
return new ActionResult<ItemStack>(EnumActionResult.PASS, itemStackIn);
@@ -235,7 +237,7 @@ public class DynBucketTest
}
@Override
public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems)
public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> subItems)
{
for (int i = 0; i < 4; i++)
{
@@ -276,8 +278,9 @@ public class DynBucketTest
}
@Override
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{
ItemStack heldItem = playerIn.getHeldItem(hand);
TileEntity te = worldIn.getTileEntity(pos);
if (!(te instanceof IFluidHandler))
{
@@ -286,7 +289,7 @@ public class DynBucketTest
IFluidHandler tank = (IFluidHandler) te;
side = side.getOpposite();
if (heldItem == null)
if (null == null)
{
sendText(playerIn, tank, side);
return false;
@@ -54,7 +54,7 @@ public class ForgeBlockStatesLoaderDebug {
public static void registerItems(RegistryEvent.Register<Item> event)
{
event.getRegistry().registerAll(
new ItemMultiTexture(BLOCKS.custom_wall, BLOCKS.custom_wall, new Function<ItemStack, String>()
new ItemMultiTexture(BLOCKS.custom_wall, BLOCKS.custom_wall, new ItemMultiTexture.Mapper()
{
@Override
public String apply(ItemStack stack)
@@ -136,7 +136,7 @@ public class ItemTileDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque() { return false; }
public boolean isVisuallyOpaque(IBlockState state) { return false; }
@Override
public TileEntity createNewTileEntity(World world, int meta)
@@ -100,7 +100,7 @@ public class ModelAnimationDebug
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
{
return this.getDefaultState().withProperty(FACING, BlockPistonBase.getFacingFromEntity(pos, placer));
return this.getDefaultState().withProperty(FACING, EnumFacing.func_190914_a(pos, placer));
}
@Override
@@ -139,7 +139,7 @@ public class ModelAnimationDebug
}*/
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{
if(world.isRemote)
{
@@ -148,7 +148,7 @@ public class ModelBakeEventDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque() { return false; }
public boolean isVisuallyOpaque(IBlockState state) { return false; }
@Override
public TileEntity createNewTileEntity(World world, int meta)
@@ -157,7 +157,7 @@ public class ModelBakeEventDebug
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{
TileEntity te = world.getTileEntity(pos);
if(te instanceof CustomTileEntity)
@@ -139,7 +139,7 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque() { return false; }
public boolean isVisuallyOpaque(IBlockState state) { return false; }
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
@@ -168,7 +168,7 @@ public class ModelLoaderRegistryDebug
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{
if(world.isRemote)
{
@@ -244,10 +244,10 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque() { return false; }
public boolean isVisuallyOpaque(IBlockState state) { return false; }
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{
if (world.getTileEntity(pos) == null) world.setTileEntity(pos, new OBJTesseractTileEntity());
OBJTesseractTileEntity tileEntity = (OBJTesseractTileEntity) world.getTileEntity(pos);
@@ -381,7 +381,7 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque() { return false; }
public boolean isVisuallyOpaque(IBlockState state) { return false; }
}
/**
@@ -438,7 +438,7 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque() { return false; }
public boolean isVisuallyOpaque(IBlockState state) { return false; }
public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn)
{
@@ -488,7 +488,7 @@ public class ModelLoaderRegistryDebug
}
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ)
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
{
if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJVertexColoring2TileEntity)
{
@@ -591,7 +591,7 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque() { return false; }
public boolean isVisuallyOpaque(IBlockState state) { return false; }
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)