Fix next, setnext, cycle and recycle

Author: Pablete1234

src/main/java/in/twizmwaz/cardinal/Cardinal.java

@@ -33,7 +33,7 @@
 import in.twizmwaz.cardinal.command.CommandCardinal;
 import in.twizmwaz.cardinal.command.CommandCycle;
 import in.twizmwaz.cardinal.command.CommandJoin;
-import in.twizmwaz.cardinal.command.CommandSetNext;
+import in.twizmwaz.cardinal.command.CommandNext;
 import in.twizmwaz.cardinal.command.CommandStart;
 import in.twizmwaz.cardinal.command.provider.LoadedMapProvider;
 import in.twizmwaz.cardinal.command.provider.TeamProvider;
@@ -154,7 +154,7 @@ private void registerCommands() {
     commandRegistry.addClass(CommandCardinal.class);
     commandRegistry.addClass(CommandCycle.class);
     commandRegistry.addClass(CommandJoin.class);
-    commandRegistry.addClass(CommandSetNext.class);
+    commandRegistry.addClass(CommandNext.class);
     commandRegistry.addClass(CommandStart.class);
     commandRegistry.register();
 

src/main/java/in/twizmwaz/cardinal/command/CommandCycle.java

@@ -32,7 +32,8 @@
 import in.twizmwaz.cardinal.match.MatchThread;
 import in.twizmwaz.cardinal.module.countdown.CountdownModule;
 import in.twizmwaz.cardinal.module.countdown.CycleCountdown;
-import org.bukkit.entity.Player;
+import in.twizmwaz.cardinal.module.cycle.CycleModule;
+import in.twizmwaz.cardinal.module.repository.LoadedMap;
 
 public class CommandCycle {
 
@@ -43,13 +44,35 @@ public class CommandCycle {
    * @param time The time until cycle, defaults to 30.
    */
   @Command(aliases = "cycle", description = "Cycles to the next map")
-  public static void cycle(CommandContext cmd, @Optional Integer time) {
+  public static void cycle(CommandContext cmd, @Optional Integer time, @Optional LoadedMap map) {
     if (time == null) {
       time = 30;
     }
     time *= 20;
-    MatchThread matchThread = cmd.getSender() instanceof Player
-        ? Cardinal.getMatchThread((Player) cmd.getSender()) : Cardinal.getInstance().getMatchThreads().get(0);
+    MatchThread matchThread = Cardinal.getMatchThread(cmd.getSender());
+    if (map != null) {
+      Cardinal.getModule(CycleModule.class).getNextCycle(Cardinal.getMatchThread(cmd.getSender())).setMap(map);
+    }
+    CycleCountdown countdown = Cardinal.getModule(CountdownModule.class).getCycleCountdown(matchThread);
+    countdown.setTime(time);
+    countdown.setCancelled(false);
+  }
+
+  /**
+   * Cycles to the same map.
+   *
+   * @param cmd  The context of this command.
+   * @param time The time until cycle, defaults to 30.
+   */
+  @Command(aliases = "recycle", description = "Cycles to the same map")
+  public static void recycle(CommandContext cmd, @Optional Integer time) {
+    if (time == null) {
+      time = 30;
+    }
+    time *= 20;
+    MatchThread matchThread = Cardinal.getMatchThread(cmd.getSender());
+    Cardinal.getModule(CycleModule.class)
+        .getNextCycle(Cardinal.getMatchThread(cmd.getSender())).setMap(matchThread.getCurrentMatch().getMap());
     CycleCountdown countdown = Cardinal.getModule(CountdownModule.class).getCycleCountdown(matchThread);
     countdown.setTime(time);
     countdown.setCancelled(false);

src/main/java/in/twizmwaz/cardinal/command/CommandSetNext.java renamed to src/main/java/in/twizmwaz/cardinal/command/CommandNext.java

@@ -25,25 +25,40 @@
 
 package in.twizmwaz.cardinal.command;
 
+import ee.ellytr.chat.ChatConstant;
+import ee.ellytr.chat.component.builder.LocalizedComponentBuilder;
 import ee.ellytr.command.Command;
 import ee.ellytr.command.CommandContext;
-import ee.ellytr.command.PlayerCommand;
 import ee.ellytr.command.argument.MultiArgs;
 import in.twizmwaz.cardinal.Cardinal;
+import in.twizmwaz.cardinal.component.map.MapComponentBuilder;
 import in.twizmwaz.cardinal.module.cycle.CycleModule;
 import in.twizmwaz.cardinal.module.repository.LoadedMap;
+import in.twizmwaz.cardinal.util.ChatUtil;
+import net.md_5.bungee.api.ChatColor;
 
-public class CommandSetNext {
+public class CommandNext {
 
   /**
    * Sets the next map.
    *
    * @param cmd The context of this command.
    */
   @Command(aliases = {"setnext", "sn"}, description = "Sets the next map.")
-  @PlayerCommand
   public static void setNext(CommandContext cmd, @MultiArgs LoadedMap map) {
-    Cardinal.getModule(CycleModule.class).getNextCycle().get(Cardinal.getMatchThread(cmd.getSender())).setMap(map);
+    Cardinal.getModule(CycleModule.class).getNextCycle(Cardinal.getMatchThread(cmd.getSender())).setMap(map);
+  }
+
+  /**
+   * Sets the next map.
+   *
+   * @param cmd The context of this command.
+   */
+  @Command(aliases = {"next"}, description = "Gets the next map.")
+  public static void getNext(CommandContext cmd) {
+    LoadedMap map = Cardinal.getModule(CycleModule.class).getNextMap(Cardinal.getMatchThread(cmd.getSender()));
+    ChatUtil.sendMessage(cmd.getSender(), new LocalizedComponentBuilder(ChatConstant.getConstant("command.next.map"),
+        new MapComponentBuilder(map).color(ChatColor.GOLD).build()).color(ChatColor.DARK_PURPLE).build());
   }
 
 }

src/main/java/in/twizmwaz/cardinal/command/provider/LoadedMapProvider.java

@@ -29,30 +29,26 @@
 import in.twizmwaz.cardinal.Cardinal;
 import in.twizmwaz.cardinal.module.repository.LoadedMap;
 import in.twizmwaz.cardinal.module.repository.RepositoryModule;
+import in.twizmwaz.cardinal.util.Strings;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 public class LoadedMapProvider implements ArgumentProvider<LoadedMap> {
 
   @Override
   public LoadedMap getMatch(String input, CommandSender sender) {
-    Map<String, LoadedMap> maps = Cardinal.getModule(RepositoryModule.class).getLoadedMaps();
-    Set<String> mapNames = maps.keySet();
-    for (String mapName : mapNames.stream().filter(m -> m.startsWith(input)).collect(Collectors.toList())) {
-      return maps.get(mapName);
-    }
-    return null;
+    List<String> mapNames = getSuggestions(input, sender);
+    return mapNames.size() > 0 ? Cardinal.getModule(RepositoryModule.class).getLoadedMaps().get(mapNames.get(0)) : null;
   }
 
   @Override
   public List<String> getSuggestions(String input, CommandSender sender) {
-    ;
-    return Cardinal.getModule(RepositoryModule.class).getLoadedMaps().keySet().stream().filter(
-        map -> map.toLowerCase().startsWith(input.toLowerCase())).collect(Collectors.toList());
+    return Cardinal.getModule(RepositoryModule.class).getLoadedMaps().keySet().stream()
+        .filter(map -> Strings.getSimplifiedName(map).startsWith(Strings.getSimplifiedName(input.toLowerCase())))
+        .collect(Collectors.toList());
 
   }
+  
 }

src/main/java/in/twizmwaz/cardinal/command/provider/TeamProvider.java

@@ -25,33 +25,27 @@
 
 package in.twizmwaz.cardinal.command.provider;
 
-import com.google.common.collect.Lists;
 import ee.ellytr.command.argument.ArgumentProvider;
 import in.twizmwaz.cardinal.Cardinal;
 import in.twizmwaz.cardinal.module.team.Team;
+import in.twizmwaz.cardinal.util.Strings;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class TeamProvider implements ArgumentProvider<Team> {
 
   @Override
   public Team getMatch(String input, CommandSender sender) {
-    //TODO: Get match from player requesting command match
-    return Team.getTeamById(Cardinal.getInstance().getMatchThreads().get(0).getCurrentMatch(), input);
+    return Team.getTeamByName(Cardinal.getMatchThread(sender).getCurrentMatch(), input);
   }
 
   @Override
   public List<String> getSuggestions(String input, CommandSender sender) {
-    List<String> suggestions = Lists.newArrayList();
-    //TODO: Get match from player requesting suggestions
-    for (Team team : Team.getTeams(Cardinal.getInstance().getMatchThreads().get(0).getCurrentMatch())) {
-      String id = team.getId();
-      if (id.toLowerCase().startsWith(input.toLowerCase())) {
-        suggestions.add(id);
-      }
-    }
-    return suggestions;
+    return Team.getTeams(Cardinal.getMatchThread(sender).getCurrentMatch())
+        .stream().filter(team -> Strings.getSimplifiedName(team.getName()).startsWith(Strings.getSimplifiedName(input)))
+        .map(Team::getName).collect(Collectors.toList());
   }
 
 }

src/main/java/in/twizmwaz/cardinal/component/TeamComponentBuilder.java renamed to src/main/java/in/twizmwaz/cardinal/component/BaseComponentBuilder.java

@@ -26,17 +26,21 @@
 package in.twizmwaz.cardinal.component;
 
 import com.google.common.collect.Lists;
-import in.twizmwaz.cardinal.module.team.Team;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.HoverEvent;
 
 import java.util.List;
 
-public class TeamComponentBuilder {
+/**
+ * This is a base for other component builders to use, it has all the {@link BaseComponent} fields.
+ *
+ * @param <B> The builder class, should always be the same as the class.
+ * @param <C> The component output.
+ */
+public abstract class BaseComponentBuilder<B extends BaseComponentBuilder, C extends BaseComponent> {
 
-  private Team team;
   private ChatColor color;
   private boolean bold;
   private boolean italic;
@@ -46,15 +50,13 @@ public class TeamComponentBuilder {
   private ClickEvent clickEvent;
   private HoverEvent hoverEvent;
   private List<BaseComponent> extra;
-  private boolean hover;
+  
+  private B thisObject;
 
   /**
-   * Creates a builder of {@link TeamComponent} based on specified values.
-   *
-   * @param team The team for this component.
+   * This is a base for other component builders to use, it has all the {@link BaseComponent} fields.
    */
-  public TeamComponentBuilder(Team team) {
-    this.team = team;
+  public BaseComponentBuilder() {
     color = null;
     bold = false;
     italic = false;
@@ -64,66 +66,67 @@ public TeamComponentBuilder(Team team) {
     clickEvent = null;
     hoverEvent = null;
     extra = Lists.newArrayList();
-    hover = true;
+    thisObject = getThis();
   }
 
-  public TeamComponentBuilder color(ChatColor color) {
+  /**
+   * Must be implemented by all sub classes, should just be a "return this;".
+   * @return The builder object.
+   */
+  public abstract B getThis();
+
+
+  public B color(ChatColor color) {
     this.color = color;
-    return this;
+    return thisObject;
   }
 
-  public TeamComponentBuilder bold(boolean bold) {
+  public B bold(boolean bold) {
     this.bold = bold;
-    return this;
+    return thisObject;
   }
 
-  public TeamComponentBuilder italic(boolean italic) {
+  public B italic(boolean italic) {
     this.italic = italic;
-    return this;
+    return thisObject;
   }
 
-  public TeamComponentBuilder underlined(boolean underlined) {
+  public B underlined(boolean underlined) {
     this.underlined = underlined;
-    return this;
+    return thisObject;
   }
 
-  public TeamComponentBuilder strikethrough(boolean strikethrough) {
+  public B strikethrough(boolean strikethrough) {
     this.strikethrough = strikethrough;
-    return this;
+    return thisObject;
   }
 
-  public TeamComponentBuilder obfuscated(boolean obfuscated) {
+  public B obfuscated(boolean obfuscated) {
     this.obfuscated = obfuscated;
-    return this;
+    return thisObject;
   }
 
-  public TeamComponentBuilder clickEvent(ClickEvent clickEvent) {
+  public B clickEvent(ClickEvent clickEvent) {
     this.clickEvent = clickEvent;
-    return this;
+    return thisObject;
   }
 
-  public TeamComponentBuilder hoverEvent(HoverEvent hoverEvent) {
+  public B hoverEvent(HoverEvent hoverEvent) {
     this.hoverEvent = hoverEvent;
-    return this;
+    return thisObject;
   }
 
-  public TeamComponentBuilder extra(List<BaseComponent> extra) {
+  public B extra(List<BaseComponent> extra) {
     this.extra = extra;
-    return this;
-  }
-
-  public TeamComponentBuilder hover(boolean hover) {
-    this.hover = hover;
-    return this;
+    return thisObject;
   }
 
   /**
-   * Builds a {@link TeamComponent} from the specified values.
+   * Builds a {@link C} from the specified values.
    *
    * @return The built component.
    */
-  public TeamComponent build() {
-    TeamComponent component = new TeamComponent(team);
+  public C build(C component) {
     component.setColor(color);
     component.setBold(bold);
     component.setItalic(italic);
@@ -133,7 +136,6 @@ public TeamComponent build() {
     component.setClickEvent(clickEvent);
     component.setHoverEvent(hoverEvent);
     component.setExtra(extra);
-    component.setHover(hover);
     return component;
   }
 

src/main/java/in/twizmwaz/cardinal/component/BaseLanguageComponent.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, Kevin Phoenix
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package in.twizmwaz.cardinal.component;
+
+import ee.ellytr.chat.component.LanguageComponent;
+import net.md_5.bungee.api.chat.BaseComponent;
+
+public abstract class BaseLanguageComponent<C extends BaseComponent> extends LanguageComponent {
+
+  /**
+   * Adds regular {@link BaseComponent} fields to a duplicate component.
+   * @param component The BaseComponent to add values to.
+   * @return The BaseComponent with the values.
+   */
+  public C duplicate(C component) {
+    component.setColor(getColor());
+    component.setBold(isBold());
+    component.setItalic(isItalic());
+    component.setUnderlined(isUnderlined());
+    component.setStrikethrough(isStrikethrough());
+    component.setObfuscated(isObfuscated());
+    component.setClickEvent(getClickEvent());
+    component.setHoverEvent(getHoverEvent());
+    if (getExtra() != null) {
+      for (BaseComponent extra : getExtra()) {
+        component.addExtra(extra.duplicate());
+      }
+    }
+    return component;
+  }
+
+}