Merge pull request #107 from Trivernis/develop

Patch 1.3.4

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 
 plugins {
     id 'idea'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.50'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.10'
     id 'com.github.johnrengelman.shadow' version '2.0.4'
 }
 
@@ -23,7 +23,7 @@ idea {
 
 group "net.trivernis"
 
-version "1.3.3"
+version PLUGIN_VERSION
 
 sourceCompatibility = 1.8
 
@@ -46,19 +46,18 @@ repositories {
 
     maven {
         name 'mikeprimm'
-        url 'http://repo.mikeprimm.com'
+        url 'https://repo.mikeprimm.com'
     }
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+    compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testCompile group: 'junit', name: 'junit', version: '4.12'
     compileOnly "com.destroystokyo.paper:paper-api:1.14.4-R0.1-SNAPSHOT"
     compileOnly "org.dynmap:dynmap-api:2.0"
     compileOnly group: 'org.xerial', name: 'sqlite-jdbc', version: '3.28.0'
-    compile "io.papermc:paperlib:1.0.2"
-    compile "org.bstats:bstats-bukkit:1.5"
+    implementation "io.papermc:paperlib:1.0.6"
+    implementation "org.bstats:bstats-bukkit:1.5"
 }
 
 apply plugin: "com.github.johnrengelman.shadow"
@@ -69,8 +68,15 @@ shadowJar {
     relocate 'org.bstats', 'net.trivernis.chunkmaster.bstats'
 }
 
-jar {
-    from configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+processResources {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    with copySpec {
+        from 'src/main/resources/'
+        include '**/*'
+        filter { String line ->
+            line.replace('$$PLUGIN_VERSION$$', PLUGIN_VERSION)
+        }
+    }
 }
 
 compileKotlin {
@@ -83,4 +89,7 @@ compileTestKotlin {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+    dependencies {
+        compileOnly group: 'junit', name: 'junit', version: '4.12'
+    }
 }

gradle.properties

@@ -1 +1,2 @@
-kotlin.code.style=official
+kotlin.code.style=official
+PLUGIN_VERSION=1.3.4

src/main/kotlin/net/trivernis/chunkmaster/lib/LanguageManager.kt

@@ -56,8 +56,13 @@ class LanguageManager(private val plugin: Chunkmaster) {
      * Returns a localized message with replacements
      */
     fun getLocalized(key: String, vararg replacements: Any): String {
-        val localizedString = langProps.getProperty(key)
-        return String.format(localizedString, *replacements)
+        try {
+            val localizedString = langProps.getProperty(key)
+            return String.format(localizedString, *replacements)
+        } catch (e: NullPointerException) {
+            plugin.logger.severe("Failed to get localized entry for $key")
+            throw e
+        }
     }
 
     /**

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 main: net.trivernis.chunkmaster.Chunkmaster
 name: Chunkmaster
-version: '1.3.3'
+version: $$PLUGIN_VERSION$$
 description: Automated world pregeneration.
 author: Trivernis
 website: trivernis.net