ready for release 1.3
This commit is contained in:
parent
dddb321c70
commit
23ff6e31d2
3 changed files with 90 additions and 72 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -6,3 +6,4 @@ lib/
|
|||
.gradle/
|
||||
.vscode/
|
||||
*.jar
|
||||
/builds
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ Resurrection is intended to make players wait long amounts of time between death
|
|||
|
||||
Resurrection is only confirmed to run on vanilla Spigot or Bukkit servers, meaning you built the server yourself using `BuildTools` with no extra settings, or downloaded it from official sources such as their website. Resurrection is **NOT GUARANTEED** to run on **ANY** fork of Spigot/Bukkit servers, such as Tuinity or Paper. Issues reported involving these forks may not be provided a solution unless proven that the issue still happens on vanilla versions.
|
||||
|
||||
Tested Minecraft Versions: 1.13, 1.14, 1.15, 1.16, 1.17, 1.18
|
||||
Tested Minecraft Versions: 1.8<sup>*</sup>, 1.9, 1.10, 1.12, 1.13, 1.14, 1.15, 1.16, 1.17, 1.18
|
||||
|
||||
Native Version: 1.16
|
||||
|
||||
You can keep track of compatibility with other versions by viewing my [TODO list.](TODO.md)
|
||||
<sup>*</sup>For Minecraft Servers version 1.8, you must download a special build of Resurrection in order for the plugin to work properly. These files are in the [releases](https://github.com/brysonsteck/resurrection/releases) as `Resurrection_1.8.jar` (for versions of Resurrection > 1.3).
|
||||
|
||||
## Commands
|
||||
|
||||
|
|
@ -21,6 +21,8 @@ You can keep track of compatibility with other versions by viewing my [TODO list
|
|||
* Displays information about the plugin, including links to download, and also warns the command-runner if the plugin is outdated.
|
||||
* `/bug`
|
||||
* Displays contact information in case a bug occurs, such as links to the GitHub issues page and the Google Form.
|
||||
* `/dead`
|
||||
* Displays all the players currently awaiting resurrection and how long they have left.
|
||||
* `/howlong [PLAYER]`
|
||||
* Shows the player how long they (or the specified player) have until they are resurrected.
|
||||
* This command requires a player to be specified when ran from the console.
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ public class Resurrection extends JavaPlugin implements Listener {
|
|||
PluginDescriptionFile pluginInfo = getDescription();
|
||||
getServer().getPluginManager().registerEvents(this, this);
|
||||
|
||||
boolean stop = false;
|
||||
if (pluginInfo.getVersion().contains("beta")) {
|
||||
// beta message
|
||||
log.warning("---------------------------------------------------------");
|
||||
|
|
@ -41,85 +42,99 @@ public class Resurrection extends JavaPlugin implements Listener {
|
|||
log.warning("");
|
||||
log.warning("This means that this plugin is early in development and not completely finished, and as a result you may experience unexpected doodads. Make sure that the plugin is up-to-date for more features and bug fixes. The plugin will now check for updates.");
|
||||
log.warning("---------------------------------------------------------");
|
||||
} else {
|
||||
log.info("---------------------------------------------------------");
|
||||
|
||||
}
|
||||
|
||||
// check for updates
|
||||
log.info("Checking for updates...");
|
||||
CheckForUpdate check = new CheckForUpdate();
|
||||
boolean outdated = false;
|
||||
if (check.isSuccess()) {
|
||||
String newestVersion = check.getVersion();
|
||||
String newestVersionURL = check.getVersionURL();
|
||||
if (pluginInfo.getVersion().equals(newestVersion)) {
|
||||
log.info(newestVersion + " is the latest version of Resurrection.");
|
||||
} else {
|
||||
log.info("A new version of Resurrection is available! (current: " + pluginInfo.getVersion() + ", newest: " + newestVersion + ")");
|
||||
log.info("You can download the latest release on GitHub here \\/");
|
||||
log.info(newestVersionURL);
|
||||
outdated = true;
|
||||
}
|
||||
}
|
||||
|
||||
log.info("---------------------------------------------------------");
|
||||
|
||||
log.info("Locating player data and settings files...");
|
||||
// check if playerData.resurrection exists
|
||||
File playerFile = new File("plugins/playerData.resurrection");
|
||||
File settingsFile = new File("plugins/settings.resurrection");
|
||||
|
||||
boolean fileFail = false;
|
||||
if (!playerFile.exists()) {
|
||||
log.info("Player data file does not exist. Creating now in the \"plugins\" directory...");
|
||||
try {
|
||||
playerFile.createNewFile();
|
||||
log.info("Player data file created successfully.");
|
||||
} catch (IOException e) {
|
||||
log.severe("An error has occurred creating the player data file!");
|
||||
e.printStackTrace();
|
||||
log.severe("This file is crucial to Resurrection. Since the file could not be created, the plugin will now stop.");
|
||||
} else if (Bukkit.getVersion().contains("1.8")) {
|
||||
if (!pluginInfo.getDescription().toLowerCase().contains("minecraft 1.8")) {
|
||||
log.severe("---------------------------------------------------------");
|
||||
log.severe("ERROR!");
|
||||
log.severe("This version of Resurrection is not compatible with Minecraft 1.8 due to specific API calls that were changed in subsequent releases of the game. In order to use Resurrection with Minecraft 1.8, you must download the specific Jar titled \"Resurrection_1.8.jar\" listed in the latest release of Resurrection found at https://github.com/brysonsteck/resurrection/releases.");
|
||||
log.severe("Resurrection will now disable to prevent crashing.");
|
||||
log.severe("---------------------------------------------------------");
|
||||
stop = true;
|
||||
Bukkit.getPluginManager().disablePlugin(this);
|
||||
fileFail = true;
|
||||
} else {
|
||||
log.info("---------------------------------------------------------");
|
||||
}
|
||||
} else {
|
||||
log.info("The player data file has been found!");
|
||||
}
|
||||
if (!settingsFile.exists()) {
|
||||
log.info("Settings file does not exist. Creating now in the \"plugins\" directory...");
|
||||
new ParseSettings();
|
||||
log.info("Settings file created successfully.");
|
||||
} else {
|
||||
log.info("The settings file has also been found!");
|
||||
log.info("---------------------------------------------------------");
|
||||
|
||||
}
|
||||
|
||||
ParseSettings parseSettings = new ParseSettings();
|
||||
|
||||
log.info("---------------------------------------------------------");
|
||||
|
||||
if (parseSettings.isSettingsComplete() && !fileFail) {
|
||||
if (Boolean.parseBoolean(parseSettings.getSetting("debug"))) {
|
||||
log.warning("[Res. DEBUG]: DEBUG MODE ENABLED!");
|
||||
log.warning("[Res. DEBUG]: Resurrection's debug mode has been enabled in the settings file. All debug messages after this disclaimer will be broadcasted (sent to everyone) prefaced with the tag \"[Res. DEBUG]\" and sent in bold yellow text. Several messages may be sent at a time. Therefore, debug mode should be disabled for anything other than, well, debugging.");
|
||||
log.warning("---------------------------------------------------------");
|
||||
if (!stop) {
|
||||
// check for updates
|
||||
log.info("Checking for updates...");
|
||||
CheckForUpdate check = new CheckForUpdate();
|
||||
boolean outdated = false;
|
||||
if (check.isSuccess()) {
|
||||
String newestVersion = check.getVersion();
|
||||
String newestVersionURL = check.getVersionURL();
|
||||
if (pluginInfo.getVersion().equals(newestVersion)) {
|
||||
log.info(newestVersion + " is the latest version of Resurrection.");
|
||||
} else {
|
||||
log.info("A new version of Resurrection is available! (current: " + pluginInfo.getVersion() + ", newest: " + newestVersion + ")");
|
||||
log.info("You can download the latest release on GitHub here \\/");
|
||||
log.info(newestVersionURL);
|
||||
outdated = true;
|
||||
}
|
||||
}
|
||||
|
||||
log.info("Essential files found and valid. Registering listeners and adding commands...");
|
||||
// register listener
|
||||
this.getServer().getPluginManager().registerEvents(new PlayerListener(parseSettings), this);
|
||||
log.info("---------------------------------------------------------");
|
||||
|
||||
// register commands
|
||||
this.getCommand("about").setExecutor(new CommandAbout(parseSettings.getSetting("debug"), pluginInfo.getVersion(), outdated));
|
||||
this.getCommand("bug").setExecutor(new CommandBug(parseSettings.getSetting("debug")));
|
||||
this.getCommand("resurrect").setExecutor(new CommandResurrect(parseSettings.getSetting("debug")));
|
||||
this.getCommand("howlong").setExecutor(new CommandHowLong(parseSettings.getSetting("debug")));
|
||||
this.getCommand("source").setExecutor(new CommandSource(parseSettings.getSetting("debug")));
|
||||
this.getCommand("dead").setExecutor(new CommandDead(parseSettings.getSetting("debug")));
|
||||
log.info("Locating player data and settings files...");
|
||||
// check if playerData.resurrection exists
|
||||
File playerFile = new File("plugins/playerData.resurrection");
|
||||
File settingsFile = new File("plugins/settings.resurrection");
|
||||
|
||||
boolean fileFail = false;
|
||||
if (!playerFile.exists()) {
|
||||
log.info("Player data file does not exist. Creating now in the \"plugins\" directory...");
|
||||
try {
|
||||
playerFile.createNewFile();
|
||||
log.info("Player data file created successfully.");
|
||||
} catch (IOException e) {
|
||||
log.severe("An error has occurred creating the player data file!");
|
||||
e.printStackTrace();
|
||||
log.severe("This file is crucial to Resurrection. Since the file could not be created, the plugin will now stop.");
|
||||
Bukkit.getPluginManager().disablePlugin(this);
|
||||
fileFail = true;
|
||||
}
|
||||
} else {
|
||||
log.info("The player data file has been found!");
|
||||
}
|
||||
if (!settingsFile.exists()) {
|
||||
log.info("Settings file does not exist. Creating now in the \"plugins\" directory...");
|
||||
new ParseSettings();
|
||||
log.info("Settings file created successfully.");
|
||||
} else {
|
||||
log.info("The settings file has also been found!");
|
||||
}
|
||||
|
||||
ParseSettings parseSettings = new ParseSettings();
|
||||
|
||||
log.info("---------------------------------------------------------");
|
||||
log.info("Successfully Started!");
|
||||
log.info("---------------------------------------------------------");
|
||||
|
||||
if (parseSettings.isSettingsComplete() && !fileFail) {
|
||||
if (Boolean.parseBoolean(parseSettings.getSetting("debug"))) {
|
||||
log.warning("[Res. DEBUG]: DEBUG MODE ENABLED!");
|
||||
log.warning("[Res. DEBUG]: Resurrection's debug mode has been enabled in the settings file. All debug messages after this disclaimer will be broadcasted (sent to everyone) prefaced with the tag \"[Res. DEBUG]\" and sent in bold yellow text. Several messages may be sent at a time. Therefore, debug mode should be disabled for anything other than, well, debugging.");
|
||||
log.warning("---------------------------------------------------------");
|
||||
}
|
||||
|
||||
log.info("Essential files found and valid. Registering listeners and adding commands...");
|
||||
// register listener
|
||||
this.getServer().getPluginManager().registerEvents(new PlayerListener(parseSettings), this);
|
||||
|
||||
// register commands
|
||||
this.getCommand("about").setExecutor(new CommandAbout(parseSettings.getSetting("debug"), pluginInfo.getVersion(), outdated));
|
||||
this.getCommand("bug").setExecutor(new CommandBug(parseSettings.getSetting("debug")));
|
||||
this.getCommand("resurrect").setExecutor(new CommandResurrect(parseSettings.getSetting("debug")));
|
||||
this.getCommand("howlong").setExecutor(new CommandHowLong(parseSettings.getSetting("debug")));
|
||||
this.getCommand("source").setExecutor(new CommandSource(parseSettings.getSetting("debug")));
|
||||
this.getCommand("dead").setExecutor(new CommandDead(parseSettings.getSetting("debug")));
|
||||
|
||||
log.info("---------------------------------------------------------");
|
||||
log.info("Successfully Started!");
|
||||
log.info("---------------------------------------------------------");
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue