Skip to content

Commit ef340b4

Browse files
authored
Merge pull request #7 from Squibid/1.21
Add option to resume your previous boom
2 parents 85f086f + 15decf9 commit ef340b4

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

src/main/java/io/wispforest/okboomer/OkBoomer.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class OkBoomer implements ClientModInitializer {
1919
public static final io.wispforest.okboomer.OkConfig CONFIG = io.wispforest.okboomer.OkConfig.createAndLoad();
2020

2121
public static double boomDivisor = 1;
22+
public static double prevBoomDivisor = CONFIG.defaultBoom();
2223
public static boolean booming = false;
2324

2425
public static double screenBoom = 1;
@@ -62,10 +63,15 @@ && isPressed(BOOM_BINDING)
6263

6364
if (booming != nowBooming) {
6465
if (booming) {
66+
prevBoomDivisor = boomDivisor;
6567
boomDivisor = 1;
6668
client.options.smoothCameraEnabled = smoothCameraRestoreValue;
6769
} else {
68-
boomDivisor = CONFIG.defaultBoom();
70+
if (CONFIG.resumeBoom()) {
71+
boomDivisor = prevBoomDivisor;
72+
} else {
73+
boomDivisor = CONFIG.defaultBoom();
74+
}
6975
smoothCameraRestoreValue = client.options.smoothCameraEnabled;
7076

7177
if (CONFIG.useCinematicCamera()) {

src/main/java/io/wispforest/okboomer/OkBoomerConfigModel.java

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public class OkBoomerConfigModel {
1515
@RangeConstraint(min = 2, max = 15)
1616
public float defaultBoom = 7.5f;
1717

18+
public boolean resumeBoom = false;
19+
1820
@RangeConstraint(min = .25, max = 5)
1921
public float boomTransitionSpeed = 1;
2022

src/main/resources/assets/ok-boomer/lang/en_us.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@
2727
"text.config.ok-boomer.option.boomScrollSensitivity": "Boom Scrolling Sensitivity",
2828
"text.config.ok-boomer.option.boomTransition": "Boom Transition",
2929
"text.config.ok-boomer.option.defaultBoom": "Default Boom",
30+
"text.config.ok-boomer.option.resumeBoom": "Resume Boom",
3031
"text.config.ok-boomer.option.boomTransitionSpeed": "Boom Transition Speed",
3132
"text.config.ok-boomer.category.boomLimits": "Boom Limits",
3233
"text.config.ok-boomer.option.boomLimits.enableLimits": "Enable Limits",
3334
"text.config.ok-boomer.option.boomLimits.allowBoomingOut": "Allow Booming Out",
3435
"text.config.ok-boomer.option.boomLimits.maxBoom": "Maximum Boom",
3536
"text.config.ok-boomer.option.boomLimits.maxScreenBoom": "Maximum Screen Boom"
36-
}
37+
}

0 commit comments

Comments
 (0)