From 54309d5482dfa575d62d799315e7a5951157f51f Mon Sep 17 00:00:00 2001 From: Zeruth Date: Mon, 29 Jul 2019 04:43:14 -0400 Subject: [PATCH 1/3] runelite-api: mournings end I/II refactor --- runelite-api/src/main/java/net/runelite/api/Quest.java | 4 ++-- runelite-api/src/main/java/net/runelite/api/VarPlayer.java | 2 +- runelite-api/src/main/java/net/runelite/api/Varbits.java | 2 +- .../achievementdiary/diaries/ArdougneDiaryRequirement.java | 2 +- .../achievementdiary/diaries/WesternDiaryRequirement.java | 6 +++--- .../client/plugins/worldmap/QuestStartLocation.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Quest.java b/runelite-api/src/main/java/net/runelite/api/Quest.java index 23a494d765..19804000d5 100644 --- a/runelite-api/src/main/java/net/runelite/api/Quest.java +++ b/runelite-api/src/main/java/net/runelite/api/Quest.java @@ -120,8 +120,8 @@ public enum Quest MONKEY_MADNESS_II(396, "Monkey Madness II", Varbits.QUEST_MONKEY_MADNESS_II), MONKS_FRIEND(397, "Monk's Friend", VarPlayer.QUEST_MONKS_FRIEND), MOUNTAIN_DAUGHTER(398, "Mountain Daughter", Varbits.QUEST_MOUNTAIN_DAUGHTER), - MOURNINGS_ENDS_PART_I(399, "Mourning's Ends Part I", VarPlayer.QUEST_MOURNINGS_ENDS_PART_I), - MOURNINGS_ENDS_PART_II(400, "Mourning's Ends Part II", Varbits.QUEST_MOURNINGS_ENDS_PART_II), + MOURNINGS_END_PART_I(399, "Mourning's Ends Part I", VarPlayer.QUEST_MOURNINGS_END_PART_I), + MOURNINGS_END_PART_II(400, "Mourning's Ends Part II", Varbits.QUEST_MOURNINGS_END_PART_II), MURDER_MYSTERY(401, "Murder Mystery", VarPlayer.QUEST_MURDER_MYSTERY), MY_ARMS_BIG_ADVENTURE(402, "My Arm's Big Adventure", Varbits.QUEST_MY_ARMS_BIG_ADVENTURE), NATURE_SPIRIT(403, "Nature Spirit", VarPlayer.QUEST_NATURE_SPIRIT), diff --git a/runelite-api/src/main/java/net/runelite/api/VarPlayer.java b/runelite-api/src/main/java/net/runelite/api/VarPlayer.java index db9f9908d3..ba78672da5 100644 --- a/runelite-api/src/main/java/net/runelite/api/VarPlayer.java +++ b/runelite-api/src/main/java/net/runelite/api/VarPlayer.java @@ -220,7 +220,7 @@ public enum VarPlayer QUEST_MERLINS_CRYSTAL(14), QUEST_MONKEY_MADNESS_I(365), QUEST_MONKS_FRIEND(30), - QUEST_MOURNINGS_ENDS_PART_I(517), + QUEST_MOURNINGS_END_PART_I(517), QUEST_MURDER_MYSTERY(192), QUEST_NATURE_SPIRIT(307), QUEST_OBSERVATORY_QUEST(112), diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java index 45619d0278..0ceac97105 100644 --- a/runelite-api/src/main/java/net/runelite/api/Varbits.java +++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java @@ -595,7 +595,7 @@ public enum Varbits QUEST_LUNAR_DIPLOMACY(2448), QUEST_MAKING_HISTORY(1383), QUEST_MOUNTAIN_DAUGHTER(260), - QUEST_MOURNINGS_ENDS_PART_II(1103), + QUEST_MOURNINGS_END_PART_II(1103), QUEST_MY_ARMS_BIG_ADVENTURE(2790), QUEST_RATCATCHERS(1404), QUEST_RECIPE_FOR_DISASTER(1850), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/ArdougneDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/ArdougneDiaryRequirement.java index fbb7bbfa78..e519510885 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/ArdougneDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/ArdougneDiaryRequirement.java @@ -109,7 +109,7 @@ public class ArdougneDiaryRequirement extends GenericDiaryRequirement new QuestRequirement(Quest.LEGENDS_QUEST)); add("Craft some Death runes.", new SkillRequirement(Skill.RUNECRAFT, 65), - new QuestRequirement(Quest.MOURNINGS_ENDS_PART_II)); + new QuestRequirement(Quest.MOURNINGS_END_PART_II)); // ELITE add("Catch a Manta ray in the Fishing Trawler and cook it in Port Khazard.", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java index b136f889fe..ed253026ba 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java @@ -110,7 +110,7 @@ public class WesternDiaryRequirement extends GenericDiaryRequirement new QuestRequirement(Quest.REGICIDE)); add("Check the health of your Palm tree in Lletya.", new SkillRequirement(Skill.FARMING, 68), - new QuestRequirement(Quest.MOURNINGS_ENDS_PART_I, true)); + new QuestRequirement(Quest.MOURNINGS_END_PART_I, true)); add("Claim a Chompy bird hat from Rantz after registering at least 300 kills.", new QuestRequirement(Quest.BIG_CHOMPY_BIRD_HUNTING)); add("Build an Isafdar painting in your POH Quest hall.", @@ -128,7 +128,7 @@ public class WesternDiaryRequirement extends GenericDiaryRequirement // ELITE add("Fletch a Magic Longbow in the Elven lands.", new SkillRequirement(Skill.FLETCHING, 85), - new QuestRequirement(Quest.MOURNINGS_ENDS_PART_I)); + new QuestRequirement(Quest.MOURNINGS_END_PART_I)); add("Kill the Thermonuclear Smoke devil (Does not require task).", new SkillRequirement(Skill.SLAYER, 93)); add("Have Prissy Scilla protect your Magic tree.", @@ -140,6 +140,6 @@ public class WesternDiaryRequirement extends GenericDiaryRequirement new QuestRequirement(Quest.BIG_CHOMPY_BIRD_HUNTING)); add("Pickpocket an Elf.", new SkillRequirement(Skill.THIEVING, 85), - new QuestRequirement(Quest.MOURNINGS_ENDS_PART_I, true)); + new QuestRequirement(Quest.MOURNINGS_END_PART_I, true)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java index 5c0f51e7de..394805357f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/QuestStartLocation.java @@ -122,8 +122,8 @@ enum QuestStartLocation MAKING_HISTORY(Quest.MAKING_HISTORY, new WorldPoint(2435, 3346, 0)), MONKS_FRIEND(Quest.MONKS_FRIEND, new WorldPoint(2605, 3209, 0)), MOUNTAIN_DAUGHTER(Quest.MOUNTAIN_DAUGHTER, new WorldPoint(2810, 3672, 0)), - MOURNINGS_ENDS_PART_I(Quest.MOURNINGS_ENDS_PART_I, new WorldPoint(2289, 3149, 0)), - MOURNINGS_ENDS_PART_II(Quest.MOURNINGS_ENDS_PART_II, new WorldPoint(2352, 3172, 0)), + MOURNINGS_ENDS_PART_I(Quest.MOURNINGS_END_PART_I, new WorldPoint(2289, 3149, 0)), + MOURNINGS_ENDS_PART_II(Quest.MOURNINGS_END_PART_II, new WorldPoint(2352, 3172, 0)), MURDER_MYSTERY(Quest.MURDER_MYSTERY, new WorldPoint(2740, 3562, 0)), MY_ARMS_BIG_ADVENTURE(Quest.MY_ARMS_BIG_ADVENTURE, new WorldPoint(2908, 10088, 0)), NATURE_SPIRIT(Quest.NATURE_SPIRIT, new WorldPoint(3440, 9894, 0)), From 8600782c56a933349963d6b6edd75d45bd311d75 Mon Sep 17 00:00:00 2001 From: Tyler Bochard Date: Mon, 29 Jul 2019 04:47:41 -0400 Subject: [PATCH 2/3] Update README.md --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 53e24c5ca6..cdc9114335 100644 --- a/README.md +++ b/README.md @@ -26,17 +26,14 @@ Currently we support RSMod which can be found at: https://github.com/Tomm0017/rsmod but should work with any server that follows osrs protocol. ``` Jar/IntelliJ -Use -private-server arg. +Use -rs=RSPS arg. Exe -Use --clientargs="--private-server" arg. - -Using modified mixins is possible using -local-injected arg, but it looks in a very specific location. -(./injected-client/target/injected-client-X.X.XX-SNAPSHOT.jar) (X.X.XX must match current API version) +Use --clientargs="--rs=RSPS" arg. ----- -Set codebase in ./codebase or in Private Server plugin and restart. +Codebase is set to 127.0.0.1 by default and can be changed in the Private Server plugin (requires restart) Update modulus in Private Server plugin. Disable Default World plugin if you have it enabled, this causes issues with codebase. From b0e70aced103159dd548088d9d303de3dc7b0e97 Mon Sep 17 00:00:00 2001 From: Tyler Bochard Date: Mon, 29 Jul 2019 04:52:02 -0400 Subject: [PATCH 3/3] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index cdc9114335..53423df333 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,9 @@ - [runescape-api](runescape-api/src/main/java/net/runelite) - Mappings correspond to these interfaces, runelite-api is a subset of this - [runelite-client](runelite-client/src/main/java/net/runelite/client) - Game client with plugins +## Building +We have migrated the project to Gradle. Information on how to setup and build the project can be found at https://github.com/runelite-extended/runelite/wiki/Building-with-IntelliJ-IDEA + ## Private Servers Currently we support RSMod which can be found at: https://github.com/Tomm0017/rsmod but should work with any server that follows osrs protocol. ```