project: Java 17 support, update deps, rework some stupid logic

runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, HSJ <https://github.com/HSJ-OSRS>
+ * Copyright (c) 2018, Matthew Steglinski <https://github.com/sainttx>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,5 +33,5 @@ import net.runelite.api.Actor;
 @Value
 public class ActorDeath
 {
-	Actor actor;
+	private final Actor actor;
 }

runelite-api/src/main/java/net/runelite/api/events/AnimationChanged.java

@@ -1,7 +1,31 @@
+/*
+ * Copyright (c) 2016-2017, Abel Briggs
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package net.runelite.api.events;
 
-import net.runelite.api.Actor;
 import lombok.Data;
+import net.runelite.api.Actor;
 
 /**
  * An event where the {@link Actor} has changed animations.

runelite-api/src/main/java/net/runelite/api/events/AreaSoundEffectPlayed.java

@@ -33,7 +33,6 @@ public class AreaSoundEffectPlayed
 {
 	@Nullable
 	private final Actor source;
-
 	private int soundId;
 	private int sceneX;
 	private int sceneY;

runelite-api/src/main/java/net/runelite/api/events/ChatMessage.java

@@ -24,11 +24,11 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.ChatMessageType;
-import net.runelite.api.MessageNode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import net.runelite.api.ChatMessageType;
+import net.runelite.api.MessageNode;
 
 /**
  * An event where a new chat message is received.

runelite-api/src/main/java/net/runelite/api/events/CommandExecuted.java

@@ -47,9 +47,9 @@ public class CommandExecuted
 	/**
 	 * The name of the command entered.
 	 */
-	String command;
+	private String command;
 	/**
 	 * The command arguments that have been entered.
 	 */
-	String[] arguments;
+	private String[] arguments;
 }

runelite-api/src/main/java/net/runelite/api/events/DecorativeObjectChanged.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.DecorativeObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where the {@link DecorativeObject} attached to a {@link Tile}

runelite-api/src/main/java/net/runelite/api/events/DecorativeObjectDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.DecorativeObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where the {@link DecorativeObject} attached to a {@link Tile}

runelite-api/src/main/java/net/runelite/api/events/DecorativeObjectSpawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.DecorativeObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where a {@link DecorativeObject} is attached to a {@link Tile}.

runelite-api/src/main/java/net/runelite/api/events/FakeXpDrop.java

@@ -30,6 +30,6 @@ import net.runelite.api.Skill;
 @Value
 public class FakeXpDrop
 {
-	Skill skill;
-	int xp;
+	private final Skill skill;
+	private final int xp;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatChanged.java

@@ -35,5 +35,5 @@ public class FriendsChatChanged
 	/**
 	 * Whether or not the client is now in a friends chat.
 	 */
-	boolean joined;
+	private boolean joined;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatMemberJoined.java

@@ -33,5 +33,5 @@ public class FriendsChatMemberJoined
 	/**
 	 * The member that joined
 	 */
-	FriendsChatMember member;
+	private FriendsChatMember member;
 }

runelite-api/src/main/java/net/runelite/api/events/FriendsChatMemberLeft.java

@@ -33,5 +33,5 @@ public class FriendsChatMemberLeft
 	/**
 	 * The member that left
 	 */
-	FriendsChatMember member;
+	private FriendsChatMember member;
 }

runelite-api/src/main/java/net/runelite/api/events/GameObjectDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.GameObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where a {@link GameObject} on a {@link Tile} is removed.

runelite-api/src/main/java/net/runelite/api/events/GameObjectSpawned.java

@@ -37,9 +37,9 @@ public class GameObjectSpawned
 	/**
 	 * The affected tile.
 	 */
-	Tile tile;
+	private Tile tile;
 	/**
 	 * The newly spawned game object.
 	 */
-	GameObject gameObject;
+	private GameObject gameObject;
 }

runelite-api/src/main/java/net/runelite/api/events/GameStateChanged.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.GameState;
 import lombok.Data;
+import net.runelite.api.GameState;
 
 /**
  * An event where the clients game state has changed.

runelite-api/src/main/java/net/runelite/api/events/GrandExchangeOfferChanged.java

@@ -24,20 +24,21 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.GrandExchangeOffer;
 import lombok.Data;
+import net.runelite.api.GrandExchangeOffer;
+import net.runelite.api.GrandExchangeOfferState;
 
 /**
- * An event where a {GrandExchangeOffer} has been updated with
+ * An event where a {@link GrandExchangeOffer} has been updated with
  * new information.
  * <p>
  * When the client initially logs in, this event is called for all grand
- * exchange slots with the {GrandExchangeOfferState#EMPTY} state,
+ * exchange slots with the {@link GrandExchangeOfferState#EMPTY} state,
  * regardless of whether any slots have offers. Once the exchange is
  * initialized, the client then updates any offers with items as it
  * receives information from the server.
  * <p>
- * See {GrandExchangeOfferState} for potential states an offer
+ * See {@link GrandExchangeOfferState} for potential states an offer
  * can change into.
  */
 @Data

