Altitude/AltitudeQuests
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Minor changes.

Browse Source
This commit is contained in:
once_a_fairy 2023-08-06 14:53:36 +02:00
parent e258644a20
commit 2b9d6c0160
5 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/alttd/altitudequests/AQuest.java
View File

@ -70,8 +70,8 @@ public final class AQuest extends JavaPlugin {
getServer().getPluginManager().registerEvents(new DonNotMessWithNPC(), this); getServer().getPluginManager().registerEvents(new DonNotMessWithNPC(), this);
getServer().getPluginManager().registerEvents(new DataLock(), this); getServer().getPluginManager().registerEvents(new DataLock(), this);
getServer().getPluginManager().registerEvents(new ItemCaught(), this); getServer().getPluginManager().registerEvents(new ItemCaught(), this);
getServer().getPluginManager().registerEvents(new PotionBrewingStarted(), this); // getServer().getPluginManager().registerEvents(new PotionBrewingStarted(), this);
getServer().getPluginManager().registerEvents(new PotionBrewingFinished(), this); // getServer().getPluginManager().registerEvents(new PotionBrewingFinished(), this);
getServer().getPluginManager().registerEvents(new FinishedRaid(), this); getServer().getPluginManager().registerEvents(new FinishedRaid(), this);
// getServer().getMessenger().registerOutgoingPluginChannel(this, "aquest:player-data"); // getServer().getMessenger().registerOutgoingPluginChannel(this, "aquest:player-data");

10
src/main/java/com/alttd/altitudequests/config/QuestsConfig.java
View File

@ -172,12 +172,8 @@ public class QuestsConfig extends AbstractConfig {
Set<String> keys = configurationSection.getKeys(false); Set<String> keys = configurationSection.getKeys(false);
for (String key : keys) { for (String key : keys) {
try { try {
if (configurationSection.getString(key + ".item") == null) { item = Material.valueOf(configurationSection.getString(key + ".item"));
item = null;
}
else {
item = Material.valueOf(configurationSection.getString(key + ".item"));
}
if (configurationSection.getString(key + ".mob") == null) { if (configurationSection.getString(key + ".mob") == null) {
entityType = null; entityType = null;
} }
@ -203,8 +199,6 @@ public class QuestsConfig extends AbstractConfig {
} }
} }
OTHER_QUEST_NAME = config.getString("other.name", OTHER_QUEST_NAME); OTHER_QUEST_NAME = config.getString("other.name", OTHER_QUEST_NAME);
//OTHER_STEP_1 = config.getString("other.step-1", OTHER_STEP_1);
//OTHER_STEP_2 = config.getString("other.step-2", OTHER_STEP_2);
OTHER_TURN_IN = config.getString("other.turn-in", OTHER_TURN_IN); OTHER_TURN_IN = config.getString("other.turn-in", OTHER_TURN_IN);
OTHER_COMMANDS = config.getStringList("other.commands", OTHER_COMMANDS); OTHER_COMMANDS = config.getStringList("other.commands", OTHER_COMMANDS);
} }

2
src/main/java/com/alttd/altitudequests/events/FinishedRaid.java
View File

@ -22,7 +22,7 @@ public class FinishedRaid implements Listener {
if (dailyQuest == null || dailyQuest.isDone()) { if (dailyQuest == null || dailyQuest.isDone()) {
return; return;
} }
if (dailyQuest instanceof OtherQuest otherQuest) { // check if dailyQuest.getVariant().getName()) == Raidquest if (dailyQuest instanceof OtherQuest otherQuest) {
otherQuest.raid(); otherQuest.raid();
} }
} }

17
src/main/java/com/alttd/altitudequests/objects/quests/OtherQuest.java
View File

@ -13,7 +13,6 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -150,7 +149,6 @@ public class OtherQuest extends Quest {
@Override @Override
public Component getDisplayName() { public Component getDisplayName() {
return MiniMessage.miniMessage().deserialize("<green>%s</green>".formatted( otherQuestObject.getCategory())); return MiniMessage.miniMessage().deserialize("<green>%s</green>".formatted( otherQuestObject.getCategory()));
//return MiniMessage.miniMessage().deserialize("%s<green>: </green>%s".formatted(QuestsConfig.OTHER_QUEST_NAME, otherQuestObject.getCategory()));
} }
@Override @Override
@ -190,20 +188,20 @@ public class OtherQuest extends Quest {
} }
public void raid(){ public void raid(){
if (isDone() || getAmount() == getStep1() || otherQuestObject.getCategory() != "Raid") { if (isDone() || getAmount() == getStep1() || !Objects.equals(otherQuestObject.getCategory(), "Raid")) { //without checking the category, other players who have otherQuests active will also have a step added
return; return;
} }
addStep1(1); addStep1(1);
checkDone(); checkDone();
} }
public void brewingStarted(ItemStack ingredient, Location brewingStandLocation){ //public void brewingStarted(ItemStack ingredient, Location brewingStandLocation){
Logger.warning("Brewing Started"); // Logger.warning("Brewing Started");
} //}
public void brewingFinished(List <ItemStack> results, Location brewingStandLocation) { //public void brewingFinished(List <ItemStack> results, Location brewingStandLocation) {
Logger.warning("Brewing Finished"); // Logger.warning("Brewing Finished");
} //}
public static List<String> getSubTypes() { public static List<String> getSubTypes() {
return QuestsConfig.OTHER_QUEST.stream().map(Variant::getInternalName).collect(Collectors.toList()); return QuestsConfig.OTHER_QUEST.stream().map(Variant::getInternalName).collect(Collectors.toList());
@ -215,7 +213,6 @@ public class OtherQuest extends Quest {
try { try {
return DyeColor.valueOf(colorName); return DyeColor.valueOf(colorName);
} catch (IllegalArgumentException ignored) { } catch (IllegalArgumentException ignored) {
// This will be thrown if the color name doesn't match the enum
} }
} }
return null; return null;

4
src/main/java/com/alttd/altitudequests/util/ProgressBookOpener.java
View File

@ -41,10 +41,6 @@ public class ProgressBookOpener {
dailyQuest.getTagResolvers() dailyQuest.getTagResolvers()
); );
List<String> pages = new ArrayList<>(); List<String> pages = new ArrayList<>();
// if (dailyQuest.isDone())
// pages.addAll(dailyQuest.getDonePages());
// else
// pages.addAll(dailyQuest.getQuestPages());
pages.addAll(Config.PROGRESS_PAGES); pages.addAll(Config.PROGRESS_PAGES);
return (pages.stream() return (pages.stream()
.map(page -> miniMessage.deserialize(page, tagResolver)) .map(page -> miniMessage.deserialize(page, tagResolver))