Specify full entrypoint name on crash (#928)

* Specify full entrypoint name on crash * Default getEntrypointName for EntrypointContainer * Rephrased entrypoint exception message
FabricMC · Aug 15, 2024 · 12dd25f · 12dd25f
1 parent f6d496a
commit 12dd25f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/src/main/java/net/fabricmc/loader/api/entrypoint/EntrypointContainer.java b/src/main/java/net/fabricmc/loader/api/entrypoint/EntrypointContainer.java
@@ -34,4 +34,11 @@ public interface EntrypointContainer<T> {
 	 * Returns the mod that provided this entrypoint.
 	 */
 	ModContainer getProvider();
+
+	/**
+	 * Returns a string representation of the entrypoint's definition.
+	 */
+	default String getDefinition() {
+		return "";
+	}
 }
diff --git a/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java b/src/main/java/net/fabricmc/loader/impl/FabricLoaderImpl.java
@@ -400,8 +400,8 @@ public <T> void invokeEntrypoints(String key, Class<T> type, Consumer<? super T>
 			} catch (Throwable t) {
 				exception = ExceptionUtil.gatherExceptions(t,
 						exception,
-						exc -> new RuntimeException(String.format("Could not execute entrypoint stage '%s' due to errors, provided by '%s'!",
-								key, container.getProvider().getMetadata().getId()),
+						exc -> new RuntimeException(String.format("Could not execute entrypoint stage '%s' due to errors, provided by '%s' at '%s'!",
+								key, container.getProvider().getMetadata().getId(), container.getDefinition()),
 								exc));
 			}
 		}

diff --git a/src/main/java/net/fabricmc/loader/impl/entrypoint/EntrypointContainerImpl.java b/src/main/java/net/fabricmc/loader/impl/entrypoint/EntrypointContainerImpl.java
@@ -64,4 +64,9 @@ public synchronized T getEntrypoint() {
 	public ModContainer getProvider() {
 		return entry.getModContainer();
 	}
+
+	@Override
+	public String getDefinition() {
+		return entry.getDefinition();
+	}
 }
diff --git a/src/main/java/net/fabricmc/loader/impl/entrypoint/EntrypointStorage.java b/src/main/java/net/fabricmc/loader/impl/entrypoint/EntrypointStorage.java
@@ -39,6 +39,8 @@ interface Entry {
 		boolean isOptional();
 
 		ModContainerImpl getModContainer();
+
+		String getDefinition();
 	}
 
 	@SuppressWarnings("deprecation")
@@ -87,6 +89,11 @@ public boolean isOptional() {
 		public ModContainerImpl getModContainer() {
 			return mod;
 		}
+
+		@Override
+		public String getDefinition() {
+			return value;
+		}
 	}
 
 	private static final class NewEntry implements Entry {
@@ -132,6 +139,11 @@ public boolean isOptional() {
 		public ModContainerImpl getModContainer() {
 			return mod;
 		}
+
+		@Override
+		public String getDefinition() {
+			return value;
+		}
 	}
 
 	private final Map<String, List<Entry>> entryMap = new HashMap<>();