diff --git a/runelite-client/src/main/java/net/runelite/client/events/ActorDeath.java b/runelite-client/src/main/java/net/runelite/client/events/ActorDeath.java index a7e0537d3f..790683b7a8 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/ActorDeath.java +++ b/runelite-client/src/main/java/net/runelite/client/events/ActorDeath.java @@ -24,19 +24,11 @@ */ package net.runelite.client.events; +import lombok.Data; import net.runelite.api.Actor; +@Data public class ActorDeath { private Actor actor; - - public Actor getActor() - { - return actor; - } - - public void setActor(Actor actor) - { - this.actor = actor; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/AnimationChanged.java b/runelite-client/src/main/java/net/runelite/client/events/AnimationChanged.java index 5d61071267..20baaaaeac 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/AnimationChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/AnimationChanged.java @@ -24,17 +24,10 @@ */ package net.runelite.client.events; +import lombok.Data; + +@Data public class AnimationChanged { private Object object; - - public Object getObject() - { - return object; - } - - public void setObject(Object object) - { - this.object = object; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/ChatMessage.java b/runelite-client/src/main/java/net/runelite/client/events/ChatMessage.java index 397aac2c58..6170ab9e9c 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/ChatMessage.java +++ b/runelite-client/src/main/java/net/runelite/client/events/ChatMessage.java @@ -24,41 +24,16 @@ */ package net.runelite.client.events; +import lombok.AllArgsConstructor; +import lombok.Data; import net.runelite.api.ChatMessageType; +@Data +@AllArgsConstructor public class ChatMessage { private ChatMessageType type; private String sender; private String message; private String clan; - - public ChatMessage(ChatMessageType type, String sender, String message, String clan) - { - this.type = type; - this.sender = sender; - this.message = message; - this.clan = clan; - } - - public ChatMessageType getType() - { - return this.type; - } - - public String getSender() - { - return this.sender; - } - - public String getMessage() - { - return this.message; - } - - public String getClan() - { - return this.clan; - } - } diff --git a/runelite-client/src/main/java/net/runelite/client/events/ConfigChanged.java b/runelite-client/src/main/java/net/runelite/client/events/ConfigChanged.java index ba30737994..8b91699e77 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/ConfigChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/ConfigChanged.java @@ -24,50 +24,13 @@ */ package net.runelite.client.events; +import lombok.Data; + +@Data public class ConfigChanged { private String group; private String key; private String oldValue; private String newValue; - - public String getGroup() - { - return group; - } - - public void setGroup(String group) - { - this.group = group; - } - - public String getKey() - { - return key; - } - - public void setKey(String key) - { - this.key = key; - } - - public String getOldValue() - { - return oldValue; - } - - public void setOldValue(String oldValue) - { - this.oldValue = oldValue; - } - - public String getNewValue() - { - return newValue; - } - - public void setNewValue(String newValue) - { - this.newValue = newValue; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/ExperienceChanged.java b/runelite-client/src/main/java/net/runelite/client/events/ExperienceChanged.java index 834f258103..a67323144d 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/ExperienceChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/ExperienceChanged.java @@ -25,30 +25,14 @@ package net.runelite.client.events; +import lombok.Data; import net.runelite.api.Skill; +@Data public class ExperienceChanged { /** * The {@link Skill} that had its experience changed. */ private Skill skill; - - /** - * Returns the {@link Skill} that had its experience changed - * @return the {@link Skill} that had its experience changed - */ - public Skill getSkill() - { - return skill; - } - - /** - * Sets the changed {@link Skill} to the specified {@link Skill}. - * @param skill the {@link Skill} that had its experience changed - */ - public void setSkill(Skill skill) - { - this.skill = skill; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/GameStateChanged.java b/runelite-client/src/main/java/net/runelite/client/events/GameStateChanged.java index fc0daf0c43..d598a9ce80 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/GameStateChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/GameStateChanged.java @@ -24,19 +24,11 @@ */ package net.runelite.client.events; +import lombok.Data; import net.runelite.api.GameState; +@Data public class GameStateChanged { private GameState gameState; - - public void setGameState(GameState gameState) - { - this.gameState = gameState; - } - - public GameState getGameState() - { - return gameState; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/GameTick.java b/runelite-client/src/main/java/net/runelite/client/events/GameTick.java index 02fb3f01d2..3e330d9bbd 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/GameTick.java +++ b/runelite-client/src/main/java/net/runelite/client/events/GameTick.java @@ -24,11 +24,14 @@ */ package net.runelite.client.events; +import lombok.Data; + /** * Event called once per tick. * * @author Adam */ +@Data public class GameTick { } diff --git a/runelite-client/src/main/java/net/runelite/client/events/MapRegionChanged.java b/runelite-client/src/main/java/net/runelite/client/events/MapRegionChanged.java index fd83910afc..f14b0eac1c 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/MapRegionChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/MapRegionChanged.java @@ -24,19 +24,12 @@ */ package net.runelite.client.events; +import lombok.Data; + +@Data public class MapRegionChanged { /** index into the region map that is changing */ private int index; - - public int getIndex() - { - return index; - } - - public void setIndex(int index) - { - this.index = index; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/MenuEntryAdded.java b/runelite-client/src/main/java/net/runelite/client/events/MenuEntryAdded.java index 6e8e225cfa..8f88b40e2e 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/MenuEntryAdded.java +++ b/runelite-client/src/main/java/net/runelite/client/events/MenuEntryAdded.java @@ -24,6 +24,11 @@ */ package net.runelite.client.events; +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor public class MenuEntryAdded { private String option; @@ -32,44 +37,4 @@ public class MenuEntryAdded private int identifier; private int actionParam0; private int actionParam1; - - public MenuEntryAdded(String option, String target, int type, int identifier, int actionParam0, int param1) - { - this.option = option; - this.target = target; - this.type = type; - this.identifier = identifier; - this.actionParam0 = actionParam0; - this.actionParam1 = param1; - } - - public String getOption() - { - return option; - } - - public String getTarget() - { - return target; - } - - public int getType() - { - return type; - } - - public int getIdentifier() - { - return identifier; - } - - public int getActionParam0() - { - return actionParam0; - } - - public int getActionParam1() - { - return actionParam1; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/MenuOptionClicked.java b/runelite-client/src/main/java/net/runelite/client/events/MenuOptionClicked.java index b228954f20..b2fd4c7af8 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/MenuOptionClicked.java +++ b/runelite-client/src/main/java/net/runelite/client/events/MenuOptionClicked.java @@ -24,12 +24,10 @@ */ package net.runelite.client.events; +import lombok.Data; import net.runelite.api.MenuAction; -/** - * - * @author robin - */ +@Data public class MenuOptionClicked { private String menuOption; @@ -37,55 +35,4 @@ public class MenuOptionClicked private MenuAction menuAction; private int id; private int widgetId; - - public String getMenuOption() - { - return menuOption; - } - - public void setMenuOption(String menuOption) - { - this.menuOption = menuOption; - } - - public String getMenuTarget() - { - return menuTarget; - } - - public void setMenuTarget(String menuTarget) - { - this.menuTarget = menuTarget; - } - - public MenuAction getMenuAction() - { - return menuAction; - } - - public void setMenuAction(MenuAction menuAction) - { - this.menuAction = menuAction; - } - - public int getId() - { - return id; - } - - public void setId(int id) - { - this.id = id; - } - - public int getWidgetId() - { - return widgetId; - } - - public void setWidgetId(int widgetId) - { - this.widgetId = widgetId; - } - } diff --git a/runelite-client/src/main/java/net/runelite/client/events/PlayerMenuOptionClicked.java b/runelite-client/src/main/java/net/runelite/client/events/PlayerMenuOptionClicked.java index 3192000689..47eafe3097 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/PlayerMenuOptionClicked.java +++ b/runelite-client/src/main/java/net/runelite/client/events/PlayerMenuOptionClicked.java @@ -24,28 +24,11 @@ */ package net.runelite.client.events; +import lombok.Data; + +@Data public class PlayerMenuOptionClicked { private String menuOption; private String menuTarget; - - public String getMenuOption() - { - return menuOption; - } - - public void setMenuOption(String menuOption) - { - this.menuOption = menuOption; - } - - public String getMenuTarget() - { - return menuTarget; - } - - public void setMenuTarget(String menuTarget) - { - this.menuTarget = menuTarget; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/PlayerMenuOptionsChanged.java b/runelite-client/src/main/java/net/runelite/client/events/PlayerMenuOptionsChanged.java index 9a97b8b3f0..2f2848bac5 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/PlayerMenuOptionsChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/PlayerMenuOptionsChanged.java @@ -24,21 +24,13 @@ */ package net.runelite.client.events; +import lombok.Data; + +@Data public class PlayerMenuOptionsChanged { /** * Index in playerOptions which changed */ private int index; - - public int getIndex() - { - return index; - } - - public void setIndex(int index) - { - this.index = index; - } - } diff --git a/runelite-client/src/main/java/net/runelite/client/events/ProjectileMoved.java b/runelite-client/src/main/java/net/runelite/client/events/ProjectileMoved.java index c38ee996d1..66a515a9ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/ProjectileMoved.java +++ b/runelite-client/src/main/java/net/runelite/client/events/ProjectileMoved.java @@ -24,42 +24,14 @@ */ package net.runelite.client.events; +import lombok.Data; import net.runelite.api.Point; import net.runelite.api.Projectile; +@Data public class ProjectileMoved { private Projectile projectile; private Point position; private int plane; - - public Projectile getProjectile() - { - return projectile; - } - - public void setProjectile(Projectile projectile) - { - this.projectile = projectile; - } - - public Point getPosition() - { - return position; - } - - public void setPosition(Point position) - { - this.position = position; - } - - public int getPlane() - { - return plane; - } - - public void setPlane(int plane) - { - this.plane = plane; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/ResizeableChanged.java b/runelite-client/src/main/java/net/runelite/client/events/ResizeableChanged.java index 971fbbd798..6c0f287a0a 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/ResizeableChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/ResizeableChanged.java @@ -26,17 +26,10 @@ package net.runelite.client.events; +import lombok.Data; + +@Data public class ResizeableChanged { private boolean isResized; - - public void setResized(boolean isResized) - { - this.isResized = isResized; - } - - public boolean isResized() - { - return this.isResized; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/SessionClose.java b/runelite-client/src/main/java/net/runelite/client/events/SessionClose.java index 83c656f77e..928d95260e 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/SessionClose.java +++ b/runelite-client/src/main/java/net/runelite/client/events/SessionClose.java @@ -24,6 +24,9 @@ */ package net.runelite.client.events; +import lombok.Data; + +@Data public class SessionClose { diff --git a/runelite-client/src/main/java/net/runelite/client/events/SessionOpen.java b/runelite-client/src/main/java/net/runelite/client/events/SessionOpen.java index ee9b01b4ad..4287353bd9 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/SessionOpen.java +++ b/runelite-client/src/main/java/net/runelite/client/events/SessionOpen.java @@ -24,10 +24,13 @@ */ package net.runelite.client.events; +import lombok.Data; + /** * Called when a session has been opened with the server * @author Adam */ +@Data public class SessionOpen { diff --git a/runelite-client/src/main/java/net/runelite/client/events/SetMessage.java b/runelite-client/src/main/java/net/runelite/client/events/SetMessage.java index 00409dc3e3..1eafac515d 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/SetMessage.java +++ b/runelite-client/src/main/java/net/runelite/client/events/SetMessage.java @@ -1,5 +1,6 @@ package net.runelite.client.events; +import lombok.Data; import net.runelite.api.ChatMessageType; import net.runelite.api.MessageNode; @@ -8,6 +9,7 @@ import net.runelite.api.MessageNode; * * @author Adam */ +@Data public class SetMessage { private MessageNode messageNode; @@ -15,54 +17,4 @@ public class SetMessage private String name; private String sender; private String value; - - public MessageNode getMessageNode() - { - return messageNode; - } - - public void setMessageNode(MessageNode messageNode) - { - this.messageNode = messageNode; - } - - public ChatMessageType getType() - { - return type; - } - - public void setType(ChatMessageType type) - { - this.type = type; - } - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } - - public String getSender() - { - return sender; - } - - public void setSender(String sender) - { - this.sender = sender; - } - - public String getValue() - { - return value; - } - - public void setValue(String value) - { - this.value = value; - } } diff --git a/runelite-client/src/main/java/net/runelite/client/events/VarbitChanged.java b/runelite-client/src/main/java/net/runelite/client/events/VarbitChanged.java index bc78c830d0..daf8a2d3f2 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/VarbitChanged.java +++ b/runelite-client/src/main/java/net/runelite/client/events/VarbitChanged.java @@ -26,6 +26,9 @@ package net.runelite.client.events; +import lombok.Data; + +@Data public class VarbitChanged { } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/events/WidgetMenuOptionClicked.java b/runelite-client/src/main/java/net/runelite/client/events/WidgetMenuOptionClicked.java index 2ab2ebc860..92f4411114 100644 --- a/runelite-client/src/main/java/net/runelite/client/events/WidgetMenuOptionClicked.java +++ b/runelite-client/src/main/java/net/runelite/client/events/WidgetMenuOptionClicked.java @@ -24,41 +24,13 @@ */ package net.runelite.client.events; +import lombok.Data; import net.runelite.api.widgets.WidgetInfo; +@Data public class WidgetMenuOptionClicked { private String menuOption; private String menuTarget; private WidgetInfo widget; - - public String getMenuOption() - { - return menuOption; - } - - public void setMenuOption(String menuOption) - { - this.menuOption = menuOption; - } - - public String getMenuTarget() - { - return menuTarget; - } - - public void setMenuTarget(String menuTarget) - { - this.menuTarget = menuTarget; - } - - public WidgetInfo getWidget() - { - return widget; - } - - public void setWidget(WidgetInfo widget) - { - this.widget = widget; - } }