Skip to content

Commit 3355289

Browse files
committed
Fix some baritone setting ranges to fit defaults correctly
(Except the seed and firework speed)
1 parent 46bb946 commit 3355289

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/main/kotlin/com/lambda/config/settings/numeric/LongSetting.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class LongSetting(
4545
unit,
4646
visibility
4747
) {
48+
// ToDo: No worky for super large numbers
4849
private var valueIndex: Int
4950
get() = ((value - range.start) / step).toInt()
5051
set(index) {

src/main/kotlin/com/lambda/interaction/BaritoneManager.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ object BaritoneManager : Configurable(LambdaConfig) {
120120
setting("Mine Goal Update Interval", mineGoalUpdateInterval.value, 0..10000).group(Group.Pathing, SubGroup.PathingCore).onValueChange { _, it -> mineGoalUpdateInterval.value = it }
121121
setting("Max Cached World Scan Count", maxCachedWorldScanCount.value, 0..100000).group(Group.Pathing, SubGroup.PathingCore).onValueChange { _, it -> maxCachedWorldScanCount.value = it }
122122
setting("Mine Max Ore Locations Count", mineMaxOreLocationsCount.value, 0..100000).group(Group.Pathing, SubGroup.PathingCore).onValueChange { _, it -> mineMaxOreLocationsCount.value = it }
123-
setting("Cached Chunks Expiry Seconds", cachedChunksExpirySeconds.value, 0L..86400L).group(Group.Pathing, SubGroup.PathingCore).onValueChange { _, it -> cachedChunksExpirySeconds.value = it }
123+
setting("Cached Chunks Expiry Seconds", cachedChunksExpirySeconds.value, -1L..86400L).group(Group.Pathing, SubGroup.PathingCore).onValueChange { _, it -> cachedChunksExpirySeconds.value = it }
124124
setting("Y Level Box Size", yLevelBoxSize.value, 0.0..256.0).group(Group.Pathing, SubGroup.PathingCore).onValueChange { _, it -> yLevelBoxSize.value = it }
125125
setting("Extend Cache On Threshold", extendCacheOnThreshold.value).group(Group.Pathing, SubGroup.PathingCore).onValueChange { _, it -> extendCacheOnThreshold.value = it }
126126
setting("Cancel On Goal Invalidation", cancelOnGoalInvalidation.value).group(Group.Pathing, SubGroup.PathingCore).onValueChange { _, it -> cancelOnGoalInvalidation.value = it }
@@ -190,7 +190,7 @@ object BaritoneManager : Configurable(LambdaConfig) {
190190
setting("Right Click Speed", rightClickSpeed.value, 0..10).group(Group.Behavior, SubGroup.Interaction).onValueChange { _, it -> rightClickSpeed.value = it }
191191
setting("Block Reach Distance", blockReachDistance.value, 0f..10f, 0.1f).group(Group.Behavior, SubGroup.Interaction).onValueChange { _, it -> blockReachDistance.value = it }
192192
setting("Block Break Speed", blockBreakSpeed.value, 0..10).group(Group.Behavior, SubGroup.Interaction).onValueChange { _, it -> blockBreakSpeed.value = it }
193-
setting("Random Looking 1.13", randomLooking113.value, 0.0..1.0, 0.01).group(Group.Behavior, SubGroup.Interaction).onValueChange { _, it -> randomLooking113.value = it }
193+
setting("Random Looking 1.13", randomLooking113.value, 0.0..5.0, 0.01).group(Group.Behavior, SubGroup.Interaction).onValueChange { _, it -> randomLooking113.value = it }
194194
setting("Random Looking", randomLooking.value, 0.0..1.0, 0.01).group(Group.Behavior, SubGroup.Interaction).onValueChange { _, it -> randomLooking.value = it }
195195
setting("Free Look", freeLook.value).group(Group.Behavior, SubGroup.Interaction).onValueChange { _, it -> freeLook.value = it }
196196
setting("Block Free Look", blockFreeLook.value).group(Group.Behavior, SubGroup.Interaction).onValueChange { _, it -> blockFreeLook.value = it }
@@ -214,20 +214,20 @@ object BaritoneManager : Configurable(LambdaConfig) {
214214
setting("Path Cutoff Factor", pathCutoffFactor.value, 0.0..100.0, 0.1).group(Group.Behavior, SubGroup.Penalties).onValueChange { _, it -> pathCutoffFactor.value = it }
215215
setting("Break Correct Block Penalty Multiplier", breakCorrectBlockPenaltyMultiplier.value, 0.0..100.0, 0.1).group(Group.Behavior, SubGroup.Penalties).onValueChange { _, it -> breakCorrectBlockPenaltyMultiplier.value = it }
216216
setting("Place Incorrect Block Penalty Multiplier", placeIncorrectBlockPenaltyMultiplier.value, 0.0..100.0, 0.1).group(Group.Behavior, SubGroup.Penalties).onValueChange { _, it -> placeIncorrectBlockPenaltyMultiplier.value = it }
217-
setting("Cost Heuristic", costHeuristic.value, 0.0..100.0, 0.1).group(Group.Behavior, SubGroup.Penalties).onValueChange { _, it -> costHeuristic.value = it }
217+
setting("Cost Heuristic", costHeuristic.value, 0.0..10.0, 0.001).group(Group.Behavior, SubGroup.Penalties).onValueChange { _, it -> costHeuristic.value = it }
218218

219219
setting("Item Saver", itemSaver.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> itemSaver.value = it }
220220
setting("Item Saver Threshold", itemSaverThreshold.value, 0..100).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> itemSaverThreshold.value = it }
221221
setting("Prefer Silk Touch", preferSilkTouch.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> preferSilkTouch.value = it }
222222
setting("Mine Scan Dropped Items", mineScanDroppedItems.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> mineScanDroppedItems.value = it }
223-
setting("Mine Drop Loiter Duration MS Thanks Louca", mineDropLoiterDurationMSThanksLouca.value, 0L..600000L).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> mineDropLoiterDurationMSThanksLouca.value = it }
223+
setting("Mine Drop Loiter Duration", mineDropLoiterDurationMSThanksLouca.value, 0L..600000L, unit = " ms").group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> mineDropLoiterDurationMSThanksLouca.value = it }
224224
setting("Legit Mine", legitMine.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> legitMine.value = it }
225225
setting("Legit Mine Y Level", legitMineYLevel.value, 0..256).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> legitMineYLevel.value = it }
226226
setting("Legit Mine Include Diagonals", legitMineIncludeDiagonals.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> legitMineIncludeDiagonals.value = it }
227227
setting("Force Internal Mining", forceInternalMining.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> forceInternalMining.value = it }
228228
setting("Internal Mining Air Exception", internalMiningAirException.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> internalMiningAirException.value = it }
229-
setting("Min Y Level While Mining", minYLevelWhileMining.value, 0..256).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> minYLevelWhileMining.value = it }
230-
setting("Max Y Level While Mining", maxYLevelWhileMining.value, 0..256).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> maxYLevelWhileMining.value = it }
229+
setting("Min Y Level While Mining", minYLevelWhileMining.value, 0..2048).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> minYLevelWhileMining.value = it }
230+
setting("Max Y Level While Mining", maxYLevelWhileMining.value, 0..2048).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> maxYLevelWhileMining.value = it }
231231
setting("Allow Only Exposed Ores", allowOnlyExposedOres.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> allowOnlyExposedOres.value = it }
232232
setting("Allow Only Exposed Ores Distance", allowOnlyExposedOresDistance.value, 0..16).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> allowOnlyExposedOresDistance.value = it }
233233
setting("Replant Crops", replantCrops.value).group(Group.Behavior, SubGroup.MiningAndFarming).onValueChange { _, it -> replantCrops.value = it }
@@ -315,15 +315,15 @@ object BaritoneManager : Configurable(LambdaConfig) {
315315
// ELYTRA
316316
setting("Simulation Ticks", elytraSimulationTicks.value, 0..200).group(Group.Elytra).onValueChange { _, it -> elytraSimulationTicks.value = it }
317317
setting("Pitch Range", elytraPitchRange.value, 0..90).group(Group.Elytra).onValueChange { _, it -> elytraPitchRange.value = it }
318-
setting("Firework Speed", elytraFireworkSpeed.value, 0.0..5.0, 0.05).group(Group.Elytra).onValueChange { _, it -> elytraFireworkSpeed.value = it }
318+
setting("Firework Speed", elytraFireworkSpeed.value, 0.0..3.0, 0.1).group(Group.Elytra).onValueChange { _, it -> elytraFireworkSpeed.value = it }
319319
setting("Firework Setback Use Delay", elytraFireworkSetbackUseDelay.value, 0..600).group(Group.Elytra).onValueChange { _, it -> elytraFireworkSetbackUseDelay.value = it }
320320
setting("Minimum Avoidance", elytraMinimumAvoidance.value, 0.0..10.0, 0.1).group(Group.Elytra).onValueChange { _, it -> elytraMinimumAvoidance.value = it }
321321
setting("Conserve Fireworks", elytraConserveFireworks.value).group(Group.Elytra).onValueChange { _, it -> elytraConserveFireworks.value = it }
322322
setting("Render Raytraces", elytraRenderRaytraces.value).group(Group.Elytra).onValueChange { _, it -> elytraRenderRaytraces.value = it }
323323
setting("Render Hitbox Raytraces", elytraRenderHitboxRaytraces.value).group(Group.Elytra).onValueChange { _, it -> elytraRenderHitboxRaytraces.value = it }
324324
setting("Render Simulation", elytraRenderSimulation.value).group(Group.Elytra).onValueChange { _, it -> elytraRenderSimulation.value = it }
325325
setting("Auto Jump", elytraAutoJump.value).group(Group.Elytra).onValueChange { _, it -> elytraAutoJump.value = it }
326-
setting("Nether Seed", elytraNetherSeed.value, -9_000_000_000_000_000L..9_000_000_000_000_000L).group(Group.Elytra).onValueChange { _, it -> elytraNetherSeed.value = it }
326+
setting("Nether Seed", elytraNetherSeed.value, Long.MIN_VALUE..Long.MAX_VALUE).group(Group.Elytra).onValueChange { _, it -> elytraNetherSeed.value = it }
327327
setting("Predict Terrain", elytraPredictTerrain.value).group(Group.Elytra).onValueChange { _, it -> elytraPredictTerrain.value = it }
328328
setting("Auto Swap", elytraAutoSwap.value).group(Group.Elytra).onValueChange { _, it -> elytraAutoSwap.value = it }
329329
setting("Minimum Durability", elytraMinimumDurability.value, 0..432).group(Group.Elytra).onValueChange { _, it -> elytraMinimumDurability.value = it }

0 commit comments

Comments
 (0)