From 7e53132918618fca7080a45baaa1416392124c9d Mon Sep 17 00:00:00 2001 From: bspkrs Date: Wed, 15 Oct 2014 02:08:41 -0400 Subject: [PATCH] changed pass-thru method name to fix MCP name conflict fixed a few old javadoc object name mistakes --- .../minecraftforge/fml/client/config/GuiConfig.java | 10 +++++----- .../fml/client/config/GuiConfigEntries.java | 4 ++-- .../minecraftforge/fml/client/config/GuiEditArray.java | 2 +- .../fml/client/config/GuiEditArrayEntries.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) 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 36932bb78..3ed811b24 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 @@ -76,7 +76,7 @@ public class GuiConfig extends GuiScreen * is not an instance of GuiConfig. * * @param parentScreen the parent GuiScreen object - * @param configElements a List of IConfigProperty objects + * @param configElements a List of IConfigElement objects * @param modID the mod ID for the mod whose config settings will be edited * @param configID an identifier that will be passed to the OnConfigChanged and PostConfigChanged events. Setting this value will force * the save action to be called when the Done button is pressed on this screen if any configElements were changed. @@ -96,7 +96,7 @@ public class GuiConfig extends GuiScreen * If configID is not defined, the events will be posted if the parent gui is null or if the parent gui is not an instance of GuiConfig. * * @param parentScreen the parent GuiScreen object - * @param configElements a List of IConfigProperty objects + * @param configElements a List of IConfigElement objects * @param modID the mod ID for the mod whose config settings will be edited * @param allRequireWorldRestart send true if all configElements on this screen require a world restart * @param allRequireMcRestart send true if all configElements on this screen require MC to be restarted @@ -114,7 +114,7 @@ public class GuiConfig extends GuiScreen * If configID is not defined, the events will be posted if the parent gui is null or if the parent gui is not an instance of GuiConfig. * * @param parentScreen the parent GuiScreen object - * @param configElements a List of IConfigProperty objects + * @param configElements a List of IConfigElement objects * @param modID the mod ID for the mod whose config settings will be edited * @param allRequireWorldRestart send true if all configElements on this screen require a world restart * @param allRequireMcRestart send true if all configElements on this screen require MC to be restarted @@ -136,7 +136,7 @@ public class GuiConfig extends GuiScreen * gui is null or if the parent gui is not an instance of GuiConfig. * * @param parentScreen the parent GuiScreen object - * @param configElements a List of IConfigProperty objects + * @param configElements a List of IConfigElement objects * @param modID the mod ID for the mod whose config settings will be edited * @param configID an identifier that will be passed to the OnConfigChanged and PostConfigChanged events * @param allRequireWorldRestart send true if all configElements on this screen require a world restart @@ -285,7 +285,7 @@ public class GuiConfig extends GuiScreen { if (mouseEvent != 0 || !this.entryList.func_148179_a(x, y, mouseEvent)) { - this.entryList.mouseClicked(x, y, mouseEvent); + this.entryList.mouseClickedPassThru(x, y, mouseEvent); super.mouseClicked(x, y, mouseEvent); } } 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 3c4b238a3..61ae8c976 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 @@ -243,14 +243,14 @@ public class GuiConfigEntries extends GuiListExtended * This method is a pass-through for IConfigEntry objects that contain GuiTextField elements. Called from the parent GuiConfig * screen. */ - public void mouseClicked(int mouseX, int mouseY, int mouseEvent) + public void mouseClickedPassThru(int mouseX, int mouseY, int mouseEvent) { for (IConfigEntry entry : this.listEntries) entry.mouseClicked(mouseX, mouseY, mouseEvent); } /** - * This method is a pass-through for IConfigListEntry objects that need to perform actions when the containing GUI is closed. + * This method is a pass-through for IConfigEntry objects that need to perform actions when the containing GUI is closed. */ public void onGuiClosed() { 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 920c4d373..351888184 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 @@ -153,7 +153,7 @@ public class GuiEditArray extends GuiScreen { if (mouseEvent != 0 || !this.entryList.func_148179_a(x, y, mouseEvent)) { - this.entryList.mouseClicked(x, y, mouseEvent); + this.entryList.mouseClickedPassThru(x, y, mouseEvent); super.mouseClicked(x, y, mouseEvent); } } 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 357e7ce0f..6183d2e86 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 @@ -203,7 +203,7 @@ public class GuiEditArrayEntries extends GuiListExtended entry.updateCursorCounter(); } - protected void mouseClicked(int x, int y, int mouseEvent) + protected void mouseClickedPassThru(int x, int y, int mouseEvent) { for (IArrayEntry entry : this.listEntries) entry.mouseClicked(x, y, mouseEvent);