From b88a842f1cb06a819d22ff58c82c49894adc29f5 Mon Sep 17 00:00:00 2001 From: NewGarbo Date: Sun, 29 Nov 2015 03:22:52 +0000 Subject: [PATCH] stuff --- .../clans/clans/commands/ClansCommand.java | 12 +++------ .../clans/commands/RestartTutCommand.java | 25 +++++++++++++++++++ .../game/clans/tutorials/Tutorial.java | 6 ++--- .../game/clans/tutorials/TutorialManager.java | 4 ++- .../gettingstarted/TaskCreateClan.java | 3 +-- 5 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java index 865bb364a..19dd24bd1 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java @@ -16,16 +16,14 @@ import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilTime.TimeUnit; -import mineplex.core.recharge.Recharge; import mineplex.core.common.util.UtilWorld; -import mineplex.game.clans.Clans; +import mineplex.core.recharge.Recharge; import mineplex.game.clans.clans.ClanInfo; import mineplex.game.clans.clans.ClanRole; +import mineplex.game.clans.clans.ClanTips.TipType; import mineplex.game.clans.clans.ClansBlacklist; import mineplex.game.clans.clans.ClansManager; -import mineplex.game.clans.clans.ClansUtility; import mineplex.game.clans.clans.ClientClan; -import mineplex.game.clans.clans.ClanTips.TipType; import mineplex.game.clans.clans.event.ClansCommandExecutedEvent; import mineplex.game.clans.tutorials.TutorialManager; import net.minecraft.server.v1_8_R3.EnumDirection; @@ -111,9 +109,7 @@ public class ClansCommand extends CommandBase else if (args[0].equalsIgnoreCase("territory") || args[0].equalsIgnoreCase("t")) infoTerritory(caller, args); - else if (args[0].equalsIgnoreCase("forcejoin")) - if (args.length == 2) - forceJoinClan(caller, args[1]); + else if (args[0].equalsIgnoreCase("who") || args[0].equalsIgnoreCase("w")) { if (args.length > 1) @@ -848,7 +844,7 @@ public class ClansCommand extends CommandBase } public void infoClan(Player caller, String search) - { + {System.out.println(search); if (search == null) { UtilPlayer.message(caller, F.main("Clans", "You did not input a search parameter.")); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java new file mode 100644 index 000000000..63dce8c34 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java @@ -0,0 +1,25 @@ +package mineplex.game.clans.clans.commands; + +import org.bukkit.entity.Player; + +import mineplex.core.command.CommandBase; +import mineplex.core.common.Rank; +import mineplex.core.task.TaskManager; +import mineplex.game.clans.tutorials.TutorialManager; +import mineplex.game.clans.tutorials.gettingstarted.TutorialGettingStarted; + +public class RestartTutCommand extends CommandBase +{ + public RestartTutCommand(TutorialManager plugin) + { + super(plugin, Rank.ALL, "rst", "rstut"); + } + + @Override + public void Execute(Player caller, String[] args) + { + TaskManager.Instance.Get(caller).TasksCompleted.clear(); + TutorialManager.Instance.cancelTutorial(caller); + TutorialManager.Instance.startTutorial(TutorialGettingStarted.class, caller); + } +} diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java index a771c7b75..131401037 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java @@ -48,9 +48,9 @@ import mineplex.game.clans.economy.GoldManager; */ public abstract class Tutorial implements ScoreboardElement, Listener { - public static String TASK_COMPLETE_TASK = "TuToRialEE%sTask%s"; - public static String TUTORIAL_COMPLETE_TASK = "TuToRialEE%sDone"; //do not change - public static String SKIPPED_TASK = "TuToRialEE%sSkip"; + public static String TASK_COMPLETE_TASK = "tttatatta%sTask%s"; + public static String TUTORIAL_COMPLETE_TASK = "tatatatatat%sDone"; //do not change + public static String SKIPPED_TASK = "tatatatata%sSkip"; protected final TutorialManager _manager; protected final GoldManager _goldManager; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java index 948ed4705..ad4dc21eb 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java @@ -15,6 +15,7 @@ import mineplex.core.donation.DonationManager; import mineplex.core.preferences.PreferencesManager; import mineplex.core.task.TaskManager; import mineplex.game.clans.clans.ClansManager; +import mineplex.game.clans.clans.commands.RestartTutCommand; import mineplex.game.clans.economy.GoldManager; import mineplex.game.clans.tutorials.commands.DoSkipTutorialCommand; import mineplex.game.clans.tutorials.commands.SkipTutorialCommand; @@ -44,6 +45,7 @@ public class TutorialManager extends MiniPlugin { addCommand(new SkipTutorialCommand(this)); addCommand(new DoSkipTutorialCommand(this)); + addCommand(new RestartTutCommand(this)); } public boolean startTutorial(final Class tutorial, final Player player) @@ -75,9 +77,9 @@ public class TutorialManager extends MiniPlugin { getTutorial(player).cancelFor(player); - _playerTutorials.remove(player.getName()); UtilPlayer.message(player, F.main("Tutorials", "You have cancelled the " + F.elem(getTutorial(player)._displayName + " Tutorial") + ".")); + _playerTutorials.remove(player.getName()); } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java index 1ddf72a28..c8b3292ad 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java @@ -17,8 +17,7 @@ public class TaskCreateClan extends TutorialTask _displayName = "Create a Clan"; _technicalName = "ClanCreation"; - _description = "Before beginning, use the {/c create } command to start up your own Clan! " - + "Alternatively, you can join a friend's Clan, if they have invited you, instead of making your own."; + _description = "Before beginning, use the {/c create } command to start up your own Clan! "; } @Override