From 864f6c7133112d2d33171b0dea3088681cdbfbf1 Mon Sep 17 00:00:00 2001 From: supersaiyansubtlety Date: Mon, 16 Sep 2024 22:19:17 -0700 Subject: [PATCH] fix+clarify ChunkTickScheduler memeber and related names --- .../server/world/ServerWorld.mapping | 2 +- .../minecraft/world/chunk/WorldChunk.mapping | 2 +- .../world/tick/ChunkTickScheduler.mapping | 27 ++++++++++++------- .../minecraft/world/tick/OrderedTick.mapping | 2 ++ .../tick/SerializableTickScheduler.mapping | 5 ++++ .../net/minecraft/world/tick/Tick.mapping | 10 +++---- .../world/tick/TickScheduler.mapping | 2 +- 7 files changed, 33 insertions(+), 17 deletions(-) diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index c537e414ab..030d2ba7f5 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -136,7 +136,7 @@ CLASS net/minecraft/unmapped/C_bdwnwhiu net/minecraft/server/world/ServerWorld METHOD m_mnsqmupw tickTime ()V METHOD m_mvfbcepu addEntities (Ljava/util/stream/Stream;)V ARG 1 entities - METHOD m_nolhpgre (Lnet/minecraft/unmapped/C_hrdsvlkq;)V + METHOD m_nolhpgre scheduleInitialTicks (Lnet/minecraft/unmapped/C_hrdsvlkq;)V ARG 1 chunk METHOD m_odekrajn spawnParticles (Lnet/minecraft/unmapped/C_nqucohct;DDDIDDDD)I ARG 1 particle diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index d12a19448e..2dfc8f2b4c 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -58,7 +58,7 @@ CLASS net/minecraft/unmapped/C_hrdsvlkq net/minecraft/world/chunk/WorldChunk METHOD m_opcnnkyf getBlockEntity (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hrdsvlkq$C_pwlgmnmf;)Lnet/minecraft/unmapped/C_kvegafmh; ARG 1 pos ARG 2 creationType - METHOD m_txdtyywn disableTickSchedulers (J)V + METHOD m_txdtyywn scheduleInitialTicks (J)V METHOD m_txllhxeh addChunkTickSchedulers (Lnet/minecraft/unmapped/C_bdwnwhiu;)V ARG 1 world METHOD m_vrgotbps createBlockEntity (Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_kvegafmh; diff --git a/mappings/net/minecraft/world/tick/ChunkTickScheduler.mapping b/mappings/net/minecraft/world/tick/ChunkTickScheduler.mapping index d56c5ceeb9..444c8ed484 100644 --- a/mappings/net/minecraft/world/tick/ChunkTickScheduler.mapping +++ b/mappings/net/minecraft/world/tick/ChunkTickScheduler.mapping @@ -1,12 +1,21 @@ CLASS net/minecraft/unmapped/C_vzzkwuje net/minecraft/world/tick/ChunkTickScheduler - FIELD f_flihgfjo tickQueue Ljava/util/Queue; - FIELD f_jfabzqdk ticks Ljava/util/List; - FIELD f_jotbaccv onTickAdded Ljava/util/function/BiConsumer; - FIELD f_sixwufro queuedTicks Ljava/util/Set; + FIELD f_flihgfjo scheduledTicks Ljava/util/Queue; + FIELD f_jfabzqdk initialTicks Ljava/util/List; + COMMENT Ticks that won't be scheduled until {@link #scheduleInitialTicks} is called. + COMMENT

Only non-null if the scheduler was created with + COMMENT {@link #ChunkTickScheduler(List>) initialTicks} + COMMENT and {@link #scheduleInitialTicks} hasn't been called yet. + FIELD f_jotbaccv onTickScheduled Ljava/util/function/BiConsumer; + FIELD f_sixwufro allTicks Ljava/util/Set; METHOD (Ljava/util/List;)V - ARG 1 ticks - METHOD m_aqbfsfzl disable (J)V + ARG 1 initialTicks + COMMENT ticks that won't be scheduled until {@link #scheduleInitialTicks} is called; + COMMENT usually these are loaded from a saved chunk + METHOD m_aqbfsfzl scheduleInitialTicks (J)V ARG 1 time + METHOD m_dugyinpj toNbt (JLjava/util/function/Function;)Lnet/minecraft/unmapped/C_hqhtfwlr; + ARG 1 time + ARG 3 typeToId METHOD m_fwancvzb create (Lnet/minecraft/unmapped/C_hqhtfwlr;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ynrszrtu;)Lnet/minecraft/unmapped/C_vzzkwuje; ARG 0 tickList ARG 1 identifierToTypeFunction @@ -14,9 +23,9 @@ CLASS net/minecraft/unmapped/C_vzzkwuje net/minecraft/world/tick/ChunkTickSchedu METHOD m_pntuedat peekNextTick ()Lnet/minecraft/unmapped/C_bokjrzyn; METHOD m_ruqbpqda queueTick (Lnet/minecraft/unmapped/C_bokjrzyn;)V ARG 1 orderedTick - METHOD m_sjrhiyib setOnTickAdded (Ljava/util/function/BiConsumer;)V - ARG 1 onTickAdded - METHOD m_yizzksuf getQueueAsStream ()Ljava/util/stream/Stream; + METHOD m_sjrhiyib setOnTickScheduled (Ljava/util/function/BiConsumer;)V + ARG 1 onTickScheduled + METHOD m_yizzksuf streamScheduled ()Ljava/util/stream/Stream; METHOD m_zgsvdbka removeTicksIf (Ljava/util/function/Predicate;)V ARG 1 predicate METHOD m_zijrctpc pollNextTick ()Lnet/minecraft/unmapped/C_bokjrzyn; diff --git a/mappings/net/minecraft/world/tick/OrderedTick.mapping b/mappings/net/minecraft/world/tick/OrderedTick.mapping index e29da77ed5..51518b0689 100644 --- a/mappings/net/minecraft/world/tick/OrderedTick.mapping +++ b/mappings/net/minecraft/world/tick/OrderedTick.mapping @@ -34,6 +34,8 @@ CLASS net/minecraft/unmapped/C_bokjrzyn net/minecraft/world/tick/OrderedTick ARG 0 tick ARG 1 tick2 METHOD m_rebqgjgp triggerTick ()J + METHOD m_uxeibajz toTick (J)Lnet/minecraft/unmapped/C_hojywanl; + ARG 1 time CLASS C_ewbmszvj METHOD equals (Ljava/lang/Object;Ljava/lang/Object;)Z ARG 1 tick diff --git a/mappings/net/minecraft/world/tick/SerializableTickScheduler.mapping b/mappings/net/minecraft/world/tick/SerializableTickScheduler.mapping index 018864f06f..c48fbad2ad 100644 --- a/mappings/net/minecraft/world/tick/SerializableTickScheduler.mapping +++ b/mappings/net/minecraft/world/tick/SerializableTickScheduler.mapping @@ -1 +1,6 @@ CLASS net/minecraft/unmapped/C_hexvwpil net/minecraft/world/tick/SerializableTickScheduler + METHOD m_khwqakbu getAllTicks (J)Ljava/util/List; + ARG 1 time + COMMENT used to convert from + COMMENT {@link net.minecraft.world.tick.OrderedTick#triggerTick() OrderedTick.triggerTick} + COMMENT to {@link net.minecraft.world.tick.Tick#delay() Tick.delay} diff --git a/mappings/net/minecraft/world/tick/Tick.mapping b/mappings/net/minecraft/world/tick/Tick.mapping index 6b5486c21e..623d506a80 100644 --- a/mappings/net/minecraft/world/tick/Tick.mapping +++ b/mappings/net/minecraft/world/tick/Tick.mapping @@ -22,10 +22,10 @@ CLASS net/minecraft/unmapped/C_hojywanl net/minecraft/world/tick/Tick METHOD m_gasmljpz (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hojywanl; ARG 1 typedTick METHOD m_gusjwjzh delay ()I - METHOD m_hxkrodca tick (Lnet/minecraft/unmapped/C_hqhtfwlr;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ynrszrtu;)Ljava/util/List; + METHOD m_hxkrodca listFromNbt (Lnet/minecraft/unmapped/C_hqhtfwlr;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_ynrszrtu;)Ljava/util/List; ARG 0 tickList - ARG 1 identifierToTypeFunction - ARG 2 chunkPos + ARG 1 idToType + ARG 2 pos METHOD m_imvsfdjj type ()Ljava/lang/Object; METHOD m_metjftvq priority ()Lnet/minecraft/unmapped/C_gkdmrpwk; METHOD m_peydzvhr toOrderedTick (JJ)Lnet/minecraft/unmapped/C_bokjrzyn; @@ -36,13 +36,13 @@ CLASS net/minecraft/unmapped/C_hojywanl net/minecraft/world/tick/Tick ARG 1 pos METHOD m_ucrjcrfu pos ()Lnet/minecraft/unmapped/C_hynzadkk; METHOD m_wmeghrgb toNbt (Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_hhlwcnih; - ARG 1 typeToIdentifierFunction + ARG 1 typeToId METHOD m_xvwkrflj fromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/util/function/Function;)Ljava/util/Optional; ARG 0 tick ARG 1 identifierToTypeFunction CLASS C_xcgovrmp METHOD equals (Ljava/lang/Object;Ljava/lang/Object;)Z - ARG 1 tick + ARG 1 tick1 ARG 2 tick2 METHOD hashCode (Ljava/lang/Object;)I ARG 1 tick diff --git a/mappings/net/minecraft/world/tick/TickScheduler.mapping b/mappings/net/minecraft/world/tick/TickScheduler.mapping index df5d5f5af8..95907562ed 100644 --- a/mappings/net/minecraft/world/tick/TickScheduler.mapping +++ b/mappings/net/minecraft/world/tick/TickScheduler.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/unmapped/C_jayokemd net/minecraft/world/tick/TickScheduler METHOD m_eayguafr getTickCount ()I - METHOD m_ocfyfama isQueued (Lnet/minecraft/unmapped/C_hynzadkk;Ljava/lang/Object;)Z + METHOD m_ocfyfama hasMatchingTick (Lnet/minecraft/unmapped/C_hynzadkk;Ljava/lang/Object;)Z ARG 1 pos ARG 2 type METHOD m_xyafeqsz scheduleTick (Lnet/minecraft/unmapped/C_bokjrzyn;)V