Skip to content

fix: award crafting XP only when the craft succeeds #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Drefvelin merged 3 commits into from
Sep 25, 2026
Merged

fix: award crafting XP only when the craft succeeds #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba59dc6
fix: award crafting XP only when the craft succeeds
ryanbarlow97 Sep 25, 2026
b72c0b4
fix: skip malformed xp values instead of throwing
ryanbarlow97 Sep 25, 2026
3643cc9
fix: require the full skill(amount) format for xp values
ryanbarlow97 Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions src/main/java/net/tfminecraft/advancedcrafting/objects/crafting/CraftingStation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit;
Expand Down Expand Up @@ -253,10 +255,17 @@ public StationFeedback craft(Player p) {

public StationFeedback craft(Player p, Double forcedQualityPercent) {
stats = CraftStatCalculator.compute(recipe, currentMaterials);
giveXP(p);
return createItem(p, forcedQualityPercent);
StationFeedback f = createItem(p, forcedQualityPercent);
// Failed attempts keep the station's materials, so paying XP before the checks let every retry pay again.
if (f == StationFeedback.SUCCESS) {
giveXP(p);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
return f;
}

// skill(amount), e.g. crafter(2.0)
private static final Pattern XP_FORMAT = Pattern.compile("([A-Za-z0-9_-]+)\\((\\d+(?:\\.\\d+)?)\\)");

private void giveXP(Player p) {
// Map of skill name -> total XP to give
Map<String, Double> xpBySkill = new HashMap<>();
Expand All @@ -267,26 +276,31 @@ private void giveXP(Player p) {
String mId = split[1];
int amount = currentMaterials.get(s);

double xpPerUnit = 0.0;
String skill = null;
String raw = null;

if (type.equalsIgnoreCase("ingredient")) {
Ingredient ingredient = IngredientLoader.getByString(mId); // Assuming you have a method like this
if (ingredient != null && ingredient.getIngredientData().hasXP()) {
String raw = ingredient.getIngredientData().getXP();
xpPerUnit = Double.parseDouble(raw.split("\\(")[1].replace(")", ""));
skill = raw.split("\\(")[0]; // Assuming you store "agriculturist" here
raw = ingredient.getIngredientData().getXP();
}
} else if (type.equalsIgnoreCase("alloy")) {
Alloy alloy = AlloyManager.getAlloyById(mId); // Likewise for alloy
if (alloy != null && alloy.getData().hasXP()) {
String raw = alloy.getData().getXP();
xpPerUnit = Double.parseDouble(raw.split("\\(")[1].replace(")", ""));
skill = raw.split("\\(")[0]; // Assuming you store "agriculturist" here
raw = alloy.getData().getXP();
}
}
if (raw == null) continue;

// XP is paid after the item drops, so a bad value must be skipped rather than throw and leave the station uncleared.
Matcher m = XP_FORMAT.matcher(raw.trim());
if (!m.matches()) {
Bukkit.getLogger().warning("AC: Invalid xp value '" + raw + "', expected skill(amount)");
continue;
}
String skill = m.group(1);
double xpPerUnit = Double.parseDouble(m.group(2));

if (skill != null && xpPerUnit > 0) {
if (xpPerUnit > 0) {
double totalXP = xpPerUnit * amount;
xpBySkill.put(skill, xpBySkill.getOrDefault(skill, 0.0) + totalXP);
}
Expand Down