randomevents: Cleanup and alphabetize code

This commit is contained in:
Shawn Shadrix
2020-06-10 22:20:16 -04:00
committed by Jordan Atwood
parent c5f8b88146
commit 0fce0f75e2
2 changed files with 24 additions and 34 deletions

View File

@@ -44,18 +44,29 @@ public interface RandomEventConfig extends Config
keyName = "removeMenuOptions", keyName = "removeMenuOptions",
name = "Remove others' menu options", name = "Remove others' menu options",
description = "Remove menu options from random events for other players.", description = "Remove menu options from random events for other players.",
position = 0 position = -3
) )
default boolean removeMenuOptions() default boolean removeMenuOptions()
{ {
return true; return true;
} }
@ConfigItem(
keyName = "notifyAll",
name = "Notify for all events",
description = "",
position = -2,
section = notificationSection
)
default boolean notifyAllEvents()
{
return false;
}
@ConfigItem( @ConfigItem(
keyName = "notifyDunce", keyName = "notifyDunce",
name = "Notify on Surprise Exam", name = "Notify on Surprise Exam",
description = "", description = "",
position = 1,
section = notificationSection section = notificationSection
) )
default boolean notifyDunce() default boolean notifyDunce()
@@ -67,7 +78,6 @@ public interface RandomEventConfig extends Config
keyName = "notifyGenie", keyName = "notifyGenie",
name = "Notify on Genie", name = "Notify on Genie",
description = "", description = "",
position = 2,
section = notificationSection section = notificationSection
) )
default boolean notifyGenie() default boolean notifyGenie()
@@ -79,7 +89,6 @@ public interface RandomEventConfig extends Config
keyName = "notifyDemon", keyName = "notifyDemon",
name = "Notify on Drill Demon", name = "Notify on Drill Demon",
description = "", description = "",
position = 3,
section = notificationSection section = notificationSection
) )
default boolean notifyDemon() default boolean notifyDemon()
@@ -91,7 +100,6 @@ public interface RandomEventConfig extends Config
keyName = "notifyForester", keyName = "notifyForester",
name = "Notify on Freaky Forester", name = "Notify on Freaky Forester",
description = "", description = "",
position = 4,
section = notificationSection section = notificationSection
) )
default boolean notifyForester() default boolean notifyForester()
@@ -103,7 +111,6 @@ public interface RandomEventConfig extends Config
keyName = "notifyFrog", keyName = "notifyFrog",
name = "Notify on Kiss the Frog", name = "Notify on Kiss the Frog",
description = "", description = "",
position = 5,
section = notificationSection section = notificationSection
) )
default boolean notifyFrog() default boolean notifyFrog()
@@ -115,7 +122,6 @@ public interface RandomEventConfig extends Config
keyName = "notifyGravedigger", keyName = "notifyGravedigger",
name = "Notify on Gravedigger", name = "Notify on Gravedigger",
description = "", description = "",
position = 6,
section = notificationSection section = notificationSection
) )
default boolean notifyGravedigger() default boolean notifyGravedigger()
@@ -127,7 +133,6 @@ public interface RandomEventConfig extends Config
keyName = "notifyMoM", keyName = "notifyMoM",
name = "Notify on Mysterious Old Man", name = "Notify on Mysterious Old Man",
description = "", description = "",
position = 7,
section = notificationSection section = notificationSection
) )
default boolean notifyMoM() default boolean notifyMoM()
@@ -139,7 +144,6 @@ public interface RandomEventConfig extends Config
keyName = "notifyBob", keyName = "notifyBob",
name = "Notify on Evil Bob", name = "Notify on Evil Bob",
description = "", description = "",
position = 8,
section = notificationSection section = notificationSection
) )
default boolean notifyBob() default boolean notifyBob()
@@ -151,24 +155,10 @@ public interface RandomEventConfig extends Config
keyName = "notifyQuiz", keyName = "notifyQuiz",
name = "Notify on Quiz Master", name = "Notify on Quiz Master",
description = "", description = "",
position = 9,
section = notificationSection section = notificationSection
) )
default boolean notifyQuiz() default boolean notifyQuiz()
{ {
return false; return false;
} }
@ConfigItem(
keyName = "notifyAll",
name = "Notify for all events",
description = "",
position = 10,
section = notificationSection
)
default boolean notifyAllEvents()
{
return false;
}
} }

View File

@@ -55,28 +55,28 @@ import net.runelite.client.plugins.PluginDescriptor;
public class RandomEventPlugin extends Plugin public class RandomEventPlugin extends Plugin
{ {
private static final Set<Integer> EVENT_NPCS = ImmutableSet.of( private static final Set<Integer> EVENT_NPCS = ImmutableSet.of(
NpcID.DR_JEKYLL, NpcID.DR_JEKYLL_314,
NpcID.BEE_KEEPER_6747, NpcID.BEE_KEEPER_6747,
NpcID.CAPT_ARNAV, NpcID.CAPT_ARNAV,
NpcID.SERGEANT_DAMIEN_6743, NpcID.DR_JEKYLL, NpcID.DR_JEKYLL_314,
NpcID.DRUNKEN_DWARF, NpcID.DRUNKEN_DWARF,
NpcID.FREAKY_FORESTER_6748, NpcID.DUNCE_6749,
NpcID.GENIE, NpcID.GENIE_327,
NpcID.EVIL_BOB, NpcID.EVIL_BOB_6754, NpcID.EVIL_BOB, NpcID.EVIL_BOB_6754,
NpcID.POSTIE_PETE_6738, NpcID.FLIPPA_6744,
NpcID.FREAKY_FORESTER_6748,
NpcID.FROG_5429,
NpcID.GENIE, NpcID.GENIE_327,
NpcID.GILES, NpcID.GILES_5441,
NpcID.LEO_6746, NpcID.LEO_6746,
NpcID.MILES, NpcID.MILES_5440,
NpcID.MYSTERIOUS_OLD_MAN_6750, NpcID.MYSTERIOUS_OLD_MAN_6751, NpcID.MYSTERIOUS_OLD_MAN_6750, NpcID.MYSTERIOUS_OLD_MAN_6751,
NpcID.MYSTERIOUS_OLD_MAN_6752, NpcID.MYSTERIOUS_OLD_MAN_6753, NpcID.MYSTERIOUS_OLD_MAN_6752, NpcID.MYSTERIOUS_OLD_MAN_6753,
NpcID.NILES, NpcID.NILES_5439,
NpcID.PILLORY_GUARD, NpcID.PILLORY_GUARD,
NpcID.FLIPPA_6744, NpcID.POSTIE_PETE_6738,
NpcID.QUIZ_MASTER_6755, NpcID.QUIZ_MASTER_6755,
NpcID.RICK_TURPENTINE, NpcID.RICK_TURPENTINE_376, NpcID.RICK_TURPENTINE, NpcID.RICK_TURPENTINE_376,
NpcID.SANDWICH_LADY, NpcID.SANDWICH_LADY,
NpcID.DUNCE_6749, NpcID.SERGEANT_DAMIEN_6743
NpcID.NILES, NpcID.NILES_5439,
NpcID.MILES, NpcID.MILES_5440,
NpcID.GILES, NpcID.GILES_5441,
NpcID.FROG_5429
); );
private static final Set<String> EVENT_OPTIONS = ImmutableSet.of( private static final Set<String> EVENT_OPTIONS = ImmutableSet.of(
"Talk-to", "Talk-to",