Skip to content

Commit 68196ba

Browse files
committed
Fix two minor issues (#2225)
(cherry picked from commit 918a18b)
1 parent 3cf2a1e commit 68196ba

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

src/main/java/de/hysky/skyblocker/skyblock/item/custom/RepoDyeColors.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,19 @@ public static void init() {
3030
}
3131

3232
public static void loadDyes() {
33-
NEURepoManager.runAsyncAfterLoad(() -> {
34-
STATIC_DYES.clear();
35-
ANIMATED_DYES.clear();
36-
37-
NEURepoFile file = NEURepoManager.file("constants/dyes.json");
38-
if (file == null) return;
39-
try (InputStream stream = file.stream()) {
40-
Dyes dyes = Dyes.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseString(new String(stream.readAllBytes()))).getOrThrow();
41-
STATIC_DYES.putAll(dyes.staticDyes);
42-
ANIMATED_DYES.putAll(dyes.animatedDyes);
43-
LOGGER.info("[Skyblocker] Successfully loaded {} static dyes and {} animated dyes from repo.", STATIC_DYES.size(), ANIMATED_DYES.size());
44-
} catch (Exception ex) {
45-
LOGGER.info("[Skyblocker] Failed to load dyes from repo", ex);
46-
}
47-
});
33+
STATIC_DYES.clear();
34+
ANIMATED_DYES.clear();
35+
36+
NEURepoFile file = NEURepoManager.file("constants/dyes.json");
37+
if (file == null) return;
38+
try (InputStream stream = file.stream()) {
39+
Dyes dyes = Dyes.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseString(new String(stream.readAllBytes()))).getOrThrow();
40+
STATIC_DYES.putAll(dyes.staticDyes);
41+
ANIMATED_DYES.putAll(dyes.animatedDyes);
42+
LOGGER.info("[Skyblocker] Successfully loaded {} static dyes and {} animated dyes from repo.", STATIC_DYES.size(), ANIMATED_DYES.size());
43+
} catch (Exception ex) {
44+
LOGGER.info("[Skyblocker] Failed to load dyes from repo", ex);
45+
}
4846
}
4947

5048
private record Dyes(Object2ObjectMap<String, List<Integer>> animatedDyes, Map<String, Integer> staticDyes) {

src/main/java/de/hysky/skyblocker/utils/command/CommandUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
55

66
public final class CommandUtils {
7-
public static Command<FabricClientCommandSource> noOp = _ctx -> -1;
7+
public static final Command<FabricClientCommandSource> noOp = _ctx -> -1;
88
}

0 commit comments

Comments
 (0)