cache: Add equals and hashCode to all Definitions

Lombok is updated due to lombok issue 1724 breaking ModelDefinition
This commit is contained in:
Max Weber
2019-01-10 03:19:55 -07:00
parent 33e76436d3
commit 330d47b5ec
16 changed files with 39 additions and 1 deletions

View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode
public class AreaDefinition public class AreaDefinition
{ {
public int id; public int id;

View File

@@ -24,8 +24,10 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@EqualsAndHashCode
public class ClientScript1Instruction public class ClientScript1Instruction
{ {
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode
public class FrameDefinition public class FrameDefinition
{ {
public int id; // file id public int id; // file id

View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode
public class FramemapDefinition public class FramemapDefinition
{ {
public int id; public int id;

View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode
public class InterfaceDefinition public class InterfaceDefinition
{ {
public int id = -1; public int id = -1;

View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode
public class InventoryDefinition public class InventoryDefinition
{ {
public int id; public int id;

View File

@@ -25,9 +25,11 @@
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import java.util.Map; import java.util.Map;
import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor @RequiredArgsConstructor
@EqualsAndHashCode
public class ItemDefinition public class ItemDefinition
{ {
public final int id; public final int id;

View File

@@ -24,9 +24,11 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@EqualsAndHashCode
@RequiredArgsConstructor @RequiredArgsConstructor
public class KitDefinition public class KitDefinition
{ {

View File

@@ -1,10 +1,12 @@
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import java.util.Arrays; import java.util.Arrays;
import lombok.EqualsAndHashCode;
import net.runelite.cache.models.CircularAngle; import net.runelite.cache.models.CircularAngle;
import net.runelite.cache.models.FaceNormal; import net.runelite.cache.models.FaceNormal;
import net.runelite.cache.models.VertexNormal; import net.runelite.cache.models.VertexNormal;
@EqualsAndHashCode
public class ModelDefinition public class ModelDefinition
{ {
public int id; public int id;

View File

@@ -26,8 +26,10 @@
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import java.util.Map; import java.util.Map;
import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@EqualsAndHashCode
@RequiredArgsConstructor @RequiredArgsConstructor
public class NpcDefinition public class NpcDefinition
{ {

View File

@@ -24,9 +24,11 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@EqualsAndHashCode
@RequiredArgsConstructor @RequiredArgsConstructor
public class SequenceDefinition public class SequenceDefinition
{ {

View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode
public class SpotAnimDefinition public class SpotAnimDefinition
{ {
public int rotaton = 0; public int rotaton = 0;

View File

@@ -25,8 +25,10 @@
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import java.util.Map; import java.util.Map;
import lombok.EqualsAndHashCode;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@EqualsAndHashCode
@RequiredArgsConstructor @RequiredArgsConstructor
public class StructDefinition public class StructDefinition
{ {

View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode;
@EqualsAndHashCode
public class TrackDefinition public class TrackDefinition
{ {
public byte[] midi; // midi file contents public byte[] midi; // midi file contents

View File

@@ -24,6 +24,9 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.Data;
@Data
public class WorldMapType0 implements WorldMapTypeBase public class WorldMapType0 implements WorldMapTypeBase
{ {
public int field600; public int field600;

View File

@@ -38,7 +38,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <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> <maven.javadoc.skip>true</maven.javadoc.skip>
<checkstyle.skip>true</checkstyle.skip> <checkstyle.skip>true</checkstyle.skip>