Merge pull request #51 from xming-cn/main

Remove Hardcoded Data Source, custom data source support, Closes #50

Author: kiranhart

.gitignore

@@ -1,3 +1,3 @@
 /target/
 /src/test/
-/.idea/
+.idea/

.idea/.gitignore

@@ -46,6 +46,8 @@
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
@@ -205,11 +207,13 @@ public void downloadHeads() {
 	public List<Skull> performHeadDownload(boolean silentDownload) {
 		final List<Skull> skulls = new ArrayList<>();
 
-		final String DOWNLOAD_URL = "https://raw.githubusercontent.com/Tweetzy/Data-Files/main/Skulls/skulls.json";
+		final String DOWNLOAD_URL = Settings.SKULLS_DATA_SOURCE_URL.getString();
 
 		try {
 			long start = System.nanoTime();
-			final JsonArray json = getJsonFromUrl(DOWNLOAD_URL);
+			final JsonArray json = DOWNLOAD_URL.startsWith("file://")
+					? getJsonFromFile(DOWNLOAD_URL.substring(7))
+					: getJsonFromUrl(DOWNLOAD_URL);
 			json.forEach(jsonElement -> {
 				final JsonObject jsonObject = jsonElement.getAsJsonObject();
 				final BaseCategory category = BaseCategory.getById(replace(jsonObject.get("category").toString()));
@@ -253,6 +257,11 @@ private JsonArray getJsonFromUrl(final String url) throws IOException {
 		return (JsonArray) parser.parse(builder.toString());
 	}
 
+	private JsonArray getJsonFromFile(String filePath) throws IOException {
+		String content = new String(Files.readAllBytes(Paths.get(filePath)));
+		return JsonParser.parseString(content).getAsJsonArray();
+	}
+
 	private String replace(String in) {
 		return in.replace("\"", "");
 	}

.idea/compiler.xml

@@ -37,6 +37,7 @@ public final class Settings extends FlightSettings {
 	public static final ConfigEntry LANG = create("language", "english").withComment("Default language file");
 	public static final ConfigEntry PREFIX = create("prefix", "<GRADIENT:DD5E89>&lSkulls</GRADIENT:fbc7d4>&r &8»").withComment("Prefix to be used in chat");
 	public static final ConfigEntry CHARGE_FOR_HEADS = create("charge for heads", true).withComment("Should skulls charge users without permission for heads?");
+	public static final ConfigEntry SKULLS_DATA_SOURCE_URL = create("skulls data source url", "https://raw.githubusercontent.com/Tweetzy/Data-Files/main/Skulls/skulls.json").withComment("Skulls data source, might be a mirror");
 	public static final ConfigEntry ECONOMY = create("economy", "Vault").withComment("You can use Vault or Item");
 	public static final ConfigEntry ITEM_ECONOMY_ITEM = create("item economy item", CompMaterial.GOLD_INGOT.name());
 	public static final ConfigEntry MAIN_MENU_REQUIRES_NO_PERM = create("main menu requires no permission", true);