@@ -65,7 +65,7 @@ private static void handleRecipeSynchronization() {
65
65
try {
66
66
client .getNetworkHandler ().onSynchronizeRecipes (packet );
67
67
} catch (Exception e ) {
68
- LOGGER .info ("[Skyblocker] recipe sync error" , e );
68
+ LOGGER .info ("[Skyblocker NEU Repo ] recipe sync error" , e );
69
69
}
70
70
}
71
71
}
@@ -76,27 +76,36 @@ public static boolean isLoading() {
76
76
77
77
private static CompletableFuture <Boolean > loadRepository () {
78
78
return CompletableFuture .supplyAsync (() -> {
79
+ boolean success = true ;
79
80
try {
80
81
if (Files .isDirectory (NEURepoManager .LOCAL_REPO_DIR )) {
81
82
try (Git localRepo = Git .open (NEURepoManager .LOCAL_REPO_DIR .toFile ())) {
82
83
localRepo .pull ().setRebase (true ).call ();
83
- LOGGER .info ("[Skyblocker] NEU Repository Updated" );
84
+ LOGGER .info ("[Skyblocker NEU Repo ] NEU Repository Updated" );
84
85
}
85
86
} else {
86
87
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" );
88
89
}
89
- NEU_REPO .reload ();
90
- return true ;
91
90
} 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 ;
93
93
} 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 );
95
95
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 ();
96
104
} 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 ;
98
107
}
99
- return false ;
108
+ return success ;
100
109
});
101
110
}
102
111
@@ -114,7 +123,7 @@ private static void deleteAndDownloadRepository(PlayerEntity player) {
114
123
sendMessage (player , Constants .PREFIX .get ().append (Text .translatable ("skyblocker.updateRepository.deleted" )));
115
124
sendMessage (player , Constants .PREFIX .get ().append (Text .translatable (loadRepository ().join () ? "skyblocker.updateRepository.success" : "skyblocker.updateRepository.failed" )));
116
125
} 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 );
118
127
sendMessage (player , Constants .PREFIX .get ().append (Text .translatable ("skyblocker.updateRepository.error" )));
119
128
}
120
129
});
0 commit comments