update grande build, fix imports, update readme

Author: DevSrSouza

.gitignore

@@ -32,3 +32,5 @@ out/
 
 # Linux temp files
 *~
+
+jcenter.properties

README.md

@@ -11,14 +11,16 @@ KotlinBukkitAPI is an API for Bukkit/SpigotAPI using the cool and nifty features
 ## Dependencies
 | Name | Version |
 | --- | --- |
-| [Spigot API](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/) | 1.8.8 |
+| [Spigot API](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/) | 1.8.8+ |
 
 ## Dependencies Embed
 | Name | Version |
 | --- | --- |
-| Kotlin STD | 1.3.71 |
+| Kotlin STD + JDK8 | 1.3.71 |
 | [Kotlinx-coroutines](https://github.com/Kotlin/kotlinx.coroutines/) | 1.3.5 |
 | [Skedule](https://github.com/okkero/Skedule) | 1.2.6 |
+| [Kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization) | 0.20.0  |
+| [KAML](https://github.com/charleskorn/kaml) | 0.18.1 |
 
 ## Modules
 | Module | Description |
@@ -27,40 +29,22 @@ KotlinBukkitAPI is an API for Bukkit/SpigotAPI using the cool and nifty features
 | Architecture | Help you with the Architecture of your plugin providing KotlinPlugin base and Lifecycle Listener |
 | Plugins | Extensions for others plugins like Vault, PlaceholderAPI and others |
 | Exposed(0.21.1) | Extensions for SQL framework [Exposed](https://github.com/JetBrains/Exposed/) |
-| Kotlinx.Serialization(0.20.0) | Extensions for [Kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization) |
+| Serialization(0.20.0) | Extensions for [Kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization) |
 
-# Links
-- [Starter project using KotlinBukkitAPI](https://github.com/KotlinMinecraft/KBAPI-StarterProject/)
-- [Examples and **documentation**](https://github.com/DevSrSouza/KotlinBukkitAPI/wiki/)
-- [Clone and building](https://github.com/DevSrSouza/KotlinBukkitAPI/wiki/Clone-and-build)
+## [Documentation](https://github.com/DevSrSouza/KotlinBukkitAPI/wiki/)
 
-# [Download](http://jenkins.devsrsouza.com.br/job/KotlinBukkitAPI/)
+## [Download](http://jenkins.devsrsouza.com.br/job/KotlinBukkitAPI/)
 
-# Setup for development
+## Others resources
+- [Starter project using KotlinBukkitAPI](https://github.com/KotlinMinecraft/KBAPI-StarterProject/)
 
-First of all, you need to put KotlinBukkitAPI as a dependency on your **plugin.yml**
-```yaml
-depend: [KotlinBukkitAPI]
-```
+## [Setup for development](https://github.com/DevSrSouza/KotlinBukkitAPI/wiki/Getting-Started)
 
-### Gradle
+# Samples
 
-```groovy
-repositories {
-  maven {
-    name = "KotlinBukkitAPI"
-    url = "http://nexus.devsrsouza.com.br/repository/maven-public/"
-  }
-}
+KotlinBukkitAPI goes beyond this samples, and you can find all of it in the [wiki/documentation](https://github.com/DevSrSouza/KotlinBukkitAPI/wiki/).
 
-dependencies {
-  compileOnly("br.com.devsrsouza.kotlinbukkitapi:core:0.1.0-SNAPSHOT") // core
-}
-```
-
-# Examples
-
-Event DSL example
+Event DSL sample
 ```kotlin
 plugin.events {
   event<PlayerJoinEvent> {
@@ -76,7 +60,7 @@ plugin.events {
 Simple Command DSL example
 ```kotlin
 plugin.simpleCommand("twitter") {
-  sender.msg(+"&eFollow me on Twitter :D &ahttps://twitter.com/DevSrSouza")
+  sender.msg("&eFollow me on Twitter :D &ahttps://twitter.com/DevSrSouza".translateColor())
 }
 ```
 
@@ -85,46 +69,56 @@ Item meta DSL and other stuff
 val gem = item(Material.DIAMOND).apply {
   amount = 5
   meta<ItemMeta> {
-    displayName = +"&bGem"
+    displayName = "&bGem".translateColor()
   }
 }
 val encbook = item(Material.ENCHANTED_BOOK).meta<EnchantmentStorageMeta> {
-  displayName = +"&4&lThe powerful BOOK"
+  displayName = "&4&lThe powerful BOOK".translateColor()
   addStoredEnchant(Enchantment.DAMAGE_ALL, 10, true) // putting sharpness 10 to the book
 }
 ```
 
+Another approach:
+```
+val gem = item(Material.DIAMOND, amount = 5).displayName("&bGem".translateColor())
+
+val encbook = metadataItem<EnchantmentStorageMeta>(Material.ENCHANTED_BOOK) {
+  displayName = "&4&lThe powerful BOOK".translateColor()
+    addStoredEnchant(Enchantment.DAMAGE_ALL, 10, true) // putting sharpness 10 to the book
+}
+```
+
 Menu creator DSL
 ```kotlin
 val myMenu = menu(+"&cWarps", 3, true) {
 
-  slot(2, 4) { // Line, Slot
-    item = ItemStack(Material.DIAMOND_SWORD).apply {
-      addEnchantment(Enchantment.DAMAGE_ALL, 5)
-
-      meta<ItemMeta> {
-        displayName = +"&4Arena PvP"
-      }
-    }
+  val arenaPvP = item(Material.DIAMOND_SWORD) {
+      addEnchant(Enchantment.DAMAGE_ALL, 5, true)
+      displayName = "&4Arena PvP".translateColor()
+  }
 
+  slot(2, 4, arenaPvP) { // Line, Slot
     onClick {
       player.teleport(Location(player.world, 250, 70, -355))
       close() // close the menu
     }
   }
 
-  slot(2, 6) {
-    item = ItemStack(Material.GOLD).apply {
-      meta<ItemMeta> {
-        displayName = +"&6Shop"
-      }
-    }
-    
+  slot(2, 6, item(Material.GOLD).displayName("&6Shop".translateColor())) {
     onClick {
       player.teleport(Location(player.world, 2399, 70, -1234))
       close() // close the menu
     }
   }
+
+  // when the menu renders to a player, will show the Paper item with their name.
+  slot(3, 9, item(Material.PAPER).displayName("Hello {player}")) {
+    onRender {
+      showingItem?.meta<ItemMeta> {
+         displayName = displayName.replace("{player}", player.name)
+      } 
+    }
+  }
 }
 
 // open to player

build.gradle.kts

@@ -1,63 +1,42 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
 import org.gradle.api.tasks.bundling.Jar
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("java")
     id("maven-publish")
     kotlin("jvm") version "1.3.71"
     id("com.github.johnrengelman.shadow") version "4.0.3"
     id("net.minecrell.plugin-yml.bukkit") version "0.3.0"
+    id("com.jfrog.bintray") version "1.8.4"
 }
 
-val softPlugins by extra(mutableListOf<String>())
-
 val groupPrefix = "br.com.devsrsouza.kotlinbukkitapi"
-val pVersion = "0.1.0-SNAPSHOT"
+val pVersion = KotlinBukkitAPI.version
 group = groupPrefix
 version = pVersion
 
+val jcenter = loadProperties("jcenter.properties")
+
 subprojects {
     plugins.apply("org.jetbrains.kotlin.jvm")
     plugins.apply("maven-publish")
     plugins.apply("com.github.johnrengelman.shadow")
+    plugins.apply("com.jfrog.bintray")
 
     group = groupPrefix
     version = pVersion
 
     repositories {
         jcenter()
-        maven {
-            name = "spigot"
-            url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
-        }
-        maven {
-            name = "sonatype"
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-        }
-        maven {
-            name = "devsrsouza"
-            url = uri("http://nexus.devsrsouza.com.br/repository/maven-public/")
-        }
+        maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+        maven("https://oss.sonatype.org/content/repositories/snapshots/")
+        maven("http://nexus.devsrsouza.com.br/repository/maven-public/")
     }
 
     dependencies {
         compileOnly(kotlin("stdlib-jdk8"))
 
         compileOnly("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
-
-        testRuntime(kotlin("stdlib"))
-        testRuntime("org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
-        testRuntime("org.junit.platform:junit-platform-launcher:1.3.2")
-        testRuntime("org.junit.jupiter:junit-jupiter-engine:5.3.2")
-        testRuntime("org.junit.vintage:junit-vintage-engine:5.3.2")
-
-        testRuntime("org.mockito:mockito-core:2.24.0")
-    }
-
-    tasks.withType<Test> {
-        useJUnitPlatform()
     }
 
     kotlin {
@@ -67,11 +46,14 @@ subprojects {
     }
 
     tasks {
-        withType<KotlinCompile> {
+        test {
+            useJUnitPlatform()
+        }
+        compileKotlin {
             kotlinOptions.jvmTarget = "1.8"
         }
 
-        withType<ShadowJar> {
+        shadowJar {
             baseName = "KotlinBukkitAPI-${project.name}"
             classifier = null
             version = null
@@ -98,8 +80,8 @@ subprojects {
                 version = project.version.toString()
                 pom {
                     name.set("KotlinBukkitAPI-${project.name}")
-                    description.set("KotlinBukkitAPI is an API for Bukkit/SpigotAPI using the cool and nifty features Kotlin has to make your life more easier.")
-                    url.set("https://github.com/DevSrSouza/KotlinBukkitAPI")
+                    description.set(KotlinBukkitAPI.github)
+                    url.set(KotlinBukkitAPI.github)
                     licenses {
                         license {
                             name.set("MIT License")
@@ -116,7 +98,32 @@ subprojects {
                     }
                     scm {
                         url.set("https://github.com/DevSrSouza/KotlinBukkitAPI/tree/master/" +
-                                "${project.path.removePrefix(":").replace(":", "/")}")
+                                project.path.removePrefix(":").replace(":", "/"))
+                    }
+                }
+            }
+        }
+    }
+
+    if(jcenter != null) {
+        bintray {
+            user = jcenter["bintray_user"] as String
+            key = jcenter["bintray_key"] as String
+            setPublications("maven")
+            with(pkg) {
+                repo = "KotlinBukkitAPI"
+                name = project.name
+                websiteUrl = KotlinBukkitAPI.github
+                vcsUrl = "${KotlinBukkitAPI.github}.git"
+                issueTrackerUrl = "${KotlinBukkitAPI.github}/issues"
+                setLicenses("MIT")
+
+                with(version) {
+                    name = project.version.toString()
+
+                    with(gpg) {
+                        sign = (jcenter["gpg_sign"] as String).toBoolean()
+                        passphrase = jcenter["gpg_passphrase"] as String
                     }
                 }
             }
@@ -129,20 +136,20 @@ repositories {
 }
 
 dependencies {
-    compile(kotlin("stdlib-jdk8"))
+    implementation(kotlin("stdlib-jdk8"))
 
     subprojects.forEach {
-        compile(project(it.path, configuration = "shadow"))
+        implementation(project(it.path, configuration = "shadow"))
     }
 }
 
 tasks {
-    "compileKotlin"(KotlinCompile::class) {
+    compileKotlin {
         kotlinOptions {
             jvmTarget = "1.8"
         }
     }
-    "shadowJar"(ShadowJar::class) {
+    shadowJar {
         baseName = project.name
         version += "-b${System.getenv("BUILD_NUMBER")}"
         classifier = null
@@ -153,11 +160,12 @@ bukkit {
     name = project.name
     version = project.version.toString()
     main = "br.com.devsrsouza.kotlinbukkitapi.KotlinBukkitAPI"
+    description = KotlinBukkitAPI.description
 
-    website = "https://github.com/DevSrSouza/KotlinBukkitAPI"
+    website = KotlinBukkitAPI.github
     authors = listOf("DevSrSouza")
 
-    softDepend = softPlugins
+    softDepend = KotlinBukkitAPI.plugins.map { it.name }
 
     load = BukkitPluginDescription.PluginLoadOrder.STARTUP
 }

buildSrc/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    `kotlin-dsl`
+}
+repositories {
+    jcenter()
+    google()
+}
+dependencies {
+
+}

buildSrc/src/main/kotlin/KotlinBukkitAPI.kt

@@ -0,0 +1,20 @@
+object KotlinBukkitAPI {
+    val version = "0.0.1"
+
+    val displayName = "KotlinBukkitAPI"
+    val description = "KotlinBukkitAPI is an API for Bukkit/SpigotAPI using the cool and nifty features Kotlin has to make your life more easier."
+    val github = "https://github.com/DevSrSouza/KotlinBukkitAPI"
+
+    val plugins = listOf(
+            Plugin("Vault", setOf("http://nexus.hc.to/content/repositories/pub_releases"), setOf("net.milkbowl.vault:VaultAPI:1.6")),
+            Plugin("PlaceholderAPI", setOf("http://repo.extendedclip.com/content/repositories/placeholderapi/"), setOf("me.clip:placeholderapi:2.8.5")),
+            Plugin("MVdWPlaceholderAPI", setOf("http://repo.mvdw-software.be/content/groups/public/"), setOf("be.maximvdw:MVdWPlaceholderAPI:2.5.2-SNAPSHOT")),
+            Plugin("ActionBarAPI", setOf("https://jitpack.io"), setOf("com.github.ConnorLinfoot:ActionBarAPI:d60c2aedb9")),
+            Plugin("TitleAPI", setOf("https://jitpack.io"), setOf("com.github.ConnorLinfoot:TitleAPI:1.7.6")),
+            Plugin("WorldEdit", setOf("http://maven.sk89q.com/repo/"), setOf("com.sk89q.worldedit:worldedit-bukkit:6.1.5")),
+            Plugin("ViaVersion", setOf("https://repo.viaversion.com/"), setOf("us.myles:viaversion-common:1.4.1")),
+            Plugin("BossBarAPI", setOf("https://repo.inventivetalent.org/content/groups/public/"), setOf("org.inventivetalent:bossbarapi:2.4.1")),
+            Plugin("HologramAPI", setOf("https://repo.inventivetalent.org/content/groups/public/"), setOf("org.inventivetalent:hologramapi:1.4.0")),
+            Plugin("ProtocolLib", setOf("http://repo.dmulloy2.net/nexus/repository/public/"), setOf("com.comphenix.protocol:ProtocolLib:4.4.0"))
+    )
+}

buildSrc/src/main/kotlin/Plugin.kt

@@ -0,0 +1,5 @@
+data class Plugin(
+        val name: String,
+        val repositories: Set<String>,
+        val dependencies: Set<String>
+)

buildSrc/src/main/kotlin/Utils.kt

@@ -0,0 +1,11 @@
+import java.io.File
+import java.util.*
+
+// null if the file does not exist
+fun loadProperties(file: String): Properties? {
+    val file = File(file).takeIf { it.exists() } ?: return null
+
+    return Properties().apply {
+        load(file.inputStream())
+    }
+}