From eed92ba07c7aa166b0ed3d6d2f0365a545aca762 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Tue, 12 Mar 2019 04:34:29 +0000 Subject: [PATCH] Only prompt for missing registries on local worlds (#5348) --- .../minecraftforge/registries/GameData.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java index b2f0984a7e..75a77588f8 100644 --- a/src/main/java/net/minecraftforge/registries/GameData.java +++ b/src/main/java/net/minecraftforge/registries/GameData.java @@ -587,20 +587,23 @@ public class GameData RegistryManager.ACTIVE.registries.forEach((name, reg) -> reg.dump(name)); RegistryManager.ACTIVE.registries.forEach((name, reg) -> reg.resetDelegates()); - List missingRegs = snapshot.keySet().stream().filter(name -> !RegistryManager.ACTIVE.registries.containsKey(name)).collect(Collectors.toList()); - if (missingRegs.size() > 0) + if (isLocalWorld) { - String text = "Forge Mod Loader detected missing/unknown registrie(s).\n\n" + - "There are " + missingRegs.size() + " missing registries in this save.\n" + - "If you continue the missing registries will get removed.\n" + - "This may cause issues, it is advised that you create a world backup before continuing.\n\n" + - "Missing Registries:\n"; + List missingRegs = snapshot.keySet().stream().filter(name -> !RegistryManager.ACTIVE.registries.containsKey(name)).collect(Collectors.toList()); + if (missingRegs.size() > 0) + { + String text = "Forge Mod Loader detected missing/unknown registrie(s).\n\n" + + "There are " + missingRegs.size() + " missing registries in this save.\n" + + "If you continue the missing registries will get removed.\n" + + "This may cause issues, it is advised that you create a world backup before continuing.\n\n" + + "Missing Registries:\n"; - for (ResourceLocation s : missingRegs) - text += s.toString() + "\n"; + for (ResourceLocation s : missingRegs) + text += s.toString() + "\n"; - if (!StartupQuery.confirm(text)) - StartupQuery.abort(); + if (!StartupQuery.confirm(text)) + StartupQuery.abort(); + } } RegistryManager STAGING = new RegistryManager("STAGING");