Panic previous hacks persist better

Author: cev-api

src/main/java/net/wurstclient/hack/HackList.java

@@ -271,6 +271,7 @@ public void onUpdate()
 	{
 		enabledHacksFile.load(this);
 		favoriteHacksFile.load(this);
+		panicHack.handleStartupRestore();
 		eventManager.remove(UpdateListener.class, this);
 	}
 

src/main/java/net/wurstclient/hacks/PanicHack.java

@@ -7,23 +7,34 @@
  */
 package net.wurstclient.hacks;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import com.google.gson.JsonArray;
+
 import net.wurstclient.Category;
 import net.wurstclient.DontBlock;
 import net.wurstclient.SearchTags;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.hack.HackList;
 import net.wurstclient.settings.ButtonSetting;
 import net.wurstclient.util.ChatUtils;
+import net.wurstclient.util.json.JsonException;
+import net.wurstclient.util.json.JsonUtils;
+import net.wurstclient.util.json.WsonArray;
 import net.wurstclient.util.text.WText;
 
 @SearchTags({"legit", "disable"})
 @DontBlock
 public final class PanicHack extends Hack
 {
 	private final Set<String> savedHackNames = new LinkedHashSet<>();
+	private final Path snapshotFile =
+		WURST.getWurstFolder().resolve("panic-snapshot.json");
+	private boolean startupRestorePending;
 
 	private final ButtonSetting restoreButton = new ButtonSetting(
 		"Restore saved hacks",
@@ -37,6 +48,7 @@ public PanicHack()
 		setCategory(Category.OTHER);
 		addSetting(restoreButton);
 		addPossibleKeybind("panic restore", "Restore hacks saved by Panic");
+		loadSnapshotFromDisk();
 	}
 
 	@Override
@@ -62,6 +74,8 @@ private int snapshotEnabledHacks()
 			if(hack.isEnabled() && hack != this)
 				savedHackNames.add(hack.getName());
 
+		persistSavedHacks();
+		startupRestorePending = false;
 		return savedHackNames.size();
 	}
 
@@ -82,9 +96,10 @@ public void restoreSavedHacks()
 
 		HackList hax = WURST.getHax();
 		Set<String> missing = new LinkedHashSet<>();
+		Set<String> blocked = new LinkedHashSet<>();
 		int restored = 0;
 
-		for(String name : savedHackNames)
+		for(String name : new LinkedHashSet<>(savedHackNames))
 		{
 			Hack hack = hax.getHackByName(name);
 			if(hack == null || hack == this)
@@ -95,18 +110,112 @@ public void restoreSavedHacks()
 
 			boolean wasEnabled = hack.isEnabled();
 			hack.setEnabled(true);
+			
+			if(!hack.isEnabled())
+			{
+				blocked.add(name);
+				continue;
+			}
+			
 			if(!wasEnabled && hack.isEnabled())
 				restored++;
 		}
 
-		if(!missing.isEmpty())
-			savedHackNames.removeAll(missing);
+		savedHackNames.clear();
+		savedHackNames.addAll(blocked);
 
 		if(restored > 0)
 			ChatUtils.message("Restored " + restored + " hack"
 				+ (restored == 1 ? "" : "s") + " from Panic.");
-		else
-			ChatUtils.message(
-				"All saved Panic hacks are already enabled or blocked.");
+		else if(savedHackNames.isEmpty())
+			ChatUtils.message("All saved Panic hacks are already enabled.");
+		
+		if(!missing.isEmpty())
+			ChatUtils
+				.warning("Missing Panic hacks: " + String.join(", ", missing));
+		
+		if(!savedHackNames.isEmpty())
+			ChatUtils
+				.warning("Still blocked: " + String.join(", ", savedHackNames));
+		
+		persistSavedHacks();
+	}
+	
+	public void handleStartupRestore()
+	{
+		if(!startupRestorePending)
+			return;
+		
+		startupRestorePending = false;
+		
+		if(savedHackNames.isEmpty())
+		{
+			deleteSnapshotFile();
+			return;
+		}
+		
+		restoreSavedHacks();
+	}
+	
+	private void loadSnapshotFromDisk()
+	{
+		startupRestorePending = false;
+		savedHackNames.clear();
+		
+		if(!Files.exists(snapshotFile))
+			return;
+		
+		try
+		{
+			WsonArray wson = JsonUtils.parseFileToArray(snapshotFile);
+			savedHackNames.addAll(wson.getAllStrings());
+			
+			if(savedHackNames.isEmpty())
+				deleteSnapshotFile();
+			else
+				startupRestorePending = true;
+			
+		}catch(IOException | JsonException e)
+		{
+			System.out.println("Couldn't load panic snapshot");
+			e.printStackTrace();
+			deleteSnapshotFile();
+		}
+	}
+	
+	private void persistSavedHacks()
+	{
+		if(savedHackNames.isEmpty())
+		{
+			deleteSnapshotFile();
+			return;
+		}
+		
+		JsonArray json = new JsonArray();
+		savedHackNames.forEach(json::add);
+		
+		try
+		{
+			Files.createDirectories(snapshotFile.getParent());
+			JsonUtils.toJson(json, snapshotFile);
+			
+		}catch(IOException | JsonException e)
+		{
+			System.out.println("Couldn't save panic snapshot");
+			e.printStackTrace();
+		}
+	}
+	
+	private void deleteSnapshotFile()
+	{
+		try
+		{
+			Files.deleteIfExists(snapshotFile);
+			
+		}catch(IOException e)
+		{
+			System.out.println("Couldn't delete panic snapshot");
+			e.printStackTrace();
+		}
 	}
 }