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

Commit c1fc4ff

Browse files
moehreagmoehreag
committed
fix a few bugs
1 parent f3b2f57 commit c1fc4ff

File tree

20 files changed

+76
-33
lines changed

20 files changed

+76
-33
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void onInitializeClient() {
136136
var keystrokes = json.get("hud").getAsJsonObject().get("keystrokehud")
137137
.getAsJsonObject();
138138
var mousemovement = new JsonObject();
139-
mousemovement.addProperty("enabled", keystrokes.get("mousemovement").getAsBoolean());
139+
mousemovement.addProperty("enabled", keystrokes.get("enabled").getAsBoolean() && keystrokes.get("mousemovement").getAsBoolean());
140140
mousemovement.addProperty("mouseMovementIndicator", keystrokes.get("mouseMovementIndicator").getAsString());
141141
mousemovement.addProperty("mouseMovementIndicatorOuter", keystrokes.get("mouseMovementIndicatorOuter").getAsString());
142142
json.get("hud").getAsJsonObject().add("mousemovementhud", mousemovement);

‎1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.*;
2929
import java.util.stream.Collectors;
3030

31+
import com.google.gson.stream.JsonWriter;
3132
import io.github.axolotlclient.AxolotlClient;
3233
import io.github.axolotlclient.AxolotlClientConfig.api.options.Option;
3334
import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
@@ -168,7 +169,7 @@ public void saveCustomEntries() {
168169
try {
169170
Files.createDirectories(CUSTOM_MODULE_SAVE_PATH.getParent());
170171
var writer = Files.newBufferedWriter(CUSTOM_MODULE_SAVE_PATH);
171-
var json = GsonHelper.GSON.newJsonWriter(writer);
172+
var json = new JsonWriter(writer);
172173
json.beginArray();
173174
for (Map.Entry<Identifier, HudEntry> entry : entries.entrySet()) {
174175
HudEntry hudEntry = entry.getValue();

‎1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,8 @@ public void loadKeystrokes() {
469469
.toList();
470470
keystrokes.clear();
471471
keystrokes.addAll(loaded);
472+
} else {
473+
saveKeystrokes();
472474
}
473475
} catch (Exception e) {
474476
AxolotlClient.LOGGER.warn("Failed to load keystroke configuration, using defaults!", e);

‎1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hud/gui/keystrokes/KeystrokesScreen.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ public class KeystrokesScreen extends io.github.axolotlclient.AxolotlClientConfi
3939

4040
public KeystrokesScreen(KeystrokeHud hud, Screen screen) {
4141
super("keystrokes.keys");
42+
if (hud.keystrokes == null) {
43+
hud.setKeystrokes();
44+
}
4245
this.keys = hud.keystrokes;
4346
this.hud = hud;
4447
this.screen = screen;
@@ -54,6 +57,7 @@ public void render(MatrixStack graphics, int mouseX, int mouseY, float delta) {
5457
@Override
5558
public void init() {
5659
super.init();
60+
5761
var keyBindsList = addDrawableChild(new KeyBindsList(this, keys));
5862
addDrawableChild(new ButtonWidget(width / 2 - 150 - 4, height - 33 / 2 - 10, 150, 20,
5963
new TranslatableText("controls.resetAll"), button -> {

‎1.20/src/main/java/io/github/axolotlclient/AxolotlClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public void onInitializeClient() {
136136
var keystrokes = json.get("hud").getAsJsonObject().get("keystrokehud")
137137
.getAsJsonObject();
138138
var mousemovement = new JsonObject();
139-
mousemovement.addProperty("enabled", keystrokes.get("mousemovement").getAsBoolean());
139+
mousemovement.addProperty("enabled", keystrokes.get("enabled").getAsBoolean() && keystrokes.get("mousemovement").getAsBoolean());
140140
mousemovement.addProperty("mouseMovementIndicator", keystrokes.get("mouseMovementIndicator").getAsString());
141141
mousemovement.addProperty("mouseMovementIndicatorOuter", keystrokes.get("mouseMovementIndicatorOuter").getAsString());
142142
json.get("hud").getAsJsonObject().add("mousemovementhud", mousemovement);

‎1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ public boolean isLabelEditable() {
452452

453453
public void saveKeystrokes() {
454454
try {
455+
Files.createDirectories(KEYSTROKE_SAVE_FILE.getParent());
455456
Files.writeString(KEYSTROKE_SAVE_FILE, GsonHelper.GSON.toJson(keystrokes.stream().map(Keystroke::serialize).toList()));
456457
} catch (Exception e) {
457458
AxolotlClient.LOGGER.warn("Failed to save keystroke configuration!", e);
@@ -461,12 +462,16 @@ public void saveKeystrokes() {
461462
@SuppressWarnings("unchecked")
462463
public void loadKeystrokes() {
463464
try {
464-
List<?> entries = (List<?>) GsonHelper.read(Files.readString(KEYSTROKE_SAVE_FILE));
465-
var loaded = entries.stream().map(e -> (Map<String, Object>) e)
466-
.map(KeystrokeHud.this::deserializeKey)
467-
.toList();
468-
keystrokes.clear();
469-
keystrokes.addAll(loaded);
465+
if (Files.exists(KEYSTROKE_SAVE_FILE)) {
466+
List<?> entries = (List<?>) GsonHelper.read(Files.readString(KEYSTROKE_SAVE_FILE));
467+
var loaded = entries.stream().map(e -> (Map<String, Object>) e)
468+
.map(KeystrokeHud.this::deserializeKey)
469+
.toList();
470+
keystrokes.clear();
471+
keystrokes.addAll(loaded);
472+
} else {
473+
saveKeystrokes();
474+
}
470475
} catch (Exception e) {
471476
AxolotlClient.LOGGER.warn("Failed to load keystroke configuration, using defaults!", e);
472477
}

‎1.20/src/main/java/io/github/axolotlclient/modules/hud/gui/keystrokes/KeystrokesScreen.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ public class KeystrokesScreen extends Screen {
3939

4040
public KeystrokesScreen(KeystrokeHud hud, Screen screen) {
4141
super(Text.translatable("keystrokes.keys"));
42+
if (hud.keystrokes == null) {
43+
hud.setKeystrokes();
44+
}
4245
this.keys = hud.keystrokes;
4346
this.hud = hud;
4447
this.screen = screen;
@@ -53,7 +56,6 @@ public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
5356

5457
@Override
5558
protected void init() {
56-
5759
var keyBindsList = addDrawableChild(new KeyBindsList(this, keys));
5860
addDrawableChild(ButtonWidget.builder(Text.translatable("controls.resetAll"), button -> {
5961
keys.clear();

‎1.21.4/src/main/java/io/github/axolotlclient/AxolotlClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public void onInitializeClient() {
140140
var keystrokes = json.get("hud").getAsJsonObject().get("keystrokehud")
141141
.getAsJsonObject();
142142
var mousemovement = new JsonObject();
143-
mousemovement.addProperty("enabled", keystrokes.get("mousemovement").getAsBoolean());
143+
mousemovement.addProperty("enabled", keystrokes.get("enabled").getAsBoolean() && keystrokes.get("mousemovement").getAsBoolean());
144144
mousemovement.addProperty("mouseMovementIndicator", keystrokes.get("mouseMovementIndicator").getAsString());
145145
mousemovement.addProperty("mouseMovementIndicatorOuter", keystrokes.get("mouseMovementIndicatorOuter").getAsString());
146146
json.get("hud").getAsJsonObject().add("mousemovementhud", mousemovement);

‎1.21.4/src/main/java/io/github/axolotlclient/modules/hud/gui/hud/KeystrokeHud.java‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@ public boolean isLabelEditable() {
445445

446446
public void saveKeystrokes() {
447447
try {
448+
Files.createDirectories(KEYSTROKE_SAVE_FILE.getParent());
448449
Files.writeString(KEYSTROKE_SAVE_FILE, GsonHelper.GSON.toJson(keystrokes.stream().map(Keystroke::serialize).toList()));
449450
} catch (Exception e) {
450451
AxolotlClient.LOGGER.warn("Failed to save keystroke configuration!", e);
@@ -454,12 +455,16 @@ public void saveKeystrokes() {
454455
@SuppressWarnings("unchecked")
455456
public void loadKeystrokes() {
456457
try {
457-
List<?> entries = (List<?>) GsonHelper.read(Files.readString(KEYSTROKE_SAVE_FILE));
458-
var loaded = entries.stream().map(e -> (Map<String, Object>) e)
459-
.map(KeystrokeHud.this::deserializeKey)
460-
.toList();
461-
keystrokes.clear();
462-
keystrokes.addAll(loaded);
458+
if (Files.exists(KEYSTROKE_SAVE_FILE)) {
459+
List<?> entries = (List<?>) GsonHelper.read(Files.readString(KEYSTROKE_SAVE_FILE));
460+
var loaded = entries.stream().map(e -> (Map<String, Object>) e)
461+
.map(KeystrokeHud.this::deserializeKey)
462+
.toList();
463+
keystrokes.clear();
464+
keystrokes.addAll(loaded);
465+
} else {
466+
saveKeystrokes();
467+
}
463468
} catch (Exception e) {
464469
AxolotlClient.LOGGER.warn("Failed to load keystroke configuration, using defaults!", e);
465470
}

‎1.21.4/src/main/java/io/github/axolotlclient/modules/hud/gui/keystrokes/KeystrokesScreen.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ public class KeystrokesScreen extends Screen {
4343

4444
public KeystrokesScreen(KeystrokeHud hud, Screen screen) {
4545
super(Component.translatable("keystrokes.keys"));
46+
if (hud.keystrokes == null) {
47+
hud.setKeystrokes();
48+
}
4649
this.keys = hud.keystrokes;
4750
this.hud = hud;
4851
this.screen = screen;
@@ -51,7 +54,6 @@ public KeystrokesScreen(KeystrokeHud hud, Screen screen) {
5154

5255
@Override
5356
protected void init() {
54-
5557
layout.addTitleHeader(getTitle(), font);
5658
layout.addToContents(keyBindsList);
5759
this.resetButton = Button.builder(Component.translatable("controls.resetAll"), button -> {

0 commit comments

Comments
 (0)