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

Commit 0147fcd

Browse files
moehreagmoehreag
committed
fix another batch of bugs
1 parent be5229e commit 0147fcd

File tree

15 files changed

+35
-14
lines changed

15 files changed

+35
-14
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import java.nio.file.Path;
2626
import java.util.function.Consumer;
27-
import java.util.function.Function;
2827

2928
import io.github.axolotlclient.AxolotlClient;
3029
import io.github.axolotlclient.AxolotlClientConfig.api.ui.screen.ConfigScreen;
@@ -75,12 +74,11 @@ public void init() {
7574
account.add(new GenericOption("api.account.usernames", "clickToOpen",
7675
() -> client.openScreen(new UsernameManagementScreen(client.currentScreen))));
7776
account.add(new GenericOption("api.account.export", "api.account.export_data", () -> ThreadExecuter.scheduleTask(() -> {
78-
Function<String, String> translate = API.getInstance().getTranslationProvider()::translate;
7977
try (MemoryStack stack = MemoryStack.stackPush()) {
8078
var pointers = stack.mallocPointer(1);
8179
pointers.put(stack.UTF8("*.json"));
8280
pointers.flip();
83-
var result = TinyFileDialogs.tinyfd_saveFileDialog(translate.apply("api.account.export.dialog_title"), FabricLoader.getInstance().getGameDir().toString(), pointers, null);
81+
var result = TinyFileDialogs.tinyfd_saveFileDialog("Choose export destination", FabricLoader.getInstance().getGameDir().toString(), pointers, null);
8482
if (result != null) {
8583
AccountDataRequest.get(Path.of(result));
8684
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ public void init() {
147147
general.add(debugLogOutput);
148148
ConfigUI.getInstance().runWhenLoaded(() -> {
149149
StringArrayOption configStyle;
150+
if (general.getOptions().removeIf(o -> "configStyle".equals(o.getName()))) {
151+
AxolotlClient.configManager.save();
152+
}
150153
general.add(configStyle = new StringArrayOption("configStyle",
151154
ConfigUI.getInstance().getStyleNames().stream().map(s -> "configStyle." + s)
152155
.toArray(String[]::new),

‎1.16_combat-6/src/main/java/io/github/axolotlclient/modules/sky/SkyResourceManager.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ public void apply(ResourceManager manager) {
6969

7070
for (Identifier entry : manager
7171
.findResources("sky", identifier -> identifier.endsWith(".json"))) {
72+
if (entry.getNamespace().equals("celestial")) { // Skip Celestial Packs, we cannot load them.
73+
continue;
74+
}
7275
AxolotlClient.LOGGER.debug("Loading FSB sky from " + entry);
7376
SkyboxManager.getInstance().addSkybox(new FSBSkyboxInstance(gson.fromJson(
7477
new BufferedReader(new InputStreamReader(manager.getResource(entry).getInputStream(), StandardCharsets.UTF_8))

‎1.20/src/main/java/io/github/axolotlclient/api/APIOptions.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import java.nio.file.Path;
2626
import java.util.function.Consumer;
27-
import java.util.function.Function;
2827

2928
import com.mojang.blaze3d.platform.InputUtil;
3029
import io.github.axolotlclient.AxolotlClient;
@@ -74,12 +73,11 @@ public void init() {
7473
account.add(new GenericOption("api.account.usernames", "clickToOpen",
7574
() -> client.setScreen(new UsernameManagementScreen(client.currentScreen))));
7675
account.add(new GenericOption("api.account.export", "api.account.export_data", () -> ThreadExecuter.scheduleTask(() -> {
77-
Function<String, String> translate = API.getInstance().getTranslationProvider()::translate;
7876
try (MemoryStack stack = MemoryStack.stackPush()) {
7977
var pointers = stack.mallocPointer(1);
8078
pointers.put(stack.UTF8("*.json"));
8179
pointers.flip();
82-
var result = TinyFileDialogs.tinyfd_saveFileDialog(translate.apply("api.account.export.dialog_title"), FabricLoader.getInstance().getGameDir().toString(), pointers, null);
80+
var result = TinyFileDialogs.tinyfd_saveFileDialog("Choose export destination", FabricLoader.getInstance().getGameDir().toString(), pointers, null);
8381
if (result != null) {
8482
AccountDataRequest.get(Path.of(result));
8583
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ public void init() {
148148
general.add(debugLogOutput);
149149
ConfigUI.getInstance().runWhenLoaded(() -> {
150150
StringArrayOption configStyle;
151+
if (general.getOptions().removeIf(o -> "configStyle".equals(o.getName()))) {
152+
AxolotlClient.configManager.save();
153+
}
151154
general.add(configStyle = new StringArrayOption("configStyle",
152155
ConfigUI.getInstance().getStyleNames().stream().map(s -> "configStyle." + s)
153156
.toArray(String[]::new),

‎1.20/src/main/java/io/github/axolotlclient/modules/sky/SkyResourceManager.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ public void reload(ResourceManager manager) {
9797

9898
for (Map.Entry<Identifier, Resource> entry : manager
9999
.findResources("sky", identifier -> identifier.getPath().endsWith(".json")).entrySet()) {
100+
if (entry.getKey().getNamespace().equals("celestial")) { // Skip Celestial Packs, we cannot load them.
101+
continue;
102+
}
100103
AxolotlClient.LOGGER.debug("Loading FSB sky from " + entry.getKey());
101104
try (BufferedReader reader = entry.getValue().openBufferedReader()) {
102105
SkyboxManager.getInstance().addSkybox(new FSBSkyboxInstance(

‎1.21.4/src/main/java/io/github/axolotlclient/api/APIOptions.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import java.nio.file.Path;
2626
import java.util.function.Consumer;
27-
import java.util.function.Function;
2827

2928
import com.mojang.blaze3d.platform.InputConstants;
3029
import io.github.axolotlclient.AxolotlClient;
@@ -72,12 +71,11 @@ public void init() {
7271
() -> client.setScreen(new UsernameManagementScreen(client.screen))
7372
));
7473
account.add(new GenericOption("api.account.export", "api.account.export_data", () -> ThreadExecuter.scheduleTask(() -> {
75-
Function<String, String> translate = API.getInstance().getTranslationProvider()::translate;
7674
try (MemoryStack stack = MemoryStack.stackPush()) {
7775
var pointers = stack.mallocPointer(1);
7876
pointers.put(stack.UTF8("*.json"));
7977
pointers.flip();
80-
var result = TinyFileDialogs.tinyfd_saveFileDialog(translate.apply("api.account.export.dialog_title"), FabricLoader.getInstance().getGameDir().toString(), pointers, null);
78+
var result = TinyFileDialogs.tinyfd_saveFileDialog("Choose export destination", FabricLoader.getInstance().getGameDir().toString(), pointers, null);
8179
if (result != null) {
8280
AccountDataRequest.get(Path.of(result));
8381
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ public void init() {
144144
general.add(CommonOptions.datetimeFormat);
145145
ConfigUI.getInstance().runWhenLoaded(() -> {
146146
StringArrayOption configStyle;
147+
if (general.getOptions().removeIf(o -> "configStyle".equals(o.getName()))) {
148+
AxolotlClient.configManager.save();
149+
}
147150
general.add(configStyle = new StringArrayOption("configStyle",
148151
ConfigUI.getInstance().getStyleNames().stream().map(s -> "configStyle." + s)
149152
.toArray(String[]::new),

‎1.21/src/main/java/io/github/axolotlclient/api/APIOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void init() {
7979
var pointers = stack.mallocPointer(1);
8080
pointers.put(stack.UTF8("*.json"));
8181
pointers.flip();
82-
var result = TinyFileDialogs.tinyfd_saveFileDialog(translate.apply("api.account.export.dialog_title"), FabricLoader.getInstance().getGameDir().toString(), pointers, null);
82+
var result = TinyFileDialogs.tinyfd_saveFileDialog("Choose export destination", FabricLoader.getInstance().getGameDir().toString(), pointers, null);
8383
if (result != null) {
8484
AccountDataRequest.get(Path.of(result));
8585
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ public void init() {
149149
ConfigUI.getInstance().runWhenLoaded(() -> {
150150
if (general.getOptions().stream().noneMatch(o -> o.getName().equals("configStyle"))) {
151151
StringArrayOption configStyle;
152+
if (general.getOptions().removeIf(o -> "configStyle".equals(o.getName()))) {
153+
AxolotlClient.configManager.save();
154+
}
152155
general.add(configStyle = new StringArrayOption("configStyle",
153156
ConfigUI.getInstance().getStyleNames().stream().map(s -> "configStyle." + s)
154157
.toArray(String[]::new),

0 commit comments

Comments
 (0)