diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index a5c2b263e..9900676ac 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -1094,7 +1094,6 @@ public class PacketHandlerServer{ } compound.setTag("AllTags", validTagList); Server.sendData(player, EnumPacketClient.GUI_DATA, compound); - System.out.println("-------------- We sent the tags"); } else warn(player,"WE 2 tried todo something with the wrong tool, probably a hacker"); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java index 836bfc9fb..130d1d732 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java @@ -22,12 +22,12 @@ import java.lang.reflect.Modifier; import java.util.*; public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData { + public static HashMap tags = new HashMap<>(); public static HashMap tagNames = new HashMap<>(); public static HashSet tagFilters = new HashSet<>(); public static byte displayTags = 0; public TagMap tagMap; - public HashMap tags = new HashMap<>(); private final GuiCustomScrollCloner scroll = new GuiCustomScrollCloner(this,0); private final GuiCustomScroll filterScroll = new GuiCustomScroll(this,1); @@ -159,8 +159,6 @@ public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData { ArrayList list = new ArrayList(); this.list = ClientCloneController.Instance.getClones(activeTab); this.tagMap = ClientTagMapController.Instance.getTagMap(activeTab); - System.out.println("Client Tag Map"); - System.out.println(this.tagMap); scroll.setList(getSearchList()); } public void keyTyped(char c, int i) diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScrollCloner.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScrollCloner.java index e761b4241..13fb9b95f 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScrollCloner.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScrollCloner.java @@ -59,13 +59,9 @@ public class GuiCustomScrollCloner extends GuiCustomScroll { int tagStartX = j + fontRendererObj.getStringWidth(displayString) + 5; if(GuiNpcMobSpawner.displayTags == 0 || GuiNpcMobSpawner.displayTags == 2){ if (this.parent.tagMap.hasClone(list.get(i))) { - System.out.println("BRUH 2"); for (UUID tagUUID : this.parent.tagMap.getUUIDs(list.get(i))){ Tag tag = this.parent.tags.get(tagUUID); - System.out.println("BRUH 2.5"); if(tag != null){ - System.out.println("-- BRUH 3 --"); - System.out.println(GuiNpcMobSpawner.displayTags); if(GuiNpcMobSpawner.displayTags == 2){ fontRendererObj.drawString("[" + tag.name + "]", tagStartX, k, tag.color); tagStartX += fontRendererObj.getStringWidth("[" + tag.name + "]") + 2; diff --git a/src/main/java/noppes/npcs/controllers/data/TagMap.java b/src/main/java/noppes/npcs/controllers/data/TagMap.java index f15d027bf..4a14706c9 100644 --- a/src/main/java/noppes/npcs/controllers/data/TagMap.java +++ b/src/main/java/noppes/npcs/controllers/data/TagMap.java @@ -25,9 +25,9 @@ public class TagMap { String cloneName = nbttagcompound.getString("Clone"); HashSet uuids = new HashSet(); - NBTTagList nbtTagList = compound.getTagList("TagUUIDs",8); + NBTTagList nbtTagList = nbttagcompound.getTagList("TagUUIDs",8); for (int j = 0; j < nbtTagList.tagCount(); j++) { - String uuid = nbtTagList.getStringTagAt(i); + String uuid = nbtTagList.getStringTagAt(j); if(!uuid.isEmpty()){ uuids.add(UUID.fromString(uuid)); }