keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Update to 20161111 mcp names

Browse source
This commit is contained in:
cpw 2016-11-12 10:05:32 -05:00
parent 7a4aa5a1c4
commit 9ab96fbda6
9 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -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

2
src/main/java/net/minecraftforge/client/ForgeHooksClient.java
View file

@ -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;

2
src/main/java/net/minecraftforge/common/chunkio/ChunkIOProvider.java
View file

@ -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);

2
src/main/java/net/minecraftforge/common/util/BlockSnapshot.java
View file

@ -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;
}

4
src/main/java/net/minecraftforge/event/ForgeEventFactory.java
View file

@ -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;

4
src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java
View file

@ -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))

12
src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java
View file

@ -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)
{

2
src/main/java/net/minecraftforge/oredict/OreDictionary.java
View file

@ -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.
};

2
src/test/java/net/minecraftforge/test/PlayerInteractEventTest.java
View file

@ -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);
}
}