Merge pull request #284 from embeddedt/forge-1.7.10

Align 1.7.10 with master

3 files changed, 161 insertions, 9 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
index fa4ac45..7f02e75 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8ClassSourceLookup.java
@@ -22,7 +22,7 @@ package me.lucko.spark.sponge;
 
 import com.google.common.collect.ImmutableMap;
 
-import me.lucko.spark.common.util.ClassSourceLookup;
+import me.lucko.spark.common.sampler.source.ClassSourceLookup;
 
 import org.spongepowered.api.Game;
 import org.spongepowered.plugin.PluginCandidate;
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 e867a75..b1d31e9 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
@@ -20,6 +20,7 @@
 
 package me.lucko.spark.sponge;
 
+import com.google.common.base.Suppliers;
 import com.google.inject.Inject;
 
 import me.lucko.spark.common.SparkPlatform;
@@ -27,9 +28,11 @@ 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.platform.world.WorldInfoProvider;
 import me.lucko.spark.common.sampler.ThreadDumper;
+import me.lucko.spark.common.sampler.source.ClassSourceLookup;
+import me.lucko.spark.common.sampler.source.SourceMetadata;
 import me.lucko.spark.common.tick.TickHook;
-import me.lucko.spark.common.util.ClassSourceLookup;
 
 import net.kyori.adventure.text.Component;
 
@@ -50,11 +53,14 @@ import org.spongepowered.api.event.lifecycle.StartedEngineEvent;
 import org.spongepowered.api.event.lifecycle.StoppingEngineEvent;
 import org.spongepowered.plugin.PluginContainer;
 import org.spongepowered.plugin.builtin.jvm.Plugin;
