Skip to content

Improvement: Settings split to Setting, and SettingCore for mutability #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beanbag44 merged 10 commits into from
Dec 3, 2025
Merged

Improvement: Settings split to Setting, and SettingCore for mutability #172

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e04d69b
initial changes
beanbag44 Dec 2, 2025
5ec50b3
cleanup
beanbag44 Dec 2, 2025
af9b1c8
it works! Cleanup
beanbag44 Dec 3, 2025
1fb0738
fix collection setting imgui logic
beanbag44 Dec 3, 2025
48a79ad
save and load settings from original setting core
beanbag44 Dec 3, 2025
c83fcbc
store configurable in setting, check and throw if duplicate configura…
beanbag44 Dec 3, 2025
2305f9f
renamed the vec3d setting class
emyfops Dec 3, 2025
675da83
Update Configurable.kt
emyfops Dec 3, 2025
f93ea7c
merge from 1.21.5
emyfops Dec 3, 2025
4fd21ce
fix onSelect and onDeselect not recognising child classes of collecti…
beanbag44 Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/lambda/mixin/CrashReportMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package com.lambda.mixin;

import com.lambda.Lambda;
import com.lambda.config.AbstractSetting;
import com.lambda.config.Setting;
import com.lambda.module.Module;
import com.lambda.module.ModuleRegistry;
import com.lambda.util.DynamicExceptionKt;
Expand Down Expand Up @@ -67,7 +67,7 @@ String injectString(ReportType type, List<String> extraInfo, Operation<String> o

module.getSettings()
.stream()
.filter(AbstractSetting::isModified)
.filter(Setting::isModified)
.forEach(setting -> list.add(String.format("\t\t%s -> %s", setting.getName(), setting.getValue())));
});
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/kotlin/com/lambda/command/commands/ConfigCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ object ConfigCommand : LambdaCommand(
executeWithResult {
val confName = config().value()
val settingName = setting().value()
val conf = Configuration.configurableByCommandName(confName) ?: run {
val configurable = Configuration.configurableByCommandName(confName) ?: run {
return@executeWithResult failure("$confName is not a valid configurable.")
}
val set = Configuration.settingByCommandName(conf, settingName) ?: run {
val setting = Configuration.settingByCommandName(configurable, settingName) ?: run {
return@executeWithResult failure("$settingName is not a valid setting for $confName.")
}
set.reset()
setting.reset()
return@executeWithResult success()
}
}
Expand Down
265 changes: 0 additions & 265 deletions src/main/kotlin/com/lambda/config/AbstractSetting.kt
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/kotlin/com/lambda/config/AutomationConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ open class AutomationConfig(
override val hotbarConfig = HotbarSettings(this, Group.Hotbar)
override val eatConfig = EatSettings(this, Group.Eat)

val hiddenSettings = mutableSetOf<AbstractSetting<*>>()

companion object {
context(module: Module)
fun MutableAutomationConfig.setDefaultAutomationConfig(
Expand Down
Loading