Update MCP mappings to snapshot_nodoc_20161220 (#3551)

This commit is contained in:
James Mitchell authored and LexManos committed 2016-12-21 15:52:30 -08:00
1 parent 1f4007e5d8
commit 5165dc52bf
88 files changed
+445 -436

No files matched your search

@@ -19,6 +19,6 @@ public class BreedingTest
@SubscribeEvent
public void onBabyBorn(BabyEntitySpawnEvent event) {
event.setChild(new EntityCow(event.getParentA().worldObj));
event.setChild(new EntityCow(event.getParentA().world));
}
}
@@ -268,7 +268,7 @@ public class DynBucketTest
return false;
}
if (heldItem.func_190926_b())
if (heldItem.isEmpty())
{
sendText(playerIn, tank);
return false;
@@ -290,7 +290,7 @@ public class DynBucketTest
private void sendText(EntityPlayer player, IFluidHandler tank)
{
if (player.worldObj.isRemote)
if (player.world.isRemote)
{
String text;
IFluidTankProperties[] tankProperties = tank.getTankProperties();
@@ -301,7 +301,7 @@ public class DynBucketTest
{
text = "empty";
}
player.addChatMessage(new TextComponentString(text));
player.sendMessage(new TextComponentString(text));
}
}
}
@@ -167,7 +167,7 @@ public class FluidPlacementTest
@Override
public int fill(FluidStack resource, boolean doFill)
{
if (container.func_190916_E() != 1 || resource == null || resource.amount > Fluid.BUCKET_VOLUME || container
if (container.getCount() != 1 || resource == null || resource.amount > Fluid.BUCKET_VOLUME || container
.getItem() instanceof ItemBucketMilk || getFluid() != null || !canFillFluidType(resource))
{
return 0;
@@ -96,7 +96,7 @@ public class ItemLayerModelDebug
@Override
public int getHarvestLevel(ItemStack stack, String toolClass, @Nullable EntityPlayer player, @Nullable IBlockState blockState) {
// This tool is a super pickaxe if the player is wearing a helment
if("pickaxe".equals(toolClass) && player != null && !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).func_190926_b()) {
if("pickaxe".equals(toolClass) && player != null && !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).isEmpty()) {
return 5;
}
return super.getHarvestLevel(stack, toolClass, player, blockState);
@@ -136,7 +136,7 @@ public class ItemTileDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque(IBlockState state) { return false; }
public boolean causesSuffocation(IBlockState state) { return false; }
@Override
public TileEntity createNewTileEntity(World world, int meta)
@@ -101,9 +101,9 @@ public class ModelAnimationDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
{
return this.getDefaultState().withProperty(FACING, EnumFacing.func_190914_a(pos, placer));
return this.getDefaultState().withProperty(FACING, EnumFacing.getDirectionFromEntityLiving(pos, placer));
}
@Override
@@ -383,7 +383,7 @@ public class ModelAnimationDebug
public void onEntityUpdate()
{
super.onEntityUpdate();
if(worldObj.isRemote && cycleLength != null)
if (world.isRemote && cycleLength != null)
{
cycleLength.setValue(getHealth() / 5);
}
@@ -149,7 +149,7 @@ public class ModelBakeEventDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque(IBlockState state) { return false; }
public boolean causesSuffocation(IBlockState state) { return false; }
@Override
public TileEntity createNewTileEntity(World world, int meta)
@@ -139,10 +139,10 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque(IBlockState state) { return false; }
public boolean causesSuffocation(IBlockState state) { return false; }
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
{
return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer));
}
@@ -244,7 +244,7 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque(IBlockState state) { return false; }
public boolean causesSuffocation(IBlockState state) { return false; }
@Override
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ)
@@ -329,7 +329,7 @@ public class ModelLoaderRegistryDebug
this.counter++;
this.hidden.add(Integer.toString(this.counter));
TextComponentString text = new TextComponentString("" + this.counter);
if (this.worldObj.isRemote) Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text);
if (this.world.isRemote) Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text);
}
public void decrement()
@@ -342,7 +342,7 @@ public class ModelLoaderRegistryDebug
this.hidden.remove(Integer.toString(this.counter));
this.counter--;
TextComponentString text = new TextComponentString("" + this.counter);
if (this.worldObj.isRemote) Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text);
if (this.world.isRemote) Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(text);
}
public void setMax(int max)
@@ -381,7 +381,7 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque(IBlockState state) { return false; }
public boolean causesSuffocation(IBlockState state) { return false; }
}
/**
@@ -408,7 +408,7 @@ public class ModelLoaderRegistryDebug
}
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
{
return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer));
}
@@ -438,7 +438,7 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque(IBlockState state) { return false; }
public boolean causesSuffocation(IBlockState state) { return false; }
public static EnumFacing getFacingFromEntity(World worldIn, BlockPos clickedBlock, EntityLivingBase entityIn)
{
@@ -511,11 +511,11 @@ public class ModelLoaderRegistryDebug
public void cycleColors()
{
if (this.worldObj.isRemote)
if (this.world.isRemote)
{
FMLLog.info("%b", shouldIncrement);
/*
IBakedModel bakedModel = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelFromBlockState(this.worldObj.getBlockState(this.pos), this.worldObj, this.pos);
IBakedModel bakedModel = Minecraft.getMinecraft().getBlockRendererDispatcher().getModelFromBlockState(this.world.getBlockState(this.pos), this.world, this.pos);
if (bakedModel != null && bakedModel instanceof OBJBakedModel)
{
OBJBakedModel objBaked = (OBJBakedModel) bakedModel;
@@ -558,7 +558,7 @@ public class ModelLoaderRegistryDebug
objBaked.scheduleRebake();
}
}
this.worldObj.markBlockRangeForRenderUpdate(this.pos, this.pos);
this.world.markBlockRangeForRenderUpdate(this.pos, this.pos);
}*/
}
}
@@ -591,10 +591,10 @@ public class ModelLoaderRegistryDebug
public boolean isFullCube(IBlockState state) { return false; }
@Override
public boolean isVisuallyOpaque(IBlockState state) { return false; }
public boolean causesSuffocation(IBlockState state) { return false; }
@Override
public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
{
return this.getDefaultState().withProperty(FACING, getFacingFromEntity(world, pos, placer));
}
@@ -769,10 +769,10 @@ public class ModelLoaderRegistryDebug
@Override
public void update()
{
if (this.worldObj.isRemote)
if (this.world.isRemote)
{
Vector3d teLoc = new Vector3d(this.getPos().getX(), this.getPos().getY(), this.getPos().getZ());
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
EntityPlayer player = Minecraft.getMinecraft().player;
Vector3d playerLoc = new Vector3d();
playerLoc.setX(player.posX);
playerLoc.setY(player.posY + player.getEyeHeight());
@@ -793,7 +793,7 @@ public class ModelLoaderRegistryDebug
matrix.setIdentity();
matrix.setRotation(rot);
transform = TRSRTransformation.blockCenterToCorner(new TRSRTransformation(matrix));
this.worldObj.markBlockRangeForRenderUpdate(this.pos, this.pos);
this.world.markBlockRangeForRenderUpdate(this.pos, this.pos);
}
}
}