From d1f388684576d8bc7ef5bed5ebab1951fadaf37e Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 24 Mar 2022 21:18:32 +0100 Subject: [PATCH] use proper registires, still issues. --- src/main/java/carpet/fakes/MinecraftServerInterface.java | 4 +++- src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java | 4 ++-- src/main/java/carpet/script/api/Auxiliary.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/fakes/MinecraftServerInterface.java b/src/main/java/carpet/fakes/MinecraftServerInterface.java index 6e52f69f..91be09f4 100644 --- a/src/main/java/carpet/fakes/MinecraftServerInterface.java +++ b/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, 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 index 958dc17d..ac92aae8 100644 --- a/src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java +++ b/src/main/java/carpet/mixins/MinecraftServer_scarpetMixin.java @@ -99,9 +99,9 @@ public abstract class MinecraftServer_scarpetMixin extends ReentrantBlockableEve } @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 index 377e60c3..aaa37b33 100644 --- a/src/main/java/carpet/script/api/Auxiliary.java +++ b/src/main/java/carpet/script/api/Auxiliary.java @@ -1154,7 +1154,7 @@ public class Auxiliary { addeds.add(ValueConversions.of(registryKey.location())); } } - ((MinecraftServerInterface)server).reloadAfterReload(); + ((MinecraftServerInterface)server).reloadAfterReload(data.registryAccess()); return ListValue.wrap(addeds); }); }