Merge branch 'master' into future

Ghoulboy78 · Mar 24, 2022 · 7c353d4 · 7c353d4
2 parents d9c227f + d1f3886
commit 7c353d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/carpet/fakes/MinecraftServerInterface.java b/src/main/java/carpet/fakes/MinecraftServerInterface.java
@@ -2,6 +2,8 @@
 
 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);
 }
diff --git a/src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java b/src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java
@@ -99,9 +99,9 @@ public void tickTasks(BooleanSupplier booleanSupplier_1, CallbackInfo ci)
     }
 
     @Override
-    public void reloadAfterReload()
+    public void reloadAfterReload(RegistryAccess newRegs)
     {
-        resources.managers().updateRegistryTags(registryAccess());
+        resources.managers().updateRegistryTags(newRegs);
         getPlayerList().saveAll();
         getPlayerList().reloadResources();
         functionManager.replaceLibrary(this.resources.managers().getFunctionLibrary());

diff --git a/src/main/java/carpet/script/api/Auxiliary.java b/src/main/java/carpet/script/api/Auxiliary.java
@@ -1144,7 +1144,7 @@ else if (fdesc.type == FileArgument.Type.JSON)
                     addeds.add(ValueConversions.of(registryKey.location()));
                 }
             }
-            ((MinecraftServerInterface)server).reloadAfterReload();
+            ((MinecraftServerInterface)server).reloadAfterReload(data.registryAccess());
             return ListValue.wrap(addeds);
         });
     }