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

Merge pull request #652 from AbrarSyed/patch-2

Browse source 
remapped parameters and added ending newlines
This commit is contained in:
LexManos 2015-04-29 14:45:59 -07:00
commit 4e8d5255ed
35 changed files with 55 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java
View file

@ -43,13 +43,13 @@ public class GuiAccessDenied extends GuiScreen
}
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
int offset = Math.max(85 - 2 * 10, 10);
this.drawCenteredString(this.fontRendererObj, "Forge Mod Loader could not connect to this server", this.width / 2, offset, 0xFFFFFF);
offset += 10;
this.drawCenteredString(this.fontRendererObj, String.format("The server %s has forbidden modded access", data.serverName), this.width / 2, offset, 0xFFFFFF);
super.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
super.drawScreen(mouseX, mouseY, partialTicks);
}
}

4
fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java
View file

@ -43,13 +43,13 @@ public class GuiBackupFailed extends GuiScreen
}
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
int offset = Math.max(85 - 2 * 10, 10);
this.drawCenteredString(this.fontRendererObj, String.format("There was an error saving the archive %s", zipName.getName()), this.width / 2, offset, 0xFFFFFF);
offset += 10;
this.drawCenteredString(this.fontRendererObj, String.format("Please fix the problem and try again"), this.width / 2, offset, 0xFFFFFF);
super.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
super.drawScreen(mouseX, mouseY, partialTicks);
}
}

4
fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java
View file

@ -30,9 +30,9 @@ public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen
this.customException.initGui(this, fontRendererObj);
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
this.customException.drawScreen(this, fontRendererObj, p_73863_1_, p_73863_2_, p_73863_3_);
this.customException.drawScreen(this, fontRendererObj, mouseX, mouseY, partialTicks);
}
}

2
fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java
View file

@ -37,7 +37,7 @@ public class GuiDupesFound extends GuiErrorScreen
this.buttonList.clear();
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
int offset = Math.max(85 - dupes.dupes.size() * 10, 10);

12
fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java
View file

@ -26,11 +26,11 @@ public class GuiIngameModOptions extends GuiScreen
}
@Override
protected void actionPerformed(GuiButton p_146284_1_)
protected void actionPerformed(GuiButton button)
{
if (p_146284_1_.enabled)
if (button.enabled)
{
if (p_146284_1_.id == 200)
if (button.id == 200)
{
this.mc.gameSettings.saveOptions();
this.mc.displayGuiScreen(this.parentScreen);
@ -39,13 +39,13 @@ public class GuiIngameModOptions extends GuiScreen
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
// force a non-transparent background
this.drawDefaultBackground();
this.optionList.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
this.optionList.drawScreen(mouseX, mouseY, partialTicks);
this.drawCenteredString(this.fontRendererObj, this.title, this.width / 2, 15, 0xFFFFFF);
super.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
super.drawScreen(mouseX, mouseY, partialTicks);
}
FontRenderer getFontRenderer() {

2
fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java
View file

@ -35,7 +35,7 @@ public class GuiModsMissing extends GuiErrorScreen
this.buttonList.clear();
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
int offset = Math.max(85 - modsMissing.missingMods.size() * 10, 10);

4
fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java
View file

@ -43,7 +43,7 @@ public class GuiModsMissingForServer extends GuiScreen
}
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
int offset = Math.max(85 - modsMissing.missingMods.size() * 10, 10);
@ -58,6 +58,6 @@ public class GuiModsMissingForServer extends GuiScreen
offset += 10;
this.drawCenteredString(this.fontRendererObj, String.format("%s : %s", v.getLabel(), v.getRangeString()), this.width / 2, offset, 0xEEEEEE);
}
super.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
super.drawScreen(mouseX, mouseY, partialTicks);
}
}

4
fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java
View file

@ -30,7 +30,7 @@ public class GuiNotification extends GuiScreen
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
@ -55,7 +55,7 @@ public class GuiNotification extends GuiScreen
}
}
super.drawScreen(p_73863_1_, p_73863_2_, p_73863_3_);
super.drawScreen(mouseX, mouseY, partialTicks);
}
protected final StartupQuery query;

10
fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java
View file

