add back permission check

Author: TropheusJ

src/main/java/one/devos/nautical/canary/Config.java

@@ -15,16 +15,17 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.server.permissions.PermissionLevel;
 
-public record Config(boolean printBlockStateReport, int diagnosticsPermissionLevel,
+public record Config(boolean printBlockStateReport, PermissionLevel diagnosticsPermissionLevel,
 					 List<String> trackedDataWhitelist, List<String> stateBuilderWhitelist) {
 
 	public static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("canary.json");
 	private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
 	public static final Codec<Config> CODEC = RecordCodecBuilder.create(instance -> instance.group(
 			Codec.BOOL.optionalFieldOf("print_blockstate_report", false).forGetter(Config::printBlockStateReport),
-			Codec.INT.optionalFieldOf("desync_diagnostics_permission_level", 4).forGetter(Config::diagnosticsPermissionLevel),
+			PermissionLevel.CODEC.optionalFieldOf("desync_diagnostics_permission_level", PermissionLevel.OWNERS).forGetter(Config::diagnosticsPermissionLevel),
 			Codec.STRING.listOf().optionalFieldOf("tracked_data_whitelist", List.of()).forGetter(Config::trackedDataWhitelist),
 			Codec.STRING.listOf().optionalFieldOf("state_builder_whitelist", List.of()).forGetter(Config::stateBuilderWhitelist)
 	).apply(instance, Config::new));
@@ -37,7 +38,7 @@ public static Config load() {
 
 	private static Config makeDefault() {
 		return new Config(
-				false, 4,
+				false, PermissionLevel.OWNERS,
 				List.of("com.example.mymod.Utilities"),
 				List.of("net.example.examplemod.Utils")
 		);

src/main/java/one/devos/nautical/canary/feature/desync/RequestDiagnosticsPacket.java

@@ -7,6 +7,8 @@
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.permissions.Permission;
+import net.minecraft.server.permissions.PermissionLevel;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import one.devos.nautical.canary.CanaryPackets;
@@ -22,7 +24,7 @@ public enum RequestDiagnosticsPacket implements CustomPacketPayload {
 
 	public static void handle(RequestDiagnosticsPacket ignored, ServerPlayNetworking.Context context) {
 		ServerPlayer player = context.player();
-		if (true){//player.hasPermissions(Config.INSTANCE.diagnosticsPermissionLevel())) {
+		if (hasPermission(player)) {
 			player.sendSystemMessage(Component.literal("Diagnostics en route. Check the client log for results."));
 		} else {
 			player.sendSystemMessage(Component.literal("You don't have permission for that."));
@@ -52,4 +54,10 @@ public static void handle(RequestDiagnosticsPacket ignored, ServerPlayNetworking
 	public Type<? extends CustomPacketPayload> type() {
 		return CanaryPackets.REQUEST_DIAGNOSTICS;
 	}
+
+	private static boolean hasPermission(ServerPlayer player) {
+		PermissionLevel level = Config.INSTANCE.diagnosticsPermissionLevel();
+		Permission permission = new Permission.HasCommandLevel(level);
+		return player.permissions().hasPermission(permission);
+	}
 }