Skip to content

Commit

Permalink
[FIX] Remove deprecated 'new URL'
Browse files Browse the repository at this point in the history
  • Loading branch information
@gravit0
gravit0 committed Mar 8, 2024
1 parent aba0b84 commit 22288f2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
8 changes: 5 additions & 3 deletions ...Helper_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/ClientDownloader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
Expand All @@ -16,7 +18,7 @@ public static JsonObject gainClient(String mc) throws IOException {
try {
String workURL = null;
JsonObject obj = GSON.fromJson(
IOHelper.request(new URL("https://launchermeta.mojang.com/mc/game/version_manifest.json")),
IOHelper.request(new URI("https://launchermeta.mojang.com/mc/game/version_manifest.json").toURL()),
JsonObject.class);
if (obj.has("versions") && obj.get("versions").isJsonArray())
for (JsonElement el : obj.get("versions").getAsJsonArray())
Expand All @@ -29,11 +31,11 @@ public static JsonObject gainClient(String mc) throws IOException {
workURL = el.getAsJsonObject().get("url").getAsString();
}
if (workURL != null) {
obj = GSON.fromJson(IOHelper.request(new URL(workURL)), JsonObject.class);
obj = GSON.fromJson(IOHelper.request(new URI(workURL).toURL()), JsonObject.class);
return obj;
}
throw new IOException("Client not found");
} catch (JsonSyntaxException | MalformedURLException e) {
} catch (JsonSyntaxException | MalformedURLException | URISyntaxException e) {
throw new RuntimeException(e);
}
}
Expand Down
13 changes: 7 additions & 6 deletions MirrorHelper_module/src/main/java/pro/gravit/launchermodules/mirrorhelper/InstallClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import pro.gravit.utils.helper.LogHelper;

import java.io.*;
import java.net.URI;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
Expand Down Expand Up @@ -59,10 +60,10 @@ public static void installMod(CurseforgeAPI api, Path modsDir, long modId, Clien
var modInfo = api.fetchModById(modId);
long fileId = modInfo.findFileIdByGameVersion(version.toString());
var fileInfo = api.fetchModFileById(modId, fileId);
URL url = new URL(fileInfo.downloadUrl());
URI url = new URI(fileInfo.downloadUrl());
Path path = modsDir.resolve(fileInfo.fileName().replace("+", "-"));
logger.info("Download {} {} into {}", fileInfo.fileName(), url, path);
try (InputStream input = IOHelper.newInput(url)) {
try (InputStream input = IOHelper.newInput(url.toURL())) {
IOHelper.transfer(input, path);
}
logger.info("{} downloaded", fileInfo.fileName());
Expand All @@ -84,10 +85,10 @@ public static void installMod(ModrinthAPI api, Path modsDir, String slug, String
if(file == null) {
throw new RuntimeException("Mod '%s' not found suitable file".formatted(slug));
}
URL url = new URL(file.url());
URI url = new URI(file.url());
Path path = modsDir.resolve(file.filename().replace("+", "-"));
logger.info("Download {} {} into {}", file.filename(), url, path);
try (InputStream input = IOHelper.newInput(url)) {
try (InputStream input = IOHelper.newInput(url.toURL())) {
IOHelper.transfer(input, path);
}
logger.info("{} downloaded", file.filename());
Expand Down Expand Up @@ -119,7 +120,7 @@ private void downloadVanillaTo(Path clientDir) throws Exception {
.map(y -> new Downloader.SizedFile(y.url, y.path, y.size)).collect(Collectors.toList());
var downloader = Downloader.downloadList(applies, null, clientDir.resolve("libraries"), null, e, 4);
if (info.client != null) {
IOHelper.transfer(IOHelper.newInput(new URL(info.client.url)), clientDir.resolve("minecraft.jar"));
IOHelper.transfer(IOHelper.newInput(new URI(info.client.url).toURL()), clientDir.resolve("minecraft.jar"));
}
LogHelper.subInfo("Downloaded client jar!");
downloader.getFuture().get();
Expand All @@ -130,7 +131,7 @@ private void downloadVanillaTo(Path clientDir) throws Exception {

private void fetchNatives(Path resolve, List<ClientDownloader.Artifact> natives) {
for (ClientDownloader.Artifact a : natives) {
try (ZipInputStream z = IOHelper.newZipInput(new URL(a.url))) {
try (ZipInputStream z = IOHelper.newZipInput(new URI(a.url).toURL())) {
ZipEntry e = z.getNextEntry();
while (e != null) {
if (!e.isDirectory() && !e.getName().startsWith("META-INF") && !e.getName().startsWith("/META-INF")) {
Expand Down
9 changes: 5 additions & 4 deletions .../src/main/java/pro/gravit/launchermodules/mirrorhelper/commands/LwjglDownloadCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import pro.gravit.utils.helper.JVMHelper;

import java.io.*;
import java.net.URI;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -87,13 +88,13 @@ public void invoke(String... args) throws Exception {
.concat("/")
.concat(version)
.concat("/");
URL jarUrl = new URL(prepareUrl
.concat("%s-%s.jar".formatted(component, version)));
URL jarUrl = new URI(prepareUrl
.concat("%s-%s.jar".formatted(component, version))).toURL();
logger.info("Download {} to {}", jarUrl, jarPath);
download(jarUrl, jarPath);
for (String arch : archs) {
URL nativesUrl = new URL(prepareUrl
.concat("%s-%s-natives-%s.jar".formatted(component, version, arch)));
URL nativesUrl = new URI(prepareUrl
.concat("%s-%s-natives-%s.jar".formatted(component, version, arch))).toURL();
var pair = getFromLwjglNativeName(arch);
Path nativesPath = natives.resolve(pair.os.name.toLowerCase()).resolve(pair.arch.name.toLowerCase());
IOHelper.createParentDirs(nativesPath);
Expand Down
3 changes: 2 additions & 1 deletion ...c/main/java/pro/gravit/launchermodules/mirrorhelper/installers/ForgeInstallerCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import pro.gravit.utils.helper.IOHelper;

import java.io.*;
import java.net.URI;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
Expand Down Expand Up @@ -81,7 +82,7 @@ public void invoke(String... args) throws Exception {
Path file = dir.resolve("tmp").resolve(info.downloads.artifact.path);
IOHelper.createParentDirs(file);
logger.debug("Download {}", info.downloads.artifact.url);
try (InputStream stream = IOHelper.newInput(new URL(info.downloads.artifact.url))) {
try (InputStream stream = IOHelper.newInput(new URI(info.downloads.artifact.url).toURL())) {
try (OutputStream output = IOHelper.newOutput(file)) {
IOHelper.transfer(stream, output);
}
Expand Down
6 changes: 4 additions & 2 deletions .../src/main/java/pro/gravit/launchermodules/unsafecommands/commands/ClassLoaderCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import pro.gravit.utils.helper.LogHelper;

import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Paths;
import java.util.Arrays;
Expand Down Expand Up @@ -58,8 +60,8 @@ public URL[] getURL(String s) {
String[] splits = s.split(";");
return Arrays.stream(splits).map((e) -> {
try {
return new URL(e);
} catch (MalformedURLException ex) {
return new URI(e);
} catch (URISyntaxException ex) {
LogHelper.error(ex);
return null;
}
Expand Down

0 comments on commit 22288f2

Please sign in to comment.