Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-11 20:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'breaking' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into breaking

Browse Source
This commit is contained in:
Jesse Boyd
2019-05-13 00:38:59 +10:00
parent 113aeb1689 8d68da09a3
commit 118a51f477
3 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worldedit-core/src/main/java/com/boydti/fawe/FaweVersion.java
View File

@ -30,9 +30,12 @@ public class FaweVersion {
}
}
@Override
public String toString() {
return "FastAsyncWorldEdit-" + year + "." + month + "." + day + "-" + Integer.toHexString(hash) + "-" + build;
@Override public String toString() {
if (hash == 0 && build == 0) {
return "FastAsyncWorldEdit-1.13-NoVer-SNAPSHOT";
} else {
return "FastAsyncWorldEdit-1.13" + build;
}
}
public boolean isNewer(FaweVersion other) {

10
worldedit-core/src/main/java/com/sk89q/worldedit/command/WorldEditCommands.java
View File

@ -63,8 +63,8 @@ public class WorldEditCommands {
)
public void version(Actor actor) throws WorldEditException {
FaweVersion fVer = Fawe.get().getVersion();
String fVerStr = fVer == null ? "unknown" : fVer.year + "." + fVer.month + "." + fVer.day + "-" + Integer.toHexString(fVer.hash) + "-" + fVer.build;
actor.print(BBC.getPrefix() + "FastAsyncWorldEdit 1.13-" + fVerStr + " by Empire92");
String fVerStr = fVer == null ? "unknown" : "-" + fVer.build;
actor.print(BBC.getPrefix() + "FastAsyncWorldEdit-1.13" + fVerStr + " by Empire92");
if (fVer != null) {
actor.printDebug("------------------------------------");
FaweVersion version = Fawe.get().getVersion();
@ -78,7 +78,7 @@ public class WorldEditCommands {
PlatformManager pm = we.getPlatformManager();
actor.printDebug("Platforms:");
for (Platform platform : pm.getPlatforms()) {
actor.printDebug(String.format(" - %s (%s)", platform.getPlatformName(), platform.getVersion()));
actor.printDebug(String.format(" - %s", platform.getPlatformName()));
}
actor.printDebug("Capabilities:");
for (Capability capability : Capability.values()) {
@ -92,7 +92,7 @@ public class WorldEditCommands {
@Command(
aliases = {"reload"},
usage = "",
desc = "Reload configuration",
desc = "Reload configuration and translations",
min = 0,
max = 0
)
@ -102,7 +102,7 @@ public class WorldEditCommands {
we.getEventBus().post(new ConfigurationLoadEvent(we.getPlatformManager().queryCapability(Capability.CONFIGURATION).getConfiguration()));
Fawe.get().setupConfigs();
CommandManager.getInstance().register(we.getPlatformManager().queryCapability(Capability.USER_COMMANDS));
actor.print(BBC.getPrefix() + "Reloaded WorldEdit " + we.getVersion() + " and " + Fawe.get().getVersion() + "");
actor.print(BBC.getPrefix() + "Reloaded FastAsyncWorldEdit configuration and translation files");
}
@Command(