Update mcp mappings to 20170611

This commit is contained in:
mezz committed 2017-06-17 17:13:44 -07:00
1 parent 864b05074e
commit 3d322ef925
48 files changed
+213 -211

No files matched your search

@@ -249,7 +249,7 @@ public class BiomeDictionary
*/
public static void makeBestGuess(Biome biome)
{
if (biome.theBiomeDecorator.treesPerChunk >= 3)
if (biome.decorator.treesPerChunk >= 3)
{
if (biome.isHighHumidity() && biome.getTemperature() >= 0.9F)
{
@@ -293,11 +293,11 @@ public class BiomeDictionary
BiomeDictionary.addTypes(biome, COLD);
}
if (biome.theBiomeDecorator.treesPerChunk > 0 && biome.theBiomeDecorator.treesPerChunk < 3)
if (biome.decorator.treesPerChunk > 0 && biome.decorator.treesPerChunk < 3)
{
BiomeDictionary.addTypes(biome, SPARSE);
}
else if (biome.theBiomeDecorator.treesPerChunk >= 10)
else if (biome.decorator.treesPerChunk >= 10)
{
BiomeDictionary.addTypes(biome, DENSE);
}
@@ -241,7 +241,7 @@ public class DimensionManager
ISaveHandler savehandler = overworld.getSaveHandler();
//WorldSettings worldSettings = new WorldSettings(overworld.getWorldInfo());
WorldServer world = (dim == 0 ? overworld : (WorldServer)(new WorldServerMulti(mcServer, savehandler, dim, overworld, mcServer.theProfiler).init()));
WorldServer world = (dim == 0 ? overworld : (WorldServer)(new WorldServerMulti(mcServer, savehandler, dim, overworld, mcServer.profiler).init()));
world.addEventListener(new ServerWorldEventHandler(mcServer, world));
MinecraftForge.EVENT_BUS.post(new WorldEvent.Load(world));
if (!mcServer.isSinglePlayer())
@@ -133,18 +133,18 @@ public class ForgeChunkManager
{
final ImmutableSetMultimap<ChunkPos, Ticket> persistentChunksFor = getPersistentChunksFor(world);
final ImmutableSet.Builder<Chunk> builder = ImmutableSet.builder();
world.theProfiler.startSection("forcedChunkLoading");
world.profiler.startSection("forcedChunkLoading");
builder.addAll(Iterators.transform(persistentChunksFor.keys().iterator(), new Function<ChunkPos, Chunk>() {
@Nullable
@Override
public Chunk apply(@Nullable ChunkPos input)
{
return input == null ? null : world.getChunkFromChunkCoords(input.chunkXPos, input.chunkZPos);
return input == null ? null : world.getChunkFromChunkCoords(input.x, input.z);
}
}));
world.theProfiler.endStartSection("regularChunkLoading");
world.profiler.endStartSection("regularChunkLoading");
builder.addAll(chunkIterator);
world.theProfiler.endSection();
world.profiler.endSection();
return builder.build().iterator();
}
@@ -660,7 +660,7 @@ public class ForgeHooks
@Nullable
public static ITextComponent onServerChatEvent(NetHandlerPlayServer net, String raw, ITextComponent comp)
{
ServerChatEvent event = new ServerChatEvent(net.playerEntity, raw, comp);
ServerChatEvent event = new ServerChatEvent(net.player, raw, comp);
if (MinecraftForge.EVENT_BUS.post(event))
{
return null;
@@ -1023,7 +1023,7 @@ public class ForgeHooks
public static RayTraceResult rayTraceEyes(EntityLivingBase entity, double length)
{
Vec3d startPos = new Vec3d(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ);
Vec3d endPos = startPos.add(new Vec3d(entity.getLookVec().xCoord * length, entity.getLookVec().yCoord * length, entity.getLookVec().zCoord * length));
Vec3d endPos = startPos.add(new Vec3d(entity.getLookVec().x * length, entity.getLookVec().y * length, entity.getLookVec().z * length));
return entity.world.rayTraceBlocks(startPos, endPos);
}
@@ -1055,7 +1055,7 @@ public class ForgeHooks
public static EnumActionResult onInteractEntityAtAction(EntityPlayer player, Entity entity, RayTraceResult ray, EnumHand hand)
{
Vec3d vec3d = new Vec3d(ray.hitVec.xCoord - entity.posX, ray.hitVec.yCoord - entity.posY, ray.hitVec.zCoord - entity.posZ);
Vec3d vec3d = new Vec3d(ray.hitVec.x - entity.posX, ray.hitVec.y - entity.posY, ray.hitVec.z - entity.posZ);
return onInteractEntityAtAction(player, entity, vec3d, hand);
}
@@ -44,7 +44,7 @@ public class ForgeInternalHandler
Entity entity = event.getEntity();
if (entity.getClass().equals(EntityItem.class))
{
ItemStack stack = ((EntityItem)entity).getEntityItem();
ItemStack stack = ((EntityItem)entity).getItem();
Item item = stack.getItem();
if (item.hasCustomEntity(stack))
{
@@ -477,9 +477,9 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC
{
for (Biome biome : ForgeRegistries.BIOMES.getValues())
{
if (biome.theBiomeDecorator instanceof DeferredBiomeDecorator)
if (biome.decorator instanceof DeferredBiomeDecorator)
{
DeferredBiomeDecorator decorator = (DeferredBiomeDecorator)biome.theBiomeDecorator;
DeferredBiomeDecorator decorator = (DeferredBiomeDecorator)biome.decorator;
decorator.fireCreateEventAndReplace(biome);
}
@@ -101,8 +101,8 @@ class ChunkIOProvider implements Runnable
this.provider.chunkGenerator.recreateStructures(this.chunk, this.chunkInfo.x, this.chunkInfo.z);
provider.id2ChunkMap.put(ChunkPos.asLong(this.chunkInfo.x, this.chunkInfo.z), this.chunk);
this.chunk.onChunkLoad();
this.chunk.populateChunk(provider, provider.chunkGenerator);
this.chunk.onLoad();
this.chunk.populate(provider, provider.chunkGenerator);
this.runCallbacks();
}
@@ -42,10 +42,10 @@ public class ChunkCoordComparator implements java.util.Comparator<ChunkPos>
}
// Subtract current position to set center point
int ax = a.chunkXPos - this.x;
int az = a.chunkZPos - this.z;
int bx = b.chunkXPos - this.x;
int bz = b.chunkZPos - this.z;
int ax = a.x - this.x;
int az = a.z - this.z;
int bx = b.x - this.x;
int bz = b.z - this.z;
int result = ((ax - bx) * (ax + bx)) + ((az - bz) * (az + bz));
if (result != 0)