From 33e5071b11694df0f6a4d640e0851d5b75b81f89 Mon Sep 17 00:00:00 2001 From: KAMKEEL Date: Wed, 22 Mar 2023 13:35:49 -0400 Subject: [PATCH] Convert Set to HashSet --- .../controllers/ClientTagMapController.java | 1 - .../controllers/ServerTagMapController.java | 27 +++++++++++++++++++ .../noppes/npcs/controllers/data/TagMap.java | 23 +++++++++++++--- 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/client/controllers/ClientTagMapController.java b/src/main/java/noppes/npcs/client/controllers/ClientTagMapController.java index 4937f7036..9a2083745 100644 --- a/src/main/java/noppes/npcs/client/controllers/ClientTagMapController.java +++ b/src/main/java/noppes/npcs/client/controllers/ClientTagMapController.java @@ -1,7 +1,6 @@ package noppes.npcs.client.controllers; import noppes.npcs.CustomNpcs; -import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.controllers.ServerTagMapController; import java.io.File; diff --git a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java index c08c42f3b..48e0a116a 100644 --- a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java +++ b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java @@ -4,6 +4,7 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.CustomNpcs; +import noppes.npcs.LogWriter; import noppes.npcs.controllers.data.Faction; import noppes.npcs.controllers.data.TagMap; @@ -61,4 +62,30 @@ public class ServerTagMapController { this.tagMap.readNBT(nbtCompound); } + public void saveTagMap(TagMap tagMap){ + try { + File saveDir = getCloneTabDir(tagMap.cloneTab); + File file = new File(saveDir, "_____tag_map.dat_new"); + File file1 = new File(saveDir, "_____tag_map.dat_old"); + File file2 = new File(saveDir, "_____tag_map.dat"); + CompressedStreamTools.writeCompressed(tagMap.writeNBT(), new FileOutputStream(file)); + if(file1.exists()) + { + file1.delete(); + } + file2.renameTo(file1); + if(file2.exists()) + { + file2.delete(); + } + file.renameTo(file2); + if(file.exists()) + { + file.delete(); + } + } catch (Exception e) { + LogWriter.except(e); + } + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/TagMap.java b/src/main/java/noppes/npcs/controllers/data/TagMap.java index 58475924b..34f191ca4 100644 --- a/src/main/java/noppes/npcs/controllers/data/TagMap.java +++ b/src/main/java/noppes/npcs/controllers/data/TagMap.java @@ -6,11 +6,11 @@ import java.util.*; public class TagMap { public int cloneTab; - public HashMap> tagMap; + public HashMap> tagMap; public TagMap(int tab){ this.cloneTab = tab; - this.tagMap = new HashMap>(); + this.tagMap = new HashMap>(); } public void readNBT(NBTTagCompound compound){ @@ -21,7 +21,7 @@ public class TagMap { NBTTagCompound nbttagcompound = list.getCompoundTagAt(i); String cloneName = nbttagcompound.getString("Clone"); NBTTagList allUUIDs = compound.getTagList("UUIDs", 10); - Set uuids = new HashSet(); + HashSet uuids = new HashSet(); if(list != allUUIDs){ for(int j = 0; j < allUUIDs.tagCount(); j++) { @@ -42,7 +42,7 @@ public class TagMap { NBTTagList cloneList = new NBTTagList(); for(String key: tagMap.keySet()){ - Set uuidSet = tagMap.get(key); + HashSet uuidSet = tagMap.get(key); if(uuidSet.size() > 0){ NBTTagCompound cloneCompound = new NBTTagCompound(); cloneCompound.setString("Clone", key); @@ -65,4 +65,19 @@ public class TagMap { return this.cloneTab; } + public HashSet getUUIDs(String cloneName) { + if(tagMap.containsKey(cloneName)){ + return tagMap.get(cloneName); + } + return null; + } + + public boolean hasTag(String cloneName, UUID tag) { + HashSet uuids = getUUIDs(cloneName); + if(uuids == null){ + return false; + } + return uuids.contains(tag); + } + }