fix: sync custom claim problems to client as well as standard ones

Author: desht

common/src/main/java/dev/ftb/mods/ftbchunks/api/ClaimResult.java

@@ -32,7 +32,9 @@ default boolean isSuccess() {
 	 *
 	 * @return the message to be displayed
 	 */
-	MutableComponent getMessage();
+	default MutableComponent getMessage() {
+		return Component.translatable(getResultId());
+	}
 
 	/**
 	 * Create a custom claim failure result. This may be of use to mods which add extra checks to claiming/forcing/etc.
@@ -74,23 +76,19 @@ enum StandardProblem implements ClaimResult {
 
 		public static final NameMap<StandardProblem> NAME_MAP = NameMap.of(NOT_OWNER, values()).baseNameKey("ftbchunks.standard_problem").create();
 
-		private final String resultName;
+		private final String resultId;
 
-		StandardProblem(String resultName) {
-			this.resultName = resultName;
+		StandardProblem(String resultId) {
+			this.resultId = "ftbchunks.claim_result." + resultId;
 		}
 
 		public static Optional<StandardProblem> forName(String name) {
 			return Optional.ofNullable(NAME_MAP.get(name));
 		}
 
-		public MutableComponent getMessage() {
-			return Component.translatable("ftbchunks.claim_result." + getResultId());
-		}
-
 		@Override
 		public String getResultId() {
-			return resultName;
+			return resultId;
 		}
 	}
 
@@ -100,20 +98,15 @@ public String getResultId() {
 	 * Use {@link ClaimResult#customProblem(String)} to create instances of this class.
 	 */
 	class CustomProblem implements ClaimResult {
-		private final String name;
+		private final String translationKey;
 
-		private CustomProblem(String name) {
-			this.name = name;
+		private CustomProblem(String translationKey) {
+			this.translationKey = translationKey;
 		}
 
 		@Override
 		public String getResultId() {
-			return name;
-		}
-
-		@Override
-		public MutableComponent getMessage() {
-			return Component.translatable(name);
+			return translationKey;
 		}
 	}
 }

common/src/main/java/dev/ftb/mods/ftbchunks/client/gui/ChunkScreenPanel.java

@@ -38,13 +38,13 @@
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.commands.Commands;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ChunkPos;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.EnumMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -80,7 +80,7 @@ public ChunkScreenPanel(ChunkScreen panel) {
 		alignWidgets();
 	}
 
-	public static void notifyChunkUpdates(int totalChunks, int changedChunks, EnumMap<ClaimResult.StandardProblem, Integer> problems) {
+	public static void notifyChunkUpdates(int totalChunks, int changedChunks, Map<String, Integer> problems) {
 		if (Minecraft.getInstance().screen instanceof ScreenWrapper sw && sw.getGui() instanceof ChunkScreen cs) {
 			cs.getChunkScreen().updateInfo = new ChunkUpdateInfo(totalChunks, changedChunks, problems, Minecraft.getInstance().level.getGameTime());
 		}
@@ -200,10 +200,10 @@ public void drawBackground(GuiGraphics graphics, Theme theme, int x, int y, int
 		if (updateInfo != null && updateInfo.shouldDisplay()) {
 			theme.drawString(graphics, updateInfo.summary(), sx + 2, sy + 2, Theme.SHADOW);
 			int line = 1;
-			for (Map.Entry<ClaimResult.StandardProblem, Integer> entry : updateInfo.problems.entrySet()) {
-				ClaimResult.StandardProblem problem = entry.getKey();
+			for (Map.Entry<String, Integer> entry : updateInfo.problems.entrySet()) {
+				MutableComponent problem = Component.translatable(entry.getKey());
 				int count = entry.getValue();
-				theme.drawString(graphics, problem.getMessage().append(": " + count), sx + 2, sy + 5 + theme.getFontHeight() * line++, Theme.SHADOW);
+				theme.drawString(graphics, problem.append(": " + count), sx + 2, sy + 5 + theme.getFontHeight() * line++, Theme.SHADOW);
 			}
 		}
 	}
@@ -355,7 +355,7 @@ public XZ getChunkPos() {
 		}
 	}
 
-	public record ChunkUpdateInfo(int totalChunks, int changedChunks, EnumMap<ClaimResult.StandardProblem, Integer> problems, long timestamp) {
+	public record ChunkUpdateInfo(int totalChunks, int changedChunks, Map<String, Integer> problems, long timestamp) {
 		public boolean shouldDisplay() {
 			// display for 3 seconds + 1 second per line of problem data
 			long timeout = 60L + 20L * problems.size();

common/src/main/java/dev/ftb/mods/ftbchunks/net/ChunkChangeResponsePacket.java

@@ -1,24 +1,26 @@
 package dev.ftb.mods.ftbchunks.net;
 
 import dev.architectury.networking.NetworkManager;
-import dev.ftb.mods.ftbchunks.api.ClaimResult.StandardProblem;
 import dev.ftb.mods.ftbchunks.api.FTBChunksAPI;
 import dev.ftb.mods.ftbchunks.client.gui.ChunkScreenPanel;
-import dev.ftb.mods.ftblibrary.util.NetworkHelper;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 
-import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
 
-public record ChunkChangeResponsePacket(int totalChunks, int changedChunks, EnumMap<StandardProblem,Integer> problems) implements CustomPacketPayload {
+public record ChunkChangeResponsePacket(
+        int totalChunks, int changedChunks, Map<String,Integer> problems
+) implements CustomPacketPayload
+{
     public static final Type<ChunkChangeResponsePacket> TYPE = new Type<>(FTBChunksAPI.rl("chunk_change_response_packet"));
 
     public static final StreamCodec<FriendlyByteBuf, ChunkChangeResponsePacket> STREAM_CODEC = StreamCodec.composite(
             ByteBufCodecs.VAR_INT, ChunkChangeResponsePacket::totalChunks,
             ByteBufCodecs.VAR_INT, ChunkChangeResponsePacket::changedChunks,
-            ByteBufCodecs.map(i -> new EnumMap<>(StandardProblem.class), NetworkHelper.enumStreamCodec(StandardProblem.class), ByteBufCodecs.VAR_INT), ChunkChangeResponsePacket::problems,
+            ByteBufCodecs.map(HashMap::new, ByteBufCodecs.STRING_UTF8, ByteBufCodecs.VAR_INT), ChunkChangeResponsePacket::problems,
             ChunkChangeResponsePacket::new
     );
 

common/src/main/java/dev/ftb/mods/ftbchunks/net/RequestChunkChangePacket.java

@@ -20,11 +20,7 @@
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.level.ServerPlayer;
 
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.function.Function;
 
 public record RequestChunkChangePacket(ChunkChangeOp action, Set<XZ> chunks, boolean tryAdminChanges, Optional<UUID> teamId) implements CustomPacketPayload {
@@ -68,16 +64,15 @@ public static void handle(RequestChunkChangePacket message, NetworkManager.Packe
 			case UNLOAD -> pos -> data.unForceLoad(source, pos.dim(player.level()), false, message.tryAdminChanges);
 		};
 
-		EnumMap<ClaimResult.StandardProblem, Integer> problems = new EnumMap<>(ClaimResult.StandardProblem.class);
+		Map<String,Integer> problems = new HashMap<>();
+
 		int changed = 0;
 		for (XZ pos : message.chunks) {
 			ClaimResult r = consumer.apply(pos);
 			if (!r.isSuccess()) {
-				FTBChunks.LOGGER.debug(String.format("%s tried to %s @ %s:%d:%d but got result %s", player.getScoreboardName(),
-						message.action.name, player.level().dimension().location(), pos.x(), pos.z(), r));
-				if (r instanceof ClaimResult.StandardProblem cr) {
-					problems.put(cr, problems.getOrDefault(cr, 0) + 1);
-				}
+				FTBChunks.LOGGER.debug("{} tried to {} @ {}:{}:{} but got result {}",
+						player.getScoreboardName(), message.action.name, player.level().dimension().location(), pos.x(), pos.z(), r);
+				problems.put(r.getResultId(), problems.getOrDefault(r.getResultId(), 0) + 1);
 			} else {
 				changed++;
 			}