Skip to content

Commit

Permalink
Updated for Sponge API 2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmonkey
mmonkey committed Jun 26, 2015
1 parent 44f42f1 commit 072f016
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 58 deletions.
5 changes: 3 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.github.mmonkey</groupId>
<artifactId>Relay</artifactId>
<version>1.0.1</version>
<version>1.0.2-2.1</version>
<packaging>jar</packaging>

<name>Relay</name>
Expand Down Expand Up @@ -38,7 +38,8 @@
<dependency>
<groupId>org.spongepowered</groupId>
<artifactId>spongeapi</artifactId>
<version>2.0</version>
<version>2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/mmonkey/Relay/Events/PlayerChangeNameListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ public class PlayerChangeNameListener {
@Subscribe
public void onJoin(PlayerJoinEvent event) {

Player player = event.getPlayer();
Player player = event.getUser();
updateUsername(player);

}

@Subscribe
public void onPlayerUpdate(PlayerUpdateEvent event) {

Player player = event.getPlayer();
Player player = event.getUser();
updateUsername(player);

}
Expand Down
108 changes: 54 additions & 54 deletions src/main/java/com/github/mmonkey/Relay/Relay.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class Relay {

protected static final String ID = "Relay";
protected static final String NAME = "Relay";
protected static final String VERSION = "1.0.1";
protected static final String VERSION = "1.0.2-2.1";

private Game game;
private Optional<PluginContainer> pluginContainer;
Expand Down Expand Up @@ -166,22 +166,22 @@ public <T> void init(InitializationEvent event) {
* /register email [[-a:accept] [-d:decline]] <emailAddress>
*/
registerSubcommands.put(Arrays.asList("email"), CommandSpec.builder()
.setPermission("relay.register")
.setDescription(Texts.of("Register your email address."))
.setExtendedDescription(Texts.of("If registered, you can receive emails from this server."))
.setExecutor(new RegisterEmailSubcommand(this))
.setArguments(GenericArguments.flags().flag("a").flag("d").buildWith(GenericArguments.string(Texts.of("emailAddress"))))
.permission("relay.register")
.description(Texts.of("Register your email address."))
.extendedDescription(Texts.of("If registered, you can receive emails from this server."))
.executor(new RegisterEmailSubcommand(this))
.arguments(GenericArguments.flags().flag("a").flag("d").buildWith(GenericArguments.string(Texts.of("emailAddress"))))
.build());

/**
* /register phone [[-a:accept] [-d:decline]] <phoneNumber> [carrier]
*/
registerSubcommands.put(Arrays.asList("phone"), CommandSpec.builder()
.setPermission("relay.register")
.setDescription(Texts.of("Register your phone number."))
.setExtendedDescription(Texts.of("If registered, you can receive text messages from this server."))
.setExecutor(new RegisterPhoneSubcommand(this))
.setArguments(GenericArguments.seq(
.permission("relay.register")
.description(Texts.of("Register your phone number."))
.extendedDescription(Texts.of("If registered, you can receive text messages from this server."))
.executor(new RegisterPhoneSubcommand(this))
.arguments(GenericArguments.seq(
GenericArguments.flags().flag("a").flag("d").buildWith(GenericArguments.string(Texts.of("phoneNumber"))),
GenericArguments.optional(GenericArguments.string(Texts.of("carrier")))))
.build());
Expand All @@ -190,32 +190,32 @@ public <T> void init(InitializationEvent event) {
* /register activate <code>
*/
registerSubcommands.put(Arrays.asList("activate"), CommandSpec.builder()
.setPermission("relay.register")
.setDescription(Texts.of("Activate your contact method."))
.setExtendedDescription(Texts.of("Enter the code from your verification message to activate that contact method."))
.setExecutor(new RegisterActivateSubcommand(this))
.setArguments(GenericArguments.string(Texts.of("code")))
.permission("relay.register")
.description(Texts.of("Activate your contact method."))
.extendedDescription(Texts.of("Enter the code from your verification message to activate that contact method."))
.executor(new RegisterActivateSubcommand(this))
.arguments(GenericArguments.string(Texts.of("code")))
.build());

/**
* /register
*/
CommandSpec registerCommand = CommandSpec.builder()
.setDescription(Texts.of("Register your email or phone number."))
.setExtendedDescription(Texts.of("If registered, you can recieve emails or text messages from this server."))
.setExecutor(new RegisterCommand(this))
.setChildren(registerSubcommands)
.description(Texts.of("Register your email or phone number."))
.extendedDescription(Texts.of("If registered, you can recieve emails or text messages from this server."))
.executor(new RegisterCommand(this))
.children(registerSubcommands)
.build();

/**
* /relay carriers [[-s:select] [-u:update]] [name]
*/
relaySubcommands.put(Arrays.asList("carriers"), CommandSpec.builder()
.setPermission("relay.register")
.setDescription(Texts.of("Supported Carriers"))
.setExtendedDescription(Texts.of("View a list of supported phone carriers for receiving SMS messages."))
.setExecutor(new RelayCarriersSubcommand(this))
.setArguments(GenericArguments.seq(
.permission("relay.register")
.description(Texts.of("Supported Carriers"))
.extendedDescription(Texts.of("View a list of supported phone carriers for receiving SMS messages."))
.executor(new RelayCarriersSubcommand(this))
.arguments(GenericArguments.seq(
GenericArguments.optional(GenericArguments.integer(Texts.of("page"))),
GenericArguments.flags().flag("s").flag("u").buildWith(GenericArguments.optional(GenericArguments.string(Texts.of("phone"))))
))
Expand All @@ -225,22 +225,22 @@ public <T> void init(InitializationEvent event) {
* /relay account [page]
*/
relaySubcommands.put(Arrays.asList("account"), CommandSpec.builder()
.setPermission("relay.register")
.setDescription(Texts.of("Manage your contact methods."))
.setExtendedDescription(Texts.of("View a list of your contact methods."))
.setExecutor(new RelayAccountSubcommand(this))
.setArguments(GenericArguments.optional(GenericArguments.integer(Texts.of("page"))))
.permission("relay.register")
.description(Texts.of("Manage your contact methods."))
.extendedDescription(Texts.of("View a list of your contact methods."))
.executor(new RelayAccountSubcommand(this))
.arguments(GenericArguments.optional(GenericArguments.integer(Texts.of("page"))))
.build());

/**
* /relay edit [-e][-p] <contactMethodId> [-c] [carrier]
*/
relaySubcommands.put(Arrays.asList("edit"), CommandSpec.builder()
.setPermission("relay.register")
.setDescription(Texts.of("Edit a contact method."))
.setExtendedDescription(Texts.of("Edit contact method of the given contact method."))
.setExecutor(new RelayEditSubcommand(this))
.setArguments(GenericArguments.seq(
.permission("relay.register")
.description(Texts.of("Edit a contact method."))
.extendedDescription(Texts.of("Edit contact method of the given contact method."))
.executor(new RelayEditSubcommand(this))
.arguments(GenericArguments.seq(
GenericArguments.flags().flag("e").flag("p").flag("r").buildWith(GenericArguments.string(Texts.of("contactMethod"))),
GenericArguments.flags().flag("c").buildWith(GenericArguments.optional(GenericArguments.string(Texts.of("carrier"))))
))
Expand All @@ -250,11 +250,11 @@ public <T> void init(InitializationEvent event) {
* /relay send [[-p] [player]] [[-t] [template]] <message>
*/
relaySubcommands.put(Arrays.asList("send"), CommandSpec.builder()
.setPermission("relay.send")
.setDescription(Texts.of("Send an email or sms message."))
.setExtendedDescription(Texts.of("If the player(s) have a relay account, send them an email or sms message."))
.setExecutor(new RelaySendSubcommand(this))
.setArguments(
.permission("relay.send")
.description(Texts.of("Send an email or sms message."))
.extendedDescription(Texts.of("If the player(s) have a relay account, send them an email or sms message."))
.executor(new RelaySendSubcommand(this))
.arguments(
GenericArguments.flags()
.valueFlag(GenericArguments.string(Texts.of("player")), "p")
.valueFlag(GenericArguments.string(Texts.of("template")), "t")
Expand All @@ -266,11 +266,11 @@ public <T> void init(InitializationEvent event) {
* /relay send [[-p] [player]] [[-t] [template]] <message>
*/
relaySubcommands.put(Arrays.asList("sendall", "all"), CommandSpec.builder()
.setPermission("relay.sendall")
.setDescription(Texts.of("Send an email or sms message to all."))
.setExtendedDescription(Texts.of("Send all contacts an email or sms message."))
.setExecutor(new RelaySendSubcommand(this))
.setArguments(
.permission("relay.sendall")
.description(Texts.of("Send an email or sms message to all."))
.extendedDescription(Texts.of("Send all contacts an email or sms message."))
.executor(new RelaySendSubcommand(this))
.arguments(
GenericArguments.flags()
.valueFlag(GenericArguments.string(Texts.of("template")), "t")
.buildWith(GenericArguments.remainingJoinedStrings(Texts.of("message")))
Expand All @@ -281,21 +281,21 @@ public <T> void init(InitializationEvent event) {
* /relay
*/
CommandSpec relayCommand = CommandSpec.builder()
.setDescription(Texts.of("Relay edit, carriers, account, send"))
.setExtendedDescription(Texts.of("Manage your relay account or send an email or sms message."))
.setExecutor(new RelayCommand(this))
.setChildren(relaySubcommands)
.description(Texts.of("Relay edit, carriers, account, send"))
.extendedDescription(Texts.of("Manage your relay account or send an email or sms message."))
.executor(new RelayCommand(this))
.children(relaySubcommands)
.build();

/**
* /unregister
*/
CommandSpec unregisterCommand = CommandSpec.builder()
.setPermission("relay.register")
.setDescription(Texts.of("Unregister your contact methods."))
.setExtendedDescription(Texts.of("Remove all contact information from this server."))
.setExecutor(new UnregisterCommand(this))
.setArguments(
.permission("relay.register")
.description(Texts.of("Unregister your contact methods."))
.extendedDescription(Texts.of("Remove all contact information from this server."))
.executor(new UnregisterCommand(this))
.arguments(
GenericArguments.flags().flag("d").flag("c").buildWith(GenericArguments.optional(GenericArguments.string(Texts.of("method"))))
)
.build();
Expand Down

0 comments on commit 072f016

Please # to comment.