runelite-api/src/main/java/net/runelite/api/events/GraphicChanged.java

@@ -1,3 +1,27 @@
+/*
+ * Copyright (c) 2018, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package net.runelite.api.events;
 
 import lombok.Data;

runelite-api/src/main/java/net/runelite/api/events/GraphicsObjectCreated.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.GraphicsObject;
 import lombok.Value;
+import net.runelite.api.GraphicsObject;
 
 /**
  * An event where a new {@link GraphicsObject} has been created.
@@ -36,5 +36,5 @@ public class GraphicsObjectCreated
 	/**
 	 * The newly created graphics object.
 	 */
-	GraphicsObject graphicsObject;
+	private final GraphicsObject graphicsObject;
 }

runelite-api/src/main/java/net/runelite/api/events/GroundObjectChanged.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.GroundObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where the {@link GroundObject} on a {@link Tile} has been changed.

runelite-api/src/main/java/net/runelite/api/events/GroundObjectDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.GroundObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where a {@link GroundObject} on a {@link Tile} has been removed.

runelite-api/src/main/java/net/runelite/api/events/GroundObjectSpawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.GroundObject;
 import net.runelite.api.Tile;
-import lombok.Data;
 
 /**
  * An event where a {@link GroundObject} is added to a {@link Tile}.

runelite-api/src/main/java/net/runelite/api/events/HitsplatApplied.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.Actor;
 import net.runelite.api.Hitsplat;
-import lombok.Data;
 
 /**
  * An event called when a {@link Hitsplat} is processed on an {@link Actor}.

runelite-api/src/main/java/net/runelite/api/events/InteractingChanged.java

@@ -1,7 +1,31 @@
+/*
+ * Copyright (c) 2018, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package net.runelite.api.events;
 
-import net.runelite.api.Actor;
 import lombok.Value;
+import net.runelite.api.Actor;
 
 /**
  * An event called when the actor an actor is interacting with changes
@@ -9,10 +33,10 @@ import lombok.Value;
 @Value
 public class InteractingChanged
 {
-	Actor source;
+	private final Actor source;
 
 	/**
 	 * Target actor, may be null
 	 */
-	Actor target;
+	private final Actor target;
 }

runelite-api/src/main/java/net/runelite/api/events/ItemContainerChanged.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.ItemContainer;
 import lombok.Value;
+import net.runelite.api.ItemContainer;
 
 /**
  * An event called whenever the stack size of an {@link net.runelite.api.Item}
@@ -44,10 +44,10 @@ public class ItemContainerChanged
 	/**
 	 * The modified container's ID.
 	 */
-	int containerId;
+	private final int containerId;
 
 	/**
 	 * The modified item container.
 	 */
-	ItemContainer itemContainer;
+	private final ItemContainer itemContainer;
 }

runelite-api/src/main/java/net/runelite/api/events/ItemDespawned.java

@@ -25,9 +25,8 @@
 package net.runelite.api.events;
 
 import lombok.Value;
-import net.runelite.api.TileItem;
 import net.runelite.api.Tile;
-import lombok.Value;
+import net.runelite.api.TileItem;
 
 /**
  * Called when an item pile despawns from the ground. When the client loads a new scene,
@@ -36,6 +35,6 @@ import lombok.Value;
 @Value
 public class ItemDespawned
 {
-	Tile tile;
-	TileItem item;
+	private final Tile tile;
+	private final TileItem item;
 }

runelite-api/src/main/java/net/runelite/api/events/ItemQuantityChanged.java

@@ -25,9 +25,8 @@
 package net.runelite.api.events;
 
 import lombok.Value;
-import net.runelite.api.TileItem;
 import net.runelite.api.Tile;
-import lombok.Value;
+import net.runelite.api.TileItem;
 
 /**
  * Called when the quantity of an item pile changes.
@@ -35,8 +34,8 @@ import lombok.Value;
 @Value
 public class ItemQuantityChanged
 {
-	TileItem item;
-	Tile tile;
-	int oldQuantity;
-	int newQuantity;
+	private final TileItem item;
+	private final Tile tile;
+	private final int oldQuantity;
+	private final int newQuantity;
 }

runelite-api/src/main/java/net/runelite/api/events/ItemSpawned.java

@@ -25,9 +25,8 @@
 package net.runelite.api.events;
 
 import lombok.Value;
-import net.runelite.api.TileItem;
 import net.runelite.api.Tile;
-import lombok.Value;
+import net.runelite.api.TileItem;
 
 /**
  * Called when an item pile spawns on the ground. When the client loads a new scene,
@@ -36,6 +35,6 @@ import lombok.Value;
 @Value
 public class ItemSpawned
 {
-	Tile tile;
-	TileItem item;
+	private final Tile tile;
+	private final TileItem item;
 }

runelite-api/src/main/java/net/runelite/api/events/NameableNameChanged.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.Nameable;
 import lombok.Value;
+import net.runelite.api.Nameable;
 
 /**
  * An event where a {@link Nameable} has had their name changed.
@@ -36,5 +36,5 @@ public class NameableNameChanged
 	/**
 	 * The nameable that changed names.
 	 */
