diff --git a/fml/src/main/java/net/minecraftforge/fml/client/FMLConfigGuiFactory.java b/fml/src/main/java/net/minecraftforge/fml/client/FMLConfigGuiFactory.java index fc8ffc0218..8ab08b4f83 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/FMLConfigGuiFactory.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/FMLConfigGuiFactory.java @@ -136,4 +136,4 @@ public class FMLConfigGuiFactory implements IModGuiFactory }; } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java index b24171bfb1..a730f00d83 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiAccessDenied.java @@ -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); } } diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java index 6bbb6f1ab2..abb74ee209 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiBackupFailed.java @@ -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); } } diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java index 53a85f01b9..825b337a3c 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiCustomModLoadingErrorScreen.java @@ -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); } } diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java index c31006fe00..7ee9a8e5d4 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiDupesFound.java @@ -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); diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java index 8ae3f5b62e..3424e51d64 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiIngameModOptions.java @@ -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() { diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java index 313ccf1370..e632835de6 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissing.java @@ -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); diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java index bc2b35206f..a55aa54312 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiModsMissingForServer.java @@ -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); } } diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java index 33690b5000..7cbc45ba6d 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiNotification.java @@ -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; diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java index 9335f0e277..ccc4269dd4 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiOldSaveLoadConfirm.java @@ -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); diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java index ed0159570d..91c0c2f637 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiSortingProblem.java @@ -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); diff --git a/fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java b/fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java index c2f995678b..f15e6b8fce 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/GuiWrongMinecraft.java @@ -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; diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/ConfigGuiType.java b/fml/src/main/java/net/minecraftforge/fml/client/config/ConfigGuiType.java index fb9d941861..fd57075cd0 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/ConfigGuiType.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/ConfigGuiType.java @@ -21,4 +21,4 @@ public enum ConfigGuiType COLOR, MOD_ID, CONFIG_CATEGORY; -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/DummyConfigElement.java b/fml/src/main/java/net/minecraftforge/fml/client/config/DummyConfigElement.java index e240bac5a1..320fbf0aaa 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/DummyConfigElement.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/DummyConfigElement.java @@ -414,4 +414,4 @@ public class DummyConfigElement implements IConfigElement { return maxValue; } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java index 71a3ef9d49..6399fe8b6c 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java @@ -74,4 +74,4 @@ public class GuiButtonExt extends GuiButton this.drawCenteredString(mc.fontRendererObj, buttonText, this.xPosition + this.width / 2, this.yPosition + (this.height - 8) / 2, color); } } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java index 21df35cb4b..7f8fca783e 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java @@ -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; @@ -81,4 +81,4 @@ public class GuiCheckBox extends GuiButton { this.isChecked = isChecked; } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java index e2a5333c2a..0d61d073b8 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfig.java @@ -349,4 +349,4 @@ public class GuiConfig extends GuiScreen { this.drawHoveringText(stringList, x, y); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java index 61ae8c976a..cdc5c1ff34 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java @@ -1765,4 +1765,4 @@ public class GuiConfigEntries extends GuiListExtended */ public void onGuiClosed(); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java index d6c6bb03bc..914347ce57 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArray.java @@ -211,4 +211,4 @@ public class GuiEditArray extends GuiScreen { this.drawHoveringText(stringList, x, y); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java index 6183d2e863..d7bb4622a2 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiEditArrayEntries.java @@ -671,4 +671,4 @@ public class GuiEditArrayEntries extends GuiListExtended public Object getValue(); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java index 851792b438..00f918c0b5 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectString.java @@ -179,4 +179,4 @@ public class GuiSelectString extends GuiScreen { this.drawHoveringText(stringList, x, y); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java index 873615851a..1a799a99c4 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiSelectStringEntries.java @@ -195,4 +195,4 @@ public class GuiSelectStringEntries extends GuiListExtended { public Object getValue(); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java index bf07650ff0..404c20f724 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java @@ -80,4 +80,4 @@ public class GuiUnicodeGlyphButton extends GuiButtonExt this.yPosition + (this.height - 8) / 2, color); } } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java index 73b6a2c058..f874d4e55d 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java @@ -193,4 +193,4 @@ public class GuiUtils tessellator.draw(); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/HoverChecker.java b/fml/src/main/java/net/minecraftforge/fml/client/config/HoverChecker.java index a2cad08600..101150ff35 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/HoverChecker.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/HoverChecker.java @@ -93,4 +93,4 @@ public class HoverChecker { hoverStart = -1; } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/config/IConfigElement.java b/fml/src/main/java/net/minecraftforge/fml/client/config/IConfigElement.java index f67546afeb..efeae96930 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/config/IConfigElement.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/config/IConfigElement.java @@ -167,4 +167,4 @@ public interface IConfigElement * [Property] Gets a Pattern object used in String property input validation. */ public Pattern getValidationPattern(); -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/client/event/ConfigChangedEvent.java b/fml/src/main/java/net/minecraftforge/fml/client/event/ConfigChangedEvent.java index ddab3aa8d1..1eaaf89106 100644 --- a/fml/src/main/java/net/minecraftforge/fml/client/event/ConfigChangedEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/client/event/ConfigChangedEvent.java @@ -82,4 +82,4 @@ public class ConfigChangedEvent extends Event super(modID, configID, isWorldRunning, requiresMcRestart); } } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/common/Loader.java b/fml/src/main/java/net/minecraftforge/fml/common/Loader.java index b8dcd721e7..3e42289f39 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/Loader.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/Loader.java @@ -981,4 +981,4 @@ public class Loader FMLLog.log(Level.INFO, e, "An error occurred writing the fml mod states file, your disabled change won't persist"); } } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/common/event/FMLMissingMappingsEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLMissingMappingsEvent.java index f1de7cc151..7515da10e4 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/event/FMLMissingMappingsEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLMissingMappingsEvent.java @@ -201,4 +201,4 @@ public class FMLMissingMappingsEvent extends FMLEvent { { return ImmutableList.copyOf(missing.values()); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java index 99c3af3bc5..d371aa0c0d 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/event/FMLModIdMappingEvent.java @@ -49,4 +49,4 @@ public class FMLModIdMappingEvent extends FMLEvent { }); remappedIds = ImmutableList.copyOf(remappings); } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/common/launcher/TerminalTweaker.java b/fml/src/main/java/net/minecraftforge/fml/common/launcher/TerminalTweaker.java index a53735ba93..bdf1bf946f 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/launcher/TerminalTweaker.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/launcher/TerminalTweaker.java @@ -29,4 +29,4 @@ public final class TerminalTweaker implements ITweaker { { } -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java index 1d60503b71..9f27ab2470 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java @@ -564,9 +564,9 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler 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 diff --git a/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java index 4d86fbd041..01ac4a2935 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/network/internal/FMLNetworkHandler.java @@ -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(); } diff --git a/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java index e02f6544d5..5795ea293c 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/GameData.java @@ -1112,4 +1112,4 @@ public class GameData { -} \ No newline at end of file +} diff --git a/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java b/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java index 7a8bc608b4..24770d13b9 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/registry/LanguageRegistry.java @@ -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); } }