aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me/xmrvizzy
diff options
context:
space:
mode:
authorKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2023-05-31 08:31:57 +0800
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2023-06-22 11:33:38 +0800
commita0d504d9e2ffa95bbd2d9d99e546a44572417de9 (patch)
tree7b0e1958c569cfc38627750e893f39dae921baef /src/main/java/me/xmrvizzy
parentd1bdb78708bfd7f289b59e17dd0b225c1aedd9a2 (diff)
downloadSkyblocker-a0d504d9e2ffa95bbd2d9d99e546a44572417de9.tar.gz
Skyblocker-a0d504d9e2ffa95bbd2d9d99e546a44572417de9.tar.bz2
Skyblocker-a0d504d9e2ffa95bbd2d9d99e546a44572417de9.zip
Updated NEU repo error handling
Diffstat (limited to 'src/main/java/me/xmrvizzy')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java5
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java4
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/NEURepo.java7
3 files changed, 10 insertions, 6 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java
index ff3c7fae..838b2a55 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/FairySouls.java
@@ -63,10 +63,9 @@ public class FairySouls {
}
reader.close();
} catch (IOException e) {
- e.printStackTrace();
- LOGGER.error("Failed to load found fairy souls.");
+ LOGGER.error("Failed to load found fairy souls", e);
} catch (Exception e) {
- e.printStackTrace();
+ LOGGER.error("Encountered unknown exception loading fairy souls", e);
}
});
ClientLifecycleEvents.CLIENT_STOPPING.register(FairySouls::saveFoundFairySouls);
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java
index 13ca356a..dc63e351 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java
@@ -36,7 +36,9 @@ public class ItemRegistry {
File dir = ITEM_LIST_DIR.toFile();
File[] files = dir.listFiles();
- assert files != null;
+ if (files == null) {
+ return;
+ }
for (File file : files) {
Path path = ITEM_LIST_DIR.resolve(file.getName());
try {
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/NEURepo.java b/src/main/java/me/xmrvizzy/skyblocker/utils/NEURepo.java
index 0de6cecd..5254feb1 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/NEURepo.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/NEURepo.java
@@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallba
import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.TransportException;
import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,11 +53,13 @@ public class NEURepo {
Git.cloneRepository().setURI(REMOTE_REPO_URL).setDirectory(NEURepo.LOCAL_REPO_DIR.toFile()).setBranchesToClone(List.of("refs/heads/master")).setBranch("refs/heads/master").call().close();
LOGGER.info("[Skyblocker] NEU Repository Downloaded");
}
+ } catch (TransportException e){
+ LOGGER.error("[Skyblocker] Transport operation failed. Most likely unable to connect to the remote NEU repo on github", e);
} catch (RepositoryNotFoundException e) {
- LOGGER.warn("Local NEU Repository not found or corrupted, downloading new one", e);
+ LOGGER.warn("[Skyblocker] Local NEU Repository not found or corrupted, downloading new one", e);
deleteAndDownloadRepository();
} catch (Exception e) {
- LOGGER.error("Encountered unknown exception while initializing NEU Repository", e);
+ LOGGER.error("[Skyblocker] Encountered unknown exception while initializing NEU Repository", e);
}
});
}