Skip to content

Commit f8b91f9

Browse files
Always load NEU repo (#920)
(cherry picked from commit d8381fd)
1 parent 894a1ea commit f8b91f9

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

src/main/java/de/hysky/skyblocker/utils/NEURepoManager.java

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private static void handleRecipeSynchronization() {
6565
try {
6666
client.getNetworkHandler().onSynchronizeRecipes(packet);
6767
} catch (Exception e) {
68-
LOGGER.info("[Skyblocker] recipe sync error" , e);
68+
LOGGER.info("[Skyblocker NEU Repo] recipe sync error", e);
6969
}
7070
}
7171
}
@@ -76,27 +76,36 @@ public static boolean isLoading() {
7676

7777
private static CompletableFuture<Boolean> loadRepository() {
7878
return CompletableFuture.supplyAsync(() -> {
79+
boolean success = true;
7980
try {
8081
if (Files.isDirectory(NEURepoManager.LOCAL_REPO_DIR)) {
8182
try (Git localRepo = Git.open(NEURepoManager.LOCAL_REPO_DIR.toFile())) {
8283
localRepo.pull().setRebase(true).call();
83-
LOGGER.info("[Skyblocker] NEU Repository Updated");
84+
LOGGER.info("[Skyblocker NEU Repo] NEU Repository Updated");
8485
}
8586
} else {
8687
Git.cloneRepository().setURI(REMOTE_REPO_URL).setDirectory(NEURepoManager.LOCAL_REPO_DIR.toFile()).setBranchesToClone(List.of("refs/heads/master")).setBranch("refs/heads/master").call().close();
87-
LOGGER.info("[Skyblocker] NEU Repository Downloaded");
88+
LOGGER.info("[Skyblocker NEU Repo] NEU Repository Downloaded");
8889
}
89-
NEU_REPO.reload();
90-
return true;
9190
} catch (TransportException e) {
92-
LOGGER.error("[Skyblocker] Transport operation failed. Most likely unable to connect to the remote NEU repo on github", e);
91+
LOGGER.error("[Skyblocker NEU Repo] Transport operation failed. Most likely unable to connect to the remote NEU repo on github", e);
92+
success = false;
9393
} catch (RepositoryNotFoundException e) {
94-
LOGGER.warn("[Skyblocker] Local NEU Repository not found or corrupted, downloading new one", e);
94+
LOGGER.warn("[Skyblocker NEU Repo] Local NEU Repository not found or corrupted, downloading new one", e);
9595
Scheduler.INSTANCE.schedule(() -> deleteAndDownloadRepository(MinecraftClient.getInstance().player), 1);
96+
success = false;
97+
} catch (Exception e) {
98+
LOGGER.error("[Skyblocker NEU Repo] Encountered unknown exception while downloading NEU Repository", e);
99+
success = false;
100+
}
101+
102+
try {
103+
NEU_REPO.reload();
96104
} catch (Exception e) {
97-
LOGGER.error("[Skyblocker] Encountered unknown exception while initializing NEU Repository", e);
105+
LOGGER.error("[Skyblocker NEU Repo] Encountered unknown exception while loading NEU Repository", e);
106+
success = false;
98107
}
99-
return false;
108+
return success;
100109
});
101110
}
102111

@@ -114,7 +123,7 @@ private static void deleteAndDownloadRepository(PlayerEntity player) {
114123
sendMessage(player, Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.deleted")));
115124
sendMessage(player, Constants.PREFIX.get().append(Text.translatable(loadRepository().join() ? "skyblocker.updateRepository.success" : "skyblocker.updateRepository.failed")));
116125
} catch (Exception e) {
117-
LOGGER.error("[Skyblocker] Encountered unknown exception while deleting the NEU repo", e);
126+
LOGGER.error("[Skyblocker NEU Repo] Encountered unknown exception while deleting the NEU repo", e);
118127
sendMessage(player, Constants.PREFIX.get().append(Text.translatable("skyblocker.updateRepository.error")));
119128
}
120129
});

0 commit comments

Comments
 (0)