aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2024-05-09 17:25:56 -0400
committerGitHub <noreply@github.com>2024-05-09 17:25:56 -0400
commit5eb9d273d2eb56cebaf0be0f90716b362916400b (patch)
tree47dc9f6f5d847d79ed6198921172493fa112aa20 /src/main/java/de/hysky/skyblocker
parentcf2a5f7618c925d033ca6959a4c841364f2f1718 (diff)
downloadSkyblocker-5eb9d273d2eb56cebaf0be0f90716b362916400b.tar.gz
Skyblocker-5eb9d273d2eb56cebaf0be0f90716b362916400b.tar.bz2
Skyblocker-5eb9d273d2eb56cebaf0be0f90716b362916400b.zip
Fix accessories helper not working with only 1 accessory bag page (#693)
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
index 06601f80..8798a139 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/tooltip/AccessoriesHelper.java
@@ -42,7 +42,7 @@ import java.util.stream.Collectors;
public class AccessoriesHelper {
private static final Logger LOGGER = LogUtils.getLogger();
private static final Path FILE = SkyblockerMod.CONFIG_DIR.resolve("collected_accessories.json");
- private static final Pattern ACCESSORY_BAG_TITLE = Pattern.compile("Accessory Bag \\((?<page>\\d+)/\\d+\\)");
+ private static final Pattern ACCESSORY_BAG_TITLE = Pattern.compile("Accessory Bag(?: \\((?<page>\\d+)\\/\\d+\\))?");
//UUID -> Profile Id & Data
private static final Object2ObjectOpenHashMap<String, Object2ObjectOpenHashMap<String, ProfileAccessoryData>> COLLECTED_ACCESSORIES = new Object2ObjectOpenHashMap<>();
private static final Predicate<String> NON_EMPTY = s -> !s.isEmpty();
@@ -63,8 +63,9 @@ public class AccessoriesHelper {
if (matcher.matches()) {
ScreenEvents.afterTick(screen).register(_screen -> {
GenericContainerScreenHandler handler = genericContainerScreen.getScreenHandler();
+ int page = matcher.group("page") != null ? Integer.parseInt(matcher.group("page")) : 1;
- collectAccessories(handler.slots.subList(0, handler.getRows() * 9), Integer.parseInt(matcher.group("page")));
+ collectAccessories(handler.slots.subList(0, handler.getRows() * 9), page);
});
}
}