From e40b5567b87617c432e65c84f9d1a03d4d9ae81b Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Fri, 4 Feb 2022 16:28:44 +0100 Subject: [PATCH] Require count digit on quantity line if module is enabled Also use the same pattern for validating the line in QuantityUtil and ChestShoSign. --- src/main/java/com/Acrobot/Breeze/Utils/QuantityUtil.java | 2 +- src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/Acrobot/Breeze/Utils/QuantityUtil.java b/src/main/java/com/Acrobot/Breeze/Utils/QuantityUtil.java index 91acf2f..b510d73 100644 --- a/src/main/java/com/Acrobot/Breeze/Utils/QuantityUtil.java +++ b/src/main/java/com/Acrobot/Breeze/Utils/QuantityUtil.java @@ -6,7 +6,7 @@ import java.util.regex.Pattern; * @author bricefrisco */ public class QuantityUtil { - private static final Pattern QUANTITY_LINE_WITH_COUNTER_PATTERN = Pattern.compile("^Q [1-9][0-9]{0,4} : C [0-9]{0,5}$"); + public static final Pattern QUANTITY_LINE_WITH_COUNTER_PATTERN = Pattern.compile("^Q [1-9][0-9]{0,4} : C [0-9]{1,5}$"); public static int parseQuantity(String quantityLine) throws IllegalArgumentException { if (quantityLineContainsCounter(quantityLine)) { diff --git a/src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java b/src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java index e4f0db0..84b3910 100644 --- a/src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java +++ b/src/main/java/com/Acrobot/ChestShop/Signs/ChestShopSign.java @@ -37,7 +37,7 @@ public class ChestShopSign { public static final byte ITEM_LINE = 3; public static final Pattern[][] SHOP_SIGN_PATTERN = { - { Pattern.compile("^[1-9][0-9]{0,5}$"), Pattern.compile("^Q [1-9][0-9]{0,4} : C [0-9]{0,5}$") }, + { Pattern.compile("^[1-9][0-9]{0,5}$"), QuantityUtil.QUANTITY_LINE_WITH_COUNTER_PATTERN }, { Pattern.compile("(?i)^((\\d*([.e]\\d+)?)|free)$"), Pattern.compile("(?i)^([BS] *((\\d*([.e]\\d+)?)|free))( *: *([BS] *((\\d*([.e]\\d+)?)|free)))?$"),