project: merge upstream

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

@@ -24,14 +24,25 @@
  */
 package net.runelite.api.events;
 
+import javax.annotation.Nullable;
 import lombok.Data;
+import net.runelite.api.Actor;
 
 @Data
 public class AreaSoundEffectPlayed implements Event
 {
+	@Nullable
+	private final Actor source;
 	private int soundId;
 	private int sceneX;
 	private int sceneY;
 	private int range;
 	private int delay;
+
+	private boolean consumed;
+
+	public void consume()
+	{
+		consumed = true;
+	}
 }

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

@@ -24,11 +24,22 @@
  */
 package net.runelite.api.events;
 
+import javax.annotation.Nullable;
 import lombok.Data;
+import net.runelite.api.Actor;
 
 @Data
 public class SoundEffectPlayed implements Event
 {
+	@Nullable
+	private final Actor source;
 	private int soundId;
 	private int delay;
+
+	private boolean consumed;
+
+	public void consume()
+	{
+		consumed = true;
+	}
 }

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

@@ -1,15 +1,16 @@
 /*
- * Copyright (c) 2017, Adam <Adam@sigterm.info>
+ * Copyright (c) 2019, 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.
+ *     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 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
@@ -24,12 +25,17 @@
  */
 package net.runelite.api.events;
 
+import lombok.Value;
+
+@Value
 public class VolumeChanged implements Event
 {
-	public static final VolumeChanged INSTANCE = new VolumeChanged();
-
-	private VolumeChanged()
+	public enum Type
 	{
-		// noop
+		MUSIC,
+		EFFECTS,
+		AREA
 	}
-}
+
+	private final Type type;
+}