Repo-Mirror/PlazmaBukkitMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity
Files
72183c64b92bbedb7173d65772e76a8cebce32f5
PlazmaBukkitMC/patches/unapplied/server/0001-Remove-remaining-timings-implementations.patch
AlphaKR93 72183c64b9 runnable
2024-10-25 18:42:48 +09:00

1265 lines
66 KiB
Diff
Raw Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: AlphaKR93 <dev@alpha93.kr>
Date: Wed, 15 May 2024 14:12:50 +0900
Subject: [PATCH] Remove remaining timings implementations
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
index 4b467f1af93452d13829f756d55dee18b8889d40..0a35e272c913df99ac12e87383bb9c7351e9fdb7 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -1,181 +1,4 @@
package co.aikar.timings;
-import com.google.common.collect.MapMaker;
-import io.papermc.paper.configuration.GlobalConfiguration;
-import net.minecraft.commands.functions.CommandFunction;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitTask;
-
-import org.bukkit.craftbukkit.scheduler.CraftTask;
-
-import java.util.Map;
-
-// TODO: Re-implement missing timers
@Deprecated(forRemoval = true)
-public final class MinecraftTimings {
-
- public static final Timing serverOversleep = Timings.ofSafe("Server Oversleep");
- public static final Timing playerListTimer = Timings.ofSafe("Player List");
- public static final Timing commandFunctionsTimer = Timings.ofSafe("Command Functions");
- public static final Timing connectionTimer = Timings.ofSafe("Connection Handler");
- public static final Timing tickablesTimer = Timings.ofSafe("Tickables");
- public static final Timing minecraftSchedulerTimer = Timings.ofSafe("Minecraft Scheduler");
- public static final Timing bukkitSchedulerTimer = Timings.ofSafe("Bukkit Scheduler");
- public static final Timing bukkitSchedulerPendingTimer = Timings.ofSafe("Bukkit Scheduler - Pending");
- public static final Timing bukkitSchedulerFinishTimer = Timings.ofSafe("Bukkit Scheduler - Finishing");
- public static final Timing chunkIOTickTimer = Timings.ofSafe("ChunkIOTick");
- public static final Timing timeUpdateTimer = Timings.ofSafe("Time Update");
- public static final Timing serverCommandTimer = Timings.ofSafe("Server Command");
- public static final Timing savePlayers = Timings.ofSafe("Save Players");
-
- public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity");
- public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity");
- public static final Timing packetProcessTimer = Timings.ofSafe("## Packet Processing");
- public static final Timing scheduledBlocksTimer = Timings.ofSafe("## Scheduled Blocks");
- public static final Timing structureGenerationTimer = Timings.ofSafe("Structure Generation");
-
- public static final Timing processQueueTimer = Timings.ofSafe("processQueue");
- public static final Timing processTasksTimer = Timings.ofSafe("processTasks");
-
- public static final Timing playerCommandTimer = Timings.ofSafe("playerCommand");
-
- public static final Timing entityActivationCheckTimer = Timings.ofSafe("entityActivationCheck");
-
- public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update");
- public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");
- public static final Timing scoreboardScoreSearch = Timings.ofSafe("Scoreboard score search"); // Paper - add timings for scoreboard search
- public static final Timing distanceManagerTick = Timings.ofSafe("Distance Manager Tick"); // Paper - add timings for distance manager
-
- public static final Timing midTickChunkTasks = Timings.ofSafe("Mid Tick Chunk Tasks");
-
- private static final Map<Class<?>, String> taskNameCache = new MapMaker().weakKeys().makeMap();
-
- private MinecraftTimings() {}
-
- public static Timing getInternalTaskName(String taskName) {
- return Timings.ofSafe(taskName);
- }
-
- /**
- * Gets a timer associated with a plugins tasks.
- * @param bukkitTask
- * @param period
- * @return
- */
- public static Timing getPluginTaskTimings(BukkitTask bukkitTask, long period) {
- if (!bukkitTask.isSync()) {
- return NullTimingHandler.NULL;
- }
- Plugin plugin;
-
- CraftTask craftTask = (CraftTask) bukkitTask;
-
- final Class<?> taskClass = craftTask.getTaskClass();
- if (bukkitTask.getOwner() != null) {
- plugin = bukkitTask.getOwner();
- } else {
- plugin = TimingsManager.getPluginByClassloader(taskClass);
- }
-
- final String taskname = taskNameCache.computeIfAbsent(taskClass, clazz -> {
- try {
- String clsName = !clazz.isMemberClass()
- ? clazz.getName()
- : clazz.getCanonicalName();
- if (clsName != null && clsName.contains("$Lambda$")) {
- clsName = clsName.replaceAll("(Lambda\\$.*?)/.*", "$1");
- }
- return clsName != null ? clsName : "UnknownTask";
- } catch (Throwable ex) {
- new Exception("Error occurred detecting class name", ex).printStackTrace();
- return "MangledClassFile";
- }
- });
-
- StringBuilder name = new StringBuilder(64);
- name.append("Task: ").append(taskname);
- if (period > 0) {
- name.append(" (interval:").append(period).append(")");
- } else {
- name.append(" (Single)");
- }
-
- if (plugin == null) {
- return Timings.ofSafe(null, name.toString());
- }
-
- return Timings.ofSafe(plugin, name.toString());
- }
-
- /**
- * Get a named timer for the specified entity type to track type specific timings.
- * @param entityType
- * @return
- */
- public static Timing getEntityTimings(String entityType, String type) {
- return Timings.ofSafe("Minecraft", "## tickEntity - " + entityType + " - " + type, tickEntityTimer);
- }
-
- public static Timing getBehaviorTimings(String type) {
- return Timings.ofSafe("## Behavior - " + type);
- }
-
- public static Timing getSensorTimings(String type, int rate) {
- return Timings.ofSafe("## Sensor - " + type + " (Default rate: " + rate + ")");
- }
-
- /**
- * Get a named timer for the specified tile entity type to track type specific timings.
- * @param entity
- * @return
- */
- public static Timing getTileEntityTimings(BlockEntity entity) {
- String entityType = entity.getClass().getName();
- return Timings.ofSafe("Minecraft", "## tickTileEntity - " + entityType, tickTileEntityTimer);
- }
- public static Timing getCancelTasksTimer() {
- return Timings.ofSafe("Cancel Tasks");
- }
- public static Timing getCancelTasksTimer(Plugin plugin) {
- return Timings.ofSafe(plugin, "Cancel Tasks");
- }
-
- public static void stopServer() {
- TimingsManager.stopServer();
- }
-
- public static Timing getBlockTiming(Block block) {
- return Timings.ofSafe("## Scheduled Block: " + block.toString(), scheduledBlocksTimer);
- }
-/*
- public static Timing getStructureTiming(StructureGenerator structureGenerator) {
- return Timings.ofSafe("Structure Generator - " + structureGenerator.getName(), structureGenerationTimer);
- }*/
-
- public static Timing getPacketTiming(Packet packet) {
- return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer);
- }
-
- public static Timing getCommandFunctionTiming(CommandFunction<?> function) {
- return Timings.ofSafe("Command Function - " + function.id());
- }
-
- public static void processConfig(GlobalConfiguration.Timings config) {
- TimingsManager.url = config.url;
- if (!TimingsManager.url.endsWith("/")) {
- TimingsManager.url += "/";
- }
- TimingsManager.privacy = config.serverNamePrivacy;
- if (!config.hiddenConfigEntries.contains("proxies.velocity.secret")) {
- config.hiddenConfigEntries.add("proxies.velocity.secret");
- }
- TimingsManager.hiddenConfigs.addAll(config.hiddenConfigEntries);
- co.aikar.timings.Timings.setVerboseTimingsEnabled(config.verbose);
- co.aikar.timings.Timings.setTimingsEnabled(config.enabled);
- co.aikar.timings.Timings.setHistoryInterval(config.historyInterval * 20);
- co.aikar.timings.Timings.setHistoryLength(config.historyLength * 20);
- }
-}
+interface MinecraftTimings {} // Thunderbolt - Remove remaining timings implementations
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index b35a9f4c5f8960864c402ede8a51fb5ab9c4fcc0..89c4d2cffb0bd3173070f8f241f45bdfe40fcfeb 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -1,389 +1,4 @@
-/*
- * This file is licensed under the MIT License (MIT).
- *
- * Copyright (c) 2014 Daniel Ennis <http://aikar.co>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
package co.aikar.timings;
-import com.google.common.collect.Sets;
-import io.papermc.paper.adventure.PaperAdventure;
-import net.kyori.adventure.text.event.ClickEvent;
-import net.kyori.adventure.text.format.NamedTextColor;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import net.minecraft.server.MinecraftServer;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.MemorySection;
-import org.bukkit.entity.EntityType;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-import oshi.SystemInfo;
-import oshi.hardware.HardwareAbstractionLayer;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.management.ManagementFactory;
-import java.lang.management.OperatingSystemMXBean;
-import java.lang.management.RuntimeMXBean;
-import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-import static co.aikar.timings.TimingsManager.HISTORY;
-import static co.aikar.util.JSONUtil.appendObjectData;
-import static co.aikar.util.JSONUtil.createObject;
-import static co.aikar.util.JSONUtil.pair;
-import static co.aikar.util.JSONUtil.toArray;
-import static co.aikar.util.JSONUtil.toArrayMapper;
-import static co.aikar.util.JSONUtil.toObjectMapper;
-import static net.kyori.adventure.text.Component.text;
-
-@SuppressWarnings({"rawtypes", "SuppressionAnnotation"})
@Deprecated(forRemoval = true)
-public class TimingsExport extends Thread {
-
- private final TimingsReportListener listeners;
- private final Map out;
- private final TimingHistory[] history;
- private static long lastReport = 0;
-
- private TimingsExport(TimingsReportListener listeners, Map out, TimingHistory[] history) {
- super("Timings paste thread");
- this.listeners = listeners;
- this.out = out;
- this.history = history;
- }
-
- /**
- * Checks if any pending reports are being requested, and builds one if needed.
- */
- public static void reportTimings() {
- if (Timings.requestingReport.isEmpty()) {
- return;
- }
- TimingsReportListener listeners = new TimingsReportListener(Timings.requestingReport);
- listeners.addConsoleIfNeeded();
-
- Timings.requestingReport.clear();
- long now = System.currentTimeMillis();
- final long lastReportDiff = now - lastReport;
- if (lastReportDiff < 60000) {
- listeners.sendMessage(text("Please wait at least 1 minute in between Timings reports. (" + (int)((60000 - lastReportDiff) / 1000) + " seconds)", NamedTextColor.RED));
- listeners.done();
- return;
- }
- final long lastStartDiff = now - TimingsManager.timingStart;
- if (lastStartDiff < 180000) {
- listeners.sendMessage(text("Please wait at least 3 minutes before generating a Timings report. Unlike Timings v1, v2 benefits from longer timings and is not as useful with short timings. (" + (int)((180000 - lastStartDiff) / 1000) + " seconds)", NamedTextColor.RED));
- listeners.done();
- return;
- }
- listeners.sendMessage(text("Preparing Timings Report...", NamedTextColor.GREEN));
- lastReport = now;
- Map parent = createObject(
- // Get some basic system details about the server
- pair("version", Bukkit.getVersion()),
- pair("maxplayers", Bukkit.getMaxPlayers()),
- pair("start", TimingsManager.timingStart / 1000),
- pair("end", System.currentTimeMillis() / 1000),
- pair("online-mode", Bukkit.getServer().getOnlineMode()),
- pair("sampletime", (System.currentTimeMillis() - TimingsManager.timingStart) / 1000),
- pair("datapacks", toArrayMapper(MinecraftServer.getServer().getPackRepository().getSelectedPacks(), pack -> {
- return PlainTextComponentSerializer.plainText().serialize(PaperAdventure.asAdventure(pack.getChatLink(true)));
- }))
- );
- if (!TimingsManager.privacy) {
- appendObjectData(parent,
- pair("server", Bukkit.getUnsafe().getTimingsServerName()),
- pair("motd", Bukkit.getServer().getMotd()),
- pair("icon", Bukkit.getServer().getServerIcon().getData())
- );
- }
-
- final Runtime runtime = Runtime.getRuntime();
- RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean();
-
- OperatingSystemMXBean osInfo = ManagementFactory.getOperatingSystemMXBean();
-
- HardwareAbstractionLayer hardwareInfo = new SystemInfo().getHardware();
-
- parent.put("system", createObject(
- pair("timingcost", getCost()),
- pair("loadavg", osInfo.getSystemLoadAverage()),
- pair("name", System.getProperty("os.name")),
- pair("version", System.getProperty("os.version")),
- pair("jvmversion", System.getProperty("java.version")),
- pair("jvmvendor", System.getProperty("java.vendor")),
- pair("jvmvendorversion", System.getProperty("java.vendor.version")),
- pair("arch", System.getProperty("os.arch")),
- pair("maxmem", runtime.maxMemory()),
- pair("memory", createObject(
- pair("heap", ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().toString()),
- pair("nonheap", ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage().toString()),
- pair("finalizing", ManagementFactory.getMemoryMXBean().getObjectPendingFinalizationCount())
- )),
- pair("cpu", runtime.availableProcessors()),
- pair("cpuname", hardwareInfo.getProcessor().getProcessorIdentifier().getName().trim()),
- pair("runtime", runtimeBean.getUptime()),
- pair("flags", StringUtils.join(runtimeBean.getInputArguments(), " ")),
- pair("gc", toObjectMapper(ManagementFactory.getGarbageCollectorMXBeans(), input -> pair(input.getName(), toArray(input.getCollectionCount(), input.getCollectionTime()))))
- )
- );
-
- parent.put("worlds", toObjectMapper(MinecraftServer.getServer().getAllLevels(), world -> {
- if (world.getWorld().getName().equals("worldeditregentempworld")) return null;
- return pair(world.getWorld().getName(), createObject(
- pair("gamerules", toObjectMapper(world.getWorld().getGameRules(), rule -> {
- return pair(rule, world.getWorld().getGameRuleValue(rule));
- })),
- pair("ticking-distance", world.getWorld().getSimulationDistance()),
- pair("no-ticking-distance", world.getWorld().getViewDistance()),
- pair("sending-distance", world.getWorld().getSendViewDistance())
- ));
- }));
-
- Set<Material> tileEntityTypeSet = Sets.newHashSet();
- Set<EntityType> entityTypeSet = Sets.newHashSet();
-
- int size = HISTORY.size();
- TimingHistory[] history = new TimingHistory[size + 1];
- int i = 0;
- for (TimingHistory timingHistory : HISTORY) {
- tileEntityTypeSet.addAll(timingHistory.tileEntityTypeSet);
- entityTypeSet.addAll(timingHistory.entityTypeSet);
- history[i++] = timingHistory;
- }
-
- history[i] = new TimingHistory(); // Current snapshot
- tileEntityTypeSet.addAll(history[i].tileEntityTypeSet);
- entityTypeSet.addAll(history[i].entityTypeSet);
-
-
- Map handlers = createObject();
- Map groupData;
- synchronized (TimingIdentifier.GROUP_MAP) {
- for (TimingIdentifier.TimingGroup group : TimingIdentifier.GROUP_MAP.values()) {
- synchronized (group.handlers) {
- for (TimingHandler id : group.handlers) {
-
- if (!id.isTimed() && !id.isSpecial()) {
- continue;
- }
-
- String name = id.identifier.name;
- if (name.startsWith("##")) {
- name = name.substring(3);
- }
- handlers.put(id.id, toArray(
- group.id,
- name
- ));
- }
- }
- }
-
- groupData = toObjectMapper(
- TimingIdentifier.GROUP_MAP.values(), group -> pair(group.id, group.name));
- }
-
- parent.put("idmap", createObject(
- pair("groups", groupData),
- pair("handlers", handlers),
- pair("worlds", toObjectMapper(TimingHistory.worldMap.entrySet(), input -> pair(input.getValue(), input.getKey()))),
- pair("tileentity",
- toObjectMapper(tileEntityTypeSet, input -> pair(input.ordinal(), input.name()))),
- pair("entity",
- toObjectMapper(entityTypeSet, input -> pair(input.ordinal(), input.name())))
- ));
-
- // Information about loaded plugins
-
- parent.put("plugins", toObjectMapper(Bukkit.getPluginManager().getPlugins(),
- plugin -> pair(plugin.getName(), createObject(
- pair("version", plugin.getDescription().getVersion()),
- pair("description", String.valueOf(plugin.getDescription().getDescription()).trim()),
- pair("website", plugin.getDescription().getWebsite()),
- pair("authors", StringUtils.join(plugin.getDescription().getAuthors(), ", "))
- ))));
-
-
-
- // Information on the users Config
-
- parent.put("config", createObject(
- pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
- pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
- pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Pufferfish
- pair("pufferfish", mapAsJSON(gg.pufferfish.pufferfish.PufferfishConfig.getConfigCopy(), null)) // Pufferfish
- ));
-
- new TimingsExport(listeners, parent, history).start();
- }
-
- static long getCost() {
- // Benchmark the users System.nanotime() for cost basis
- int passes = 100;
- TimingHandler SAMPLER1 = Timings.ofSafe("Timings Sampler 1");
- TimingHandler SAMPLER2 = Timings.ofSafe("Timings Sampler 2");
- TimingHandler SAMPLER3 = Timings.ofSafe("Timings Sampler 3");
- TimingHandler SAMPLER4 = Timings.ofSafe("Timings Sampler 4");
- TimingHandler SAMPLER5 = Timings.ofSafe("Timings Sampler 5");
- TimingHandler SAMPLER6 = Timings.ofSafe("Timings Sampler 6");
-
- long start = System.nanoTime();
- for (int i = 0; i < passes; i++) {
- SAMPLER1.startTiming();
- SAMPLER2.startTiming();
- SAMPLER3.startTiming();
- SAMPLER3.stopTiming();
- SAMPLER4.startTiming();
- SAMPLER5.startTiming();
- SAMPLER6.startTiming();
- SAMPLER6.stopTiming();
- SAMPLER5.stopTiming();
- SAMPLER4.stopTiming();
- SAMPLER2.stopTiming();
- SAMPLER1.stopTiming();
- }
- long timingsCost = (System.nanoTime() - start) / passes / 6;
- SAMPLER1.reset(true);
- SAMPLER2.reset(true);
- SAMPLER3.reset(true);
- SAMPLER4.reset(true);
- SAMPLER5.reset(true);
- SAMPLER6.reset(true);
- return timingsCost;
- }
-
- private static JSONObject mapAsJSON(ConfigurationSection config, String parentKey) {
-
- JSONObject object = new JSONObject();
- for (String key : config.getKeys(false)) {
- String fullKey = (parentKey != null ? parentKey + "." + key : key);
- if (fullKey.equals("database") || fullKey.equals("settings.bungeecord-addresses") || TimingsManager.hiddenConfigs.contains(fullKey) || key.startsWith("seed-") || key.equals("worldeditregentempworld") || key.equals("feature-seeds")) {
- continue;
- }
- final Object val = config.get(key);
-
- object.put(key, valAsJSON(val, fullKey));
- }
- return object;
- }
-
- private static Object valAsJSON(Object val, final String parentKey) {
- if (!(val instanceof MemorySection)) {
- if (val instanceof List) {
- Iterable<Object> v = (Iterable<Object>) val;
- return toArrayMapper(v, input -> valAsJSON(input, parentKey));
- } else {
- return String.valueOf(val);
- }
- } else {
- return mapAsJSON((ConfigurationSection) val, parentKey);
- }
- }
-
- @Override
- public void run() {
- out.put("data", toArrayMapper(history, TimingHistory::export));
-
-
- String response = null;
- String timingsURL = null;
- try {
- HttpURLConnection con = (HttpURLConnection) new URL(TimingsManager.url + "post").openConnection();
- con.setDoOutput(true);
- String hostName = "BrokenHost";
- try {
- hostName = InetAddress.getLocalHost().getHostName();
- } catch (Exception ignored) {}
- con.setRequestProperty("User-Agent", "Paper/" + Bukkit.getUnsafe().getTimingsServerName() + "/" + hostName);
- con.setRequestMethod("POST");
- con.setInstanceFollowRedirects(false);
-
- OutputStream request = new GZIPOutputStream(con.getOutputStream()) {{
- this.def.setLevel(7);
- }};
-
- request.write(JSONValue.toJSONString(out).getBytes("UTF-8"));
- request.close();
-
- response = getResponse(con);
-
- if (con.getResponseCode() != 302) {
- listeners.sendMessage(text( "Upload Error: " + con.getResponseCode() + ": " + con.getResponseMessage(), NamedTextColor.RED));
- listeners.sendMessage(text("Check your logs for more information", NamedTextColor.RED));
- if (response != null) {
- Bukkit.getLogger().log(Level.SEVERE, response);
- }
- return;
- }
-
- timingsURL = con.getHeaderField("Location");
- listeners.sendMessage(text("View Timings Report: ", NamedTextColor.GREEN).append(text(timingsURL).clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, timingsURL))));
-
- if (response != null && !response.isEmpty()) {
- Bukkit.getLogger().log(Level.INFO, "Timing Response: " + response);
- }
- } catch (IOException ex) {
- listeners.sendMessage(text("Error uploading timings, check your logs for more information", NamedTextColor.RED));
- if (response != null) {
- Bukkit.getLogger().log(Level.SEVERE, response);
- }
- Bukkit.getLogger().log(Level.SEVERE, "Could not paste timings", ex);
- } finally {
- this.listeners.done(timingsURL);
- }
- }
-
- private String getResponse(HttpURLConnection con) throws IOException {
- InputStream is = null;
- try {
- is = con.getInputStream();
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
-
- byte[] b = new byte[1024];
- int bytesRead;
- while ((bytesRead = is.read(b)) != -1) {
- bos.write(b, 0, bytesRead);
- }
- return bos.toString();
-
- } catch (IOException ex) {
- listeners.sendMessage(text("Error uploading timings, check your logs for more information", NamedTextColor.RED));
- Bukkit.getLogger().log(Level.WARNING, con.getResponseMessage(), ex);
- return null;
- } finally {
- if (is != null) {
- is.close();
- }
- }
- }
-}
+interface TimingsExport {} // Thunderbolt - Remove remaining timings implementations
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
index 22687667ec69a954261e55e59261286ac1b8b8cd..94efe27854d929e79480cee8a2075115b0c4a31c 100644
--- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
@@ -1,140 +1,4 @@
package co.aikar.timings;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.storage.PrimaryLevelData;
-
-/**
- * Set of timers per world, to track world specific timings.
- */
-// TODO: Re-implement missing timers
@Deprecated(forRemoval = true)
-public class WorldTimingsHandler {
- public final Timing mobSpawn;
- public final Timing doChunkUnload;
- public final Timing doPortalForcer;
- public final Timing scheduledBlocks;
- public final Timing scheduledBlocksCleanup;
- public final Timing scheduledBlocksTicking;
- public final Timing chunkTicks;
- public final Timing lightChunk;
- public final Timing chunkTicksBlocks;
- public final Timing doVillages;
- public final Timing doChunkMap;
- public final Timing doChunkMapUpdate;
- public final Timing doChunkMapToUpdate;
- public final Timing doChunkMapSortMissing;
- public final Timing doChunkMapSortSendToPlayers;
- public final Timing doChunkMapPlayersNeedingChunks;
- public final Timing doChunkMapPendingSendToPlayers;
- public final Timing doChunkMapUnloadChunks;
- public final Timing doChunkGC;
- public final Timing doSounds;
- public final Timing entityRemoval;
- public final Timing entityTick;
- public final Timing tileEntityTick;
- public final Timing tileEntityPending;
- public final Timing tracker1;
- public final Timing tracker2;
- public final Timing doTick;
- public final Timing tickEntities;
- public final Timing chunks;
- public final Timing newEntities;
- public final Timing raids;
- public final Timing chunkProviderTick;
- public final Timing broadcastChunkUpdates;
- public final Timing countNaturalMobs;
-
- public final Timing chunkLoad;
- public final Timing chunkLoadPopulate;
- public final Timing syncChunkLoad;
- public final Timing chunkLoadLevelTimer;
- public final Timing chunkIO;
- public final Timing chunkPostLoad;
- public final Timing worldSave;
- public final Timing worldSaveChunks;
- public final Timing worldSaveLevel;
- public final Timing chunkSaveData;
-
-
- public final Timing miscMobSpawning;
-
- public final Timing poiUnload;
- public final Timing chunkUnload;
- public final Timing poiSaveDataSerialization;
- public final Timing chunkSave;
- public final Timing chunkSaveDataSerialization;
- public final Timing chunkSaveIOWait;
- public final Timing chunkUnloadPrepareSave;
- public final Timing chunkUnloadPOISerialization;
- public final Timing chunkUnloadDataSave;
-
- public WorldTimingsHandler(Level server) {
- String name = ((PrimaryLevelData) server.getLevelData()).getLevelName() + " - ";
-
- mobSpawn = Timings.ofSafe(name + "mobSpawn");
- doChunkUnload = Timings.ofSafe(name + "doChunkUnload");
- scheduledBlocks = Timings.ofSafe(name + "Scheduled Blocks");
- scheduledBlocksCleanup = Timings.ofSafe(name + "Scheduled Blocks - Cleanup");
- scheduledBlocksTicking = Timings.ofSafe(name + "Scheduled Blocks - Ticking");
- chunkTicks = Timings.ofSafe(name + "Chunk Ticks");
- lightChunk = Timings.ofSafe(name + "Light Chunk");
- chunkTicksBlocks = Timings.ofSafe(name + "Chunk Ticks - Blocks");
- doVillages = Timings.ofSafe(name + "doVillages");
- doChunkMap = Timings.ofSafe(name + "doChunkMap");
- doChunkMapUpdate = Timings.ofSafe(name + "doChunkMap - Update");
- doChunkMapToUpdate = Timings.ofSafe(name + "doChunkMap - To Update");
- doChunkMapSortMissing = Timings.ofSafe(name + "doChunkMap - Sort Missing");
- doChunkMapSortSendToPlayers = Timings.ofSafe(name + "doChunkMap - Sort Send To Players");
- doChunkMapPlayersNeedingChunks = Timings.ofSafe(name + "doChunkMap - Players Needing Chunks");
- doChunkMapPendingSendToPlayers = Timings.ofSafe(name + "doChunkMap - Pending Send To Players");
- doChunkMapUnloadChunks = Timings.ofSafe(name + "doChunkMap - Unload Chunks");
- doSounds = Timings.ofSafe(name + "doSounds");
- doChunkGC = Timings.ofSafe(name + "doChunkGC");
- doPortalForcer = Timings.ofSafe(name + "doPortalForcer");
- entityTick = Timings.ofSafe(name + "entityTick");
- entityRemoval = Timings.ofSafe(name + "entityRemoval");
- tileEntityTick = Timings.ofSafe(name + "tileEntityTick");
- tileEntityPending = Timings.ofSafe(name + "tileEntityPending");
-
- chunkLoad = Timings.ofSafe(name + "Chunk Load");
- chunkLoadPopulate = Timings.ofSafe(name + "Chunk Load - Populate");
- syncChunkLoad = Timings.ofSafe(name + "Sync Chunk Load");
- chunkLoadLevelTimer = Timings.ofSafe(name + "Chunk Load - Load Level");
- chunkIO = Timings.ofSafe(name + "Chunk Load - DiskIO");
- chunkPostLoad = Timings.ofSafe(name + "Chunk Load - Post Load");
- worldSave = Timings.ofSafe(name + "World Save");
- worldSaveLevel = Timings.ofSafe(name + "World Save - Level");
- worldSaveChunks = Timings.ofSafe(name + "World Save - Chunks");
- chunkSaveData = Timings.ofSafe(name + "Chunk Save - Data");
-
- tracker1 = Timings.ofSafe(name + "tracker stage 1");
- tracker2 = Timings.ofSafe(name + "tracker stage 2");
- doTick = Timings.ofSafe(name + "doTick");
- tickEntities = Timings.ofSafe(name + "tickEntities");
-
- chunks = Timings.ofSafe(name + "Chunks");
- newEntities = Timings.ofSafe(name + "New entity registration");
- raids = Timings.ofSafe(name + "Raids");
- chunkProviderTick = Timings.ofSafe(name + "Chunk provider tick");
- broadcastChunkUpdates = Timings.ofSafe(name + "Broadcast chunk updates");
- countNaturalMobs = Timings.ofSafe(name + "Count natural mobs");
-
-
- miscMobSpawning = Timings.ofSafe(name + "Mob spawning - Misc");
-
- poiUnload = Timings.ofSafe(name + "Chunk unload - POI");
- chunkUnload = Timings.ofSafe(name + "Chunk unload - Chunk");
- poiSaveDataSerialization = Timings.ofSafe(name + "Chunk save - POI Data serialization");
- chunkSave = Timings.ofSafe(name + "Chunk save - Chunk");
- chunkSaveDataSerialization = Timings.ofSafe(name + "Chunk save - Chunk Data serialization");
- chunkSaveIOWait = Timings.ofSafe(name + "Chunk save - Chunk IO Wait");
- chunkUnloadPrepareSave = Timings.ofSafe(name + "Chunk unload - Async Save Prepare");
- chunkUnloadPOISerialization = Timings.ofSafe(name + "Chunk unload - POI Data Serialization");
- chunkUnloadDataSave = Timings.ofSafe(name + "Chunk unload - Data Serialization");
- }
-
- public static Timing getTickList(ServerLevel worldserver, String timingsType) {
- return Timings.ofSafe(((PrimaryLevelData) worldserver.getLevelData()).getLevelName() + " - Scheduled " + timingsType);
- }
-}
+interface WorldTimingsHandler {} // Thunderbolt - Remove remaining timings implementations
diff --git a/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java b/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java
index 4ad189d52b27560424ddb311d0817a334637dc95..f7e64bcd8810f7f5782d5314ec16290dc30cb518 100644
--- a/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java
+++ b/src/main/java/gg/pufferfish/pufferfish/compat/ServerConfigurations.java
@@ -1,6 +1,6 @@
package gg.pufferfish.pufferfish.compat;
-import co.aikar.timings.TimingsManager;
+// import co.aikar.timings.TimingsManager; // Thunderbolt - Remove remaining timings implementations
import com.google.common.io.Files;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -37,7 +37,7 @@ public class ServerConfigurations {
public static String getCleanCopy(String configName) throws IOException {
File file = new File(configName);
- List<String> hiddenConfigs = TimingsManager.hiddenConfigs;
+ // List<String> hiddenConfigs = TimingsManager.hiddenConfigs; // Thunderbolt - Remove remaining timings implementations
switch (Files.getFileExtension(configName)) {
case "properties": {
@@ -45,9 +45,11 @@ public class ServerConfigurations {
try (FileInputStream inputStream = new FileInputStream(file)) {
properties.load(inputStream);
}
+ /* // Thunderbolt - Remove remaining timings implementations
for (String hiddenConfig : hiddenConfigs) {
properties.remove(hiddenConfig);
}
+ */ // Thunderbolt - Remove remaining timings implementations
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
properties.store(outputStream, "");
return Arrays.stream(outputStream.toString()
@@ -63,11 +65,13 @@ public class ServerConfigurations {
throw new IOException(e);
}
configuration.options().header(null);
+ /* // Thunderbolt - Remove remaining timings implementations
for (String key : configuration.getKeys(true)) {
if (hiddenConfigs.contains(key)) {
configuration.set(key, null);
}
}
+ */ // Thunderbolt - Remove remaining timings implementations
return configuration.saveToString();
}
default:
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 86822868e47b269891a71fdc04371b1e28a2752e..723444f9ac1a61ee08d0e2425e338c529a63dc27 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -1,6 +1,6 @@
package io.papermc.paper.configuration;
-import co.aikar.timings.MinecraftTimings;
+// import co.aikar.timings.MinecraftTimings; // Thunderbolt - Remove remaining timings implementations
import com.mojang.logging.LogUtils;
import io.papermc.paper.configuration.constraint.Constraints;
import io.papermc.paper.configuration.type.number.IntOr;
@@ -93,6 +93,7 @@ public class GlobalConfiguration extends ConfigurationPart {
public boolean useDisplayNameInQuitMessage = false;
}
+ /* // Thunderbolt - Remove remaining timings implementations
@Deprecated(forRemoval = true)
public Timings timings;
@@ -124,6 +125,7 @@ public class GlobalConfiguration extends ConfigurationPart {
MinecraftTimings.processConfig(this);
}
}
+ */ // Thunderbolt - Remove remaining timings implementations
public Proxies proxies;
diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
index 23594fb7eb4b2f33146592866608c2858ef23937..db405389e7b3ec6136cb68161d437940d242ff13 100644
--- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
+++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java
@@ -1,6 +1,6 @@
package io.papermc.paper.plugin.manager;
-import co.aikar.timings.TimedEventExecutor;
+// import co.aikar.timings.TimedEventExecutor; // Thunderbolt - Remove remaining timings implementations
import com.destroystokyo.paper.event.server.ServerExceptionEvent;
import com.destroystokyo.paper.exception.ServerEventException;
import com.google.common.collect.Sets;
@@ -96,7 +96,7 @@ class PaperEventManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
- executor = new TimedEventExecutor(executor, plugin, null, event);
+ // executor = new TimedEventExecutor(executor, plugin, null, event); // Thunderbolt - Remove remaining timings implementations
this.getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
}
@@ -183,7 +183,7 @@ class PaperEventManager {
}
}
- EventExecutor executor = new TimedEventExecutor(EventExecutor.create(method, eventClass), plugin, method, eventClass);
+ EventExecutor executor = EventExecutor.create(method, eventClass); // Thunderbolt - Remove remaining timings implementations
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
}
return ret;
diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java
index 097500a59336db1bbfffcd1aa4cff7a8586e46ec..844e340c331c6dd12eaaac247f871b042ceb6c25 100644
--- a/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java
+++ b/src/main/java/io/papermc/paper/plugin/manager/PaperPluginManagerImpl.java
@@ -232,7 +232,7 @@ public class PaperPluginManagerImpl implements PluginManager, DependencyContext
@Override
public boolean useTimings() {
- return co.aikar.timings.Timings.isTimingsEnabled();
+ return false; // Thunderbolt - Remove remaining timings implementations
}
@Override
diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
index 8c134a642ccaf3530022f2e675a858d726e1dda4..2cc6668b64c5e8ae3c39a934efae95933e1c83db 100644
--- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
+++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
@@ -50,7 +50,7 @@ public class PacketUtils {
try { // Paper - detailed watchdog information
if (listener instanceof ServerCommonPacketListenerImpl serverCommonPacketListener && serverCommonPacketListener.processedDisconnect) return; // CraftBukkit - Don't handle sync packets for kicked players
if (listener.shouldHandleMessage(packet)) {
- co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings
+ // co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings // Thunderbolt - Remove remaining timings implementations
try { // Paper - timings // Purpur
packet.handle(listener);
} catch (Exception exception) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cffcbc5db9593f69748d1c2d5a5687fa31f9ada5..75171854b6f1d056262b78d9028e68f755254e10 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -3,7 +3,7 @@ package net.minecraft.server;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
-import co.aikar.timings.Timings;
+// import co.aikar.timings.Timings; // Thunderbolt - Remove remaining timings implementations
import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
@@ -190,7 +190,7 @@ import org.bukkit.craftbukkit.CraftRegistry;
import org.bukkit.event.server.ServerLoadEvent;
// CraftBukkit end
-import co.aikar.timings.MinecraftTimings; // Paper
+// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations
public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements ServerInfo, CommandSource, AutoCloseable {
@@ -984,7 +984,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
- MinecraftTimings.stopServer(); // Paper
+ // MinecraftTimings.stopServer(); // Paper // Thunderbolt - Remove remaining timings implementations
// Purpur start
if (upnp) {
if (dev.omega24.upnp4j.UPnP4J.close(this.getPort(), dev.omega24.upnp4j.util.Protocol.TCP)) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 4bf46e28d099511a29eeae981d63ca4540bc9d76..c5f9841b63861f86189e2c4e998e4d8182e3cf87 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -63,7 +63,7 @@ import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.io.IoBuilder;
import org.bukkit.command.CommandSender;
-import co.aikar.timings.MinecraftTimings; // Paper
+// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations
import org.bukkit.craftbukkit.util.TerminalCompletionHandler;
import org.bukkit.craftbukkit.util.TerminalConsoleWriterThread;
import org.bukkit.event.server.ServerCommandEvent;
@@ -846,6 +846,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
}
// Paper start
command.set(event.getCommand());
+ /* // Thunderbolt - Remove remaining timings implementations
if (event.getCommand().toLowerCase().startsWith("timings") && event.getCommand().toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
org.bukkit.command.BufferedCommandSender sender = new org.bukkit.command.BufferedCommandSender();
Waitable<String> waitable = new Waitable<>() {
@@ -858,9 +859,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
co.aikar.timings.Timings.generateReport(new co.aikar.timings.TimingsReportListener(sender, waitable));
} else {
// Paper end
+ */ // Thunderbolt - Remove remaining timings implementations
ConsoleInput serverCommand = new ConsoleInput(event.getCommand(), wrapper);
this.server.dispatchServerCommand(event.getSender(), serverCommand);
- } // Paper
+ // } // Paper // Thunderbolt - Remove remaining timings implementations
});
// Paper start
if (waitableArray[0] != null) {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 873ef80c02b4c6494529a6327faf82902a0181da..9afadf28d33275d3e9f35fdcc6cf679d6b117457 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1,7 +1,7 @@
package net.minecraft.server.level;
import com.google.common.annotations.VisibleForTesting;
-import co.aikar.timings.TimingHistory; // Paper
+// import co.aikar.timings.TimingHistory; // Paper // Thunderbolt - Remove remaining timings implementations
import com.google.common.collect.Lists;
import com.mojang.datafixers.DataFixer;
import com.mojang.datafixers.util.Pair;
@@ -1497,9 +1497,9 @@ public class ServerLevel extends Level implements WorldGenLevel {
currentlyTickingEntity.lazySet(entity);
}
// Paper end - log detailed entity tick information
- ++TimingHistory.entityTicks; // Paper - timings
+ //++TimingHistory.entityTicks; // Paper - timings // Thunderbolt - Remove remaining timings implementations
// Spigot start
- co.aikar.timings.Timing timer; // Paper
+ //co.aikar.timings.Timing timer; // Paper // Thunderbolt - Remove remaining timings implementations
/*if (!org.spigotmc.ActivationRange.checkIfActive(entity)) { // Paper - comment out - EAR 2, reimplement below
entity.tickCount++;
timer = entity.getType().inactiveTickTimer.startTiming(); try { // Paper - timings
@@ -1522,7 +1522,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
});*/ // Purpur
//gameprofilerfiller.incrementCounter("tickNonPassenger"); // Purpur
if (isActive) { // Paper - EAR 2
- TimingHistory.activatedEntityTicks++;
+ // TimingHistory.activatedEntityTicks++; // Thunderbolt - Remove remaining timings implementations
entity.tick();
entity.postTick(); // CraftBukkit
} else { entity.inactiveTick(); } // Paper - EAR 2
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index fdfe8f5bc5ad0e5f5ded41d87756a5866d041df1..9e519813080e76b43ad68f1a67b0dd0610062b68 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1,6 +1,6 @@
package net.minecraft.server.players;
-import co.aikar.timings.MinecraftTimings;
+// import co.aikar.timings.MinecraftTimings; // Thunderbolt - Remove remaining timings implementations
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 32a1b5a1d01fd4dc603a76fde259f3a0d4749fad..824855365586538ad78dfe379df53e89cd2c60f5 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -356,10 +356,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
this(factory, spawnGroup, saveable, summonable, fireImmune, spawnableFarFromPlayer, canSpawnInside, dimensions, spawnBoxScale, maxTrackDistance, trackTickInterval, requiredFeatures, "custom");
}
public EntityType(EntityType.EntityFactory<T> factory, MobCategory spawnGroup, boolean saveable, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, ImmutableSet<Block> canSpawnInside, EntityDimensions dimensions, float spawnBoxScale, int maxTrackDistance, int trackTickInterval, FeatureFlagSet requiredFeatures, String id) {
+ /* // Thunderbolt - Remove remaining timings implementations
this.tickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "tick");
this.inactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "inactiveTick");
this.passengerTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerTick");
this.passengerInactiveTickTimer = co.aikar.timings.MinecraftTimings.getEntityTimings(id, "passengerInactiveTick");
+ */ // Thunderbolt - Remove remaining timings implementations
// Paper end
this.builtInRegistryHolder = BuiltInRegistries.ENTITY_TYPE.createIntrusiveHolder(this);
this.factory = factory;
@@ -730,10 +732,12 @@ public class EntityType<T extends Entity> implements FeatureElement, EntityTypeT
}
// Paper start - timings
+ /* // Thunderbolt - Remove remaining timings implementations
public final co.aikar.timings.Timing tickTimer;
public final co.aikar.timings.Timing inactiveTickTimer;
public final co.aikar.timings.Timing passengerTickTimer;
public final co.aikar.timings.Timing passengerInactiveTickTimer;
+ */ // Thunderbolt - Remove remaining timings implementations
// Paper end
public boolean trackDeltas() {
return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS;
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
index 612a14806ec63b0dcf31814396282f4b7f4a527c..b72936610ae125d1d972608364c79c85703f987e 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java
@@ -16,7 +16,7 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
private final int maxDuration;
// Paper start - configurable behavior tick rate and timings
private final String configKey;
- private final co.aikar.timings.Timing timing;
+ // private final co.aikar.timings.Timing timing; // Thunderbolt - Remove remaining timings implementations
// Paper end - configurable behavior tick rate and timings
public Behavior(Map<MemoryModuleType<?>, MemoryStatus> requiredMemoryState) {
@@ -38,7 +38,7 @@ public abstract class Behavior<E extends LivingEntity> implements BehaviorContro
key = key.substring(lastSeparator + 1);
}
this.configKey = key.toLowerCase(java.util.Locale.ROOT);
- this.timing = co.aikar.timings.MinecraftTimings.getBehaviorTimings(configKey);
+ // this.timing = co.aikar.timings.MinecraftTimings.getBehaviorTimings(configKey); // Thunderbolt - Remove remaining timings implementations
// Paper end - configurable behavior tick rate and timings
}
diff --git a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
index 703006eb5df8099c4f51cdb4e41f95cacfbe43a6..a17f85cd0f52fba5d1ca64b20350310102377304 100644
--- a/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
+++ b/src/main/java/net/minecraft/world/entity/ai/sensing/Sensor.java
@@ -28,7 +28,7 @@ public abstract class Sensor<E extends LivingEntity> {
private long timeToTick;
// Paper start - configurable sensor tick rate and timings
private final String configKey;
- private final co.aikar.timings.Timing timing;
+ // private final co.aikar.timings.Timing timing; // Thunderbolt - Remove remaining timings implementations
// Paper end
public Sensor(int senseInterval) {
@@ -39,7 +39,7 @@ public abstract class Sensor<E extends LivingEntity> {
key = key.substring(lastSeparator + 1);
}
this.configKey = key.toLowerCase(java.util.Locale.ROOT);
- this.timing = co.aikar.timings.MinecraftTimings.getSensorTimings(configKey, senseInterval);
+ // this.timing = co.aikar.timings.MinecraftTimings.getSensorTimings(configKey, senseInterval); // Thunderbolt - Remove remaining timings implementations
// Paper end
this.scanRate = senseInterval;
this.timeToTick = (long)RANDOM.nextInt(senseInterval);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 77ebd33eca98832e34866e7b522a263673fa25f8..37f80a6e2e0891464c99367700be70ed4618069b 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -183,7 +183,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
public final org.purpurmc.purpur.PurpurWorldConfig purpurConfig; // Purpur
- public final co.aikar.timings.WorldTimingsHandler timings; // Paper
+ // public final co.aikar.timings.WorldTimingsHandler timings; // Paper // Thunderbolt - Remove remaining timings implementations
public static BlockPos lastPhysicsProblem; // Spigot
private org.spigotmc.TickLimiter entityLimiter;
private org.spigotmc.TickLimiter tileLimiter;
@@ -364,7 +364,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
public void onBorderSetDamageSafeZOne(WorldBorder border, double safeZoneRadius) {}
});
// CraftBukkit end
- this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
+ // this.timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings // Thunderbolt - Remove remaining timings implementations
this.entityLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.entityMaxTickTime);
this.tileLimiter = new org.spigotmc.TickLimiter(this.spigotConfig.tileMaxTickTime);
this.chunkPacketBlockController = this.paperConfig().anticheat.antiXray.enabled ? new com.destroystokyo.paper.antixray.ChunkPacketBlockControllerAntiXray(this, executor) : com.destroystokyo.paper.antixray.ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
@@ -1387,7 +1387,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
//this.timings.tileEntityTick.stopTiming(); // Spigot // Purpur
this.tickingBlockEntities = false;
- co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
+ // co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper // Thunderbolt - Remove remaining timings implementations
//gameprofilerfiller.pop(); // Purpur
this.spigotConfig.currentPrimedTnt = 0; // Spigot
}
diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
index 5ae3decf100d21f7d4a471c155eaf5e00e996580..5ed1cbeea5946888ef564a06b9a9d5a1379ca2da 100644
--- a/src/main/java/net/minecraft/world/level/block/Block.java
+++ b/src/main/java/net/minecraft/world/level/block/Block.java
@@ -107,6 +107,7 @@ public class Block extends BlockBehaviour implements ItemLike {
this != Blocks.STRUCTURE_BLOCK &&
this != Blocks.JIGSAW;
}
+ /* // Thunderbolt - Remove remaining timings implementations
public co.aikar.timings.Timing timing;
public co.aikar.timings.Timing getTiming() {
if (timing == null) {
@@ -114,6 +115,7 @@ public class Block extends BlockBehaviour implements ItemLike {
}
return timing;
}
+ */ // Thunderbolt - Remove remaining timings implementations
// Paper end
@Nullable
private String descriptionId;
diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
index 8dc1436fe78759cee5247cc28e8a18999e738a1b..ace886913b43252c5216b716e1a6b42a652fd411 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
@@ -33,14 +33,14 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataTypeRegistry;
import org.bukkit.inventory.InventoryHolder;
// CraftBukkit end
-import org.spigotmc.CustomTimingsHandler; // Spigot
-import co.aikar.timings.MinecraftTimings; // Paper
-import co.aikar.timings.Timing; // Paper
+// import org.spigotmc.CustomTimingsHandler; // Spigot // Thunderbolt - Remove remaining timings implementations
+// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations
+// import co.aikar.timings.Timing; // Paper // Thunderbolt - Remove remaining timings implementations
public abstract class BlockEntity {
static boolean ignoreTileUpdates; // Paper - Perf: Optimize Hoppers
- public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper
+ // public Timing tickTimer = MinecraftTimings.getTileEntityTimings(this); // Paper // Thunderbolt - Remove remaining timings implementations
// CraftBukkit start - data containers
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 58123df202b28de77a9e733e062ee4f201d4d305..709f49e83a3bd71de446f60a7b4f98ad3421c773 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -376,8 +376,8 @@ public class Main {
tryPreloadClass("org.jline.terminal.impl.MouseSupport");
tryPreloadClass("org.jline.terminal.impl.MouseSupport$1");
tryPreloadClass("org.jline.terminal.Terminal$MouseTracking");
- tryPreloadClass("co.aikar.timings.TimingHistory");
- tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport");
+ // tryPreloadClass("co.aikar.timings.TimingHistory"); // Thunderbolt - Remove remaining timings implementations
+ // tryPreloadClass("co.aikar.timings.TimingHistory$MinuteReport"); // Thunderbolt - Remove remaining timings implementations
tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext");
tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$11");
tryPreloadClass("io.netty.channel.AbstractChannelHandlerContext$12");
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index e3af3ba8f34626e54cdd931601fd3ec40618a061..b08ef35521fd570a577b578f079587d11983229f 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -1,6 +1,6 @@
package org.bukkit.craftbukkit.scheduler;
-import co.aikar.timings.MinecraftTimings; // Paper
+// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations
import com.google.common.base.Preconditions;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import java.util.ArrayList;
@@ -304,7 +304,7 @@ public class CraftScheduler implements BukkitScheduler {
}
return false;
}
- }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper
+ })/*{{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}*/; // Paper // Thunderbolt - Remove remaining timings implementations
this.handle(task, 0L);
for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
@@ -344,7 +344,7 @@ public class CraftScheduler implements BukkitScheduler {
}
}
}
- }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer(plugin);}}; // Paper
+ })/*{{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer(plugin);}}*/; // Paper // Thunderbolt - Remove remaining timings implementations
this.handle(task, 0L);
for (CraftTask taskPending = this.head.getNext(); taskPending != null; taskPending = taskPending.getNext()) {
if (taskPending == task) {
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index 5835dc236b3f5291a804f7fb14a12eb466d4e0ba..878d8800f35c49a04a1632381e64137fbe619937 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -2,14 +2,14 @@ package org.bukkit.craftbukkit.scheduler;
import java.util.function.Consumer;
-import co.aikar.timings.NullTimingHandler;
+// import co.aikar.timings.NullTimingHandler; // Thunderbolt - Remove remaining timings implementations
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import org.bukkit.scheduler.BukkitTask;
-import org.spigotmc.CustomTimingsHandler; // Spigot
-import co.aikar.timings.MinecraftTimings; // Paper
-import co.aikar.timings.Timing; // Paper
+// import org.spigotmc.CustomTimingsHandler; // Spigot // Thunderbolt - Remove remaining timings implementations
+// import co.aikar.timings.MinecraftTimings; // Paper // Thunderbolt - Remove remaining timings implementations
+// import co.aikar.timings.Timing; // Paper // Thunderbolt - Remove remaining timings implementations
public class CraftTask implements BukkitTask, Runnable { // Spigot
@@ -31,7 +31,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
private long nextRun;
public final Runnable rTask; // Paper
public final Consumer<BukkitTask> cTask; // Paper
- public Timing timings; // Paper
+ // public Timing timings; // Paper // Thunderbolt - Remove remaining timings implementations
private final Plugin plugin;
private final int id;
private final long createdAt = System.nanoTime();
@@ -55,7 +55,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
this.id = id;
this.period = CraftTask.NO_REPEATING;
this.taskName = taskName;
- this.timings = MinecraftTimings.getInternalTaskName(taskName);
+ // this.timings = MinecraftTimings.getInternalTaskName(taskName); // Thunderbolt - Remove remaining timings implementations
}
// Paper end
@@ -76,7 +76,7 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot
}
this.id = id;
this.period = period;
- timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : NullTimingHandler.NULL; // Paper
+ // timings = task != null ? MinecraftTimings.getPluginTaskTimings(this, period) : NullTimingHandler.NULL; // Paper // Thunderbolt - Remove remaining timings implementations
}
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 6f24422beb7d3db6dbed0efcba2935f542519827..f6f991d2018ffca3ca49c61a6cc942c6b00e150b 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -215,6 +215,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
return ENTITY_TYPES_ENTITY_TYPE.get(entityTypes);
}
// Paper end
+ /* // Thunderbolt - Remove remaining timings implementations
// ========================================================================
// Paper start
@Override
@@ -222,6 +223,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
co.aikar.timings.TimingsExport.reportTimings();
}
// Paper end
+ */ // Thunderbolt - Remove remaining timings implementations
public static byte toLegacyData(BlockState data) {
return CraftLegacy.toLegacyData(data);
@@ -495,10 +497,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
return new CraftDamageSourceBuilder(damageType);
}
// Paper start
+ /* // Thunderbolt - Remove remaining timings implementations
@Override
public String getTimingsServerName() {
return io.papermc.paper.configuration.GlobalConfiguration.get().timings.serverName;
}
+ */ // Thunderbolt - Remove remaining timings implementations
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 583647f6c9ca0fb092f30c97693bd548f692dfd3..a46f90860b5d3565bae429b6d5a60edf90a4299f 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -35,7 +35,7 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity;
import net.minecraft.world.entity.projectile.ThrowableProjectile;
import net.minecraft.world.entity.projectile.ThrownTrident;
import net.minecraft.world.entity.raid.Raider;
-import co.aikar.timings.MinecraftTimings;
+// import co.aikar.timings.MinecraftTimings; // Thunderbolt - Remove remaining timings implementations
import net.minecraft.world.entity.schedule.Activity;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
Reference in New Issue View Git Blame Copy Permalink