+import org.spongepowered.plugin.metadata.model.PluginContributor;
 
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -67,9 +73,10 @@ public class Sponge8SparkPlugin implements SparkPlugin {
     private final Game game;
     private final Path configDirectory;
     private final ExecutorService asyncExecutor;
+    private final Supplier<ExecutorService> syncExecutor;
+    private final ThreadDumper.GameThread gameThreadDumper = new ThreadDumper.GameThread();
 
     private SparkPlatform platform;
-    private final ThreadDumper.GameThread threadDumper = new ThreadDumper.GameThread();
 
     @Inject
     public Sponge8SparkPlugin(PluginContainer pluginContainer, Logger logger, Game game, @ConfigDir(sharedRoot = false) Path configDirectory) {
@@ -78,6 +85,15 @@ public class Sponge8SparkPlugin implements SparkPlugin {
         this.game = game;
         this.configDirectory = configDirectory;
         this.asyncExecutor = game.asyncScheduler().executor(pluginContainer);
+        this.syncExecutor = Suppliers.memoize(() -> {
+            if (this.game.isServerAvailable()) {
+                return this.game.server().scheduler().executor(this.pluginContainer);
+            } else if (this.game.isClientAvailable()) {
+                return this.game.client().scheduler().executor(this.pluginContainer);
+            } else {
+                throw new IllegalStateException("Server and client both unavailable");
+            }
+        });
     }
 
 
@@ -88,6 +104,8 @@ public class Sponge8SparkPlugin implements SparkPlugin {
 
     @Listener
     public void onEnable(StartedEngineEvent<Server> event) {
+        executeSync(() -> this.gameThreadDumper.setThread(Thread.currentThread()));
+
         this.platform = new SparkPlatform(this);
         this.platform.enable();
     }
@@ -114,10 +132,14 @@ public class Sponge8SparkPlugin implements SparkPlugin {
 
     @Override
     public Stream<CommandSender> getCommandSenders() {
-        return Stream.concat(
-                this.game.server().onlinePlayers().stream(),
-                Stream.of(this.game.systemSubject())
-        ).map(Sponge8CommandSender::new);
+        if (this.game.isServerAvailable()) {
+            return Stream.concat(
+                    this.game.server().onlinePlayers().stream(),
+                    Stream.of(this.game.systemSubject())
+            ).map(Sponge8CommandSender::new);
+        } else {
+            return Stream.of(this.game.systemSubject()).map(Sponge8CommandSender::new);
+        }
     }
 
     @Override
@@ -126,6 +148,11 @@ public class Sponge8SparkPlugin implements SparkPlugin {
     }
 
     @Override
+    public void executeSync(Runnable task) {
+        this.syncExecutor.get().execute(task);
+    }
+
+    @Override
     public void log(Level level, String msg) {
         if (level == Level.INFO) {
             this.logger.info(msg);
@@ -140,7 +167,7 @@ public class Sponge8SparkPlugin implements SparkPlugin {
 
     @Override
     public ThreadDumper getDefaultThreadDumper() {
-        return this.threadDumper.get();
+        return this.gameThreadDumper.get();
     }
 
     @Override
@@ -154,6 +181,18 @@ public class Sponge8SparkPlugin implements SparkPlugin {
     }
 
     @Override
+    public Collection<SourceMetadata> getKnownSources() {
+        return SourceMetadata.gather(
+                this.game.pluginManager().plugins(),
+                plugin -> plugin.metadata().id(),
+                plugin -> plugin.metadata().version().toString(),
+                plugin -> plugin.metadata().contributors().stream()
+                        .map(PluginContributor::name)
+                        .collect(Collectors.joining(", "))
+        );
+    }
+
+    @Override
     public PlayerPingProvider createPlayerPingProvider() {
         if (this.game.isServerAvailable()) {
             return new Sponge8PlayerPingProvider(this.game.server());
@@ -163,6 +202,15 @@ public class Sponge8SparkPlugin implements SparkPlugin {
     }
 
     @Override
+    public WorldInfoProvider createWorldInfoProvider() {
+        if (this.game.isServerAvailable()) {
+            return new Sponge8WorldInfoProvider(this.game.server());
+        } else {
+            return WorldInfoProvider.NO_OP;
+        }
+    }
+
+    @Override
     public PlatformInfo getPlatformInfo() {
         return new Sponge8PlatformInfo(this.game);
     }
@@ -176,7 +224,6 @@ public class Sponge8SparkPlugin implements SparkPlugin {
 
         @Override
         public CommandResult process(CommandCause cause, ArgumentReader.Mutable arguments) {
-            this.plugin.threadDumper.ensureSetup();
             this.plugin.platform.executeCommand(new Sponge8CommandSender(cause), arguments.input().split(" "));
             return CommandResult.success();
         }
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8WorldInfoProvider.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8WorldInfoProvider.java
new file mode 100644
index 0000000..69b4515
--- /dev/null
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8WorldInfoProvider.java
@@ -0,0 +1,105 @@
+/*
+ * 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.Iterables;
+import com.google.common.collect.Lists;
+
+import me.lucko.spark.common.platform.world.AbstractChunkInfo;
+import me.lucko.spark.common.platform.world.CountMap;
+import me.lucko.spark.common.platform.world.WorldInfoProvider;
+
+import org.spongepowered.api.Server;
+import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.entity.EntityType;
+import org.spongepowered.api.entity.EntityTypes;
+import org.spongepowered.api.world.chunk.WorldChunk;
+import org.spongepowered.api.world.server.ServerWorld;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class Sponge8WorldInfoProvider implements WorldInfoProvider {
+    private final Server server;
+
+    public Sponge8WorldInfoProvider(Server server) {
+        this.server = server;
+    }
+
+    @Override
+    public CountsResult pollCounts() {
+        int players = this.server.onlinePlayers().size();
+        int entities = 0;
+        int tileEntities = 0;
+        int chunks = 0;
+
+        for (ServerWorld world : this.server.worldManager().worlds()) {
+            entities += world.entities().size();
+            tileEntities += world.blockEntities().size();
+            chunks += Iterables.size(world.loadedChunks());
+        }
+
+        return new CountsResult(players, entities, tileEntities, chunks);
+    }
+
+    @Override
+    public ChunksResult<Sponge7ChunkInfo> pollChunks() {
+        ChunksResult<Sponge7ChunkInfo> data = new ChunksResult<>();
+
+        for (ServerWorld world : this.server.worldManager().worlds()) {
+            List<WorldChunk> chunks = Lists.newArrayList(world.loadedChunks());
+
+            List<Sponge7ChunkInfo> list = new ArrayList<>(chunks.size());
+            for (WorldChunk chunk : chunks) {
+                list.add(new Sponge7ChunkInfo(chunk));
+            }
+
+            data.put(world.key().value(), list);
+        }
+
+        return data;
+    }
+
+    static final class Sponge7ChunkInfo extends AbstractChunkInfo<EntityType<?>> {
+        private final CountMap<EntityType<?>> entityCounts;
+
+        Sponge7ChunkInfo(WorldChunk chunk) {
+            super(chunk.chunkPosition().x(), chunk.chunkPosition().z());
+
+            this.entityCounts = new CountMap.Simple<>(new HashMap<>());
+            for (Entity entity : chunk.entities()) {
+                this.entityCounts.increment(entity.type());
+            }
+        }
+
+        @Override
+        public CountMap<EntityType<?>> getEntityCounts() {
+            return this.entityCounts;
+        }
+
+        @Override
+        public String entityTypeName(EntityType<?> type) {
+            return EntityTypes.registry().valueKey(type).value();
+        }
+
+    }
+}