Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

23w43a tick stuff #3707

Merged
merged 3 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/MinecraftClient.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
METHOD method_54579 printCrashReport ()V
METHOD method_54580 printCrashReport (Lnet/minecraft/class_128;)V
ARG 1 crashReport
METHOD method_54785 getTargetMillisPerTick (F)F
ARG 1 millis
CLASS class_5859 ChatRestriction
COMMENT Represents the restrictions on chat on a Minecraft client.
COMMENT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ CLASS net/minecraft/class_317 net/minecraft/client/render/RenderTickCounter
FIELD field_1969 lastFrameDuration F
FIELD field_1970 tickDelta F
FIELD field_1971 prevTimeMillis J
FIELD field_47102 targetMillisPerTick Lit/unimi/dsi/fastutil/floats/FloatUnaryOperator;
METHOD <init> (FJLit/unimi/dsi/fastutil/floats/FloatUnaryOperator;)V
ARG 1 tps
ARG 2 timeMillis
ARG 4 targetMillisPerTick
METHOD method_1658 beginRenderTick (J)I
ARG 1 timeMillis
2 changes: 2 additions & 0 deletions mappings/net/minecraft/client/world/ClientWorld.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
FIELD field_3733 scoreboard Lnet/minecraft/class_269;
FIELD field_37951 pendingUpdateManager Lnet/minecraft/class_7202;
FIELD field_37952 LOGGER Lorg/slf4j/Logger;
FIELD field_47129 tickManager Lnet/minecraft/class_8921;
METHOD <init> (Lnet/minecraft/class_634;Lnet/minecraft/class_638$class_5271;Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;IILjava/util/function/Supplier;Lnet/minecraft/class_761;ZJ)V
ARG 1 networkHandler
ARG 2 properties
ARG 3 registryRef
ARG 4 dimensionTypeEntry
ARG 5 loadDistance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,7 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi
ARG 1 packet
METHOD method_52800 onStartChunkSend (Lnet/minecraft/class_8739;)V
ARG 1 packet
METHOD method_54806 onUpdateTickRate (Lnet/minecraft/class_8913;)V
ARG 1 packet
METHOD method_54807 onTickStep (Lnet/minecraft/class_8914;)V
ARG 1 packet
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/class_8914 net/minecraft/network/packet/s2c/play/TickStepS2CPacket
METHOD <init> (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD method_54666 create (Lnet/minecraft/class_8921;)Lnet/minecraft/class_8914;
ARG 0 tickManager
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS net/minecraft/class_8913 net/minecraft/network/packet/s2c/play/UpdateTickRateS2CPacket
METHOD <init> (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD method_54664 create (Lnet/minecraft/class_8921;)Lnet/minecraft/class_8913;
ARG 0 tickManager
22 changes: 22 additions & 0 deletions mappings/net/minecraft/server/MinecraftServer.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ CLASS net/minecraft/server/MinecraftServer
FIELD field_4599 proxy Ljava/net/Proxy;
FIELD field_4602 random Lnet/minecraft/class_5819;
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 <init> (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
Expand All @@ -81,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
Expand Down Expand Up @@ -244,6 +256,7 @@ CLASS net/minecraft/server/MinecraftServer
ARG 1 waitForShutdown
COMMENT whether to wait for server shutdown, if called outside the server thread
METHOD method_3748 tick (Ljava/util/function/BooleanSupplier;)V
ARG 1 shouldKeepTicking
METHOD method_3749 getMaxWorldBorderRadius ()I
METHOD method_3750 isStopped ()Z
METHOD method_3754 isHardcore ()Z
Expand Down Expand Up @@ -426,9 +439,18 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_49750 sendTimeUpdatePackets (Lnet/minecraft/class_3218;)V
ARG 1 world
METHOD method_52344 shouldLogIps ()Z
METHOD method_53501 (Lnet/minecraft/class_3222;)V
ARG 0 player
METHOD method_53620 tickTickLog (J)V
ARG 1 nanos
METHOD method_5387 isMainThread ()Z
METHOD method_54809 isPaused ()Z
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
FIELD field_33980 time J
FIELD field_33981 tick I
Expand Down
23 changes: 23 additions & 0 deletions mappings/net/minecraft/server/ServerTickManager.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
CLASS net/minecraft/class_8915 net/minecraft/server/ServerTickManager
FIELD field_46919 sprintTicks J
FIELD field_46920 sprintStartTime J
FIELD field_46921 sprintTime J
FIELD field_46922 scheduledSprintTicks J
FIELD field_46923 wasFrozen Z
FIELD field_46924 server Lnet/minecraft/server/MinecraftServer;
METHOD <init> (Lnet/minecraft/server/MinecraftServer;)V
ARG 1 server
METHOD method_54670 isSprinting ()Z
METHOD method_54672 step (I)Z
ARG 1 ticks
METHOD method_54674 sendPackets (Lnet/minecraft/class_3222;)V
ARG 1 player
METHOD method_54676 stopStepping ()Z
METHOD method_54677 startSprint (I)Z
ARG 1 ticks
METHOD method_54678 stopSprinting ()Z
METHOD method_54679 sprint ()Z
METHOD method_54680 updateSprintTime ()V
METHOD method_54681 sendUpdateTickRatePacket ()V
METHOD method_54682 sendStepPacket ()V
METHOD method_54683 finishSprinting ()V
52 changes: 52 additions & 0 deletions mappings/net/minecraft/server/command/TickCommand.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
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
ARG 0 context
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 executeQuery (Lnet/minecraft/class_2168;)I
ARG 0 source
METHOD method_54691 executeRate (Lnet/minecraft/class_2168;F)I
ARG 0 source
ARG 1 rate
METHOD method_54692 executeSprint (Lnet/minecraft/class_2168;I)I
ARG 0 source
ARG 1 ticks
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 executeStopStep (Lnet/minecraft/class_2168;)I
ARG 0 source
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
ARG 0 context
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 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
ARG 0 context
METHOD method_54717 (Lcom/mojang/brigadier/context/CommandContext;)I
ARG 0 context
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CLASS net/minecraft/class_3178 net/minecraft/server/dedicated/DedicatedServerWatchdog
FIELD field_13823 server Lnet/minecraft/class_3176;
FIELD field_13825 LOGGER Lorg/slf4j/Logger;
FIELD field_46927 maxTickTime J
METHOD <init> (Lnet/minecraft/class_3176;)V
ARG 1 server
METHOD method_13954 shutdown ()V
Expand Down
4 changes: 4 additions & 0 deletions mappings/net/minecraft/util/TimeHelper.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ CLASS net/minecraft/class_4802 net/minecraft/util/TimeHelper
COMMENT The equivalent of 1 second, in nanoseconds. Is {@code 1000000000}.
FIELD field_33869 MILLI_IN_NANOS J
COMMENT The equivalent of 1 millisecond, in nanoseconds. Is {@code 1000000}.
FIELD field_46957 SECOND_IN_MILLIS J
COMMENT The equivalent of 1 second, in milliseconds. Is {@code 1000}.
FIELD field_46958 HOUR_IN_SECONDS J
COMMENT The equivalent of 1 hour, in seconds. Is {@code 3600}.
METHOD method_24505 betweenSeconds (II)Lnet/minecraft/class_6019;
COMMENT {@return an int provider that provides a time in ticks, between {@code min * 20} and
COMMENT {@code max * 20} (both inclusive)}
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/world/World.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
ARG 1 entity
ARG 2 damageSource
METHOD method_48963 getDamageSources ()Lnet/minecraft/class_8109;
METHOD method_54719 getTickManager ()Lnet/minecraft/class_8921;
METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V
ARG 1 pos
ARG 2 oldState
Expand Down
22 changes: 22 additions & 0 deletions mappings/net/minecraft/world/tick/TickManager.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
CLASS net/minecraft/class_8921 net/minecraft/world/tick/TickManager
FIELD field_46961 tickRate F
FIELD field_46962 nanosPerTick J
FIELD field_46963 stepTicks I
FIELD field_46964 shouldTick Z
FIELD field_46965 frozen Z
METHOD method_54671 setTickRate (F)V
ARG 1 tickRate
METHOD method_54675 setFrozen (Z)V
ARG 1 frozen
METHOD method_54746 shouldTick (Lnet/minecraft/class_1297;)Z
ARG 1 entity
METHOD method_54747 setStepTicks (I)V
ARG 1 stepTicks
METHOD method_54748 getTickRate ()F
METHOD method_54749 getMillisPerTick ()F
METHOD method_54750 getNanosPerTick ()J
METHOD method_54751 shouldTick ()Z
METHOD method_54752 isStepping ()Z
METHOD method_54753 getStepTicks ()I
METHOD method_54754 isFrozen ()Z
METHOD method_54755 step ()V