Skip to content

Commit

Permalink
fix+clarify ChunkTickScheduler memeber and related names
Browse files Browse the repository at this point in the history
  • Loading branch information
@supersaiyansubtlety
supersaiyansubtlety committed Sep 17, 2024
1 parent 3372129 commit 864f6c7
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 17 deletions.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/server/world/ServerWorld.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/world/chunk/WorldChunk.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
27 changes: 18 additions & 9 deletions mappings/net/minecraft/world/tick/ChunkTickScheduler.mapping
View file
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;
2 changes: 2 additions & 0 deletions mappings/net/minecraft/world/tick/OrderedTick.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions mappings/net/minecraft/world/tick/SerializableTickScheduler.mapping
View file
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}
10 changes: 5 additions & 5 deletions mappings/net/minecraft/world/tick/Tick.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
2 changes: 1 addition & 1 deletion mappings/net/minecraft/world/tick/TickScheduler.mapping
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 864f6c7

Please sign in to comment.