From 58d9a5ea34f8244aa8115e8eee0e6423ef049521 Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Fri, 27 Oct 2023 09:52:24 +0900 Subject: [PATCH] Finish the tick stuff --- .../minecraft/server/MinecraftServer.mapping | 9 ++++++++ .../server/command/TickCommand.mapping | 21 ++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index e517d4e7a1..f9f45ef1ee 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -75,8 +75,15 @@ CLASS net/minecraft/server/MinecraftServer FIELD field_4604 pvpEnabled Z FIELD field_47135 ticksUntilAutosave I FIELD field_47136 tickTimes [J + FIELD field_47137 recentTickTimesNanos J + FIELD field_47138 lastOverloadWarningNanos J + FIELD field_47139 tickStartTimeNanos J + FIELD field_47140 tickEndTimeNanos J FIELD field_47141 averageTickTime F FIELD field_47142 tickManager Lnet/minecraft/class_8915; + FIELD field_47143 OVERLOAD_THRESHOLD_NANOS J + FIELD field_47145 OVERLOAD_WARNING_INTERVAL_NANOS J + FIELD field_47148 PREPARE_START_REGION_TICK_DELAY_NANOS J METHOD (Ljava/lang/Thread;Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/net/Proxy;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_7497;Lnet/minecraft/class_3950;)V ARG 1 serverThread ARG 2 session @@ -85,6 +92,7 @@ CLASS net/minecraft/server/MinecraftServer ARG 5 proxy ARG 6 dataFixer ARG 7 apiServices + ARG 8 worldGenerationProgressListenerFactory METHOD method_16043 isStopping ()Z METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16208 runTasksTillTickEnd ()V @@ -440,6 +448,7 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_54831 updateAutosaveTicks ()V METHOD method_54832 getAverageTickTime ()F METHOD method_54833 getTickManager ()Lnet/minecraft/class_8915; + METHOD method_54834 getAverageNanosPerTick ()J METHOD method_54835 getTickTimes ()[J METHOD method_54837 getAutosaveInterval ()I CLASS class_6414 DebugStart diff --git a/mappings/net/minecraft/server/command/TickCommand.mapping b/mappings/net/minecraft/server/command/TickCommand.mapping index 0835493238..d68e288ef4 100644 --- a/mappings/net/minecraft/server/command/TickCommand.mapping +++ b/mappings/net/minecraft/server/command/TickCommand.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8916 net/minecraft/server/command/TickCommand FIELD field_46925 MAX_TICK_RATE F FIELD field_46926 DEFAULT_TICK_RATE_STRING Ljava/lang/String; + METHOD method_54686 format (J)Ljava/lang/String; + ARG 0 nanos METHOD method_54687 register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD method_54688 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -8,24 +10,25 @@ CLASS net/minecraft/class_8916 net/minecraft/server/command/TickCommand METHOD method_54689 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 suggestionsBuilder - METHOD method_54690 query (Lnet/minecraft/class_2168;)I + METHOD method_54690 executeQuery (Lnet/minecraft/class_2168;)I ARG 0 source - METHOD method_54691 (Lnet/minecraft/class_2168;F)I + METHOD method_54691 executeRate (Lnet/minecraft/class_2168;F)I ARG 0 source ARG 1 rate - METHOD method_54692 (Lnet/minecraft/class_2168;I)I + METHOD method_54692 executeSprint (Lnet/minecraft/class_2168;I)I ARG 0 source ARG 1 ticks - METHOD method_54693 (Lnet/minecraft/class_2168;Z)I + METHOD method_54693 executeFreeze (Lnet/minecraft/class_2168;Z)I ARG 0 source + ARG 1 frozen METHOD method_54699 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_54700 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 suggestionsBuilder - METHOD method_54701 (Lnet/minecraft/class_2168;)I + METHOD method_54701 executeStopStep (Lnet/minecraft/class_2168;)I ARG 0 source - METHOD method_54702 step (Lnet/minecraft/class_2168;I)I + METHOD method_54702 executeStep (Lnet/minecraft/class_2168;I)I ARG 0 source ARG 1 steps METHOD method_54704 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -33,10 +36,14 @@ CLASS net/minecraft/class_8916 net/minecraft/server/command/TickCommand METHOD method_54705 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 suggestionsBuilder - METHOD method_54706 stopSprint (Lnet/minecraft/class_2168;)I + METHOD method_54706 executeStopSprint (Lnet/minecraft/class_2168;)I ARG 0 source + METHOD method_54708 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_54709 (Lnet/minecraft/class_2168;)Z ARG 0 source + METHOD method_54711 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context METHOD method_54713 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_54715 (Lcom/mojang/brigadier/context/CommandContext;)I