Update resource-packs to 1.4.5

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Change log
 
+### 1.4.5
+- Add the Giants foundry button borders
+- Add the activity adviser minimap orb and the icon
+- Add hitpoints low life minimap orb icon
+- Add Greater and Lesser corruption prayer minimap orb icons
+- Fix the Grand Exchange offer completion borders (Note: This requires pack owners to update ge/border_offer_right.png)
+
 ### 1.4.4
 - Add the new group ironman sprites
 - Add minimap orb frame flashing (seems to only be used in tutorial island)

build.gradle

@@ -27,7 +27,7 @@ dependencies {
 }
 
 group = 'melky.resourcepacks'
-version = '1.4.4'
+version = '1.4.5'
 sourceCompatibility = '1.8'
 
 tasks.withType(JavaCompile) {

src/main/java/melky/resourcepacks/SpriteOverride.java

@@ -197,6 +197,15 @@ enum SpriteOverride
 	BUTTON_MENU(2289, Folder.BUTTON),
 	BUTTON_MENU_SELECTED(2290, Folder.BUTTON),
 
+	BUTTON_GIANTS_FOUNDRY_EDGE_TOP(3528, Folder.BUTTON),
+	BUTTON_GIANTS_FOUNDRY_EDGE_BOTTOM(3529, Folder.BUTTON),
+	BUTTON_GIANTS_FOUNDRY_EDGE_LEFT(3530, Folder.BUTTON),
+	BUTTON_GIANTS_FOUNDRY_EDGE_RIGHT(3531, Folder.BUTTON),
+	BUTTON_GIANTS_FOUNDRY_CORNER_TOP_LEFT(3524, Folder.BUTTON),
+	BUTTON_GIANTS_FOUNDRY_CORNER_TOP_RIGHT(3525, Folder.BUTTON),
+	BUTTON_GIANTS_FOUNDRY_CORNER_BOTTOM_LEFT(3526, Folder.BUTTON),
+	BUTTON_GIANTS_FOUNDRY_CORNER_BOTTOM_RIGHT(3527, Folder.BUTTON),
+
 	SKILL_ATTACK(SpriteID.SKILL_ATTACK, Folder.SKILL),
 	SKILL_STRENGTH(SpriteID.SKILL_STRENGTH, Folder.SKILL),
 	SKILL_DEFENCE(SpriteID.SKILL_DEFENCE, Folder.SKILL),
@@ -278,7 +287,10 @@ enum SpriteOverride
 	MINIMAP_ORB_RUN_ACTIVATED(SpriteID.MINIMAP_ORB_RUN_ACTIVATED, Folder.OTHER),
 	MINIMAP_ORB_PRAYER_ACTIVATED(SpriteID.MINIMAP_ORB_PRAYER_ACTIVATED, Folder.OTHER),
 	MINIMAP_ORB_HITPOINTS_ICON(SpriteID.MINIMAP_ORB_HITPOINTS_ICON, Folder.OTHER),
+	MINIMAP_ORB_HITPOINTS_LOW_LIFE_ICON(3017, Folder.OTHER),
 	MINIMAP_ORB_PRAYER_ICON(SpriteID.MINIMAP_ORB_PRAYER_ICON, Folder.OTHER),
+	MINIMAP_ORB_PRAYER_LESSER_CORRUPTION_ICON(3015, Folder.OTHER),
+	MINIMAP_ORB_PRAYER_GREATER_CORRUPTION_ICON(3016, Folder.OTHER),
 	MINIMAP_ORB_RUN_ICON(SpriteID.MINIMAP_ORB_WALK_ICON, Folder.OTHER),
 	MINIMAP_ORB_RUN_ICON_ACTIVATED(SpriteID.MINIMAP_ORB_RUN_ICON, Folder.OTHER),
 	MINIMAP_ORB_SPECIAL(SpriteID.MINIMAP_ORB_SPECIAL, Folder.OTHER),
@@ -287,6 +299,8 @@ enum SpriteOverride
 	MINIMAP_ORB_STORE(1609, Folder.OTHER),
 	MINIMAP_ORB_STORE_ICON(1668, Folder.OTHER),
 	MINIMAP_ORB_RUN_ICON_SLOWED_DEPLETION(SpriteID.MINIMAP_ORB_RUN_ICON_SLOWED_DEPLETION, Folder.OTHER),
+	MINIMAP_ORB_ACTIVITY_ADVISER(4547, Folder.OTHER),
+	MINIMAP_ORB_ACTIVITY_ADVISER_ICON(3018, Folder.OTHER),
 
 	OLD_SCHOOL_MODE_SIDE_PANEL_EDGE_LEFT_UPPER(SpriteID.OLD_SCHOOl_MODE_SIDE_PANEL_EDGE_LEFT_UPPER, Folder.OTHER),
 	OLD_SCHOOL_MODE_SIDE_PANEL_EDGE_LEFT_LOWER(SpriteID.OLD_SCHOOl_MODE_SIDE_PANEL_EDGE_LEFT_LOWER, Folder.OTHER),

src/main/java/melky/resourcepacks/WidgetOverride.java

@@ -15,16 +15,16 @@ public enum WidgetOverride
 	GE_BORDER_SELL_INNER(GE_OFFERS_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, new int[]{7, 8, 9, 10, 11, 12, 13, 14}, 1),
 	GE_BORDER_SELL_OUTER(GE_OFFERS_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, new int[]{7, 8, 9, 10, 11, 12, 13, 14}, 4),
 
-	GE_BORDER_OFFER_BUY_OFFER_FULL_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 14),
-	GE_BORDER_OFFER_BUY_OFFER_FULL_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 15),
-	GE_BORDER_OFFER_BUY_OFFER_BOTTOM_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 16),
-	GE_BORDER_OFFER_BUY_OFFER_BOTTOM_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 17),
-	GE_BORDER_OFFER_CHOOSE_ITEM_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 23),
-	GE_BORDER_OFFER_CHOOSE_ITEM_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 24),
-	GE_BORDER_OFFER_QUANTITY_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 26),
-	GE_BORDER_OFFER_QUANTITY_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 27),
-	GE_BORDER_OFFER_PRICE_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 33),
-	GE_BORDER_OFFER_PRICE_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 24, 34),
+	GE_BORDER_OFFER_BUY_OFFER_FULL_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 14),
+	GE_BORDER_OFFER_BUY_OFFER_FULL_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 15),
+	GE_BORDER_OFFER_BUY_OFFER_BOTTOM_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 16),
+	GE_BORDER_OFFER_BUY_OFFER_BOTTOM_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 17),
+	GE_BORDER_OFFER_CHOOSE_ITEM_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 23),
+	GE_BORDER_OFFER_CHOOSE_ITEM_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 24),
+	GE_BORDER_OFFER_QUANTITY_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 26),
+	GE_BORDER_OFFER_QUANTITY_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 27),
+	GE_BORDER_OFFER_PRICE_INNER(GE_OFFERS_SETUP_INIT, 0x5a5245, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 33),
+	GE_BORDER_OFFER_PRICE_OUTER(GE_OFFERS_SETUP_INIT, 0x383023, WidgetID.GRAND_EXCHANGE_GROUP_ID, 25, 34),
 
 	GE_CHATBOX_BUY_SEARCH_BORDER_INNER(GE_OFFERS_SETUP_INIT, 0x463214, WidgetID.CHATBOX_GROUP_ID, 51, -1),
 	GE_CHATBOX_BUY_SEARCH_BORDER_OUTER(GE_OFFERS_SETUP_INIT, 0x463214, WidgetID.CHATBOX_GROUP_ID, 52, -1),
