From 3201e66a0a7d00f6ecd06662b8a6ff5a110fc2c8 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Thu, 15 Dec 2022 19:56:52 +0100 Subject: [PATCH] Update links --- .github/FUNDING.yml | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- README.md | 2 +- .../wurstclient/options/WurstOptionsScreen.java | 17 +++++++++-------- .../other_features/ChangelogOtf.java | 3 ++- .../serverfinder/ServerFinderScreen.java | 2 +- .../java/net/wurstclient/update/Version.java | 2 +- .../net/wurstclient/update/WurstUpdater.java | 16 ++++++++++++---- .../net/wurstclient/util/ForceOpDialog.java | 3 +-- src/main/resources/fabric.mod.json | 13 +++++++++++-- 10 files changed, 40 insertions(+), 22 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index a7eb43fc..607060a1 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ # These are supported funding model platforms -custom: https://www.wurstclient.net/donate/ +custom: https://www.wurstclient.net/donate/?utm_source=GitHub&utm_medium=Wurst7&utm_campaign=GitHub+Sponsors&utm_content=Sponsor+this+project diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index ff9046c0..e91fc221 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -4,5 +4,5 @@ contact_links: url: https://www.reddit.com/r/WurstClient/ about: For general discussion, support, memes, etc. - name: Contact Alexander - url: https://www.wurstclient.net/contact/ + url: https://www.wurstclient.net/contact/?utm_source=GitHub&utm_medium=Wurst7&utm_campaign=Issues&utm_content=Contact+Alexander about: For anything that shouldn't be public. diff --git a/README.md b/README.md index d01309d0..21999899 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Downloads (for users) -https://www.wurstclient.net/download/ +[https://www.wurstclient.net/download/](https://www.wurstclient.net/download/?utm_source=GitHub&utm_medium=Wurst7&utm_campaign=README.md&utm_content=Downloads+%28for+users%29) ## Setup (for developers) diff --git a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java index 324e51f9..633fe0ef 100644 --- a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java +++ b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java @@ -121,21 +121,22 @@ public class WurstOptionsScreen extends Screen OperatingSystem os = Util.getOperatingSystem(); new WurstOptionsButton(54, 24, () -> "Official Website", - "WurstClient.net", b -> os.open("https://www.wurstclient.net/")); + "WurstClient.net", b -> os.open( + "https://www.wurstclient.net/?utm_source=Wurst+Client&utm_medium=Wurst+Options&utm_content=Official+Website")); - new WurstOptionsButton(54, 48, () -> "Wurst Wiki", - "Wiki.WurstClient.net", - b -> os.open("https://wiki.wurstclient.net/")); + new WurstOptionsButton(54, 48, () -> "Wurst Wiki", "Wurst.Wiki", + b -> os.open( + "https://wurst.wiki/?utm_source=Wurst+Client&utm_medium=Wurst+Options&utm_content=Wurst+Wiki")); new WurstOptionsButton(54, 72, () -> "Twitter", "@Wurst_Imperium", - b -> os.open("https://twitter.com/Wurst_Imperium")); + b -> os.open("https://www.wurstclient.net/twitter/")); new WurstOptionsButton(54, 96, () -> "Reddit", "r/WurstClient", - b -> os.open("https://www.reddit.com/r/WurstClient/")); + b -> os.open("https://www.wurstclient.net/reddit/")); new WurstOptionsButton(54, 120, () -> "Donate", - "paypal.me/WurstImperium", - b -> os.open("https://www.wurstclient.net/donate/")); + "WurstClient.net/donate", b -> os.open( + "https://www.wurstclient.net/donate/?utm_source=Wurst+Client&utm_medium=Wurst+Options&utm_content=Donate")); } @Override diff --git a/src/main/java/net/wurstclient/other_features/ChangelogOtf.java b/src/main/java/net/wurstclient/other_features/ChangelogOtf.java index a5bf322b..7fcc650d 100644 --- a/src/main/java/net/wurstclient/other_features/ChangelogOtf.java +++ b/src/main/java/net/wurstclient/other_features/ChangelogOtf.java @@ -33,7 +33,8 @@ public final class ChangelogOtf extends OtherFeature @Override public void doPrimaryAction() { - String link = new Version(WurstClient.VERSION).getChangelogLink(); + String link = new Version(WurstClient.VERSION).getChangelogLink() + + "?utm_source=Wurst+Client&utm_medium=ChangelogOtf&utm_content=View+Changelog"; Util.getOperatingSystem().open(link); } } diff --git a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java index 1ec76f2f..cfccccf0 100644 --- a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java @@ -53,7 +53,7 @@ public class ServerFinderScreen extends Screen addDrawableChild(ButtonWidget.builder(Text.literal("Tutorial"), b -> Util.getOperatingSystem().open( - "https://www.wurstclient.net/wiki/Special_Features/Server_Finder/")) + "https://www.wurstclient.net/serverfinder-tutorial/")) .dimensions(width / 2 - 100, height / 4 + 120 + 12, 200, 20) .build()); diff --git a/src/main/java/net/wurstclient/update/Version.java b/src/main/java/net/wurstclient/update/Version.java index b307b36a..f0e5f576 100644 --- a/src/main/java/net/wurstclient/update/Version.java +++ b/src/main/java/net/wurstclient/update/Version.java @@ -139,7 +139,7 @@ public final class Version implements Comparable public String getChangelogLink() { - String version = major + "-" + minor; + String version = major + "-" + minor + "-" + patch; if(isPreRelease()) version += "pre" + preRelease; diff --git a/src/main/java/net/wurstclient/update/WurstUpdater.java b/src/main/java/net/wurstclient/update/WurstUpdater.java index 2338c589..c6c36467 100644 --- a/src/main/java/net/wurstclient/update/WurstUpdater.java +++ b/src/main/java/net/wurstclient/update/WurstUpdater.java @@ -7,6 +7,9 @@ */ package net.wurstclient.update; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; + import net.minecraft.text.ClickEvent; import net.minecraft.text.Text; import net.wurstclient.WurstClient; @@ -84,7 +87,8 @@ public final class WurstUpdater implements UpdateListener { String text = "An error occurred while checking for updates." + " Click \u00a7nhere\u00a7r to check manually."; - String url = "https://www.wurstclient.net/download/"; + String url = + "https://www.wurstclient.net/download/?utm_source=Wurst+Client&utm_medium=WurstUpdater+chat+message&utm_content=An+error+occurred+while+checking+for+updates."; showLink(text, url); return; } @@ -92,9 +96,13 @@ public final class WurstUpdater implements UpdateListener if(!outdated) return; - String text = "Wurst " + latestVersion + " is now available." - + " Click \u00a7nhere\u00a7r to download the update."; - String url = "https://www.wurstclient.net/download/"; + String textPart1 = "Wurst " + latestVersion + " MC" + + WurstClient.MC_VERSION + " is now available."; + String text = + textPart1 + " Click \u00a7nhere\u00a7r to download the update."; + String url = + "https://www.wurstclient.net/download/?utm_source=Wurst+Client&utm_medium=WurstUpdater+chat+message&utm_content=" + + URLEncoder.encode(textPart1, StandardCharsets.UTF_8); showLink(text, url); } diff --git a/src/main/java/net/wurstclient/util/ForceOpDialog.java b/src/main/java/net/wurstclient/util/ForceOpDialog.java index 2cb192ab..9d1f890f 100644 --- a/src/main/java/net/wurstclient/util/ForceOpDialog.java +++ b/src/main/java/net/wurstclient/util/ForceOpDialog.java @@ -178,8 +178,7 @@ public class ForceOpDialog extends JDialog { try { - String howToLink = - "https://www.wurstclient.net/Mods/Force_OP_(AuthMeCracker)/"; + String howToLink = "https://www.wurstclient.net/forceop-tutorial/"; Desktop.getDesktop().browse(URI.create(howToLink)); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c95c11e5..5f81bba4 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -9,8 +9,9 @@ "Alexander01998" ], "contact": { - "homepage": "https://www.wurstclient.net/", - "sources": "https://www.wurstclient.net/github/" + "homepage": "https://www.wurstclient.net/?utm_source=Wurst+Client&utm_medium=ModMenu&utm_content=Website", + "issues": "https://www.wurstclient.net/wurst7issues/", + "sources": "https://www.wurstclient.net/wurst7sources/" }, "license": "GPL-3.0-or-later", @@ -39,5 +40,13 @@ "breaks": { "wi_zoom": "*", "wi-zoom": "*" + }, + "custom": { + "modmenu": { + "links": { + "Wiki": "https://wurst.wiki/?utm_source=Wurst+Client&utm_medium=ModMenu&utm_content=Wiki", + "Donate": "https://www.wurstclient.net/donate/?utm_source=Wurst+Client&utm_medium=ModMenu&utm_content=Donate" + } + } } }