Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix style and compilation error
Browse files Browse the repository at this point in the history
alexstaeding committed Dec 9, 2023
1 parent 71e6019 commit 23d6fc9
Showing 9 changed files with 31 additions and 21 deletions.
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ import org.bukkit.plugin.Plugin
class AnvilPaperPlugin(private val plugin: AnvilPlugin) {
fun registerCommands(bootstrap: Plugin, event: ServerResourcesLoadEvent) {
plugin.registerCommands { command ->
event.commands.register(bootstrap, command.toPaper())
event.commands.register(bootstrap.pluginMeta, command.toPaper())
}
}
}
Original file line number Diff line number Diff line change
@@ -18,8 +18,6 @@

package org.anvilpowered.anvil.core.command

import org.apache.logging.log4j.Logger

interface CommandExecutor {

suspend fun execute(source: CommandSource, command: String): Boolean
Original file line number Diff line number Diff line change
@@ -77,18 +77,22 @@ class ListKey<E : Any> internal constructor(
}

@KeyBuilderDsl
interface AnonymousBuilderFacet<E : Any> : BuilderFacet<E, AnonymousBuilderFacet<E>>,
interface AnonymousBuilderFacet<E : Any> :
BuilderFacet<E, AnonymousBuilderFacet<E>>,
Key.BuilderFacet<List<E>, ListKey<E>, AnonymousBuilderFacet<E>>

@KeyBuilderDsl
interface NamedBuilderFacet<E : Any> : BuilderFacet<E, NamedBuilderFacet<E>>,
interface NamedBuilderFacet<E : Any> :
BuilderFacet<E, NamedBuilderFacet<E>>,
Key.NamedBuilderFacet<List<E>, ListKey<E>, NamedBuilderFacet<E>>

@KeyBuilderDsl
interface Builder<E : Any> : BuilderFacet<E, Builder<E>>,
interface Builder<E : Any> :
BuilderFacet<E, Builder<E>>,
Key.Builder<List<E>, ListKey<E>, Builder<E>>

@KeyBuilderDsl
interface FacetedBuilder<E : Any> : BuilderFacet<E, FacetedBuilder<E>>,
interface FacetedBuilder<E : Any> :
BuilderFacet<E, FacetedBuilder<E>>,
Key.FacetedBuilder<List<E>, ListKey<E>, FacetedBuilder<E>, AnonymousBuilderFacet<E>, NamedBuilderFacet<E>>
}
Original file line number Diff line number Diff line change
@@ -25,7 +25,8 @@ class ListKeyBuilder<E : Any>(
private val elementType: TypeToken<E>,
) : AbstractKeyBuilder<List<E>, ListKey<E>, ListKey.FacetedBuilder<E>, ListKey.AnonymousBuilderFacet<E>, ListKey.NamedBuilderFacet<E>>(
createListTypeToken(elementType),
), ListKey.FacetedBuilder<E> {
),
ListKey.FacetedBuilder<E> {

private var elementSerializer: ((E) -> String)? = null
private var elementDeserializer: ((String) -> E)? = null
Original file line number Diff line number Diff line change
@@ -103,18 +103,22 @@ class MapKey<K : Any, V : Any> internal constructor(
}

@KeyBuilderDsl
interface AnonymousBuilderFacet<K : Any, V : Any> : BuilderFacet<K, V, AnonymousBuilderFacet<K, V>>,
interface AnonymousBuilderFacet<K : Any, V : Any> :
BuilderFacet<K, V, AnonymousBuilderFacet<K, V>>,
Key.BuilderFacet<Map<K, V>, MapKey<K, V>, AnonymousBuilderFacet<K, V>>

@KeyBuilderDsl
interface NamedBuilderFacet<K : Any, V : Any> : BuilderFacet<K, V, NamedBuilderFacet<K, V>>,
interface NamedBuilderFacet<K : Any, V : Any> :
BuilderFacet<K, V, NamedBuilderFacet<K, V>>,
Key.NamedBuilderFacet<Map<K, V>, MapKey<K, V>, NamedBuilderFacet<K, V>>

@KeyBuilderDsl
interface Builder<K : Any, V : Any> : BuilderFacet<K, V, Builder<K, V>>,
interface Builder<K : Any, V : Any> :
BuilderFacet<K, V, Builder<K, V>>,
Key.Builder<Map<K, V>, MapKey<K, V>, Builder<K, V>>

@KeyBuilderDsl
interface FacetedBuilder<K : Any, V : Any> : BuilderFacet<K, V, FacetedBuilder<K, V>>,
interface FacetedBuilder<K : Any, V : Any> :
BuilderFacet<K, V, FacetedBuilder<K, V>>,
Key.FacetedBuilder<Map<K, V>, MapKey<K, V>, FacetedBuilder<K, V>, AnonymousBuilderFacet<K, V>, NamedBuilderFacet<K, V>>
}
Original file line number Diff line number Diff line change
@@ -27,7 +27,8 @@ class MapKeyBuilder<K : Any, V : Any>(
) : AbstractKeyBuilder<
Map<K, V>, MapKey<K, V>, MapKey.FacetedBuilder<K, V>, MapKey.AnonymousBuilderFacet<K, V>,
MapKey.NamedBuilderFacet<K, V>,
>(createMapTypeToken(mapKeyType, mapValueType)), MapKey.FacetedBuilder<K, V> {
>(createMapTypeToken(mapKeyType, mapValueType)),
MapKey.FacetedBuilder<K, V> {

private var keySerializer: ((K) -> String)? = null
private var keyDeserializer: ((String) -> K)? = null
Original file line number Diff line number Diff line change
@@ -66,18 +66,22 @@ class SimpleKey<T : Any> internal constructor(
}

@KeyBuilderDsl
interface AnonymousBuilderFacet<T : Any> : BuilderFacet<T, AnonymousBuilderFacet<T>>,
interface AnonymousBuilderFacet<T : Any> :
BuilderFacet<T, AnonymousBuilderFacet<T>>,
Key.BuilderFacet<T, SimpleKey<T>, AnonymousBuilderFacet<T>>

@KeyBuilderDsl
interface NamedBuilderFacet<T : Any> : BuilderFacet<T, NamedBuilderFacet<T>>,
interface NamedBuilderFacet<T : Any> :
BuilderFacet<T, NamedBuilderFacet<T>>,
Key.NamedBuilderFacet<T, SimpleKey<T>, NamedBuilderFacet<T>>

@KeyBuilderDsl
interface Builder<T : Any> : BuilderFacet<T, Builder<T>>,
interface Builder<T : Any> :
BuilderFacet<T, Builder<T>>,
Key.Builder<T, SimpleKey<T>, Builder<T>>

@KeyBuilderDsl
interface FacetedBuilder<T : Any> : BuilderFacet<T, FacetedBuilder<T>>,
interface FacetedBuilder<T : Any> :
BuilderFacet<T, FacetedBuilder<T>>,
Key.FacetedBuilder<T, SimpleKey<T>, FacetedBuilder<T>, AnonymousBuilderFacet<T>, NamedBuilderFacet<T>>
}
Original file line number Diff line number Diff line change
@@ -24,7 +24,8 @@ class SimpleKeyBuilder<T : Any>(
type: TypeToken<T>,
) : AbstractKeyBuilder<T, SimpleKey<T>, SimpleKey.FacetedBuilder<T>, SimpleKey.AnonymousBuilderFacet<T>, SimpleKey.NamedBuilderFacet<T>>(
type,
), SimpleKey.FacetedBuilder<T> {
),
SimpleKey.FacetedBuilder<T> {

private var serializer: ((T) -> String)? = null
private var deserializer: ((String) -> T)? = null
Original file line number Diff line number Diff line change
@@ -33,12 +33,9 @@ import org.anvilpowered.anvil.velocity.platform.VelocityServer
import org.anvilpowered.anvil.velocity.user.VelocityPlayerService
import org.apache.logging.log4j.LogManager
import org.apache.logging.log4j.Logger
import org.koin.core.context.KoinContext
import org.koin.core.context.startKoin
import org.koin.core.module.Module
import org.koin.core.module.dsl.bind
import org.koin.core.module.dsl.singleOf
import org.koin.dsl.koinApplication
import org.koin.dsl.module

/**

0 comments on commit 23d6fc9

Please sign in to comment.