-
-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix+clarify ChunkTickScheduler, complete n.m.world.tick (#640)
* fix+clarify ChunkTickScheduler memeber and related names * map ScheduledTickAccess move TickPriority to tick package complete n.m.world.tick * rename ScheduledTickAccess -> TickSchedulerAccess --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
- Loading branch information
1 parent
d03d93b
commit b2aa2b7
Showing
10 changed files
with
66 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 18 additions & 9 deletions
27
mappings/net/minecraft/world/tick/ChunkTickScheduler.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,31 @@ | ||
| 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 <p>Only non-null if the scheduler was created with | ||
| COMMENT {@link #ChunkTickScheduler(List<Tick<T>>) 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 <init> (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 | ||
| ARG 2 chunkPos | ||
| 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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
mappings/net/minecraft/world/tick/SerializableTickScheduler.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../net/minecraft/world/TickPriority.mapping → ...minecraft/world/tick/TickPriority.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
mappings/net/minecraft/world/tick/TickSchedulerAccess.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| CLASS net/minecraft/unmapped/C_adoatlrf net/minecraft/world/tick/TickSchedulerAccess | ||
| METHOD m_frvtnypd scheduleBlockTick (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;ILnet/minecraft/unmapped/C_gkdmrpwk;)V | ||
| ARG 3 delay | ||
| ARG 4 priority | ||
| METHOD m_gilfgcrq getFluidTickScheduler ()Lnet/minecraft/unmapped/C_zynzpvwf; | ||
| METHOD m_ilonjtab createTick (Lnet/minecraft/unmapped/C_hynzadkk;Ljava/lang/Object;ILnet/minecraft/unmapped/C_gkdmrpwk;)Lnet/minecraft/unmapped/C_bokjrzyn; | ||
| ARG 2 type | ||
| ARG 3 delay | ||
| ARG 4 priority | ||
| METHOD m_miidoetd scheduleFluidTick (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rxhyurmy;I)V | ||
| COMMENT Schedules a {@link net.minecraft.fluid.Fluid Fluid} tick with | ||
| COMMENT {@link net.minecraft.world.tick.TickPriority#NORMAL NORMAL} priority | ||
| ARG 2 fluid | ||
| ARG 3 delay | ||
| METHOD m_mwcdjxvs getBlockTickScheduler ()Lnet/minecraft/unmapped/C_zynzpvwf; | ||
| METHOD m_rmubjhrd createTick (Lnet/minecraft/unmapped/C_hynzadkk;Ljava/lang/Object;I)Lnet/minecraft/unmapped/C_bokjrzyn; | ||
| COMMENT @return a tick with {@link net.minecraft.world.tick.TickPriority#NORMAL NORMAL} priority | ||
| ARG 2 type | ||
| ARG 3 delay | ||
| METHOD m_rpovjsym scheduleBlockTick (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_mmxmpdoq;I)V | ||
| COMMENT Schedules a {@link net.minecraft.block.Block Block} tick with | ||
| COMMENT {@link net.minecraft.world.tick.TickPriority#NORMAL NORMAL} priority | ||
| ARG 3 delay | ||
| METHOD m_ummdtjmj scheduleFluidTick (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_rxhyurmy;ILnet/minecraft/unmapped/C_gkdmrpwk;)V | ||
| ARG 2 fluid | ||
| ARG 3 delay | ||
| ARG 4 priority |
b2aa2b7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With commit b2aa2b7, 154 file(s) were updated with 502 line(s) added and 487 removed compared to the latest Quilt Mappings version.
View the diff here (1/3):
b2aa2b7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
View the diff here (2/3):
b2aa2b7There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
View the diff here (3/3):