-	Nameable nameable;
+	private final Nameable nameable;
 }

runelite-api/src/main/java/net/runelite/api/events/NpcChanged.java

@@ -37,11 +37,10 @@ public class NpcChanged
 	/**
 	 * The NPC of which the composition changed.
 	 */
-	NPC npc;
-
+	private final NPC npc;
 
 	/**
 	 * The old composition of the NPC
 	 */
-	NPCComposition old;
-}
+	private final NPCComposition old;
+}

runelite-api/src/main/java/net/runelite/api/events/NpcDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Value;
 import net.runelite.api.Actor;
 import net.runelite.api.NPC;
-import lombok.Value;
 
 /**
  * An event where an {@link NPC} has despawned.
@@ -37,7 +37,7 @@ public class NpcDespawned
 	/**
 	 * The despawned NPC.
 	 */
-	NPC npc;
+	private final NPC npc;
 
 	public Actor getActor()
 	{

runelite-api/src/main/java/net/runelite/api/events/NpcSpawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Value;
 import net.runelite.api.Actor;
 import net.runelite.api.NPC;
-import lombok.Value;
 
 /**
  * An event where an {@link NPC} has spawned.
@@ -37,7 +37,7 @@ public class NpcSpawned
 	/**
 	 * The spawned NPC.
 	 */
-	NPC npc;
+	private final NPC npc;
 
 	public Actor getActor()
 	{

runelite-api/src/main/java/net/runelite/api/events/OverheadTextChanged.java

@@ -1,12 +1,39 @@
+/*
+ * Copyright (c) 2018, Magic fTail
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 package net.runelite.api.events;
 
-import net.runelite.api.Actor;
 import lombok.Value;
+import net.runelite.api.Actor;
 
+/**
+ * Event fired when an actors overhead text is changed.
+ */
 @Value
 public class OverheadTextChanged
 {
-	Actor actor;
+	private final Actor actor;
 
-	String overheadText;
+	private final String overheadText;
 }

runelite-api/src/main/java/net/runelite/api/events/PlayerDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Value;
 import net.runelite.api.Actor;
 import net.runelite.api.Player;
-import lombok.Value;
 
 /**
  * An event where a {@link Player} has despawned.
@@ -39,7 +39,7 @@ public class PlayerDespawned
 	/**
 	 * The despawned player.
 	 */
-	Player player;
+	private final Player player;
 
 	public Actor getActor()
 	{

runelite-api/src/main/java/net/runelite/api/events/PlayerSpawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Value;
 import net.runelite.api.Actor;
 import net.runelite.api.Player;
-import lombok.Value;
 
 /**
  * An event where a {@link Player} has spawned.
@@ -37,7 +37,7 @@ public class PlayerSpawned
 	/**
 	 * The spawned player.
 	 */
-	Player player;
+	private final Player player;
 
 	public Actor getActor()
 	{

runelite-api/src/main/java/net/runelite/api/events/PostHealthBar.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.HealthBar;
 import lombok.Data;
+import net.runelite.api.HealthBar;
 
 @Data
 public class PostHealthBar

runelite-api/src/main/java/net/runelite/api/events/ProjectileMoved.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.Projectile;
 import net.runelite.api.coords.LocalPoint;
-import lombok.Data;
 
 /**
  * An event called whenever a {@link Projectile} has moved towards a point.

runelite-api/src/main/java/net/runelite/api/events/RemovedFriend.java

@@ -37,4 +37,4 @@ public class RemovedFriend
 	 * The removed friend or ignore entry
 	 */
 	private final Nameable nameable;
-}
+}

runelite-api/src/main/java/net/runelite/api/events/ScriptCallbackEvent.java

@@ -24,8 +24,8 @@
  */
 package net.runelite.api.events;
 
-import net.runelite.api.Script;
 import lombok.Data;
+import net.runelite.api.Script;
 
 /**
  * A callback from a runelite_callback opcode in a cs2

runelite-api/src/main/java/net/runelite/api/events/ScriptPostFired.java

@@ -35,5 +35,5 @@ public class ScriptPostFired
 	/**
 	 * The script id of the invoked script
 	 */
-	int scriptId;
+	private final int scriptId;
 }

runelite-api/src/main/java/net/runelite/api/events/ScriptPreFired.java

@@ -24,22 +24,22 @@
  */
 package net.runelite.api.events;
 
-import lombok.Value;
+import lombok.Data;
 import net.runelite.api.ScriptEvent;
 
 /**
  * An event that is fired before the designated script is ran
  */
-@Value
+@Data
 public class ScriptPreFired
 {
 	/**
 	 * The script id of the invoked script
 	 */
-	int scriptId;
+	private final int scriptId;
 
 	/**
 	 * The input of the script invoke, this will be null unless it is the root script
 	 */
-	ScriptEvent scriptEvent;
+	private ScriptEvent scriptEvent;
 }

runelite-api/src/main/java/net/runelite/api/events/SoundEffectPlayed.java

@@ -33,10 +33,8 @@ public class SoundEffectPlayed
 {
 	@Nullable
 	private final Actor source;
-
 	private int soundId;
 	private int delay;
-	private int npcid;
 
 	private boolean consumed;
 

runelite-api/src/main/java/net/runelite/api/events/StatChanged.java

@@ -33,8 +33,8 @@ import net.runelite.api.Skill;
 @Value
 public class StatChanged
 {
-	Skill skill;
-	int xp;
-	int level;
-	int boostedLevel;
+	private final Skill skill;
+	private final int xp;
+	private final int level;
+	private final int boostedLevel;
 }

runelite-api/src/main/java/net/runelite/api/events/VarClientIntChanged.java

@@ -28,11 +28,10 @@ package net.runelite.api.events;
 import lombok.Value;
 
 /**
- * An event where a client int var has changed.
  * @see net.runelite.api.VarClientInt
  */
 @Value
 public class VarClientIntChanged
 {
-	int index;
+	private int index;
 }

runelite-api/src/main/java/net/runelite/api/events/VarClientStrChanged.java

@@ -28,11 +28,10 @@ package net.runelite.api.events;
 import lombok.Value;
 
 /**
- * An event where a client var string has changed.
  * @see net.runelite.api.VarClientStr
  */
 @Value
 public class VarClientStrChanged
 {
-	int index;
+	private int index;
 }

runelite-api/src/main/java/net/runelite/api/events/VolumeChanged.java

@@ -37,5 +37,5 @@ public class VolumeChanged
 		AREA
 	}
 
-	Type type;
-}
+	private final Type type;
+}