@@ -111,7 +111,7 @@ public enum WidgetOverride
 
 	KOUREND_FAVOUR_DIALOG_SEPERATOR_LINE_UPPER(ZEAH_FAVOUR_INIT, 0x2e2b23, 626, 5, -1),
 	KOUREND_FAVOUR_DIALOG_SEPERATOR_LINE_LOWER(ZEAH_FAVOUR_INIT, 0x2e2b23, 626, 4, -1),
-	OPTIONS_TAB_SEPERATOR_LINE(SETTINGS_SIDE_TABS_INIT, 0x5d5848, WidgetID.SETTINGS_SIDE_GROUP_ID, new int[]{61, 62, 63, 64}, -1),
+	OPTIONS_TAB_SEPERATOR_LINE(SETTINGS_SIDE_TABS_INIT, 0x5d5848, WidgetID.SETTINGS_SIDE_GROUP_ID, new int[]{102, 103, 104, 105}, -1),
 	CHANNEL_TAB_SEPERATOR_LINE(CHANNEL_TAB_INIT, 0x5d5848, 707, 2, -1),
 	;
 

src/main/java/melky/resourcepacks/WidgetResize.java

@@ -10,7 +10,6 @@
 public enum WidgetResize
 {
 
-	GE_BORDER_RIGHT(WidgetID.GRAND_EXCHANGE_GROUP_ID, 20, 340, null, 344, null, null, null, null, null),
 	RESIZABLE_QUESTS_TAB(WidgetInfo.RESIZABLE_VIEWPORT_QUESTS_TAB.getGroupId(), WidgetInfo.RESIZABLE_VIEWPORT_QUESTS_TAB.getChildId(), null, null, null, null, 33, null, 38, null),
 	RESIZABLE_IGNORES_TAB(WidgetInfo.RESIZABLE_VIEWPORT_IGNORES_TAB.getGroupId(), WidgetInfo.RESIZABLE_VIEWPORT_IGNORES_TAB.getChildId(), null, null, null, null, 33, null, 38, null),
 	FIXED_QUESTS_TAB(WidgetInfo.FIXED_VIEWPORT_QUESTS_TAB.getGroupId(), WidgetInfo.FIXED_VIEWPORT_QUESTS_TAB.getChildId(), null, null, null, null, 33, null, 38, null),

src/test/java/melky/resourcepacks/ResourcePacksPluginTest.java

@@ -28,7 +28,7 @@ public static void main(String[] args) throws Exception
 	 * Allow you to build your own sample-vanilla pack (with some drawbacks)
 	 * Sprite 990 is custom made (is janky when using a dumper), login screen is also not being moved and also runelite's tag tab sprites are not moved. These have to be manually added
 	 * <p>
-	 * spriteFolder needs sprites to be dumped using correct offsets/correct max dimensions otherwise most of the sprites will be not positioned correctly (can be download from sprite-exporter repo)
+	 * spriteFolder needs sprites to be dumped using correct offsets/correct max dimensions otherwise most of the sprites will be not positioned correctly (can be downloaded from sprite-exporter repo)
 	 * packFolder where to output the sample-vanilla pack to
 	 *
 	 * @throws IOException
@@ -47,8 +47,7 @@ public void moveImages() throws IOException
 		{
 			// TODO:
 			// Grab the tag tab images from rl repo and make an exception for login screen
-			// Figure out why 990 is so janky
-			if (override.getSpriteID() < 0 || override.getSpriteID() == 990)
+			if (override.getSpriteID() < 0)
 			{
 				continue;
 			}
@@ -76,9 +75,9 @@ public void moveImages() throws IOException
 	}
 
 	/**
-	 * Allow you to check whether or not a pack does not contain files that should not be in there or sprites that are the same as vanilla
+	 * Allow you to check whether a pack does not contain files that should not be in there or sprites that are the same as vanilla
 	 * <p>
-	 * spriteFolder needs to be dumped using correct offsets/correct max dimensions for the vanilla comparison to work
+	 * spriteFolder needs to be dumped using correct offsets/correct max dimensions for the vanilla comparison to work (can be downloaded from sprite-exporter repo)
 	 * packFolder is the path to the pack you want to be testing against
 	 *
 	 * @throws IOException