From e23620d724c46dbe1d97170e92f80847b3eac98a Mon Sep 17 00:00:00 2001 From: luiz-otavio Date: Thu, 3 Mar 2022 17:43:18 -0300 Subject: [PATCH] refactor: use `JSON`as default codec for `PlayerData` instead of `.dat` files --- .../controllers/PlayerDataController.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index 27bdef592..345ba4130 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -1,11 +1,5 @@ package noppes.npcs.controllers; -import java.io.*; -import java.nio.file.Files; -import java.nio.file.StandardOpenOption; -import java.util.HashMap; -import java.util.Map; - import me.luizotavio.compressor.ZstdCompressor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; @@ -17,6 +11,12 @@ import noppes.npcs.LogWriter; import noppes.npcs.util.JsonException; import noppes.npcs.util.NBTJsonUtil; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.StandardOpenOption; +import java.util.HashMap; +import java.util.Map; + import static me.luizotavio.compressor.executor.IOExecutor.IO_EXECUTOR; public class PlayerDataController { @@ -79,10 +79,8 @@ public class PlayerDataController { if(CustomNpcs.CompressorType.equalsIgnoreCase("zstd")) { filename += ".zstd"; - } else if(CustomNpcs.CompressorType.equalsIgnoreCase("json")) { - filename += ".json"; } else { - filename += ".dat"; + filename += ".json"; } try { @@ -102,10 +100,8 @@ public class PlayerDataController { if (CustomNpcs.CompressorType.equalsIgnoreCase("zstd")) { filename = data.uuid + ".zstd"; - } else if (CustomNpcs.CompressorType.equalsIgnoreCase("json")) { + } else { filename = data.uuid + ".json"; - } else { - filename = data.uuid + ".dat"; } try {