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

Merge branch 'master' of github.com:runelite/runelite

Browse Source
This commit is contained in:
Adam
2018-02-16 13:04:14 -05:00
parent 5663852846 1f1c2f2e3d
commit 0b05da4677
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingConfig.java
View File

@@ -145,4 +145,23 @@ public interface FishingConfig extends Config
return true;
}
@ConfigItem(
keyName = "showKarambwanji",
name = "Show Karambwanji",
description = "Configures whether karambwanji is displayed"
)
default boolean showKarambwanji()
{
return true;
}
@ConfigItem(
keyName = "showKarambwan",
name = "Show Karambwan",
description = "Configures whether karambwan is displayed"
)
default boolean showKarambwan()
{
return true;
}
}

8
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java
View File

@@ -158,6 +158,14 @@ public class FishingPlugin extends Plugin
{
spotIds.addAll(Ints.asList(FishingSpot.INFERNAL_EEL.getIds()));
}
if (config.showKarambwanji())
{
spotIds.addAll(Ints.asList(FishingSpot.KARAMBWANJI.getIds()));
}
if (config.showKarambwan())
{
spotIds.addAll(Ints.asList(FishingSpot.KARAMBWAN.getIds()));
}
}
@Subscribe

17
runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingSpot.java
View File

@@ -24,10 +24,9 @@
*/
package net.runelite.client.plugins.fishing;
import net.runelite.api.ItemID;
import java.util.HashMap;
import java.util.Map;
import net.runelite.api.ItemID;
import static net.runelite.api.NpcID.FISHING_SPOT_1506;
import static net.runelite.api.NpcID.FISHING_SPOT_1508;
import static net.runelite.api.NpcID.FISHING_SPOT_1510;
@@ -47,18 +46,21 @@ import static net.runelite.api.NpcID.FISHING_SPOT_1530;
import static net.runelite.api.NpcID.FISHING_SPOT_1542;
import static net.runelite.api.NpcID.FISHING_SPOT_1544;
import static net.runelite.api.NpcID.FISHING_SPOT_4316;
import static net.runelite.api.NpcID.FISHING_SPOT_4710;
import static net.runelite.api.NpcID.FISHING_SPOT_4712;
import static net.runelite.api.NpcID.FISHING_SPOT_4713;
import static net.runelite.api.NpcID.FISHING_SPOT_6825;
import static net.runelite.api.NpcID.FISHING_SPOT_7155;
import static net.runelite.api.NpcID.FISHING_SPOT_7199;
import static net.runelite.api.NpcID.FISHING_SPOT_7200;
import static net.runelite.api.NpcID.FISHING_SPOT_7469;
import static net.runelite.api.NpcID.FISHING_SPOT_7470;
import static net.runelite.api.NpcID.FISHING_SPOT_7676;
import static net.runelite.api.NpcID.FISHING_SPOT_7730;
import static net.runelite.api.NpcID.FISHING_SPOT_7731;
import static net.runelite.api.NpcID.FISHING_SPOT_7732;
import static net.runelite.api.NpcID.FISHING_SPOT_7733;
import static net.runelite.api.NpcID.FISHING_SPOT_7734;
import static net.runelite.api.NpcID.FISHING_SPOT_7676;
public enum FishingSpot
{
@@ -91,7 +93,14 @@ public enum FishingSpot
FISHING_SPOT_7730, FISHING_SPOT_7731, FISHING_SPOT_7732, FISHING_SPOT_7733, FISHING_SPOT_7734
),
INFERNAL_EEL("Infernal Eel", ItemID.INFERNAL_EEL,
FISHING_SPOT_7676);
FISHING_SPOT_7676
),
KARAMBWAN("Karambwan", ItemID.RAW_KARAMBWAN,
FISHING_SPOT_4712, FISHING_SPOT_4713
),
KARAMBWANJI("Karambwanji, Shrimp", ItemID.KARAMBWANJI,
FISHING_SPOT_4710
);
public static final int FLYING_FISH = FISHING_SPOT_7734;
private static final Map<Integer, FishingSpot> fishingSpots = new HashMap<>();