Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-01-29 11:31:48 +01:00
Code Issues Projects Releases Wiki Activity

Update quest objective matching to better match job task matching.

Browse Source 
Allows the default enchanter quest to actually detect ARROW_DAMAGE enchantment.
This commit is contained in:
BeepoWuff 2021-09-21 02:08:15 +10:00
parent a224545d79
commit e9c1937953
No known key found for this signature in database
GPG Key ID: 4C176134BCA5058C
3 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gamingmesh/jobs/container/Job.java
View File

@ -29,8 +29,8 @@ import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.function.BiPredicate; import java.util.function.BiPredicate;
import com.gamingmesh.jobs.CMILib.CMIEnchantment;
import com.gamingmesh.jobs.actions.EnchantActionInfo; import com.gamingmesh.jobs.actions.EnchantActionInfo;
import com.gamingmesh.jobs.stuff.Util;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -310,16 +310,7 @@ public class Job {
} }
if (actionInfo instanceof EnchantActionInfo) { if (actionInfo instanceof EnchantActionInfo) {
EnchantActionInfo enchantActionInfo = (EnchantActionInfo)actionInfo; return Util.enchantMatchesActionInfo(jobInfo.getName(), (EnchantActionInfo) actionInfo);
String enchantName = CMIEnchantment.get(actionInfo.getName()).toString();
return (
// Enchantment without level e.g. silk_touch
jobInfo.getName().equalsIgnoreCase(enchantName) ||
// Enchantment with level e.g. fire_aspect:1
jobInfo.getName().equalsIgnoreCase(enchantName + ":" + enchantActionInfo.getLevel())
);
} }
return jobInfo.getName().equalsIgnoreCase(action.getNameWithSub()) || return jobInfo.getName().equalsIgnoreCase(action.getNameWithSub()) ||

50
src/main/java/com/gamingmesh/jobs/container/QuestProgression.java
View File

@ -4,6 +4,8 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.gamingmesh.jobs.actions.EnchantActionInfo;
import com.gamingmesh.jobs.stuff.Util;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.event.server.ServerCommandEvent; import org.bukkit.event.server.ServerCommandEvent;
@ -97,7 +99,9 @@ public class QuestProgression {
return; return;
Map<String, QuestObjective> byAction = quest.getObjectives().get(action.getType()); Map<String, QuestObjective> byAction = quest.getObjectives().get(action.getType());
if (byAction != null && !byAction.containsKey(action.getNameWithSub()) && !byAction.containsKey(action.getName())) QuestObjective objective = objectiveForAction(action);
if (byAction != null && objective == null)
return; return;
org.bukkit.entity.Player player = jPlayer.getPlayer(); org.bukkit.entity.Player player = jPlayer.getPlayer();
@ -118,21 +122,13 @@ public class QuestProgression {
} }
} }
if (!isCompleted()) { if (
QuestObjective objective = null; !isCompleted() &&
objective != null
if (byAction != null) { ) {
objective = byAction.get(action.getName());
if (objective == null)
objective = byAction.get(action.getNameWithSub());
}
if (objective != null) {
Integer old = done.getOrDefault(objective, 0); Integer old = done.getOrDefault(objective, 0);
done.put(objective, old < objective.getAmount() ? old + 1 : objective.getAmount()); done.put(objective, old < objective.getAmount() ? old + 1 : objective.getAmount());
} }
}
jPlayer.setSaved(false); jPlayer.setSaved(false);
@ -159,4 +155,32 @@ public class QuestProgression {
public void setGivenReward(boolean givenReward) { public void setGivenReward(boolean givenReward) {
this.givenReward = givenReward; this.givenReward = givenReward;
} }
private boolean objectiveKeyMatches(String objectiveKey, ActionInfo actionInfo) {
if (actionInfo instanceof EnchantActionInfo) {
return Util.enchantMatchesActionInfo(objectiveKey, (EnchantActionInfo) actionInfo);
}
return (
objectiveKey.equalsIgnoreCase(actionInfo.getNameWithSub()) ||
objectiveKey.equalsIgnoreCase(actionInfo.getName())
);
}
private QuestObjective objectiveForAction(ActionInfo actionInfo) {
Map<String, QuestObjective> byAction = quest.getObjectives().get(actionInfo.getType());
if (byAction == null) {
return null;
}
for (Map.Entry<String, QuestObjective> objectiveEntry : byAction.entrySet()) {
String objectiveKey = objectiveEntry.getKey();
if (objectiveKeyMatches(objectiveKey, actionInfo)) {
return objectiveEntry.getValue();
}
}
return null;
}
} }

13
src/main/java/com/gamingmesh/jobs/stuff/Util.java
View File

@ -14,6 +14,8 @@ import java.util.UUID;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import com.gamingmesh.jobs.CMILib.CMIEnchantment;
import com.gamingmesh.jobs.actions.EnchantActionInfo;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Location; import org.bukkit.Location;
@ -405,4 +407,15 @@ public final class Util {
return difference; return difference;
} }
public static boolean enchantMatchesActionInfo(String enchant, EnchantActionInfo actionInfo) {
String enchantName = CMIEnchantment.get(actionInfo.getName()).toString();
return (
// Enchantment without level e.g. silk_touch
enchant.equalsIgnoreCase(enchantName) ||
// Enchantment with level e.g. fire_aspect:1
enchant.equalsIgnoreCase(enchantName + ":" + actionInfo.getLevel())
);
}
} }