diff options
| author | fatpigsarefat <fatpigsarefat@outlook.com> | 2018-04-21 08:50:13 +0100 |
|---|---|---|
| committer | fatpigsarefat <fatpigsarefat@outlook.com> | 2018-04-21 08:50:13 +0100 |
| commit | 279cf8d33350ab9bf2387f3d4cdfa14d016b1845 (patch) | |
| tree | 1a2e74fcc708594c55f01b56735836093f39e9a6 | |
| parent | 0dc7a8f6215b14c47e861db67768b5bc76070b0f (diff) | |
added configvalues in prep for creator, moved task types into their own package
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java | 29 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java | 6 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/ASkyBlockLevelType.java) | 16 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/BuildingCertainTaskType.java) | 17 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/BuildingTaskType.java) | 15 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/FishingTaskType.java) | 15 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/InventoryTaskType.java) | 17 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/MilkingTaskType.java) | 15 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/MiningCertainTaskType.java) | 17 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/MiningTaskType.java) | 18 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/MobkillingCertainTaskType.java) | 17 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/MobkillingTaskType.java) | 16 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/PlayerkillingTaskType.java) | 16 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/ShearingTaskType.java) | 15 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/TamingTaskType.java) | 15 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/WalkingTaskType.java) | 15 | ||||
| -rw-r--r-- | src/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java (renamed from src/me/fatpigsarefat/quests/quests/tasktypes/uSkyBlockLevelType.java) | 15 |
17 files changed, 257 insertions, 17 deletions
diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java b/src/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java new file mode 100644 index 00000000..d886fe16 --- /dev/null +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/ConfigValue.java @@ -0,0 +1,29 @@ +package me.fatpigsarefat.quests.quests.tasktypes; + +/** + * This is for the quest creator and is purely cosmetic. + */ +public final class ConfigValue { + + private String key; + private boolean required; + private String description; + + public ConfigValue(String key, boolean required, String description) { + this.key = key; + this.required = required; + this.description = description; + } + + public String getKey() { + return key; + } + + public boolean isRequired() { + return required; + } + + public String getDescription() { + return description; + } +} diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java index d84d13ba..bb4ddea5 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/TaskType.java @@ -4,6 +4,7 @@ import me.fatpigsarefat.quests.quests.Quest; import org.bukkit.event.Listener; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public abstract class TaskType implements Listener { @@ -37,7 +38,6 @@ public abstract class TaskType implements Listener { return quests; } - public final String getType() { return type; } @@ -49,4 +49,8 @@ public abstract class TaskType implements Listener { public String getDescription() { return description; } + + public List<ConfigValue> getCreatorConfigValues() { + return Collections.emptyList(); + } } diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/ASkyBlockLevelType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java index e86b5a0b..5fcdda15 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/ASkyBlockLevelType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/ASkyBlockLevelType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import com.wasteofplastic.askyblock.events.IslandPostLevelEvent; import me.fatpigsarefat.quests.Quests; @@ -8,13 +8,26 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; +import java.util.ArrayList; +import java.util.List; + public final class ASkyBlockLevelType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public ASkyBlockLevelType() { super("askyblock_level", "fatpigsarefat", "Reach a certain island level for ASkyBlock."); + this.creatorConfigValues.add(new ConfigValue("level", true, "Minimum island level needed.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) @@ -48,5 +61,4 @@ public final class ASkyBlockLevelType extends TaskType { } } } - } diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/BuildingCertainTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java index 8a2add5d..425fd693 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/BuildingCertainTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingCertainTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,16 +7,31 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.apache.commons.lang.StringUtils; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockPlaceEvent; +import java.util.ArrayList; +import java.util.List; + public final class BuildingCertainTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public BuildingCertainTaskType() { super("blockplacecertain", "fatpigsarefat", "Place a set amount of a specific block."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of blocks to be placed.")); + this.creatorConfigValues.add(new ConfigValue("block", true, "Name or ID of block.")); + this.creatorConfigValues.add(new ConfigValue("data", false, "Data code for block.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/BuildingTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java index 17d8247b..0943ddf9 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/BuildingTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/BuildingTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,14 +7,27 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockPlaceEvent; +import java.util.ArrayList; +import java.util.List; + public final class BuildingTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public BuildingTaskType() { super("blockplace", "fatpigsarefat", "Place a set amount of blocks."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of blocks to be placed.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/FishingTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java index fac0bbda..87ce8147 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/FishingTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/FishingTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,15 +7,28 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerFishEvent; +import java.util.ArrayList; +import java.util.List; + public final class FishingTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public FishingTaskType() { super("fishing", "fatpigsarefat", "Catch a set amount of items from the sea."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of fish to be caught.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/InventoryTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java index d95e25d8..66499681 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/InventoryTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/InventoryTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,6 +7,8 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.apache.commons.lang.StringUtils; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -18,10 +20,23 @@ import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.scheduler.BukkitRunnable; +import java.util.ArrayList; +import java.util.List; + public final class InventoryTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public InventoryTaskType() { super("inventory", "fatpigsarefat", "Obtain a set of items."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of item to retrieve.")); + this.creatorConfigValues.add(new ConfigValue("item", true, "Name or ID of item.")); + this.creatorConfigValues.add(new ConfigValue("remove-items-when-complete", false, "Take the items away from the player on completion (true/false, default = false).")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/MilkingTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java index 81a08dca..7de92d59 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/MilkingTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MilkingTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,6 +7,8 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.Material; import org.bukkit.entity.Cow; import org.bukkit.entity.Player; @@ -14,10 +16,21 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerInteractEntityEvent; +import java.util.ArrayList; +import java.util.List; + public final class MilkingTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public MilkingTaskType() { super("milking", "fatpigsarefat", "Milk a set amount of cows."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of cows to be milked.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/MiningCertainTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java index a53d2373..de9e4f94 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/MiningCertainTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningCertainTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,16 +7,31 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.apache.commons.lang.StringUtils; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockBreakEvent; +import java.util.ArrayList; +import java.util.List; + public final class MiningCertainTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public MiningCertainTaskType() { super("blockbreakcertain", "fatpigsarefat", "Break a set amount of a specific block."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of blocks to be broken.")); + this.creatorConfigValues.add(new ConfigValue("block", true, "Name or ID of block.")); + this.creatorConfigValues.add(new ConfigValue("data", false, "Data code for block.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/MiningTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java index a0bcb4bf..f0ba95ca 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/MiningTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MiningTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,15 +7,31 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockBreakEvent; +import java.util.ArrayList; +import java.util.List; + public final class MiningTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public MiningTaskType() { // type, author, description super("blockbreak", "fatpigsarefat", "Break a set amount of blocks."); + + // config values for the quest creator to use, if unspecified then the quest creator will not know what to put here (and will require users to + // go into the config and manually configure there) + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of blocks to be broken.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/MobkillingCertainTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java index 11848918..aeb56e0e 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/MobkillingCertainTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingCertainTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,6 +7,8 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.ChatColor; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; @@ -15,10 +17,23 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDeathEvent; +import java.util.ArrayList; +import java.util.List; + public final class MobkillingCertainTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public MobkillingCertainTaskType() { super("mobkillingcertain", "fatpigsarefat", "Kill a set amount of a specific entity type."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of mobs to be killed.")); + this.creatorConfigValues.add(new ConfigValue("mob", true, "Name of mob.")); + this.creatorConfigValues.add(new ConfigValue("name", false, "Only allow a specific name for mob (unspecified = any name allowed).")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/MobkillingTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java index cdc3449d..8e0e5550 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/MobkillingTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/MobkillingTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,6 +7,8 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.entity.Animals; import org.bukkit.entity.Entity; import org.bukkit.entity.Monster; @@ -15,10 +17,22 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDeathEvent; +import java.util.ArrayList; +import java.util.List; + public final class MobkillingTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public MobkillingTaskType() { super("mobkilling", "fatpigsarefat", "Kill a set amount of entities."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of mobs to be killed.")); + this.creatorConfigValues.add(new ConfigValue("hostile", false, "Only allow hostile or non-hostile mobs (unspecified = any type allowed).")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/PlayerkillingTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java index 2edf5282..6a9e7481 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/PlayerkillingTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/PlayerkillingTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,16 +7,30 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDeathEvent; +import java.util.ArrayList; +import java.util.List; + public final class PlayerkillingTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public PlayerkillingTaskType() { super("playerkilling", "fatpigsarefat", "Kill a set amount of players."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of mobs to be killed.")); + this.creatorConfigValues.add(new ConfigValue("hostile", false, "Only allow hostile or non-hostile mobs (unspecified = any type allowed).")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/ShearingTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java index 57e36980..316c3e28 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/ShearingTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/ShearingTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,16 +7,29 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.entity.Player; import org.bukkit.entity.Sheep; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerShearEntityEvent; +import java.util.ArrayList; +import java.util.List; + public final class ShearingTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public ShearingTaskType() { super("shearing", "fatpigsarefat", "Shear a set amount of sheep."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of cows to be milked.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/TamingTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java index 5227d6fe..beca3b4e 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/TamingTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/TamingTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,15 +7,28 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityTameEvent; +import java.util.ArrayList; +import java.util.List; + public final class TamingTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public TamingTaskType() { super("taming", "fatpigsarefat", "Tame a set amount of animals."); + this.creatorConfigValues.add(new ConfigValue("amount", true, "Amount of animals to be tamed.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/WalkingTaskType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java index 0256096e..5ddc2241 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/WalkingTaskType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/WalkingTaskType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,15 +7,28 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerMoveEvent; +import java.util.ArrayList; +import java.util.List; + public final class WalkingTaskType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public WalkingTaskType() { super("walking", "fatpigsarefat", "Walk a set distance."); + this.creatorConfigValues.add(new ConfigValue("distance", true, "Amount of meters (blocks) to be travelled.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) diff --git a/src/me/fatpigsarefat/quests/quests/tasktypes/uSkyBlockLevelType.java b/src/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java index 89950c25..d140ab8f 100644 --- a/src/me/fatpigsarefat/quests/quests/tasktypes/uSkyBlockLevelType.java +++ b/src/me/fatpigsarefat/quests/quests/tasktypes/types/uSkyBlockLevelType.java @@ -1,4 +1,4 @@ -package me.fatpigsarefat.quests.quests.tasktypes; +package me.fatpigsarefat.quests.quests.tasktypes.types; import me.fatpigsarefat.quests.Quests; import me.fatpigsarefat.quests.player.QPlayer; @@ -7,14 +7,27 @@ import me.fatpigsarefat.quests.player.questprogressfile.QuestProgressFile; import me.fatpigsarefat.quests.player.questprogressfile.TaskProgress; import me.fatpigsarefat.quests.quests.Quest; import me.fatpigsarefat.quests.quests.Task; +import me.fatpigsarefat.quests.quests.tasktypes.ConfigValue; +import me.fatpigsarefat.quests.quests.tasktypes.TaskType; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import us.talabrek.ultimateskyblock.api.event.uSkyBlockScoreChangedEvent; +import java.util.ArrayList; +import java.util.List; + public final class uSkyBlockLevelType extends TaskType { + private List<ConfigValue> creatorConfigValues = new ArrayList<>(); + public uSkyBlockLevelType() { super("uskyblock_level", "fatpigsarefat", "Reach a certain island level for uSkyBlock."); + this.creatorConfigValues.add(new ConfigValue("level", true, "Minimum island level needed.")); + } + + @Override + public List<ConfigValue> getCreatorConfigValues() { + return creatorConfigValues; } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) |
