From 493229a277784dcee7ebe19cc1e81a0f57765df6 Mon Sep 17 00:00:00 2001 From: Jamie Date: Thu, 2 Nov 2023 14:19:56 +0000 Subject: [PATCH 1/5] feat: Export favorites and waypoints from update available screen --- .../core/instances/MainMenuButtons.java | 7 +-- .../overlays/ui/UpdateAvailableScreen.java | 60 +++++++++++-------- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java b/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java index c1131e987..2e3f83f08 100644 --- a/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java +++ b/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java @@ -68,12 +68,7 @@ public static void actionPerformed(GuiMainMenu on, GuiButton button, List lines = new ArrayList() {{ add(line1); add(line2); - add("Update now or when leaving Minecraft?"); + add(line3); }}; int spacing = this.fontRenderer.FONT_HEIGHT + 2; // 11 @@ -81,13 +85,13 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { for (GuiButton button : buttonList) { if (button.isMouseOver()) { if (button.id == 0) { - drawHoveringText("View the changelog for this update", mouseX, mouseY); + drawHoveringText("Open a link to the Artemis Modrinth page", mouseX, mouseY); } else if (button.id == 1) { - drawHoveringText("Update now and exit Minecraft", mouseX, mouseY); + drawHoveringText("Copy your favorites to your clipboard", mouseX, mouseY); } else if (button.id == 2) { - drawHoveringText("Update when you exit Minecraft", mouseX, mouseY); + drawHoveringText("Copy your waypoints to your clipboard", mouseX, mouseY); } else if (button.id == 3) { - drawHoveringText("Ignore this update", mouseX, mouseY); + drawHoveringText("Continue to Wynncraft", mouseX, mouseY); } else if (button.id == 4) { drawHoveringText("Cancel", mouseX, mouseY); } @@ -97,12 +101,18 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { @Override public void actionPerformed(GuiButton button) { - if (button.id == 1 || button.id == 2) { - // Update - CoreDBConfig.INSTANCE.showChangelogs = true; - CoreDBConfig.INSTANCE.lastVersion = Reference.VERSION; - CoreDBConfig.INSTANCE.saveSettings(CoreModule.getModule()); - McIf.mc().displayGuiScreen(new UpdatingScreen(button.id == 1)); + if (button.id == 1) { + List combinedList = new ArrayList<>(); + combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteItems); + combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteIngredients); + combinedList.addAll(UtilitiesConfig.INSTANCE.favoritePowders); + combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteEmeraldPouches); + + Utils.copyToClipboard("wynntilsFavorites," + String.join(",", combinedList)); + } else if (button.id == 2) { + JsonArray array = new JsonArray(); + MapConfig.Waypoints.INSTANCE.waypoints.stream().map(WaypointProfile::toArtemisObject).forEach(array::add); + Utils.copyToClipboard(GSON.toJson(array)); } else if (button.id == 3) { // Ignore WebManager.skipJoinUpdate(); @@ -111,9 +121,7 @@ public void actionPerformed(GuiButton button) { // Cancel McIf.mc().displayGuiScreen(null); } else if (button.id == 0) { - // View changelog - boolean major = CoreDBConfig.INSTANCE.updateStream == UpdateStream.STABLE; - ChangelogUI.loadChangelogAndShow(this, major); + Utils.openUrl("https://modrinth.com/mod/wynntils/version/latest"); } } From 5b18b97547fd0d4e28d3b34bc8bc7b2be4032450 Mon Sep 17 00:00:00 2001 From: Jamie Date: Fri, 3 Nov 2023 15:18:16 +0000 Subject: [PATCH 2/5] Revert UpdateAvailableScreen, add ExportScreen and button, only force show on first launch --- .../modules/core/config/CoreDBConfig.java | 3 + .../modules/core/events/ClientEvents.java | 13 ++- .../core/instances/MainMenuButtons.java | 11 ++ .../core/overlays/ui/ExportScreen.java | 102 ++++++++++++++++++ .../overlays/ui/UpdateAvailableScreen.java | 60 +++++------ 5 files changed, 154 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java diff --git a/src/main/java/com/wynntils/modules/core/config/CoreDBConfig.java b/src/main/java/com/wynntils/modules/core/config/CoreDBConfig.java index d3c1eee79..9e8f80327 100644 --- a/src/main/java/com/wynntils/modules/core/config/CoreDBConfig.java +++ b/src/main/java/com/wynntils/modules/core/config/CoreDBConfig.java @@ -47,6 +47,9 @@ public class CoreDBConfig extends SettingsClass { @Setting(upload = false) public String lastVersion = "0.0.0"; + @Setting(upload = false) + public boolean shownExportScreen = false; + @Setting(displayName = "Main Menu Wynncraft Button", description = "Should a button be added to the main menu that allows you to connect to Wynncraft directly?") public boolean addMainMenuButton = true; diff --git a/src/main/java/com/wynntils/modules/core/events/ClientEvents.java b/src/main/java/com/wynntils/modules/core/events/ClientEvents.java index ff0de7c33..60bcc6766 100644 --- a/src/main/java/com/wynntils/modules/core/events/ClientEvents.java +++ b/src/main/java/com/wynntils/modules/core/events/ClientEvents.java @@ -21,6 +21,8 @@ import com.wynntils.core.utils.objects.Location; import com.wynntils.core.utils.objects.TimedSet; import com.wynntils.core.utils.reflections.ReflectionFields; +import com.wynntils.modules.core.CoreModule; +import com.wynntils.modules.core.config.CoreDBConfig; import com.wynntils.modules.core.instances.GatheringBake; import com.wynntils.modules.core.instances.MainMenuButtons; import com.wynntils.modules.core.instances.TotemTracker; @@ -30,6 +32,8 @@ import com.wynntils.modules.core.overlays.inventories.HorseReplacer; import com.wynntils.modules.core.overlays.inventories.IngameMenuReplacer; import com.wynntils.modules.core.overlays.inventories.InventoryReplacer; +import com.wynntils.modules.core.overlays.ui.ExportScreen; +import com.wynntils.modules.core.overlays.ui.UpdateAvailableScreen; import com.wynntils.modules.utilities.UtilitiesModule; import com.wynntils.modules.utilities.configs.OverlayConfig; import com.wynntils.modules.utilities.instances.ShamanMaskType; @@ -456,7 +460,14 @@ public void addMainMenuButtons(GuiScreenEvent.InitGuiEvent.Post e) { if (gui instanceof GuiMainMenu) { boolean resize = lastScreen != null && lastScreen instanceof GuiMainMenu; - MainMenuButtons.addButtons((GuiMainMenu) gui, e.getButtonList(), resize); + + if (!CoreDBConfig.INSTANCE.shownExportScreen) { + McIf.mc().displayGuiScreen(new ExportScreen()); + CoreDBConfig.INSTANCE.shownExportScreen = true; + CoreDBConfig.INSTANCE.saveSettings(CoreModule.getModule()); + } else { + MainMenuButtons.addButtons((GuiMainMenu) gui, e.getButtonList(), resize); + } } lastScreen = gui; diff --git a/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java b/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java index 2e3f83f08..8003cfe39 100644 --- a/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java +++ b/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java @@ -10,6 +10,7 @@ import com.wynntils.core.utils.ServerUtils; import com.wynntils.modules.core.config.CoreDBConfig; import com.wynntils.modules.core.overlays.UpdateOverlay; +import com.wynntils.modules.core.overlays.ui.ExportScreen; import com.wynntils.modules.core.overlays.ui.UpdateAvailableScreen; import com.wynntils.modules.utilities.instances.ServerIcon; import com.wynntils.webapi.WebManager; @@ -31,12 +32,16 @@ public class MainMenuButtons { private static ServerList serverList = null; private static final int WYNNCRAFT_BUTTON_ID = 3790627; + private static final int EXPORT_BUTTON_ID = 3790628; private static WynncraftButton lastButton = null; private static boolean alreadyLoaded = false; public static void addButtons(GuiMainMenu to, List buttonList, boolean resize) { + GuiButton exportButton = new GuiButton(EXPORT_BUTTON_ID, to.width / 2 + 104, to.height / 4 + 48 + 48, 20, 20, "!"); + buttonList.add(exportButton); + if (!CoreDBConfig.INSTANCE.addMainMenuButton) return; if (lastButton == null || !resize) { @@ -64,6 +69,8 @@ public static void addButtons(GuiMainMenu to, List buttonList, boolea public static void actionPerformed(GuiMainMenu on, GuiButton button, List buttonList) { if (button.id == WYNNCRAFT_BUTTON_ID) { clickedWynncraftButton(((WynncraftButton) button).serverIcon.getServer(), on); + } else if (button.id == EXPORT_BUTTON_ID) { + clickedExportButton(); } } @@ -71,6 +78,10 @@ private static void clickedWynncraftButton(ServerData server, GuiScreen backGui) McIf.mc().displayGuiScreen(new UpdateAvailableScreen(server)); } + private static void clickedExportButton() { + McIf.mc().displayGuiScreen(new ExportScreen()); + } + private static boolean hasUpdate() { return !Reference.developmentEnvironment && WebManager.getUpdate() != null && WebManager.getUpdate().hasUpdate(); } diff --git a/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java b/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java new file mode 100644 index 000000000..9788c6cbc --- /dev/null +++ b/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java @@ -0,0 +1,102 @@ +package com.wynntils.modules.core.overlays.ui; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.wynntils.McIf; +import com.wynntils.core.utils.Utils; +import com.wynntils.modules.map.configs.MapConfig; +import com.wynntils.modules.map.instances.WaypointProfile; +import com.wynntils.modules.utilities.configs.UtilitiesConfig; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; + +import java.util.ArrayList; +import java.util.List; + +public class ExportScreen extends GuiScreen { + private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); + private String line1; + private String line2; + private String line3; + + public ExportScreen() { + line1 = "Wynncraft will be phasing out 1.12 by the end of this year."; + line2 = "We highly recommend updating to Artemis (1.20.2) as soon as you can."; + line3 = "Waypoints and favorites can be exported using the buttons below."; + } + + @Override + public void initGui() { + int spacing = 24; + int y = this.height / 4 + 84; + // row 1 + this.buttonList.add(new GuiButton(0, this.width / 2 - 100, y, 200, 20, "Get Artemis")); + // row 2 + y += spacing; + this.buttonList.add(new GuiButton(1, this.width / 2 - 100, y, 98, 20, "Export Favorites")); + this.buttonList.add(new GuiButton(2, this.width / 2 + 2, y, 98, 20, "Export Waypoints")); + // row 3 + y += spacing; + this.buttonList.add(new GuiButton(3, this.width / 2 - 100, y, 200, 20, "Continue")); + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + drawDefaultBackground(); + + List lines = new ArrayList() {{ + add(line1); + add(line2); + add(line3); + }}; + + int spacing = this.fontRenderer.FONT_HEIGHT + 2; // 11 + int y = this.height / 4 + (84 - spacing * lines.size()); + + for (String line : lines) { + drawCenteredString(this.fontRenderer, line, this.width / 2, y, 0xFFFFFF); + y += spacing; + } + + // draw gui buttons + super.drawScreen(mouseX, mouseY, partialTicks); + + // Draw hover text + for (GuiButton button : buttonList) { + if (button.isMouseOver()) { + if (button.id == 0) { + drawHoveringText("Open a link to the Artemis Modrinth page", mouseX, mouseY); + } else if (button.id == 1) { + drawHoveringText("Copy your favorites to your clipboard", mouseX, mouseY); + } else if (button.id == 2) { + drawHoveringText("Copy your waypoints to your clipboard", mouseX, mouseY); + } else if (button.id == 3) { + drawHoveringText("Continue to Wynncraft", mouseX, mouseY); + } + } + } + } + + @Override + public void actionPerformed(GuiButton button) { + if (button.id == 1) { + List combinedList = new ArrayList<>(); + combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteItems); + combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteIngredients); + combinedList.addAll(UtilitiesConfig.INSTANCE.favoritePowders); + combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteEmeraldPouches); + + Utils.copyToClipboard("wynntilsFavorites," + String.join(",", combinedList)); + } else if (button.id == 2) { + JsonArray array = new JsonArray(); + MapConfig.Waypoints.INSTANCE.waypoints.stream().map(WaypointProfile::toArtemisObject).forEach(array::add); + Utils.copyToClipboard(GSON.toJson(array)); + } else if (button.id == 3) { + // Cancel + McIf.mc().displayGuiScreen(null); + } else if (button.id == 0) { + Utils.openUrl("https://modrinth.com/mod/wynntils/version/latest"); + } + } +} diff --git a/src/main/java/com/wynntils/modules/core/overlays/ui/UpdateAvailableScreen.java b/src/main/java/com/wynntils/modules/core/overlays/ui/UpdateAvailableScreen.java index 118131811..47a7b416a 100644 --- a/src/main/java/com/wynntils/modules/core/overlays/ui/UpdateAvailableScreen.java +++ b/src/main/java/com/wynntils/modules/core/overlays/ui/UpdateAvailableScreen.java @@ -4,19 +4,12 @@ package com.wynntils.modules.core.overlays.ui; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; import com.wynntils.McIf; import com.wynntils.Reference; import com.wynntils.core.utils.ServerUtils; -import com.wynntils.core.utils.Utils; import com.wynntils.modules.core.CoreModule; import com.wynntils.modules.core.config.CoreDBConfig; import com.wynntils.modules.core.enums.UpdateStream; -import com.wynntils.modules.map.configs.MapConfig; -import com.wynntils.modules.map.instances.WaypointProfile; -import com.wynntils.modules.utilities.configs.UtilitiesConfig; import com.wynntils.webapi.WebManager; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; @@ -28,17 +21,20 @@ public class UpdateAvailableScreen extends GuiScreen { - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); private ServerData server; private String line1; private String line2; - private String line3; public UpdateAvailableScreen(ServerData server) { this.server = server; - line1 = "Wynncraft will be phasing out 1.12 by the end of this year."; - line2 = "We highly recommend updating to Artemis (1.20.2) as soon as you can."; - line3 = "Waypoints and favorites can be exported using the buttons below."; + line1 = "A new update is available " + TextFormatting.YELLOW + WebManager.getUpdate().getLatestUpdate(); + if (WebManager.getUpdate().getDownloadMD5() != null) { + line1 += TextFormatting.GRAY + " (md5: " + TextFormatting.YELLOW + WebManager.getUpdate().getDownloadMD5() + TextFormatting.GRAY + ")"; + } + line2 = "You are currently on " + TextFormatting.YELLOW + Reference.VERSION; + if (WebManager.getUpdate().getMd5Installed() != null) { + line2 += TextFormatting.GRAY + " (md5: " + TextFormatting.YELLOW + WebManager.getUpdate().getMd5Installed() + TextFormatting.GRAY + ")"; + } } @Override @@ -46,14 +42,14 @@ public void initGui() { int spacing = 24; int y = this.height / 4 + 84; // row 1 - this.buttonList.add(new GuiButton(0, this.width / 2 - 100, y, 200, 20, "Get Artemis")); + this.buttonList.add(new GuiButton(0, this.width / 2 - 100, y, 200, 20, "View changelog")); // row 2 y += spacing; - this.buttonList.add(new GuiButton(1, this.width / 2 - 100, y, 98, 20, "Export Favorites")); - this.buttonList.add(new GuiButton(2, this.width / 2 + 2, y, 98, 20, "Export Waypoints")); + this.buttonList.add(new GuiButton(1, this.width / 2 - 100, y, 98, 20, "Update now")); + this.buttonList.add(new GuiButton(2, this.width / 2 + 2, y, 98, 20, "Update at exit")); // row 3 y += spacing; - this.buttonList.add(new GuiButton(3, this.width / 2 - 100, y, 98, 20, "Continue")); + this.buttonList.add(new GuiButton(3, this.width / 2 - 100, y, 98, 20, "Ignore update")); this.buttonList.add(new GuiButton(4, this.width / 2 + 2, y, 98, 20, "Cancel")); } @@ -64,7 +60,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { List lines = new ArrayList() {{ add(line1); add(line2); - add(line3); + add("Update now or when leaving Minecraft?"); }}; int spacing = this.fontRenderer.FONT_HEIGHT + 2; // 11 @@ -85,13 +81,13 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { for (GuiButton button : buttonList) { if (button.isMouseOver()) { if (button.id == 0) { - drawHoveringText("Open a link to the Artemis Modrinth page", mouseX, mouseY); + drawHoveringText("View the changelog for this update", mouseX, mouseY); } else if (button.id == 1) { - drawHoveringText("Copy your favorites to your clipboard", mouseX, mouseY); + drawHoveringText("Update now and exit Minecraft", mouseX, mouseY); } else if (button.id == 2) { - drawHoveringText("Copy your waypoints to your clipboard", mouseX, mouseY); + drawHoveringText("Update when you exit Minecraft", mouseX, mouseY); } else if (button.id == 3) { - drawHoveringText("Continue to Wynncraft", mouseX, mouseY); + drawHoveringText("Ignore this update", mouseX, mouseY); } else if (button.id == 4) { drawHoveringText("Cancel", mouseX, mouseY); } @@ -101,18 +97,12 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { @Override public void actionPerformed(GuiButton button) { - if (button.id == 1) { - List combinedList = new ArrayList<>(); - combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteItems); - combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteIngredients); - combinedList.addAll(UtilitiesConfig.INSTANCE.favoritePowders); - combinedList.addAll(UtilitiesConfig.INSTANCE.favoriteEmeraldPouches); - - Utils.copyToClipboard("wynntilsFavorites," + String.join(",", combinedList)); - } else if (button.id == 2) { - JsonArray array = new JsonArray(); - MapConfig.Waypoints.INSTANCE.waypoints.stream().map(WaypointProfile::toArtemisObject).forEach(array::add); - Utils.copyToClipboard(GSON.toJson(array)); + if (button.id == 1 || button.id == 2) { + // Update + CoreDBConfig.INSTANCE.showChangelogs = true; + CoreDBConfig.INSTANCE.lastVersion = Reference.VERSION; + CoreDBConfig.INSTANCE.saveSettings(CoreModule.getModule()); + McIf.mc().displayGuiScreen(new UpdatingScreen(button.id == 1)); } else if (button.id == 3) { // Ignore WebManager.skipJoinUpdate(); @@ -121,7 +111,9 @@ public void actionPerformed(GuiButton button) { // Cancel McIf.mc().displayGuiScreen(null); } else if (button.id == 0) { - Utils.openUrl("https://modrinth.com/mod/wynntils/version/latest"); + // View changelog + boolean major = CoreDBConfig.INSTANCE.updateStream == UpdateStream.STABLE; + ChangelogUI.loadChangelogAndShow(this, major); } } From 6cb9da2dadb30f1f5762055e6b7af12edc3ba892 Mon Sep 17 00:00:00 2001 From: Jamie Date: Fri, 3 Nov 2023 18:31:14 +0000 Subject: [PATCH 3/5] fix: Don't always open UpdateAvailableScreen --- .../wynntils/modules/core/instances/MainMenuButtons.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java b/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java index 8003cfe39..1c394bb8b 100644 --- a/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java +++ b/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java @@ -75,7 +75,12 @@ public static void actionPerformed(GuiMainMenu on, GuiButton button, List Date: Fri, 3 Nov 2023 18:42:42 +0000 Subject: [PATCH 4/5] chore: Change button text and export message --- .../wynntils/modules/core/instances/MainMenuButtons.java | 2 +- .../wynntils/modules/core/overlays/ui/ExportScreen.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java b/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java index 1c394bb8b..f4ff2f58b 100644 --- a/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java +++ b/src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java @@ -39,7 +39,7 @@ public class MainMenuButtons { private static boolean alreadyLoaded = false; public static void addButtons(GuiMainMenu to, List buttonList, boolean resize) { - GuiButton exportButton = new GuiButton(EXPORT_BUTTON_ID, to.width / 2 + 104, to.height / 4 + 48 + 48, 20, 20, "!"); + GuiButton exportButton = new GuiButton(EXPORT_BUTTON_ID, to.width / 2 + 104, to.height / 4 + 48 + 48, 100, 20, "§cExport to Artemis"); buttonList.add(exportButton); if (!CoreDBConfig.INSTANCE.addMainMenuButton) return; diff --git a/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java b/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java index 9788c6cbc..a0eab02ac 100644 --- a/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java +++ b/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java @@ -19,11 +19,15 @@ public class ExportScreen extends GuiScreen { private String line1; private String line2; private String line3; + private String line4; + private String line5; public ExportScreen() { - line1 = "Wynncraft will be phasing out 1.12 by the end of this year."; + line1 = "Wynncraft will be phasing out 1.12 by the end of this year (2023)."; line2 = "We highly recommend updating to Artemis (1.20.2) as soon as you can."; line3 = "Waypoints and favorites can be exported using the buttons below."; + line4 = "This will save them to your clipboard, either save them to a text"; + line5 = "editor to import later or immediately import into Artemis."; } @Override @@ -49,6 +53,8 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { add(line1); add(line2); add(line3); + add(line4); + add(line5); }}; int spacing = this.fontRenderer.FONT_HEIGHT + 2; // 11 From d719f371f95f22558227d116413cd5a16cbe89d3 Mon Sep 17 00:00:00 2001 From: Jamie Date: Sat, 4 Nov 2023 10:38:12 +0000 Subject: [PATCH 5/5] chore: Change modrinth link and remove 1.20.2 mention --- .../com/wynntils/modules/core/overlays/ui/ExportScreen.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java b/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java index a0eab02ac..ec4708a1e 100644 --- a/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java +++ b/src/main/java/com/wynntils/modules/core/overlays/ui/ExportScreen.java @@ -24,7 +24,7 @@ public class ExportScreen extends GuiScreen { public ExportScreen() { line1 = "Wynncraft will be phasing out 1.12 by the end of this year (2023)."; - line2 = "We highly recommend updating to Artemis (1.20.2) as soon as you can."; + line2 = "We highly recommend updating to Wynntils Artemis as soon as you can."; line3 = "Waypoints and favorites can be exported using the buttons below."; line4 = "This will save them to your clipboard, either save them to a text"; line5 = "editor to import later or immediately import into Artemis."; @@ -72,7 +72,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) { for (GuiButton button : buttonList) { if (button.isMouseOver()) { if (button.id == 0) { - drawHoveringText("Open a link to the Artemis Modrinth page", mouseX, mouseY); + drawHoveringText("Open a link to the Wynntils Artemis Modrinth page", mouseX, mouseY); } else if (button.id == 1) { drawHoveringText("Copy your favorites to your clipboard", mouseX, mouseY); } else if (button.id == 2) { @@ -102,7 +102,7 @@ public void actionPerformed(GuiButton button) { // Cancel McIf.mc().displayGuiScreen(null); } else if (button.id == 0) { - Utils.openUrl("https://modrinth.com/mod/wynntils/version/latest"); + Utils.openUrl("https://modrinth.com/mod/wynntils/"); } } }