From 78237d9c802909308420dc0676ac848e93ab2a41 Mon Sep 17 00:00:00 2001
From: Merith-TK <merith.tk@gmail.com>
Date: Tue, 9 Aug 2022 17:39:31 -0700
Subject: [PATCH] remove broken urls
---
src/main/net/mc/main/Main.java | 112 +++++++++---------
.../minecraft/launcher/LauncherConstants.java | 2 +-
.../minecraft/launcher/ui/LauncherPanel.java | 2 +-
3 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/src/main/net/mc/main/Main.java b/src/main/net/mc/main/Main.java
index 1cb1cbb..5c1a0a1 100644
--- a/src/main/net/mc/main/Main.java
+++ b/src/main/net/mc/main/Main.java
@@ -47,13 +47,13 @@ public class Main {
public static String cbuttonlink = "https://launcher.skaia.us";
public static String sButton = "Support Ticket";
public static String sLink = "https://skaiacraft.net/support";
- public static String npg = "http://merovingian861628905.skaia.us/news3000.htm";
+ public static String npg = "http://486.merith.xyz/obsidian/";
public static List<String> dnames = new ArrayList();
- public static String[] urls = new String[]{"merovingian861628905.skaia.us", "merovingian861628905.skaiacraft.net", "merovingian861628905.413.io"};
- public static String bUrl = "http://merovingian861628905.skaia.us/";
- public static String bUrl2 = "merovingian861628905.skaia.us";
- public static String backupBaseURL = "http://merovingian861628905.413.io/";
- public static String backupBaseURL2 = "merovingian861628905.413.io";
+ public static String[] urls = new String[]{"486.merith.xyz/obsidian"};
+// public static String bUrl = "http://486.merith.xyz/obsidian/";
+// public static String bUrl2 = "http://486.merith.xyz/obsidian/";
+// public static String backupBaseURL = "http://486.merith.xyz/obsidian/";
+// public static String backupBaseURL2 = "486.merith.xyz/obsidian";
private static JFrame frame;
private static File workingDirectory;
private static Proxy proxy;
@@ -65,60 +65,60 @@ public class Main {
new Launcher(frame, workingDirectory, proxy, passwordAuthentication, argss, 100);
}
- public static void checkUpdates() {
- try {
- URL url;
- if (isReachable(bUrl2)) {
- System.out.println("Using default URL.");
- url = new URL(bUrl + "version.php");
- } else {
- System.out.println("Could not reach " + bUrl + ". Trying to reach old URL.");
- if (!isReachable(backupBaseURL2)) {
- System.out.println("Could not reach backup URL. Exiting update check sequence.");
- isLatest = true;
- return;
- }
+// public static void checkUpdates() {
+// try {
+// URL url;
+// if (isReachable(bUrl2)) {
+// System.out.println("Using default URL.");
+// url = new URL(bUrl + "version.php");
+// } else {
+// System.out.println("Could not reach " + bUrl + ". Trying to reach old URL.");
+// if (!isReachable(backupBaseURL2)) {
+// System.out.println("Could not reach backup URL. Exiting update check sequence.");
+// isLatest = true;
+// return;
+// }
- System.out.println("Using backup URL.");
- url = new URL(backupBaseURL + "version.php");
- }
+// System.out.println("Using backup URL.");
+// url = new URL(backupBaseURL + "version.php");
+// }
- URLConnection yc = url.openConnection();
- yc.addRequestProperty("User-Agent", "Mozilla/4.76");
- BufferedReader in = new BufferedReader(new InputStreamReader(yc.getInputStream()));
+// URLConnection yc = url.openConnection();
+// yc.addRequestProperty("User-Agent", "Mozilla/4.76");
+// BufferedReader in = new BufferedReader(new InputStreamReader(yc.getInputStream()));
- String inputLine;
- for(int i = 0; (inputLine = in.readLine()) != null; ++i) {
- if (i == 0) {
- newestv = inputLine;
- } else if (i == 1) {
- wherenewv = inputLine;
- } else if (i == 2) {
- updateurl = inputLine;
- } else if (i == 3) {
- cbuttontext = inputLine;
- } else if (i == 4) {
- cbuttonlink = inputLine;
- } else if (i == 5) {
- sButton = inputLine;
- } else if (i == 6) {
- sLink = inputLine;
- }
- }
+// String inputLine;
+// for(int i = 0; (inputLine = in.readLine()) != null; ++i) {
+// if (i == 0) {
+// newestv = inputLine;
+// } else if (i == 1) {
+// wherenewv = inputLine;
+// } else if (i == 2) {
+// updateurl = inputLine;
+// } else if (i == 3) {
+// cbuttontext = inputLine;
+// } else if (i == 4) {
+// cbuttonlink = inputLine;
+// } else if (i == 5) {
+// sButton = inputLine;
+// } else if (i == 6) {
+// sLink = inputLine;
+// }
+// }
- in.close();
- if (!newestv.equalsIgnoreCase(currentv)) {
- System.out.println(newestv);
- System.out.println(currentv);
- isLatest = false;
- } else {
- isLatest = true;
- }
- } catch (IOException var5) {
- isLatest = true;
- }
+// in.close();
+// if (!newestv.equalsIgnoreCase(currentv)) {
+// System.out.println(newestv);
+// System.out.println(currentv);
+// isLatest = false;
+// } else {
+// isLatest = true;
+// }
+// } catch (IOException var5) {
+// isLatest = true;
+// }
- }
+// }
public static void startMC(String[] args) throws IOException {
String[] var4 = args;
@@ -214,7 +214,7 @@ public class Main {
}
lh.load(lang);
- checkUpdates();
+ //checkUpdates();
if (!isLatest) {
Object[] options1 = new Object[]{Language.get("button.ok"), Language.get("button.update"), Language.get("button.cancel")};
JPanel panel = new JPanel();
diff --git a/src/main/net/minecraft/launcher/LauncherConstants.java b/src/main/net/minecraft/launcher/LauncherConstants.java
index 4f1294a..9f8a6a2 100644
--- a/src/main/net/minecraft/launcher/LauncherConstants.java
+++ b/src/main/net/minecraft/launcher/LauncherConstants.java
@@ -22,7 +22,7 @@ public class LauncherConstants {
public static final String URL_DOWNLOAD_BASE = "https://s3.amazonaws.com/Minecraft.Download/";
public static final String URL_RESOURCE_BASE = "http://resources.download.minecraft.net/";
public static final String URL_LIBRARY_BASE = "https://libraries.minecraft.net/";
- public static final String URL_BLOG = "http://launchernewsx.skaia.us";
+ public static final String URL_BLOG = "http://486.merith.xyz/obsidian/";
public static final String URL_SUPPORT = "https://skaiacraft.net/support";
public static final String URL_STATUS_CHECKER = "http://status.mojang.com/check";
public static final int UNVERSIONED_BOOTSTRAP_VERSION = 0;
diff --git a/src/main/net/minecraft/launcher/ui/LauncherPanel.java b/src/main/net/minecraft/launcher/ui/LauncherPanel.java
index 53d721d..e554abe 100644
--- a/src/main/net/minecraft/launcher/ui/LauncherPanel.java
+++ b/src/main/net/minecraft/launcher/ui/LauncherPanel.java
@@ -42,7 +42,7 @@ public class LauncherPanel extends JPanel {
protected JPanel createLauncherInterface() {
JPanel result = new JPanel(new BorderLayout());
- this.tabPanel.getBlog().setPage("http://launchernewsx.skaia.us");
+ this.tabPanel.getBlog().setPage("http://486.merith.xyz/obsidian");
this.tabPanel.ggg().setPage(Main.npg);
boolean javaBootstrap = this.getMinecraftLauncher().getBootstrapVersion() < 100;
boolean upgradableOS = OperatingSystem.getCurrentPlatform() == OperatingSystem.WINDOWS;