Improve entrypoint exception handling a bit. Should help with debugging

#332.
QuiltMC · Jul 9, 2023 · cb54b62 · cb54b62
1 parent be3bcc1
commit cb54b62
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/org/quiltmc/loader/impl/entrypoint/EntrypointStorage.java b/src/main/java/org/quiltmc/loader/impl/entrypoint/EntrypointStorage.java
@@ -176,10 +176,11 @@ public <T> List<T> getEntrypoints(String key, Class<T> type) {
 					results.add(result);
 				}
 			} catch (Throwable t) {
+				QuiltEntrypointException e2 = new QuiltEntrypointException(key, entry.getModContainer().metadata().id(), t);
 				if (exception == null) {
-					exception = new QuiltEntrypointException(key, entry.getModContainer().metadata().id(), t);
+					exception = e2;
 				} else {
-					exception.addSuppressed(t);
+					exception.addSuppressed(e2);
 				}
 			}
 		}
@@ -209,10 +210,11 @@ public <T> List<EntrypointContainer<T>> getEntrypointContainers(String key, Clas
 
 					container = new EntrypointContainerImpl<>(entry.getModContainer(), instance);
 				} catch (Throwable t) {
+					QuiltEntrypointException e2 = new QuiltEntrypointException(key, entry.getModContainer().metadata().id(), t);
 					if (exc == null) {
-						exc = new QuiltEntrypointException(key, entry.getModContainer().metadata().id(), t);
+						exc = e2;
 					} else {
-						exc.addSuppressed(t);
+						exc.addSuppressed(e2);
 					}
 
 					continue;
@@ -221,7 +223,7 @@ public <T> List<EntrypointContainer<T>> getEntrypointContainers(String key, Clas
 				container = new EntrypointContainerImpl<>(entry.getModContainer(), () -> {
 				try {
 					return entry.getOrCreate(type);
-				} catch (Exception ex) {
+				} catch (Exception | LinkageError ex) {
 					throw new QuiltEntrypointException(key, entry.getModContainer().metadata().id(), ex);
 				}
 			});

diff --git a/src/main/resources/changelog/0.20.0.txt b/src/main/resources/changelog/0.20.0.txt
@@ -1,3 +1,7 @@
+Features:
+
+* Improved entrypoint exception handling a bit.
+
 Bug Fixes:
 
 * Fixed the mods table being empty if quilt-loader crashed too early.