Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit 5df18a2

Browse files
FloweyntFloweynt
committed
misc: refactor axolotlclient config
1 parent 899c2f7 commit 5df18a2

File tree

6 files changed

+99
-346
lines changed

6 files changed

+99
-346
lines changed

‎1.16_combat-6/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java‎

Lines changed: 4 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,8 @@
5050
import net.minecraft.client.texture.NativeImageBackedTexture;
5151

5252
public class AxolotlClientConfig extends AxolotlClientConfigCommon {
53-
54-
public final BooleanOption showOwnNametag = new BooleanOption("showOwnNametag", false);
55-
public final BooleanOption useShadows = new BooleanOption("useShadows", false);
56-
public final BooleanOption nametagBackground = new BooleanOption("nametagBackground", true);
57-
58-
public final BooleanOption showBadges = new BooleanOption("showBadges", true);
59-
public final BooleanOption customBadge = new BooleanOption("customBadge", false);
60-
public final StringOption badgeText = new StringOption("badgeText", "");
61-
62-
public final ForceableBooleanOption timeChangerEnabled = new ForceableBooleanOption("enabled", false);
63-
public final IntegerOption customTime = new IntegerOption("time", 0, 0, 24000);
6453
public final BooleanOption customSky = new BooleanOption("customSky", true);
65-
public final BooleanOption dynamicFOV = new BooleanOption("dynamicFov", true);
66-
public final ForceableBooleanOption fullBright = new ForceableBooleanOption("fullBright", false);
67-
public final BooleanOption removeVignette = new BooleanOption("removeVignette", false);
68-
public final ForceableBooleanOption lowFire = new ForceableBooleanOption("lowFire", false);
54+
6955
public final BooleanOption lowShield = new BooleanOption("lowShield", false);
7056
public final ColorOption hitColor = new ColorOption("hitColor", new Color(255, 0, 0, 77),
7157
value -> {
@@ -93,59 +79,26 @@ public class AxolotlClientConfig extends AxolotlClientConfigCommon {
9379
} catch (Exception ignored) {
9480
}
9581
});
96-
public final BooleanOption minimalViewBob = new BooleanOption("minimalViewBob", false);
97-
public final BooleanOption noHurtCam = new BooleanOption("noHurtCam", false);
82+
9883
public final BooleanOption flatItems = new BooleanOption("flatItems", false);
9984
public final BooleanOption inventoryPotionEffectOffset = new BooleanOption("inventory.potion_effect_offset", true);
10085

10186
public final ColorOption loadingScreenColor = new ColorOption("loadingBgColor", new Color(239, 50, 61, 255));
10287
public final BooleanOption nightMode = new BooleanOption("nightMode", false);
103-
public final BooleanOption customWindowTitle = new BooleanOption("customWindowTitle", true);
10488

105-
public final BooleanOption enableCustomOutlines = new BooleanOption("enabled", false);
106-
public final ColorOption outlineColor = new ColorOption("color", Color.parse("#DD000000"));
10789
public final BooleanOption outlineChroma = new BooleanOption("chroma", false);
10890

109-
public final BooleanOption noRain = new BooleanOption("noRain", false);
110-
11191
public final GenericOption openCredits = new GenericOption("Credits", "Open Credits", () ->
11292
MinecraftClient.getInstance().openScreen(new CreditsScreen(MinecraftClient.getInstance().currentScreen))
11393
);
114-
public final BooleanOption debugLogOutput = new BooleanOption("debugLogOutput", false);
115-
public final BooleanOption creditsBGM = new BooleanOption("creditsBGM", true);
116-
117-
public final OptionCategory general = OptionCategory.create("general");
118-
public final OptionCategory nametagOptions = OptionCategory.create("nametagOptions");
119-
public final OptionCategory rendering = OptionCategory.create("rendering");
120-
public final OptionCategory outlines = OptionCategory.create("blockOutlines");
121-
public final OptionCategory timeChanger = OptionCategory.create("timeChanger");
94+
12295
@Getter
12396
private final List<Option<?>> options = new ArrayList<>();
12497

12598
public AxolotlClientConfig() {
126-
config.add(general);
127-
config.add(nametagOptions);
128-
config.add(rendering);
129-
130-
rendering.add(outlines);
131-
132-
nametagOptions.add(showOwnNametag);
133-
nametagOptions.add(useShadows);
134-
nametagOptions.add(nametagBackground);
135-
136-
nametagOptions.add(showBadges);
137-
nametagOptions.add(customBadge);
138-
nametagOptions.add(badgeText);
139-
14099
general.add(loadingScreenColor);
141100
general.add(nightMode);
142-
general.add(customWindowTitle);
143101
general.add(openCredits);
144-
general.add(debugLogOutput);
145-
146-
general.add(datetimeFormat);
147-
general.add(titleScreenOptionButtonMode);
148-
general.add(gameMenuScreenOptionButtonMode);
149102

150103
ConfigUI.getInstance().runWhenLoaded(() -> {
151104
general.getOptions().removeIf(o -> "configStyle".equals(o.getName()));
@@ -157,7 +110,6 @@ public AxolotlClientConfig() {
157110
general.add(configStyle = new StringArrayOption("configStyle", themes,
158111
"configStyle." + ConfigUI.getInstance().getCurrentStyle().getName(), s -> {
159112
ConfigUI.getInstance().setStyle(s.split("\\.")[1]);
160-
161113
Screen newScreen = RecreatableScreen.tryRecreate(MinecraftClient.getInstance().currentScreen);
162114
MinecraftClient.getInstance().openScreen(newScreen);
163115
}));
@@ -168,30 +120,9 @@ public AxolotlClientConfig() {
168120
}
169121
});
170122

171-
rendering.add(customSky,
172-
dynamicFOV,
173-
fullBright,
174-
removeVignette,
175-
lowFire,
176-
lowShield,
177-
hitColor,
178-
minimalViewBob,
179-
flatItems,
180-
noHurtCam,
181-
inventoryPotionEffectOffset);
182-
183-
timeChanger.add(timeChangerEnabled);
184-
timeChanger.add(customTime);
185-
rendering.add(timeChanger);
186-
187-
outlines.add(enableCustomOutlines);
188-
outlines.add(outlineColor);
123+
rendering.add(customSky, lowShield, hitColor, flatItems, inventoryPotionEffectOffset);
189124
outlines.add(outlineChroma);
190125

191-
rendering.add(noRain);
192-
193-
hidden.add(creditsBGM, someNiceBackground);
194-
195126
general.add(new GenericOption("profiles.title", "profiles.configure", () ->
196127
MinecraftClient.getInstance().openScreen(new ProfilesScreen(MinecraftClient.getInstance().currentScreen))), false);
197128

@@ -203,5 +134,4 @@ public AxolotlClientConfig() {
203134
}
204135
});
205136
}
206-
207137
}

