chore: post-cherry-pick fixups

Author: desht

common/src/main/java/dev/ftb/mods/ftbteams/FTBTeams.java

@@ -28,6 +28,8 @@
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
+
 public class FTBTeams {
 	public static final Logger LOGGER = LogManager.getLogger(FTBTeamsAPI.MOD_NAME);
 
@@ -51,8 +53,12 @@ public FTBTeams() {
 	private void serverAboutToStart(MinecraftServer server) {
 		TeamManagerImpl.INSTANCE = new TeamManagerImpl(server);
 		TeamManagerEvent.CREATED.invoker().accept(new TeamManagerEvent(TeamManagerImpl.INSTANCE));
-		TeamManagerImpl.INSTANCE.load();
-	}
+        try {
+            TeamManagerImpl.INSTANCE.load();
+        } catch (IOException e) {
+            FTBTeams.LOGGER.error("Load failure for ");
+        }
+    }
 
 	private void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext commandBuildContext, Commands.CommandSelection selection) {
 		new FTBTeamsCommands().register(dispatcher);

common/src/main/java/dev/ftb/mods/ftbteams/data/TeamManagerImpl.java

@@ -25,7 +25,6 @@
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.StringTag;
-import net.minecraft.nbt.Tag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
@@ -140,46 +139,45 @@ public boolean arePlayersInSameTeam(UUID id1, UUID id2) {
 				.orElse(false);
 	}
 
-	public void load() {
+	public void load() throws IOException {
 		id = null;
 		Path directory = server.getWorldPath(FOLDER_NAME);
 
 		if (Files.notExists(directory) || !Files.isDirectory(directory)) {
 			return;
 		}
 
-		CompoundTag dataFileTag = SNBT.read(directory.resolve("ftbteams.snbt"));
-
-		if (dataFileTag != null) {
-			if (dataFileTag.contains("id")) {
-				id = dataFileTag.read("id", UUIDUtil.CODEC).orElseThrow();
-			}
+		CompoundTag dataFileTag = SNBT.tryRead(directory.resolve("ftbteams.snbt"));
+		if (dataFileTag.contains("id")) {
+			id = dataFileTag.read("id", UUIDUtil.CODEC).orElseThrow();
+		}
 
-			extraData = dataFileTag.getCompoundOrEmpty("extra");
-			TeamManagerEvent.LOADED.invoker().accept(new TeamManagerEvent(this));
+		extraData = dataFileTag.getCompoundOrEmpty("extra");
+		TeamManagerEvent.LOADED.invoker().accept(new TeamManagerEvent(this));
 
-			chatRedirected.clear();
-			dataFileTag.getList("chat_redirected", Tag.TAG_STRING).forEach(tag -> {
-				try {
-					chatRedirected.add(UUID.fromString(tag.getAsString()));
-				} catch (IllegalArgumentException e) {
-					FTBTeams.LOGGER.error("invalid uuid {} in 'chat_redirection', ignoring", tag.getAsString());
-				}
-			});
-		}
+		chatRedirected.clear();
+		dataFileTag.getListOrEmpty("chat_redirected").forEach(tag -> {
+			try {
+				chatRedirected.add(UUID.fromString(tag.toString()));
+			} catch (IllegalArgumentException e) {
+				FTBTeams.LOGGER.error("invalid uuid {} in 'chat_redirection', ignoring", tag.toString());
+			}
+		});
 
 		for (TeamType type : TeamType.values()) {
 			Path dir = directory.resolve(type.getSerializedName());
 
 			if (Files.exists(dir) && Files.isDirectory(dir)) {
 				try (Stream<Path> s = Files.list(dir)) {
 					s.filter(path -> path.getFileName().toString().endsWith(".snbt")).forEach(file -> {
-						CompoundTag nbt = SNBT.read(file);
-						if (nbt != null) {
+                        try {
+                            CompoundTag nbt = SNBT.tryRead(file);
 							AbstractTeam team = type.createTeam(this, nbt.read("id", UUIDUtil.CODEC).orElseThrow());
 							teamMap.put(team.id, team);
 							team.deserializeNBT(nbt, server.registryAccess());
-						}
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
 					});
 				} catch (Exception ex) {
 					FTBTeams.LOGGER.error("can't list directory {}: {}", dir, ex.getMessage());