From b6316b47728e18ca2b76941a58543d8fd8f0e759 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 28 Sep 2021 23:34:57 -0400 Subject: [PATCH] api: move Favour to achievementdiary plugin --- .../main/java/net/runelite/api/Favour.java | 45 ------------------- .../achievementdiary/FavourRequirement.java | 19 +++++++- .../diaries/KourendDiaryRequirement.java | 31 +++++++------ 3 files changed, 33 insertions(+), 62 deletions(-) delete mode 100644 runelite-api/src/main/java/net/runelite/api/Favour.java diff --git a/runelite-api/src/main/java/net/runelite/api/Favour.java b/runelite-api/src/main/java/net/runelite/api/Favour.java deleted file mode 100644 index 38904257b1..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/Favour.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2019 William - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.api; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -/** - * An enumeration of Kourend house favour the player can earn. - */ -@RequiredArgsConstructor -@Getter -public enum Favour -{ - ARCEUUS("Arceuus", Varbits.KOUREND_FAVOR_ARCEUUS), - HOSIDIUS("Hosidius", Varbits.KOUREND_FAVOR_HOSIDIUS), - LOVAKENGJ("Lovakengj", Varbits.KOUREND_FAVOR_LOVAKENGJ), - PISCARILIUS("Piscarilius", Varbits.KOUREND_FAVOR_PISCARILIUS), - SHAYZIEN("Shayzien", Varbits.KOUREND_FAVOR_SHAYZIEN); - - private final String name; - private final Varbits varbit; -} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java index a39953492c..ef608a2be5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/FavourRequirement.java @@ -27,12 +27,29 @@ package net.runelite.client.plugins.achievementdiary; import lombok.Getter; import lombok.RequiredArgsConstructor; import net.runelite.api.Client; -import net.runelite.api.Favour; +import net.runelite.api.Varbits; @RequiredArgsConstructor @Getter public class FavourRequirement implements Requirement { + /** + * An enumeration of Kourend house favour the player can earn. + */ + @RequiredArgsConstructor + @Getter + public enum Favour + { + ARCEUUS("Arceuus", Varbits.KOUREND_FAVOR_ARCEUUS), + HOSIDIUS("Hosidius", Varbits.KOUREND_FAVOR_HOSIDIUS), + LOVAKENGJ("Lovakengj", Varbits.KOUREND_FAVOR_LOVAKENGJ), + PISCARILIUS("Piscarilius", Varbits.KOUREND_FAVOR_PISCARILIUS), + SHAYZIEN("Shayzien", Varbits.KOUREND_FAVOR_SHAYZIEN); + + private final String name; + private final Varbits varbit; + } + private final Favour house; private final int percent; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KourendDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KourendDiaryRequirement.java index 2cde458c8e..6a44468381 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KourendDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/KourendDiaryRequirement.java @@ -24,13 +24,12 @@ */ package net.runelite.client.plugins.achievementdiary.diaries; -import net.runelite.api.Favour; import net.runelite.api.Quest; import net.runelite.api.Skill; -import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; -import net.runelite.client.plugins.achievementdiary.SkillRequirement; -import net.runelite.client.plugins.achievementdiary.QuestRequirement; import net.runelite.client.plugins.achievementdiary.FavourRequirement; +import net.runelite.client.plugins.achievementdiary.GenericDiaryRequirement; +import net.runelite.client.plugins.achievementdiary.QuestRequirement; +import net.runelite.client.plugins.achievementdiary.SkillRequirement; public class KourendDiaryRequirement extends GenericDiaryRequirement { @@ -41,7 +40,7 @@ public class KourendDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.MINING, 15)); add("Steal from a Hosidius Food Stall.", new SkillRequirement(Skill.THIEVING, 25), - new FavourRequirement(Favour.HOSIDIUS, 15)); + new FavourRequirement(FavourRequirement.Favour.HOSIDIUS, 15)); add("Browse the Warrens General Store.", new QuestRequirement(Quest.THE_QUEEN_OF_THIEVES, true)); add("Enter your Player Owned House from Hosidius.", @@ -65,11 +64,11 @@ public class KourendDiaryRequirement extends GenericDiaryRequirement add("Enter the Farming Guild.", new SkillRequirement(Skill.FARMING, 45)); add("Switch to the Necromancy Spellbook at Tyss.", - new FavourRequirement(Favour.ARCEUUS, 60)); + new FavourRequirement(FavourRequirement.Favour.ARCEUUS, 60)); add("Repair a Piscarilius crane.", new SkillRequirement(Skill.CRAFTING, 30)); add("Deliver some intelligence to Captain Ginea.", - new FavourRequirement(Favour.SHAYZIEN, 40)); + new FavourRequirement(FavourRequirement.Favour.SHAYZIEN, 40)); add("Catch a Bluegill on Molch Island.", new SkillRequirement(Skill.FISHING, 43), new SkillRequirement(Skill.HUNTER, 35)); @@ -86,23 +85,23 @@ public class KourendDiaryRequirement extends GenericDiaryRequirement //HARD add("Enter the Woodcutting Guild.", new SkillRequirement(Skill.WOODCUTTING, 60), - new FavourRequirement(Favour.HOSIDIUS, 75)); + new FavourRequirement(FavourRequirement.Favour.HOSIDIUS, 75)); add("Smelt an Adamantite bar in The Forsaken Tower.", new SkillRequirement(Skill.SMITHING, 70), new QuestRequirement(Quest.THE_FORSAKEN_TOWER, true)); add("Kill a Lizardman Shaman in Molch.", - new FavourRequirement(Favour.SHAYZIEN, 100)); + new FavourRequirement(FavourRequirement.Favour.SHAYZIEN, 100)); add("Mine some Lovakite.", new SkillRequirement(Skill.MINING, 65), - new FavourRequirement(Favour.LOVAKENGJ, 30)); + new FavourRequirement(FavourRequirement.Favour.LOVAKENGJ, 30)); add("Plant some Logavano seeds at the Tithe Farm.", new SkillRequirement(Skill.FARMING, 74), - new FavourRequirement(Favour.HOSIDIUS, 100)); + new FavourRequirement(FavourRequirement.Favour.HOSIDIUS, 100)); add("Teleport to Xeric's Heart using Xeric's Talisman.", new QuestRequirement(Quest.ARCHITECTURAL_ALLIANCE)); add("Deliver an artefact to Captain Khaled.", new SkillRequirement(Skill.THIEVING, 49), - new FavourRequirement(Favour.PISCARILIUS, 75)); + new FavourRequirement(FavourRequirement.Favour.PISCARILIUS, 75)); add("Kill a Wyrm in the Karuulm Slayer Dungeon.", new SkillRequirement(Skill.SLAYER, 62)); add("Cast Monster Examine on a Troll south of Mount Quidamortem.", @@ -114,21 +113,21 @@ public class KourendDiaryRequirement extends GenericDiaryRequirement new SkillRequirement(Skill.RUNECRAFT, 77), new SkillRequirement(Skill.MINING, 38), new SkillRequirement(Skill.CRAFTING, 38), - new FavourRequirement(Favour.ARCEUUS, 100)); + new FavourRequirement(FavourRequirement.Favour.ARCEUUS, 100)); add("Chop some Redwood logs.", new SkillRequirement(Skill.WOODCUTTING, 90), - new FavourRequirement(Favour.HOSIDIUS, 75)); + new FavourRequirement(FavourRequirement.Favour.HOSIDIUS, 75)); add("Catch an Anglerfish and cook it whilst in Great Kourend.", new SkillRequirement(Skill.FISHING, 82), new SkillRequirement(Skill.COOKING, 84), - new FavourRequirement(Favour.PISCARILIUS, 100)); + new FavourRequirement(FavourRequirement.Favour.PISCARILIUS, 100)); add("Kill a Hydra in the Karuulm Slayer Dungeon.", new SkillRequirement(Skill.SLAYER, 95)); add("Create an Ape Atoll teleport tablet.", new SkillRequirement(Skill.MAGIC, 90), new SkillRequirement(Skill.MINING, 38), new SkillRequirement(Skill.CRAFTING, 38), - new FavourRequirement(Favour.ARCEUUS, 100)); + new FavourRequirement(FavourRequirement.Favour.ARCEUUS, 100)); add("Create your own Battlestaff from scratch within the Farming Guild.", new SkillRequirement(Skill.FARMING, 85), new SkillRequirement(Skill.FLETCHING, 40));