Merge branch 'master' into future

src/main/java/carpet/fakes/MinecraftServerInterface.java

@@ -2,6 +2,8 @@ package carpet.fakes;
 
 import java.util.Map;
 import java.util.function.BooleanSupplier;
+
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.resources.ResourceKey;
 //import net.minecraft.server.ServerResources;
 import net.minecraft.server.level.ServerLevel;
@@ -13,5 +15,5 @@ public interface MinecraftServerInterface
     void forceTick(BooleanSupplier sup);
     LevelStorageSource.LevelStorageAccess getCMSession();
     Map<ResourceKey<Level>, ServerLevel> getCMWorlds();
-    void reloadAfterReload();
+    void reloadAfterReload(RegistryAccess newRegs);
 }