Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-06-29 05:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor versioning changes

Browse Source
This commit is contained in:
Kenzie Togami 2019-05-05 01:37:11 -07:00 committed by NotMyFault
parent 55b02e1b1f
commit 8d68da09a3
3 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
build.gradle
View File

@ -28,8 +28,6 @@ plugins {
}
apply plugin: 'java'
clean { delete "target" }
def splashFile = new File('splash.txt')
if (splashFile.exists()) {
@ -58,23 +56,24 @@ ext {
}
}
if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion
version = "unknown"
} else {
version = String.format("%s.%s", rootVersion, buildNumber)
}
version = String.format("%s.%s", rootVersion, buildNumber)
description = rootProject.name
subprojects {
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'com.github.johnrengelman.shadow'
// Enable this requires putting license header files in many, many FAWE files
//Enable this requires putting license header files in many, many FAWE files
//apply plugin: 'net.minecrell.licenser'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
clean.doFirst {
delete "../target"
}
compileJava { options.compilerArgs += ["-parameters"] }
repositories {
@ -96,23 +95,6 @@ subprojects {
maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" }
}
if (JavaVersion.current().isJava8Compatible()) {
// Java 8 turns on doclint which we fail
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
}
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
artifacts {
archives jar
archives javadocJar
}
if (!(name.equals('worldedit-forge') || name.equals('worldedit-sponge'))) {
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
@ -144,4 +126,4 @@ subprojects {
// header = rootProject.file("HEADER.txt")
// include '**/*.java'
//}
}
}

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(