Suggested Changes

src/main/java/ch/njol/skript/Skript.java

@@ -1685,7 +1685,7 @@ private static String getPackageName(String qualifiedClassName) {
 
 	private static void logErrorDetails(@Nullable Throwable cause, String[] info, @Nullable Thread thread, @Nullable TriggerItem item) {
 		String issuesUrl = "https://github.com/SkriptLang/Skript/issues";
-		String downloadUrl = "https://github.com/SkriptLang/Skript/releases/latest";
+		String downloadUrl = "https://github.com/SkriptLang/Skript/releases/latest"; //TODO grab this from the update checker
 
 		logEx();
 		logEx("[Skript] Severe Error:");
@@ -1711,13 +1711,17 @@ private static void logErrorDetails(@Nullable Throwable cause, String[] info, @N
 	private static Set<PluginDescriptionFile> identifyPluginsInStackTrace(StackTraceElement[] stackTrace) {
 		Set<PluginDescriptionFile> stackPlugins = new HashSet<>();
 		for (StackTraceElement element : stackTrace) {
-			pluginPackages.entrySet().stream()
-				.filter(entry -> element.getClassName().startsWith(entry.getKey()))
-				.forEach(entry -> stackPlugins.add(entry.getValue()));
+			try {
+				Class<?> clazz = Class.forName(element.getClassName());
+				Plugin plugin = JavaPlugin.getProvidingPlugin(clazz);
+				stackPlugins.add(plugin.getDescription());
+			} catch (ClassNotFoundException ignored) {
+			}
 		}
 		return stackPlugins;
 	}
 
+
 	private static void logPlatformSupportInfo(String issuesUrl, String downloadUrl, Set<PluginDescriptionFile> stackPlugins) {
 		SkriptUpdater updater = Skript.getInstance().getUpdater();
 
@@ -1777,7 +1781,7 @@ private static void logVersionInfo() {
 		SkriptUpdater updater = Skript.getInstance().getUpdater();
 		if (updater != null) {
 			ReleaseStatus status = updater.getReleaseStatus();
-			logEx("Skript: " + getVersion() + " (" + getStatusDescription(status) + ")");
+			logEx("Skript: " + getVersion() + " (" + status.toString() + ")");
 			ReleaseManifest current = updater.getCurrentRelease();
 			logEx("    Flavor: " + current.flavor);
 			logEx("    Date: " + current.date);
@@ -1792,15 +1796,6 @@ private static void logVersionInfo() {
 		logEx("Server platform: " + serverPlatform.name + (serverPlatform.supported ? "" : " (unsupported)"));
 	}
 
-	private static String getStatusDescription(ReleaseStatus status) {
-		switch (status) {
-			case LATEST: return "latest";
-			case OUTDATED: return "outdated";
-			case CUSTOM: return "custom version";
-			default: return "";
-		}
-	}
-
 	private static void logCurrentState(@Nullable Thread thread, @Nullable TriggerItem item) {
 		logEx("Current node: " + SkriptLogger.getNode());
 		logEx("Current item: " + (item == null ? "null" : item.toString(null, true)));

src/main/java/ch/njol/skript/update/ReleaseStatus.java

@@ -1,52 +1,45 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.update;
 
 
 /**
  * Status of currently installed release.
  */
 public enum ReleaseStatus {
-	
+
 	/**
 	 * Latest release in channel. This is a good thing.
 	 */
-	LATEST,
+	LATEST("latest"),
 
 	/**
 	 * Old, probably unsupported release.
 	 */
-	OUTDATED,
+	OUTDATED("outdated"),
 
 	/**
-	 * Updates have not been checked, so it not known if any exist.
+	 * Updates have not been checked, so it is not known if any exist.
 	 */
-	UNKNOWN,
+	UNKNOWN("unknown"),
 
 	/**
 	 * Updates have been checked, but this release was not found at all.
 	 * It might be not yet published.
 	 */
-	CUSTOM,
+	CUSTOM("custom"),
 
 	/**
 	 * Running a developer/nightly build, updates will not be checked.
 	 */
-	DEVELOPMENT
+	DEVELOPMENT("development");
+
+	private final String name;
+
+	ReleaseStatus(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String toString() {
+		return name;
+	}
 }