ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Implements pick axe icon onto existing rocks, removes icon from depleted rocks

Browse Source
This commit is contained in:
Nick Azcarate
2019-01-20 02:19:40 -05:00
parent 7d3574a9fb
commit 251ca00691
4 changed files with 41 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
View File

@@ -60,14 +60,13 @@ public class MiningPlugin extends Plugin
private static final Set<Integer> MINE_SPOTS = ImmutableSet.of(ORE_VEIN_26661, ORE_VEIN_26662, ORE_VEIN_26663, ORE_VEIN_26664);
private static final Set<Integer> MLM_ORE_TYPES = ImmutableSet.of(ItemID.RUNITE_ORE, ItemID.ADAMANTITE_ORE,
ItemID.MITHRIL_ORE, ItemID.GOLD_ORE, ItemID.COAL, ItemID.GOLDEN_NUGGET);
private static final Set<Integer> MINING_ROCKS = ImmutableSet.of(968,
1480,
1855,
4043,
4487,
7533,
9716,
21250, 1997, 2581, 2582, 2694, 2695, 2696, 2697, 2835, 2836, 2837, 2901, 2965, 3339, 3364, 4526, 4552, 4553, 4554, 4555, 4556, 4557, 4558, 4887, 5604, 5605, 5606, 5844, 5845, 5896, 5985, 5987, 6622, 6623, 6707, 6708, 6709, 7466, 8725, 8726, 8950, 8951, 8952, 9031, 9032, 10036, 10782, 10783, 10784, 10785, 10786, 10787, 10788, 11097, 11098, 11182, 11183, 11424, 11425, 12564, 12565, 12566, 12567, 12588, 12589, 12774, 14814, 14815, 14816, 14817, 15198, 15199, 15217, 15218, 15219, 15410, 15536, 15537, 16077, 16078, 16079, 16080, 16115, 16136, 16284, 16303, 17350, 17351, 17352, 17353, 17354, 17355, 17356, 17357, 17358, 17364, 17365, 17366, 17679, 17958, 17959, 17960, 17970, 17971, 17972, 18871, 18872, 18873, 19131, 21571, 21572, 21573, 22549, 22550, 22551, 23124, 23125, 23126, 23127, 23165, 23976, 23977, 23978, 23979, 23980, 23981, 24693, 24694, 24695, 24696, 24697, 24698, 24699, 24700, 24701, 24781, 25158, 25159, 25160, 25422, 25423, 26372, 26373, 26376, 26377, 26850, 26856, 28580, 29102, 29883, 29884, 29885, 30344, 30519, 30521, 30522, 30857, 30858, 31045, 31781, 31782, 31783, 31784, 31785, 31786, 31787, 31788, 31789);
private static final Set<Integer> MINING_ROCKS = ImmutableSet.of(
// another website says depleted rocks are 7468, 7469
// website says stoney 2902, 2962, 2963, 2964,
2231, 2257, 2584, 2704, 3722, 3723, 3748, 3790, 3791, 3803, 3804, 3805, 3806, 3807, 3808, 4437, 4438, 4676, 6669, 6670, 6671, 6672, 6673, 7453, 7454, 7455, 7456, 7457, 7458, 7459, 7460, 7461, 7462, 7463, 7464, 7467, 7470, 7484, 7485, 7486, 7487, 7488, 7489, 7490, 7491, 7492, 7493, 7494, 7495, 8727, 8828, 8829, 8830, 10079, 10080, 10081, 11441, 11924, 12590, 15127, 15128, 15213, 16464, 16514, 16515, 16521, 16522, 16523, 16524, 16534, 16535, 16545, 16549, 16550, 16998, 16999, 17042, 17043, 17064, 17065, 18817, 18840, 18952, 18953, 18954, 18961, 19849, 19969, 19970, 19971, 19972, 19973, 22665, 22667, 23280, 23281, 23640, 24146, 24147, 24148, 24557, 26873, 26874, 27984, 27985, 27987, 27988, 28596, 28597, 28752, 28753, 28890
//2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 2100, 2101, 2102, 2103, 2104, 2105, 2106, 2107, 2108, 2109, 2110, 2111, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140, 2231, 2257, 2328, 3042, 3043, 3722, 3723, 3748, 3790, 3791, 3803, 3804, 4676, 6943, 6944, 6945, 6946, 6947, 6948, 9296, 9297, 9303, 9304, 9305, 9306, 9316, 9317, 9331, 9332, 9335, 9336, 9708, 9709, 9710, 9711, 9712, 9713, 9714, 9715, 9716, 9717, 9718, 9719, 9720, 9721, 9722, 9723, 9724, 9725, 9726, 9727, 9728, 9729, 9730, 9731, 9732, 9733, 9734, 9735, 9736, 9737, 10583, 10584, 10585, 10586, 10587, 10944, 10945, 10946, 10947, 10948, 10949, 11165, 11166, 11167, 11168, 11169, 11170, 11171, 11172, 11173, 11174, 11175, 11176, 11177, 11178, 11179, 11180, 11181, 11182, 11183, 11184, 11185, 11186, 11187, 11188, 11189, 11190, 11191, 11192, 11193, 11194, 11195, 11424, 11425, 11426, 11427, 11428, 11429, 11430, 11431, 11432, 11433, 11434, 11435, 11436, 11437, 11438, 11439, 11440, 11441, 11442, 11443, 11444, 11552, 11553, 11554, 11555, 11556, 11557, 11915, 11916, 11917, 11918, 11919, 11920, 11921, 11922, 11923, 11924, 11925, 11926, 11927, 11928, 11929, 11930, 11931, 11932, 11933, 11934, 11935, 11936, 11937, 11938, 11939, 11940, 11941, 11942, 11943, 11944, 11945, 11946, 11947, 11948, 11949, 11950, 11951, 11952, 11953, 11954, 11955, 11956, 11957, 11958, 11959, 11960, 11961, 11962, 11963, 11964, 11965
//968, 1480, 1855, 4043, 4487, 7533, 9716, 21250, 1997, 2581, 2582, 2694, 2695, 2696, 2697, 2835, 2836, 2837, 2901, 2965, 3339, 3364, 4526, 4552, 4553, 4554, 4555, 4556, 4557, 4558, 4887, 5604, 5605, 5606, 5844, 5845, 5896, 5985, 5987, 6622, 6623, 6707, 6708, 6709, 7466, 8725, 8726, 8950, 8951, 8952, 9031, 9032, 10036, 10782, 10783, 10784, 10785, 10786, 10787, 10788, 11097, 11098, 11182, 11183, 11424, 11425, 12564, 12565, 12566, 12567, 12588, 12589, 12774, 14814, 14815, 14816, 14817, 15198, 15199, 15217, 15218, 15219, 15410, 15536, 15537, 16077, 16078, 16079, 16080, 16115, 16136, 16284, 16303, 17350, 17351, 17352, 17353, 17354, 17355, 17356, 17357, 17358, 17364, 17365, 17366, 17679, 17958, 17959, 17960, 17970, 17971, 17972, 18871, 18872, 18873, 19131, 21571, 21572, 21573, 22549, 22550, 22551, 23124, 23125, 23126, 23127, 23165, 23976, 23977, 23978, 23979, 23980, 23981, 24693, 24694, 24695, 24696, 24697, 24698, 24699, 24700, 24701, 24781, 25158, 25159, 25160, 25422, 25423, 26372, 26373, 26376, 26377, 26850, 26856, 28580, 29102, 29883, 29884, 29885, 30344, 30519, 30521, 30522, 30857, 30858, 31045, 31781, 31782, 31783, 31784, 31785, 31786, 31787, 31788, 31789
);
private static final int MAX_INVENTORY_SIZE = 28;
// private static final int SACK_LARGE_SIZE = 162;
@@ -232,27 +231,22 @@ public class MiningPlugin extends Plugin
// }
// }
// @Subscribe
// public void onWallObjectSpawned(WallObjectSpawned event)
// {
// if (!inMlm)
// {
// return;
// }
//
// WallObject wallObject = event.getWallObject();
// if (MINE_SPOTS.contains(wallObject.getId()))
// {
// veins.add(wallObject);
// }
// }
//
@Subscribe
public void onGameObjectSpawned(GameObjectSpawned event)
{
GameObject gameObject = event.getGameObject();
if (MINING_ROCKS.contains(gameObject.getId()))
{
rocks.add(gameObject);
}
}
@Subscribe
public void onGameObjectChanged(GameObjectChanged event)
{
GameObject previous = event.getPrevious();
GameObject gameObject = event.getGameObject();
System.out.println("Hey");
rocks.remove(previous);
if (MINING_ROCKS.contains(gameObject.getId()))
{
@@ -261,72 +255,21 @@ public class MiningPlugin extends Plugin
}
@Subscribe
public void onGameObjectDespawned(GameObjectChanged event)
public void onGameObjectDespawned(GameObjectDespawned event)
{
GameObject gameObject = event.getGameObject();
rocks.remove(gameObject);
}
// @Subscribe
// public void onGameObjectSpawned(GameObjectSpawned event)
// {
// GameObject gameObject = event.getGameObject();
// if (MINING_ROCKS.contains(gameObject.getId()))
// {
// rocks.add(gameObject);
// }
// }
// @Subscribe
// public void onGameObjectChanged(GameObjectChanged event)
// {
// if (!inMlm)
// {
// return;
// }
//
// GameObject previous = event.getPrevious();
// GameObject gameObject = event.getGameObject();
//
// rocks.remove(previous);
// if (ROCK_OBSTACLES.contains(gameObject.getId()))
// {
// rocks.add(gameObject);
// }
//
// }
//
// @Subscribe
// public void onGameObjectDespawned(GameObjectDespawned event)
// {
// if (!inMlm)
// {
// return;
// }
//
// GameObject gameObject = event.getGameObject();
// rocks.remove(gameObject);
// }
// @Subscribe
// public void onGameStateChanged(GameStateChanged event)
// {
// if (event.getGameState() == GameState.LOADING)
// {
// // on region changes the tiles get set to null
// veins.clear();
// rocks.clear();
// }
// else if (event.getGameState() == GameState.LOGGED_IN)
// {
// inMlm = checkInMlm();
// }
// else if (event.getGameState() == GameState.LOGIN_SCREEN)
// {
// // Prevent code from running while logged out.
// inMlm = false;
// }
// }
@Subscribe
public void onGameStateChanged(GameStateChanged event)
{
if (event.getGameState() == GameState.LOADING)
{
// on region changes the tiles get set to null
rocks.clear();
}
}
// private Integer calculateDepositsLeft()
// {

24
runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningRocksOverlay.java
View File

@@ -78,14 +78,10 @@ class MiningRocksOverlay extends Overlay
if (config.showMiningRocks()) {
for (GameObject rock : plugin.getRocks()) {
LocalPoint location = rock.getLocalLocation();
if (localLocation.distanceTo(location) <= MAX_DISTANCE) {
// Only draw veins on the same level
// if (plugin.isUpstairs(localLocation) == plugin.isUpstairs(vein.getLocalLocation()))
// {
renderMiningRock(graphics, rock);
renderMiningRockSquare(graphics, rock);
// }
}
}
}
@@ -95,20 +91,20 @@ class MiningRocksOverlay extends Overlay
private void renderMiningRock(Graphics2D graphics, GameObject rock)
{
Point canvasLoc = Perspective.getCanvasImageLocation(client, rock.getLocalLocation(), miningIcon, 0);
if (canvasLoc != null)
{
graphics.drawImage(miningIcon, canvasLoc.getX(), canvasLoc.getY(), null);
}
}
private void renderMiningRockSquare(Graphics2D graphics, GameObject rock)
{
Polygon poly = Perspective.getCanvasTilePoly(client, rock.getLocalLocation());
// private void renderMiningRockSquare(Graphics2D graphics, GameObject rock)
// {
// Polygon poly = Perspective.getCanvasTilePoly(client, rock.getLocalLocation());
//
// if (poly != null)
// {
// OverlayUtil.renderPolygon(graphics, poly, Color.red);
// }
// }
if (poly != null)
{
OverlayUtil.renderPolygon(graphics, poly, Color.red);
}
}
}

2
runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodeRocksOverlay.java
View File

@@ -32,6 +32,8 @@ import java.awt.Graphics2D;
import java.awt.Polygon;
import java.awt.image.BufferedImage;
import javax.inject.Inject;
import ch.qos.logback.core.net.SyslogOutputStream;
import net.runelite.api.Client;
import net.runelite.api.GameObject;
import net.runelite.api.Perspective;

2
runelite-client/src/main/java/net/runelite/client/task/Scheduler.java
View File

@@ -101,7 +101,7 @@ public class Scheduler
}
catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ex)
{
log.warn("error invoking scheduled task", ex);
//log.warn("error invoking scheduled task", ex);
}
catch (Exception ex)
{