Compare commits
No commits in common. "b3adbe61e86fb1a6f34d9395d610efeced5d6a45" and "8bbdd7a8188de591cf18c7624179f1e7be3a3efc" have entirely different histories.
b3adbe61e8
...
8bbdd7a818
@ -27,7 +27,7 @@ public class T2CBupdateCheckerGit {
|
|||||||
|
|
||||||
public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String gitKey) {
|
public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String gitKey) {
|
||||||
String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1";
|
String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1";
|
||||||
if (!T2CBlibConfig.getSeePreReleaseUpdates()) {
|
if (!T2CBlibConfig.getSeePreReleaseUpdates()){
|
||||||
RepoURL = RepoURL + "&pre-release=false";
|
RepoURL = RepoURL + "&pre-release=false";
|
||||||
}
|
}
|
||||||
String finalRepoURL = RepoURL;
|
String finalRepoURL = RepoURL;
|
||||||
@ -62,7 +62,6 @@ public class T2CBupdateCheckerGit {
|
|||||||
String formattedDate = outputFormat.format(parsedDate);
|
String formattedDate = outputFormat.format(parsedDate);
|
||||||
|
|
||||||
JSONArray downloadArray = obj.getJSONArray("assets");
|
JSONArray downloadArray = obj.getJSONArray("assets");
|
||||||
String gitURL = updateurl;
|
|
||||||
String downloadURL;
|
String downloadURL;
|
||||||
if (downloadArray.isEmpty()) {
|
if (downloadArray.isEmpty()) {
|
||||||
downloadURL = "https://www.spigotmc.org/resources/" + spigotID;
|
downloadURL = "https://www.spigotmc.org/resources/" + spigotID;
|
||||||
@ -75,7 +74,7 @@ public class T2CBupdateCheckerGit {
|
|||||||
updateurl = "https://www.spigotmc.org/resources/" + spigotID;
|
updateurl = "https://www.spigotmc.org/resources/" + spigotID;
|
||||||
}
|
}
|
||||||
|
|
||||||
T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, gitURL, prerelease);
|
T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, prerelease);
|
||||||
consumer.accept(webData);
|
consumer.accept(webData);
|
||||||
} catch (Exception var10) {
|
} catch (Exception var10) {
|
||||||
Boolean load = false;
|
Boolean load = false;
|
||||||
|
@ -17,13 +17,13 @@ public class T2CupdateAPI {
|
|||||||
public static HashMap<String, T2CupdateObject> pluginVersions = new HashMap<>();
|
public static HashMap<String, T2CupdateObject> pluginVersions = new HashMap<>();
|
||||||
|
|
||||||
public static void join(Plugin plugin, String prefix, String perm, Player player, Integer spigotID, String discord) {
|
public static void join(Plugin plugin, String prefix, String perm, Player player, Integer spigotID, String discord) {
|
||||||
if (pluginVersions.get(plugin.getName()) == null) {
|
if (pluginVersions.get(plugin.getName()) == null){
|
||||||
Bukkit.getScheduler().runTaskLaterAsynchronously(T2CodeLibMain.getPlugin(), new Runnable() {
|
Bukkit.getScheduler().runTaskLaterAsynchronously(T2CodeLibMain.getPlugin(), new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
join(plugin, prefix, perm, player, spigotID, discord);
|
join(plugin,prefix,perm,player,spigotID,discord);
|
||||||
}
|
}
|
||||||
}, 2 * 20L);
|
},2*20L);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -156,7 +156,7 @@ public class T2CupdateAPI {
|
|||||||
String updateButton;
|
String updateButton;
|
||||||
if (player) {
|
if (player) {
|
||||||
updateButton = "<br><dark_red>║</dark_red> <color:#5eff89><hover:show_text:'<gold>" + updateUpdate + "</gold>'><click:open_url:'" + updateUpdate
|
updateButton = "<br><dark_red>║</dark_red> <color:#5eff89><hover:show_text:'<gold>" + updateUpdate + "</gold>'><click:open_url:'" + updateUpdate
|
||||||
+ "'>Download</click></hover></color> <dark_gray>|</dark_gray> <color:#ff9499><hover:show_text:'" + updateDescription + "'><click:open_url:'" + webData.getGitURL() + "'>Update Description</click></hover></color>";
|
+ "'>Download</click></hover></color> <dark_gray>|</dark_gray> <color:#ff9499><hover:show_text:'" + updateDescription + "'>Update Description</hover></color>";
|
||||||
} else updateButton = "<br><dark_red>║</dark_red> <color:#5eff89>Download:</color> <gold>" + updateUpdate + "</gold>";
|
} else updateButton = "<br><dark_red>║</dark_red> <color:#5eff89>Download:</color> <gold>" + updateUpdate + "</gold>";
|
||||||
|
|
||||||
String text;
|
String text;
|
||||||
|
@ -102,7 +102,6 @@ public class T2CupdateCheckerGit {
|
|||||||
Date parsedDate = inputFormat.parse(date);
|
Date parsedDate = inputFormat.parse(date);
|
||||||
String formattedDate = outputFormat.format(parsedDate);
|
String formattedDate = outputFormat.format(parsedDate);
|
||||||
|
|
||||||
String gitURL = updateurl;
|
|
||||||
JSONArray downloadArray = obj.getJSONArray("assets");
|
JSONArray downloadArray = obj.getJSONArray("assets");
|
||||||
String downloadURL;
|
String downloadURL;
|
||||||
if (downloadArray.isEmpty()) {
|
if (downloadArray.isEmpty()) {
|
||||||
@ -116,7 +115,7 @@ public class T2CupdateCheckerGit {
|
|||||||
updateurl = "https://www.spigotmc.org/resources/" + spigotID;
|
updateurl = "https://www.spigotmc.org/resources/" + spigotID;
|
||||||
}
|
}
|
||||||
|
|
||||||
T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, gitURL, prerelease);
|
T2CupdateWebData webData = new T2CupdateWebData(UpdateName, tag_name, body, updateurl, formattedDate, downloadURL, prerelease);
|
||||||
consumer.accept(webData);
|
consumer.accept(webData);
|
||||||
} catch (Exception var10) {
|
} catch (Exception var10) {
|
||||||
Boolean load = false;
|
Boolean load = false;
|
||||||
|
@ -16,18 +16,15 @@ public class T2CupdateWebData {
|
|||||||
@Getter
|
@Getter
|
||||||
private String downloadURL;
|
private String downloadURL;
|
||||||
@Getter
|
@Getter
|
||||||
private String gitURL;
|
|
||||||
@Getter
|
|
||||||
private boolean preRelease;
|
private boolean preRelease;
|
||||||
|
|
||||||
public T2CupdateWebData(String updateTitle, String version, String updateDescription, String updateUrl, String publishedAt, String downloadURL, String gitURL, boolean preRelease) {
|
public T2CupdateWebData(String updateTitle, String version, String updateDescription, String updateUrl, String publishedAt, String downloadURL, boolean preRelease) {
|
||||||
this.updateTitle = updateTitle;
|
this.updateTitle = updateTitle;
|
||||||
this.version = version;
|
this.version = version;
|
||||||
this.updateDescription = updateDescription;
|
this.updateDescription = updateDescription;
|
||||||
this.updateUrl = updateUrl;
|
this.updateUrl = updateUrl;
|
||||||
this.publishedAt = publishedAt;
|
this.publishedAt = publishedAt;
|
||||||
this.downloadURL = downloadURL;
|
this.downloadURL = downloadURL;
|
||||||
this.gitURL = gitURL;
|
|
||||||
this.preRelease = preRelease;
|
this.preRelease = preRelease;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user