Merge pull request #107 from Trivernis/develop

Patch 1.3.4
master v1.3.4
Trivernis 4 years ago committed by GitHub
commit 689fea28d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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

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

@ -56,8 +56,13 @@ class LanguageManager(private val plugin: Chunkmaster) {
* Returns a localized message with replacements * Returns a localized message with replacements
*/ */
fun getLocalized(key: String, vararg replacements: Any): String { fun getLocalized(key: String, vararg replacements: Any): String {
val localizedString = langProps.getProperty(key) try {
return String.format(localizedString, *replacements) 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
}
} }
/** /**

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

Loading…
Cancel
Save