Compare commits

...

5 Commits
12.5 ... 12.6

Author SHA1 Message Date
7f706cce49 Update UpdateAPI.java 2022-08-06 01:21:15 +02:00
a84b185812 12.6
The update checker now works asynchronously
2022-08-06 00:29:25 +02:00
JaTiTV
82905c0d66 Merge pull request '12.5' (#7) from 12.4-DEV into main
Reviewed-on: #7
2022-08-05 18:20:53 +02:00
868d36e1b5 fix 2022-08-05 18:20:09 +02:00
JaTiTV
f35b4efe4f Merge pull request '12.5' (#6) from 12.4-DEV into main
Reviewed-on: #6
2022-07-14 21:58:00 +02:00
6 changed files with 19 additions and 21 deletions

View File

@@ -45,10 +45,10 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.11.1" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:19.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.bencodez:votingplugin:6.9.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.bencodez:votingplugin:6.9.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bstats:bstats-velocity:2.2.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bstats:bstats-base:2.2.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.bencodez:advancedcore:master-1634c37011-1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.bencodez:advancedcore:master-28bd248b49-1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.zaxxer:HikariCP:3.4.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" />

View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>12.5</version>
<version>12.6</version>
<!-- <classifier>dev-1</classifier> -->
<groupId>net.t2code</groupId>

View File

@@ -1,7 +1,6 @@
package net.t2code.lib.Spigot.Lib.eco;
import com.bencodez.votingplugin.VotingPluginMain;
import com.bencodez.votingplugin.user.VotingPluginUser;
import net.t2code.lib.Spigot.Lib.messages.send;
import net.t2code.lib.Spigot.Lib.plugins.PluginCheck;
import net.t2code.lib.Spigot.system.T2CodeMain;

View File

@@ -5,7 +5,6 @@ import net.md_5.bungee.api.chat.TextComponent;
import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
import net.t2code.lib.Spigot.Lib.replace.Replace;
import net.t2code.lib.Spigot.Lib.update.UpdateAPI;
import net.t2code.lib.Spigot.system.config.SelectLibConfig;
import net.t2code.lib.Util;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;

View File

@@ -1,8 +1,6 @@
package net.t2code.lib.Spigot.Lib.replace;
import me.clip.placeholderapi.PlaceholderAPI;
import net.t2code.lib.Spigot.Lib.messages.send;
import net.t2code.lib.Spigot.system.T2CodeMain;
import org.bukkit.entity.Player;
import java.util.ArrayList;

View File

@@ -34,7 +34,7 @@ public class UpdateAPI {
public void run() {
join(plugin, prefix, perm, player, spigot, discord);
}
}.runTaskLater(plugin, 20L);
}.runTaskLaterAsynchronously(plugin, 20L);
return;
}
String publicVersion = UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion;
@@ -45,12 +45,12 @@ public class UpdateAPI {
}
private static void use(Plugin plugin, String prefix, Player player, String pluginVersion, String publicVersion, String spigot, String discord) {
Bukkit.getScheduler().runTaskLater(plugin, new Runnable() {
new BukkitRunnable() {
@Override
public void run() {
UpdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion, player);
}
}, 200L);
}.runTaskLaterAsynchronously(plugin, 200L);
}
public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String pluginVersion, String publicVersion) {
@@ -74,27 +74,29 @@ public class UpdateAPI {
send.console("§4=========== " + Prefix + " §4===========");
}
public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String pluginVersion, String publicVersion, Player player) {
public static void sendUpdateMsg(String prefix, String Spigot, String Discord, String pluginVersion, String publicVersion, Player player) {
if (publicVersion.equals("§4No public version found!")) {
return;
}
send.player(player, Prefix);
String st = "[prefix]<br>" +
"<click:open_url:'[link]'><hover:show_text:'<gold>You can download it here: <yellow>[link]</yellow></gold>'>[prefix] <gold>A new</gold> [value]<gold>version was found!</gold></hover></click><br>" +
"<click:open_url:'[link]'><hover:show_text:'<gold>You can download it here: <yellow>[link]</yellow></gold>'>[prefix] <red>[plv]</red> <gray>-></gray> <green>[puv]</green></hover></click><br>" +
"<click:open_url:'[dc]'><hover:show_text:'<yellow>[dc]</yellow>'>[prefix] <gold>You can find more information on Discord.</gold></hover></click><br>" +
"[prefix]";
String value = "";
if (publicVersion.toLowerCase().contains("dev") || publicVersion.toLowerCase().contains("beta") || publicVersion.toLowerCase().contains("snapshot")) {
if (publicVersion.toLowerCase().contains("dev")) {
HoverModule.modulePlayer(Prefix + " §6A new §4DEV§6 version was found!", "§6You can download it here: §e" + Spigot, "OPEN_URL", Spigot, player);
value = "<dark_red>DEV </dark_red>";
}
if (publicVersion.toLowerCase().contains("beta")) {
HoverModule.modulePlayer(Prefix + " §6A new §2BETA§6 version was found!", "§6You can download it here: §e" + Spigot, "OPEN_URL", Spigot, player);
value = "<green>BETA </green>";
}
if (publicVersion.toLowerCase().contains("snapshot")) {
HoverModule.modulePlayer(Prefix + " §6A new §eSNAPSHOT§6 version was found!", "§6You can download it here: §e" + Spigot, "OPEN_URL", Spigot, player);
value = "<yellow>SNAPSHOT </yellow>";
}
} else {
HoverModule.modulePlayer(Prefix + " §6A new version was found!", "§6You can download it here: §e" + Spigot, "OPEN_URL", Spigot, player);
}
HoverModule.modulePlayer(Prefix + " §c" + pluginVersion + " §7-> §a" + publicVersion, "§6You can download it here: §e" + Spigot, "OPEN_URL", Spigot, player);
HoverModule.modulePlayer(Prefix + " §6You can find more information on Discord.", "§e" + Discord, "OPEN_URL", Discord, player);
send.player(player, Prefix);
send.player(player, st.replace("[prefix]", prefix).replace("[value]", value).replace("[link]", Spigot)
.replace("[plv]",pluginVersion).replace("[puv]",publicVersion).replace("[dc]",Discord));
}
private static Boolean noUpdate = true;
@@ -183,7 +185,7 @@ public class UpdateAPI {
"§4No public version found!"
);
UpdateAPI.PluginVersionen.put(plugin.getName(), update);
this.plugin.getLogger().severe(Prefix + "§4 Cannot look for updates: " + var10.getMessage());
this.plugin.getLogger().severe("§4 Cannot look for updates: " + var10.getMessage());
}
});
}