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

timetracking: correctly bound Catherby patches

Browse Source
This commit is contained in:
Max Weber
2020-10-05 21:32:49 -06:00
committed by Adam
parent dc414b1adf
commit 4dfb561632
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingTracker.java
View File

@@ -92,9 +92,13 @@ public class FarmingTracker
}
}
FarmingRegion region = farmingWorld.getRegions().get(location.getRegionID());
if (region != null && region.isInBounds(location))
for (FarmingRegion region : farmingWorld.getRegions().get(location.getRegionID()))
{
if (!region.isInBounds(location))
{
continue;
}
// Write config with new varbits
// timetracking.<login-username>.<regionID>.<VarbitID>=<varbitValue>:<unix time>
String group = TimeTrackingConfig.CONFIG_GROUP + "." + client.getUsername() + "." + region.getRegionID();

29
runelite-client/src/main/java/net/runelite/client/plugins/timetracking/farming/FarmingWorld.java
View File

@@ -25,6 +25,9 @@
*/
package net.runelite.client.plugins.timetracking.farming;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.inject.Singleton;
import java.util.Collections;
import java.util.Comparator;
@@ -42,7 +45,7 @@ import net.runelite.client.plugins.timetracking.Tab;
class FarmingWorld
{
@Getter
private Map<Integer, FarmingRegion> regions = new HashMap<>();
private Multimap<Integer, FarmingRegion> regions = HashMultimap.create();
@Getter
private Map<Tab, Set<FarmingPatch>> tabs = new HashMap<>();
@@ -83,10 +86,28 @@ class FarmingWorld
new FarmingPatch("South", Varbits.FARMING_4772, PatchImplementation.ALLOTMENT),
new FarmingPatch("", Varbits.FARMING_4773, PatchImplementation.FLOWER),
new FarmingPatch("", Varbits.FARMING_4774, PatchImplementation.HERB)
));
)
{
@Override
public boolean isInBounds(WorldPoint loc)
{
if (loc.getY() < 3456)
{
return loc.getX() <= 2840 && loc.getY() > 3440;
}
return true;
}
}, 11061, 11318, 11317);
add(new FarmingRegion("Catherby", 11317,
new FarmingPatch("", Varbits.FARMING_4771, PatchImplementation.FRUIT_TREE)
));
)
{
@Override
public boolean isInBounds(WorldPoint loc)
{
return loc.getX() > 2840 || loc.getY() < 3440;
}
});
add(new FarmingRegion("Champions' Guild", 12596,
new FarmingPatch("", Varbits.FARMING_4771, PatchImplementation.BUSH)
@@ -255,7 +276,7 @@ class FarmingWorld
));
// Finalize
this.regions = Collections.unmodifiableMap(regions);
this.regions = Multimaps.unmodifiableMultimap(regions);
Map<Tab, Set<FarmingPatch>> umtabs = new TreeMap<>();
for (Map.Entry<Tab, Set<FarmingPatch>> e : tabs.entrySet())
{