Anvilcraft/modpacktools
4
0
Fork 0
mirror of https://github.com/Anvilcraft/modpacktools synced 2024-09-30 04:59:05 +02:00
Code Issues Releases Wiki Activity

Moved ModInfo outside Commands.java

Browse source
This commit is contained in:
Timo Ley 2020-05-02 11:20:51 +02:00
parent a58a45ead0
commit 3a62436ecd
2 changed files with 88 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/main/java/ley/anvil/modpacktools/Commands.java
View file

@ -2,6 +2,7 @@ package ley.anvil.modpacktools;
import com.google.gson.*; import com.google.gson.*;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import ley.anvil.modpacktools.util.ModInfo;
import ley.anvil.modpacktools.util.Util; import ley.anvil.modpacktools.util.Util;
import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVPrinter; import org.apache.commons.csv.CSVPrinter;
@ -95,7 +96,7 @@ public class Commands {
try(CSVPrinter printer = new CSVPrinter(new FileWriter(csvFile), CSVFormat.EXCEL.withDelimiter(';'))) { try(CSVPrinter printer = new CSVPrinter(new FileWriter(csvFile), CSVFormat.EXCEL.withDelimiter(';'))) {
printer.printRecord("Name", "Authors", "Link", "Downloads", "ID"); printer.printRecord("Name", "Authors", "Link", "Downloads", "ID");
printer.println(); printer.println();
ArrayList<ModInfo> modlist = getModInfo(); ArrayList<ModInfo> modlist = ModInfo.getModInfo();
Collections.sort(modlist, Comparator.comparing(ModInfo :: getName)); Collections.sort(modlist, Comparator.comparing(ModInfo :: getName));
for(ModInfo mod : modlist) { for(ModInfo mod : modlist) {
String name = mod.getName(); String name = mod.getName();
@ -122,78 +123,7 @@ public class Commands {
System.out.println("Expected Either HTML or CSV as format"); System.out.println("Expected Either HTML or CSV as format");
} }
} }
private class ModInfo {
private String name;
private JsonArray authors;
@SerializedName("websiteUrl")
private String link;
@SerializedName("downloadCount")
private int downloads;
private int id;
private ModInfo(String name, JsonArray authors, String link, int downloads, int id) {
this.name = name;
this.authors = authors;
this.link = link;
this.downloads = downloads;
this.id = id;
}
public String getName() {
return name;
}
public String[] getAuthors() {
ArrayList<String> authorArr = new ArrayList<>();
for(JsonElement author : authors) {
JsonObject authorObj = (JsonObject) author;
authorArr.add(authorObj.get("name").getAsString());
}
return authorArr.toArray(new String[authorArr.size()]);
}
public String getLink() {
return link;
}
public int getDownloads() {
return downloads;
}
public int getId() {
return id;
}
}
private static ArrayList<ModInfo> getModInfo() {
try {
System.out.println("Getting Info From Curse API");
File manifestFile = new File(Main.CONFIG.JAR_LOCATION, Main.CONFIG.CONFIG.get("manifestFile").getAsString());
//Read manifest
JsonObject manifest = Util.readJsonFile(manifestFile);
JsonArray files = manifest.getAsJsonArray("files");
ArrayList<Integer> fileIds = new ArrayList<>();
for(JsonElement file : files) {
fileIds.add(((JsonObject) file).get("projectID").getAsInt());
}
String responseStr = Util.httpPostString(new URL("https://addons-ecs.forgesvc.net/api/v2/addon"),
fileIds.toString(),
"application/json; utf-8",
"application/json");
JsonArray response = (JsonArray) JsonParser.parseString(responseStr);
ArrayList<ModInfo> modInfos = new ArrayList<>();
Gson gson = new Gson();
for(JsonElement mod : response) {
modInfos.add(gson.fromJson(mod, ModInfo.class));
}
return modInfos;
} catch(MalformedURLException e) {
e.printStackTrace();
}
return null;
}
//Commands for users (available outside a modpack dev environment) //Commands for users (available outside a modpack dev environment)

86
src/main/java/ley/anvil/modpacktools/util/ModInfo.java Normal file
View file

@ -0,0 +1,86 @@
package ley.anvil.modpacktools.util;
import com.google.gson.*;
import com.google.gson.annotations.SerializedName;
import ley.anvil.modpacktools.Commands;
import ley.anvil.modpacktools.Main;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
public class ModInfo {
private String name;
private JsonArray authors;
@SerializedName("websiteUrl")
private String link;
@SerializedName("downloadCount")
private int downloads;
private int id;
private ModInfo(String name, JsonArray authors, String link, int downloads, int id) {
this.name = name;
this.authors = authors;
this.link = link;
this.downloads = downloads;
this.id = id;
}
public String getName() {
return name;
}
public String[] getAuthors() {
ArrayList<String> authorArr = new ArrayList<>();
for(JsonElement author : authors) {
JsonObject authorObj = (JsonObject) author;
authorArr.add(authorObj.get("name").getAsString());
}
return authorArr.toArray(new String[authorArr.size()]);
}
public String getLink() {
return link;
}
public int getDownloads() {
return downloads;
}
public int getId() {
return id;
}
public static ArrayList<ModInfo> getModInfo() {
try {
System.out.println("Getting Info From Curse API");
File manifestFile = new File(Main.CONFIG.JAR_LOCATION, Main.CONFIG.CONFIG.get("manifestFile").getAsString());
//Read manifest
JsonObject manifest = Util.readJsonFile(manifestFile);
JsonArray files = manifest.getAsJsonArray("files");
ArrayList<Integer> fileIds = new ArrayList<>();
for(JsonElement file : files) {
fileIds.add(((JsonObject) file).get("projectID").getAsInt());
}
String responseStr = Util.httpPostString(new URL("https://addons-ecs.forgesvc.net/api/v2/addon"),
fileIds.toString(),
"application/json; utf-8",
"application/json");
JsonArray response = (JsonArray) JsonParser.parseString(responseStr);
ArrayList<ModInfo> modInfos = new ArrayList<>();
Gson gson = new Gson();
for(JsonElement mod : response) {
modInfos.add(gson.fromJson(mod, ModInfo.class));
}
return modInfos;
} catch(MalformedURLException e) {
e.printStackTrace();
}
return null;
}
}