From d2c72ee59b43b31d729c30d77b9d1437c5896a1e Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 29 Jun 2021 20:51:32 -0400 Subject: [PATCH 01/11] tile indicators: add border width config --- .../tileindicators/TileIndicatorsConfig.java | 41 +++++++++++++++++-- .../tileindicators/TileIndicatorsOverlay.java | 11 ++--- 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java index c1ab681930..f30b1c7667 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsConfig.java @@ -56,12 +56,23 @@ public interface TileIndicatorsConfig extends Config return true; } + @ConfigItem( + keyName = "destinationTileBorderWidth", + name = "Destination border width", + description = "Width of the destination tile marker border", + position = 3 + ) + default double destinationTileBorderWidth() + { + return 2; + } + @Alpha @ConfigItem( keyName = "highlightHoveredColor", name = "Hovered tile", description = "Configures the highlight color of hovered tile", - position = 3 + position = 4 ) default Color highlightHoveredColor() { @@ -72,19 +83,30 @@ public interface TileIndicatorsConfig extends Config keyName = "highlightHoveredTile", name = "Highlight hovered tile", description = "Highlights tile player is hovering with mouse", - position = 4 + position = 5 ) default boolean highlightHoveredTile() { return false; } + @ConfigItem( + keyName = "hoveredTileBorderWidth", + name = "Hovered tile border width", + description = "Width of the hovered tile marker border", + position = 6 + ) + default double hoveredTileBorderWidth() + { + return 2; + } + @Alpha @ConfigItem( keyName = "highlightCurrentColor", name = "True tile", description = "Configures the highlight color of current true tile", - position = 5 + position = 7 ) default Color highlightCurrentColor() { @@ -95,10 +117,21 @@ public interface TileIndicatorsConfig extends Config keyName = "highlightCurrentTile", name = "Highlight true tile", description = "Highlights true tile player is on as seen by server", - position = 6 + position = 8 ) default boolean highlightCurrentTile() { return false; } + + @ConfigItem( + keyName = "currentTileBorderWidth", + name = "True tile border width", + description = "Width of the true tile marker border", + position = 9 + ) + default double currentTileBorderWidth() + { + return 2; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java index b592684849..8abb968314 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsOverlay.java @@ -24,6 +24,7 @@ */ package net.runelite.client.plugins.tileindicators; +import java.awt.BasicStroke; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; @@ -62,13 +63,13 @@ public class TileIndicatorsOverlay extends Overlay // If we have tile "selected" render it if (client.getSelectedSceneTile() != null) { - renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), config.highlightHoveredColor()); + renderTile(graphics, client.getSelectedSceneTile().getLocalLocation(), config.highlightHoveredColor(), config.hoveredTileBorderWidth()); } } if (config.highlightDestinationTile()) { - renderTile(graphics, client.getLocalDestinationLocation(), config.highlightDestinationColor()); + renderTile(graphics, client.getLocalDestinationLocation(), config.highlightDestinationColor(), config.destinationTileBorderWidth()); } if (config.highlightCurrentTile()) @@ -85,13 +86,13 @@ public class TileIndicatorsOverlay extends Overlay return null; } - renderTile(graphics, playerPosLocal, config.highlightCurrentColor()); + renderTile(graphics, playerPosLocal, config.highlightCurrentColor(), config.currentTileBorderWidth()); } return null; } - private void renderTile(final Graphics2D graphics, final LocalPoint dest, final Color color) + private void renderTile(final Graphics2D graphics, final LocalPoint dest, final Color color, final double borderWidth) { if (dest == null) { @@ -105,6 +106,6 @@ public class TileIndicatorsOverlay extends Overlay return; } - OverlayUtil.renderPolygon(graphics, poly, color); + OverlayUtil.renderPolygon(graphics, poly, color, new BasicStroke((float) borderWidth)); } } From 110138ad143569d66a0376d8fbc329f2d6c66f30 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 29 Jun 2021 12:30:25 -0600 Subject: [PATCH 02/11] Update Item IDs to 2021-6-30 --- .../main/java/net/runelite/api/ItemID.java | 38 +++++++++++++++++-- .../java/net/runelite/api/NullItemID.java | 30 +++++++++++++++ .../plugins/cluescrolls/clues/EmoteClue.java | 2 +- 3 files changed, 66 insertions(+), 4 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 1bf7e8e792..0cff2f0c2f 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -548,7 +548,7 @@ public final class ItemID public static final int ADAMANT_DART = 810; public static final int RUNE_DART = 811; public static final int BRONZE_DARTP = 812; - public static final int IRON_DARTP = 813; + public static final int IRON_DART_P = 813; public static final int STEEL_DARTP = 814; public static final int MITHRIL_DARTP = 815; public static final int ADAMANT_DARTP = 816; @@ -3383,7 +3383,7 @@ public final class ItemID public static final int ADAMANT_ARROWP_5626 = 5626; public static final int RUNE_ARROWP_5627 = 5627; public static final int BRONZE_DARTP_5628 = 5628; - public static final int IRON_DARTP_5629 = 5629; + public static final int IRON_DARTP = 5629; public static final int STEEL_DARTP_5630 = 5630; public static final int BLACK_DARTP_5631 = 5631; public static final int MITHRIL_DARTP_5632 = 5632; @@ -8326,7 +8326,7 @@ public final class ItemID public static final int SHAYZIEN_BOOTS_5 = 13378; public static final int SHAYZIEN_HELM_5 = 13379; public static final int SHAYZIEN_GREAVES_5 = 13380; - public static final int SHAYZIEN_PLATEBODY_5 = 13381; + public static final int SHAYZIEN_BODY_5 = 13381; public static final int SHAYZIEN_MEDPACK = 13382; public static final int XERICIAN_FABRIC = 13383; public static final int XERICIAN_HAT = 13385; @@ -11956,5 +11956,37 @@ public final class ItemID public static final int OLD_NOTE_25829 = 25829; public static final int SHAYZIA_MILITARY_ORDERS = 25831; public static final int RAW_BOAR_MEAT = 25833; + public static final int LITTLE_PARASITE = 25836; + public static final int SLEPEY_TABLET = 25837; + public static final int PARASITIC_EGG = 25838; + public static final int BANANA_HAT = 25840; + public static final int SRARACHA_25842 = 25842; + public static final int SRARACHA_25843 = 25843; + public static final int ORANGE_EGG_SAC = 25844; + public static final int BLUE_EGG_SAC = 25846; + public static final int AMETHYST_DART = 25849; + public static final int AMETHYST_DARTP = 25851; + public static final int AMETHYST_DART_TIP = 25853; + public static final int AMETHYST_DARTP_25855 = 25855; + public static final int AMETHYST_DARTP_25857 = 25857; + public static final int ENHANCED_CRYSTAL_WEAPON_SEED = 25859; + public static final int BOW_OF_FAERDHINEN_INACTIVE = 25862; + public static final int BOW_OF_FAERDHINEN = 25865; + public static final int BOW_OF_FAERDHINEN_C = 25867; + public static final int BOW_OF_FAERDHINEN_C_25869 = 25869; + public static final int BLADE_OF_SAELDOR_C_25870 = 25870; + public static final int BLADE_OF_SAELDOR_C_25872 = 25872; + public static final int BLADE_OF_SAELDOR_C_25874 = 25874; + public static final int BLADE_OF_SAELDOR_C_25876 = 25876; + public static final int BLADE_OF_SAELDOR_C_25878 = 25878; + public static final int BLADE_OF_SAELDOR_C_25880 = 25880; + public static final int BLADE_OF_SAELDOR_C_25882 = 25882; + public static final int BOW_OF_FAERDHINEN_C_25884 = 25884; + public static final int BOW_OF_FAERDHINEN_C_25886 = 25886; + public static final int BOW_OF_FAERDHINEN_C_25888 = 25888; + public static final int BOW_OF_FAERDHINEN_C_25890 = 25890; + public static final int BOW_OF_FAERDHINEN_C_25892 = 25892; + public static final int BOW_OF_FAERDHINEN_C_25894 = 25894; + public static final int BOW_OF_FAERDHINEN_C_25896 = 25896; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index d710c4d986..3fe975cb45 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -13669,5 +13669,35 @@ public final class NullItemID public static final int NULL_25832 = 25832; public static final int NULL_25834 = 25834; public static final int NULL_25835 = 25835; + public static final int NULL_25839 = 25839; + public static final int NULL_25841 = 25841; + public static final int NULL_25845 = 25845; + public static final int NULL_25847 = 25847; + public static final int NULL_25848 = 25848; + public static final int NULL_25850 = 25850; + public static final int NULL_25852 = 25852; + public static final int NULL_25854 = 25854; + public static final int NULL_25856 = 25856; + public static final int NULL_25858 = 25858; + public static final int NULL_25860 = 25860; + public static final int NULL_25861 = 25861; + public static final int NULL_25863 = 25863; + public static final int NULL_25864 = 25864; + public static final int NULL_25866 = 25866; + public static final int NULL_25868 = 25868; + public static final int NULL_25871 = 25871; + public static final int NULL_25873 = 25873; + public static final int NULL_25875 = 25875; + public static final int NULL_25877 = 25877; + public static final int NULL_25879 = 25879; + public static final int NULL_25881 = 25881; + public static final int NULL_25883 = 25883; + public static final int NULL_25885 = 25885; + public static final int NULL_25887 = 25887; + public static final int NULL_25889 = 25889; + public static final int NULL_25891 = 25891; + public static final int NULL_25893 = 25893; + public static final int NULL_25895 = 25895; + public static final int NULL_25897 = 25897; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java index 7d1d7fc6a0..bbf7b26fbe 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java @@ -180,7 +180,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu new EmoteClue("Clap at Bob's Brilliant Axes. Equip a bronze axe and leather boots.", "Lumbridge", BOB_AXES_ENTRANCE, new WorldPoint(3231, 3203, 0), CLAP, item(BRONZE_AXE), item(LEATHER_BOOTS)), new EmoteClue("Panic at Al Kharid mine.", "Al Kharid mine", null, new WorldPoint(3300, 3314, 0), PANIC), new EmoteClue("Spin at Flynn's Mace Shop.", "Falador", null, new WorldPoint(2950, 3387, 0), SPIN), - new EmoteClue("Salute by the Charcoal Burners. Equip a Farmer's strawhat, Shayzien platebody (5) and Pyromancer robes.", "Charcoal Burners", CHARCOAL_BURNERS, new WorldPoint(1714, 3467, 0), SALUTE, any("Farmer's strawhat", item(FARMERS_STRAWHAT), item(FARMERS_STRAWHAT_13647)), item(SHAYZIEN_PLATEBODY_5), item(PYROMANCER_ROBE))); + new EmoteClue("Salute by the Charcoal Burners. Equip a Farmer's strawhat, Shayzien platebody (5) and Pyromancer robes.", "Charcoal Burners", CHARCOAL_BURNERS, new WorldPoint(1714, 3467, 0), SALUTE, any("Farmer's strawhat", item(FARMERS_STRAWHAT), item(FARMERS_STRAWHAT_13647)), item(SHAYZIEN_BODY_5), item(PYROMANCER_ROBE))); private static final String UNICODE_CHECK_MARK = "\u2713"; private static final String UNICODE_BALLOT_X = "\u2717"; From f0d9b316d0138cd7aa58977cc50930a47b198236 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 29 Jun 2021 12:30:25 -0600 Subject: [PATCH 03/11] Update Item variations to 2021-6-30 --- .../src/main/resources/item_variations.json | 36 +++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index 028e980914..1c195a11bc 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -8151,8 +8151,7 @@ 13361, 13366, 13371, - 13376, - 13381 + 13376 ], "xerics talisman": [ 13392, @@ -9219,6 +9218,11 @@ 23324, 23327 ], + "sraracha": [ + 23495, + 25842, + 25843 + ], "giant egg sac": [ 23517, 23520 @@ -9377,7 +9381,14 @@ 23995, 23997, 24551, - 24553 + 24553, + 25870, + 25872, + 25874, + 25876, + 25878, + 25880, + 25882 ], "elven top": [ 24009, @@ -9854,5 +9865,24 @@ 25806, 25807, 25808 + ], + "amethyst dart": [ + 25849, + 25851, + 25855, + 25857 + ], + "bow of faerdhinen": [ + 25862, + 25865, + 25867, + 25869, + 25884, + 25886, + 25888, + 25890, + 25892, + 25894, + 25896 ] } \ No newline at end of file From 17bde1159e4cbc0992011656da24506aee3ec448 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 29 Jun 2021 12:30:25 -0600 Subject: [PATCH 04/11] Update Object IDs to 2021-6-30 --- .../src/main/java/net/runelite/api/NullObjectID.java | 6 ++++++ runelite-api/src/main/java/net/runelite/api/ObjectID.java | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 2dbda498c3..66971ab20f 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -15655,6 +15655,10 @@ public final class NullObjectID public static final int NULL_33030 = 33030; public static final int NULL_33031 = 33031; public static final int NULL_33032 = 33032; + public static final int NULL_33033 = 33033; + public static final int NULL_33034 = 33034; + public static final int NULL_33035 = 33035; + public static final int NULL_33036 = 33036; public static final int NULL_33038 = 33038; public static final int NULL_33039 = 33039; public static final int NULL_33040 = 33040; @@ -20366,6 +20370,8 @@ public final class NullObjectID public static final int NULL_41741 = 41741; public static final int NULL_41742 = 41742; public static final int NULL_41743 = 41743; + public static final int NULL_41748 = 41748; + public static final int NULL_41749 = 41749; public static final int NULL_41750 = 41750; public static final int NULL_41751 = 41751; public static final int NULL_41752 = 41752; diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 12f5ba0de6..6f3377cc0e 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -17366,10 +17366,6 @@ public final class ObjectID public static final int STRATEGY_TABLE = 33014; public static final int SMALL_CHEST_33016 = 33016; public static final int WEAPON_RACK_33020 = 33020; - public static final int TILE = 33033; - public static final int TILE_33034 = 33034; - public static final int TILE_33035 = 33035; - public static final int TILE_33036 = 33036; public static final int PORTAL_33037 = 33037; public static final int VYRE_WELL_33081 = 33081; public static final int VYRE_WELL_33082 = 33082; @@ -19915,7 +19911,7 @@ public final class ObjectID public static final int BROKEN_BRIDGE_38809 = 38809; public static final int BROKEN_BRIDGE_38810 = 38810; public static final int BRIDGE_38811 = 38811; - public static final int TILE_38822 = 38822; + public static final int TILE = 38822; public static final int TILE_38823 = 38823; public static final int TILE_38824 = 38824; public static final int TILE_38825 = 38825; @@ -21367,8 +21363,6 @@ public final class ObjectID public static final int REWARDS_CHEST_41745 = 41745; public static final int MONUMENTAL_CHEST_41746 = 41746; public static final int ACID_POOL_41747 = 41747; - public static final int TILE_41748 = 41748; - public static final int TILE_41749 = 41749; public static final int IRON_PICKAXE = 41754; public static final int SILK_STALL_41755 = 41755; public static final int GEM_STALL_41756 = 41756; From 21da08be7191178dfe132ba858b830a54d6e1d64 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 29 Jun 2021 12:30:25 -0600 Subject: [PATCH 05/11] Update NPC IDs to 2021-6-30 --- .../src/main/java/net/runelite/api/NpcID.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 50c8f2e3ea..5ef310cdab 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -7368,6 +7368,7 @@ public final class NpcID public static final int AMELIA = 8180; public static final int JONATHAN = 8181; public static final int NATURAL_HISTORIAN_8182 = 8182; + public static final int LITTLE_PARASAITE = 8183; public static final int BOULDER_8188 = 8188; public static final int GRAVE_DIGGER = 8189; public static final int JAMES = 8193; @@ -7633,6 +7634,7 @@ public final class NpcID public static final int ELISE = 8538; public static final int ARC_TEST_01 = 8539; public static final int ARC_TEST_02 = 8540; + public static final int LITTLE_PARASITE = 8541; public static final int ROYAL_GUARD = 8542; public static final int ROYAL_GUARD_8543 = 8543; public static final int UNDOR = 8544; @@ -9347,7 +9349,7 @@ public final class NpcID public static final int OSWALD = 11043; public static final int SHERYL = 11044; public static final int FARMER_11045 = 11045; - public static final int SOLIDER = 11046; + public static final int SOLDIER_11046 = 11046; public static final int SOLDIER_11047 = 11047; public static final int DRUNKEN_SOLDIER = 11048; public static final int SOLDIER_11049 = 11049; @@ -9415,5 +9417,13 @@ public final class NpcID public static final int ISTORIA = 11112; public static final int ISTORIA_11113 = 11113; public static final int COUNCILLOR_ANDREWS_11152 = 11152; + public static final int PHOSANIS_NIGHTMARE_11153 = 11153; + public static final int PHOSANIS_NIGHTMARE_11154 = 11154; + public static final int PHOSANIS_NIGHTMARE_11155 = 11155; + public static final int SWARM_11156 = 11156; + public static final int SRARACHA_11157 = 11157; + public static final int SRARACHA_11158 = 11158; + public static final int SRARACHA_11159 = 11159; + public static final int SRARACHA_11160 = 11160; /* This file is automatically generated. Do not edit. */ } From 3a8c1cdc0cb6a5482e536084945622462057b0a2 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 29 Jun 2021 12:30:26 -0600 Subject: [PATCH 06/11] Update Scripts to 2021-6-30 --- .../src/main/scripts/BankSearchLayout.hash | 2 +- .../src/main/scripts/BankSearchLayout.rs2asm | 71 +++---- .../main/scripts/OptionsPanelZoomUpdater.hash | 2 +- .../scripts/OptionsPanelZoomUpdater.rs2asm | 6 +- .../src/main/scripts/PrivateMessage.hash | 2 +- .../src/main/scripts/PrivateMessage.rs2asm | 181 +++++++++--------- 6 files changed, 135 insertions(+), 129 deletions(-) diff --git a/runelite-client/src/main/scripts/BankSearchLayout.hash b/runelite-client/src/main/scripts/BankSearchLayout.hash index a6d2a3aaf6..0c32c3a219 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.hash +++ b/runelite-client/src/main/scripts/BankSearchLayout.hash @@ -1 +1 @@ -90076B6F48BDA11B9905808D70A53D53F894350AD46B7ED3AF75C7C60BB304D1 \ No newline at end of file +8F6EC040714CB55346C243DA8126FC74122F8300D808E5616CCC37FC767B38DF \ No newline at end of file diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm index d68db90bae..f67c6a9bfe 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm @@ -848,13 +848,14 @@ LABEL750: invoke 514 iconst 1 if_icmpeq LABEL754 - jump LABEL757 + jump LABEL758 LABEL754: + iconst 1 iconst 1 iconst 1 invoke 299 GetTabRange: -LABEL757: +LABEL758: iconst -1 istore 32 iconst -1 @@ -867,43 +868,43 @@ LABEL757: istore 34 iconst 0 istore 35 -LABEL769: +LABEL770: iload 20 iconst 816 - if_icmplt LABEL773 - jump LABEL853 -LABEL773: + if_icmplt LABEL774 + jump LABEL854 +LABEL774: iload 2 iload 20 cc_find iconst 1 - if_icmpeq LABEL779 - jump LABEL848 -LABEL779: + if_icmpeq LABEL780 + jump LABEL849 +LABEL780: iconst 95 iload 20 inv_getobj istore 25 iload 25 iconst -1 - if_icmpne LABEL787 - jump LABEL791 -LABEL787: + if_icmpne LABEL788 + jump LABEL792 +LABEL788: iload 29 iconst 1 add istore 29 -LABEL791: +LABEL792: iload 20 iload 32 - if_icmpge LABEL795 - jump LABEL846 -LABEL795: + if_icmpge LABEL796 + jump LABEL847 +LABEL796: iload 20 iload 33 - if_icmplt LABEL799 - jump LABEL846 -LABEL799: + if_icmplt LABEL800 + jump LABEL847 +LABEL800: iconst 0 cc_sethide iload 25 @@ -937,38 +938,38 @@ LABEL799: istore 28 iload 34 iload 22 - if_icmplt LABEL834 - jump LABEL839 -LABEL834: + if_icmplt LABEL835 + jump LABEL840 +LABEL835: iload 34 iconst 1 add istore 34 - jump LABEL845 -LABEL839: + jump LABEL846 +LABEL840: iconst 0 iload 35 iconst 1 add istore 35 istore 34 -LABEL845: - jump LABEL848 LABEL846: + jump LABEL849 +LABEL847: iconst 1 cc_sethide -LABEL848: +LABEL849: iload 20 iconst 1 add istore 20 - jump LABEL769 -LABEL853: + jump LABEL770 +LABEL854: get_varbit 4170 iconst 2 - if_icmpeq LABEL857 - jump LABEL867 -LABEL857: + if_icmpeq LABEL858 + jump LABEL868 +LABEL858: sconst "Tab " iconst 105 iconst 115 @@ -978,8 +979,8 @@ LABEL857: join_string 2 iload 5 if_settext - jump LABEL873 -LABEL867: + jump LABEL874 +LABEL868: sconst "Tab " get_varbit 4150 tostring @@ -987,7 +988,7 @@ LABEL867: iload 5 if_settext FinishBuilding: -LABEL873: +LABEL874: iload 0 iload 1 iload 2 diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash index 03cd95c44c..66a18c2a05 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash @@ -1 +1 @@ -581520BBF672827101447FABB2D0F515AB1AF23FDABFAF374032DF36A82B0658 \ No newline at end of file +9C827673E7E0FADA71DB2017F4AEE7CC2A6A9C617756DBAF7821B93D62D412C8 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm index 93974dca56..89363385e9 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm @@ -23,9 +23,9 @@ runelite_callback sub istore 1 - iconst 7602237 + iconst 7602274 if_getwidth - iconst 7602238 + iconst 7602275 if_getwidth sub istore 2 @@ -78,6 +78,6 @@ LABEL44: iconst 0 iconst 0 iconst 0 - iconst 7602238 + iconst 7602275 if_setposition return diff --git a/runelite-client/src/main/scripts/PrivateMessage.hash b/runelite-client/src/main/scripts/PrivateMessage.hash index c9c8d6ff7f..30b9841652 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.hash +++ b/runelite-client/src/main/scripts/PrivateMessage.hash @@ -1 +1 @@ -D6803CE58C6976B2799C6410F4F3E806D1EFD5A8263DCAE9C5BF54A4426BFFD1 \ No newline at end of file +237BFF112EE82F6ECE47A75D7272464BA08F7FBDF879656A18C73680DF593308 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/PrivateMessage.rs2asm b/runelite-client/src/main/scripts/PrivateMessage.rs2asm index a6ef72d6f4..4c9271aa4d 100644 --- a/runelite-client/src/main/scripts/PrivateMessage.rs2asm +++ b/runelite-client/src/main/scripts/PrivateMessage.rs2asm @@ -25,7 +25,7 @@ LABEL10: iload 1 iconst 0 if_icmpgt LABEL21 - jump LABEL265 + jump LABEL269 LABEL21: get_varc_int 5 switch @@ -35,23 +35,23 @@ LABEL21: 4: LABEL26 5: LABEL26 6: LABEL47 - 7: LABEL110 - 8: LABEL116 - 9: LABEL124 - 10: LABEL201 - 11: LABEL257 - 12: LABEL217 - 13: LABEL235 - 15: LABEL124 - 16: LABEL262 - 18: LABEL257 - 19: LABEL110 - 20: LABEL124 - 21: LABEL124 - jump LABEL264 + 7: LABEL111 + 8: LABEL117 + 9: LABEL125 + 10: LABEL202 + 11: LABEL260 + 12: LABEL219 + 13: LABEL237 + 15: LABEL125 + 16: LABEL266 + 18: LABEL260 + 19: LABEL111 + 20: LABEL125 + 21: LABEL125 + jump LABEL268 LABEL24: return - jump LABEL264 + jump LABEL268 LABEL26: ignore_count iconst 0 @@ -79,7 +79,7 @@ LABEL44: get_varc_string 359 ignore_del LABEL46: - jump LABEL264 + jump LABEL268 LABEL47: friend_count iconst 0 @@ -88,7 +88,7 @@ LABEL47: LABEL51: sconst "Unable to complete action - system busy." mes - jump LABEL109 + jump LABEL110 LABEL54: get_varc_int 5 iconst 2 @@ -97,7 +97,7 @@ LABEL54: LABEL58: get_varc_string 359 friend_add - jump LABEL109 + jump LABEL110 LABEL61: get_varc_int 5 iconst 3 @@ -106,30 +106,31 @@ LABEL61: LABEL65: get_varc_string 359 friend_del - jump LABEL109 + jump LABEL110 LABEL68: get_varc_int 5 iconst 6 if_icmpeq LABEL72 - jump LABEL109 + jump LABEL110 LABEL72: get_varbit 8119 iconst 0 if_icmpeq LABEL76 - jump LABEL82 + jump LABEL83 LABEL76: + iconst 1 iconst 1 iconst 1 invoke 299 sconst "You must set a name before you can chat." mes return -LABEL82: +LABEL83: chat_getfilter_private iconst 2 - if_icmpeq LABEL86 - jump LABEL97 -LABEL86: + if_icmpeq LABEL87 + jump LABEL98 +LABEL87: chat_getfilter_public iconst 1 chat_getfilter_trade @@ -141,37 +142,37 @@ LABEL86: invoke 84 iload 0 invoke 89 -LABEL97: +LABEL98: get_varbit 4394 iconst 1 - if_icmpeq LABEL101 - jump LABEL104 -LABEL101: + if_icmpeq LABEL102 + jump LABEL105 +LABEL102: get_varc_string 360 friend_del - jump LABEL107 -LABEL104: + jump LABEL108 +LABEL105: get_varc_string 360 get_varc_string 359 sconst "privateMessage" ; load event name iconst 0 ; whether or not to skip runelite_callback ; invoke callback iconst 1 - if_icmpeq LABEL107 ; if skipped, do not message + if_icmpeq LABEL108 ; if skipped, do not message chat_sendprivate -LABEL107: +LABEL108: clientclock set_varc_int 61 -LABEL109: - jump LABEL264 LABEL110: + jump LABEL268 +LABEL111: get_varc_string 359 invoke 212 resume_countdialog iconst 0 set_varc_int 5 - jump LABEL264 -LABEL116: + jump LABEL268 +LABEL117: get_varc_string 359 removetags set_varc_string 361 @@ -179,23 +180,23 @@ LABEL116: resume_namedialog iconst 0 set_varc_int 5 - jump LABEL264 -LABEL124: + jump LABEL268 +LABEL125: get_varc_int 5 iconst 20 - if_icmpeq LABEL128 - jump LABEL132 -LABEL128: + if_icmpeq LABEL129 + jump LABEL133 +LABEL129: get_varc_string 359 removetags invoke 4394 - jump LABEL196 -LABEL132: + jump LABEL197 +LABEL133: get_varc_int 5 iconst 21 - if_icmpeq LABEL136 - jump LABEL196 -LABEL136: + if_icmpeq LABEL137 + jump LABEL197 +LABEL137: get_varc_string 359 sconst "jagex" sconst " " @@ -256,66 +257,68 @@ LABEL136: sconst " " invoke 4191 set_varc_string 359 -LABEL196: +LABEL197: get_varc_string 359 resume_stringdialog iconst 0 set_varc_int 5 - jump LABEL264 -LABEL201: + jump LABEL268 +LABEL202: get_varbit 8119 iconst 0 - if_icmpeq LABEL205 - jump LABEL211 -LABEL205: + if_icmpeq LABEL206 + jump LABEL213 +LABEL206: + iconst 1 iconst 1 iconst 1 invoke 299 sconst "You must set a name before you can chat." mes return -LABEL211: +LABEL213: get_varc_string 359 removetags set_varc_string 362 get_varc_string 359 clan_joinchat - jump LABEL264 -LABEL217: + jump LABEL268 +LABEL219: iload 1 iconst 10 - if_icmpgt LABEL221 - jump LABEL227 -LABEL221: + if_icmpgt LABEL223 + jump LABEL229 +LABEL223: get_varc_string 359 iconst 0 iconst 9 substring sstore 0 - jump LABEL229 -LABEL227: + jump LABEL231 +LABEL229: get_varc_string 359 sstore 0 -LABEL229: +LABEL231: sload 0 lowercase chat_setmessagefilter invoke 553 invoke 84 - jump LABEL264 -LABEL235: + jump LABEL268 +LABEL237: get_varbit 8119 iconst 0 - if_icmpeq LABEL239 - jump LABEL245 -LABEL239: + if_icmpeq LABEL241 + jump LABEL248 +LABEL241: + iconst 1 iconst 1 iconst 1 invoke 299 sconst "You must set a name before you can chat." mes return -LABEL245: +LABEL248: get_varc_string 359 iconst 0 set_varc_int 62 @@ -327,35 +330,37 @@ LABEL245: sconst "I1" iconst 10616843 if_setontimer - jump LABEL264 -LABEL257: + jump LABEL268 +LABEL260: iconst 0 iconst 1 + iconst 1 invoke 299 return - jump LABEL264 -LABEL262: + jump LABEL268 +LABEL266: get_varc_string 359 invoke 2061 -LABEL264: - jump LABEL271 -LABEL265: +LABEL268: + jump LABEL275 +LABEL269: get_varc_int 5 switch - 16: LABEL270 - 20: LABEL268 - 21: LABEL268 - 7: LABEL268 - 8: LABEL268 - 9: LABEL268 - 15: LABEL268 - jump LABEL271 -LABEL268: + 16: LABEL274 + 20: LABEL272 + 21: LABEL272 + 7: LABEL272 + 8: LABEL272 + 9: LABEL272 + 15: LABEL272 + jump LABEL275 +LABEL272: return - jump LABEL271 -LABEL270: + jump LABEL275 +LABEL274: return -LABEL271: +LABEL275: + iconst 1 iconst 1 iconst 1 invoke 299 From 458e6852086ff528c1b62755fe1d9e5cf49d73b5 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 29 Jun 2021 12:30:27 -0600 Subject: [PATCH 07/11] Update Widget IDs to 2021-6-30 --- .../src/main/java/net/runelite/api/widgets/WidgetID.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 index 744e434f64..2ae045b5b3 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -839,10 +839,10 @@ public class WidgetID static class SettingsSide { - static final int CAMERA_ZOOM_SLIDER_TRACK = 61; - static final int MUSIC_SLIDER = 14; - static final int SOUND_EFFECT_SLIDER = 18; - static final int AREA_SOUND_SLIDER = 22; + static final int CAMERA_ZOOM_SLIDER_TRACK = 98; + static final int MUSIC_SLIDER = 27; + static final int SOUND_EFFECT_SLIDER = 41; + static final int AREA_SOUND_SLIDER = 55; } static class Settings From 00c971ef154889af5abd4e934389cd1e2abd8554 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 29 Jun 2021 13:02:49 -0600 Subject: [PATCH 08/11] Update script arguments to 2021-6-30 --- runelite-api/src/main/java/net/runelite/api/ScriptID.java | 3 ++- .../net/runelite/client/game/chatbox/ChatboxPanelManager.java | 3 ++- .../java/net/runelite/client/plugins/bank/BankSearch.java | 2 +- .../plugins/chatboxperformance/ChatboxPerformancePlugin.java | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/ScriptID.java b/runelite-api/src/main/java/net/runelite/api/ScriptID.java index ba89d4190c..846bd76b1f 100644 --- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java +++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java @@ -84,9 +84,10 @@ public final class ScriptID *
    *
  • int (boolean) Clear the current text
    • *
  • int (boolean) Restore to chat view
    • + *
  • int (boolean) Submit close to server
    • *
*/ - @ScriptArguments(integer = 2) + @ScriptArguments(integer = 3) public static final int MESSAGE_LAYER_CLOSE = 299; /** diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java index dee0846aac..2178b5f2c2 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java @@ -93,7 +93,8 @@ public class ChatboxPanelManager client.runScript( ScriptID.MESSAGE_LAYER_CLOSE, 0, - 1 + 1, + 0 ); if (currentInput != null) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankSearch.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankSearch.java index 73e00b436e..6293fdac35 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankSearch.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankSearch.java @@ -105,7 +105,7 @@ public class BankSearch if (closeChat) { // this clears the input text and type, and resets the chatbox to allow input - client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 1, 1); + client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 1, 1, 0); } else { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java index da642e1d43..15e20d6c8a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java @@ -56,7 +56,7 @@ public class ChatboxPerformancePlugin extends Plugin { if (client.getGameState() == GameState.LOGGED_IN) { - clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0)); + clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0, 0)); } } @@ -65,7 +65,7 @@ public class ChatboxPerformancePlugin extends Plugin { if (client.getGameState() == GameState.LOGGED_IN) { - clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0)); + clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0, 0)); } } From f2b7f263876361ef0f7d16197e8aa399d4e53b19 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 30 Jun 2021 04:47:50 -0600 Subject: [PATCH 09/11] http-api, rl-client: add phosani's nightmare to hiscores --- .../runelite/http/api/hiscore/HiscoreResult.java | 3 +++ .../http/api/hiscore/HiscoreResultBuilder.java | 6 ++---- .../runelite/http/api/hiscore/HiscoreSkill.java | 1 + .../client/plugins/hiscore/HiscorePanel.java | 2 +- .../plugins/hiscore/bosses/phosanis_nightmare.png | Bin 0 -> 492 bytes 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/phosanis_nightmare.png diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java index 6bb87e0909..de52f5c5aa 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResult.java @@ -94,6 +94,7 @@ public class HiscoreResult private Skill krilTsutsaroth; private Skill mimic; private Skill nightmare; + private Skill phosanisNightmare; private Skill obor; private Skill sarachnis; private Skill scorpia; @@ -245,6 +246,8 @@ public class HiscoreResult return mimic; case NIGHTMARE: return nightmare; + case PHOSANIS_NIGHTMARE: + return phosanisNightmare; case OBOR: return obor; case SARACHNIS: diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java index 33e43cc465..6c88ebcd18 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreResultBuilder.java @@ -119,6 +119,7 @@ class HiscoreResultBuilder hiscoreResult.setKrilTsutsaroth(skills.get(index++)); hiscoreResult.setMimic(skills.get(index++)); hiscoreResult.setNightmare(skills.get(index++)); + hiscoreResult.setPhosanisNightmare(skills.get(index++)); hiscoreResult.setObor(skills.get(index++)); hiscoreResult.setSarachnis(skills.get(index++)); hiscoreResult.setScorpia(skills.get(index++)); @@ -127,10 +128,7 @@ class HiscoreResultBuilder hiscoreResult.setGauntlet(skills.get(index++)); hiscoreResult.setCorruptedGauntlet(skills.get(index++)); hiscoreResult.setTheatreOfBlood(skills.get(index++)); - if (skills.size() >= 82) - { - hiscoreResult.setTheatreOfBloodHardMode(skills.get(index++)); - } + hiscoreResult.setTheatreOfBloodHardMode(skills.get(index++)); hiscoreResult.setThermonuclearSmokeDevil(skills.get(index++)); hiscoreResult.setTzKalZuk(skills.get(index++)); hiscoreResult.setTzTokJad(skills.get(index++)); diff --git a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java index d005e5a28c..698bd34e8e 100644 --- a/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java +++ b/http-api/src/main/java/net/runelite/http/api/hiscore/HiscoreSkill.java @@ -98,6 +98,7 @@ public enum HiscoreSkill KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS), MIMIC("Mimic", BOSS), NIGHTMARE("Nightmare", BOSS), + PHOSANIS_NIGHTMARE("Phosani's Nightmare", BOSS), OBOR("Obor", BOSS), SARACHNIS("Sarachnis", BOSS), SCORPIA("Scorpia", BOSS), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index 64424456ee..25ae9a55b3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -104,7 +104,7 @@ public class HiscorePanel extends PluginPanel GIANT_MOLE, GROTESQUE_GUARDIANS, HESPORI, KALPHITE_QUEEN, KING_BLACK_DRAGON, KRAKEN, KREEARRA, KRIL_TSUTSAROTH, MIMIC, - NIGHTMARE, OBOR, SARACHNIS, + NIGHTMARE, PHOSANIS_NIGHTMARE, OBOR, SARACHNIS, SCORPIA, SKOTIZO, TEMPOROSS, THE_GAUNTLET, THE_CORRUPTED_GAUNTLET, THEATRE_OF_BLOOD, THEATRE_OF_BLOOD_HARD_MODE, THERMONUCLEAR_SMOKE_DEVIL, TZKAL_ZUK, diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/phosanis_nightmare.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/bosses/phosanis_nightmare.png new file mode 100644 index 0000000000000000000000000000000000000000..c0f7645c02c50ca4a8f51792daa69a258ea4e5d0 GIT binary patch literal 492 zcmVik5M4dR=OEU|?r; zP-k6TWot-Ys});bKvY~kNkc7yi$js}!w+p(es=MV=oI(X~MLnHNmk*QI7}>QO zK^YRld1DjB)f|o}HjM2|lnOwVuE=&Fd+a)~?x4CYs0 z1SD`l8k5en5ONLgH(~tC;WlctejmIAANWc5zCWUy?LiJKiRg(jrTlO_CJErKqL#MZ iw|n}GlQx__{>m5gGY{Kv1ji!)0000 Date: Wed, 30 Jun 2021 10:58:12 +0000 Subject: [PATCH 10/11] Release 1.7.14 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 3ae3806918..40e98c696f 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index cad874d2c5..cf97d7b26c 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index bf0eb73736..95393639d7 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index bdb5946649..a653262faa 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index a8e96b916f..1e138de61e 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 Web Service diff --git a/pom.xml b/pom.xml index 72dc438b78..fe5048fa5e 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.7.14 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 0f13c7aafc..e59736f9e6 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 6d56066ea6..55af48c0cb 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 7619f6d964..b7bfedcd2e 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index f60279099c..e14fc75f24 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14-SNAPSHOT + 1.7.14 script-assembler-plugin From 98885d6bf630b886f56bc9a014e105750ced531c Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Wed, 30 Jun 2021 10:58:16 +0000 Subject: [PATCH 11/11] Bump for 1.7.15-SNAPSHOT --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 40e98c696f..9f4a8b1935 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index cf97d7b26c..8336a86d91 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 95393639d7..519f6f2013 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index a653262faa..7c5cfaef5f 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index 1e138de61e..b18670df11 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index fe5048fa5e..4f8caaacd6 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT pom RuneLite @@ -61,7 +61,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.7.14 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index e59736f9e6..42d35244d9 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 55af48c0cb..bc416cfac1 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index b7bfedcd2e..059090cbbf 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index e14fc75f24..69d6bbf343 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.7.14 + 1.7.15-SNAPSHOT script-assembler-plugin