From 50f42d6f2e113ce0d65c8237f09f0f7ce5c46897 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 5 Feb 2020 12:50:55 -0600 Subject: [PATCH] 20w06a profiler mappings (#1085) Signed-off-by: liach --- .../net/minecraft/client/MinecraftClient.mapping | 10 ++++++++++ .../net/minecraft/server/MinecraftServer.mapping | 7 +++++++ .../net/minecraft/util/TickDurationMonitor.mapping | 14 ++++++++++++++ .../net/minecraft/util/TickTimeTracker.mapping | 12 ++++++++++++ .../net/minecraft/util/profiler/Profiler.mapping | 1 + .../minecraft/util/profiler/ProfilerSystem.mapping | 5 +++++ 6 files changed, 49 insertions(+) create mode 100644 mappings/net/minecraft/util/TickDurationMonitor.mapping create mode 100644 mappings/net/minecraft/util/TickTimeTracker.mapping diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 3746f80166..71d4d2bf71 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -93,6 +93,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_20907 debugChunkInfo Z FIELD field_20908 debugChunkOcculsion Z FIELD field_20909 bufferBuilders Lnet/minecraft/class_4599; + FIELD field_22224 trackingTick I + FIELD field_22225 tickTimeTracker Lnet/minecraft/class_4757; + FIELD field_22226 tickProfilerResult Lnet/minecraft/class_3696; METHOD (Lnet/minecraft/class_542;)V ARG 1 args METHOD method_1476 checkIs64Bit ()Z @@ -225,3 +228,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_24287 getWindowTitle ()Ljava/lang/String; METHOD method_24288 updateWindowTitle ()V METHOD method_24289 isModded ()Z + METHOD method_24458 startMonitor (ZLnet/minecraft/class_4758;)V + ARG 1 active + ARG 2 monitor + METHOD method_24459 shouldMonitorTickDuration ()Z + METHOD method_24460 endMonitor (ZLnet/minecraft/class_4758;)V + ARG 1 active + ARG 2 monitor diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 8429c9cbc3..bcd9f9fc2e 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_20279 COMPLETED_UNIT_FUTURE Ljava/util/concurrent/CompletableFuture; FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565; FIELD field_20851 predicateManager Lnet/minecraft/class_4567; + FIELD field_22250 tickTimeTracker Lnet/minecraft/class_4757; FIELD field_4543 onlineMode Z FIELD field_4544 running Z FIELD field_4545 forceGameMode Z @@ -106,6 +107,12 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_21714 getFunctionPermissionLevel ()I METHOD method_22827 getDataCommandStorage ()Lnet/minecraft/class_4565; METHOD method_22828 getPredicateManager ()Lnet/minecraft/class_4567; + METHOD method_24487 startMonitor (Lnet/minecraft/class_4758;)V + ARG 1 monitor + METHOD method_24488 isDebugRunning ()Z + METHOD method_24489 stopDebug ()Lnet/minecraft/class_3696; + METHOD method_24490 endMonitor (Lnet/minecraft/class_4758;)V + ARG 1 monitor METHOD method_3716 getKeyPair ()Ljava/security/KeyPair; METHOD method_3717 start ()V METHOD method_3718 isFlightEnabled ()Z diff --git a/mappings/net/minecraft/util/TickDurationMonitor.mapping b/mappings/net/minecraft/util/TickDurationMonitor.mapping new file mode 100644 index 0000000000..3c776a98a2 --- /dev/null +++ b/mappings/net/minecraft/util/TickDurationMonitor.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_4758 net/minecraft/util/TickDurationMonitor + FIELD field_21967 LOGGER Lorg/apache/logging/log4j/Logger; + FIELD field_21968 timeGetter Ljava/util/function/LongSupplier; + FIELD field_21969 overtime J + FIELD field_21970 tickCount I + FIELD field_21971 tickResultsDirectory Ljava/io/File; + FIELD field_21972 profiler Lnet/minecraft/class_3693; + METHOD method_24339 nextProfiler ()Lnet/minecraft/class_3695; + METHOD method_24340 tickProfiler (Lnet/minecraft/class_3695;Lnet/minecraft/class_4758;)Lnet/minecraft/class_3695; + ARG 0 profiler + ARG 1 monitor + METHOD method_24341 create (Ljava/lang/String;)Lnet/minecraft/class_4758; + ARG 0 name + METHOD method_24342 endTick ()V diff --git a/mappings/net/minecraft/util/TickTimeTracker.mapping b/mappings/net/minecraft/util/TickTimeTracker.mapping new file mode 100644 index 0000000000..86444cc06a --- /dev/null +++ b/mappings/net/minecraft/util/TickTimeTracker.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_4757 net/minecraft/util/TickTimeTracker + FIELD field_21962 timeGetter Ljava/util/function/LongSupplier; + FIELD field_21963 tickGetter Ljava/util/function/IntSupplier; + FIELD field_21964 profiler Lnet/minecraft/class_3693; + METHOD (Ljava/util/function/LongSupplier;Ljava/util/function/IntSupplier;)V + ARG 1 timeGetter + ARG 2 tickGetter + METHOD method_24333 isActive ()Z + METHOD method_24334 disable ()V + METHOD method_24335 enable ()V + METHOD method_24336 getProfiler ()Lnet/minecraft/class_3695; + METHOD method_24337 getResult ()Lnet/minecraft/class_3696; diff --git a/mappings/net/minecraft/util/profiler/Profiler.mapping b/mappings/net/minecraft/util/profiler/Profiler.mapping index 72a24b58ef..a26f933cb2 100644 --- a/mappings/net/minecraft/util/profiler/Profiler.mapping +++ b/mappings/net/minecraft/util/profiler/Profiler.mapping @@ -27,3 +27,4 @@ CLASS net/minecraft/class_3695 net/minecraft/util/profiler/Profiler COMMENT supplier won't be called if the profiler is disabled. ARG 1 markerGetter COMMENT the getter for a unique marker + METHOD method_24338 union (Lnet/minecraft/class_3695;Lnet/minecraft/class_3695;)Lnet/minecraft/class_3695; diff --git a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping index ef7d997f72..aec7356843 100644 --- a/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping +++ b/mappings/net/minecraft/util/profiler/ProfilerSystem.mapping @@ -11,6 +11,11 @@ CLASS net/minecraft/class_3533 net/minecraft/util/profiler/ProfilerSystem FIELD field_20345 checkTimeout Z 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; + METHOD (Ljava/util/function/LongSupplier;Ljava/util/function/IntSupplier;Z)V + ARG 1 timeGetter + ARG 2 tickGetter + ARG 3 checkTimeout METHOD method_24246 getCurrentInfo ()Lnet/minecraft/class_3533$class_4746; CLASS class_4746 LocatedInfo FIELD field_21820 time J