Skip to content

Commit a209093

Browse files
committed
Moonrise compatibility: Set require=0 for ChunkStatusTracker Inject
Tuinity/Moonrise#91
1 parent be60945 commit a209093

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

common/src/main/java/net/caffeinemc/mods/lithium/mixin/util/chunk_status_tracking/ChunkHolderMixin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ public ChunkHolderMixin(ChunkPos chunkPos) {
2323

2424
@Inject(
2525
method = "updateFutures(Lnet/minecraft/server/level/ChunkMap;Ljava/util/concurrent/Executor;)V", locals = LocalCapture.CAPTURE_FAILHARD,
26-
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/FullChunkStatus;isOrAfter(Lnet/minecraft/server/level/FullChunkStatus;)Z", ordinal = 6)
26+
at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/FullChunkStatus;isOrAfter(Lnet/minecraft/server/level/FullChunkStatus;)Z", ordinal = 6),
27+
// See ca.spottledleaf.moonrise.compat.lithium.LithiumHooks and https://github.com/Tuinity/Moonrise/blob/c2cf9858998d9245cb2f548a4618b8772d054125/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkHolderMixin.java#L401
28+
// Moonrise will call Lithium's ChunkStatusTracker methods directly, in turn we set require = 0, avoiding a conflict with their overwrite.
29+
require = 0
2730
)
2831
private void trackUpdate(ChunkMap chunkMap, Executor executor, CallbackInfo ci, FullChunkStatus prevStatus, FullChunkStatus status) {
2932
ServerLevel serverLevel = chunkMap.level;

0 commit comments

Comments
 (0)