diff --git a/cache/pom.xml b/cache/pom.xml index bcad435545c..297e77153e7 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.12.5.1 + 1.12.5.2 cache diff --git a/pom.xml b/pom.xml index bd88504f9ff..3a77df3a45a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.12.5.1 + 1.12.5.2 pom RuneLite diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 4008cbb08e8..4cba1f34ad9 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.12.5.1 + 1.12.5.2 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 24a988d1407..1d72189d634 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.12.5.1 + 1.12.5.2 client @@ -41,7 +41,7 @@ nogit false false - 2.0.43 + 2.0.44 nogit diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index 4872436a71b..1a5b92d5876 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java @@ -313,6 +313,8 @@ public void onScriptPreFired(ScriptPreFired scriptPreFired) case ObjectID.ROCKS1: case ObjectID.ROCKS2: case ObjectID.ROCKS3: + case ObjectID.LEADROCK1_EMPTY: + case ObjectID.NICKELROCK1_EMPTY: case ObjectID.MY2ARM_SALTROCK_EMPTY: // Basalt etc case ObjectID.PRIF_MINE_ROCKS1_EMPTY: // Trahaearn mine case ObjectID.FOSSIL_ASHPILE_EMPTY: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java index deff6a7f273..be4fb52268a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java @@ -76,6 +76,16 @@ enum MiningSiteLocation CRANDOR_SOUTH_WEST(new WorldPoint(2819, 3247, 0), new Rock(7, Ore.MITHRIL)), CUSTODIA_LAKE(new WorldPoint(1281, 3412, 0), new Rock(8, Ore.IRON), new Rock(3, Ore.COAL), new Rock(6, Ore.MITHRIL)), DAEYALT_ESSENCE_MINE(new WorldPoint(3631, 3340, 0), new Rock(3, Ore.DAEYALT_ESSENCE)), + DEEPFIN_POINT_NORTH(new WorldPoint(1945, 2805, 0), new Rock(3, Ore.TIN), new Rock(4, Ore.COPPER), new Rock(6, + Ore.IRON), new Rock(5, Ore.MITHRIL)), + DEEPFIN_POINT_WEST(new WorldPoint(1932, 2790, 0), new Rock(5, Ore.SILVER), new Rock(7, Ore.LEAD), new Rock(6, + Ore.GOLD), new Rock(7, Ore.NICKEL)), + DEEPFIN_MINE_NORTH(new WorldPoint(1996, 9205, 0), new Rock(7, Ore.IRON), new Rock(7, Ore.LEAD)), + DEEPFIN_MINE_NORTH_WEST(new WorldPoint(1944, 9204, 0), new Rock(23, Ore.COAL), new Rock(4, Ore.ADAMANTITE)), + DEEPFIN_MINE_WEST(new WorldPoint(1932, 9186, 0), new Rock(6, Ore.IRON), new Rock(3, Ore.MITHRIL)), + DEEPFIN_MINE_NORTH_EAST(new WorldPoint(2067, 9208, 0), new Rock(12, Ore.NICKEL)), + DEEPFIN_MINE_EAST(new WorldPoint(2090, 9201, 0), new Rock(21, Ore.COAL), new Rock(6, Ore.ADAMANTITE), new Rock(4, + Ore.RUNITE)), DESERT_MINING_CAMP_SURFACE(new WorldPoint(3299, 3021, 0), true, new Rock(4, Ore.COPPER), new Rock(4, Ore.TIN), new Rock(3, Ore.IRON), new Rock(4, Ore.COAL)), // DESERT_MINING_CAMP_UNDERGROUND -- NOT AVAILABLE ON WORLDMAP DORGESH_KAAN_NORTH(new WorldPoint(3309, 9645, 0), new Rock(1, Ore.IRON), new Rock(9, Ore.SILVER)), @@ -113,6 +123,10 @@ enum MiningSiteLocation GRAND_TREE(new WorldPoint(2489, 9916, 0), new Rock(9, Ore.CLAY), new Rock(8, Ore.IRON), new Rock(4, Ore.SILVER), new Rock(11, Ore.COAL), new Rock(4, Ore.GOLD), new Rock(4, Ore.MITHRIL), new Rock(3, Ore.ADAMANTITE)), + GRIMSTONE_NORTH_EAST(new WorldPoint(2911, 4084, 0), new Rock(3, Ore.COAL), new Rock(3, Ore.ADAMANTITE), + new Rock(4, Ore.NICKEL)), + GRIMSTONE_NORTH_WEST(new WorldPoint(2901, 4084, 0), new Rock(2, Ore.COAL), new Rock(3, Ore.RUNITE)), + GRIMSTONE_SOUTH(new WorldPoint(2909, 4062, 0), new Rock(2, Ore.COAL), new Rock(4, Ore.NICKEL)), GWENITH(new WorldPoint(2163, 3415, 0), new Rock(10, Ore.GOLD)), GWENITH_PRIFDDINAS_MAP(new WorldPoint(3187, 6167, 0), new Rock(10, Ore.GOLD)), HEROES_GUILD_EAST_BOTTOM(new WorldPoint(2939, 9898, 0), new Rock(3, Ore.COAL), new Rock(2, Ore.RUNITE)), @@ -123,8 +137,8 @@ enum MiningSiteLocation new Rock(10, Ore.CLAY), new Rock(11, Ore.COPPER), new Rock(4, Ore.TIN), new Rock(9, Ore.IRON), new Rock(2, Ore.SILVER)), ISAFDAR(new WorldPoint(2277, 3159, 0), new Rock(4, Ore.ADAMANTITE), new Rock(2, Ore.RUNITE)), - ISLE_OF_SOULS_DUNGEON_EAST(new WorldPoint(1831, 9109, 0), new Rock(1, Ore.RUNITE)), - ISLE_OF_SOULS_DUNGEON_WEST(new WorldPoint(1814, 9116, 0), new Rock(2, Ore.ADAMANTITE)), + ISLE_OF_SOULS_DUNGEON_EAST(new WorldPoint(2279, 9237, 0), new Rock(1, Ore.RUNITE)), + ISLE_OF_SOULS_DUNGEON_WEST(new WorldPoint(2262, 9244, 0), new Rock(2, Ore.ADAMANTITE)), ISLE_OF_SOULS_SOUTH(new WorldPoint(2195, 2793, 0), new Rock(3, Ore.CLAY), new Rock(3, Ore.TIN), new Rock(3, Ore.COPPER), new Rock(10, Ore.IRON), new Rock(3, Ore.SILVER), new Rock(6, Ore.COAL), new Rock(4, Ore.GOLD), new Rock(2, Ore.MITHRIL)), @@ -180,6 +194,11 @@ enum MiningSiteLocation NECROPOLIS(new WorldPoint(3319, 2708, 0), new Rock(5, Ore.SANDSTONE), new Rock(5, Ore.GRANITE)), OGRESS_SETTLEMENT(new WorldPoint(1977, 9041, 0), new Rock(5, Ore.COAL), new Rock(2, Ore.MITHRIL), new Rock(1, Ore.ADAMANTITE)), + ONYX_CREST(new WorldPoint(2978, 2254, 0), new Rock(8, Ore.IRON), new Rock(3, Ore.SILVER), new Rock(6, Ore.LEAD), + new Rock(4, Ore.GEM_ROCK), new Rock(4, Ore.GOLD)), + PANDEMONIUM(new WorldPoint(3055, 9367, 0), + new Rock(3, Ore.COPPER), new Rock(3, Ore.TIN), new Rock(5, Ore.IRON), + new Rock(3, Ore.COAL), new Rock(8, Ore.LEAD)), PIRATES_HIDEOUT(new WorldPoint(3056, 3945, 0), new Rock(1, Ore.IRON), new Rock(4, Ore.COAL), new Rock(4, Ore.MITHRIL), new Rock(1, Ore.ADAMANTITE)), PISCARILLIUS(new WorldPoint(1759, 3718, 0), @@ -209,6 +228,8 @@ enum MiningSiteLocation SLEPE_UNDERGROUND(new WorldPoint(3888, 9749, 0), new Rock(6, Ore.IRON), new Rock(14, Ore.COAL)), STONECUTTER_OUTPOST(new WorldPoint(1747, 2955, 0), new Rock(5, Ore.CLAY), new Rock(6, Ore.IRON), new Rock(4, Ore.SILVER), new Rock(10, Ore.COAL), new Rock(3, Ore.GOLD), new Rock(4, Ore.MITHRIL)), STRANGLEWOOD_MINE(new WorldPoint(1169, 3323, 0), new Rock(3, Ore.IRON), new Rock(3, Ore.COAL), new Rock(3, Ore.MITHRIL), new Rock(3, Ore.ADAMANTITE), new Rock(1, Ore.RUNITE)), + SUNBLEAK_CAVE_NORTH(new WorldPoint(2221, 9003, 0), new Rock(4, Ore.COAL), new Rock(5, Ore.MITHRIL)), + SUNBLEAK_CAVE_SOUTH(new WorldPoint(2224, 8977, 0), new Rock(3, Ore.COAL), new Rock(4, Ore.ADAMANTITE)), TLATI_RAINFOREST_EAST(new WorldPoint(1352, 3112, 0), new Rock(7, Ore.IRON), new Rock(4, Ore.COAL), new Rock(5, Ore.GOLD), new Rock(4, Ore.MITHRIL), new Rock(4, Ore.ADAMANTITE), new Rock(1, Ore.GEMSTONE_CRAB)), TLATI_RAINFOREST_NORTH(new WorldPoint(1272, 3173, 0), new Rock(9, Ore.SILVER), new Rock(8, Ore.CLAY), new Rock(1, Ore.GEMSTONE_CRAB)), TLATI_RAINFOREST_SOUTH(new WorldPoint(1238, 3043, 0), new Rock(13, Ore.COPPER), new Rock(10, Ore.IRON), new Rock(7, Ore.COAL), new Rock(1, Ore.GEMSTONE_CRAB)), @@ -226,6 +247,9 @@ enum MiningSiteLocation new Rock(6, Ore.IRON), new Rock(11, Ore.COAL), new Rock(4, Ore.GOLD), new Rock(1, Ore.MITHRIL), new Rock(6, Ore.ADAMANTITE)), WILDERNESS_SOUTH(new WorldPoint(3104, 3569, 0), new Rock(2, Ore.IRON), new Rock(3, Ore.COAL)), WILDERNESS_SOUTH_WEST(new WorldPoint(3013, 3589, 0), new Rock(34, Ore.COAL)), + YNYSDAIL(new WorldPoint(2224, 3476, 0), new Rock(4, Ore.IRON), new Rock(3, Ore.NICKEL)), + YNYSDAIL_CAVERN_NORTH(new WorldPoint(2267, 9892, 0), new Rock(5, Ore.MITHRIL), new Rock(8, Ore.ADAMANTITE)), + YNYSDAIL_CAVERN_WEST(new WorldPoint(2249, 9878, 0), new Rock(2, Ore.MITHRIL), new Rock(2, Ore.RUNITE)) ; private final WorldPoint location; @@ -284,6 +308,8 @@ private enum Ore RUNITE("Runite"), AMETHYST("Amethyst"), GEMSTONE_CRAB("Gemstone Crab"), + LEAD("Lead"), + NICKEL("Nickel") ; private final String name; diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/collision-map.zip b/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/collision-map.zip index 4e9330dd21d..d9d72d28325 100644 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/collision-map.zip and b/runelite-client/src/main/resources/net/runelite/client/plugins/microbot/shortestpath/collision-map.zip differ diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 8fda8a275d0..a2b7136d0cf 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.12.5.1 + 1.12.5.2 jshell diff --git a/runelite-maven-plugin/pom.xml b/runelite-maven-plugin/pom.xml index ba10ee423bd..ce9f3386454 100644 --- a/runelite-maven-plugin/pom.xml +++ b/runelite-maven-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.12.5.1 + 1.12.5.2 runelite-maven-plugin