Workaround loom bug

Reforged-Hub · Sep 9, 2024 · e518a66 · e518a66
1 parent 799f1f9
commit e518a66
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...ithium/mixin/minimal_nonvanilla/world/expiring_chunk_tickets/ChunkTicketManagerMixin.java b/...ithium/mixin/minimal_nonvanilla/world/expiring_chunk_tickets/ChunkTicketManagerMixin.java
@@ -42,7 +42,7 @@ private static boolean canNoneExpire(SortedArraySet<ChunkTicket<?>> tickets) {
         return true;
     }
 
-    @Redirect(method = { "lambda$addTicket$6", "lambda$getTickets$7" }, at = @At(value = "INVOKE", target = "Lnet/minecraft/util/collection/SortedArraySet;create(I)Lnet/minecraft/util/collection/SortedArraySet;"))
+    @Redirect(method = { "lambda$addTicket$6", "lambda$getTickets$7" }, at = @At(value = "INVOKE", target = "Lnet/minecraft/util/SortedArraySet;create(I)Lnet/minecraft/util/SortedArraySet;"))
     private static SortedArraySet<ChunkTicket<?>> useLithiumSortedArraySet(int initialCapacity) { // TODO fix redirect method
         return new ChunkTicketSortedArraySet<>(initialCapacity);
     }
@@ -82,7 +82,7 @@ private void unregisterExpiringTicket(long pos, ChunkTicket<?> ticket, CallbackI
             method = "addTicket(JLnet/minecraft/server/world/ChunkTicket;)V",
             at = @At(
                     value = "INVOKE", shift = At.Shift.BEFORE,
-                    target = "Lnet/minecraft/util/collection/SortedArraySet;addAndGet(Ljava/lang/Object;)Ljava/lang/Object;"
+                    target = "Lnet/minecraft/util/SortedArraySet;addOrGet(Ljava/lang/Object;)Ljava/lang/Object;"
             )
     )
     private void updateSetMinExpiryTime(long position, ChunkTicket<?> ticket, CallbackInfo ci, @Local(ordinal = 0) SortedArraySet<?> sortedArraySet) {
@@ -106,7 +106,7 @@ private Long2ObjectOpenHashMap<SortedArraySet<ChunkTicket<?>>> getExpiringTicket
     @Redirect(method = "purge",
             at = @At(
                 value = "INVOKE",
-                target = "Lnet/minecraft/util/collection/SortedArraySet;isEmpty()Z"
+                target = "Lnet/minecraft/util/SortedArraySet;isEmpty()Z"
             )
     )
     private boolean retCanNoneExpire(SortedArraySet<ChunkTicket<?>> tickets) {
@@ -116,7 +116,7 @@ private boolean retCanNoneExpire(SortedArraySet<ChunkTicket<?>> tickets) {
     @Inject(method = "purge", locals = LocalCapture.CAPTURE_FAILHARD,
             at = @At(
                     value = "INVOKE", shift = At.Shift.BEFORE,
-                    target = "Lnet/minecraft/util/collection/SortedArraySet;isEmpty()Z"
+                    target = "Lnet/minecraft/util/SortedArraySet;isEmpty()Z"
             )
     )
     private void removeIfEmpty(CallbackInfo ci, ObjectIterator<?> objectIterator, Long2ObjectMap.Entry<SortedArraySet<ChunkTicket<?>>> entry) {
@@ -129,7 +129,7 @@ private void removeIfEmpty(CallbackInfo ci, ObjectIterator<?> objectIterator, Lo
     @Redirect(method = "purge",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/util/collection/SortedArraySet;iterator()Ljava/util/Iterator;"
+                    target = "Lnet/minecraft/util/SortedArraySet;iterator()Ljava/util/Iterator;"
             )
     )
     private Iterator<ChunkTicket<?>> skipIfNotExpiringNow(SortedArraySet<ChunkTicket<?>> ticketsAtPos) {