Skip to content

Commit ed8b59c

Browse files
PuharesourcePuharesource
committed
Simplified code, updated Gradle version, upgraded Kotlin version, fixed a few bugs & fixed code styling
1 parent 6ceeec0 commit ed8b59c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+701
-448
lines changed

‎build.gradle.kts‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ plugins {
88
java
99
`maven-publish`
1010

11-
kotlin("jvm") version "1.4.0"
12-
kotlin("kapt") version "1.4.0"
11+
kotlin("jvm") version "1.4.21"
12+
kotlin("kapt") version "1.4.21"
1313

1414
id("com.github.johnrengelman.shadow") version "5.1.0"
1515
id("org.jetbrains.dokka") version "0.10.0"
1616
id("net.saliman.properties") version "1.5.1"
17-
id("org.jlleitschuh.gradle.ktlint") version "9.2.1"
17+
id("org.jlleitschuh.gradle.ktlint") version "9.4.1"
1818
}
1919

2020
group = "io.puharesource.mc"
@@ -219,6 +219,7 @@ repositories {
219219
name = "cubekrowd-repo"
220220
url = uri("https://mavenrepo.cubekrowd.net/artifactory/repo/")
221221
}
222+
maven("https://dl.bintray.com/kotlin/kotlin-eap")
222223
}
223224

