stuff
This commit is contained in:
parent
c870d99e0e
commit
b88a842f1c
|
@ -16,16 +16,14 @@ import mineplex.core.common.util.UtilPlayer;
|
||||||
import mineplex.core.common.util.UtilServer;
|
import mineplex.core.common.util.UtilServer;
|
||||||
import mineplex.core.common.util.UtilTime;
|
import mineplex.core.common.util.UtilTime;
|
||||||
import mineplex.core.common.util.UtilTime.TimeUnit;
|
import mineplex.core.common.util.UtilTime.TimeUnit;
|
||||||
import mineplex.core.recharge.Recharge;
|
|
||||||
import mineplex.core.common.util.UtilWorld;
|
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.ClanInfo;
|
||||||
import mineplex.game.clans.clans.ClanRole;
|
import mineplex.game.clans.clans.ClanRole;
|
||||||
|
import mineplex.game.clans.clans.ClanTips.TipType;
|
||||||
import mineplex.game.clans.clans.ClansBlacklist;
|
import mineplex.game.clans.clans.ClansBlacklist;
|
||||||
import mineplex.game.clans.clans.ClansManager;
|
import mineplex.game.clans.clans.ClansManager;
|
||||||
import mineplex.game.clans.clans.ClansUtility;
|
|
||||||
import mineplex.game.clans.clans.ClientClan;
|
import mineplex.game.clans.clans.ClientClan;
|
||||||
import mineplex.game.clans.clans.ClanTips.TipType;
|
|
||||||
import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
|
import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
|
||||||
import mineplex.game.clans.tutorials.TutorialManager;
|
import mineplex.game.clans.tutorials.TutorialManager;
|
||||||
import net.minecraft.server.v1_8_R3.EnumDirection;
|
import net.minecraft.server.v1_8_R3.EnumDirection;
|
||||||
|
@ -111,9 +109,7 @@ public class ClansCommand extends CommandBase<ClansManager>
|
||||||
|
|
||||||
else if (args[0].equalsIgnoreCase("territory") || args[0].equalsIgnoreCase("t"))
|
else if (args[0].equalsIgnoreCase("territory") || args[0].equalsIgnoreCase("t"))
|
||||||
infoTerritory(caller, args);
|
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"))
|
else if (args[0].equalsIgnoreCase("who") || args[0].equalsIgnoreCase("w"))
|
||||||
{
|
{
|
||||||
if (args.length > 1)
|
if (args.length > 1)
|
||||||
|
@ -848,7 +844,7 @@ public class ClansCommand extends CommandBase<ClansManager>
|
||||||
}
|
}
|
||||||
|
|
||||||
public void infoClan(Player caller, String search)
|
public void infoClan(Player caller, String search)
|
||||||
{
|
{System.out.println(search);
|
||||||
if (search == null)
|
if (search == null)
|
||||||
{
|
{
|
||||||
UtilPlayer.message(caller, F.main("Clans", "You did not input a search parameter."));
|
UtilPlayer.message(caller, F.main("Clans", "You did not input a search parameter."));
|
||||||
|
|
|
@ -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<TutorialManager>
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
|
@ -48,9 +48,9 @@ import mineplex.game.clans.economy.GoldManager;
|
||||||
*/
|
*/
|
||||||
public abstract class Tutorial implements ScoreboardElement, Listener
|
public abstract class Tutorial implements ScoreboardElement, Listener
|
||||||
{
|
{
|
||||||
public static String TASK_COMPLETE_TASK = "TuToRialEE%sTask%s";
|
public static String TASK_COMPLETE_TASK = "tttatatta%sTask%s";
|
||||||
public static String TUTORIAL_COMPLETE_TASK = "TuToRialEE%sDone"; //do not change
|
public static String TUTORIAL_COMPLETE_TASK = "tatatatatat%sDone"; //do not change
|
||||||
public static String SKIPPED_TASK = "TuToRialEE%sSkip";
|
public static String SKIPPED_TASK = "tatatatata%sSkip";
|
||||||
|
|
||||||
protected final TutorialManager _manager;
|
protected final TutorialManager _manager;
|
||||||
protected final GoldManager _goldManager;
|
protected final GoldManager _goldManager;
|
||||||
|
|
|
@ -15,6 +15,7 @@ import mineplex.core.donation.DonationManager;
|
||||||
import mineplex.core.preferences.PreferencesManager;
|
import mineplex.core.preferences.PreferencesManager;
|
||||||
import mineplex.core.task.TaskManager;
|
import mineplex.core.task.TaskManager;
|
||||||
import mineplex.game.clans.clans.ClansManager;
|
import mineplex.game.clans.clans.ClansManager;
|
||||||
|
import mineplex.game.clans.clans.commands.RestartTutCommand;
|
||||||
import mineplex.game.clans.economy.GoldManager;
|
import mineplex.game.clans.economy.GoldManager;
|
||||||
import mineplex.game.clans.tutorials.commands.DoSkipTutorialCommand;
|
import mineplex.game.clans.tutorials.commands.DoSkipTutorialCommand;
|
||||||
import mineplex.game.clans.tutorials.commands.SkipTutorialCommand;
|
import mineplex.game.clans.tutorials.commands.SkipTutorialCommand;
|
||||||
|
@ -44,6 +45,7 @@ public class TutorialManager extends MiniPlugin
|
||||||
{
|
{
|
||||||
addCommand(new SkipTutorialCommand(this));
|
addCommand(new SkipTutorialCommand(this));
|
||||||
addCommand(new DoSkipTutorialCommand(this));
|
addCommand(new DoSkipTutorialCommand(this));
|
||||||
|
addCommand(new RestartTutCommand(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean startTutorial(final Class<? extends Tutorial> tutorial, final Player player)
|
public boolean startTutorial(final Class<? extends Tutorial> tutorial, final Player player)
|
||||||
|
@ -75,9 +77,9 @@ public class TutorialManager extends MiniPlugin
|
||||||
{
|
{
|
||||||
getTutorial(player).cancelFor(player);
|
getTutorial(player).cancelFor(player);
|
||||||
|
|
||||||
_playerTutorials.remove(player.getName());
|
|
||||||
|
|
||||||
UtilPlayer.message(player, F.main("Tutorials", "You have cancelled the " + F.elem(getTutorial(player)._displayName + " Tutorial") + "."));
|
UtilPlayer.message(player, F.main("Tutorials", "You have cancelled the " + F.elem(getTutorial(player)._displayName + " Tutorial") + "."));
|
||||||
|
_playerTutorials.remove(player.getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,7 @@ public class TaskCreateClan extends TutorialTask<TutorialGettingStarted>
|
||||||
_displayName = "Create a Clan";
|
_displayName = "Create a Clan";
|
||||||
_technicalName = "ClanCreation";
|
_technicalName = "ClanCreation";
|
||||||
|
|
||||||
_description = "Before beginning, use the {/c create <ClanName>} command to start up your own Clan! "
|
_description = "Before beginning, use the {/c create <ClanName>} 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.";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue