Skip to content

Commit e7c4ab5

Browse files
committed
applying ktlint rules to the source code
1 parent b15ce0e commit e7c4ab5

File tree

117 files changed

+1529
-1386
lines changed

Some content is hidden

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

117 files changed

+1529
-1386
lines changed

architecture/src/main/kotlin/br/com/devsrsouza/kotlinbukkitapi/architecture/KotlinPlugin.kt

+21-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package br.com.devsrsouza.kotlinbukkitapi.architecture
22

3-
import br.com.devsrsouza.kotlinbukkitapi.architecture.lifecycle.*
4-
import org.bukkit.plugin.Plugin
3+
import br.com.devsrsouza.kotlinbukkitapi.architecture.lifecycle.Lifecycle
4+
import br.com.devsrsouza.kotlinbukkitapi.architecture.lifecycle.LifecycleEvent
5+
import br.com.devsrsouza.kotlinbukkitapi.architecture.lifecycle.LifecycleListener
6+
import br.com.devsrsouza.kotlinbukkitapi.architecture.lifecycle.PluginLifecycleListener
57
import org.bukkit.plugin.java.JavaPlugin
68
import java.util.concurrent.ConcurrentHashMap
79

@@ -24,8 +26,8 @@ public abstract class KotlinPlugin : JavaPlugin() {
2426
* **Priority Order**: High priority loads first and disable lastly
2527
*/
2628
public inline fun <P : KotlinPlugin, T : LifecycleListener<P>> lifecycle(
27-
priority: Int = 1,
28-
block: () -> T
29+
priority: Int = 1,
30+
block: () -> T,
2931
): T = block().also {
3032
registerKotlinPluginLifecycle(priority, it as LifecycleListener<KotlinPlugin>)
3133
}
@@ -36,15 +38,15 @@ public abstract class KotlinPlugin : JavaPlugin() {
3638
* **Priority Order**: High priority loads first and disable lastly
3739
*/
3840
public fun registerKotlinPluginLifecycle(
39-
priority: Int = 1,
40-
listener: PluginLifecycleListener
41+
priority: Int = 1,
42+
listener: PluginLifecycleListener,
4143
) {
4244
_lifecycleListeners.put(
43-
Lifecycle(
44-
priority,
45-
listener
46-
),
47-
true
45+
Lifecycle(
46+
priority,
47+
listener,
48+
),
49+
true,
4850
)
4951
}
5052

@@ -59,14 +61,14 @@ public abstract class KotlinPlugin : JavaPlugin() {
5961
final override fun onLoad() {
6062
onPluginLoad()
6163

62-
for(lifecycle in lifecycleLoadOrder())
64+
for (lifecycle in lifecycleLoadOrder())
6365
lifecycle.listener(LifecycleEvent.LOAD)
6466
}
6567

6668
final override fun onEnable() {
6769
onPluginEnable()
6870

69-
for(lifecycle in lifecycleLoadOrder())
71+
for (lifecycle in lifecycleLoadOrder())
7072
lifecycle.listener(LifecycleEvent.ENABLE)
7173
}
7274

@@ -76,7 +78,7 @@ public abstract class KotlinPlugin : JavaPlugin() {
7678
// reversing lifecycles for execute first the low priority ones
7779
val reversedLifecyle = lifecycleDisableOrder()
7880

79-
for(lifecycle in reversedLifecyle)
81+
for (lifecycle in reversedLifecyle)
8082
lifecycle.listener(LifecycleEvent.DISABLE)
8183
}
8284

@@ -89,12 +91,11 @@ public abstract class KotlinPlugin : JavaPlugin() {
8991
public fun someConfigReloaded(all: Boolean = false) {
9092
onConfigReload()
9193

92-
for(lifecycle in lifecycleListeners)
94+
for (lifecycle in lifecycleListeners)
9395
lifecycle.listener(
94-
if(all)
95-
LifecycleEvent.ALL_CONFIG_RELOAD
96-
else LifecycleEvent.CONFIG_RELOAD
96+
if (all) {
97+
LifecycleEvent.ALL_CONFIG_RELOAD
98+
} else LifecycleEvent.CONFIG_RELOAD,
9799
)
98100
}
99-
100-
}
101+
}

architecture/src/main/kotlin/br/com/devsrsouza/kotlinbukkitapi/architecture/ThirdPartyAware.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package br.com.devsrsouza.kotlinbukkitapi.architecture
22

33
import br.com.devsrsouza.kotlinbukkitapi.architecture.extensions.WithPlugin
4-
import java.util.WeakHashMap
54
import org.bukkit.event.EventHandler
65
import org.bukkit.event.server.PluginDisableEvent
76
import org.bukkit.plugin.Plugin
7+
import java.util.WeakHashMap
88

99
/**
1010
* A holder for all instance of a class [T] that is bound a specific plugin.
@@ -33,4 +33,4 @@ public abstract class PluginDisableAwareController<T : PluginDisableAware> {
3333

3434
public interface PluginDisableAware : WithPlugin<Plugin> {
3535
public fun onDisable()
36-
}
36+
}

architecture/src/main/kotlin/br/com/devsrsouza/kotlinbukkitapi/architecture/extensions/ExDependency.kt

+13-24
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,45 @@ import kotlin.reflect.KProperty
1111
* otherwise, returns null
1212
*/
1313
public inline fun <reified T : Plugin> KotlinPlugin.softDepend(
14-
pluginName: String
14+
pluginName: String,
1515
): SoftDependencyDelegate<T> = softDepend(T::class, pluginName)
1616

1717
public fun <T : Plugin> KotlinPlugin.softDepend(
1818
type: KClass<T>,
19-
pluginName: String
19+
pluginName: String,
2020
): SoftDependencyDelegate<T> =
2121
SoftDependencyDelegate(
2222
pluginName,
23-
type
23+
type,
2424
)
2525

2626
/**
2727
* Delegate that returns the plugin dependency, disable the plugin if the plugin
2828
* is not available.
2929
*/
3030
public inline fun <reified T : Plugin> KotlinPlugin.depend(
31-
pluginName: String
31+
pluginName: String,
3232
): DependencyDelegate<T> = depend(T::class, pluginName)
3333

3434
public fun <T : Plugin> KotlinPlugin.depend(
3535
type: KClass<T>,
36-
pluginName: String
36+
pluginName: String,
3737
): DependencyDelegate<T> =
3838
DependencyDelegate(pluginName, type)
3939

40-
41-
42-
43-
44-
45-
46-
47-
48-
49-
5040
public class DependencyDelegate<T : Plugin>(
5141
public val pluginName: String,
52-
public val type: KClass<T>
42+
public val type: KClass<T>,
5343
) : ReadOnlyProperty<KotlinPlugin, T> {
5444

5545
private var isDisabled: Boolean = false
5646
private var cache: T? = null
5747

5848
override fun getValue(
5949
thisRef: KotlinPlugin,
60-
property: KProperty<*>
50+
property: KProperty<*>,
6151
): T {
62-
if(cache == null) {
52+
if (cache == null) {
6353
val plugin = thisRef.server.pluginManager.getPlugin(pluginName)
6454

6555
if (plugin != null) {
@@ -69,7 +59,7 @@ public class DependencyDelegate<T : Plugin>(
6959
thisRef.server.pluginManager.disablePlugin(thisRef)
7060
error(
7161
"Invalid plugin dependency with the name $pluginName: " +
72-
"The plugin do not match main class with ${type.qualifiedName}."
62+
"The plugin do not match main class with ${type.qualifiedName}.",
7363
)
7464
}
7565
} else {
@@ -84,17 +74,17 @@ public class DependencyDelegate<T : Plugin>(
8474

8575
public class SoftDependencyDelegate<T : Plugin>(
8676
public val pluginName: String,
87-
public val type: KClass<T>
77+
public val type: KClass<T>,
8878
) : ReadOnlyProperty<KotlinPlugin, T?> {
8979

9080
private var alreadySearch: Boolean = false
9181
private var cache: T? = null
9282

9383
override fun getValue(
9484
thisRef: KotlinPlugin,
95-
property: KProperty<*>
85+
property: KProperty<*>,
9686
): T? {
97-
if(!alreadySearch) {
87+
if (!alreadySearch) {
9888
val plugin = thisRef.server.pluginManager.getPlugin(pluginName) ?: return null
9989

10090
alreadySearch = true
@@ -105,12 +95,11 @@ public class SoftDependencyDelegate<T : Plugin>(
10595
thisRef.server.pluginManager.disablePlugin(thisRef)
10696
error(
10797
"Invalid plugin dependency with the name $pluginName: " +
108-
"The plugin do not match main class with ${type.qualifiedName}."
98+
"The plugin do not match main class with ${type.qualifiedName}.",
10999
)
110100
}
111101
}
112102

113103
return cache
114104
}
115105
}
116-

architecture/src/main/kotlin/br/com/devsrsouza/kotlinbukkitapi/architecture/lifecycle/Lifecycle.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ package br.com.devsrsouza.kotlinbukkitapi.architecture.lifecycle
44
* Holds a lifecycle listener class and its priority
55
*/
66
public data class Lifecycle(
7-
val priority: Int,
8-
val listener: PluginLifecycleListener
7+
val priority: Int,
8+
val listener: PluginLifecycleListener,
99
) : Comparable<Lifecycle> {
1010

1111
override fun compareTo(
12-
other: Lifecycle
12+
other: Lifecycle,
1313
): Int = other.priority.compareTo(priority)
14-
}
14+
}

architecture/src/main/kotlin/br/com/devsrsouza/kotlinbukkitapi/architecture/lifecycle/LifecycleListener.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import br.com.devsrsouza.kotlinbukkitapi.architecture.extensions.WithPlugin
99
public interface LifecycleListener<T : KotlinPlugin> : PluginLifecycleListener, WithPlugin<T> {
1010

1111
override fun invoke(event: LifecycleEvent) {
12-
when(event) {
12+
when (event) {
1313
LifecycleEvent.LOAD -> onPluginLoad()
1414
LifecycleEvent.ENABLE -> onPluginEnable()
1515
LifecycleEvent.DISABLE -> onPluginDisable()
@@ -38,4 +38,4 @@ public interface LifecycleListener<T : KotlinPlugin> : PluginLifecycleListener,
3838
* Called when some part of your code calls [KotlinPlugin.reloadConfig]
3939
*/
4040
public fun onConfigReload() {}
41-
}
41+
}

architecture/src/main/kotlin/br/com/devsrsouza/kotlinbukkitapi/architecture/lifecycle/PluginLifecycleListener.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package br.com.devsrsouza.kotlinbukkitapi.architecture.lifecycle
22

33
public enum class LifecycleEvent { LOAD, ENABLE, DISABLE, CONFIG_RELOAD, ALL_CONFIG_RELOAD }
44

5-
public typealias PluginLifecycleListener = (LifecycleEvent) -> Unit
5+
public typealias PluginLifecycleListener = (LifecycleEvent) -> Unit

architecture/src/main/kotlin/br/com/devsrsouza/kotlinbukkitapi/architecture/lifecycle/Utils.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package br.com.devsrsouza.kotlinbukkitapi.architecture.lifecycle
33
import br.com.devsrsouza.kotlinbukkitapi.architecture.KotlinPlugin
44

55
public inline fun <reified T : PluginLifecycleListener> KotlinPlugin.getOrInsertGenericLifecycle(
6-
priority: Int,
7-
factory: () -> T
6+
priority: Int,
7+
factory: () -> T,
88
): T {
99
return lifecycleListeners
10-
.map { it.listener }
11-
.filterIsInstance<T>()
12-
.firstOrNull()
13-
?: factory().also { registerKotlinPluginLifecycle(priority, it) }
14-
}
10+
.map { it.listener }
11+
.filterIsInstance<T>()
12+
.firstOrNull()
13+
?: factory().also { registerKotlinPluginLifecycle(priority, it) }
14+
}

build-logic/convention/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ gradlePlugin {
2626
plugins {
2727
register("kotlinBukkitApiBuild") {
2828
id = "kotlinbukkitapi.build"
29-
implementationClass = "br.com.devsrsouza.kotlinbukkitapi.build.KBAPIBuildPlugin"
29+
implementationClass = "br.com.devsrsouza.kotlinbukkitapi.buildlogic.KBAPIBuildPlugin"
3030
}
3131
}
3232
}

0 commit comments

Comments
 (0)