Skip to content

Commit

Permalink
Remove BukkitScheduler update checker and add Folia support.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SirBlobman
SirBlobman committed May 11, 2023
1 parent 460cb21 commit 1e8d4e7
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 60 deletions.
6 changes: 4 additions & 2 deletions plugin.yml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
name: ${project.name}
version: ${project.version}-b${env.TRAVIS_BUILD_NUMBER}
version: ${project.version}-b${env.TRAVIS_BUILD_NUMBER}-folia
description: ${project.description}
authors: [cereal, Sleaker, mung3r]
website: ${project.url}
api-version: 1.13

folia-supported: true

main: ${mainClass}
load: startup

Expand All @@ -22,4 +24,4 @@ commands:
permissions:
vault.admin:
description: Notifies the player when vault is in need of an update.
default: op
default: op
114 changes: 56 additions & 58 deletions src/net/milkbowl/vault/Vault.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,29 @@
import java.util.concurrent.Callable;
import java.util.logging.Logger;

import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.ServicePriority;
import org.bukkit.plugin.ServicesManager;
import org.bukkit.plugin.java.JavaPlugin;

import net.milkbowl.vault.chat.Chat;
import net.milkbowl.vault.chat.plugins.Chat_DroxPerms;
import net.milkbowl.vault.chat.plugins.Chat_GroupManager;
import net.milkbowl.vault.chat.plugins.Chat_OverPermissions;
import net.milkbowl.vault.chat.plugins.Chat_Permissions3;
import net.milkbowl.vault.chat.plugins.Chat_PermissionsEx;
import net.milkbowl.vault.chat.plugins.Chat_Privileges;
import net.milkbowl.vault.chat.plugins.Chat_TotalPermissions;
import net.milkbowl.vault.chat.plugins.Chat_bPermissions;
import net.milkbowl.vault.chat.plugins.Chat_bPermissions2;
import net.milkbowl.vault.chat.plugins.Chat_iChat;
Expand All @@ -40,6 +56,7 @@
import net.milkbowl.vault.permission.Permission;
import net.milkbowl.vault.permission.plugins.Permission_DroxPerms;
import net.milkbowl.vault.permission.plugins.Permission_GroupManager;
import net.milkbowl.vault.permission.plugins.Permission_KPerms;
import net.milkbowl.vault.permission.plugins.Permission_OverPermissions;
import net.milkbowl.vault.permission.plugins.Permission_Permissions3;
import net.milkbowl.vault.permission.plugins.Permission_PermissionsBukkit;
Expand All @@ -48,36 +65,17 @@
import net.milkbowl.vault.permission.plugins.Permission_SimplyPerms;
import net.milkbowl.vault.permission.plugins.Permission_Starburst;
import net.milkbowl.vault.permission.plugins.Permission_SuperPerms;
import net.milkbowl.vault.permission.plugins.Permission_TotalPermissions;
import net.milkbowl.vault.permission.plugins.Permission_Xperms;
import net.milkbowl.vault.permission.plugins.Permission_bPermissions;
import net.milkbowl.vault.permission.plugins.Permission_bPermissions2;
import net.milkbowl.vault.permission.plugins.Permission_TotalPermissions;
import net.milkbowl.vault.permission.plugins.Permission_rscPermissions;
import net.milkbowl.vault.permission.plugins.Permission_KPerms;

import org.bstats.bukkit.Metrics;
import org.bstats.charts.SimplePie;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.ServicePriority;
import org.bukkit.plugin.ServicesManager;
import org.bukkit.plugin.java.JavaPlugin;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;

import net.milkbowl.vault.chat.plugins.Chat_TotalPermissions;

public class Vault extends JavaPlugin {

private static final String VAULT_BUKKIT_URL = "https://dev.bukkit.org/projects/Vault";
Expand All @@ -94,7 +92,7 @@ public class Vault extends JavaPlugin {
public void onDisable() {
// Remove all Service Registrations
getServer().getServicesManager().unregisterAll(this);
Bukkit.getScheduler().cancelTasks(this);
// Bukkit.getScheduler().cancelTasks(this);
}

@Override
Expand All @@ -117,43 +115,43 @@ public void onEnable() {
getServer().getPluginManager().registerEvents(new VaultListener(), this);
// Schedule to check the version every 30 minutes for an update. This is to update the most recent
// version so if an admin reconnects they will be warned about newer versions.
this.getServer().getScheduler().runTask(this, new Runnable() {

@Override
public void run() {
// Programmatically set the default permission value cause Bukkit doesn't handle plugin.yml properly for Load order STARTUP plugins
org.bukkit.permissions.Permission perm = getServer().getPluginManager().getPermission("vault.update");
if (perm == null)
{
perm = new org.bukkit.permissions.Permission("vault.update");
perm.setDefault(PermissionDefault.OP);
plugin.getServer().getPluginManager().addPermission(perm);
}
perm.setDescription("Allows a user or the console to check for vault updates");

getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {

@Override
public void run() {
if (getServer().getConsoleSender().hasPermission("vault.update") && getConfig().getBoolean("update-check", true)) {
try {
log.info("Checking for Updates ... ");
newVersion = updateCheck(currentVersion);
if (newVersion > currentVersion) {
log.warning("Stable Version: " + newVersionTitle + " is out!" + " You are still running version: " + currentVersionTitle);
log.warning("Update at: https://dev.bukkit.org/projects/vault");
} else if (currentVersion > newVersion) {
log.info("Stable Version: " + newVersionTitle + " | Current Version: " + currentVersionTitle);
}
} catch (Exception e) {
// ignore exceptions
}
}
}
}, 0, 432000);

}
});
// this.getServer().getScheduler().runTask(this, new Runnable() {
//
// @Override
// public void run() {
// // Programmatically set the default permission value cause Bukkit doesn't handle plugin.yml properly for Load order STARTUP plugins
// org.bukkit.permissions.Permission perm = getServer().getPluginManager().getPermission("vault.update");
// if (perm == null)
// {
// perm = new org.bukkit.permissions.Permission("vault.update");
// perm.setDefault(PermissionDefault.OP);
// plugin.getServer().getPluginManager().addPermission(perm);
// }
// perm.setDescription("Allows a user or the console to check for vault updates");
//
// getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
//
// @Override
// public void run() {
// if (getServer().getConsoleSender().hasPermission("vault.update") && getConfig().getBoolean("update-check", true)) {
// try {
// log.info("Checking for Updates ... ");
// newVersion = updateCheck(currentVersion);
// if (newVersion > currentVersion) {
// log.warning("Stable Version: " + newVersionTitle + " is out!" + " You are still running version: " + currentVersionTitle);
// log.warning("Update at: https://dev.bukkit.org/projects/vault");
// } else if (currentVersion > newVersion) {
// log.info("Stable Version: " + newVersionTitle + " | Current Version: " + currentVersionTitle);
// }
// } catch (Exception e) {
// // ignore exceptions
// }
// }
// }
// }, 0, 432000);
//
// }
// });

// Load up the Plugin metrics
Metrics metrics = new Metrics(this, 887);
Expand Down

0 comments on commit 1e8d4e7

Please # to comment.