File tree Expand file tree Collapse file tree 14 files changed +26
-22
lines changed
common/src/main/kotlin/com/lambda Expand file tree Collapse file tree 14 files changed +26
-22
lines changed Original file line number Diff line number Diff line change 1717package com.lambda.brigadier.argument
1818
1919import com.lambda.brigadier.*
20- import com.lambda.brigadier.assumeSourceNotUsed
2120import net.minecraft.advancement.AdvancementEntry
2221import net.minecraft.command.argument.IdentifierArgumentType
2322import net.minecraft.loot.condition.LootCondition
@@ -111,7 +110,7 @@ fun ArgumentReader<
111110 */
112111@BrigadierDsl
113112fun <S > identifier (
114- name : String
113+ name : String ,
115114): DefaultArgumentConstructor <S , IdentifierArgumentType > {
116115 return argument(name, IdentifierArgumentType .identifier())
117116}
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ fun DefaultArgumentReader<ItemStackArgumentType>.value(): ItemStackArgument {
7676@BrigadierDsl
7777fun <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
8888fun <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
100100fun <S > itemStack (
101101 name : String ,
102- context : CommandRegistryAccess
102+ context : CommandRegistryAccess ,
103103): DefaultArgumentConstructor <S , ItemStackArgumentType > {
104104 return argument(name, ItemStackArgumentType .itemStack(context))
105105}
Original file line number Diff line number Diff line change 1818package com.lambda.command.commands
1919
2020import 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
2224import com.lambda.brigadier.executeWithResult
23- import com.lambda.brigadier.optional
2425import com.lambda.brigadier.required
2526import com.lambda.command.LambdaCommand
2627import 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
Original file line number Diff line number Diff 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 }
Original file line number Diff line number Diff line change 1717
1818package com.lambda.command.commands
1919
20- import com.lambda.brigadier.*
2120import com.lambda.brigadier.argument.literal
2221import com.lambda.brigadier.argument.value
2322import com.lambda.brigadier.argument.word
23+ import com.lambda.brigadier.execute
24+ import com.lambda.brigadier.required
2425import com.lambda.command.LambdaCommand
2526import com.lambda.module.modules.client.DiscordRPC
2627import com.lambda.util.extension.CommandBuilder
Original file line number Diff line number Diff line change @@ -23,10 +23,10 @@ import com.lambda.brigadier.argument.*
2323import com.lambda.brigadier.executeWithResult
2424import com.lambda.brigadier.required
2525import com.lambda.command.LambdaCommand
26+ import com.lambda.interaction.material.StackSelection.Companion.selectStack
2627import com.lambda.interaction.material.container.ContainerManager
2728import com.lambda.interaction.material.container.ContainerManager.containerWithMaterial
2829import com.lambda.interaction.material.container.ContainerManager.containerWithSpace
29- import com.lambda.interaction.material.StackSelection.Companion.selectStack
3030import com.lambda.interaction.material.transfer.TransferResult
3131import com.lambda.task.TaskFlow.run
3232import com.lambda.util.Communication.info
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ import java.awt.Color
5050 * @property settings A set of [AbstractSetting]s that this configurable manages.
5151 */
5252abstract class Configurable (
53- private val configuration : Configuration
53+ private val configuration : Configuration ,
5454) : Jsonable, Nameable {
5555 val settings = mutableSetOf<AbstractSetting <* >>()
5656
Original file line number Diff line number Diff line change 1818package com.lambda.config.configurations
1919
2020import com.lambda.config.Configuration
21+ import com.lambda.config.configurations.ModuleConfig.configName
22+ import com.lambda.config.configurations.ModuleConfig.primary
2123import com.lambda.util.FolderRegister
2224import java.io.File
2325
Original file line number Diff line number Diff line change 1717
1818package com.lambda.config.groups
1919
20- import com.lambda.interaction.material.container.MaterialContainer
2120import com.lambda.interaction.material.StackSelection
21+ import com.lambda.interaction.material.container.MaterialContainer
2222import net.minecraft.block.Block
2323
2424interface 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 }
Original file line number Diff line number Diff 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 /* *
You can’t perform that action at this time.
0 commit comments