diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveData.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveData.java deleted file mode 100644 index 35a9d72f9..000000000 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveData.java +++ /dev/null @@ -1,5 +0,0 @@ -package mineplex.core.common.objective; - -public class ObjectiveData -{ -} diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java index d6a1bf7ae..7c85592f2 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/Tutorial.java @@ -14,8 +14,8 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveListener; +import mineplex.game.clans.tutorial.objective.Objective; +import mineplex.game.clans.tutorial.objective.ObjectiveListener; import mineplex.core.common.util.C; import mineplex.game.clans.message.ClansMessageManager; @@ -60,13 +60,16 @@ public abstract class Tutorial implements Listener, ObjectiveListener System.out.println(String.format("Tutorial> [%s] started tutorial [%s]", player.getName(), getName())); TutorialSession session = new TutorialSession(); - if (_worldManager != null) - session.setRegion(_worldManager.getNextRegion()); + TutorialRegion region = _worldManager == null ? null : _worldManager.getNextRegion(); + session.setRegion(region); + _playerSessionMap.put(player, session); // Start at first objective! setObjective(player, 0); onStart(player); + + _objectives.forEach(objective -> objective.setup(player, region)); } private void setObjective(Player player, int objective) @@ -149,6 +152,8 @@ public abstract class Tutorial implements Listener, ObjectiveListener private void finish(Player player) { + _objectives.forEach(objective -> objective.clean(player, getRegion(player))); + removePlayer(player); System.out.println(String.format("Tutorial> [%s] finished tutorial [%s]", player.getName(), getName())); diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/Objective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java similarity index 90% rename from Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/Objective.java rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java index 183e9ea30..9e813ba0a 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/Objective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java @@ -1,6 +1,5 @@ -package mineplex.core.common.objective; +package mineplex.game.clans.tutorial.objective; -import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; import java.util.List; @@ -13,7 +12,7 @@ import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.common.util.UtilPlayer; -import mineplex.core.common.util.UtilServer; +import mineplex.game.clans.tutorial.TutorialRegion; /** * An Objective represents a set of goals that need to be completed to move on to the next Objective in the quest @@ -148,6 +147,26 @@ public abstract class Objective implements L */ protected abstract void completeGoal(ObjectiveGoal goal, Player player); + /** + * Called when a player is finished the tutorial + * @param player + * @param region + */ + public void clean(Player player, TutorialRegion region) + { + getGoals().forEach(goal -> goal.clean(player, region)); + } + + /** + * Called when a player starts the tutorial + * @param player + * @param region + */ + public void setup(Player player, TutorialRegion region) + { + getGoals().forEach(goal -> goal.setup(player, region)); + } + /** * Returns a list of all the ObjectiveGoals used by this Objective * Can return null diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveData.java new file mode 100644 index 000000000..9d6f8ca00 --- /dev/null +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveData.java @@ -0,0 +1,5 @@ +package mineplex.game.clans.tutorial.objective; + +public class ObjectiveData +{ +} diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveGoal.java similarity index 85% rename from Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveGoal.java rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveGoal.java index c81ae3160..c64ca8885 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveGoal.java @@ -1,4 +1,4 @@ -package mineplex.core.common.objective; +package mineplex.game.clans.tutorial.objective; import java.util.HashSet; import java.util.Set; @@ -7,6 +7,8 @@ import java.util.UUID; import org.bukkit.entity.Player; import org.bukkit.event.Listener; +import mineplex.game.clans.tutorial.TutorialRegion; + public abstract class ObjectiveGoal implements Listener { private T _objective; @@ -101,6 +103,22 @@ public abstract class ObjectiveGoal implements Listener } } + /** + * Called when a player starts the tutorial with this goal + */ + protected void setup(Player player, TutorialRegion region) + { + + } + + /** + * Called when a player finishes the tutorial with this goal + */ + protected void clean(Player player, TutorialRegion region) + { + + } + public T getObjective() { return _objective; diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveListener.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveListener.java similarity index 92% rename from Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveListener.java rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveListener.java index 17713da67..6ac9f0e74 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/ObjectiveListener.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveListener.java @@ -1,4 +1,4 @@ -package mineplex.core.common.objective; +package mineplex.game.clans.tutorial.objective; import org.bukkit.entity.Player; diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/OrderedObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/OrderedObjective.java similarity index 97% rename from Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/OrderedObjective.java rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/OrderedObjective.java index 1f7a68d4c..924b6b7ac 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/OrderedObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/OrderedObjective.java @@ -1,10 +1,9 @@ -package mineplex.core.common.objective; +package mineplex.game.clans.tutorial.objective; import java.util.ArrayList; import java.util.List; import org.bukkit.entity.Player; -import org.bukkit.event.HandlerList; import org.bukkit.plugin.java.JavaPlugin; import net.md_5.bungee.api.ChatColor; diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/OrderedObjectiveData.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/OrderedObjectiveData.java similarity index 83% rename from Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/OrderedObjectiveData.java rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/OrderedObjectiveData.java index 8626f7161..55fdd79dc 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/OrderedObjectiveData.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/OrderedObjectiveData.java @@ -1,4 +1,4 @@ -package mineplex.core.common.objective; +package mineplex.game.clans.tutorial.objective; public class OrderedObjectiveData extends ObjectiveData { diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/SingleObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/SingleObjective.java similarity index 94% rename from Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/SingleObjective.java rename to Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/SingleObjective.java index 6b49fdba6..a1e7f4cc5 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/objective/SingleObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/SingleObjective.java @@ -1,7 +1,6 @@ -package mineplex.core.common.objective; +package mineplex.game.clans.tutorial.objective; import java.util.List; -import java.util.UUID; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java index a7603bee0..21c63fd74 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java @@ -3,7 +3,7 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.common.objective.OrderedObjective; +import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.AttackEnemyGoal; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.BuildHouseGoal; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java index a1d2b4dfb..4292c2032 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java @@ -3,7 +3,7 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.common.objective.OrderedObjective; +import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.classes.OpenClassManagerGoal; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.classes.UseBullsChargeGoal; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java index addb3cda5..141bc601b 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java @@ -3,10 +3,9 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.common.objective.OrderedObjective; +import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.fields.GoToFieldsGoal; -import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.fields.KillZombiesGoal; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.fields.MineDiamondsGoal; public class FieldsObjective extends OrderedObjective diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java index 67369fe1f..59711f5bd 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java @@ -3,13 +3,8 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.common.objective.OrderedObjective; +import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; -import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.BuildHouseGoal; -import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.ClaimLandGoal; -import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.ClanDetailsGoal; -import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.CreateClanGoal; -import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.SetHomeGoal; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.end.TpClanHomeGoal; public class FinalObjective extends OrderedObjective diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/LeaveSpawnObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/LeaveSpawnObjective.java index 880b3aedd..aac892f39 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/LeaveSpawnObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/LeaveSpawnObjective.java @@ -1,12 +1,10 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; -import java.util.Optional; - import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.common.objective.SingleObjective; +import mineplex.game.clans.tutorial.objective.SingleObjective; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java index 43472efa4..40ec76123 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java @@ -3,7 +3,7 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import mineplex.core.common.objective.OrderedObjective; +import mineplex.game.clans.tutorial.objective.OrderedObjective; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.shops.GoToShopsGoal; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/AttackEnemyGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/AttackEnemyGoal.java index 617844d94..3ce61d950 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/AttackEnemyGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/AttackEnemyGoal.java @@ -1,18 +1,15 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan; import java.util.HashMap; -import java.util.concurrent.TimeUnit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import org.bukkit.inventory.ItemStack; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.F; -import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilPlayer; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java index 3216bbc26..00ee7ab7b 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java @@ -14,8 +14,7 @@ import org.bukkit.inventory.ItemStack; import com.google.common.collect.Lists; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; import mineplex.game.clans.clans.ClansManager; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java index b7c717695..7af78450b 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java @@ -4,12 +4,10 @@ import java.util.List; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilPlayer; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanDetailsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanDetailsGoal.java index 8d88ab556..3b84a1fd3 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanDetailsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanDetailsGoal.java @@ -3,7 +3,7 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.game.clans.clans.ClanInfo; import mineplex.game.clans.clans.ClansManager; import mineplex.game.clans.clans.event.ClansCommandExecutedEvent; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/CreateClanGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/CreateClanGoal.java index e7e8b42f3..b3fc57bc0 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/CreateClanGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/CreateClanGoal.java @@ -3,10 +3,8 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.game.clans.clans.ClansManager; -import mineplex.game.clans.clans.event.ClanCreatedEvent; import mineplex.game.clans.clans.event.ClanCreationCompleteEvent; import mineplex.game.clans.tutorial.tutorials.clans.objective.ClanObjective; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java index 23e0ff626..0cbb5fd00 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java @@ -3,11 +3,9 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; -import mineplex.game.clans.clans.event.ClanSetHomeEvent; import mineplex.game.clans.clans.event.ClansCommandPreExecutedEvent; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.ClanObjective; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/StealEnemyPotatoesGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/StealEnemyPotatoesGoal.java index 4dd5ae378..61585a75b 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/StealEnemyPotatoesGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/StealEnemyPotatoesGoal.java @@ -1,13 +1,11 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan; import org.bukkit.entity.Player; -import org.bukkit.event.EventHandler; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.Objective; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilPlayer; -import mineplex.game.clans.clans.event.ClanCreatedEvent; public class StealEnemyPotatoesGoal extends ObjectiveGoal { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/OpenClassManagerGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/OpenClassManagerGoal.java index 633a9f7d0..bf3ad1e20 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/OpenClassManagerGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/OpenClassManagerGoal.java @@ -5,8 +5,8 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.player.PlayerInteractEvent; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.Objective; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.UtilEvent; import mineplex.core.common.util.UtilEvent.ActionType; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java index 485b24d51..362be3e12 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java @@ -2,8 +2,8 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.classes; import org.bukkit.entity.Player; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.Objective; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; public class UseBullsChargeGoal extends ObjectiveGoal { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/end/TpClanHomeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/end/TpClanHomeGoal.java index 44e8d8c89..c64f15152 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/end/TpClanHomeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/end/TpClanHomeGoal.java @@ -3,8 +3,8 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.end; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.Objective; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.game.clans.clans.event.ClansCommandExecutedEvent; public class TpClanHomeGoal extends ObjectiveGoal diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/GoToFieldsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/GoToFieldsGoal.java index c9321881c..f46e59123 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/GoToFieldsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/GoToFieldsGoal.java @@ -5,12 +5,10 @@ import java.util.UUID; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.UtilPlayer; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import mineplex.game.clans.clans.event.PlayerEnterTerritoryEvent; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.FieldsObjective; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/KillZombiesGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/KillZombiesGoal.java index 0dc2fb06e..d393dbe08 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/KillZombiesGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/KillZombiesGoal.java @@ -8,8 +8,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.entity.EntityDeathEvent; import mineplex.core.common.DefaultHashMap; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.Objective; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; public class KillZombiesGoal extends ObjectiveGoal { diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java index 6360bc284..ee94f6c15 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java @@ -12,9 +12,7 @@ import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.inventory.ItemStack; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; -import mineplex.game.clans.clans.event.PlayerEnterTerritoryEvent; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.game.clans.tutorial.TutorialRegion; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.FieldsObjective; diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/GoToShopsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/GoToShopsGoal.java index 3cd9aaf2b..0e63ef3ac 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/GoToShopsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/GoToShopsGoal.java @@ -5,13 +5,10 @@ import java.util.UUID; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import mineplex.core.common.objective.Objective; -import mineplex.core.common.objective.ObjectiveGoal; +import mineplex.game.clans.tutorial.objective.ObjectiveGoal; import mineplex.core.common.util.UtilPlayer; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import mineplex.game.clans.clans.event.ClanCreatedEvent; -import mineplex.game.clans.clans.event.PlayerEnterTerritoryEvent; import mineplex.game.clans.tutorial.tutorials.clans.ClansMainTutorial; import mineplex.game.clans.tutorial.tutorials.clans.objective.ShopsObjective;