From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 1 Jul 2022 04:03:26 -0500 Subject: [PATCH] Remove Timings diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java index 8f29c1561ba5916cb5634392edd8bd2a5a294a51..6fbc64e0f214d0c8e5afcbe385e414a4e1fe1c72 100644 --- a/src/main/java/co/aikar/timings/TimedEventExecutor.java +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java @@ -77,9 +77,9 @@ public class TimedEventExecutor implements EventExecutor { executor.execute(listener, event); return; } - try (Timing ignored = timings.startTiming()){ + //try (Timing ignored = timings.startTiming()){ // Purpur executor.execute(listener, event); - } + //} // Purpur } @Override diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java index 7514fad26f955329f8bf17ff17db75f0c8301ee5..1d866e980abc542bdfee1ce082cd9cdd7761e9f7 100644 --- a/src/main/java/co/aikar/timings/Timing.java +++ b/src/main/java/co/aikar/timings/Timing.java @@ -39,6 +39,7 @@ public interface Timing extends AutoCloseable { * @return Timing */ @NotNull + @io.papermc.paper.annotation.DoNotUse // Purpur Timing startTiming(); /** @@ -46,6 +47,7 @@ public interface Timing extends AutoCloseable { * * Will automatically be called when this Timing is used with try-with-resources */ + @io.papermc.paper.annotation.DoNotUse // Purpur void stopTiming(); /** @@ -56,6 +58,7 @@ public interface Timing extends AutoCloseable { * @return Timing */ @NotNull + @io.papermc.paper.annotation.DoNotUse // Purpur Timing startTimingIfSync(); /** @@ -65,12 +68,14 @@ public interface Timing extends AutoCloseable { * * But only if we are on the primary thread. */ + @io.papermc.paper.annotation.DoNotUse // Purpur void stopTimingIfSync(); /** * @deprecated Doesn't do anything - Removed */ @Deprecated + @io.papermc.paper.annotation.DoNotUse // Purpur void abort(); /** @@ -82,5 +87,6 @@ public interface Timing extends AutoCloseable { TimingHandler getTimingHandler(); @Override + @io.papermc.paper.annotation.DoNotUse // Purpur void close(); } diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java index 9812d668ad945aba486fbf6d5bf83c4292cb5d03..752d54830aa8baa1450bf72da03ae55ed30293c2 100644 --- a/src/main/java/co/aikar/timings/Timings.java +++ b/src/main/java/co/aikar/timings/Timings.java @@ -124,7 +124,7 @@ public final class Timings { @NotNull public static Timing ofStart(@NotNull Plugin plugin, @NotNull String name, @Nullable Timing groupHandler) { Timing timing = of(plugin, name, groupHandler); - timing.startTiming(); + //timing.startTiming(); // Purpur return timing; } @@ -145,9 +145,11 @@ public final class Timings { * @param enabled Should timings be reported */ public static void setTimingsEnabled(boolean enabled) { - timingsEnabled = enabled; - warnAboutDeprecationOnEnable(); - reset(); + // Purpur start - we don't do that here... + timingsEnabled = false; + //warnAboutDeprecationOnEnable(); + //reset(); + // Purpur end } private static void warnAboutDeprecationOnEnable() { diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java index e801e79fa57c44b2e5d359647c920f88064826f1..1abfcee0f6d632f4cd8d74b4994a90c9ea9d254c 100644 --- a/src/main/java/co/aikar/timings/TimingsCommand.java +++ b/src/main/java/co/aikar/timings/TimingsCommand.java @@ -45,7 +45,7 @@ public class TimingsCommand extends BukkitCommand { public TimingsCommand(@NotNull String name) { super(name); this.description = "Manages Spigot Timings data to see performance of the server."; - this.usageMessage = "/timings "; + this.usageMessage = "/timings";// "; // Purpur this.setPermission("bukkit.command.timings"); } @@ -54,8 +54,12 @@ public class TimingsCommand extends BukkitCommand { if (!testPermission(sender)) { return true; } - if (false) { - sender.sendMessage(Timings.deprecationMessage()); + if (true) { + net.kyori.adventure.text.minimessage.MiniMessage mm = net.kyori.adventure.text.minimessage.MiniMessage.miniMessage(); + sender.sendMessage(mm.deserialize("Purpur has removed timings to save your performance. Please use /spark instead")); + sender.sendMessage(mm.deserialize("For more information, view its documentation at")); + sender.sendMessage(mm.deserialize("https://spark.lucko.me/docs/Command-Usage")); + return true; } if (args.length < 1) { sender.sendMessage(text("Usage: " + this.usageMessage, NamedTextColor.RED)); @@ -115,7 +119,7 @@ public class TimingsCommand extends BukkitCommand { Preconditions.checkNotNull(args, "Arguments cannot be null"); Preconditions.checkNotNull(alias, "Alias cannot be null"); - if (args.length == 1) { + if (false && args.length == 1) { // Purpur return StringUtil.copyPartialMatches(args[0], TIMINGS_SUBCOMMANDS, new ArrayList(TIMINGS_SUBCOMMANDS.size())); } diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java index 83f84a76cbfdf5138ecccf3a886d38151a500bf2..fdedac32544be6534288c8ba28abe7f5c4c56f3b 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -172,10 +172,10 @@ public class SimpleCommandMap implements CommandMap { // Paper end try { - try (co.aikar.timings.Timing ignored = target.timings.startTiming()) { // Paper - use try with resources + //try (co.aikar.timings.Timing ignored = target.timings.startTiming()) { // Paper - use try with resources // Purpur // Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false) target.execute(sender, sentCommandLabel, parsedArgs); // Purpur - } // target.timings.stopTiming(); // Spigot // Paper + //} // target.timings.stopTiming(); // Spigot // Paper // Purpur } catch (CommandException ex) { server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper //target.timings.stopTiming(); // Spigot // Paper diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java index 12946bd55fcf7c40d39081779a7fa30049ee6165..9c2d605c50cbf9aefa56ec209df9f6cea1392e89 100644 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java @@ -61,7 +61,7 @@ public final class CustomTimingsHandler { handler = timing; } - public void startTiming() { handler.startTiming(); } - public void stopTiming() { handler.stopTiming(); } + public void startTiming() { /*handler.startTiming();*/ } // Purpur + public void stopTiming() { /*handler.stopTiming();*/ } // Purpur }