From 330d47b5ecf10a0911cfa9fb27e17ad7ba5cc6f2 Mon Sep 17 00:00:00 2001
From: Max Weber <mii7303@gmail.com>
Date: Thu, 10 Jan 2019 03:19:55 -0700
Subject: [PATCH] cache: Add equals and hashCode to all Definitions

Lombok is updated due to lombok issue 1724 breaking ModelDefinition
---
 .../java/net/runelite/cache/definitions/AreaDefinition.java    | 3 +++
 .../runelite/cache/definitions/ClientScript1Instruction.java   | 2 ++
 .../java/net/runelite/cache/definitions/FrameDefinition.java   | 3 +++
 .../net/runelite/cache/definitions/FramemapDefinition.java     | 3 +++
 .../net/runelite/cache/definitions/InterfaceDefinition.java    | 3 +++
 .../net/runelite/cache/definitions/InventoryDefinition.java    | 3 +++
 .../java/net/runelite/cache/definitions/ItemDefinition.java    | 2 ++
 .../java/net/runelite/cache/definitions/KitDefinition.java     | 2 ++
 .../java/net/runelite/cache/definitions/ModelDefinition.java   | 2 ++
 .../java/net/runelite/cache/definitions/NpcDefinition.java     | 2 ++
 .../net/runelite/cache/definitions/SequenceDefinition.java     | 2 ++
 .../net/runelite/cache/definitions/SpotAnimDefinition.java     | 3 +++
 .../java/net/runelite/cache/definitions/StructDefinition.java  | 2 ++
 .../java/net/runelite/cache/definitions/TrackDefinition.java   | 3 +++
 .../java/net/runelite/cache/definitions/WorldMapType0.java     | 3 +++
 pom.xml                                                        | 2 +-
 16 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java
index fe615b4250..27a722014b 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java
@@ -24,6 +24,9 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
 public class AreaDefinition
 {
 	public int id;
diff --git a/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java b/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java
index f0fe7d4683..2b80b8c1dc 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java
@@ -24,8 +24,10 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
+@EqualsAndHashCode
 public class ClientScript1Instruction
 {
 	@RequiredArgsConstructor
diff --git a/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java
index 07fb2c7e31..fde09dfb87 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java
@@ -24,6 +24,9 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
 public class FrameDefinition
 {
 	public int id; // file id
diff --git a/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java
index 250204d24b..7e958ff78b 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java
@@ -24,6 +24,9 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
 public class FramemapDefinition
 {
 	public int id;
diff --git a/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java
index 4bbee579e2..d314a7a347 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java
@@ -24,6 +24,9 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
 public class InterfaceDefinition
 {
 	public int id = -1;
diff --git a/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java
index d8f383ac58..95c683e7d8 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java
@@ -24,6 +24,9 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
 public class InventoryDefinition
 {
 	public int id;
diff --git a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java
index 3856b0bb61..18961a38ce 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java
@@ -25,9 +25,11 @@
 package net.runelite.cache.definitions;
 
 import java.util.Map;
+import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
+@EqualsAndHashCode
 public class ItemDefinition
 {
 	public final int id;
diff --git a/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java
index 8db2095eb3..9b355b80e2 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java
@@ -24,9 +24,11 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+@EqualsAndHashCode
 @RequiredArgsConstructor
 public class KitDefinition
 {
diff --git a/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java
index 2ec675d0d0..9229c731c7 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java
@@ -1,10 +1,12 @@
 package net.runelite.cache.definitions;
 
 import java.util.Arrays;
+import lombok.EqualsAndHashCode;
 import net.runelite.cache.models.CircularAngle;
 import net.runelite.cache.models.FaceNormal;
 import net.runelite.cache.models.VertexNormal;
 
+@EqualsAndHashCode
 public class ModelDefinition
 {
 	public int id;
diff --git a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
index ffb8e1888a..00e94938ab 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java
@@ -26,8 +26,10 @@
 package net.runelite.cache.definitions;
 
 import java.util.Map;
+import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
+@EqualsAndHashCode
 @RequiredArgsConstructor
 public class NpcDefinition
 {
diff --git a/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java
index 257be8398a..5d9632656d 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java
@@ -24,9 +24,11 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
+@EqualsAndHashCode
 @RequiredArgsConstructor
 public class SequenceDefinition
 {
diff --git a/cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java
index c0107e0848..6a155ba354 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java
@@ -24,6 +24,9 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
 public class SpotAnimDefinition
 {
 	public int rotaton = 0;
diff --git a/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java
index cd1d2de749..265fcb1bf4 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java
@@ -25,8 +25,10 @@
 package net.runelite.cache.definitions;
 
 import java.util.Map;
+import lombok.EqualsAndHashCode;
 import lombok.RequiredArgsConstructor;
 
+@EqualsAndHashCode
 @RequiredArgsConstructor
 public class StructDefinition
 {
diff --git a/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java
index 33007ce073..5e5cb1af9d 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java
@@ -24,6 +24,9 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode
 public class TrackDefinition
 {
 	public byte[] midi; // midi file contents
diff --git a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java
index c69c0d873a..1294d0eb4d 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/WorldMapType0.java
@@ -24,6 +24,9 @@
  */
 package net.runelite.cache.definitions;
 
+import lombok.Data;
+
+@Data
 public class WorldMapType0 implements WorldMapTypeBase
 {
 	public int field600;
diff --git a/pom.xml b/pom.xml
index e643be5913..a441fb3372 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<lombok.version>1.16.22</lombok.version>
+		<lombok.version>1.18.4</lombok.version>
 
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<checkstyle.skip>true</checkstyle.skip>