Merge pull request #213 from embeddedt/forge-1.7.10

Align 1.7.10 with Spark 1.9

6 files changed, 469 insertions, 0 deletions

diff --git a/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7ClassSourceLookup.java b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7ClassSourceLookup.java
new file mode 100644
index 0000000..90f3b8f
--- /dev/null
+++ b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7ClassSourceLookup.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.sponge;
+
+import me.lucko.spark.common.util.ClassSourceLookup;
+
+import org.spongepowered.api.Game;
+
+import java.nio.file.Path;
+
+public class Sponge7ClassSourceLookup extends ClassSourceLookup.ByCodeSource {
+    private final Path modsDirectory;
+
+    public Sponge7ClassSourceLookup(Game game) {
+        this.modsDirectory = game.getGameDirectory().resolve("mods").toAbsolutePath().normalize();
+    }
+
+    @Override
+    public String identifyFile(Path path) {
+        if (!path.startsWith(this.modsDirectory)) {
+            return null;
+        }
+
+        return super.identifyFileName(this.modsDirectory.relativize(path).toString());
+    }
+}
diff --git a/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7CommandSender.java b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7CommandSender.java
new file mode 100644
index 0000000..b0cfd3c
--- /dev/null
+++ b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7CommandSender.java
@@ -0,0 +1,61 @@
+/*
+ * 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 me.lucko.spark.common.command.sender.AbstractCommandSender;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+
+import org.spongepowered.api.command.CommandSource;
+import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.text.serializer.TextSerializers;
+
+import java.util.UUID;
+
+public class Sponge7CommandSender extends AbstractCommandSender<CommandSource> {
+    public Sponge7CommandSender(CommandSource source) {
+        super(source);
+    }
+
+    @Override
+    public String getName() {
+        return super.delegate.getName();
+    }
+
+    @Override
+    public UUID getUniqueId() {
+        if (super.delegate instanceof Player) {
+            return ((Player) super.delegate).getUniqueId();
+        }
+        return null;
+    }
+
+    @Override
+    public void sendMessage(Component message) {
+        super.delegate.sendMessage(TextSerializers.JSON.deserialize(GsonComponentSerializer.gson().serialize(message)));
+    }
+
+    @Override
+    public boolean hasPermission(String permission) {
+        return super.delegate.hasPermission(permission);
+    }
+}
diff --git a/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7PlatformInfo.java b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7PlatformInfo.java
new file mode 100644
index 0000000..91d7ea2
--- /dev/null
+++ b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7PlatformInfo.java
@@ -0,0 +1,54 @@
+/*
+ * 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 me.lucko.spark.common.platform.PlatformInfo;
+
+import org.spongepowered.api.Game;
+import org.spongepowered.api.Platform;
+
+public class Sponge7PlatformInfo implements PlatformInfo {
+    private final Game game;
+
+    public Sponge7PlatformInfo(Game game) {
+        this.game = game;
+    }
+
+    @Override
+    public Type getType() {
+        return Type.SERVER;
+    }
+
+    @Override
+    public String getName() {
+        return "Sponge";
+    }
+
+    @Override
+    public String getVersion() {
+        return this.game.getPlatform().getContainer(Platform.Component.IMPLEMENTATION).getVersion().orElse("unknown");
+    }
+
+    @Override
+    public String getMinecraftVersion() {
+        return this.game.getPlatform().getMinecraftVersion().getName();
+    }
+}
diff --git a/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7PlayerPingProvider.java b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7PlayerPingProvider.java
new file mode 100644
index 0000000..8f4c15f
--- /dev/null
+++ b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7PlayerPingProvider.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.Player;
+
+import java.util.Map;
+
+public class Sponge7PlayerPingProvider implements PlayerPingProvider {
+    private final Server server;
+
+    public Sponge7PlayerPingProvider(Server server) {
+        this.server = server;
+    }
+
+    @Override
+    public Map<String, Integer> poll() {
+        ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder();
+        for (Player player : this.server.getOnlinePlayers()) {
+            builder.put(player.getName(), player.getConnection().getLatency());
+        }
+        return builder.build();
+    }
+}
diff --git a/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7SparkPlugin.java b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7SparkPlugin.java
new file mode 100644
index 0000000..670e0c5
--- /dev/null
+++ b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7SparkPlugin.java
@@ -0,0 +1,212 @@
+/*
+ * 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.inject.Inject;
+
+import me.lucko.spark.api.Spark;
+import me.lucko.spark.common.SparkPlatform;
+import me.lucko.spark.common.SparkPlugin;
+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 org.slf4j.Logger;
+import org.spongepowered.api.Game;
+import org.spongepowered.api.command.CommandCallable;
+import org.spongepowered.api.command.CommandResult;
+import org.spongepowered.api.command.CommandSource;
+import org.spongepowered.api.config.ConfigDir;
+import org.spongepowered.api.event.Listener;
+import org.spongepowered.api.event.game.state.GameStartedServerEvent;
+import org.spongepowered.api.event.game.state.GameStoppingServerEvent;
+import org.spongepowered.api.plugin.Plugin;
+import org.spongepowered.api.plugin.PluginContainer;
+import org.spongepowered.api.scheduler.AsynchronousExecutor;
+import org.spongepowered.api.scheduler.SpongeExecutorService;
+import org.spongepowered.api.text.Text;
+import org.spongepowered.api.world.Location;
+import org.spongepowered.api.world.World;
+
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.stream.Stream;
+
+import javax.annotation.Nullable;
+
+@Plugin(
+        id = "spark",
+        name = "spark",
+        version = "@version@",
+        description = "@desc@",
+        authors = {"Luck"}
+)
+public class Sponge7SparkPlugin implements SparkPlugin {
+
+    private final PluginContainer pluginContainer;
+    private final Logger logger;
+    private final Game game;
+    private final Path configDirectory;
+    private final SpongeExecutorService asyncExecutor;
+
+    private SparkPlatform platform;
+    private final ThreadDumper.GameThread threadDumper = new ThreadDumper.GameThread();
+
+    @Inject
+    public Sponge7SparkPlugin(PluginContainer pluginContainer, Logger logger, Game game, @ConfigDir(sharedRoot = false) Path configDirectory, @AsynchronousExecutor SpongeExecutorService asyncExecutor) {
+        this.pluginContainer = pluginContainer;
+        this.logger = logger;
+        this.game = game;
+        this.configDirectory = configDirectory;
+        this.asyncExecutor = asyncExecutor;
+    }
+
+    @Listener
+    public void onEnable(GameStartedServerEvent event) {
+        this.platform = new SparkPlatform(this);
+        this.platform.enable();
+        this.game.getCommandManager().register(this, new SparkCommand(this), "spark");
+    }
+
+    @Listener
+    public void onDisable(GameStoppingServerEvent event) {
+        this.platform.disable();
+    }
+
+    @Override
+    public String getVersion() {
+        return Sponge7SparkPlugin.class.getAnnotation(Plugin.class).version();
+    }
+
+    @Override
+    public Path getPluginDirectory() {
+        return this.configDirectory;
+    }
+
+    @Override
+    public String getCommandName() {
+        return "spark";
+    }
+
+    @Override
+    public Stream<Sponge7CommandSender> getCommandSenders() {
+        return Stream.concat(
+                this.game.getServer().getOnlinePlayers().stream(),
+                Stream.of(this.game.getServer().getConsole())
+        ).map(Sponge7CommandSender::new);
+    }
+
+    @Override
+    public void executeAsync(Runnable task) {
+        this.asyncExecutor.execute(task);
+    }
+
+    @Override
+    public void log(Level level, String msg) {
+        if (level == Level.INFO) {
+            this.logger.info(msg);
+        } else if (level == Level.WARNING) {
+            this.logger.warn(msg);
+        } else if (level == Level.SEVERE) {
+            this.logger.error(msg);
+        } else {
+            throw new IllegalArgumentException(level.getName());
+        }
+    }
+
+    @Override
+    public ThreadDumper getDefaultThreadDumper() {
+        return this.threadDumper.get();
+    }
+
+    @Override
+    public TickHook createTickHook() {
+        return new Sponge7TickHook(this);
+    }
+
+    @Override
+    public ClassSourceLookup createClassSourceLookup() {
+        return new Sponge7ClassSourceLookup(this.game);
+    }
+
+    @Override
+    public PlayerPingProvider createPlayerPingProvider() {
+        if (this.game.isServerAvailable()) {
+            return new Sponge7PlayerPingProvider(this.game.getServer());
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public PlatformInfo getPlatformInfo() {
+        return new Sponge7PlatformInfo(this.game);
+    }
+
+    @Override
+    public void registerApi(Spark api) {
+        this.game.getServiceManager().setProvider(this, Spark.class, api);
+    }
+
+    private static final class SparkCommand implements CommandCallable {
+        private final Sponge7SparkPlugin plugin;
+
+        private SparkCommand(Sponge7SparkPlugin plugin) {
+            this.plugin = plugin;
+        }
+
+        @Override
+        public CommandResult process(CommandSource source, String arguments) {
+            this.plugin.threadDumper.ensureSetup();
+            this.plugin.platform.executeCommand(new Sponge7CommandSender(source), arguments.split(" "));
+            return CommandResult.empty();
+        }
+
+        @Override
+        public List<String> getSuggestions(CommandSource source, String arguments, @Nullable Location<World> targetPosition) {
+            return this.plugin.platform.tabCompleteCommand(new Sponge7CommandSender(source), arguments.split(" "));
+        }
+
+        @Override
+        public boolean testPermission(CommandSource source) {
+            return this.plugin.platform.hasPermissionForAnyCommand(new Sponge7CommandSender(source));
+        }
+
+        @Override
+        public Optional<Text> getShortDescription(CommandSource source) {
+            return Optional.of(Text.of("Main spark plugin command"));
+        }
+
+        @Override
+        public Optional<Text> getHelp(CommandSource source) {
+            return Optional.of(Text.of("Run '/spark' to view usage."));
+        }
+
+        @Override
+        public Text getUsage(CommandSource source) {
+            return Text.of("Run '/spark' to view usage.");
+        }
+    }
+}
diff --git a/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7TickHook.java b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7TickHook.java
new file mode 100644
index 0000000..2618522
--- /dev/null
+++ b/spark-sponge7/src/main/java/me/lucko/spark/sponge/Sponge7TickHook.java
@@ -0,0 +1,51 @@
+/*
+ * 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 me.lucko.spark.common.tick.AbstractTickHook;
+import me.lucko.spark.common.tick.TickHook;
+
+import org.spongepowered.api.scheduler.Task;
+
+public class Sponge7TickHook extends AbstractTickHook implements TickHook, Runnable {
+    private final Sponge7SparkPlugin plugin;
+    private Task task;
+
+    public Sponge7TickHook(Sponge7SparkPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public void run() {
+        onTick();
+    }
+
+    @Override
+    public void start() {
+        this.task = Task.builder().intervalTicks(1).name("spark-ticker").execute(this).submit(this.plugin);
+    }
+
+    @Override
+    public void close() {
+        this.task.cancel();
+    }
+
+}