Skip to content

Commit af56457

Browse files
authored
Improvement: Separate core from the rest of the setting to allow mutability (172)
1 parent 6291b9e commit af56457

39 files changed

+706
-877
lines changed

src/main/java/com/lambda/mixin/CrashReportMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.lambda.mixin;
1919

2020
import com.lambda.Lambda;
21-
import com.lambda.config.AbstractSetting;
21+
import com.lambda.config.Setting;
2222
import com.lambda.module.Module;
2323
import com.lambda.module.ModuleRegistry;
2424
import com.lambda.util.DynamicExceptionKt;
@@ -67,7 +67,7 @@ String injectString(ReportType type, List<String> extraInfo, Operation<String> o
6767

6868
module.getSettings()
6969
.stream()
70-
.filter(AbstractSetting::isModified)
70+
.filter(Setting::isModified)
7171
.forEach(setting -> list.add(String.format("\t\t%s -> %s", setting.getName(), setting.getValue())));
7272
});
7373
}

src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@ object ConfigCommand : LambdaCommand(
7676
executeWithResult {
7777
val confName = config().value()
7878
val settingName = setting().value()
79-
val conf = Configuration.configurableByCommandName(confName) ?: run {
79+
val configurable = Configuration.configurableByCommandName(confName) ?: run {
8080
return@executeWithResult failure("$confName is not a valid configurable.")
8181
}
82-
val set = Configuration.settingByCommandName(conf, settingName) ?: run {
82+
val setting = Configuration.settingByCommandName(configurable, settingName) ?: run {
8383
return@executeWithResult failure("$settingName is not a valid setting for $confName.")
8484
}
85-
set.reset()
85+
setting.reset()
8686
return@executeWithResult success()
8787
}
8888
}

src/main/kotlin/com/lambda/config/AbstractSetting.kt

Lines changed: 0 additions & 265 deletions
This file was deleted.

src/main/kotlin/com/lambda/config/AutomationConfig.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ open class AutomationConfig(
5959
override val hotbarConfig = HotbarSettings(this, Group.Hotbar)
6060
override val eatConfig = EatSettings(this, Group.Eat)
6161

62-
val hiddenSettings = mutableSetOf<AbstractSetting<*>>()
63-
6462
companion object {
6563
context(module: Module)
6664
fun MutableAutomationConfig.setDefaultAutomationConfig(

0 commit comments

Comments
 (0)