Sampler changes (#2478)

* Fully mapped sampler

now they are mostly on server, and a few refactors

Signed-off-by: liach <liach@users.noreply.github.com>

* Missing old name

Co-authored-by: liach <liach@users.noreply.github.com>

mappings/net/minecraft/client/MinecraftClient.mapping

@@ -160,7 +160,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 	FIELD field_26902 socialInteractionsService Lcom/mojang/authlib/minecraft/SocialInteractionsService;
 	FIELD field_27387 entityModelLoader Lnet/minecraft/class_5599;
 	FIELD field_27388 blockEntityRenderDispatcher Lnet/minecraft/class_824;
-	FIELD field_29569 debugRecorder Lnet/minecraft/class_5962;
+	FIELD field_29569 recorder Lnet/minecraft/class_5962;
 	FIELD field_32144 wireFrame Z
 	FIELD field_33697 resourceReloadLogger Lnet/minecraft/class_6360;
 	FIELD field_33735 GL_ERROR_DIALOGUE Ljava/lang/String;
@@ -450,6 +450,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
 		ARG 2 languageManager
 		ARG 3 version
 		ARG 4 options
+	METHOD method_37286 stopRecorder ()V
 	CLASS class_5366 WorldLoadAction
 	CLASS class_5367 IntegratedResourceManager
 		FIELD field_25439 resourcePackManager Lnet/minecraft/class_3283;

mappings/net/minecraft/client/util/ClientSamplerSource.mapping

@@ -0,0 +1,8 @@
+CLASS net/minecraft/class_6412 net/minecraft/client/util/ClientSamplerSource
+	FIELD field_33959 renderer Lnet/minecraft/class_761;
+	FIELD field_33960 samplers Ljava/util/Set;
+	FIELD field_33961 factory Lnet/minecraft/class_6401;
+	METHOD <init> (Ljava/util/function/LongSupplier;Lnet/minecraft/class_761;)V
+		ARG 1 nanoTimeSupplier
+		ARG 2 renderer
+	METHOD method_37309 addInfoSamplers ()V

mappings/net/minecraft/client/util/profiler/DebugRecorder.mapping

@@ -1,16 +0,0 @@
-CLASS net/minecraft/class_5961 net/minecraft/client/util/profiler/DebugRecorder
-	FIELD field_29579 globalPathConsumer Ljava/util/function/Consumer;
-	FIELD field_29581 timeTracker Lnet/minecraft/class_4757;
-	FIELD field_29582 executor Ljava/util/concurrent/Executor;
-	FIELD field_29583 dumper Lnet/minecraft/class_5971;
-	FIELD field_29584 readAction Ljava/util/function/Consumer;
-	FIELD field_29585 pathConsumer Ljava/util/function/Consumer;
-	FIELD field_29586 timeGetter Ljava/util/function/LongSupplier;
-	FIELD field_29588 nanoStartTime J
-	FIELD field_29589 ticks I
-	FIELD field_29590 profiler Lnet/minecraft/class_3693;
-	FIELD field_29591 pendingRead Z
-	METHOD method_34762 checkState ()V
-	METHOD method_34763 execute (Lnet/minecraft/class_3696;)V
-	METHOD method_35762 setGlobalPathConsumer (Ljava/util/function/Consumer;)V
-		ARG 0 globalPathConsumer

mappings/net/minecraft/client/util/profiler/DummyRecorder.mapping

@@ -1,2 +0,0 @@
-CLASS net/minecraft/class_5963 net/minecraft/client/util/profiler/DummyRecorder
-	FIELD field_29594 INSTANCE Lnet/minecraft/class_5962;

mappings/net/minecraft/client/util/profiler/ProfilerDumper.mapping

@@ -1,11 +0,0 @@
-CLASS net/minecraft/class_5971 net/minecraft/client/util/profiler/ProfilerDumper
-	FIELD field_29616 DEBUG_PROFILING_DIRECTORY Ljava/nio/file/Path;
-	FIELD field_29618 LOGGER Lorg/apache/logging/log4j/Logger;
-	FIELD field_32677 METRICS_DIRECTORY Ljava/lang/String;
-	FIELD field_32678 DEVIATIONS_DIRECTORY Ljava/lang/String;
-	FIELD field_32679 FILE_NAME Ljava/lang/String;
-	METHOD method_34802 save (Lnet/minecraft/class_3696;Ljava/nio/file/Path;)V
-		ARG 2 directory
-	METHOD method_34803 writeCategory (Ljava/util/Set;Ljava/nio/file/Path;)V
-		ARG 2 directory
-	METHOD method_34807 createDump (Ljava/util/Set;Ljava/util/Map;Lnet/minecraft/class_3696;)Ljava/nio/file/Path;

mappings/net/minecraft/client/util/profiler/Recorder.mapping

@@ -1,6 +0,0 @@
-CLASS net/minecraft/class_5962 net/minecraft/client/util/profiler/Recorder
-	METHOD method_34770 sample ()V
-	METHOD method_34771 start ()V
-	METHOD method_34772 read ()V
-	METHOD method_34773 isActive ()Z
-	METHOD method_34774 getProfiler ()Lnet/minecraft/class_3695;

mappings/net/minecraft/client/util/profiler/SamplingRecorder.mapping

@@ -1,33 +0,0 @@
-CLASS net/minecraft/class_5965 net/minecraft/client/util/profiler/SamplingRecorder
-	FIELD field_29598 metric Lnet/minecraft/class_5949;
-	FIELD field_29599 timeGetter Ljava/util/function/DoubleSupplier;
-	FIELD field_29600 buffer Lio/netty/buffer/ByteBuf;
-	FIELD field_29601 active Z
-	FIELD field_29602 startAction Ljava/lang/Runnable;
-	FIELD field_29603 writeAction Lnet/minecraft/class_5965$class_5967;
-	METHOD method_34776 create (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965;
-	METHOD method_34778 create (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/lang/Object;Ljava/util/function/ToDoubleFunction;)Lnet/minecraft/class_5965;
-	METHOD method_34779 create (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/ToDoubleFunction;Ljava/lang/Object;)Lnet/minecraft/class_5965$class_5966;
-		ARG 0 name
-	METHOD method_34780 start ()V
-	METHOD method_34781 sample (I)V
-	METHOD method_34782 stop ()V
-	METHOD method_34786 checkState ()V
-	CLASS class_5966 Builder
-		FIELD field_29605 timeGetter Ljava/util/function/DoubleSupplier;
-		FIELD field_29606 context Ljava/lang/Object;
-		FIELD field_29607 startAction Ljava/lang/Runnable;
-		FIELD field_29608 writeAction Lnet/minecraft/class_5965$class_5967;
-		METHOD method_34787 create ()Lnet/minecraft/class_5965;
-		METHOD method_34788 writeAction (Lnet/minecraft/class_5965$class_5967;)Lnet/minecraft/class_5965$class_5966;
-			ARG 1 writeAction
-		METHOD method_34789 startAction (Ljava/util/function/Consumer;)Lnet/minecraft/class_5965$class_5966;
-			ARG 1 action
-	CLASS class_5967 ValueConsumer
-		METHOD method_34792 accept (D)Z
-			ARG 1 value
-	CLASS class_5968 HighPassValueConsumer
-		FIELD field_29609 threshold F
-		FIELD field_29611 lastValue D
-		METHOD <init> (F)V
-			ARG 1 threshold

mappings/net/minecraft/entity/ai/Durations.mapping

@@ -1,4 +0,0 @@
-CLASS net/minecraft/class_4802 net/minecraft/entity/ai/Durations
-	METHOD method_24505 betweenSeconds (II)Lnet/minecraft/class_6019;
-		ARG 0 min
-		ARG 1 max

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -25,7 +25,7 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_19248 nextTickTimestamp J
 	FIELD field_19249 waitingForNextTick Z
 	FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565;
-	FIELD field_22250 tickTimeTracker Lnet/minecraft/class_5962;
+	FIELD field_22250 recorder Lnet/minecraft/class_5962;
 	FIELD field_23784 session Lnet/minecraft/class_32$class_5143;
 	FIELD field_24370 structureManager Lnet/minecraft/class_3485;
 	FIELD field_24371 saveHandler Lnet/minecraft/class_29;
@@ -40,7 +40,11 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_33211 MAX_WORLD_BORDER_RADIUS I
 	FIELD field_33217 PLAYER_SAMPLE_UPDATE_INTERVAL J
 	FIELD field_33219 START_TICKET_CHUNKS I
-	FIELD field_33979 profilerEnabled Z
+	FIELD field_33975 recorderResultConsumer Ljava/util/function/Consumer;
+	FIELD field_33976 recorderDumpConsumer Ljava/util/function/Consumer;
+	FIELD field_33977 needsRecorderSetup Z
+	FIELD field_33978 debugStart Lnet/minecraft/server/MinecraftServer$class_6414;
+	FIELD field_33979 needsDebugSetup Z
 	FIELD field_4543 onlineMode Z
 	FIELD field_4544 running Z
 	FIELD field_4546 LOGGER Lorg/apache/logging/log4j/Logger;
@@ -99,6 +103,7 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_15876 getMetricsData ()Lnet/minecraft/class_3517;
 	METHOD method_16043 isStopping ()Z
 	METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695;
+	METHOD method_16208 runTasksTillTickEnd ()V
 	METHOD method_17819 setServerId (Ljava/lang/String;)V
 		ARG 1 serverId
 	METHOD method_17976 initScoreboard (Lnet/minecraft/class_26;)V
@@ -111,6 +116,7 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 1 profile
 	METHOD method_19467 setDifficultyLocked (Z)V
 		ARG 1 locked
+	METHOD method_20415 runOneTask ()Z
 	METHOD method_21613 dump (Ljava/nio/file/Path;)V
 		ARG 1 path
 	METHOD method_21615 dumpGamerules (Ljava/nio/file/Path;)V
@@ -125,10 +131,10 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_22827 getDataCommandStorage ()Lnet/minecraft/class_4565;
 	METHOD method_22828 getPredicateManager ()Lnet/minecraft/class_4567;
 	METHOD method_24307 getModdedStatusMessage ()Ljava/util/Optional;
-	METHOD method_24487 startMonitor ()V
+	METHOD method_24487 startTickMetrics ()V
 	METHOD method_24488 isDebugRunning ()Z
 	METHOD method_24489 stopDebug ()Lnet/minecraft/class_3696;
-	METHOD method_24490 endMonitor ()V
+	METHOD method_24490 endTickMetrics ()V
 	METHOD method_27050 getSavePath (Lnet/minecraft/class_5218;)Ljava/nio/file/Path;
 		ARG 1 worldSavePath
 	METHOD method_27051 syncChunkWrites ()Z
@@ -181,6 +187,8 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_34864 getResourceManager ()Lnet/minecraft/class_3300;
 	METHOD method_36113 getProxy ()Ljava/net/Proxy;
 	METHOD method_36326 getResourcePackPrompt ()Lnet/minecraft/class_2561;
+	METHOD method_37113 dumpProperties (Ljava/nio/file/Path;)V
+		ARG 1 file
 	METHOD method_3716 getKeyPair ()Ljava/security/KeyPair;
 	METHOD method_3718 isFlightEnabled ()Z
 	METHOD method_3719 getGameProfileRepo ()Lcom/mojang/authlib/GameProfileRepository;
@@ -205,8 +213,17 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 1 demo
 	METHOD method_3731 setEnforceWhitelist (Z)V
 		ARG 1 whitelistEnabled
+	METHOD method_37319 (Ljava/util/function/Consumer;Lnet/minecraft/class_3696;)V
+		ARG 2 result
 	METHOD method_3732 shouldBroadcastRconToOps ()Z
-	METHOD method_37321 isRunningMonitor ()Z
+	METHOD method_37320 setupRecorder (Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V
+		ARG 1 resultConsumer
+		ARG 2 dumpConsumer
+	METHOD method_37321 isRecorderActive ()Z
+	METHOD method_37322 resetRecorder ()V
+	METHOD method_37323 stopRecorder ()V
+	METHOD method_37324 addSystemDetails (Lnet/minecraft/class_6396;)Lnet/minecraft/class_6396;
+		ARG 1 details
 	METHOD method_3734 getCommandManager ()Lnet/minecraft/class_2170;
 		COMMENT Gets the server's command manager.
 		COMMENT The command manager is responsible for parsing and dispatching commands.
@@ -310,7 +327,7 @@ CLASS net/minecraft/server/MinecraftServer
 		COMMENT This method does several things including loading server properties and loading worlds.
 		COMMENT
 		COMMENT @return true if the Minecraft server was successfully setup, false if the server failed to be setup.
-	METHOD method_3826 getServerStartTime ()J
+	METHOD method_3826 getTimeReference ()J
 	METHOD method_3827 getVersion ()Ljava/lang/String;
 	METHOD method_3828 isOnlineMode ()Z
 		COMMENT Checks whether this Minecraft server should require all connected players are using a licensed Minecraft account when connecting to this server.
@@ -318,7 +335,7 @@ CLASS net/minecraft/server/MinecraftServer
 		ARG 1 world
 	METHOD method_3830 getTickTime ()F
 	METHOD method_3831 getRunDirectory ()Ljava/io/File;
-	METHOD method_3832 enableProfiler ()V
+	METHOD method_3832 startDebug ()V
 	METHOD method_3834 setMotd (Ljava/lang/String;)V
 		ARG 1 motd
 	METHOD method_3835 getPermissionLevel (Lcom/mojang/authlib/GameProfile;)I
@@ -348,7 +365,8 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_3856 forcePlayerSampleUpdate ()V
 	METHOD method_3857 getLootManager ()Lnet/minecraft/class_60;
 	METHOD method_3858 getPlayerNames ()[Ljava/lang/String;
-	METHOD method_3859 populateCrashReport (Lnet/minecraft/class_6396;)Lnet/minecraft/class_6396;
+	METHOD method_3859 addExtraSystemDetails (Lnet/minecraft/class_6396;)Lnet/minecraft/class_6396;
+		ARG 1 details
 	METHOD method_3860 isRemote ()Z
 	METHOD method_3861 loadWorldResourcePack ()V
 	METHOD method_3862 getPlayerIdleTimeout ()I
@@ -358,3 +376,12 @@ CLASS net/minecraft/server/MinecraftServer
 	METHOD method_5387 isMainThread ()Z
 	CLASS 1
 		FIELD field_4609 lastProgressUpdate J
+	CLASS class_6414 DebugStart
+		FIELD field_33980 time J
+		FIELD field_33981 tick I
+		METHOD <init> (JI)V
+			ARG 1 time
+			ARG 3 tick
+		METHOD method_37330 end (JI)Lnet/minecraft/class_3696;
+			ARG 1 endTime
+			ARG 3 endTick

mappings/net/minecraft/server/dedicated/command/PerfCommand.mapping

@@ -13,8 +13,10 @@ CLASS net/minecraft/class_6413 net/minecraft/server/dedicated/command/PerfComman
 		ARG 1 result
 	METHOD method_37335 saveReport (Lnet/minecraft/class_2168;Ljava/nio/file/Path;Lnet/minecraft/server/MinecraftServer;)V
 		ARG 0 source
-		ARG 1 tempProfilingFile
+		ARG 1 tempProfilingDirectory
 		ARG 2 server
+	METHOD method_37336 (Lnet/minecraft/class_2168;Lnet/minecraft/server/MinecraftServer;Ljava/nio/file/Path;)V
+		ARG 2 dumpDirectory
 	METHOD method_37337 (Lcom/mojang/brigadier/context/CommandContext;)I
 		ARG 0 context
 	METHOD method_37338 executeStop (Lnet/minecraft/class_2168;)I

mappings/net/minecraft/util/CsvWriter.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_4456 net/minecraft/util/profiler/CsvWriter
+CLASS net/minecraft/class_4456 net/minecraft/util/CsvWriter
 	FIELD field_20284 writer Ljava/io/Writer;
 	FIELD field_20285 column I
 	FIELD field_29836 CRLF Ljava/lang/String;

mappings/net/minecraft/util/TimeHelper.mapping

@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_4802 net/minecraft/util/TimeHelper
+	FIELD field_33868 SECOND_IN_MILLIS J
+	FIELD field_33869 MILLI_IN_NANOS J
+	METHOD method_24505 betweenSeconds (II)Lnet/minecraft/class_6019;
+		ARG 0 min
+		ARG 1 max

mappings/net/minecraft/util/ZipCompressor.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_6397 net/minecraft/util/profiler/ZipCompressor
+CLASS net/minecraft/class_6397 net/minecraft/util/ZipCompressor
 	COMMENT A ZIP compressor builds up a ZIP file. It completes the ZIP file when it is
 	COMMENT {@linkplain #close() closed}. All its methods and constructors throw
 	COMMENT {@link java.io.UncheckedIOException} when an I/O error occurs.

mappings/net/minecraft/util/profiler/DebugRecorder.mapping

@@ -0,0 +1,37 @@
+CLASS net/minecraft/class_5961 net/minecraft/util/profiler/DebugRecorder
+	FIELD field_29579 globalDumpConsumer Ljava/util/function/Consumer;
+	FIELD field_29581 timeTracker Lnet/minecraft/class_4757;
+	FIELD field_29582 dumpExecutor Ljava/util/concurrent/Executor;
+	FIELD field_29583 dumper Lnet/minecraft/class_5971;
+	FIELD field_29584 resultConsumer Ljava/util/function/Consumer;
+	FIELD field_29585 dumpConsumer Ljava/util/function/Consumer;
+	FIELD field_29586 timeGetter Ljava/util/function/LongSupplier;
+	FIELD field_29588 endTime J
+	FIELD field_29589 ticks I
+	FIELD field_29590 profiler Lnet/minecraft/class_3693;
+	FIELD field_29591 stopping Z
+	FIELD field_32676 MAX_DURATION_IN_SECONDS I
+	FIELD field_33891 deviations Ljava/util/Map;
+	FIELD field_33892 samplerSource Lnet/minecraft/class_6400;
+	FIELD field_33893 samplers Ljava/util/Set;
+	METHOD <init> (Lnet/minecraft/class_6400;Ljava/util/function/LongSupplier;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5971;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V
+		ARG 1 samplerSource
+		ARG 2 timeGetter
+		ARG 3 dumpExecutor
+		ARG 4 dumper
+		ARG 5 resultConsumer
+		ARG 6 dumpConsumer
+	METHOD method_34762 checkState ()V
+	METHOD method_34763 dump (Lnet/minecraft/class_3696;)V
+		ARG 1 result
+	METHOD method_35762 setGlobalDumpConsumer (Ljava/util/function/Consumer;)V
+		ARG 0 consumer
+	METHOD method_37190 (Lnet/minecraft/class_5965;)Ljava/util/List;
+		ARG 0 s
+	METHOD method_37191 of (Lnet/minecraft/class_6400;Ljava/util/function/LongSupplier;Ljava/util/concurrent/Executor;Lnet/minecraft/class_5971;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)Lnet/minecraft/class_5961;
+		ARG 0 source
+		ARG 1 timeGetter
+		ARG 2 dumpExecutor
+		ARG 3 dumper
+		ARG 4 resultConsumer
+		ARG 5 dumpConsumer

mappings/net/minecraft/util/profiler/Deviation.mapping

@@ -1,7 +1,8 @@
-CLASS net/minecraft/class_5964 net/minecraft/client/util/profiler/Sample
+CLASS net/minecraft/class_5964 net/minecraft/util/profiler/Deviation
-	FIELD field_29595 samplingTimer Ljava/time/Instant;
+	FIELD field_29595 instant Ljava/time/Instant;
 	FIELD field_29596 ticks I
 	FIELD field_29597 result Lnet/minecraft/class_3696;
 	METHOD <init> (Ljava/time/Instant;ILnet/minecraft/class_3696;)V
+		ARG 1 instant
 		ARG 2 ticks
 		ARG 3 result

mappings/net/minecraft/util/profiler/DummyRecorder.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_5963 net/minecraft/util/profiler/DummyRecorder
+	FIELD field_29594 INSTANCE Lnet/minecraft/class_5962;

mappings/net/minecraft/util/profiler/MetricSamplerSupplier.mapping

@@ -1,2 +0,0 @@
-CLASS net/minecraft/class_5952 net/minecraft/util/profiler/MetricSamplerSupplier
-	METHOD method_34705 getSamplers ()Ljava/util/List;

mappings/net/minecraft/util/profiler/MetricSuppliers.mapping

@@ -1,5 +0,0 @@
-CLASS net/minecraft/class_5950 net/minecraft/util/profiler/MetricSuppliers
-	FIELD field_29555 INSTANCE Lnet/minecraft/class_5950;
-	FIELD field_29556 samplers Ljava/util/WeakHashMap;
-	METHOD method_34702 add (Lnet/minecraft/class_5952;)V
-		ARG 1 supplier

mappings/net/minecraft/util/profiler/ProfileLocationInfo.mapping

@@ -7,3 +7,4 @@ CLASS net/minecraft/class_4748 net/minecraft/util/profiler/ProfileLocationInfo
 	METHOD method_24274 getCounts ()Lit/unimi/dsi/fastutil/objects/Object2LongMap;
 		COMMENT Returns a marker to count map indicating the times each marker has been
 		COMMENT visited in the profiler location.
+	METHOD method_37169 getMaxTime ()J

mappings/net/minecraft/util/profiler/ProfileResultImpl.mapping

@@ -23,6 +23,8 @@ CLASS net/minecraft/class_3692 net/minecraft/util/profiler/ProfileResultImpl
 	METHOD method_16063 asString (JI)Ljava/lang/String;
 		ARG 1 timeSpan
 		ARG 3 tickSpan
+	METHOD method_24252 (IILjava/lang/StringBuilder;Ljava/util/Map$Entry;)V
+		ARG 4 entry
 	METHOD method_24253 appendCounter (ILjava/lang/String;Lnet/minecraft/class_3692$class_4747;ILjava/lang/StringBuilder;)V
 		ARG 1 depth
 		ARG 2 name
@@ -35,17 +37,33 @@ CLASS net/minecraft/class_3692 net/minecraft/util/profiler/ProfileResultImpl
 	METHOD method_24256 indent (Ljava/lang/StringBuilder;I)Ljava/lang/StringBuilder;
 		ARG 0 sb
 		ARG 1 size
+	METHOD method_24257 (Ljava/lang/StringBuilder;ILjava/lang/String;Lnet/minecraft/class_3692$class_4747;)V
+		ARG 3 name
+		ARG 4 info
+	METHOD method_24258 (Ljava/lang/StringBuilder;ILjava/lang/String;Ljava/lang/Long;)V
+		ARG 3 marker
+		ARG 4 count
+	METHOD method_24259 (Ljava/util/Map;Ljava/lang/String;Lnet/minecraft/class_4748;)V
+		ARG 1 location
+		ARG 2 info
 	METHOD method_24260 appendCounterDump (Ljava/util/Map;Ljava/lang/StringBuilder;I)V
 		ARG 1 counters
 		ARG 2 sb
 		ARG 3 tickSpan
+	METHOD method_24261 (Ljava/util/Map;Ljava/util/List;Ljava/lang/String;Ljava/lang/Long;)V
+		ARG 2 marker
+		ARG 3 count
 	METHOD method_24262 getInfo (Ljava/lang/String;)Lnet/minecraft/class_4748;
 		ARG 1 path
+	METHOD method_24263 (Ljava/lang/String;)Lnet/minecraft/class_3692$class_4747;
+		ARG 0 k
 	METHOD method_24264 setupCounters ()Ljava/util/Map;
 	CLASS class_4747 CounterInfo
 		FIELD field_21827 selfTime J
 		FIELD field_21828 totalTime J
 		FIELD field_21829 subCounters Ljava/util/Map;
+		METHOD method_24266 (Ljava/lang/String;)Lnet/minecraft/class_3692$class_4747;
+			ARG 0 k
 		METHOD method_24267 add (Ljava/util/Iterator;J)V
 			ARG 1 pathIterator
 			ARG 2 time

mappings/net/minecraft/util/profiler/Profiler.mapping

@@ -31,3 +31,5 @@ CLASS net/minecraft/class_3695 net/minecraft/util/profiler/Profiler
 	METHOD method_24338 union (Lnet/minecraft/class_3695;Lnet/minecraft/class_3695;)Lnet/minecraft/class_3695;
 		ARG 0 a
 		ARG 1 b
+	METHOD method_37167 markSampleType (Lnet/minecraft/class_5949;)V
+		ARG 1 type

mappings/net/minecraft/util/profiler/ProfilerSystem.mapping

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem
 	FIELD field_15730 timeList Lit/unimi/dsi/fastutil/longs/LongList;
 	FIELD field_15732 startTime J
 	FIELD field_15733 tickStarted Z
-	FIELD field_15734 location Ljava/lang/String;
+	FIELD field_15734 fullPath Ljava/lang/String;
 	FIELD field_15735 LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD field_15736 path Ljava/util/List;
 	FIELD field_16266 endTickGetter Ljava/util/function/IntSupplier;
@@ -12,12 +12,17 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem
 	FIELD field_21818 locationInfos Ljava/util/Map;
 	FIELD field_21819 currentInfo Lnet/minecraft/class_3533$class_4746;
 	FIELD field_21961 timeGetter Ljava/util/function/LongSupplier;
+	FIELD field_33873 sampleTypes Ljava/util/Set;
 	METHOD <init> (Ljava/util/function/LongSupplier;Ljava/util/function/IntSupplier;Z)V
 		ARG 1 timeGetter
 		ARG 2 tickGetter
 		ARG 3 checkTimeout
+	METHOD method_24245 (Ljava/lang/String;)Lnet/minecraft/class_3533$class_4746;
+		ARG 0 k
 	METHOD method_24246 getCurrentInfo ()Lnet/minecraft/class_3533$class_4746;
 	CLASS class_4746 LocatedInfo
-		FIELD field_21820 time J
+		FIELD field_21820 totalTime J
 		FIELD field_21821 visits J
 		FIELD field_21822 counts Lit/unimi/dsi/fastutil/objects/Object2LongOpenHashMap;
+		FIELD field_33874 maxTime J
+		FIELD field_33875 minTime J

mappings/net/minecraft/util/profiler/ReadableProfiler.mapping

@@ -2,3 +2,5 @@ CLASS net/minecraft/class_3693 net/minecraft/util/profiler/ReadableProfiler
 	METHOD method_16064 getResult ()Lnet/minecraft/class_3696;
 	METHOD method_34696 getInfo (Ljava/lang/String;)Lnet/minecraft/class_3533$class_4746;
 		ARG 1 name
+	METHOD method_37168 getSampleTargets ()Ljava/util/Set;
+		COMMENT {@return a set of pairs of profiler location and sample kind}

mappings/net/minecraft/util/profiler/RecordDumper.mapping

@@ -0,0 +1,36 @@
+CLASS net/minecraft/class_5971 net/minecraft/util/profiler/RecordDumper
+	FIELD field_29616 DEBUG_PROFILING_DIRECTORY Ljava/nio/file/Path;
+	FIELD field_29618 LOGGER Lorg/apache/logging/log4j/Logger;
+	FIELD field_32677 METRICS_DIRECTORY Ljava/lang/String;
+	FIELD field_32678 DEVIATIONS_DIRECTORY Ljava/lang/String;
+	FIELD field_32679 FILE_NAME Ljava/lang/String;
+	FIELD field_33903 type Ljava/lang/String;
+	METHOD <init> (Ljava/lang/String;)V
+		ARG 1 type
+	METHOD method_34802 save (Lnet/minecraft/class_3696;Ljava/nio/file/Path;)V
+		ARG 1 result
+		ARG 2 directory
+	METHOD method_34803 writeSamplers (Ljava/util/Set;Ljava/nio/file/Path;)V
+		ARG 1 samplers
+		ARG 2 directory
+	METHOD method_34807 createDump (Ljava/util/Set;Ljava/util/Map;Lnet/minecraft/class_3696;)Ljava/nio/file/Path;
+		ARG 1 samplers
+		ARG 2 deviations
+		ARG 3 result
+	METHOD method_37207 (ILnet/minecraft/class_5965$class_6398;)Ljava/lang/String;
+		ARG 1 data
+	METHOD method_37208 writeSamplersInType (Lnet/minecraft/class_5949;Ljava/util/List;Ljava/nio/file/Path;)V
+		ARG 1 type
+		ARG 2 samplers
+		ARG 3 directory
+	METHOD method_37209 (Ljava/nio/file/Path;Lnet/minecraft/class_5949;Ljava/util/List;)V
+		ARG 2 type
+		ARG 3 sampler
+	METHOD method_37210 (Ljava/time/format/DateTimeFormatter;Ljava/nio/file/Path;Lnet/minecraft/class_5965;Lnet/minecraft/class_5964;)V
+		ARG 3 deviation
+	METHOD method_37211 (Ljava/time/format/DateTimeFormatter;Ljava/nio/file/Path;Lnet/minecraft/class_5965;Ljava/util/List;)V
+		ARG 2 sampler
+		ARG 3 sampleDeviations
+	METHOD method_37212 writeDeviations (Ljava/util/Map;Ljava/nio/file/Path;)V
+		ARG 1 deviations
+		ARG 2 deviationsDirectory

mappings/net/minecraft/util/profiler/Recorder.mapping

@@ -0,0 +1,6 @@
+CLASS net/minecraft/class_5962 net/minecraft/util/profiler/Recorder
+	METHOD method_34770 stop ()V
+	METHOD method_34771 startTick ()V
+	METHOD method_34772 endTick ()V
+	METHOD method_34773 isActive ()Z
+	METHOD method_34774 getProfiler ()Lnet/minecraft/class_3695;

mappings/net/minecraft/util/profiler/SampleType.mapping

@@ -1,4 +1,4 @@
-CLASS net/minecraft/class_5949 net/minecraft/client/util/profiler/SamplingChannel
+CLASS net/minecraft/class_5949 net/minecraft/util/profiler/SampleType
 	FIELD field_29553 name Ljava/lang/String;
 	METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 		ARG 3 name

mappings/net/minecraft/util/profiler/Sampler.mapping

@@ -0,0 +1,79 @@
+CLASS net/minecraft/class_5965 net/minecraft/util/profiler/Sampler
+	FIELD field_29598 type Lnet/minecraft/class_5949;
+	FIELD field_29599 retriever Ljava/util/function/DoubleSupplier;
+	FIELD field_29600 valueBuffer Lio/netty/buffer/ByteBuf;
+	FIELD field_29601 active Z
+	FIELD field_29602 startAction Ljava/lang/Runnable;
+	FIELD field_29603 deviationChecker Lnet/minecraft/class_5965$class_5967;
+	FIELD field_33882 name Ljava/lang/String;
+	FIELD field_33883 ticksBuffer Lio/netty/buffer/ByteBuf;
+	FIELD field_33884 currentSample D
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;Ljava/lang/Runnable;Lnet/minecraft/class_5965$class_5967;)V
+		ARG 1 name
+		ARG 2 type
+		ARG 3 retriever
+		ARG 4 startAction
+		ARG 5 deviationChecker
+	METHOD equals (Ljava/lang/Object;)Z
+		ARG 1 o
+	METHOD method_34776 create (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/DoubleSupplier;)Lnet/minecraft/class_5965;
+		ARG 0 name
+		ARG 1 type
+		ARG 2 retriever
+	METHOD method_34778 create (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/lang/Object;Ljava/util/function/ToDoubleFunction;)Lnet/minecraft/class_5965;
+		ARG 0 name
+		ARG 1 type
+		ARG 2 context
+		ARG 3 retriever
+	METHOD method_34779 builder (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/ToDoubleFunction;Ljava/lang/Object;)Lnet/minecraft/class_5965$class_5966;
+		ARG 0 name
+		ARG 1 type
+		ARG 2 retriever
+		ARG 3 context
+	METHOD method_34780 start ()V
+	METHOD method_34781 sample (I)V
+		ARG 1 tick
+	METHOD method_34782 stop ()V
+	METHOD method_34786 ensureActive ()V
+	METHOD method_37170 getRetriever ()Ljava/util/function/DoubleSupplier;
+	METHOD method_37171 getName ()Ljava/lang/String;
+	METHOD method_37172 getType ()Lnet/minecraft/class_5949;
+	METHOD method_37173 collectData ()Lnet/minecraft/class_5965$class_6398;
+	METHOD method_37174 hasDeviated ()Z
+	CLASS class_5966 Builder
+		FIELD field_29605 timeGetter Ljava/util/function/DoubleSupplier;
+		FIELD field_29606 context Ljava/lang/Object;
+		FIELD field_29607 startAction Ljava/lang/Runnable;
+		FIELD field_29608 deviationChecker Lnet/minecraft/class_5965$class_5967;
+		FIELD field_33885 name Ljava/lang/String;
+		FIELD field_33886 type Lnet/minecraft/class_5949;
+		METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_5949;Ljava/util/function/ToDoubleFunction;Ljava/lang/Object;)V
+			ARG 1 name
+			ARG 2 type
+			ARG 3 timeFunction
+			ARG 4 context
+		METHOD method_34787 build ()Lnet/minecraft/class_5965;
+		METHOD method_34788 deviationChecker (Lnet/minecraft/class_5965$class_5967;)Lnet/minecraft/class_5965$class_5966;
+			ARG 1 deviationChecker
+		METHOD method_34789 startAction (Ljava/util/function/Consumer;)Lnet/minecraft/class_5965$class_5966;
+			ARG 1 action
+	CLASS class_5967 DeviationChecker
+		METHOD method_34792 check (D)Z
+			ARG 1 value
+	CLASS class_5968 RatioDeviationChecker
+		FIELD field_29609 threshold F
+		FIELD field_29611 lastValue D
+		METHOD <init> (F)V
+			ARG 1 threshold
+	CLASS class_6398 Data
+		FIELD field_33887 values Lit/unimi/dsi/fastutil/ints/Int2DoubleMap;
+		FIELD field_33888 startTick I
+		FIELD field_33889 endTick I
+		METHOD <init> (IILit/unimi/dsi/fastutil/ints/Int2DoubleMap;)V
+			ARG 1 startTick
+			ARG 2 endTick
+			ARG 3 values
+		METHOD method_37175 getStartTick ()I
+		METHOD method_37176 getValue (I)D
+			ARG 1 tick
+		METHOD method_37177 getEndTick ()I

mappings/net/minecraft/util/profiler/SamplerFactory.mapping

@@ -0,0 +1,12 @@
+CLASS net/minecraft/class_6401 net/minecraft/util/profiler/SamplerFactory
+	FIELD field_33894 sampledFullPaths Ljava/util/Set;
+	METHOD method_37194 createSamplers (Ljava/util/function/Supplier;)Ljava/util/Set;
+		ARG 1 profilerSupplier
+	METHOD method_37196 createSampler (Ljava/util/function/Supplier;Ljava/lang/String;Lnet/minecraft/class_5949;)Lnet/minecraft/class_5965;
+		ARG 0 profilerSupplier
+		ARG 1 id
+		ARG 2 type
+	METHOD method_37197 (Ljava/util/function/Supplier;Lorg/apache/commons/lang3/tuple/Pair;)Lnet/minecraft/class_5965;
+		ARG 1 target
+	METHOD method_37198 (Lorg/apache/commons/lang3/tuple/Pair;)Z
+		ARG 1 target

mappings/net/minecraft/util/profiler/SamplerSource.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_6400 net/minecraft/util/profiler/SamplerSource
+	METHOD method_37189 getSamplers (Ljava/util/function/Supplier;)Ljava/util/Set;
+		ARG 1 profilerSupplier

mappings/net/minecraft/util/profiler/ServerSamplerSource.mapping

@@ -0,0 +1,23 @@
+CLASS net/minecraft/class_6402 net/minecraft/util/profiler/ServerSamplerSource
+	FIELD field_33895 samplers Ljava/util/Set;
+	FIELD field_33896 factory Lnet/minecraft/class_6401;
+	FIELD field_33988 LOGGER Lorg/apache/logging/log4j/Logger;
+	METHOD <init> (Ljava/util/function/LongSupplier;Z)V
+		ARG 1 nanoTimeSupplier
+		ARG 2 includeSystem
+	METHOD method_37199 createSystemSamplers ()Ljava/util/Set;
+	METHOD method_37200 (Lnet/minecraft/class_6402$class_6403;I)Lnet/minecraft/class_5965;
+		ARG 1 index
+	METHOD method_37201 (Lcom/google/common/base/Stopwatch;)D
+		ARG 0 watch
+	METHOD method_37202 createTickTimeTracker (Ljava/util/function/LongSupplier;)Lnet/minecraft/class_5965;
+		ARG 0 nanoTimeSupplier
+	CLASS class_6403 CpuUsageFetcher
+		FIELD field_33897 logicalProcessorCount I
+		FIELD field_33898 systemInfo Loshi/SystemInfo;
+		FIELD field_33899 processor Loshi/hardware/CentralProcessor;
+		FIELD field_33900 loadTicks [[J
+		FIELD field_33901 loadBetweenTicks [D
+		FIELD field_33902 lastCheckTime J
+		METHOD method_37205 getCpuUsage (I)D
+			ARG 1 index

mappings/net/minecraft/util/thread/ExecutorSampling.mapping

@@ -0,0 +1,27 @@
+CLASS net/minecraft/class_5950 net/minecraft/util/thread/ExecutorSampling
+	FIELD field_29555 INSTANCE Lnet/minecraft/class_5950;
+	FIELD field_29556 activeExecutors Ljava/util/WeakHashMap;
+	METHOD method_34702 add (Lnet/minecraft/class_5952;)V
+		ARG 1 executor
+	METHOD method_37178 createSamplers ()Ljava/util/List;
+	METHOD method_37179 (Ljava/util/Map$Entry;)Lnet/minecraft/class_5965;
+		ARG 0 entry
+	METHOD method_37180 mergeSimilarSamplers (Ljava/util/Map;)Ljava/util/List;
+		ARG 0 samplers
+	METHOD method_37181 (Lnet/minecraft/class_5952;)Ljava/util/stream/Stream;
+		ARG 0 executor
+	CLASS class_6399 MergedSampler
+		FIELD field_33890 delegates Ljava/util/List;
+		METHOD <init> (Ljava/lang/String;Ljava/util/List;)V
+			ARG 1 id
+			ARG 2 delegates
+		METHOD method_37182 (DLnet/minecraft/class_5965;)Z
+			ARG 2 sampler
+		METHOD method_37183 combineDeviationCheckers (Ljava/util/List;)Lnet/minecraft/class_5965$class_5967;
+			ARG 0 delegates
+		METHOD method_37184 (Ljava/util/List;D)Z
+			ARG 1 value
+		METHOD method_37185 start (Ljava/util/List;)V
+			ARG 0 samplers
+		METHOD method_37186 averageRetrievers (Ljava/util/List;)D
+			ARG 0 samplers

mappings/net/minecraft/util/thread/SampleableExecutor.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_5952 net/minecraft/util/thread/SampleableExecutor
+	METHOD method_34705 createSamplers ()Ljava/util/List;