Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-16 03:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removal of many prefixes and deprecation of FaweLocation

Browse Source 
- Removed some prefixes to help make upstream merging a bit easier.
- Replaced reflection code for titles with the regular bukkit api.
- Removed FAWELocation and FAWEPlayer where it wasn't needed.
- Deprecated FaweLocation since having it in the first place is very stupid.
- FAWEPlayer should also be deprecated soon because the majority of that code is redundant.
This commit is contained in:
MattBDev
2019-06-05 21:17:34 -04:00
parent bf5d2c2788
commit b42553116c
21 changed files with 161 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
worldedit-core/src/main/java/com/sk89q/worldedit/WorldEdit.java
View File

@@ -612,7 +612,7 @@ public final class WorldEdit {
String ext = filename.substring(index + 1);
if (!ext.equalsIgnoreCase("js")) {
player.printError(BBC.getPrefix() + "Only .js scripts are currently supported");
player.printError("Only .js scripts are currently supported");
return;
}
@@ -625,7 +625,7 @@ public final class WorldEdit {
file = WorldEdit.class.getResourceAsStream("craftscripts/" + filename);
if (file == null) {
player.printError(BBC.getPrefix() + "Script does not exist: " + filename);
player.printError("Script does not exist: " + filename);
return;
}
} else {
@@ -638,7 +638,7 @@ public final class WorldEdit {
in.close();
script = new String(data, 0, data.length, StandardCharsets.UTF_8);
} catch (IOException e) {
player.printError(BBC.getPrefix() + "Script read error: " + e.getMessage());
player.printError("Script read error: " + e.getMessage());
return;
}
@@ -651,8 +651,8 @@ public final class WorldEdit {
try {
engine = new RhinoCraftScriptEngine();
} catch (NoClassDefFoundError e) {
player.printError(BBC.getPrefix() + "Failed to find an installed script engine.");
player.printError(BBC.getPrefix() + "Please see http://wiki.sk89q.com/wiki/WorldEdit/Installation");
player.printError("Failed to find an installed script engine.");
player.printError("Please see http://wiki.sk89q.com/wiki/WorldEdit/Installation");
return;
}
@@ -666,15 +666,15 @@ public final class WorldEdit {
try {
engine.evaluate(script, filename, vars);
} catch (ScriptException e) {
player.printError(BBC.getPrefix() + "Failed to execute:");
player.printError("Failed to execute:");
player.printRaw(e.getMessage());
logger.warn(BBC.getPrefix() + "Failed to execute script", e);
logger.warn("Failed to execute script", e);
} catch (NumberFormatException | WorldEditException e) {
throw e;
} catch (Throwable e) {
player.printError(BBC.getPrefix() + "Failed to execute (see console):");
player.printError("Failed to execute (see console):");
player.printRaw(e.getClass().getCanonicalName());
logger.warn(BBC.getPrefix() + "Failed to execute script", e);
logger.warn("Failed to execute script", e);
} finally {
for (EditSession editSession : scriptContext.getEditSessions()) {
editSession.flushSession();