224225
dependencies {
@@ -245,4 +246,13 @@ dependencies {
245246

246247
testImplementation(group = "junit", name = "junit", version = "4.12")
247248
testImplementation(group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version = "1.3.50")
249+
implementation(kotlin("stdlib-jdk8"))
250+
}
251+
val compileKotlin: KotlinCompile by tasks
252+
compileKotlin.kotlinOptions {
253+
jvmTarget = "1.8"
254+
}
255+
val compileTestKotlin: KotlinCompile by tasks
256+
compileTestKotlin.kotlinOptions {
257+
jvmTarget = "1.8"
248258
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎logs/latest.log‎

Whitespace-only changes.

‎settings.gradle.kts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1+
pluginManagement {
2+
repositories {
3+
maven("https://dl.bintray.com/kotlin/kotlin-eap")
4+
mavenCentral()
5+
maven("https://plugins.gradle.org/m2/")
6+
}
7+
}
18
rootProject.name = "TitleManager"

‎src/main/kotlin/io/puharesource/mc/titlemanager/api/v2/animation/AnimationPart.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ fun interface AnimationPart<T> {
1111
/**
1212
* The part that should be displayed.
1313
*/
14-
fun getPart(): T
14+
fun getPart(): T
1515
}

‎src/main/kotlin/io/puharesource/mc/titlemanager/internal/Internals.kt‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,18 @@ internal fun onPluginDisable(body: () -> Unit) {
2727
val pluginManager = Bukkit.getPluginManager()
2828
val listener = object : Listener {}
2929

30-
pluginManager.registerEvent(PluginDisableEvent::class.java, listener, EventPriority.MONITOR, { _, event ->
31-
val disableEvent = event as PluginDisableEvent
32-
33-
if (disableEvent.plugin == pluginInstance) {
34-
body()
35-
}
36-
}, pluginInstance, false)
30+
pluginManager.registerEvent(
31+
PluginDisableEvent::class.java,
32+
listener,
33+
EventPriority.MONITOR,
34+
{ _, event ->
35+
val disableEvent = event as PluginDisableEvent
36+
37+
if (disableEvent.plugin == pluginInstance) {
38+
body()
39+
}
40+
},
41+
pluginInstance,
42+
false
43+
)
3744
}

‎src/main/kotlin/io/puharesource/mc/titlemanager/internal/color/Interpolator.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package io.puharesource.mc.titlemanager.internal.color
22

3-
interface Interpolator<T> {
3+
fun interface Interpolator<T> {
44
fun interpolate(percentage: Float): T
55
}

‎src/main/kotlin/io/puharesource/mc/titlemanager/internal/color/InterpolatorUtil.kt‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ object InterpolatorUtil {
2020
val greenInterpolator = createRgbInterpolator(start.green, end.green)
2121
val blueInterpolator = createRgbInterpolator(start.blue, end.blue)
2222

23-
return createInterpolator { percentage -> Color(
24-
redInterpolator.interpolate(percentage).toInt(),
25-
greenInterpolator.interpolate(percentage).toInt(),
26-
blueInterpolator.interpolate(percentage).toInt())
23+
return createInterpolator { percentage ->
24+
Color(
25+
redInterpolator.interpolate(percentage).toInt(),
26+
greenInterpolator.interpolate(percentage).toInt(),
27+
blueInterpolator.interpolate(percentage).toInt()
28+
)
2729
}
2830
}
2931

@@ -90,10 +92,12 @@ object InterpolatorUtil {
9092
val saturationInterpolator = createNoGammaInterpolator(start.saturation, end.saturation)
9193
val lightnessInterpolator = createNoGammaInterpolator(start.lightness, end.lightness)
9294

93-
return createInterpolator { percentage -> HslColor(
94-
hueInterpolator.interpolate(percentage),
95-
saturationInterpolator.interpolate(percentage),
96-
lightnessInterpolator.interpolate(percentage))
95+
return createInterpolator { percentage ->
96+
HslColor(
97+
hueInterpolator.interpolate(percentage),
98+
saturationInterpolator.interpolate(percentage),
99+
lightnessInterpolator.interpolate(percentage)
100+
)
97101
}
98102
}
99103

@@ -127,7 +131,5 @@ object InterpolatorUtil {
127131
}
128132
}
129133

130-
private inline fun <T> createInterpolator(crossinline interpolator: (Float) -> T): Interpolator<T> = object : Interpolator<T> {
131-
override fun interpolate(percentage: Float): T = interpolator(percentage)
132-
}
134+
private inline fun <T> createInterpolator(crossinline interpolator: (Float) -> T): Interpolator<T> = Interpolator { percentage -> interpolator(percentage) }
133135
}

‎src/main/kotlin/io/puharesource/mc/titlemanager/internal/commands/TMCommand.kt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ import java.util.TreeSet
1717

1818
class TMCommand constructor(private val plugin: TitleManagerPlugin) : CommandExecutor, TabCompleter {
1919
private val subCommands: MutableMap<String, TMSubCommand> = TreeMap(String.CASE_INSENSITIVE_ORDER)
20-
private val parameterPattern = """(?i)^[-](silent|world|fadein|stay|fadeout|radius)$""".toRegex()
21-
private val parameterPatternWithValue = """(?i)^[-](silent|world|fadein|stay|fadeout|radius)[=]([^ ]+)$""".toRegex()
22-
private val commandSplitPattern = """([<]nl[>])|(\\n)""".toRegex()
20+
private val parameterPattern =
21+
"""(?i)^[-](silent|world|fadein|stay|fadeout|radius)$""".toRegex()
22+
private val parameterPatternWithValue =
23+
"""(?i)^[-](silent|world|fadein|stay|fadeout|radius)[=]([^ ]+)$""".toRegex()
24+
private val commandSplitPattern =
25+
"""([<]nl[>])|(\\n)""".toRegex()
2326

2427
init {
2528
addSubCommand(createSubCommand(aliases = arrayOf("abroadcast", "abc"), executor = ::executorActionbarBroadcast))
@@ -228,9 +231,7 @@ class TMCommand constructor(private val plugin: TitleManagerPlugin) : CommandExe
228231
val animations = plugin.titleManagerComponent.animationsService().animations.keys
229232
val separator = plugin.config.getString("messages.command-animations.separator").orEmpty().color()
230233

231-
commandExecutor.sendConfigMessage("format",
232-
"count" to animations.size.toString(),
233-
"animations" to animations.joinToString(separator = separator))
234+
commandExecutor.sendConfigMessage("format", "count" to animations.size.toString(), "animations" to animations.joinToString(separator = separator))
234235
}
235236

236237
private fun executorBroadcast(commandExecutor: io.puharesource.mc.titlemanager.internal.model.command.CommandExecutor) {
@@ -336,9 +337,7 @@ class TMCommand constructor(private val plugin: TitleManagerPlugin) : CommandExe
336337
private fun executorScripts(commandExecutor: io.puharesource.mc.titlemanager.internal.model.command.CommandExecutor) {
337338
val scripts = plugin.getRegisteredScripts()
338339

339-
commandExecutor.sendConfigMessage("format",
340-
"count" to scripts.size.toString(),
341-
"scripts" to scripts.joinToString(separator = plugin.config.getString("messages.command-scripts.separator").orEmpty().color()))
340+
commandExecutor.sendConfigMessage("format", "count" to scripts.size.toString(), "scripts" to scripts.joinToString(separator = plugin.config.getString("messages.command-scripts.separator").orEmpty().color()))
342341
}
343342

344343
private fun executorVersion(commandExecutor: io.puharesource.mc.titlemanager.internal.model.command.CommandExecutor) {

‎src/main/kotlin/io/puharesource/mc/titlemanager/internal/config/ConfigMigration.kt‎

Lines changed: 47 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,32 @@ class ConfigMigration(private val plugin: TitleManagerPlugin) {
9191
move("updater.check-automatically", "check-for-updates")
9292

9393
move("tabmenu.enabled", "player-list.enabled")
94-
move("tabmenu.header", "player-list.header", transformer = {
95-
val header = it as String
96-
97-
if (header.contains("\\n")) {
98-
header.split("\\n")
99-
} else {
100-
header
94+
move(
95+
"tabmenu.header",
96+
"player-list.header",
97+
transformer = {
98+
val header = it as String
99+
100+
if (header.contains("\\n")) {
101+
header.split("\\n")
102+
} else {
103+
header
104+
}
101105
}
102-
})
103-
move("tabmenu.footer", "player-list.footer", transformer = {
104-
val footer = it as String
105-
106-
if (footer.contains("\\n")) {
107-
footer.split("\\n")
108-
} else {
109-
footer
106+
)
107+
move(
108+
"tabmenu.footer",
109+
"player-list.footer",
110+
transformer = {
111+
val footer = it as String
112+
113+
if (footer.contains("\\n")) {
114+
footer.split("\\n")
115+
} else {
116+
footer
117+
}
110118
}
111-
})
119+
)
112120

113121
move("welcome_message.enabled", "welcome-title.enabled")
114122
move("welcome_message.title", "welcome-title.title")
@@ -133,21 +141,21 @@ class ConfigMigration(private val plugin: TitleManagerPlugin) {
133141
val oldAnimationsConfig = YamlConfiguration.loadConfiguration(oldAnimationFile)
134142

135143
oldAnimationsConfig.getKeys(false)
136-
.map { it to oldAnimationsConfig.getStringList("$it.frames") }
137-
.forEach { entry ->
138-
val name = entry.first
139-
val frames = entry.second
140-
.joinToString(separator = "\n")
141-
.replace(oldPlaceholderPattern, transform = { "%{${it.groups[1]!!.value}}" })
142-
143-
animationsFolder.mkdirs()
144-
val file = File(animationsFolder, "$name.txt")
145-
146-
if (!file.exists()) {
147-
file.createNewFile()
148-
file.writeText(frames)
149-
}
144+
.map { it to oldAnimationsConfig.getStringList("$it.frames") }
145+
.forEach { entry ->
146+
val name = entry.first
147+
val frames = entry.second
148+
.joinToString(separator = "\n")
149+
.replace(oldPlaceholderPattern, transform = { "%{${it.groups[1]!!.value}}" })
150+
151+
animationsFolder.mkdirs()
152+
val file = File(animationsFolder, "$name.txt")
153+
154+
if (!file.exists()) {
155+
file.createNewFile()
156+
file.writeText(frames)
150157
}
158+
}
151159

152160
oldAnimationFile.renameTo(File(dataFolder, "animations-old.yml"))
153161
}
@@ -167,17 +175,17 @@ class ConfigMigration(private val plugin: TitleManagerPlugin) {
167175
val oldConfig = YamlConfiguration.loadConfiguration(oldFile.reader())
168176

169177
conf.getKeys(false)
170-
.asSequence()
171-
.filter { it != "config-version" && it != "messages" }
172-
.filter { oldConfig.contains(it) }
173-
.map { it to oldConfig[it] }
174-
.forEach { conf.set(it.first, it.second) }
178+
.asSequence()
179+
.filter { it != "config-version" && it != "messages" }
180+
.filter { oldConfig.contains(it) }
181+
.map { it to oldConfig[it] }
182+
.forEach { conf.set(it.first, it.second) }
175183

176184
conf.getConfigurationSection("messages")!!.getKeys(false)
177-
.asSequence()
178-
.filter { oldConfig.contains(it) }
179-
.map { it to oldConfig[it] }
180-
.forEach { conf.getConfigurationSection("messages")!!.set(it.first, it.second) }
185+
.asSequence()
186+
.filter { oldConfig.contains(it) }
187+
.map { it to oldConfig[it] }
188+
.forEach { conf.getConfigurationSection("messages")!!.set(it.first, it.second) }
181189

182190
config.set("config-version", 5)
183191
config.save(configFile)

0 commit comments

Comments
 (0)