diff --git a/build.gradle b/build.gradle index 6cb7a30ad..b2a925981 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ apply plugin: "net.minecraftforge.gradle.launch4j" minecraft.version = "1.10.2" minecraft { - mappings = 'snapshot_nodoc_20160518' + mappings = 'snapshot_nodoc_20161111' workspaceDir = "projects" versionJson = "jsons/${minecraft.version}-dev.json" buildUserdev = true diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 14c1a0117..e9d7f24d6 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -276,7 +276,7 @@ public class ForgeHooksClient for (int z = -distance; z <= distance; ++z) { BlockPos pos = center.add(x, 0, z); - Biome biome = world.getBiomeGenForCoords(pos); + Biome biome = world.getBiome(pos); int colour = biome.getSkyColorByTemp(biome.getFloatTemperature(pos)); r += (colour & 0xFF0000) >> 16; g += (colour & 0x00FF00) >> 8; diff --git a/src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java b/src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java index 0690ce93a..9b07e688a 100644 --- a/src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java +++ b/src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java @@ -100,7 +100,7 @@ class ChunkIOProvider implements Runnable this.chunk.setLastSaveTime(provider.worldObj.getTotalWorldTime()); this.provider.chunkGenerator.recreateStructures(this.chunk, this.chunkInfo.x, this.chunkInfo.z); - provider.id2ChunkMap.put(ChunkPos.chunkXZ2Int(this.chunkInfo.x, this.chunkInfo.z), this.chunk); + provider.id2ChunkMap.put(ChunkPos.asLong(this.chunkInfo.x, this.chunkInfo.z), this.chunk); this.chunk.onChunkLoad(); this.chunk.populateChunk(provider, provider.chunkGenerator); diff --git a/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java b/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java index b312c23b6..2e5bfb06c 100644 --- a/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java +++ b/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java @@ -158,7 +158,7 @@ public class BlockSnapshot implements Serializable public TileEntity getTileEntity() { if (getNbt() != null) - return TileEntity.func_190200_a(getWorld(), getNbt()); + return TileEntity.create(getWorld(), getNbt()); else return null; } diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index 73d341930..448bed7e4 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -574,8 +574,8 @@ public class ForgeEventFactory Result canContinueSleep = evt.getResult(); if (canContinueSleep == Result.DEFAULT) { - IBlockState state = player.worldObj.getBlockState(player.playerLocation); - return state.getBlock().isBed(state, player.worldObj, player.playerLocation, player); + IBlockState state = player.worldObj.getBlockState(player.bedLocation); + return state.getBlock().isBed(state, player.worldObj, player.bedLocation, player); } else return canContinueSleep == Result.ALLOW; diff --git a/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java b/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java index 89f23bb01..46b917c49 100644 --- a/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java +++ b/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java @@ -63,7 +63,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem private ItemStack fillContainer(IBlockSource source, ItemStack stack) { World world = source.getWorld(); - EnumFacing dispenserFacing = source.func_189992_e().getValue(BlockDispenser.FACING); + EnumFacing dispenserFacing = source.getBlockState().getValue(BlockDispenser.FACING); BlockPos blockpos = source.getBlockPos().offset(dispenserFacing); ItemStack result = FluidUtil.tryPickUpFluid(stack, null, world, blockpos, dispenserFacing.getOpposite()); @@ -98,7 +98,7 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem } FluidStack fluidStack = fluidHandler.drain(Fluid.BUCKET_VOLUME, false); - EnumFacing dispenserFacing = source.func_189992_e().getValue(BlockDispenser.FACING); + EnumFacing dispenserFacing = source.getBlockState().getValue(BlockDispenser.FACING); BlockPos blockpos = source.getBlockPos().offset(dispenserFacing); if (fluidStack != null && fluidStack.amount == Fluid.BUCKET_VOLUME && FluidUtil.tryPlaceFluid(null, source.getWorld(), fluidStack, blockpos)) diff --git a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java index 874d71121..c33813075 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java @@ -356,8 +356,8 @@ public class VillagerRegistry { if (prof == null) { - if (entity.func_189777_di() != ZombieType.NORMAL && entity.func_189777_di() != ZombieType.HUSK) - entity.func_189778_a(ZombieType.NORMAL); + if (entity.getZombieType() != ZombieType.NORMAL && entity.getZombieType() != ZombieType.HUSK) + entity.setZombieType(ZombieType.NORMAL); return; } @@ -369,13 +369,13 @@ public class VillagerRegistry if (network >= 0 && network < 5) // Vanilla { - if (entity.func_189777_di() == null || entity.func_189777_di().func_190150_a() != network + 1) + if (entity.getZombieType() == null || entity.getZombieType().getId() != network + 1) { - entity.func_189778_a(ZombieType.func_190144_b(network)); + entity.setZombieType(ZombieType.getVillagerByOrdinal(network)); } } - else if (entity.func_189777_di() != null) - entity.func_189778_a(ZombieType.NORMAL); + else if (entity.getZombieType() != null) + entity.setZombieType(ZombieType.NORMAL); } public static void onSetProfession(EntityZombie entity, ZombieType type, int network) { diff --git a/src/main/java/net/minecraftforge/oredict/OreDictionary.java b/src/main/java/net/minecraftforge/oredict/OreDictionary.java index fde574638..7958bd056 100644 --- a/src/main/java/net/minecraftforge/oredict/OreDictionary.java +++ b/src/main/java/net/minecraftforge/oredict/OreDictionary.java @@ -336,7 +336,7 @@ public class OreDictionary new ItemStack(Blocks.DARK_OAK_STAIRS), new ItemStack(Blocks.WOODEN_SLAB), new ItemStack(Blocks.GLASS_PANE), - new ItemStack(Blocks.field_189880_di), // Bone Block, to prevent conversion of dyes into bone meal. + new ItemStack(Blocks.BONE_BLOCK), // Bone Block, to prevent conversion of dyes into bone meal. new ItemStack(Items.BOAT), null //So the above can have a comma and we don't have to keep editing extra lines. }; diff --git a/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java b/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java index 58e1fdc48..fc4b0b2f0 100644 --- a/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java +++ b/src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java @@ -137,7 +137,7 @@ public class PlayerInteractEventTest && evt.getLocalPos().yCoord > evt.getTarget().height / 2.0) { // If we right click the upper half of a skeleton it becomes wither skeleton. Otherwise nothing happens. - ((EntitySkeleton) evt.getTarget()).func_189768_a(SkeletonType.WITHER); + ((EntitySkeleton) evt.getTarget()).setSkeletonType(SkeletonType.WITHER); evt.setCanceled(true); } }