ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-06-12 11:47:08 +02:00
parent 6ee59b0a04 bb2c5102a2
commit ae9de3928f
14 changed files with 1484 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cache/src/main/java/net/runelite/cache/ItemManager.java vendored
View File

@@ -96,20 +96,18 @@ public class ItemManager implements ItemProvider
public void java(File java) throws IOException
{
java.mkdirs();
try (IDClass ids = IDClass.create(java, "ItemID"))
try (IDClass ids = IDClass.create(java, "ItemID");
IDClass nulls = IDClass.create(java, "NullItemID"))
{
try (IDClass nulls = IDClass.create(java, "NullItemID"))
for (ItemDefinition def : items.values())
{
for (ItemDefinition def : items.values())
if (def.name.equalsIgnoreCase("NULL"))
{
if (def.name.equalsIgnoreCase("NULL"))
{
nulls.add(def.name, def.id);
}
else
{
ids.add(def.name, def.id);
}
nulls.add(def.name, def.id);
}
else
{
ids.add(def.name, def.id);
}
}
}

11
cache/src/main/java/net/runelite/cache/NpcManager.java vendored
View File

@@ -95,16 +95,19 @@ public class NpcManager
public void java(File java) throws IOException
{
java.mkdirs();
try (IDClass ids = IDClass.create(java, "NpcID"))
try (IDClass ids = IDClass.create(java, "NpcID");
IDClass nulls = IDClass.create(java, "NullNpcID"))
{
for (NpcDefinition def : npcs.values())
{
if (def.name.equalsIgnoreCase("NULL"))
{
continue;
nulls.add(def.name, def.id);
}
else
{
ids.add(def.name, def.id);
}
ids.add(def.name, def.id);
}
}
}

20
cache/src/main/java/net/runelite/cache/ObjectManager.java vendored
View File

@@ -95,20 +95,18 @@ public class ObjectManager
public void java(File java) throws IOException
{
java.mkdirs();
try (IDClass ids = IDClass.create(java, "ObjectID"))
try (IDClass ids = IDClass.create(java, "ObjectID");
IDClass nulls = IDClass.create(java, "NullObjectID"))
{
try (IDClass nulls = IDClass.create(java, "NullObjectID"))
for (ObjectDefinition def : objects.values())
{
for (ObjectDefinition def : objects.values())
if ("null".equals(def.getName()))
{
if ("null".equals(def.getName()))
{
nulls.add(def.getName(), def.getId());
}
else
{
ids.add(def.getName(), def.getId());
}
nulls.add(def.getName(), def.getId());
}
else
{
ids.add(def.getName(), def.getId());
}
}
}