Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
@Slf4j
public class FletchingPlugin extends Plugin {

public static final String version = "1.6.3";
public static final String version = "1.6.4";

@Inject
private FletchingConfig config;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void run(FletchingConfig config) {
primaryItemToFletch = fletchingMode.getItemName();

if (fletchingMode == FletchingMode.PROGRESSIVE) {
secondaryItemToFletch = (model.getFletchingMaterial().getName() + " logs").trim();
secondaryItemToFletch = model.getFletchingMaterial().getLogItemName();
hasRequirementsToFletch = Rs2Inventory.hasItem(primaryItemToFletch)
&& Rs2Inventory.hasItemAmount(secondaryItemToFletch, model.getFletchingItem().getAmountRequired());
hasRequirementsToBank = !Rs2Inventory.hasItem(primaryItemToFletch)
Expand All @@ -84,7 +84,7 @@ public void run(FletchingConfig config) {
} else {
secondaryItemToFletch = fletchingMode == FletchingMode.STRUNG
? config.fletchingMaterial().getName() + " " + config.fletchingItem().getContainsInventoryName() + " (u)"
: (config.fletchingMaterial().getName() + " logs").trim();
: config.fletchingMaterial().getLogItemName();
hasRequirementsToFletch = Rs2Inventory.hasItem(primaryItemToFletch)
&& Rs2Inventory.hasItemAmount(secondaryItemToFletch, config.fletchingItem().getAmountRequired());
hasRequirementsToBank = !Rs2Inventory.hasItem(primaryItemToFletch)
Expand Down Expand Up @@ -115,7 +115,7 @@ private void bankItems(FletchingConfig config) {
case PROGRESSIVE:
Rs2Bank.depositAll(model.getFletchingItem().getContainsInventoryName());
calculateItemToFletch();
secondaryItemToFletch = (model.getFletchingMaterial().getName() + " logs").trim();
secondaryItemToFletch = model.getFletchingMaterial().getLogItemName();
break;
case PROGRESSIVE_STRUNG:
Rs2Bank.depositAll();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ public enum FletchingMaterial

private final String name;

public String getLogItemName() {
return this == LOG ? "Logs" : name + " logs";
}

@Override
public String toString()
Expand Down
Loading