diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 67d9af4..df96bcb 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/plugin.yml b/src/plugin.yml index bf37256..195019a 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -5,120 +5,120 @@ commands: money: description: Tells the player the amount of money they are holding. usage: /money - permission: TwosideKeeper.money + permission: AutoPluginUpdate.money permission-message: You don't have permission to check your balance! enchant_advanced: description: Enchants items with more properties. usage: /enchant_advanced - permission: TwosideKeeper.enchant + permission: AutoPluginUpdate.enchant permission-message: No permissions! harden_armor: description: Hardens a piece of armor. usage: /harden_armor - permission: TwosideKeeper.harden + permission: AutoPluginUpdate.harden permission-message: No permissions! item_cube: description: Sets this item as an item cube. usage: /item_cube - permission: TwosideKeeper.item_cube + permission: AutoPluginUpdate.item_cube permission-message: No permissions! artifact: description: Gives the player an artifact. usage: /artifact [amt] - permission: TwosideKeeper.artifact + permission: AutoPluginUpdate.artifact permission-message: No permissions! recyclingcenter: description: Defines a new container for a Recycling Center. usage: /recyclingcenter - permission: TwosideKeeper.recyclingcenter + permission: AutoPluginUpdate.recyclingcenter permission-message: No permissions! glowingitem: description: Creates a new glowing item. usage: /glowingitem - permission: TwosideKeeper.glowingitem + permission: AutoPluginUpdate.glowingitem permission-message: No permissions! sound: description: Toggle sound message notifications. usage: /sound - permission: TwosideKeeper.sound + permission: AutoPluginUpdate.sound permission-message: No permissions! log: - description: Adjusts the debugging log level for TwosideKeeper in the console. + description: Adjusts the debugging log level for AutoPluginUpdate in the console. usage: /log - permission: TwosideKeeper.log + permission: AutoPluginUpdate.log permission-message: No permissions! servertype: description: Sets the server type to another type. usage: /servertype - permission: TwosideKeeper.servertype + permission: AutoPluginUpdate.servertype permission-message: No permissions! ess: description: Generates a Mysterious Essence report. usage: /ess - permission: TwosideKeeper.report + permission: AutoPluginUpdate.report permission-message: No permissions! bow: description: Generates a Bow report. usage: /bow - permission: TwosideKeeper.report + permission: AutoPluginUpdate.report permission-message: No permissions! loot: description: Generates a Loot report. usage: /loot - permission: TwosideKeeper.report + permission: AutoPluginUpdate.report permission-message: No permissions! mega: description: Generates a Mega Piece. usage: /mega - permission: TwosideKeeper.mega + permission: AutoPluginUpdate.mega permission-message: No permissions! fix: description: Does many things depending on what item is being held. Typically if it's broken, typing this will help. usage: /fix - permission: TwosideKeeper.fix + permission: AutoPluginUpdate.fix permission-message: No permissions! tp_world: description: Teleports to a location in a specified world. usage: /tp_world - permission: TwosideKeeper.tp_world + permission: AutoPluginUpdate.tp_world permission-message: No permissions! stats: description: Display statistics for damage and defense. usage: /stats [username] - permission: TwosideKeeper.money + permission: AutoPluginUpdate.money permission-message: No permissions! awakenedartifact: description: Used for upgrading awakened artifacts. usage: /awakenedartifact - permission: TwosideKeeper.money + permission: AutoPluginUpdate.money permission-message: No permissions! awakenedartifact_ability: description: Apply an awakened artifact ability to an item. usage: /awakenedartifact_ability - permission: TwosideKeeper.artifact + permission: AutoPluginUpdate.artifact permission-message: No permissions! mode: description: Displays information about a mode. usage: /mode - permission: TwosideKeeper.money + permission: AutoPluginUpdate.money permission-message: No permissions! dps: description: DPS Logger. usage: /dps - permission: TwosideKeeper.money + permission: AutoPluginUpdate.money permission-message: No permissions! muchlogsmuchwow: description: D00d. usage: /muchlogsmuchwow - permission: TwosideKeeper.muchlogsmuchwow + permission: AutoPluginUpdate.muchlogsmuchwow permission-message: No permissions! make_set_item: description: Turns an item into a set. usage: /make_set_item - permission: TwosideKeeper.makesetitem + permission: AutoPluginUpdate.makesetitem permission-message: No permissions! craft: description: Displays the crafting recipe for a custom item. Press Tab after typing /craft to see options. usage: /craft ITEM - permission: TwosideKeeper.money + permission: AutoPluginUpdate.money permission-message: No permissions! \ No newline at end of file diff --git a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java index dfc77ef..06ae4ef 100644 --- a/src/sig/plugin/TwosideKeeper/TwosideKeeper.java +++ b/src/sig/plugin/TwosideKeeper/TwosideKeeper.java @@ -165,6 +165,7 @@ import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; +import sig.plugin.AutoPluginUpdate.AnnounceUpdateEvent; import sig.plugin.TwosideKeeper.Events.EntityDamagedEvent; import sig.plugin.TwosideKeeper.HelperStructures.AnvilItem; import sig.plugin.TwosideKeeper.HelperStructures.ArtifactAbility; @@ -220,7 +221,7 @@ public class TwosideKeeper extends JavaPlugin implements Listener { public static long SERVERTICK=0; //This is the SERVER's TOTAL TICKS when first loaded. public static long STARTTIME=0; public static long LASTSERVERCHECK=0; - public static int SERVERCHECKERTICKS=18000; + public static int SERVERCHECKERTICKS=18000; public static int TERMINALTIME=220; //How much time in ticks to use the bank withdraw/deposit terminals. public static double DEATHPENALTY=50.0; //Percent of holding money that will be taken from the player on death. public static double RECYCLECHANCE=65.0; //65% chance to save despawned items. Can be adjusted via config. @@ -739,9 +740,9 @@ public class TwosideKeeper extends JavaPlugin implements Listener { TwosideRecyclingCenter.populateItemListFromAllNodes(); log("Recycling Centers Loaded: "+TwosideRecyclingCenter.getNumberOfNodes(),3); - pluginupdater = new AutoUpdatePlugin(this); + /*pluginupdater = new AutoUpdatePlugin(this); pluginupdater.AddPlugin("TwosideKeeper", "https://dl.dropboxusercontent.com/s/z5ram6vi3jipiit/TwosideKeeper.jar"); - pluginupdater.AddPlugin("aPlugin", "https://dl.dropboxusercontent.com/u/62434995/aPlugin.jar"); + pluginupdater.AddPlugin("aPlugin", "https://dl.dropboxusercontent.com/u/62434995/aPlugin.jar");*/ //Create Spleef Games. TwosideSpleefGames = new SpleefManager(this); @@ -831,12 +832,12 @@ public class TwosideKeeper extends JavaPlugin implements Listener { getServer().getScheduler().scheduleSyncRepeatingTask(this, new ControlChargeZombies(), 5l, 5l); - if (SERVER_TYPE==ServerType.MAIN) { //Only perform this on the official servers. Test servers do not require constant updating. + /*if (SERVER_TYPE==ServerType.MAIN) { //Only perform this on the official servers. Test servers do not require constant updating. //Every 5 minutes, check for a plugin update. if (!restarting_server) { Bukkit.getScheduler().runTaskTimerAsynchronously(this, pluginupdater, 6000l, 6000l); } - } + }*/ getServer().getScheduler().runTaskLaterAsynchronously(this, new DiscordStatusUpdater(), 300l); @@ -4927,6 +4928,11 @@ public class TwosideKeeper extends JavaPlugin implements Listener { } } } + + @EventHandler(priority=EventPriority.LOW,ignoreCancelled = true) + public void announcePluginUpdateEvent(AnnounceUpdateEvent ev) { + aPlugin.API.discordSendRaw(ev.getAnnouncementMessage()); + } @EventHandler(priority=EventPriority.LOW,ignoreCancelled = true) public void expEvent(PlayerExpChangeEvent ev) {