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

Merge pull request #7597 from Abextm/cache-getters

Browse Source 
cache: use lombok Data for all definitions
This commit is contained in:
Abex
2019-01-28 03:38:30 -07:00
committed by GitHub
parent 2975365cac 527be68a81
commit 233de55863
15 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cache/src/main/java/net/runelite/cache/definitions/AreaDefinition.java vendored
View File

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

4
cache/src/main/java/net/runelite/cache/definitions/ClientScript1Instruction.java vendored
View File

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

4
cache/src/main/java/net/runelite/cache/definitions/FrameDefinition.java vendored
View File

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

4
cache/src/main/java/net/runelite/cache/definitions/FramemapDefinition.java vendored
View File

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

4
cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java vendored
View File

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

4
cache/src/main/java/net/runelite/cache/definitions/InventoryDefinition.java vendored
View File

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

6
cache/src/main/java/net/runelite/cache/definitions/ItemDefinition.java vendored
View File

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

8
cache/src/main/java/net/runelite/cache/definitions/KitDefinition.java vendored
View File

@@ -24,15 +24,11 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode; import lombok.Data;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@EqualsAndHashCode @Data
@RequiredArgsConstructor
public class KitDefinition public class KitDefinition
{ {
@Getter
private final int id; private final int id;
public short[] recolorToReplace; public short[] recolorToReplace;
public short[] recolorToFind; public short[] recolorToFind;

4
cache/src/main/java/net/runelite/cache/definitions/ModelDefinition.java vendored
View File

@@ -1,12 +1,12 @@
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import java.util.Arrays; import java.util.Arrays;
import lombok.EqualsAndHashCode; import lombok.Data;
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 @Data
public class ModelDefinition public class ModelDefinition
{ {
public int id; public int id;

6
cache/src/main/java/net/runelite/cache/definitions/NpcDefinition.java vendored
View File

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

8
cache/src/main/java/net/runelite/cache/definitions/SequenceDefinition.java vendored
View File

@@ -24,15 +24,11 @@
*/ */
package net.runelite.cache.definitions; package net.runelite.cache.definitions;
import lombok.EqualsAndHashCode; import lombok.Data;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@EqualsAndHashCode @Data
@RequiredArgsConstructor
public class SequenceDefinition public class SequenceDefinition
{ {
@Getter
private final int id; private final int id;
public int[] frameIDs; // top 16 bits are FrameDefinition ids public int[] frameIDs; // top 16 bits are FrameDefinition ids
public int[] field3048; public int[] field3048;

4
cache/src/main/java/net/runelite/cache/definitions/SpotAnimDefinition.java vendored
View File

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

7
cache/src/main/java/net/runelite/cache/definitions/StructDefinition.java vendored
View File

@@ -25,12 +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.Data;
import lombok.RequiredArgsConstructor;
@EqualsAndHashCode @Data
@RequiredArgsConstructor
public class StructDefinition public class StructDefinition
{ {
public final int id;
public Map<Integer, Object> params = null; public Map<Integer, Object> params = null;
} }

4
cache/src/main/java/net/runelite/cache/definitions/TrackDefinition.java vendored
View File

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

3
cache/src/main/java/net/runelite/cache/definitions/loaders/StructLoader.java vendored
View File

@@ -30,10 +30,9 @@ import net.runelite.cache.io.InputStream;
public class StructLoader public class StructLoader
{ {
public StructDefinition load(int id, byte[] b) public StructDefinition load(int id, byte[] b)
{ {
StructDefinition def = new StructDefinition(); StructDefinition def = new StructDefinition(id);
InputStream is = new InputStream(b); InputStream is = new InputStream(b);
while (true) while (true)