Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 09:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build "Fawe" and credit Matt ❤️

Browse Source 
Also update PlotSquared stuff
This commit is contained in:
NotMyFault 2019-08-23 15:48:51 +02:00
parent 20fff1c668
commit c5d3c4dca7
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -7,19 +7,19 @@ plugins {
logger.lifecycle(""" logger.lifecycle("""
******************************************* *******************************************
You are building WorldEdit! You are building FastAsyncWorldEdit!
If you encounter trouble: If you encounter trouble:
1) Read COMPILING.md if you haven't yet 1) Read COMPILING.md if you haven't yet
2) Try running 'build' in a separate Gradle run 2) Try running 'build' in a separate Gradle run
3) Use gradlew and not gradle 3) Use gradlew and not gradle
4) If you still need help, ask on Discord! https://discord.gg/enginehub 4) If you still need help, ask on Discord! https://discord.gg/cSMxtGn
Output files will be in [subproject]/build/libs Output files will be in [subproject]/build/libs
******************************************* *******************************************
""") """)
//TODO FIX THIS WHEN I FEEL LIKE IT //TODO FIX THIS WHEN I FEEL LIKE IT
var rootVersion = "1.13" var rootVersion = "1.14"
var revision: String = "" var revision: String = ""
var buildNumber = "" var buildNumber = ""
var date: String = "" var date: String = ""
@ -63,7 +63,7 @@ ext {
// //
//version = String.format("%s.%s", rootVersion, buildNumber) //version = String.format("%s.%s", rootVersion, buildNumber)
version = String.format("%s.%s", rootVersion, buildNumber) version = String.format("%s-%s", rootVersion, buildNumber)
if (!project.hasProperty("gitCommitHash")) { if (!project.hasProperty("gitCommitHash")) {
apply(plugin = "org.ajoberstar.grgit") apply(plugin = "org.ajoberstar.grgit")

3
buildSrc/src/main/kotlin/PlatformConfig.kt
View File

@ -94,12 +94,13 @@ fun Project.applyPlatformAndCoreConfiguration() {
fun Project.applyShadowConfiguration() { fun Project.applyShadowConfiguration() {
tasks.named<ShadowJar>("shadowJar") { tasks.named<ShadowJar>("shadowJar") {
archiveClassifier.set("dist") // archiveClassifier.set("dist")
dependencies { dependencies {
include(project(":worldedit-libs:core")) include(project(":worldedit-libs:core"))
include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}")) include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}"))
include(project(":worldedit-core")) include(project(":worldedit-core"))
} }
archiveName = "FastAsyncWorldEdit-${project.version}.jar"
exclude("GradleStart**") exclude("GradleStart**")
exclude(".cache") exclude(".cache")
exclude("LICENSE*") exclude("LICENSE*")

2
worldedit-bukkit/src/main/resources/plugin.yml
View File

@ -4,7 +4,7 @@ version: "${internalVersion}"
load: STARTUP load: STARTUP
api-version: 1.13 api-version: 1.13
description: Fast Async WorldEdit plugin description: Fast Async WorldEdit plugin
authors: [Empire92] authors: [Empire92, MattBDev]
loadbefore: [BannerBoard, WorldGuard, PlotSquared, AsyncWorldEdit, AsyncWorldEditInjector] loadbefore: [BannerBoard, WorldGuard, PlotSquared, AsyncWorldEdit, AsyncWorldEditInjector]
database: false database: false
permissions: permissions:

4
worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java
View File

@ -59,9 +59,9 @@ public class PlotSetBiome extends Command {
Collection<BiomeType> knownBiomes = BiomeTypes.values(); Collection<BiomeType> knownBiomes = BiomeTypes.values();
final BiomeType biome = Biomes.findBiomeByName(knownBiomes, args[0], biomeRegistry); final BiomeType biome = Biomes.findBiomeByName(knownBiomes, args[0], biomeRegistry);
if (biome == null) { if (biome == null) {
String biomes = StringMan.join(WorldUtil.IMP.getBiomeList(), Captions.BLOCK_LIST_SEPARATER.s()); String biomes = StringMan.join(WorldUtil.IMP.getBiomeList(), Captions.BLOCK_LIST_SEPARATER.toString());
Captions.NEED_BIOME.send(player); Captions.NEED_BIOME.send(player);
MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.s() + biomes); MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.toString() + biomes);
return; return;
} }
confirm.run(this, new Runnable() { confirm.run(this, new Runnable() {