Skip to content

Commit 938eacc

Browse files
committed
Reformat core, commands
1 parent d8767e0 commit 938eacc

File tree

14 files changed

+26
-22
lines changed

14 files changed

+26
-22
lines changed

common/src/main/kotlin/com/lambda/brigadier/argument/IdentifierArguments.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.lambda.brigadier.argument
1818

1919
import com.lambda.brigadier.*
20-
import com.lambda.brigadier.assumeSourceNotUsed
2120
import net.minecraft.advancement.AdvancementEntry
2221
import net.minecraft.command.argument.IdentifierArgumentType
2322
import net.minecraft.loot.condition.LootCondition
@@ -111,7 +110,7 @@ fun ArgumentReader<
111110
*/
112111
@BrigadierDsl
113112
fun <S> identifier(
114-
name: String
113+
name: String,
115114
): DefaultArgumentConstructor<S, IdentifierArgumentType> {
116115
return argument(name, IdentifierArgumentType.identifier())
117116
}

common/src/main/kotlin/com/lambda/brigadier/argument/ItemArguments.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ fun DefaultArgumentReader<ItemStackArgumentType>.value(): ItemStackArgument {
7676
@BrigadierDsl
7777
fun <S> itemPredicate(
7878
name: String,
79-
context: CommandRegistryAccess
79+
context: CommandRegistryAccess,
8080
): DefaultArgumentConstructor<S, ItemPredicateArgumentType> {
8181
return argument(name, ItemPredicateArgumentType.itemPredicate(context))
8282
}
@@ -86,7 +86,7 @@ fun <S> itemPredicate(
8686
*/
8787
@BrigadierDsl
8888
fun <S> itemSlot(
89-
name: String
89+
name: String,
9090
): DefaultArgumentConstructor<S, ItemSlotArgumentType> {
9191
return argument(name, ItemSlotArgumentType.itemSlot())
9292
}
@@ -99,7 +99,7 @@ fun <S> itemSlot(
9999
@BrigadierDsl
100100
fun <S> itemStack(
101101
name: String,
102-
context: CommandRegistryAccess
102+
context: CommandRegistryAccess,
103103
): DefaultArgumentConstructor<S, ItemStackArgumentType> {
104104
return argument(name, ItemStackArgumentType.itemStack(context))
105105
}

common/src/main/kotlin/com/lambda/command/commands/BuildCommand.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818
package com.lambda.command.commands
1919

2020
import com.lambda.brigadier.CommandResult
21-
import com.lambda.brigadier.argument.*
21+
import com.lambda.brigadier.argument.greedyString
22+
import com.lambda.brigadier.argument.literal
23+
import com.lambda.brigadier.argument.value
2224
import com.lambda.brigadier.executeWithResult
23-
import com.lambda.brigadier.optional
2425
import com.lambda.brigadier.required
2526
import com.lambda.command.LambdaCommand
2627
import com.lambda.interaction.construction.StructureRegistry
@@ -69,7 +70,9 @@ object BuildCommand : LambdaCommand(
6970
} catch (e: NoSuchFileException) {
7071
return@executeWithResult CommandResult.failure("Structure $pathString not found")
7172
} catch (e: Exception) {
72-
return@executeWithResult CommandResult.failure(e.message ?: "Failed to load structure $pathString")
73+
return@executeWithResult CommandResult.failure(
74+
e.message ?: "Failed to load structure $pathString"
75+
)
7376
}
7477
}
7578

common/src/main/kotlin/com/lambda/command/commands/FriendCommand.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ object FriendCommand : LambdaCommand(
7676
?.playerList
7777
?.filter { it.profile != mc.gameProfile }
7878
?.map { it.profile.name }
79-
?.forEach { builder.suggest(it) }
79+
?.forEach { builder.suggest(it) }
8080

8181
builder.buildFuture()
8282
}
@@ -87,7 +87,7 @@ object FriendCommand : LambdaCommand(
8787
?.playerList
8888
?.firstOrNull {
8989
it.profile.name == name &&
90-
it.profile != mc.gameProfile
90+
it.profile != mc.gameProfile
9191
} ?: return@executeWithResult failure("Could not find the player on the server")
9292

9393
return@executeWithResult if (FriendManager.befriend(id.profile)) {
@@ -105,7 +105,7 @@ object FriendCommand : LambdaCommand(
105105
?.playerList
106106
?.filter { it.profile != mc.gameProfile }
107107
?.map { it.profile.id }
108-
?.forEach { builder.suggest(it.toString()) }
108+
?.forEach { builder.suggest(it.toString()) }
109109

110110
builder.buildFuture()
111111
}

common/src/main/kotlin/com/lambda/command/commands/RpcCommand.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717

1818
package com.lambda.command.commands
1919

20-
import com.lambda.brigadier.*
2120
import com.lambda.brigadier.argument.literal
2221
import com.lambda.brigadier.argument.value
2322
import com.lambda.brigadier.argument.word
23+
import com.lambda.brigadier.execute
24+
import com.lambda.brigadier.required
2425
import com.lambda.command.LambdaCommand
2526
import com.lambda.module.modules.client.DiscordRPC
2627
import com.lambda.util.extension.CommandBuilder

common/src/main/kotlin/com/lambda/command/commands/TransferCommand.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import com.lambda.brigadier.argument.*
2323
import com.lambda.brigadier.executeWithResult
2424
import com.lambda.brigadier.required
2525
import com.lambda.command.LambdaCommand
26+
import com.lambda.interaction.material.StackSelection.Companion.selectStack
2627
import com.lambda.interaction.material.container.ContainerManager
2728
import com.lambda.interaction.material.container.ContainerManager.containerWithMaterial
2829
import com.lambda.interaction.material.container.ContainerManager.containerWithSpace
29-
import com.lambda.interaction.material.StackSelection.Companion.selectStack
3030
import com.lambda.interaction.material.transfer.TransferResult
3131
import com.lambda.task.TaskFlow.run
3232
import com.lambda.util.Communication.info

common/src/main/kotlin/com/lambda/config/Configurable.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import java.awt.Color
5050
* @property settings A set of [AbstractSetting]s that this configurable manages.
5151
*/
5252
abstract class Configurable(
53-
private val configuration: Configuration
53+
private val configuration: Configuration,
5454
) : Jsonable, Nameable {
5555
val settings = mutableSetOf<AbstractSetting<*>>()
5656

common/src/main/kotlin/com/lambda/config/configurations/ModuleConfig.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package com.lambda.config.configurations
1919

2020
import com.lambda.config.Configuration
21+
import com.lambda.config.configurations.ModuleConfig.configName
22+
import com.lambda.config.configurations.ModuleConfig.primary
2123
import com.lambda.util.FolderRegister
2224
import java.io.File
2325

common/src/main/kotlin/com/lambda/config/groups/InventoryConfig.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
package com.lambda.config.groups
1919

20-
import com.lambda.interaction.material.container.MaterialContainer
2120
import com.lambda.interaction.material.StackSelection
21+
import com.lambda.interaction.material.container.MaterialContainer
2222
import net.minecraft.block.Block
2323

2424
interface InventoryConfig {
@@ -40,6 +40,7 @@ interface InventoryConfig {
4040
WITH_MAX_ITEMS -> compareBy<MaterialContainer> { it.rank }
4141
.thenByDescending { it.materialAvailable(selection) }
4242
.thenBy { it.name }
43+
4344
WITH_MIN_ITEMS -> compareBy<MaterialContainer> { it.rank }
4445
.thenBy { it.materialAvailable(selection) }
4546
.thenBy { it.name }
@@ -50,6 +51,7 @@ interface InventoryConfig {
5051
WITH_MAX_ITEMS -> compareBy<MaterialContainer> { it.rank }
5152
.thenByDescending { it.spaceAvailable(selection) }
5253
.thenBy { it.name }
54+
5355
WITH_MIN_ITEMS -> compareBy<MaterialContainer> { it.rank }
5456
.thenBy { it.spaceAvailable(selection) }
5557
.thenBy { it.name }

common/src/main/kotlin/com/lambda/config/groups/Targeting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ abstract class Targeting(
4949
owner: Configurable,
5050
predicate: () -> Boolean = { true },
5151
defaultRange: Double,
52-
maxRange: Double
52+
maxRange: Double,
5353
) : TargetingConfig {
5454

5555
/**

0 commit comments

Comments
 (0)