Skip to content

feat: tell staff when gear materials are bypassed #30

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 1 commit into from
Sep 25, 2026
Merged

feat: tell staff when gear materials are bypassed #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/main/java/net/tfminecraft/magic/gear/gui/GearInventoryManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,16 @@ private void tryPrepare(Player player) {
player.playSound(player.getLocation(), Sound.ENTITY_VILLAGER_NO, 1f, 1f);
return;
}
Map<String, Integer> charged = GearCosts.bypasses(player) ? Map.of() : GearCosts.total(parts);
boolean staffBypass = GearCosts.bypasses(player);
Map<String, Integer> charged = staffBypass ? Map.of() : GearCosts.total(parts);
GearCosts.take(player, parts);
GearStationStore.occupy(station, prepared, player.getUniqueId(), charged);
OpenStationManager.clear(player);
player.closeInventory();
player.sendMessage(Messages.get("gear.craft.prepared"));
if (staffBypass) {
player.sendMessage(Messages.get("gear.craft.bypassed"));
}
player.playSound(player.getLocation(), Sound.BLOCK_ANVIL_USE, 1f, 1.2f);
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/messages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ gear:

prepared: "#aaaaaa§oThe weapon rests on the station"

bypassed: "#ffaa00Materials were bypassed due to staff."

charge:

not_charge: "#ff5555That is not an enchanted charge."
Expand Down