Upstream merge from feature/chunks-cmd

Year4000 · Apr 7, 2016 · 932cc2c · 932cc2c
2 parents 85d93a9 + 3c7ff24
commit 932cc2c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 34 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #Sun Mar 13 21:11:07 PDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists

diff --git a/sponge/src/main/java/net/year4000/utilities/sponge/Utilities.java b/sponge/src/main/java/net/year4000/utilities/sponge/Utilities.java
@@ -5,6 +5,7 @@
 package net.year4000.utilities.sponge;
 
 import net.year4000.utilities.Tokens;
+import net.year4000.utilities.sponge.command.ChunksCommand;
 import net.year4000.utilities.sponge.command.PluginCommand;
 import net.year4000.utilities.sponge.command.SystemCommand;
 import org.spongepowered.api.event.Listener;
@@ -32,5 +33,6 @@ public void onUtilitiesInit(GameInitializationEvent event) {
         PluginCommand.register(this);
         // FlyCommand.register(this); todo disable, should be in drip
         SystemCommand.register(this);
+        ChunksCommand.register(this);
     }
 }
diff --git a/sponge/src/main/java/net/year4000/utilities/sponge/UtilitiesPlugin.java b/sponge/src/main/java/net/year4000/utilities/sponge/UtilitiesPlugin.java
diff --git a/sponge/src/main/java/net/year4000/utilities/sponge/command/ChunksCommand.java b/sponge/src/main/java/net/year4000/utilities/sponge/command/ChunksCommand.java
@@ -2,7 +2,7 @@
 
 import com.google.common.collect.Lists;
 import net.year4000.utilities.sponge.Messages;
-import net.year4000.utilities.sponge.UtilitiesPlugin;
+import net.year4000.utilities.sponge.Utilities;
 import org.spongepowered.api.Sponge;
 import org.spongepowered.api.command.CommandException;
 import org.spongepowered.api.command.CommandPermissionException;
@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static net.year4000.utilities.sponge.Messages.*;
+import static net.year4000.utilities.sponge.Messages.CHUNKS_WORLD;
 
 /** View the status of the chunks of each world */
 public final class ChunksCommand implements CommandExecutor {
@@ -89,7 +89,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
                         player.sendMessage(ChatTypes.ACTION_BAR, Text.of(Messages.NOTICE, "Unloading server chunks, use caution when building."));
                     });
                 })
-                .submit(UtilitiesPlugin.get());
+                .submit(Utilities.get());
 
             Sponge.getScheduler().createTaskBuilder()
                 .async()
@@ -115,7 +115,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
                         player.sendMessage(ChatTypes.ACTION_BAR, Text.of(Messages.SUCCESS, TextColors.GOLD, TextStyles.BOLD, "It's OK, you may resume your work."));
                     });
                 })
-                .submit(UtilitiesPlugin.get());
+                .submit(Utilities.get());
 
             return CommandResult.success();
         }