‎1.20/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java‎

Lines changed: 2 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,8 @@
4949
import net.minecraft.client.texture.NativeImageBackedTexture;
5050

5151
public class AxolotlClientConfig extends AxolotlClientConfigCommon {
52-
53-
public final BooleanOption showOwnNametag = new BooleanOption("showOwnNametag", false);
54-
public final BooleanOption useShadows = new BooleanOption("useShadows", false);
55-
public final BooleanOption nametagBackground = new BooleanOption("nametagBackground", true);
56-
57-
public final BooleanOption showBadges = new BooleanOption("showBadges", true);
58-
public final BooleanOption customBadge = new BooleanOption("customBadge", false);
59-
public final StringOption badgeText = new StringOption("badgeText", "");
60-
61-
public final ForceableBooleanOption timeChangerEnabled = new ForceableBooleanOption("enabled", false);
62-
public final IntegerOption customTime = new IntegerOption("time", 0, 0, 24000);
6352
public final BooleanOption customSky = new BooleanOption("customSky", true);
64-
public final BooleanOption dynamicFOV = new BooleanOption("dynamicFov", true);
65-
public final ForceableBooleanOption fullBright = new ForceableBooleanOption("fullBright", false);
66-
public final BooleanOption removeVignette = new BooleanOption("removeVignette", false);
67-
public final ForceableBooleanOption lowFire = new ForceableBooleanOption("lowFire", false);
53+
6854
public final BooleanOption lowShield = new BooleanOption("lowShield", false);
6955
public final ColorOption hitColor = new ColorOption("hitColor", new Color(255, 0, 0, 77),
7056
value -> {
@@ -90,59 +76,23 @@ public class AxolotlClientConfig extends AxolotlClientConfigCommon {
9076
RenderSystem.activeTexture(33984);
9177
}
9278
});
93-
public final BooleanOption minimalViewBob = new BooleanOption("minimalViewBob", false);
94-
public final BooleanOption noHurtCam = new BooleanOption("noHurtCam", false);
79+
9580
public final BooleanOption flatItems = new BooleanOption("flatItems", false);
9681

9782
public final ColorOption loadingScreenColor = new ColorOption("loadingBgColor", new Color(239, 50, 61, 255));
9883
public final BooleanOption nightMode = new BooleanOption("nightMode", false);
99-
public final BooleanOption customWindowTitle = new BooleanOption("customWindowTitle", true);
100-
101-
public final BooleanOption enableCustomOutlines = new BooleanOption("enabled", false);
102-
public final ColorOption outlineColor = new ColorOption("color", Color.parse("#DD000000"));
103-
104-
public final BooleanOption noRain = new BooleanOption("noRain", false);
10584

10685
public final GenericOption openCredits = new GenericOption("Credits", "Open Credits", () ->
10786
MinecraftClient.getInstance().setScreen(new CreditsScreen(MinecraftClient.getInstance().currentScreen))
10887
);
109-
public final BooleanOption debugLogOutput = new BooleanOption("debugLogOutput", false);
110-
public final BooleanOption creditsBGM = new BooleanOption("creditsBGM", true);
111-
112-
public final OptionCategory general = OptionCategory.create("general");
113-
public final OptionCategory nametagOptions = OptionCategory.create("nametagOptions");
114-
public final OptionCategory rendering = OptionCategory.create("rendering");
115-
public final OptionCategory outlines = OptionCategory.create("blockOutlines");
116-
public final OptionCategory timeChanger = OptionCategory.create("timeChanger");
11788

11889
@Getter
11990
private final List<Option<?>> options = new ArrayList<>();
12091

12192
public AxolotlClientConfig() {
122-
123-
config.add(general);
124-
config.add(nametagOptions);
125-
config.add(rendering);
126-
127-
rendering.add(outlines);
128-
129-
nametagOptions.add(showOwnNametag);
130-
nametagOptions.add(useShadows);
131-
nametagOptions.add(nametagBackground);
132-
133-
nametagOptions.add(showBadges);
134-
nametagOptions.add(customBadge);
135-
nametagOptions.add(badgeText);
136-
13793
general.add(loadingScreenColor);
13894
general.add(nightMode);
139-
general.add(customWindowTitle);
14095
general.add(openCredits);
141-
general.add(debugLogOutput);
142-
143-
general.add(datetimeFormat);
144-
general.add(titleScreenOptionButtonMode);
145-
general.add(gameMenuScreenOptionButtonMode);
14696

14797
ConfigUI.getInstance().runWhenLoaded(() -> {
14898
general.getOptions().removeIf(o -> "configStyle".equals(o.getName()));
@@ -176,17 +126,6 @@ public AxolotlClientConfig() {
176126
flatItems,
177127
noHurtCam);
178128

179-
timeChanger.add(timeChangerEnabled);
180-
timeChanger.add(customTime);
181-
rendering.add(timeChanger);
182-
183-
outlines.add(enableCustomOutlines);
184-
outlines.add(outlineColor);
185-
186-
rendering.add(noRain);
187-
188-
hidden.add(creditsBGM, someNiceBackground);
189-
190129
general.add(new GenericOption("profiles.title", "profiles.configure", () ->
191130
MinecraftClient.getInstance().setScreen(new ProfilesScreen(MinecraftClient.getInstance().currentScreen))), false);
192131

‎1.21/src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java‎

Lines changed: 3 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,8 @@
4949
import net.minecraft.client.texture.NativeImageBackedTexture;
5050

5151
public class AxolotlClientConfig extends AxolotlClientConfigCommon {
52-
53-
public final BooleanOption showOwnNametag = new BooleanOption("showOwnNametag", false);
54-
public final BooleanOption useShadows = new BooleanOption("useShadows", false);
55-
public final BooleanOption nametagBackground = new BooleanOption("nametagBackground", true);
56-
57-
public final BooleanOption showBadges = new BooleanOption("showBadges", true);
58-
public final BooleanOption customBadge = new BooleanOption("customBadge", false);
59-
public final StringOption badgeText = new StringOption("badgeText", "");
60-
61-
public final ForceableBooleanOption timeChangerEnabled = new ForceableBooleanOption("enabled", false);
62-
public final IntegerOption customTime = new IntegerOption("time", 0, 0, 24000);
6352
public final BooleanOption customSky = new BooleanOption("customSky", true);
64-
public final BooleanOption dynamicFOV = new BooleanOption("dynamicFov", true);
65-
public final ForceableBooleanOption fullBright = new ForceableBooleanOption("fullBright", false);
66-
public final BooleanOption removeVignette = new BooleanOption("removeVignette", false);
67-
public final ForceableBooleanOption lowFire = new ForceableBooleanOption("lowFire", false);
53+
6854
public final BooleanOption lowShield = new BooleanOption("lowShield", false);
6955
public final ColorOption hitColor = new ColorOption("hitColor", new Color(255, 0, 0, 77),
7056
value -> {
@@ -90,58 +76,23 @@ public class AxolotlClientConfig extends AxolotlClientConfigCommon {
9076
RenderSystem.activeTexture(33984);
9177
}
9278
});
93-
public final BooleanOption minimalViewBob = new BooleanOption("minimalViewBob", false);
94-
public final BooleanOption noHurtCam = new BooleanOption("noHurtCam", false);
79+
9580
public final BooleanOption flatItems = new BooleanOption("flatItems", false);
9681

9782
public final ColorOption loadingScreenColor = new ColorOption("loadingBgColor", new Color(239, 50, 61, 255));
9883
public final BooleanOption nightMode = new BooleanOption("nightMode", false);
99-
public final BooleanOption customWindowTitle = new BooleanOption("customWindowTitle", true);
100-
101-
public final BooleanOption enableCustomOutlines = new BooleanOption("enabled", false);
102-
public final ColorOption outlineColor = new ColorOption("color", Color.parse("#DD000000"));
103-
104-
public final BooleanOption noRain = new BooleanOption("noRain", false);
10584

10685
public final GenericOption openCredits = new GenericOption("Credits", "Open Credits", () ->
10786
MinecraftClient.getInstance().setScreen(new CreditsScreen(MinecraftClient.getInstance().currentScreen))
10887
);
109-
public final BooleanOption debugLogOutput = new BooleanOption("debugLogOutput", false);
110-
public final BooleanOption creditsBGM = new BooleanOption("creditsBGM", true);
111-
112-
public final OptionCategory general = OptionCategory.create("general");
113-
public final OptionCategory nametagOptions = OptionCategory.create("nametagOptions");
114-
public final OptionCategory rendering = OptionCategory.create("rendering");
115-
public final OptionCategory outlines = OptionCategory.create("blockOutlines");
116-
public final OptionCategory timeChanger = OptionCategory.create("timeChanger");
11788

11889
@Getter
11990
private final List<Option<?>> options = new ArrayList<>();
12091

12192
public AxolotlClientConfig() {
122-
config.add(general);
123-
config.add(nametagOptions);
124-
config.add(rendering);
125-
126-
rendering.add(outlines);
127-
128-
nametagOptions.add(showOwnNametag);
129-
nametagOptions.add(useShadows);
130-
nametagOptions.add(nametagBackground);
131-
132-
nametagOptions.add(showBadges);
133-
nametagOptions.add(customBadge);
134-
nametagOptions.add(badgeText);
135-
13693
general.add(loadingScreenColor);
13794
general.add(nightMode);
138-
general.add(customWindowTitle);
13995
general.add(openCredits);
140-
general.add(debugLogOutput);
141-
142-
general.add(datetimeFormat);
143-
general.add(titleScreenOptionButtonMode);
144-
general.add(gameMenuScreenOptionButtonMode);
14596

14697
ConfigUI.getInstance().runWhenLoaded(() -> {
14798
general.getOptions().removeIf(o -> "configStyle".equals(o.getName()));
@@ -153,7 +104,6 @@ public AxolotlClientConfig() {
153104
general.add(configStyle = new StringArrayOption("configStyle", themes,
154105
"configStyle." + ConfigUI.getInstance().getCurrentStyle().getName(), s -> {
155106
ConfigUI.getInstance().setStyle(s.split("\\.")[1]);
156-
157107
Screen newScreen = RecreatableScreen.tryRecreate(MinecraftClient.getInstance().currentScreen);
158108
MinecraftClient.getInstance().setScreen(newScreen);
159109
}));
@@ -164,27 +114,7 @@ public AxolotlClientConfig() {
164114
}
165115
});
166116

167-
rendering.add(customSky,
168-
dynamicFOV,
169-
fullBright,
170-
removeVignette,
171-
lowFire,
172-
lowShield,
173-
hitColor,
174-
minimalViewBob,
175-
flatItems,
176-
noHurtCam);
177-
178-
timeChanger.add(timeChangerEnabled);
179-
timeChanger.add(customTime);
180-
rendering.add(timeChanger);
181-
182-
outlines.add(enableCustomOutlines);
183-
outlines.add(outlineColor);
184-
185-
rendering.add(noRain);
186-
187-
hidden.add(creditsBGM, someNiceBackground);
117+
rendering.add(customSky, lowShield, hitColor, flatItems);
188118

189119
general.add(new GenericOption("profiles.title", "profiles.configure", () ->
190120
MinecraftClient.getInstance().setScreen(new ProfilesScreen(MinecraftClient.getInstance().currentScreen))), false);

0 commit comments

Comments
 (0)