From 0de75b537d4acd7ce17a1d86ca438b7b371a9396 Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Sat, 13 Aug 2022 00:19:11 -0700 Subject: [PATCH] refactored a few gui classes --- .../java/net/lax1dude/eaglercraft/GuiScreenConnectOption.java | 2 +- .../lax1dude/eaglercraft/GuiScreenCreateWorldSelection.java | 2 +- ...{GuiNameWorldImport.java => GuiScreenNameWorldImport.java} | 4 ++-- .../eaglercraft/{GuiNoRelays.java => GuiScreenNoRelays.java} | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/net/lax1dude/eaglercraft/{GuiNameWorldImport.java => GuiScreenNameWorldImport.java} (96%) rename src/main/java/net/lax1dude/eaglercraft/{GuiNoRelays.java => GuiScreenNoRelays.java} (92%) diff --git a/src/main/java/net/lax1dude/eaglercraft/GuiScreenConnectOption.java b/src/main/java/net/lax1dude/eaglercraft/GuiScreenConnectOption.java index 355abd8..4293276 100644 --- a/src/main/java/net/lax1dude/eaglercraft/GuiScreenConnectOption.java +++ b/src/main/java/net/lax1dude/eaglercraft/GuiScreenConnectOption.java @@ -37,7 +37,7 @@ public class GuiScreenConnectOption extends GuiScreen { }else if(par1GuiButton.id == 2) { GuiScreen scn = new GuiScreenLANConnect(guiScreen); if(IntegratedServer.relayManager.count() == 0) { - mc.displayGuiScreen(new GuiNoRelays(guiScreen)); + mc.displayGuiScreen(new GuiScreenNoRelays(guiScreen)); }else { mc.displayGuiScreen(scn); } diff --git a/src/main/java/net/lax1dude/eaglercraft/GuiScreenCreateWorldSelection.java b/src/main/java/net/lax1dude/eaglercraft/GuiScreenCreateWorldSelection.java index 51c9e40..cc2dac5 100644 --- a/src/main/java/net/lax1dude/eaglercraft/GuiScreenCreateWorldSelection.java +++ b/src/main/java/net/lax1dude/eaglercraft/GuiScreenCreateWorldSelection.java @@ -28,7 +28,7 @@ public class GuiScreenCreateWorldSelection extends GuiScreen { public void updateScreen() { if(EaglerAdapter.getFileChooserResultAvailable() && (isImportingEPK || isImportingMCA)) { - this.mc.displayGuiScreen(new GuiNameWorldImport(mainmenu, EaglerAdapter.getFileChooserResultName(), isImportingEPK ? 0 : (isImportingMCA ? 1 : -1))); + this.mc.displayGuiScreen(new GuiScreenNameWorldImport(mainmenu, EaglerAdapter.getFileChooserResultName(), isImportingEPK ? 0 : (isImportingMCA ? 1 : -1))); isImportingEPK = isImportingMCA = false; } } diff --git a/src/main/java/net/lax1dude/eaglercraft/GuiNameWorldImport.java b/src/main/java/net/lax1dude/eaglercraft/GuiScreenNameWorldImport.java similarity index 96% rename from src/main/java/net/lax1dude/eaglercraft/GuiNameWorldImport.java rename to src/main/java/net/lax1dude/eaglercraft/GuiScreenNameWorldImport.java index 67b5429..9292c3d 100644 --- a/src/main/java/net/lax1dude/eaglercraft/GuiNameWorldImport.java +++ b/src/main/java/net/lax1dude/eaglercraft/GuiScreenNameWorldImport.java @@ -6,7 +6,7 @@ import net.minecraft.src.GuiScreen; import net.minecraft.src.GuiTextField; import net.minecraft.src.StringTranslate; -public class GuiNameWorldImport extends GuiScreen { +public class GuiScreenNameWorldImport extends GuiScreen { private GuiScreen parentGuiScreen; private GuiTextField theGuiTextField; private int importFormat; @@ -16,7 +16,7 @@ public class GuiNameWorldImport extends GuiScreen { private boolean definetlyTimeToImport = false; private boolean isImporting = false; - public GuiNameWorldImport(GuiScreen menu, String name, int format) { + public GuiScreenNameWorldImport(GuiScreen menu, String name, int format) { this.parentGuiScreen = menu; this.importFormat = format; this.oldName = name; diff --git a/src/main/java/net/lax1dude/eaglercraft/GuiNoRelays.java b/src/main/java/net/lax1dude/eaglercraft/GuiScreenNoRelays.java similarity index 92% rename from src/main/java/net/lax1dude/eaglercraft/GuiNoRelays.java rename to src/main/java/net/lax1dude/eaglercraft/GuiScreenNoRelays.java index dd86b5e..5545b18 100644 --- a/src/main/java/net/lax1dude/eaglercraft/GuiNoRelays.java +++ b/src/main/java/net/lax1dude/eaglercraft/GuiScreenNoRelays.java @@ -4,11 +4,11 @@ import net.minecraft.src.GuiButton; import net.minecraft.src.GuiScreen; import net.minecraft.src.StringTranslate; -public class GuiNoRelays extends GuiScreen { +public class GuiScreenNoRelays extends GuiScreen { private GuiScreen parent; - public GuiNoRelays(GuiScreen parent) { + public GuiScreenNoRelays(GuiScreen parent) { this.parent = parent; }