2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java
index baf9648..f8eaba3 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java
@@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 public class TrackerHandler extends Gui {
 
     public static Set<TrackerObject> trackerObjects = new HashSet<>();
-    public static Map<Locations, Map<String, TrackerObject>> trackers = new HashMap<>();
+    public static LinkedHashMap<Locations, Map<String, TrackerObject>> trackers = new LinkedHashMap<>();
 
     public static <K, V> Map<K, V> sortTrackers(Map<K, V> map, Comparator<? super Map.Entry<K, V>> comparator) {
         List<Map.Entry<K, V>> list = new ArrayList<>(map.entrySet());
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerObject.java b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerObject.java
index 6013b09..1c6e54d 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerObject.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerObject.java
@@ -38,6 +38,11 @@ public class TrackerObject {
         if (jsonObject.has("enchanted") && jsonObject.get("enchanted").getAsBoolean()) {
             stack.setTagInfo("ench", new NBTTagList());
         }
+        if (!jsonObject.get("id").getAsString().contains("entity:")) {
+            NBTTagCompound extraAttributes = new NBTTagCompound();
+            extraAttributes.setString("id", jsonObject.get("id").getAsString());
+            stack.setTagInfo("ExtraAttributes", extraAttributes);
+        }
         return stack;
     }