JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on new tutorial

Browse Source
This commit is contained in:
Shaun Bennett 2015-12-21 03:49:27 -05:00
parent baef84f4d9
commit 0da28faab8
29 changed files with 99 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/.idea/compiler.xml
View File

@ -23,7 +23,7 @@
</profile>
<profile default="false" name="Annotation profile for bungee" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target\generated-test-sources\test-annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="true" />
</profile>

2
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
View File

@ -104,7 +104,7 @@ import mineplex.game.clans.gameplay.safelog.SafeLog;
import mineplex.game.clans.gameplay.safelog.npc.NPCManager;
import mineplex.game.clans.items.GearManager;
import mineplex.game.clans.spawn.Spawn;
import mineplex.game.clans.tutorials.TutorialManager;
import mineplex.game.clans.legacytutorial.TutorialManager;
import mineplex.minecraft.game.classcombat.Class.ClassManager;
import mineplex.minecraft.game.classcombat.Class.ClientClass;
import mineplex.minecraft.game.classcombat.Class.IPvpClass;

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
View File

@ -27,8 +27,7 @@ import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.ClientClan;
import mineplex.game.clans.clans.event.ClanJoinEvent;
import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
import mineplex.game.clans.tutorials.Tutorial;
import mineplex.game.clans.tutorials.TutorialManager;
import net.minecraft.server.v1_8_R3.EnumDirection;
public class ClansCommand extends CommandBase<ClansManager>

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/RestartTutCommand.java
View File