runelite-api/src/main/java/net/runelite/api/events/WallObjectChanged.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.Tile;
 import net.runelite.api.WallObject;
-import lombok.Data;
 
 /**
  * An event where the {@link WallObject} of a {@link Tile} has been changed.

runelite-api/src/main/java/net/runelite/api/events/WallObjectDespawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.Tile;
 import net.runelite.api.WallObject;
-import lombok.Data;
 
 /**
  * An event where a {@link WallObject} on a {@link Tile} has been removed.

runelite-api/src/main/java/net/runelite/api/events/WallObjectSpawned.java

@@ -24,9 +24,9 @@
  */
 package net.runelite.api.events;
 
+import lombok.Data;
 import net.runelite.api.Tile;
 import net.runelite.api.WallObject;
-import lombok.Data;
 
 /**
  * An event where a {@link WallObject} is added to a {@link Tile}.

runelite-api/src/main/java/net/runelite/api/events/WorldChanged.java

@@ -36,4 +36,4 @@ import net.runelite.api.Client;
  */
 public class WorldChanged
 {
-}
+}

runelite-api/src/main/java/net/runelite/api/events/WorldListLoad.java

@@ -1,37 +1,37 @@
-/*
- * Copyright (c) 2018, Adam <Adam@sigterm.info>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-package net.runelite.api.events;
-
-import net.runelite.api.World;
-import lombok.Value;
-
-/**
- * Event when the world list is loaded for the world switcher
- */
-@Value
-public class WorldListLoad
-{
-	World[] worlds;
-}
+/*
+ * Copyright (c) 2018, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.api.events;
+
+import lombok.Value;
+import net.runelite.api.World;
+
+/**
+ * Event when the world list is loaded for the world switcher
+ */
+@Value
+public class WorldListLoad
+{
+	private final World[] worlds;
+}