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

@@ -139,7 +139,7 @@ import com.google.gson.JsonObject;
/**
* Handles primary communication from hooked code into the system
*
* The FML entry point is {@link #beginMinecraftLoading(Minecraft, List, IReloadableResourceManager)} called from
* The FML entry point is {@link #beginMinecraftLoading(Minecraft, List, IReloadableResourceManager, MetadataSerializer)} called from
* {@link Minecraft}
*
* Obfuscated code should focus on this class and other members of the "server"
@@ -474,7 +474,7 @@ public class FMLClientHandler implements IFMLSidedHandler
*/
public void displayGuiScreen(EntityPlayer player, GuiScreen gui)
{
if (client.thePlayer==player && gui != null) {
if (client.player==player && gui != null) {
client.displayGuiScreen(gui);
}
}
@@ -567,12 +567,12 @@ public class FMLClientHandler implements IFMLSidedHandler
public WorldClient getWorldClient()
{
return client.theWorld;
return client.world;
}
public EntityPlayerSP getClientPlayerEntity()
{
return client.thePlayer;
return client.player;
}
@Override
@@ -286,7 +286,7 @@ public abstract class GuiScrollingList
GL11.glScissor((int)(left * scaleW), (int)(client.displayHeight - (bottom * scaleH)),
(int)(listWidth * scaleW), (int)(viewHeight * scaleH));
if (this.client.theWorld != null)
if (this.client.world != null)
{
this.drawGradientRect(this.left, this.top, this.right, this.bottom, 0xC0101010, 0xD0101010);
}
@@ -166,7 +166,7 @@ public class GuiConfig extends GuiScreen
this.allRequireMcRestart = allRequireMcRestart;
this.modID = modID;
this.configID = configID;
this.isWorldRunning = mc.theWorld != null;
this.isWorldRunning = mc.world != null;
if (title != null)
this.title = title;
this.titleLine2 = titleLine2;