mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Update mcp mappings to 20170611
This commit is contained in:
1 parent
864b05074e
commit
3d322ef925
48 files changed
+213
-211
No files matched your search
@@ -116,7 +116,7 @@ public class GuiIngameForge extends GuiIngame
|
||||
|
||||
if (pre(ALL)) return;
|
||||
|
||||
fontrenderer = mc.fontRendererObj;
|
||||
fontrenderer = mc.fontRenderer;
|
||||
mc.entityRenderer.setupOverlayRendering();
|
||||
GlStateManager.enableBlend();
|
||||
|
||||
@@ -181,7 +181,7 @@ public class GuiIngameForge extends GuiIngame
|
||||
ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(mc.player.getName());
|
||||
if (scoreplayerteam != null)
|
||||
{
|
||||
int slot = scoreplayerteam.getChatFormat().getColorIndex();
|
||||
int slot = scoreplayerteam.getColor().getColorIndex();
|
||||
if (slot >= 0) objective = scoreboard.getObjectiveInDisplaySlot(3 + slot);
|
||||
}
|
||||
ScoreObjective scoreobjective1 = objective != null ? objective : scoreboard.getObjectiveInDisplaySlot(1);
|
||||
|
||||
@@ -82,7 +82,7 @@ public class GuiScreenEvent extends Event
|
||||
}
|
||||
|
||||
/**
|
||||
* This event fires just after initializing {@link GuiScreen#mc}, {@link GuiScreen#fontRendererObj},
|
||||
* This event fires just after initializing {@link GuiScreen#mc}, {@link GuiScreen#fontRenderer},
|
||||
* {@link GuiScreen#width}, and {@link GuiScreen#height}.<br/><br/>
|
||||
*
|
||||
* If canceled the following lines are skipped in {@link GuiScreen#setWorldAndResolution(Minecraft, int, int)}:<br/>
|
||||
|
||||
@@ -82,8 +82,8 @@ public class NotificationModUpdateScreen extends GuiScreen
|
||||
GlStateManager.color(1, 1, 1, 1);
|
||||
GlStateManager.pushMatrix();
|
||||
|
||||
int x = modButton.xPosition;
|
||||
int y = modButton.yPosition;
|
||||
int x = modButton.x;
|
||||
int y = modButton.y;
|
||||
int w = modButton.width;
|
||||
int h = modButton.height;
|
||||
|
||||
|
||||
@@ -63,9 +63,9 @@ public class BlockInfo
|
||||
public void updateShift()
|
||||
{
|
||||
Vec3d offset = state.getOffset(world, blockPos);
|
||||
shx = (float) offset.xCoord;
|
||||
shy = (float) offset.yCoord;
|
||||
shz = (float) offset.zCoord;
|
||||
shx = (float) offset.x;
|
||||
shy = (float) offset.y;
|
||||
shz = (float) offset.z;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
|
||||
Reference in new issue
Block a user