@ -33,7 +33,7 @@ public class GuiOldSaveLoadConfirm extends GuiYesNo implements GuiYesNoCallback
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
this.drawCenteredString(this.fontRendererObj, String.format("The world %s contains pre-update modding data", saveName), this.width / 2, 50, 16777215);
@ -44,18 +44,18 @@ public class GuiOldSaveLoadConfirm extends GuiYesNo implements GuiYesNoCallback
for (k = 0; k < this.buttonList.size(); ++k)
{
((GuiButton)this.buttonList.get(k)).drawButton(this.mc, p_73863_1_, p_73863_2_);
((GuiButton)this.buttonList.get(k)).drawButton(this.mc, mouseX, mouseY);
}
for (k = 0; k < this.labelList.size(); ++k)
{
((GuiLabel)this.labelList.get(k)).drawLabel(this.mc, p_73863_1_, p_73863_2_);
((GuiLabel)this.labelList.get(k)).drawLabel(this.mc, mouseX, mouseY);
}
}
@Override
protected void actionPerformed(GuiButton p_146284_1_)
protected void actionPerformed(GuiButton button)
{
if (p_146284_1_.id == 1)
if (button.id == 1)
{
ObfuscationReflectionHelper.setPrivateValue(GuiSelectWorld.class, (GuiSelectWorld)parentScreen, false, "field_"+"146634_i");
FMLClientHandler.instance().showGuiScreen(parent);

2
fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java
View file

@ -20,7 +20,7 @@ public class GuiSortingProblem extends GuiScreen {
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
int offset = Math.max(85 - (failedList.getVisitedNodes().size() + 3) * 10, 10);

2
fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java
View file

@ -31,7 +31,7 @@ public class GuiWrongMinecraft extends GuiErrorScreen
this.buttonList.clear();
}
@Override
public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)
public void drawScreen(int mouseX, int mouseY, float partialTicks)
{
this.drawDefaultBackground();
int offset = 75;

4
fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java
View file

@ -61,9 +61,9 @@ public class GuiCheckBox extends GuiButton
}
@Override
public boolean mousePressed(Minecraft p_146116_1_, int p_146116_2_, int p_146116_3_)
public boolean mousePressed(Minecraft mc, int mouseX, int mouseY)
{
if (this.enabled && this.visible && p_146116_2_ >= this.xPosition && p_146116_3_ >= this.yPosition && p_146116_2_ < this.xPosition + this.width && p_146116_3_ < this.yPosition + this.height)
if (this.enabled && this.visible && mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height)
{
this.isChecked = !this.isChecked;
return true;

4
fml/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
View file

@ -564,9 +564,9 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
FMLLog.fine("Received override dimension %d", overrideDim);
}
public int getOverrideDimension(S01PacketJoinGame p_147282_1_) {
public int getOverrideDimension(S01PacketJoinGame packetIn) {
FMLLog.fine("Overriding dimension: using %d", this.overrideLoginDim);
return this.overrideLoginDim != 0 ? this.overrideLoginDim : p_147282_1_.getDimension();
return this.overrideLoginDim != 0 ? this.overrideLoginDim : packetIn.getDimension();
}
private class MultiPartCustomPayload extends S3FPacketCustomPayload

4
fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java
View file

@ -64,9 +64,9 @@ public class FMLNetworkHandler
dispatcher.serverToClientHandshake(player);
}
public static void fmlClientHandshake(NetworkManager field_147393_d)
public static void fmlClientHandshake(NetworkManager networkManager)
{
NetworkDispatcher dispatcher = NetworkDispatcher.allocAndSet(field_147393_d);
NetworkDispatcher dispatcher = NetworkDispatcher.allocAndSet(networkManager);
dispatcher.clientToServerHandshake();
}

6
fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java
View file

@ -154,15 +154,15 @@ public class LanguageRegistry
*/
@SuppressWarnings("unchecked")
@Deprecated
public void mergeLanguageTable(@SuppressWarnings("rawtypes") Map field_135032_a, String lang)
public void mergeLanguageTable(@SuppressWarnings("rawtypes") Map properties, String lang)
{
Properties langPack=modLanguageData.get(lang);
if (langPack!=null) {
mergeWithoutOverwrite(langPack, field_135032_a);
mergeWithoutOverwrite(langPack, properties);
}
Properties usPack=modLanguageData.get("en_US");
if (usPack!=null) {
mergeWithoutOverwrite(usPack, field_135032_a);
mergeWithoutOverwrite(usPack, properties);
}
}