diff --git a/build.gradle b/build.gradle
index ffd2d40..86f3495 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,11 +81,6 @@ allprojects {
         }
         maven { url = "https://maven.shedaniel.me/" }
         maven { url = "https://maven.terraformersmc.com/releases/" }
-        mavenLocal {
-            mavenContent {
-                includeModule("net.neoforged", "neoforge")
-            }
-        }
     }
 
     // make build reproducible
diff --git a/gradle.properties b/gradle.properties
index 9fb1299..dd7d643 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,17 +5,17 @@ org.gradle.caching=true
 org.gradle.configuration-cache=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.21.6-pre1
+minecraft_version=1.21.6
 loader_version=0.16.14
-supported_minecraft_versions=1.21.6-pre1
-neoforge_version=21.5.0-alpha.1.21.6-pre1.20250603.133746
-neoform_version=1.21.6-pre2-20250602.144525
-fabric_api_version=0.125.3+1.21.6
+supported_minecraft_versions=1.21.6
+neoforge_version=21.6.0-beta
+neoform_version=1.21.6-20250617.151856
+fabric_api_version=0.127.0+1.21.6
 snakeyaml_version=2.3
 concurrentutil_version=0.0.3
 yamlconfig_version=1.0.2
 cloth_version=18.0.145
-modmenu_version=14.0.0-rc.2
+modmenu_version=15.0.0-beta.1
 # set to false when modmenu/cloth is not updated for the current minecraft version
 enable_gui=false
 junit_version=5.11.3
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index d7f80c9..0943c30 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -12,14 +12,6 @@ repositories {
         name = 'NeoForged'
         url = 'https://maven.neoforged.net/releases/'
     }
-    maven {
-        name 'Maven for PR #2297' // https://github.com/neoforged/NeoForge/pull/2297
-        url 'https://prmaven.neoforged.net/NeoForge/pr2297'
-        content {
-            includeModule('net.neoforged', 'neoforge')
-            includeModule('net.neoforged', 'testframework')
-        }
-    }
 }
 
 def aw2at = Aw2AtTask.configureDefault(
diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/TicketStorageMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/TicketStorageMixin.java
index acf6df2..b824e67 100644
--- a/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/TicketStorageMixin.java
+++ b/src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/TicketStorageMixin.java
@@ -29,6 +29,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.Iterator;
 import java.util.List;
 import java.util.function.BiConsumer;
+import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 @Mixin(TicketStorage.class)
@@ -193,8 +194,8 @@ abstract class TicketStorageMixin extends SavedData implements ChunkSystemTicket
      * @author Spottedleaf
      */
     @Overwrite
-    public void purgeStaleTickets() {
-        ((ChunkSystemServerLevel)this.chunkMap.level).moonrise$getChunkTaskScheduler().chunkHolderManager.tick();
+    public void purgeStaleTickets(final ChunkMap chunkMap) {
+        ((ChunkSystemServerLevel)chunkMap.level).moonrise$getChunkTaskScheduler().chunkHolderManager.tick();
         this.setDirty();
     }
 
@@ -208,11 +209,11 @@ abstract class TicketStorageMixin extends SavedData implements ChunkSystemTicket
         method = "deactivateTicketsOnClosing",
         at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/world/level/TicketStorage;removeTicketIf(Ljava/util/function/Predicate;Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V"
+            target = "Lnet/minecraft/world/level/TicketStorage;removeTicketIf(Ljava/util/function/BiPredicate;Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)V"
         )
     )
     private void avoidRemovingTicketsOnShutdown(final TicketStorage instance,
-                                                final Predicate<Ticket> predicate,
+                                                final BiPredicate<Long, Ticket> predicate,
                                                 final Long2ObjectOpenHashMap<List<Ticket>> tickets) {}
 
     /**
@@ -220,7 +221,7 @@ abstract class TicketStorageMixin extends SavedData implements ChunkSystemTicket
      * @author Spottedleaf
      */
     @Overwrite
-    public void removeTicketIf(final Predicate<Ticket> predicate, final Long2ObjectOpenHashMap<List<Ticket>> into) {
+    public void removeTicketIf(final BiPredicate<Long, Ticket> predicate, final Long2ObjectOpenHashMap<List<Ticket>> into) {
         throw new UnsupportedOperationException();
     }