project: Merge upstream

arthiman · Feb 17, 2020 · 4fe996b · 4fe996b
2 parents 90fa820 + d347e3a
commit 4fe996b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/gradlew b/gradlew
diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
@@ -94,6 +94,7 @@ public class WidgetID
 	public static final int CLUE_SCROLL_REWARD_GROUP_ID = 73;
 	public static final int BARROWS_REWARD_GROUP_ID = 155;
 	public static final int RAIDS_GROUP_ID = 513;
+	public static final int TOB_PARTY_GROUP_ID = 28;
 	public static final int MOTHERLODE_MINE_GROUP_ID = 382;
 	public static final int MOTHERLODE_MINE_FULL_INVENTORY_GROUP_ID = 229;
 	public static final int EXPERIENCE_DROP_GROUP_ID = 122;
@@ -694,6 +695,12 @@ static class TheatreOfBloodParty
 		static final int CONTAINER = 10;
 	}
 
+	static class Tob
+	{
+		static final int PARTY_INTERFACE = 6;
+		static final int PARTY_STATS = 10;
+	}
+
 	static class ExperienceDrop
 	{
 		static final int DROP_1 = 15;

diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
@@ -458,6 +458,9 @@ public enum WidgetInfo
 	THEATRE_OF_BLOOD_BOSS_HEALTH(WidgetID.THEATRE_OF_BLOOD_GROUP_ID, WidgetID.TheatreOfBlood.BOSS_HEALTH_BAR),
 	THEATRE_OF_BLOOD_RAIDING_PARTY(WidgetID.THEATRE_OF_BLOOD_GROUP_ID, WidgetID.TheatreOfBlood.RAIDING_PARTY),
 
+	TOB_PARTY_INTERFACE(WidgetID.TOB_PARTY_GROUP_ID, WidgetID.Tob.PARTY_INTERFACE),
+	TOB_PARTY_STATS(WidgetID.TOB_PARTY_GROUP_ID, WidgetID.Tob.PARTY_STATS),
+
 	BLAST_FURNACE_COFFER(WidgetID.BLAST_FURNACE_GROUP_ID, 2),
 
 	PYRAMID_PLUNDER_DATA(WidgetID.PYRAMID_PLUNDER_GROUP_ID, 2),

diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java
@@ -46,6 +46,8 @@ public class WidgetOverlay extends Overlay
 		.put(WidgetInfo.FOSSIL_ISLAND_OXYGENBAR, OverlayPosition.TOP_LEFT)
 		.put(WidgetInfo.EXPERIENCE_TRACKER_WIDGET, OverlayPosition.TOP_RIGHT)
 		.put(WidgetInfo.RAIDS_POINTS_INFOBOX, OverlayPosition.TOP_RIGHT)
+		.put(WidgetInfo.TOB_PARTY_INTERFACE, OverlayPosition.TOP_LEFT)
+		.put(WidgetInfo.TOB_PARTY_STATS, OverlayPosition.TOP_LEFT)
 		.put(WidgetInfo.GWD_KC, OverlayPosition.TOP_RIGHT)
 		.put(WidgetInfo.TITHE_FARM, OverlayPosition.TOP_RIGHT)
 		.put(WidgetInfo.PEST_CONTROL_BOAT_INFO, OverlayPosition.TOP_LEFT)

diff --git a/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java b/runelite-client/src/main/java/net/runelite/client/util/ImageCapture.java
@@ -115,7 +115,7 @@ else if (worldTypes.contains(WorldType.LEAGUE))
 
 		playerFolder.mkdirs();
 
-		fileName +=  " " + format(new Date());
+		fileName += (fileName.isEmpty() ? "" : " ") + format(new Date());
 
 		try
 		{
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,7 +115,7 @@ else if (worldTypes.contains(WorldType.LEAGUE)) @@
     		playerFolder.mkdirs();
-    		fileName +=  " " + format(new Date());
+    		fileName += (fileName.isEmpty() ? "" : " ") + format(new Date());
     		try
     		{
@@ Expand Down @@