Cleanup commands

anvilpowered · Apr 17, 2020 · 56e5e4e · 56e5e4e
1 parent df8a754
commit 56e5e4e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 33 deletions.
diff --git a/sponge/src/main/java/org/anvilpowered/ontime/sponge/commands/OnTimeAddCommand.java b/sponge/src/main/java/org/anvilpowered/ontime/sponge/commands/OnTimeAddCommand.java
@@ -19,9 +19,7 @@
 package org.anvilpowered.ontime.sponge.commands;
 
 import com.google.inject.Inject;
-import org.anvilpowered.anvil.api.plugin.PluginInfo;
 import org.anvilpowered.ontime.api.member.MemberManager;
-import org.spongepowered.api.command.CommandException;
 import org.spongepowered.api.command.CommandResult;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.command.args.CommandContext;
@@ -34,17 +32,11 @@ public class OnTimeAddCommand implements CommandExecutor {
     @Inject
     private MemberManager<Text> memberManager;
 
-    @Inject
-    private PluginInfo<Text> pluginInfo;
-
     @Override
-    public CommandResult execute(CommandSource source, CommandContext context) throws CommandException {
+    public CommandResult execute(CommandSource source, CommandContext context) {
         memberManager.addBonusTime(
-            context.<User>getOne(Text.of("user"))
-                .orElseThrow(() -> new CommandException(Text.of(pluginInfo.getPrefix(), "Missing user")))
-                .getUniqueId(),
-            context.<String>getOne(Text.of("time"))
-                .orElseThrow(() -> new CommandException(Text.of(pluginInfo.getPrefix(), "Missing time")))
+            context.<User>requireOne(Text.of("user")).getUniqueId(),
+            context.requireOne(Text.of("time"))
         ).thenAcceptAsync(source::sendMessage);
         return CommandResult.success();
     }

diff --git a/sponge/src/main/java/org/anvilpowered/ontime/sponge/commands/OnTimeSetBonusCommand.java b/sponge/src/main/java/org/anvilpowered/ontime/sponge/commands/OnTimeSetBonusCommand.java
@@ -19,9 +19,7 @@
 package org.anvilpowered.ontime.sponge.commands;
 
 import com.google.inject.Inject;
-import org.anvilpowered.anvil.api.plugin.PluginInfo;
 import org.anvilpowered.ontime.api.member.MemberManager;
-import org.spongepowered.api.command.CommandException;
 import org.spongepowered.api.command.CommandResult;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.command.args.CommandContext;
@@ -34,17 +32,11 @@ public class OnTimeSetBonusCommand implements CommandExecutor {
     @Inject
     private MemberManager<Text> memberManager;
 
-    @Inject
-    private PluginInfo<Text> pluginInfo;
-
     @Override
-    public CommandResult execute(CommandSource source, CommandContext context) throws CommandException {
+    public CommandResult execute(CommandSource source, CommandContext context) {
         memberManager.setBonusTime(
-            context.<User>getOne(Text.of("user"))
-                .orElseThrow(() -> new CommandException(Text.of(pluginInfo.getPrefix(), "Missing user")))
-                .getUniqueId(),
-            context.<String>getOne(Text.of("time"))
-                .orElseThrow(() -> new CommandException(Text.of(pluginInfo.getPrefix(), "Missing time")))
+            context.<User>requireOne(Text.of("user")).getUniqueId(),
+            context.requireOne(Text.of("time"))
         ).thenAcceptAsync(source::sendMessage);
         return CommandResult.success();
     }

diff --git a/sponge/src/main/java/org/anvilpowered/ontime/sponge/commands/OnTimeSetCommand.java b/sponge/src/main/java/org/anvilpowered/ontime/sponge/commands/OnTimeSetCommand.java
@@ -19,9 +19,7 @@
 package org.anvilpowered.ontime.sponge.commands;
 
 import com.google.inject.Inject;
-import org.anvilpowered.anvil.api.plugin.PluginInfo;
 import org.anvilpowered.ontime.api.member.MemberManager;
-import org.spongepowered.api.command.CommandException;
 import org.spongepowered.api.command.CommandResult;
 import org.spongepowered.api.command.CommandSource;
 import org.spongepowered.api.command.args.CommandContext;
@@ -34,17 +32,11 @@ public class OnTimeSetCommand implements CommandExecutor {
     @Inject
     private MemberManager<Text> memberManager;
 
-    @Inject
-    private PluginInfo<Text> pluginInfo;
-
     @Override
-    public CommandResult execute(CommandSource source, CommandContext context) throws CommandException {
+    public CommandResult execute(CommandSource source, CommandContext context) {
         memberManager.setTotalTime(
-            context.<User>getOne(Text.of("user"))
-                .orElseThrow(() -> new CommandException(Text.of(pluginInfo.getPrefix(), "Missing user")))
-                .getUniqueId(),
-            context.<String>getOne(Text.of("time"))
-                .orElseThrow(() -> new CommandException(Text.of(pluginInfo.getPrefix(), "Missing time")))
+            context.<User>requireOne(Text.of("user")).getUniqueId(),
+            context.requireOne(Text.of("time"))
         ).thenAcceptAsync(source::sendMessage);
         return CommandResult.success();
     }