From ef3fe01a322cd63a9f99b2e53426793c1c9dd0d3 Mon Sep 17 00:00:00 2001 From: sirjonasxx <36828922+sirjonasxx@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:53:35 +0200 Subject: [PATCH] Update StoreFetch.java --- .../extensionstore/repository/StoreFetch.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java index 332de50..55ef2d4 100644 --- a/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java +++ b/G-Earth/src/main/java/gearth/services/internal_extensions/extensionstore/repository/StoreFetch.java @@ -1,5 +1,6 @@ package gearth.services.internal_extensions.extensionstore.repository; +import gearth.Main; import gearth.services.internal_extensions.extensionstore.repository.models.StoreData; import org.apache.commons.io.IOUtils; import org.json.JSONArray; @@ -17,16 +18,24 @@ public class StoreFetch { } + public static void fetch(StoreFetchListener storeFetchListener) { + fetch(Main.version, storeFetchListener, "sirjonasxx/G-ExtensionStore"); + } + public static void fetch(String version, StoreFetchListener storeFetchListener) { + fetch(version, storeFetchListener, "sirjonasxx/G-ExtensionStore"); + } + + public static void fetch(String version, StoreFetchListener storeFetchListener, String source) { new Thread(() -> { try { JSONObject config = new JSONObject(IOUtils.toString( - new URL(String.format("https://raw.githubusercontent.com/sirjonasxx/G-ExtensionStore/repo/%s/store/config.json", version)) + new URL(String.format("https://raw.githubusercontent.com/%s/repo/%s/store/config.json", source, version)) .openStream(), StandardCharsets.UTF_8)); JSONArray exensions = new JSONArray(IOUtils.toString( - new URL(String.format("https://raw.githubusercontent.com/sirjonasxx/G-ExtensionStore/repo/%s/.auto-generated/extensions.json", version)) + new URL(String.format("https://raw.githubusercontent.com/%s/repo/%s/.auto-generated/extensions.json", source, version)) .openStream(), StandardCharsets.UTF_8)); storeFetchListener.success(new StoreRepository(new StoreData(config, exensions), version));