CloudburstMC · Villagers654 · Jun 3, 2023 · Jun 3, 2023 · Jun 3, 2023 · Jun 3, 2023
diff --git a/src/main/java/cn/nukkit/Player.java b/src/main/java/cn/nukkit/Player.java
diff --git a/src/main/java/cn/nukkit/Server.java b/src/main/java/cn/nukkit/Server.java
@@ -77,9 +77,9 @@
 import cn.nukkit.resourcepacks.ResourcePackManager;
 import cn.nukkit.scheduler.ServerScheduler;
 import cn.nukkit.scheduler.Task;
+import cn.nukkit.spark.SparkInstaller;
 import cn.nukkit.utils.*;
 import cn.nukkit.utils.bugreport.ExceptionHandler;
-import co.aikar.timings.Timings;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import io.netty.buffer.ByteBuf;
@@ -504,6 +504,8 @@ public Level remove(Object key) {
 
         this.pluginManager.loadPlugins(this.pluginPath);
 
+        SparkInstaller.initSpark(this);
+
         this.enablePlugins(PluginLoadOrder.STARTUP);
 
         LevelProviderManager.addProvider(this, Anvil.class);
@@ -690,7 +692,6 @@ public void batchPackets(Player[] players, DataPacket[] packets, boolean forceSy
             return;
         }
 
-        Timings.playerNetworkSendTimer.startTiming();
         byte[][] payload = new byte[packets.length * 2][];
         for (int i = 0; i < packets.length; i++) {
             DataPacket p = packets[i];
@@ -719,7 +720,6 @@ public void batchPackets(Player[] players, DataPacket[] packets, boolean forceSy
                 throw new RuntimeException(e);
             }
         }
-        Timings.playerNetworkSendTimer.stopTiming();
     }
 
     public void broadcastPacketsCallback(byte[] data, List<InetSocketAddress> targets) {
@@ -815,9 +815,9 @@ public void reload() {
 
         this.pluginManager.registerInterface(JavaPluginLoader.class);
         this.pluginManager.loadPlugins(this.pluginPath);
+        SparkInstaller.initSpark(this);
         this.enablePlugins(PluginLoadOrder.STARTUP);
         this.enablePlugins(PluginLoadOrder.POSTWORLD);
-        Timings.reset();
     }
 
     public void shutdown() {
@@ -874,7 +874,6 @@ public void forceShutdown() {
             }
 
             this.getLogger().debug("Disabling timings");
-            Timings.stopServer();
             if (this.watchdog != null) {
                 this.watchdog.kill();
             }
@@ -1122,7 +1121,6 @@ private void checkTickUpdates(int currentTick, long tickTime) {
 
     public void doAutoSave() {
         if (this.getAutoSave()) {
-            Timings.levelSaveTimer.startTiming();
             for (Player player : new ArrayList<>(this.players.values())) {
                 if (player.isOnline()) {
                     player.save(true);
@@ -1134,7 +1132,6 @@ public void doAutoSave() {
             for (Level level : this.levelArray) {
                 level.save();
             }
-            Timings.levelSaveTimer.stopTiming();
         }
     }
 
@@ -1156,21 +1153,15 @@ private boolean tick() {
             return false;
         }
 
-        Timings.fullServerTickTimer.startTiming();
-
         ++this.tickCounter;
 
-        Timings.connectionTimer.startTiming();
         this.network.processInterfaces();
 
         if (this.rcon != null) {
             this.rcon.check();
         }
-        Timings.connectionTimer.stopTiming();
 
-        Timings.schedulerTimer.startTiming();
         this.scheduler.mainThreadHeartbeat(this.tickCounter);
-        Timings.schedulerTimer.stopTiming();
 
         this.checkTickUpdates(this.tickCounter, tickTime);
 
@@ -1214,7 +1205,6 @@ private boolean tick() {
             }
         }
 
-        Timings.fullServerTickTimer.stopTiming();
         //long now = System.currentTimeMillis();
         long nowNano = System.nanoTime();
         //float tick = Math.min(20, 1000 / Math.max(1, now - tickTime));

diff --git a/src/main/java/cn/nukkit/blockentity/BlockEntity.java b/src/main/java/cn/nukkit/blockentity/BlockEntity.java
@@ -8,8 +8,6 @@
 import cn.nukkit.nbt.tag.CompoundTag;
 import cn.nukkit.utils.ChunkException;
 import cn.nukkit.utils.MainLogger;
-import co.aikar.timings.Timing;
-import co.aikar.timings.Timings;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 
@@ -58,14 +56,12 @@ public abstract class BlockEntity extends Position {
     public CompoundTag namedTag;
     protected long lastUpdate;
     protected Server server;
-    protected Timing timing;
 
     public BlockEntity(FullChunk chunk, CompoundTag nbt) {
         if (chunk == null || chunk.getProvider() == null) {
             throw new ChunkException("Invalid garbage Chunk given to Block Entity");
         }
 
-        this.timing = Timings.getBlockEntityTiming(this);
         this.server = chunk.getProvider().getLevel().getServer();
         this.chunk = chunk;
         this.setLevel(chunk.getProvider().getLevel());

diff --git a/src/main/java/cn/nukkit/blockentity/BlockEntityFurnace.java b/src/main/java/cn/nukkit/blockentity/BlockEntityFurnace.java
@@ -226,8 +226,6 @@ public boolean onUpdate() {
             return false;
         }
 
-        this.timing.startTiming();
-
         boolean ret = false;
         Item fuel = this.inventory.getFuel();
         Item raw = this.inventory.getSmelting();
@@ -304,8 +302,6 @@ public boolean onUpdate() {
 
         this.lastUpdate = System.currentTimeMillis();
 
-        this.timing.stopTiming();
-
         return ret;
     }
 

diff --git a/src/main/java/cn/nukkit/command/Command.java b/src/main/java/cn/nukkit/command/Command.java
@@ -7,8 +7,6 @@
 import cn.nukkit.lang.TranslationContainer;
 import cn.nukkit.permission.Permissible;
 import cn.nukkit.utils.TextFormat;
-import co.aikar.timings.Timing;
-import co.aikar.timings.Timings;
 
 import java.util.*;
 
@@ -44,8 +42,6 @@ public abstract class Command {
 
     protected Map<String, CommandParameter[]> commandParameters = new HashMap<>();
 
-    public Timing timing;
-
     public Command(String name) {
         this(name, "", null, new String[0]);
     }
@@ -67,7 +63,6 @@ public Command(String name, String description, String usageMessage, String[] al
         this.usageMessage = usageMessage == null ? "/" + name : usageMessage;
         this.aliases = aliases;
         this.activeAliases = aliases;
-        this.timing = Timings.getCommandTiming(this);
         this.commandParameters.put("default", new CommandParameter[]{CommandParameter.newType("args", true, CommandParamType.RAWTEXT)});
     }
 
@@ -186,7 +181,6 @@ public boolean setLabel(String name) {
         this.nextLabel = name;
         if (!this.isRegistered()) {
             this.label = name;
-            this.timing = Timings.getCommandTiming(this);
             return true;
         }
         return false;

diff --git a/src/main/java/cn/nukkit/command/SimpleCommandMap.java b/src/main/java/cn/nukkit/command/SimpleCommandMap.java
@@ -71,7 +71,6 @@ private void setDefaultCommands() {
 //        if ((boolean) this.server.getConfig("debug.commands", false)) {
         this.register("nukkit", new StatusCommand("status"));
         this.register("nukkit", new GarbageCollectorCommand("gc"));
-        this.register("nukkit", new TimingsCommand("timings"));
         this.register("nukkit", new DebugPasteCommand("debugpaste"));
         //this.register("nukkit", new DumpMemoryCommand("dumpmemory"));
 //        }
@@ -252,7 +251,6 @@ public boolean dispatch(CommandSender sender, String cmdLine) {
             return false;
         }
 
-        target.timing.startTiming();
         try {
             target.execute(sender, sentCommandLabel, args);
         } catch (Exception e) {
@@ -263,7 +261,6 @@ public boolean dispatch(CommandSender sender, String cmdLine) {
                 logger.logException(e);
             }
         }
-        target.timing.stopTiming();
 
         return true;
     }

diff --git a/src/main/java/cn/nukkit/command/defaults/TimingsCommand.java b/src/main/java/cn/nukkit/command/defaults/TimingsCommand.java
diff --git a/src/main/java/cn/nukkit/console/NukkitConsole.java b/src/main/java/cn/nukkit/console/NukkitConsole.java
@@ -2,7 +2,6 @@
 
 import cn.nukkit.Server;
 import cn.nukkit.event.server.ServerCommandEvent;
-import co.aikar.timings.Timings;
 import lombok.RequiredArgsConstructor;
 import net.minecrell.terminalconsole.SimpleTerminalConsole;
 import org.jline.reader.LineReader;
@@ -26,15 +25,13 @@ protected boolean isRunning() {
     @Override
     protected void runCommand(String command) {
         if (executingCommands.get()) {
-            Timings.serverCommandTimer.startTiming();
             ServerCommandEvent event = new ServerCommandEvent(server.getConsoleSender(), command);
             if (server.getPluginManager() != null) {
                 server.getPluginManager().callEvent(event);
             }
             if (!event.isCancelled()) {
                 Server.getInstance().getScheduler().scheduleTask(() -> server.dispatchCommand(event.getSender(), event.getCommand()));
             }
-            Timings.serverCommandTimer.stopTiming();
         } else {
             consoleQueue.add(command);
         }

diff --git a/src/main/java/cn/nukkit/entity/Entity.java b/src/main/java/cn/nukkit/entity/Entity.java
@@ -30,9 +30,6 @@
 import cn.nukkit.scheduler.Task;
 import cn.nukkit.utils.ChunkException;
 import cn.nukkit.utils.MainLogger;
-import co.aikar.timings.Timing;
-import co.aikar.timings.Timings;
-import co.aikar.timings.TimingsHistory;
 import com.google.common.collect.Iterables;
 
 import java.lang.reflect.Constructor;
@@ -401,8 +398,6 @@ public abstract class Entity extends Location implements Metadatable {
 
     public boolean closed = false;
 
-    protected Timing timing;
-
     protected boolean isPlayer = this instanceof Player;
 
     private volatile boolean initialized;
@@ -495,8 +490,6 @@ protected final void init(FullChunk chunk, CompoundTag nbt) {
         }
         this.initialized = true;
 
-        this.timing = Timings.getEntityTiming(this);
-
         this.temporalVector = new Vector3();
 
         this.id = Entity.entityCount++;
@@ -1333,8 +1326,6 @@ public boolean entityBaseTick() {
     }
 
     public boolean entityBaseTick(int tickDiff) {
-        Timings.entityBaseTickTimer.startTiming();
-
         if (!this.isPlayer) {
             this.blocksAround = null;
             this.collisionBlocks = null;
@@ -1347,7 +1338,6 @@ public boolean entityBaseTick(int tickDiff) {
             if (!this.isPlayer) {
                 this.close();
             }
-            Timings.entityBaseTickTimer.stopTiming();
             return false;
         }
         if (riding != null && !riding.isAlive() && riding instanceof EntityRideable) {
@@ -1442,9 +1432,7 @@ public void onRun(int currentTick) {
 
         this.age += tickDiff;
         this.ticksLived += tickDiff;
-        TimingsHistory.activatedEntityTicks++;
 
-        Timings.entityBaseTickTimer.stopTiming();
         return hasUpdate;
     }
 
@@ -1912,8 +1900,6 @@ public boolean fastMove(double dx, double dy, double dz) {
             return true;
         }
 
-        Timings.entityMoveTimer.startTiming();
-
         AxisAlignedBB newBB = this.boundingBox.getOffsetBoundingBox(dx, dy, dz);
 
         if (server.getAllowFlight() || !this.level.hasCollision(this, newBB, false)) {
@@ -1934,7 +1920,6 @@ public boolean fastMove(double dx, double dy, double dz) {
         }
         this.isCollided = this.onGround;
         this.updateFallState(this.onGround);
-        Timings.entityMoveTimer.stopTiming();
         return true;
     }
 
@@ -1949,9 +1934,6 @@ public boolean move(double dx, double dy, double dz) {
             this.onGround = this.isPlayer;
             return true;
         } else {
-
-            Timings.entityMoveTimer.startTiming();
-
             this.ySize *= 0.4;
 
             double movX = dx;
@@ -2049,7 +2031,6 @@ public boolean move(double dx, double dy, double dz) {
             }
 
             //TODO: vehicle collision events (first we need to spawn them!)
-            Timings.entityMoveTimer.stopTiming();
             return true;
         }
     }