Skip to content
This repository has been archived by the owner on Aug 8, 2024. It is now read-only.

Commit

Permalink
feat: Export favorites and waypoints from update available screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShadowCat117
ShadowCat117 committed Nov 2, 2023
1 parent 93739e0 commit 493229a
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 32 deletions.
7 changes: 1 addition & 6 deletions src/main/java/com/wynntils/modules/core/instances/MainMenuButtons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,7 @@ public static void actionPerformed(GuiMainMenu on, GuiButton button, List<GuiBut
}

private static void clickedWynncraftButton(ServerData server, GuiScreen backGui) {
if (hasUpdate()) {
McIf.mc().displayGuiScreen(new UpdateAvailableScreen(server));
} else {
WebManager.skipJoinUpdate();
ServerUtils.connect(backGui, server);
}
McIf.mc().displayGuiScreen(new UpdateAvailableScreen(server));
}

private static boolean hasUpdate() {
Expand Down
60 changes: 34 additions & 26 deletions src/main/java/com/wynntils/modules/core/overlays/ui/UpdateAvailableScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,19 @@

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;
Expand All @@ -21,35 +28,32 @@

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 = "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 + ")";
}
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, "View changelog"));
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, "Update now"));
this.buttonList.add(new GuiButton(2, this.width / 2 + 2, y, 98, 20, "Update at exit"));
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, 98, 20, "Ignore update"));
this.buttonList.add(new GuiButton(3, this.width / 2 - 100, y, 98, 20, "Continue"));
this.buttonList.add(new GuiButton(4, this.width / 2 + 2, y, 98, 20, "Cancel"));
}

Expand All @@ -60,7 +64,7 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
List<String> lines = new ArrayList<String>() {{
add(line1);
add(line2);
add("Update now or when leaving Minecraft?");
add(line3);
}};

int spacing = this.fontRenderer.FONT_HEIGHT + 2; // 11
Expand All @@ -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);
}
Expand All @@ -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<String> 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();
Expand All @@ -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");
}
}

Expand Down

0 comments on commit 493229a

Please sign in to comment.