From 4752dd69182e5cd76a16472d436fe3c44975430e Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Thu, 18 Jul 2024 01:23:58 +0200 Subject: [PATCH] Update Engine#populateCrashContent() --- .../staropensource/sosengine/base/Engine.java | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/base/src/main/java/de/staropensource/sosengine/base/Engine.java b/base/src/main/java/de/staropensource/sosengine/base/Engine.java index 720078d..b9f474d 100644 --- a/base/src/main/java/de/staropensource/sosengine/base/Engine.java +++ b/base/src/main/java/de/staropensource/sosengine/base/Engine.java @@ -183,23 +183,27 @@ public final class Engine implements SubsystemMainClass { crashContentIssuer.put("Additional information", "%issuer_info%"); crashContentIssuer.put("Message", "%issuer_message%"); + // Engine -> Dependencies -> base + Map<@NotNull String, @NotNull String> crashContentEngineDependenciesBase = new LinkedHashMap<>(); + crashContentEngineDependenciesBase.put("Jansi", "%engine_dependency_jansi%"); + crashContentEngineDependenciesBase.put("Reflections", "%engine_dependency_reflections%"); + // Engine -> Dependencies -> slf4j-compat + Map<@NotNull String, @NotNull String> crashContentEngineDependenciesSlf4jCompat = new LinkedHashMap<>(); + crashContentEngineDependenciesSlf4jCompat.put("SLF4J", "%engine_dependency_slf4j%"); + // Engine -> Dependencies -> opengl & vulkan + Map<@NotNull String, @NotNull String> crashContentEngineDependenciesOpenGlVulkan = new LinkedHashMap<>(); + crashContentEngineDependenciesOpenGlVulkan.put("LWJGL", "%engine_dependency_lwjgl%"); // Engine -> Dependencies - Map<@NotNull String, @NotNull String> crashContentEngineDependencies = new LinkedHashMap<>(); + Map<@NotNull String, @NotNull Object> crashContentEngineDependencies = new LinkedHashMap<>(); crashContentEngineDependencies.put("Lombok", "%engine_dependency_lombok%"); crashContentEngineDependencies.put("Jetbrains Annotations", "%engine_dependency_jetbrains_annotations%"); - crashContentEngineDependencies.put("Jansi", "%engine_dependency_jansi%"); - crashContentEngineDependencies.put("Reflections", "%engine_dependencies_reflections%"); - crashContentEngineDependencies.put("SLF4J", "%engine_dependencies_slf4j%"); - crashContentEngineDependencies.put("LWJGL", "%engine_dependencies_lwjgl%"); - // Engine -> Plugins - Map<@NotNull String, @NotNull String> crashContentEnginePlugins = new LinkedHashMap<>(); - crashContentEnginePlugins.put("Shadow", "%engine_plugin_shadow%"); - crashContentEnginePlugins.put("Lombok", "%engine_plugin_lombok%"); + crashContentEngineDependencies.put("Subsystem 'base'", crashContentEngineDependenciesBase); + crashContentEngineDependencies.put("Subsystem 'slf4j-compat'", crashContentEngineDependenciesSlf4jCompat); + crashContentEngineDependencies.put("Subsystems 'opengl' & 'vulkan'", crashContentEngineDependenciesOpenGlVulkan); // Engine -> * Map<@NotNull String, @NotNull Object> crashContentEngine = new LinkedHashMap<>(); crashContentEngine.put("Version", "%engine_version%"); crashContentEngine.put("Dependencies", crashContentEngineDependencies); - crashContentEngine.put("Plugins", crashContentEnginePlugins); // JVM -> Implementation Map<@NotNull String, @NotNull String> crashContentJvmImplementation = new LinkedHashMap<>();