@ -10,9 +10,9 @@ import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.task.TaskManager;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.tutorials.Tutorial;
import mineplex.game.clans.tutorials.TutorialManager;
import mineplex.game.clans.tutorials.gettingstarted.TutorialGettingStarted;
import mineplex.game.clans.legacytutorial.Tutorial;
import mineplex.game.clans.legacytutorial.TutorialManager;
import mineplex.game.clans.legacytutorial.gettingstarted.TutorialGettingStarted;
public class RestartTutCommand extends CommandBase<TutorialManager>
{

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/scoreboard/ClansScoreboardManager.java
View File

@ -8,7 +8,6 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.account.CoreClientManager;
import mineplex.core.account.event.OnlineRankUpdateEvent;
import mineplex.core.common.util.C;
import mineplex.core.donation.DonationManager;
import mineplex.core.scoreboard.PlayerScoreboard;
import mineplex.core.scoreboard.ScoreboardData;
@ -20,11 +19,10 @@ import mineplex.game.clans.clans.ClanInfo;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementClan;
import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementPlayer;
import mineplex.game.clans.clans.scoreboard.elements.ScoreboardElementPlayerCount;
import mineplex.game.clans.clans.war.WarManager;
import mineplex.game.clans.clans.worldevent.WorldEventManager;
import mineplex.game.clans.tutorials.Tutorial;
import mineplex.game.clans.tutorials.TutorialManager;
import mineplex.game.clans.legacytutorial.Tutorial;
import mineplex.game.clans.legacytutorial.TutorialManager;
public class ClansScoreboardManager extends ScoreboardManager
{

7
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/Tutorial.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/Tutorial.java
View File

@ -1,10 +1,9 @@
package mineplex.game.clans.tutorials;
package mineplex.game.clans.legacytutorial;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.bukkit.Color;
import org.bukkit.FireworkEffect.Type;
@ -31,13 +30,10 @@ import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilFirework;
import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilItem;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.donation.DonationManager;
import mineplex.core.packethandler.IPacketHandler;
import mineplex.core.packethandler.PacketHandler;
import mineplex.core.packethandler.PacketInfo;
import mineplex.core.scoreboard.ScoreboardManager;
import mineplex.core.scoreboard.elements.ScoreboardElement;
import mineplex.core.task.TaskManager;
@ -48,7 +44,6 @@ import mineplex.game.clans.clans.event.ClanJoinEvent;
import mineplex.game.clans.clans.event.ClanTipEvent;
import mineplex.game.clans.clans.playtime.Playtime;
import mineplex.game.clans.economy.GoldManager;
import net.minecraft.server.v1_8_R3.PacketPlayOutChat;
/**
*

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialClient.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialClient.java
View File

@ -1,9 +1,7 @@
package mineplex.game.clans.tutorials;
package mineplex.game.clans.legacytutorial;
import org.bukkit.entity.Player;
import mineplex.core.task.TaskManager;
public class TutorialClient
{
public Player Player;

7
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialManager.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialManager.java
View File

@ -1,4 +1,4 @@
package mineplex.game.clans.tutorials;
package mineplex.game.clans.legacytutorial;
import java.util.HashMap;
import java.util.LinkedList;
@ -21,9 +21,8 @@ import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.commands.RestartTutCommand;
import mineplex.game.clans.clans.playtime.Playtime;
import mineplex.game.clans.economy.GoldManager;
import mineplex.game.clans.tutorials.commands.DoSkipTutorialCommand;
import mineplex.game.clans.tutorials.commands.SkipTutorialCommand;
import mineplex.game.clans.tutorials.gettingstarted.TutorialGettingStarted;
import mineplex.game.clans.legacytutorial.commands.DoSkipTutorialCommand;
import mineplex.game.clans.legacytutorial.commands.SkipTutorialCommand;
import net.md_5.bungee.api.ChatColor;
import net.minecraft.server.v1_8_R3.PacketPlayOutChat;

3
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/TutorialTask.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/TutorialTask.java
View File

@ -1,11 +1,10 @@
package mineplex.game.clans.tutorials;
package mineplex.game.clans.legacytutorial;
import java.util.Iterator;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import mineplex.core.common.util.C;

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/DoSkipTutorialCommand.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/commands/DoSkipTutorialCommand.java
View File

@ -1,4 +1,4 @@
package mineplex.game.clans.tutorials.commands;
package mineplex.game.clans.legacytutorial.commands;
import org.bukkit.entity.Player;
@ -6,7 +6,7 @@ import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.game.clans.tutorials.TutorialManager;
import mineplex.game.clans.legacytutorial.TutorialManager;
public class DoSkipTutorialCommand extends CommandBase<TutorialManager>
{

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/commands/SkipTutorialCommand.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/commands/SkipTutorialCommand.java
View File

@ -1,12 +1,11 @@
package mineplex.game.clans.tutorials.commands;
package mineplex.game.clans.legacytutorial.commands;
import org.bukkit.entity.Player;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.game.clans.tutorials.TutorialManager;
import mineplex.game.clans.legacytutorial.TutorialManager;
public class SkipTutorialCommand extends CommandBase<TutorialManager>
{

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskClaim.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskClaim.java
View File

@ -1,12 +1,11 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
import mineplex.game.clans.clans.event.PlayerPreClaimTerritoryEvent;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskClaim extends TutorialTask<TutorialGettingStarted>
{

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCreateClan.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskCreateClan.java
View File

@ -1,4 +1,4 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -6,7 +6,7 @@ import org.bukkit.event.EventPriority;
import mineplex.core.common.util.UtilServer;
import mineplex.game.clans.clans.event.ClanCreatedEvent;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskCreateClan extends TutorialTask<TutorialGettingStarted>
{

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskCustomizeClass.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskCustomizeClass.java
View File

@ -1,4 +1,4 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import java.util.Iterator;
@ -12,7 +12,7 @@ import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.spawn.Spawn;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
import mineplex.minecraft.game.classcombat.Class.ClientClass;
public class TaskCustomizeClass extends TutorialTask<TutorialGettingStarted>

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskDisbandClan.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskDisbandClan.java
View File

@ -1,11 +1,10 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import mineplex.core.common.util.UtilServer;
import mineplex.game.clans.clans.event.ClanDisbandedEvent;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskDisbandClan extends TutorialTask<TutorialGettingStarted>
{

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskEquipClass.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskEquipClass.java
View File

@ -1,4 +1,4 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import org.bukkit.Location;
import org.bukkit.Material;
@ -13,7 +13,7 @@ import mineplex.core.task.TaskManager;
import mineplex.game.clans.clans.event.ClansPlayerBuyItemEvent;
import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
import mineplex.game.clans.spawn.Spawn;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
import mineplex.minecraft.game.classcombat.Class.event.ClassEquipEvent;
public class TaskEquipClass extends TutorialTask<TutorialGettingStarted>

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskExploreShops.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskExploreShops.java
View File

@ -1,4 +1,4 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import java.util.Iterator;
@ -12,7 +12,7 @@ import mineplex.core.updater.event.UpdateEvent;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.event.EnergyPageBuildEvent;
import mineplex.game.clans.spawn.Spawn;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskExploreShops extends TutorialTask<TutorialGettingStarted>
{

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskLeaveSpawn.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskLeaveSpawn.java
View File

@ -1,16 +1,14 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import java.util.Iterator;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskLeaveSpawn extends TutorialTask<TutorialGettingStarted>
{

5
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskMakingMoney.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskMakingMoney.java
View File

@ -1,4 +1,4 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import org.bukkit.Location;
import org.bukkit.Material;
@ -7,10 +7,9 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerItemConsumeEvent;
import org.bukkit.inventory.ItemStack;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.event.ClansPlayerSellItemEvent;
import mineplex.game.clans.spawn.Spawn;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskMakingMoney extends TutorialTask<TutorialGettingStarted>
{

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskSetHome.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskSetHome.java
View File

@ -1,11 +1,11 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskSetHome extends TutorialTask<TutorialGettingStarted>
{

11
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskUseAbility.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskUseAbility.java
View File

@ -1,8 +1,6 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.Location;
@ -10,25 +8,20 @@ import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.CraftingInventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import mineplex.core.common.util.Callback;
import mineplex.core.common.util.NautArrayList;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilServer;
import mineplex.core.task.TaskManager;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.game.clans.clans.event.ClansPlayerBuyItemEvent;
import mineplex.game.clans.clans.event.ClansShopAddButtonEvent;
import mineplex.game.clans.spawn.Spawn;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskUseAbility extends TutorialTask<TutorialGettingStarted>
{

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskViewClanDetails.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskViewClanDetails.java
View File

@ -1,10 +1,10 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import mineplex.game.clans.clans.event.ClansCommandExecutedEvent;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskViewClanDetails extends TutorialTask<TutorialGettingStarted>
{

4
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TaskWelcome.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TaskWelcome.java
View File

@ -1,6 +1,6 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import mineplex.game.clans.tutorials.TutorialTask;
import mineplex.game.clans.legacytutorial.TutorialTask;
public class TaskWelcome extends TutorialTask<TutorialGettingStarted>
{

6
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorials/gettingstarted/TutorialGettingStarted.java → Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/legacytutorial/gettingstarted/TutorialGettingStarted.java
View File

@ -1,4 +1,4 @@
package mineplex.game.clans.tutorials.gettingstarted;
package mineplex.game.clans.legacytutorial.gettingstarted;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -15,8 +15,8 @@ import mineplex.game.clans.clans.ClansManager;
import mineplex.game.clans.clans.playtime.Playtime;
import mineplex.game.clans.economy.GoldManager;
import mineplex.game.clans.spawn.Spawn;
import mineplex.game.clans.tutorials.Tutorial;
import mineplex.game.clans.tutorials.TutorialManager;
import mineplex.game.clans.legacytutorial.Tutorial;
import mineplex.game.clans.legacytutorial.TutorialManager;
public class TutorialGettingStarted extends Tutorial
{

7
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Objective.java Normal file
View File

@ -0,0 +1,7 @@
package mineplex.game.clans.tutorial;
public class Objective
{
private String _name;
private String _desc;
}

9
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/ObjectiveGroup.java Normal file
View File

@ -0,0 +1,9 @@
package mineplex.game.clans.tutorial;
import java.util.List;
public class ObjectiveGroup
{
private String _name;
private List<Objective> _objectives;
}

16
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java Normal file
View File

@ -0,0 +1,16 @@
package mineplex.game.clans.tutorial;
import java.util.HashMap;
import java.util.List;
import org.bukkit.entity.Player;
public class Tutorial
{
private HashMap<Player, TutorialSession> _playerSessionMap;
private String _name;
private String _taskIdentifier;
private List<ObjectiveGroup> _objectiveGroups;
}

15
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialManager.java Normal file
View File

@ -0,0 +1,15 @@
package mineplex.game.clans.tutorial;
import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.MiniPlugin;
public class TutorialManager extends MiniPlugin
{
public TutorialManager(JavaPlugin plugin)
{
super("Clans Tutorial", plugin);
}
}

7
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/TutorialSession.java Normal file
View File

@ -0,0 +1,7 @@
package mineplex.game.clans.tutorial;
public class TutorialSession
{
private int _objectiveGroupIndex;
private int _objectiveIndex;
}