Merge remote-tracking branch 'lucko/master' into forge-1.7.10

9 files changed, 412 insertions, 153 deletions

diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerConfigProvider.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerConfigProvider.java
new file mode 100644
index 0000000..18079d3
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerConfigProvider.java
@@ -0,0 +1,57 @@
+/*
+ * 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 com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+import me.lucko.spark.common.platform.serverconfig.AbstractServerConfigProvider;
+import me.lucko.spark.common.platform.serverconfig.ConfigParser;
+import me.lucko.spark.common.platform.serverconfig.PropertiesConfigParser;
+
+import java.util.Collection;
+import java.util.Map;
+
+public class FabricServerConfigProvider extends AbstractServerConfigProvider {
+
+    /** A map of provided files and their type */
+    private static final Map<String, ConfigParser> FILES;
+    /** A collection of paths to be excluded from the files */
+    private static final Collection<String> HIDDEN_PATHS;
+
+    public FabricServerConfigProvider() {
+        super(FILES, HIDDEN_PATHS);
+    }
+
+    static {
+        ImmutableSet.Builder<String> hiddenPaths = ImmutableSet.<String>builder()
+                .add("server-ip")
+                .add("motd")
+                .add("resource-pack")
+                .add("rcon<dot>password")
+                .add("level-seed")
+                .addAll(getSystemPropertyList("spark.serverconfigs.hiddenpaths"));
+
+        FILES = ImmutableMap.of("server.properties", PropertiesConfigParser.INSTANCE);
+        HIDDEN_PATHS = hiddenPaths.build();
+    }
+
+}
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java
new file mode 100644
index 0000000..f2f7b96
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricWorldInfoProvider.java
@@ -0,0 +1,144 @@
+/*
+ * 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 it.unimi.dsi.fastutil.longs.LongIterator;
+import it.unimi.dsi.fastutil.longs.LongSet;
+
+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 me.lucko.spark.fabric.mixin.ClientEntityManagerAccessor;
+import me.lucko.spark.fabric.mixin.ClientWorldAccessor;
+import me.lucko.spark.fabric.mixin.ServerEntityManagerAccessor;
+import me.lucko.spark.fabric.mixin.ServerWorldAccessor;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.world.ClientEntityManager;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.world.ServerEntityManager;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.entity.EntityTrackingSection;
+import net.minecraft.world.entity.SectionedEntityCache;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Stream;
+
+public abstract class FabricWorldInfoProvider implements WorldInfoProvider {
+
+    protected List<FabricChunkInfo> getChunksFromCache(SectionedEntityCache<Entity> cache) {
+        LongSet loadedChunks = cache.getChunkPositions();
+        List<FabricChunkInfo> list = new ArrayList<>(loadedChunks.size());
+
+        for (LongIterator iterator = loadedChunks.iterator(); iterator.hasNext(); ) {
+            long chunkPos = iterator.nextLong();
+            Stream<EntityTrackingSection<Entity>> sections = cache.getTrackingSections(chunkPos);
+
+            list.add(new FabricChunkInfo(chunkPos, sections));
+        }
+
+        return list;
+    }
+
+    public static final class Server extends FabricWorldInfoProvider {
+        private final MinecraftServer server;
+
+        public Server(MinecraftServer server) {
+            this.server = server;
+        }
+
+        @Override
+        public Result<FabricChunkInfo> poll() {
+            Result<FabricChunkInfo> data = new Result<>();
+
+            for (ServerWorld world : this.server.getWorlds()) {
+                ServerEntityManager<Entity> entityManager = ((ServerWorldAccessor) world).getEntityManager();
+                SectionedEntityCache<Entity> cache = ((ServerEntityManagerAccessor) entityManager).getCache();
+
+                List<FabricChunkInfo> list = getChunksFromCache(cache);
+                data.put(world.getRegistryKey().getValue().getPath(), list);
+            }
+
+            return data;
+        }
+    }
+
+    public static final class Client extends FabricWorldInfoProvider {
+        private final MinecraftClient client;
+
+        public Client(MinecraftClient client) {
+            this.client = client;
+        }
+
+        @Override
+        public Result<FabricChunkInfo> poll() {
+            Result<FabricChunkInfo> data = new Result<>();
+
+            ClientWorld world = this.client.world;
+            if (world == null) {
+                return null;
+            }
+
+            ClientEntityManager<Entity> entityManager = ((ClientWorldAccessor) world).getEntityManager();
+            SectionedEntityCache<Entity> cache = ((ClientEntityManagerAccessor) entityManager).getCache();
+
+            List<FabricChunkInfo> list = getChunksFromCache(cache);
+            data.put(world.getRegistryKey().getValue().getPath(), list);
+
+            return data;
+        }
+    }
+
+    static final class FabricChunkInfo extends AbstractChunkInfo<EntityType<?>> {
+        private final CountMap<EntityType<?>> entityCounts;
+
+        FabricChunkInfo(long chunkPos, Stream<EntityTrackingSection<Entity>> entities) {
+            super(ChunkPos.getPackedX(chunkPos), ChunkPos.getPackedZ(chunkPos));
+
+            this.entityCounts = new CountMap.Simple<>(new HashMap<>());
+            entities.forEach(section -> {
+                if (section.getStatus().shouldTrack()) {
+                    section.stream().forEach(entity ->
+                            this.entityCounts.increment(entity.getType())
+                    );
+                }
+            });
+        }
+
+        @Override
+        public CountMap<EntityType<?>> getEntityCounts() {
+            return this.entityCounts;
+        }
+
+        @Override
+        public String entityTypeName(EntityType<?> type) {
+            return EntityType.getId(type).toString();
+        }
+    }
+
+}
+
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ClientEntityManagerAccessor.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ClientEntityManagerAccessor.java
new file mode 100644
index 0000000..88c9521
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ClientEntityManagerAccessor.java
@@ -0,0 +1,36 @@
+/*
+ * 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.mixin;
+
+import net.minecraft.client.world.ClientEntityManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.world.entity.SectionedEntityCache;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ClientEntityManager.class)
+public interface ClientEntityManagerAccessor {
+
+    @Accessor
+    SectionedEntityCache<Entity> getCache();
+
+}
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ClientWorldAccessor.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ClientWorldAccessor.java
new file mode 100644
index 0000000..01562ef
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ClientWorldAccessor.java
@@ -0,0 +1,36 @@
+/*
+ * 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.mixin;
+
+import net.minecraft.client.world.ClientEntityManager;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.entity.Entity;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ClientWorld.class)
+public interface ClientWorldAccessor {
+
+    @Accessor
+    ClientEntityManager<Entity> getEntityManager();
+
+}
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ServerEntityManagerAccessor.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ServerEntityManagerAccessor.java
new file mode 100644
index 0000000..160a12b
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ServerEntityManagerAccessor.java
@@ -0,0 +1,36 @@
+/*
+ * 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.mixin;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.server.world.ServerEntityManager;
+import net.minecraft.world.entity.SectionedEntityCache;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ServerEntityManager.class)
+public interface ServerEntityManagerAccessor {
+
+    @Accessor
+    SectionedEntityCache<Entity> getCache();
+
+}
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ServerWorldAccessor.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ServerWorldAccessor.java
new file mode 100644
index 0000000..cf2e7e8
--- /dev/null
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/mixin/ServerWorldAccessor.java
@@ -0,0 +1,36 @@
+/*
+ * 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.mixin;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.server.world.ServerEntityManager;
+import net.minecraft.server.world.ServerWorld;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ServerWorld.class)
+public interface ServerWorldAccessor {
+
+    @Accessor
+    ServerEntityManager<Entity> getEntityManager();
+
+}
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java
index dc2e7d9..69303e3 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/placeholder/SparkFabricPlaceholderApi.java
@@ -20,169 +20,48 @@
 
 package me.lucko.spark.fabric.placeholder;
 
-import eu.pb4.placeholders.PlaceholderAPI;
-import eu.pb4.placeholders.PlaceholderResult;
+import eu.pb4.placeholders.api.PlaceholderContext;
+import eu.pb4.placeholders.api.PlaceholderHandler;
+import eu.pb4.placeholders.api.PlaceholderResult;
+import eu.pb4.placeholders.api.Placeholders;
 
 import me.lucko.spark.common.SparkPlatform;
-import me.lucko.spark.common.monitor.cpu.CpuMonitor;
-import me.lucko.spark.common.monitor.tick.TickStatistics;
-import me.lucko.spark.common.util.RollingAverage;
-import me.lucko.spark.common.util.StatisticFormatter;
+import me.lucko.spark.common.util.SparkPlaceholder;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
-public class SparkFabricPlaceholderApi {
-    private final SparkPlatform platform;
+import org.jetbrains.annotations.Nullable;
 
-    public SparkFabricPlaceholderApi(SparkPlatform platform) {
-        this.platform = platform;
+public enum SparkFabricPlaceholderApi {
+    ;
 
-        PlaceholderAPI.register(
-                new Identifier("spark", "tps"),
-                context -> {
-                    TickStatistics tickStatistics = platform.getTickStatistics();
-                    if (tickStatistics == null) {
-                        return PlaceholderResult.invalid();
-                    }
-
-                    if (context.hasArgument()) {
-                        Double tps = switch (context.getArgument()) {
-                            case "5s":
-                                yield tickStatistics.tps5Sec();
-                            case "10s":
-                                yield tickStatistics.tps10Sec();
-                            case "1m":
-                                yield tickStatistics.tps1Min();
-                            case "5m":
-                                yield tickStatistics.tps5Min();
-                            case "15m":
-                                yield tickStatistics.tps15Min();
-                            default:
-                                yield null;
-                        };
-
-                        if (tps == null) {
-                            return PlaceholderResult.invalid("Invalid argument");
-                        } else {
-                            return PlaceholderResult.value(toText(StatisticFormatter.formatTps(tps)));
-                        }
-                    } else {
-                        return PlaceholderResult.value(toText(
-                                Component.text()
-                                        .append(StatisticFormatter.formatTps(tickStatistics.tps5Sec())).append(Component.text(", "))
-                                        .append(StatisticFormatter.formatTps(tickStatistics.tps10Sec())).append(Component.text(", "))
-                                        .append(StatisticFormatter.formatTps(tickStatistics.tps1Min())).append(Component.text(", "))
-                                        .append(StatisticFormatter.formatTps(tickStatistics.tps5Min())).append(Component.text(", "))
-                                        .append(StatisticFormatter.formatTps(tickStatistics.tps15Min()))
-                                        .build()
-                        ));
-                    }
-                }
-        );
-
-        PlaceholderAPI.register(
-                new Identifier("spark", "tickduration"),
-                context -> {
-                    TickStatistics tickStatistics = platform.getTickStatistics();
-                    if (tickStatistics == null || !tickStatistics.isDurationSupported()) {
-                        return PlaceholderResult.invalid();
-                    }
-
-                    if (context.hasArgument()) {
-                        RollingAverage duration = switch (context.getArgument()) {
-                            case "10s":
-                                yield tickStatistics.duration10Sec();
-                            case "1m":
-                                yield tickStatistics.duration1Min();
-                            default:
-                                yield null;
-                        };
-
-                        if (duration == null) {
-                            return PlaceholderResult.invalid("Invalid argument");
-                        } else {
-                            return PlaceholderResult.value(toText(StatisticFormatter.formatTickDurations(duration)));
-                        }
-                    } else {
-                        return PlaceholderResult.value(toText(
-                                Component.text()
-                                        .append(StatisticFormatter.formatTickDurations(tickStatistics.duration10Sec())).append(Component.text(";  "))
-                                        .append(StatisticFormatter.formatTickDurations(tickStatistics.duration1Min()))
-                                        .build()
-                        ));
-                    }
-                }
-        );
-
-        PlaceholderAPI.register(
-                new Identifier("spark", "cpu_system"),
-                context -> {
-                    if (context.hasArgument()) {
-                        Double usage = switch (context.getArgument()) {
-                            case "10s":
-                                yield CpuMonitor.systemLoad10SecAvg();
-                            case "1m":
-                                yield CpuMonitor.systemLoad1MinAvg();
-                            case "15m":
-                                yield CpuMonitor.systemLoad15MinAvg();
-                            default:
-                                yield null;
-                        };
-
-                        if (usage == null) {
-                            return PlaceholderResult.invalid("Invalid argument");
-                        } else {
-                            return PlaceholderResult.value(toText(StatisticFormatter.formatCpuUsage(usage)));
-                        }
-                    } else {
-                        return PlaceholderResult.value(toText(
-                                Component.text()
-                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad10SecAvg())).append(Component.text(", "))
-                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad1MinAvg())).append(Component.text(", "))
-                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.systemLoad15MinAvg()))
-                                        .build()
-                        ));
-                    }
-                }
-        );
-
-        PlaceholderAPI.register(
-                new Identifier("spark", "cpu_process"),
-                context -> {
-                    if (context.hasArgument()) {
-                        Double usage = switch (context.getArgument()) {
-                            case "10s":
-                                yield CpuMonitor.processLoad10SecAvg();
-                            case "1m":
-                                yield CpuMonitor.processLoad1MinAvg();
-                            case "15m":
-                                yield CpuMonitor.processLoad15MinAvg();
-                            default:
-                                yield null;
-                        };
-
-                        if (usage == null) {
-                            return PlaceholderResult.invalid("Invalid argument");
-                        } else {
-                            return PlaceholderResult.value(toText(StatisticFormatter.formatCpuUsage(usage)));
-                        }
-                    } else {
-                        return PlaceholderResult.value(toText(
-                                Component.text()
-                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad10SecAvg())).append(Component.text(", "))
-                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad1MinAvg())).append(Component.text(", "))
-                                        .append(StatisticFormatter.formatCpuUsage(CpuMonitor.processLoad15MinAvg()))
-                                        .build()
-                        ));
-                    }
-                }
-        );
+    public static void register(SparkPlatform platform) {
+        for (SparkPlaceholder placeholder : SparkPlaceholder.values()) {
+            Placeholders.register(
+                    new Identifier("spark", placeholder.getName()),
+                    new Handler(platform, placeholder)
+            );
+        }
     }
 
-    private Text toText(Component component) {
-        return Text.Serializer.fromJson(GsonComponentSerializer.gson().serialize(component));
+    private record Handler(SparkPlatform platform, SparkPlaceholder placeholder) implements PlaceholderHandler {
+        @Override
+        public PlaceholderResult onPlaceholderRequest(PlaceholderContext context, @Nullable String argument) {
+            return toResult(this.placeholder.resolve(this.platform, argument));
+        }
+
+        private static PlaceholderResult toResult(Component component) {
+            return component == null
+                    ? PlaceholderResult.invalid()
+                    : PlaceholderResult.value(toText(component));
+        }
+
+        private static Text toText(Component component) {
+            return Text.Serializer.fromJson(GsonComponentSerializer.gson().serialize(component));
+        }
     }
+
 }
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
index e94d697..1876658 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricClientSparkPlugin.java
@@ -29,6 +29,7 @@ import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 
 import me.lucko.spark.common.platform.PlatformInfo;
+import me.lucko.spark.common.platform.world.WorldInfoProvider;
 import me.lucko.spark.common.tick.TickHook;
 import me.lucko.spark.common.tick.TickReporter;
 import me.lucko.spark.fabric.FabricCommandSender;
@@ -36,6 +37,7 @@ import me.lucko.spark.fabric.FabricPlatformInfo;
 import me.lucko.spark.fabric.FabricSparkMod;
 import me.lucko.spark.fabric.FabricTickHook;
 import me.lucko.spark.fabric.FabricTickReporter;
+import me.lucko.spark.fabric.FabricWorldInfoProvider;
 
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
@@ -113,6 +115,11 @@ public class FabricClientSparkPlugin extends FabricSparkPlugin implements Comman
     }
 
     @Override
+    public void executeSync(Runnable task) {
+        this.minecraft.executeSync(task);
+    }
+
+    @Override
     public TickHook createTickHook() {
         return new FabricTickHook.Client();
     }
@@ -123,6 +130,11 @@ public class FabricClientSparkPlugin extends FabricSparkPlugin implements Comman
     }
 
     @Override
+    public WorldInfoProvider createWorldInfoProvider() {
+        return new FabricWorldInfoProvider.Client(this.minecraft);
+    }
+
+    @Override
     public PlatformInfo getPlatformInfo() {
         return new FabricPlatformInfo(PlatformInfo.Type.CLIENT);
     }
diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
index 428ac4c..bb1d68c 100644
--- a/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
+++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/plugin/FabricServerSparkPlugin.java
@@ -31,14 +31,18 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import me.lucko.fabric.api.permissions.v0.Permissions;
 import me.lucko.spark.common.monitor.ping.PlayerPingProvider;
 import me.lucko.spark.common.platform.PlatformInfo;
+import me.lucko.spark.common.platform.serverconfig.ServerConfigProvider;
+import me.lucko.spark.common.platform.world.WorldInfoProvider;
 import me.lucko.spark.common.tick.TickHook;
 import me.lucko.spark.common.tick.TickReporter;
 import me.lucko.spark.fabric.FabricCommandSender;
 import me.lucko.spark.fabric.FabricPlatformInfo;
 import me.lucko.spark.fabric.FabricPlayerPingProvider;
+import me.lucko.spark.fabric.FabricServerConfigProvider;
 import me.lucko.spark.fabric.FabricSparkMod;
 import me.lucko.spark.fabric.FabricTickHook;
 import me.lucko.spark.fabric.FabricTickReporter;
+import me.lucko.spark.fabric.FabricWorldInfoProvider;
 import me.lucko.spark.fabric.placeholder.SparkFabricPlaceholderApi;
 
 import net.fabricmc.loader.api.FabricLoader;
@@ -74,7 +78,11 @@ public class FabricServerSparkPlugin extends FabricSparkPlugin implements Comman
 
         // placeholders
         if (FabricLoader.getInstance().isModLoaded("placeholder-api")) {
-            new SparkFabricPlaceholderApi(this.platform);
+            try {
+                SparkFabricPlaceholderApi.register(this.platform);
+            } catch (LinkageError e) {
+                // ignore
+            }
         }
     }
 
@@ -123,6 +131,11 @@ public class FabricServerSparkPlugin extends FabricSparkPlugin implements Comman
     }
 
     @Override
+    public void executeSync(Runnable task) {
+        this.server.executeSync(task);
+    }
+
+    @Override
     public TickHook createTickHook() {
         return new FabricTickHook.Server();
     }
@@ -138,6 +151,16 @@ public class FabricServerSparkPlugin extends FabricSparkPlugin implements Comman
     }
 
     @Override
+    public ServerConfigProvider createServerConfigProvider() {
+        return new FabricServerConfigProvider();
+    }
+
+    @Override
+    public WorldInfoProvider createWorldInfoProvider() {
+        return new FabricWorldInfoProvider.Server(this.server);
+    }
+
+    @Override
     public PlatformInfo getPlatformInfo() {
         return new FabricPlatformInfo(PlatformInfo.Type.SERVER);
     }