Merge pull request #213 from embeddedt/forge-1.7.10

Align 1.7.10 with Spark 1.9

5 files changed, 150 insertions, 2 deletions

diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java
new file mode 100644
index 0000000..fa4ac45
--- /dev/null
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java
@@ -0,0 +1,84 @@
+/*
+ * 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.sponge;
+
+import com.google.common.collect.ImmutableMap;
+
+import me.lucko.spark.common.util.ClassSourceLookup;
+
+import org.spongepowered.api.Game;
+import org.spongepowered.plugin.PluginCandidate;
+import org.spongepowered.plugin.PluginContainer;
+import org.spongepowered.plugin.builtin.jvm.JVMPluginContainer;
+import org.spongepowered.plugin.builtin.jvm.locator.JVMPluginResource;
+
+import java.lang.reflect.Field;
+import java.nio.file.Path;
+import java.util.Collection;
+import java.util.Map;
+
+public class Sponge8ClassSourceLookup extends ClassSourceLookup.ByCodeSource {
+    private final Path modsDirectory;
+    private final Map<Path, String> pathToPluginMap;
+
+    public Sponge8ClassSourceLookup(Game game) {
+        this.modsDirectory = game.gameDirectory().resolve("mods").toAbsolutePath().normalize();
+        this.pathToPluginMap = constructPathToPluginIdMap(game.pluginManager().plugins());
+    }
+
+    @Override
+    public String identifyFile(Path path) {
+        String id = this.pathToPluginMap.get(path);
+        if (id != null) {
+            return id;
+        }
+
+        if (!path.startsWith(this.modsDirectory)) {
+            return null;
+        }
+
+        return super.identifyFileName(this.modsDirectory.relativize(path).toString());
+    }
+
+    // pretty nasty, but if it fails it doesn't really matter
+    @SuppressWarnings("unchecked")
+    private static Map<Path, String> constructPathToPluginIdMap(Collection<PluginContainer> plugins) {
+        ImmutableMap.Builder<Path, String> builder = ImmutableMap.builder();
+
+        try {
+            Field candidateField = JVMPluginContainer.class.getDeclaredField("candidate");
+            candidateField.setAccessible(true);
+
+            for (PluginContainer plugin : plugins) {
+                if (plugin instanceof JVMPluginContainer) {
+                    PluginCandidate<JVMPluginResource> candidate = (PluginCandidate<JVMPluginResource>) candidateField.get(plugin);
+                    Path path = candidate.resource().path().toAbsolutePath().normalize();
+                    builder.put(path, plugin.metadata().id());
+                }
+            }
+        } catch (Exception e) {
+            // ignore
+        }
+
+        return builder.build();
+    }
+
+}
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
index 5e7a65a..e7878dc 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
@@ -17,6 +17,7 @@
  *  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.sponge;
 
 import me.lucko.spark.common.command.sender.AbstractCommandSender;
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlatformInfo.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlatformInfo.java
index c2a136a..9589ddf 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlatformInfo.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlatformInfo.java
@@ -20,12 +20,12 @@
 
 package me.lucko.spark.sponge;
 
-import me.lucko.spark.common.platform.AbstractPlatformInfo;
+import me.lucko.spark.common.platform.PlatformInfo;
 
 import org.spongepowered.api.Game;
 import org.spongepowered.api.Platform;
 
-public class Sponge8PlatformInfo extends AbstractPlatformInfo {
+public class Sponge8PlatformInfo implements PlatformInfo {
     private final Game game;
 
     public Sponge8PlatformInfo(Game game) {
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlayerPingProvider.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlayerPingProvider.java
new file mode 100644
index 0000000..2bcaf6a
--- /dev/null
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8PlayerPingProvider.java
@@ -0,0 +1,47 @@
+/*
+ * 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.sponge;
+
+import com.google.common.collect.ImmutableMap;
+
+import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
+
+import org.spongepowered.api.Server;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+
+import java.util.Map;
+
+public class Sponge8PlayerPingProvider implements PlayerPingProvider {
+    private final Server server;
+
+    public Sponge8PlayerPingProvider(Server server) {
+        this.server = server;
+    }
+
+    @Override
+    public Map<String, Integer> poll() {
+        ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder();
+        for (ServerPlayer player : this.server.onlinePlayers()) {
+            builder.put(player.name(), player.connection().latency());
+        }
+        return builder.build();
+    }
+}
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8SparkPlugin.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8SparkPlugin.java
index 0195b24..e867a75 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8SparkPlugin.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8SparkPlugin.java
@@ -25,9 +25,11 @@ import com.google.inject.Inject;
 import me.lucko.spark.common.SparkPlatform;
 import me.lucko.spark.common.SparkPlugin;
 import me.lucko.spark.common.command.sender.CommandSender;
+import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
 import me.lucko.spark.common.platform.PlatformInfo;
 import me.lucko.spark.common.sampler.ThreadDumper;
 import me.lucko.spark.common.tick.TickHook;
+import me.lucko.spark.common.util.ClassSourceLookup;
 
 import net.kyori.adventure.text.Component;
 
@@ -147,6 +149,20 @@ public class Sponge8SparkPlugin implements SparkPlugin {
     }
 
     @Override
+    public ClassSourceLookup createClassSourceLookup() {
+        return new Sponge8ClassSourceLookup(this.game);
+    }
+
+    @Override
+    public PlayerPingProvider createPlayerPingProvider() {
+        if (this.game.isServerAvailable()) {
+            return new Sponge8PlayerPingProvider(this.game.server());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
     public PlatformInfo getPlatformInfo() {
         return new Sponge8PlatformInfo(this.game);
     }