From cba8c83ca6af94573ea0c8d42833eea1599882be Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Sat, 8 Jul 2017 22:41:11 -0400
Subject: [PATCH] cache: use id to uniquely name fields

---
 .../net/runelite/cache/InterfaceManager.java     |  3 ++-
 .../java/net/runelite/cache/ItemManager.java     |  3 ++-
 .../main/java/net/runelite/cache/NpcManager.java |  3 ++-
 .../java/net/runelite/cache/ObjectManager.java   |  3 ++-
 .../main/java/net/runelite/cache/util/Namer.java | 16 ++++------------
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/cache/src/main/java/net/runelite/cache/InterfaceManager.java b/cache/src/main/java/net/runelite/cache/InterfaceManager.java
index 2e09b91aa3..baa944360d 100644
--- a/cache/src/main/java/net/runelite/cache/InterfaceManager.java
+++ b/cache/src/main/java/net/runelite/cache/InterfaceManager.java
@@ -90,6 +90,7 @@ public class InterfaceManager
 
 	public void java(File java) throws IOException
 	{
+		System.setProperty("line.separator", "\n");
 		java.mkdirs();
 		File targ = new File(java, "InterfaceID.java");
 		try (PrintWriter fw = new PrintWriter(targ))
@@ -105,7 +106,7 @@ public class InterfaceManager
 					continue;
 				}
 
-				String name = namer.name(def.name);
+				String name = namer.name(def.name, def.id);
 				if (name == null)
 				{
 					continue;
diff --git a/cache/src/main/java/net/runelite/cache/ItemManager.java b/cache/src/main/java/net/runelite/cache/ItemManager.java
index d77337ac13..b0de94fff5 100644
--- a/cache/src/main/java/net/runelite/cache/ItemManager.java
+++ b/cache/src/main/java/net/runelite/cache/ItemManager.java
@@ -82,6 +82,7 @@ public class ItemManager
 
 	public void java(File java) throws IOException
 	{
+		System.setProperty("line.separator", "\n");
 		java.mkdirs();
 		File targ = new File(java, "ItemID.java");
 		try (PrintWriter fw = new PrintWriter(targ))
@@ -98,7 +99,7 @@ public class ItemManager
 					continue;
 				}
 
-				String name = namer.name(def.name);
+				String name = namer.name(def.name, def.id);
 				if (name == null)
 				{
 					continue;
diff --git a/cache/src/main/java/net/runelite/cache/NpcManager.java b/cache/src/main/java/net/runelite/cache/NpcManager.java
index 679a4cafd8..c0685b4438 100644
--- a/cache/src/main/java/net/runelite/cache/NpcManager.java
+++ b/cache/src/main/java/net/runelite/cache/NpcManager.java
@@ -77,6 +77,7 @@ public class NpcManager
 
 	public void java(File java) throws IOException
 	{
+		System.setProperty("line.separator", "\n");
 		java.mkdirs();
 		File targ = new File(java, "NpcID.java");
 		try (PrintWriter fw = new PrintWriter(targ))
@@ -93,7 +94,7 @@ public class NpcManager
 					continue;
 				}
 
-				String name = namer.name(def.name);
+				String name = namer.name(def.name, def.id);
 				if (name == null)
 				{
 					continue;
diff --git a/cache/src/main/java/net/runelite/cache/ObjectManager.java b/cache/src/main/java/net/runelite/cache/ObjectManager.java
index a0ee541766..607421457a 100644
--- a/cache/src/main/java/net/runelite/cache/ObjectManager.java
+++ b/cache/src/main/java/net/runelite/cache/ObjectManager.java
@@ -82,6 +82,7 @@ public class ObjectManager
 
 	public void java(File java) throws IOException
 	{
+		System.setProperty("line.separator", "\n");
 		java.mkdirs();
 		File targ = new File(java, "ObjectID.java");
 		try (PrintWriter fw = new PrintWriter(targ))
@@ -98,7 +99,7 @@ public class ObjectManager
 					continue;
 				}
 
-				String name = namer.name(def.getName());
+				String name = namer.name(def.getName(), def.getId());
 				if (name == null)
 				{
 					continue;
diff --git a/cache/src/main/java/net/runelite/cache/util/Namer.java b/cache/src/main/java/net/runelite/cache/util/Namer.java
index a474ede710..2fba4e8e94 100644
--- a/cache/src/main/java/net/runelite/cache/util/Namer.java
+++ b/cache/src/main/java/net/runelite/cache/util/Namer.java
@@ -31,7 +31,7 @@ public class Namer
 {
 	private final Set<String> used = new HashSet<>();
 
-	public String name(String name)
+	public String name(String name, int id)
 	{
 		name = sanitize(name);
 
@@ -40,20 +40,12 @@ public class Namer
 			return null;
 		}
 
-		String suffix = "";
-		while (used.contains(name + suffix))
+		if (used.contains(name))
 		{
-			if (suffix.isEmpty())
-			{
-				suffix = "_2";
-			}
-			else
-			{
-				suffix = "_" + (Integer.parseInt(suffix.substring(1)) + 1);
-			}
+			name = name + "_" + id;
+			assert !used.contains(name);
 		}
 
-		name += suffix;
 		used.add(name);
 
 		return name;