v1.13.0

Author: unknown

README.md

@@ -14,11 +14,14 @@ A plugin which allows you to customize XP drops in more ways than the default OS
 - Customize which skills to filter from showing XP drops at all.
 - Attach XP drop location to in game player model.
 - Add a custom prefix and suffix to the XP drop text.
-- Show predicted damage from XP drop.
+- Show predicted damage from XP drop. 
 - Replace the XP tracker widget with a minimalistic one.
 - Export your plugin settings to share with a friend by right-clicking the xp orb in-game.
+- Show predicted hits with vanilla XP drops. `Use Customizable XP drops` off and `Show prdicted hit` on.
+- Show predicted hits from party members.
 
 #### Change log
+- v1.13.0 - Show XP drops/predicted hits from party members.
 - v1.12.1 - Fix regression for a combination of settings, added special attack to predicted hit message, added predicted hit message to party.
 - v1.12.0 - Add plugin message for predicted hit.
 - v1.11.0 - Add `Use Customizable XP drops` setting. It's on by default. If off the xp tracker and predicted hits can still function.
@@ -113,7 +116,7 @@ Round of experience gained happens on the server before it is sent to the client
 Furthermore, some monsters in OSRS give bonus experience in the form of a multiplier over the experience gained.
 This plugin tries to use the same multipliers per monster but the list is incomplete leading to incorrect predicted hits.
 
-#### Predicted hits plugin/party message
+#### Predicted hits plugin message
 This plugin emits a message over the event bus when a hit is predicted. Under namespace `customizable-xp-drops` and name `predicted-hit`.
 The data field of this message is a map with a key `value` in which a JSON string is stored which contains all the information about the predicted hit.
 Copy over [PredictedHit.java](src/main/java/com/xpdrops/predictedhit/PredictedHit.java) to your own plugin and use this to deserialize the JSON string under the aforementioned `value` key in the data map.\
@@ -131,19 +134,6 @@ protected void onPluginMessage(PluginMessage pluginMessage)
     }
 }
 ```
-When `Send predicted hits over party` under `Miscellaneous` is turned on the plugin also sends this message over the party service.
-Copy over  [PredictedHit.java](src/main/java/com/xpdrops/predictedhit/PredictedHit.java) and [PredictedHitPartyMessage.java](src/main/java/com/xpdrops/predictedhit/PredictedHitPartyMessage.java) to your plugin and register the message with
-```java
-wsClient.registerMessage(PredictedHitPartyMessage.class);
-```
-Example for listening to the party message
-```java
-@Subscribe
-protected void onPredictedHitPartyMessage(PredictedHitPartyMessage partyMessage)
-{
-    log.debug("Hit {} special attack {}", partyMessage.getPredictedHit().getHit(), partyMessage.getPredictedHit().isSpecialAttack());
-}
-```
 
 #### XP drops are delayed
 Try increasing the `Vertical XP drop speed` and/or lowering the `XP drop delay` settings. 

build.gradle

@@ -33,7 +33,7 @@ dependencies {
 }
 
 group = 'com.xpdrops'
-version = '1.12.1'
+version = '1.13.0'
 sourceCompatibility = '1.8'
 
 tasks.withType(JavaCompile).configureEach {

src/main/java/com/xpdrops/CustomizableXpDropsPlugin.java

@@ -10,7 +10,7 @@
 import com.xpdrops.overlay.XpDropOverlayManager;
 import com.xpdrops.predictedhit.Hit;
 import com.xpdrops.predictedhit.PredictedHit;
-import com.xpdrops.predictedhit.PredictedHitPartyMessage;
+import com.xpdrops.predictedhit.party.PredictedHitPartyManager;
 import com.xpdrops.predictedhit.XpDropDamageCalculator;
 import com.xpdrops.predictedhit.npcswithscalingbonus.ChambersLayoutSolver;
 import lombok.Getter;
@@ -45,11 +45,10 @@
 import net.runelite.client.events.ConfigChanged;
 import net.runelite.client.events.PluginMessage;
 import net.runelite.client.game.ItemVariationMapping;
-import net.runelite.client.party.PartyService;
-import net.runelite.client.party.WSClient;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDependency;
 import net.runelite.client.plugins.PluginDescriptor;
+import net.runelite.client.plugins.party.PartyPlugin;
 import net.runelite.client.plugins.xptracker.XpTrackerPlugin;
 import net.runelite.client.util.Text;
 
@@ -65,8 +64,11 @@
 
 import static net.runelite.api.ScriptID.XPDROPS_SETDROPSIZE;
 
+// Depends on XpTrackerPlugin for custom xp tracker
 @PluginDependency(XpTrackerPlugin.class)
-// Plugin class and xp drop manager
+// Depends on PartyPlugin for PartyConfig
+@PluginDependency(PartyPlugin.class)
+// Plugin class
 @PluginDescriptor(
 	name = "Customizable XP drops",
 	description = "Allows one to use fully customizable xp drops independent of the in-game ones"
@@ -112,10 +114,7 @@ public class CustomizableXpDropsPlugin extends Plugin
 	private Gson gson;
 
 	@Inject
-	private PartyService partyService;
-
-	@Inject
-	private WSClient wsClient;
+	private PredictedHitPartyManager predictedHitPartyManager;
 
 	@Provides
 	XpDropsConfig provideConfig(ConfigManager configManager)
@@ -207,7 +206,7 @@ protected void startUp()
 
 		importExport.addImportExportMenuOptions();
 
-		wsClient.registerMessage(PredictedHitPartyMessage.class);
+		predictedHitPartyManager.startUp();
 
 		long totalTime = System.currentTimeMillis() - time;
 		log.debug("Plugin took {}ms to start.", totalTime);
@@ -248,9 +247,9 @@ else if ((attackStyle == AttackStyle.CASTING) && (castingMode == 1))
 	protected void shutDown()
 	{
 		xpDropOverlayManager.shutdown();
-		setXpTrackerHidden(false); // should be according to varbit?
+		setXpTrackerHidden(false);
 		importExport.removeMenuOptions();
-		wsClient.unregisterMessage(PredictedHitPartyMessage.class);
+		predictedHitPartyManager.shutDown();
 	}
 
 	protected void setXpTrackerHidden(boolean hidden)
@@ -505,6 +504,7 @@ protected void onStatChanged(StatChanged event)
 	protected void onBeforeRender(BeforeRender beforeRender)
 	{
 		xpDropOverlayManager.update();
+		predictedHitPartyManager.update();
 	}
 
 	@Subscribe
@@ -623,10 +623,6 @@ private void postPredictedHit(PredictedHit hit)
 		HashMap<String, Object> data = new HashMap<>();
 		data.put("value", gson.toJson(hit));
 		eventBus.post(new PluginMessage(namespace, name, data));
-
-		if (config.predictedHitOverParty() && partyService.isInParty())
-		{
-			partyService.send(new PredictedHitPartyMessage(hit));
-		}
+		predictedHitPartyManager.postPredictedHit(hit);
 	}
 }