geforkt von Mirrors/FastAsyncWorldEdit
Minor versioning changes
Dieser Commit ist enthalten in:
Ursprung
55b02e1b1f
Commit
8d68da09a3
32
build.gradle
32
build.gradle
@ -28,8 +28,6 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
clean { delete "target" }
|
|
||||||
|
|
||||||
|
|
||||||
def splashFile = new File('splash.txt')
|
def splashFile = new File('splash.txt')
|
||||||
if (splashFile.exists()) {
|
if (splashFile.exists()) {
|
||||||
@ -58,23 +56,24 @@ ext {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( project.hasProperty("lzNoVersion") ) { // gradle build -PlzNoVersion
|
version = String.format("%s.%s", rootVersion, buildNumber)
|
||||||
version = "unknown"
|
|
||||||
} else {
|
|
||||||
version = String.format("%s.%s", rootVersion, buildNumber)
|
|
||||||
}
|
|
||||||
description = rootProject.name
|
description = rootProject.name
|
||||||
|
|
||||||
subprojects {
|
subprojects {
|
||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
apply plugin: 'maven'
|
apply plugin: 'maven'
|
||||||
apply plugin: 'com.github.johnrengelman.shadow'
|
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'
|
//apply plugin: 'net.minecrell.licenser'
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
|
||||||
|
clean.doFirst {
|
||||||
|
delete "../target"
|
||||||
|
}
|
||||||
|
|
||||||
compileJava { options.compilerArgs += ["-parameters"] }
|
compileJava { options.compilerArgs += ["-parameters"] }
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@ -96,23 +95,6 @@ subprojects {
|
|||||||
maven {url "http://ci.emc.gs/nexus/content/groups/aikar/" }
|
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'))) {
|
if (!(name.equals('worldedit-forge') || name.equals('worldedit-sponge'))) {
|
||||||
task sourcesJar(type: Jar, dependsOn: classes) {
|
task sourcesJar(type: Jar, dependsOn: classes) {
|
||||||
classifier = 'sources'
|
classifier = 'sources'
|
||||||
|
@ -30,9 +30,12 @@ public class FaweVersion {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override public String toString() {
|
||||||
public String toString() {
|
if (hash == 0 && build == 0) {
|
||||||
return "FastAsyncWorldEdit-" + year + "." + month + "." + day + "-" + Integer.toHexString(hash) + "-" + build;
|
return "FastAsyncWorldEdit-1.13-NoVer-SNAPSHOT";
|
||||||
|
} else {
|
||||||
|
return "FastAsyncWorldEdit-1.13" + build;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isNewer(FaweVersion other) {
|
public boolean isNewer(FaweVersion other) {
|
||||||
|
@ -63,8 +63,8 @@ public class WorldEditCommands {
|
|||||||
)
|
)
|
||||||
public void version(Actor actor) throws WorldEditException {
|
public void version(Actor actor) throws WorldEditException {
|
||||||
FaweVersion fVer = Fawe.get().getVersion();
|
FaweVersion fVer = Fawe.get().getVersion();
|
||||||
String fVerStr = fVer == null ? "unknown" : fVer.year + "." + fVer.month + "." + fVer.day + "-" + Integer.toHexString(fVer.hash) + "-" + fVer.build;
|
String fVerStr = fVer == null ? "unknown" : "-" + fVer.build;
|
||||||
actor.print(BBC.getPrefix() + "FastAsyncWorldEdit 1.13-" + fVerStr + " by Empire92");
|
actor.print(BBC.getPrefix() + "FastAsyncWorldEdit-1.13" + fVerStr + " by Empire92");
|
||||||
if (fVer != null) {
|
if (fVer != null) {
|
||||||
actor.printDebug("------------------------------------");
|
actor.printDebug("------------------------------------");
|
||||||
FaweVersion version = Fawe.get().getVersion();
|
FaweVersion version = Fawe.get().getVersion();
|
||||||
@ -78,7 +78,7 @@ public class WorldEditCommands {
|
|||||||
PlatformManager pm = we.getPlatformManager();
|
PlatformManager pm = we.getPlatformManager();
|
||||||
actor.printDebug("Platforms:");
|
actor.printDebug("Platforms:");
|
||||||
for (Platform platform : pm.getPlatforms()) {
|
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:");
|
actor.printDebug("Capabilities:");
|
||||||
for (Capability capability : Capability.values()) {
|
for (Capability capability : Capability.values()) {
|
||||||
@ -92,7 +92,7 @@ public class WorldEditCommands {
|
|||||||
@Command(
|
@Command(
|
||||||
aliases = {"reload"},
|
aliases = {"reload"},
|
||||||
usage = "",
|
usage = "",
|
||||||
desc = "Reload configuration",
|
desc = "Reload configuration and translations",
|
||||||
min = 0,
|
min = 0,
|
||||||
max = 0
|
max = 0
|
||||||
)
|
)
|
||||||
@ -102,7 +102,7 @@ public class WorldEditCommands {
|
|||||||
we.getEventBus().post(new ConfigurationLoadEvent(we.getPlatformManager().queryCapability(Capability.CONFIGURATION).getConfiguration()));
|
we.getEventBus().post(new ConfigurationLoadEvent(we.getPlatformManager().queryCapability(Capability.CONFIGURATION).getConfiguration()));
|
||||||
Fawe.get().setupConfigs();
|
Fawe.get().setupConfigs();
|
||||||
CommandManager.getInstance().register(we.getPlatformManager().queryCapability(Capability.USER_COMMANDS));
|
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(
|
@Command(
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren