From c5d3c4dca7ea2137fcc104e53ddec55e2246b177 Mon Sep 17 00:00:00 2001
From: NotMyFault <mc.cache@web.de>
Date: Fri, 23 Aug 2019 15:48:51 +0200
Subject: [PATCH] Build "Fawe" and credit Matt :heart:

Also update PlotSquared stuff
---
 build.gradle.kts                                          | 8 ++++----
 buildSrc/src/main/kotlin/PlatformConfig.kt                | 3 ++-
 worldedit-bukkit/src/main/resources/plugin.yml            | 2 +-
 .../boydti/fawe/regions/general/plot/PlotSetBiome.java    | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e189f6b82..21be27e98 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,19 +7,19 @@ plugins {
 
 logger.lifecycle("""
 *******************************************
- You are building WorldEdit!
+ You are building FastAsyncWorldEdit!
 
  If you encounter trouble:
  1) Read COMPILING.md if you haven't yet
  2) Try running 'build' in a separate Gradle run
  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
 *******************************************
 """)
 //TODO FIX THIS WHEN I FEEL LIKE IT
-var rootVersion = "1.13"
+var rootVersion = "1.14"
 var revision: String = ""
 var buildNumber = ""
 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)
 
 if (!project.hasProperty("gitCommitHash")) {
     apply(plugin = "org.ajoberstar.grgit")
diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt
index 9a4d27a8f..e33302f03 100644
--- a/buildSrc/src/main/kotlin/PlatformConfig.kt
+++ b/buildSrc/src/main/kotlin/PlatformConfig.kt
@@ -94,12 +94,13 @@ fun Project.applyPlatformAndCoreConfiguration() {
 
 fun Project.applyShadowConfiguration() {
     tasks.named<ShadowJar>("shadowJar") {
-        archiveClassifier.set("dist")
+//        archiveClassifier.set("dist")
         dependencies {
             include(project(":worldedit-libs:core"))
             include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}"))
             include(project(":worldedit-core"))
         }
+        archiveName = "FastAsyncWorldEdit-${project.version}.jar"
         exclude("GradleStart**")
         exclude(".cache")
         exclude("LICENSE*")
diff --git a/worldedit-bukkit/src/main/resources/plugin.yml b/worldedit-bukkit/src/main/resources/plugin.yml
index 7683c521d..d9dbe048d 100644
--- a/worldedit-bukkit/src/main/resources/plugin.yml
+++ b/worldedit-bukkit/src/main/resources/plugin.yml
@@ -4,7 +4,7 @@ version: "${internalVersion}"
 load: STARTUP
 api-version: 1.13
 description: Fast Async WorldEdit plugin
-authors: [Empire92]
+authors: [Empire92, MattBDev]
 loadbefore: [BannerBoard, WorldGuard, PlotSquared, AsyncWorldEdit, AsyncWorldEditInjector]
 database: false
 permissions:
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java
index 36e7e6d9b..ea0381916 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotSetBiome.java
@@ -59,9 +59,9 @@ public class PlotSetBiome extends Command {
         Collection<BiomeType> knownBiomes = BiomeTypes.values();
         final BiomeType biome = Biomes.findBiomeByName(knownBiomes, args[0], biomeRegistry);
         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);
-            MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.s() + biomes);
+            MainUtil.sendMessage(player, Captions.SUBCOMMAND_SET_OPTIONS_HEADER.toString() + biomes);
             return;
         }
         confirm.run(this, new Runnable() {