From 54e236158db9b5947d125f83b29e53cf27f73a79 Mon Sep 17 00:00:00 2001
From: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>
Date: Thu, 19 Oct 2023 23:32:12 +0200
Subject: Use atomic move for config + small cleanup (#881)

---
 .../notenoughupdates/miscfeatures/SlotLocking.java | 41 +++++-----------------
 1 file changed, 8 insertions(+), 33 deletions(-)

(limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java
index c8ac39b2..72aeaa23 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/SlotLocking.java
@@ -23,6 +23,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.autosubscribe.NEUAutoSubscribe;
+import io.github.moulberry.notenoughupdates.core.config.ConfigUtil;
 import io.github.moulberry.notenoughupdates.core.config.KeybindHelper;
 import io.github.moulberry.notenoughupdates.core.util.render.RenderUtils;
 import io.github.moulberry.notenoughupdates.events.ReplaceItemEvent;
@@ -55,14 +56,7 @@ import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.util.vector.Vector2f;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 
 @NEUAutoSubscribe
@@ -113,15 +107,7 @@ public class SlotLocking {
 	public Slot getRealSlot() {return realSlot;}
 
 	public void loadConfig(File file) {
-		try (
-			BufferedReader reader = new BufferedReader(new InputStreamReader(
-				new FileInputStream(file),
-				StandardCharsets.UTF_8
-			))
-		) {
-			config = GSON.fromJson(reader, SlotLockingConfig.class);
-		} catch (Exception ignored) {
-		}
+		config = ConfigUtil.loadConfig(SlotLockingConfig.class, file, GSON);
 		if (config == null) {
 			config = new SlotLockingConfig();
 		}
@@ -163,19 +149,7 @@ public class SlotLocking {
 	private final long[] slotChanges = new long[9];
 
 	public void saveConfig(File file) {
-		try {
-			file.createNewFile();
-			try (
-				BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(
-					new FileOutputStream(file),
-					StandardCharsets.UTF_8
-				))
-			) {
-				writer.write(GSON.toJson(config));
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+		ConfigUtil.saveConfig(config, file, GSON);
 	}
 
 	private LockedSlot[] getDataForProfile() {
@@ -191,12 +165,10 @@ public class SlotLocking {
 			k -> new SlotLockProfile()
 		);
 
-
 		if (profile.slotLockData[0] == null) {
 			profile.slotLockData[0] = new SlotLockData();
 		}
 
-
 		if (!"rift".equals(SBInfo.getInstance().getLocation())) {
 			return profile.slotLockData[0].lockedSlots;
 		} else {
@@ -209,7 +181,6 @@ public class SlotLocking {
 			return DEFAULT_LOCKED_SLOT;
 		}
 
-
 		LockedSlot slot = lockedSlots[index];
 
 		if (slot == null) {
@@ -747,10 +718,14 @@ public class SlotLocking {
 	}
 
 	boolean setTopHalfBarrier = false;
+
 	@SubscribeEvent
 	public void barrierInventory(ReplaceItemEvent event) {
 		if (event.getSlotNumber() < 9 ||
-			(pairingSlot != null && (event.getSlotNumber() == pairingSlot.slotNumber || isArmourSlot(event.getSlotNumber(), pairingSlot.slotNumber))) ||
+			(pairingSlot != null && (event.getSlotNumber() == pairingSlot.slotNumber || isArmourSlot(
+				event.getSlotNumber(),
+				pairingSlot.slotNumber
+			))) ||
 			!setTopHalfBarrier ||
 			!(event.getInventory() instanceof InventoryPlayer)) return;
 		ItemStack stack = new ItemStack(Blocks.barrier);
-- 
cgit