From 3253de9466757bf3b6f6ba173d330a186cc200d0 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 28 Jan 2019 03:22:44 -0700 Subject: [PATCH 1/2] cache: use lombok Data for all definitions --- .../net/runelite/cache/definitions/AreaDefinition.java | 4 ++-- .../cache/definitions/ClientScript1Instruction.java | 4 ++-- .../net/runelite/cache/definitions/FrameDefinition.java | 4 ++-- .../runelite/cache/definitions/FramemapDefinition.java | 4 ++-- .../runelite/cache/definitions/InterfaceDefinition.java | 4 ++-- .../runelite/cache/definitions/InventoryDefinition.java | 4 ++-- .../net/runelite/cache/definitions/ItemDefinition.java | 6 ++---- .../net/runelite/cache/definitions/KitDefinition.java | 8 ++------ .../net/runelite/cache/definitions/ModelDefinition.java | 4 ++-- .../net/runelite/cache/definitions/NpcDefinition.java | 6 ++---- .../runelite/cache/definitions/SequenceDefinition.java | 8 ++------ .../runelite/cache/definitions/SpotAnimDefinition.java | 4 ++-- .../net/runelite/cache/definitions/StructDefinition.java | 6 ++---- .../net/runelite/cache/definitions/TrackDefinition.java | 4 ++-- 14 files changed, 28 insertions(+), 42 deletions(-) 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 27a722014b..7abdbdfddd 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java @@ -24,9 +24,9 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; +import lombok.Data; -@EqualsAndHashCode +@Data 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 2b80b8c1dc..b56c0a42d1 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java @@ -24,10 +24,10 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; +import lombok.Data; import lombok.RequiredArgsConstructor; -@EqualsAndHashCode +@Data 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 fde09dfb87..c31f0330ac 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java @@ -24,9 +24,9 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; +import lombok.Data; -@EqualsAndHashCode +@Data 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 7e958ff78b..00669d6690 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java @@ -24,9 +24,9 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; +import lombok.Data; -@EqualsAndHashCode +@Data 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 d314a7a347..aede6d6d7b 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java @@ -24,9 +24,9 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; +import lombok.Data; -@EqualsAndHashCode +@Data 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 95c683e7d8..5239f5c093 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java @@ -24,9 +24,9 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; +import lombok.Data; -@EqualsAndHashCode +@Data 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 18961a38ce..8f67622b24 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java @@ -25,11 +25,9 @@ package net.runelite.cache.definitions; import java.util.Map; -import lombok.EqualsAndHashCode; -import lombok.RequiredArgsConstructor; +import lombok.Data; -@RequiredArgsConstructor -@EqualsAndHashCode +@Data 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 9b355b80e2..bd2ee535f5 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java @@ -24,15 +24,11 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.RequiredArgsConstructor; +import lombok.Data; -@EqualsAndHashCode -@RequiredArgsConstructor +@Data public class KitDefinition { - @Getter private final int id; public short[] recolorToReplace; public short[] recolorToFind; 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 9229c731c7..2259026a4d 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java @@ -1,12 +1,12 @@ package net.runelite.cache.definitions; import java.util.Arrays; -import lombok.EqualsAndHashCode; +import lombok.Data; import net.runelite.cache.models.CircularAngle; import net.runelite.cache.models.FaceNormal; import net.runelite.cache.models.VertexNormal; -@EqualsAndHashCode +@Data 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 00e94938ab..8ba160c97a 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java @@ -26,11 +26,9 @@ package net.runelite.cache.definitions; import java.util.Map; -import lombok.EqualsAndHashCode; -import lombok.RequiredArgsConstructor; +import lombok.Data; -@EqualsAndHashCode -@RequiredArgsConstructor +@Data 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 5d9632656d..3f280f31c2 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java @@ -24,15 +24,11 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.RequiredArgsConstructor; +import lombok.Data; -@EqualsAndHashCode -@RequiredArgsConstructor +@Data public class SequenceDefinition { - @Getter private final int id; public int[] frameIDs; // top 16 bits are FrameDefinition ids public int[] field3048; 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 6a155ba354..e85b3918e2 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java @@ -24,9 +24,9 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; +import lombok.Data; -@EqualsAndHashCode +@Data 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 265fcb1bf4..b9e9f5131b 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java @@ -25,11 +25,9 @@ package net.runelite.cache.definitions; import java.util.Map; -import lombok.EqualsAndHashCode; -import lombok.RequiredArgsConstructor; +import lombok.Data; -@EqualsAndHashCode -@RequiredArgsConstructor +@Data public class StructDefinition { public Map params = null; 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 5e5cb1af9d..136070e8f9 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java @@ -24,9 +24,9 @@ */ package net.runelite.cache.definitions; -import lombok.EqualsAndHashCode; +import lombok.Data; -@EqualsAndHashCode +@Data public class TrackDefinition { public byte[] midi; // midi file contents From 527be68a81ca1d3b9735c96e07c8f4854e115366 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 28 Jan 2019 03:25:20 -0700 Subject: [PATCH 2/2] cache: Include id in StructDefinition --- .../java/net/runelite/cache/definitions/StructDefinition.java | 1 + .../net/runelite/cache/definitions/loaders/StructLoader.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b9e9f5131b..455ce9ea5e 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java @@ -30,5 +30,6 @@ import lombok.Data; @Data public class StructDefinition { + public final int id; public Map params = null; } diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java index 664a6bc042..4137da8f37 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java @@ -30,10 +30,9 @@ import net.runelite.cache.io.InputStream; public class StructLoader { - public StructDefinition load(int id, byte[] b) { - StructDefinition def = new StructDefinition(); + StructDefinition def = new StructDefinition(id); InputStream is = new InputStream(b); while (true)