Add class source lookups for Fabric and Forge

5 files changed, 118 insertions, 15 deletions

diff --git a/spark-common/src/main/java/me/lucko/spark/common/util/ClassSourceLookup.java b/spark-common/src/main/java/me/lucko/spark/common/util/ClassSourceLookup.java
index 27e3ec6..9f58c7f 100644
--- a/spark-common/src/main/java/me/lucko/spark/common/util/ClassSourceLookup.java
+++ b/spark-common/src/main/java/me/lucko/spark/common/util/ClassSourceLookup.java
@@ -29,6 +29,7 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
@@ -97,6 +98,18 @@ public interface ClassSourceLookup {
             }
             return null;
         }
+
+        protected String identifyUrl(URL url) throws URISyntaxException {
+            return url.getProtocol().equals("file") ? identifyFile(Paths.get(url.toURI())) : null;
+        }
+
+        protected String identifyFile(Path path) {
+            return identifyFileName(path.getFileName().toString());
+        }
+
+        protected String identifyFileName(String fileName) {
+            return fileName.endsWith(".jar") ? fileName.substring(0, fileName.length() - 4) : null;
+        }
     }
 
     /**
@@ -117,24 +130,20 @@ public interface ClassSourceLookup {
             URL url = codeSource.getLocation();
             return url == null ? null : identifyUrl(url);
         }
-    }
 
-    /**
-     * Attempts to identify a jar file from a URL.
-     *
-     * @param url the url
-     * @return the name of the file
-     * @throws URISyntaxException thrown by {@link URL#toURI()}
-     */
-    static String identifyUrl(URL url) throws URISyntaxException {
-        if (url.getProtocol().equals("file")) {
-            String jarName = Paths.get(url.toURI()).getFileName().toString();
-            if (jarName.endsWith(".jar")) {
-                return jarName.substring(0, jarName.length() - 4);
-            }
+        protected String identifyUrl(URL url) throws URISyntaxException {
+            return url.getProtocol().equals("file") ? identifyFile(Paths.get(url.toURI())) : null;
+        }
+
+        protected String identifyFile(Path path) {
+            return identifyFileName(path.getFileName().toString());
+        }
+
+        protected String identifyFileName(String fileName) {
+            return fileName.endsWith(".jar") ? fileName.substring(0, fileName.length() - 4) : null;
         }
-        return null;
     }
+
     interface Visitor {
         void visit(ThreadNode node);
 
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClassSourceLookup.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClassSourceLookup.java
new file mode 100644
index 0000000..fad0bc8
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricClassSourceLookup.java
@@ -0,0 +1,44 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.lucko.spark.fabric;
+
+import me.lucko.spark.common.util.ClassSourceLookup;
+
+import net.fabricmc.loader.api.FabricLoader;
+
+import java.nio.file.Path;
+
+public class FabricClassSourceLookup extends ClassSourceLookup.ByCodeSource {
+    private final Path modsDirectory;
+
+    public FabricClassSourceLookup() {
+        this.modsDirectory = FabricLoader.getInstance().getGameDir().resolve("mods").toAbsolutePath().normalize();
+    }
+
+    @Override
+    protected String identifyFile(Path path) {
+        if (!path.startsWith(this.modsDirectory)) {
+            return null;
+        }
+
+        return super.identifyFileName(this.modsDirectory.relativize(path).toString());
+    }
+}
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricSparkPlugin.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricSparkPlugin.java
index 4b48d6a..50c6e44 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricSparkPlugin.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricSparkPlugin.java
@@ -31,6 +31,8 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.sampler.ThreadDumper;
+import me.lucko.spark.common.util.ClassSourceLookup;
+import me.lucko.spark.fabric.FabricClassSourceLookup;
 import me.lucko.spark.fabric.FabricSparkMod;
 
 import net.minecraft.server.command.CommandOutput;
@@ -88,6 +90,11 @@ public abstract class FabricSparkPlugin implements SparkPlugin {
         return this.threadDumper.get();
     }
 
+    @Override
+    public ClassSourceLookup createClassSourceLookup() {
+        return new FabricClassSourceLookup();
+    }
+
     protected static <T> void registerCommands(CommandDispatcher<T> dispatcher, Command<T> executor, SuggestionProvider<T> suggestor, String... aliases) {
         if (aliases.length == 0) {
             return;
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClassSourceLookup.java b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClassSourceLookup.java
new file mode 100644
index 0000000..fc4af30
--- /dev/null
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/ForgeClassSourceLookup.java
@@ -0,0 +1,37 @@
+/*
+ * This file is part of spark.
+ *
+ *  Copyright (c) lucko (Luck) <luck@lucko.me>
+ *  Copyright (c) contributors
+ *
+ *  This program 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.
+ *
+ *  This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.lucko.spark.forge;
+
+import me.lucko.spark.common.util.ClassSourceLookup;
+
+import java.net.URL;
+
+public class ForgeClassSourceLookup extends ClassSourceLookup.ByCodeSource {
+
+    @Override
+    protected String identifyUrl(URL url) {
+        if (url.getProtocol().equals("modjar")) {
+            String host = url.getHost();
+            return host.equals("forge") ? null : host;
+        }
+        return null;
+    }
+}
diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java
index 083a350..c44b587 100644
--- a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java
+++ b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeSparkPlugin.java
@@ -31,6 +31,8 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.sampler.ThreadDumper;
+import me.lucko.spark.common.util.ClassSourceLookup;
+import me.lucko.spark.forge.ForgeClassSourceLookup;
 import me.lucko.spark.forge.ForgeSparkMod;
 
 import net.minecraft.command.ICommandSource;
@@ -107,4 +109,8 @@ public abstract class ForgeSparkPlugin implements SparkPlugin {
         return this.threadDumper.get();
     }
 
+    @Override
+    public ClassSourceLookup createClassSourceLookup() {
+        return new ForgeClassSourceLookup();
+    }
 }