From bdf50d8c68e5d40197f53f8c5ce9ff2a682cd2bf Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 19:58:20 +0800 Subject: [PATCH 01/38] Update NecharDisplayFilter.java --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index fbfa0a6..09bb720 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -22,7 +22,7 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); - if (!displayName.isEmpty() && CONTEXT.contains(displayName, this.searchText)) { + if (!displayName.isEmpty() && CONTEXT.contains(displayName.replaceAll(",(?=[0,9])",""), this.searchText.replaceAll(",(?=[0,9])",""))) { return true; } @@ -31,7 +31,7 @@ public boolean matches(ItemStack itemStack) { itemStack.getItem() .getItemStackDisplayName(itemStack)); - if (displayName.isEmpty() && CONTEXT.contains(displayName, this.searchText)) { + if (displayName.isEmpty() && CONTEXT.contains(displayName.replaceAll(",(?=[0,9])",""), this.searchText.replaceAll(",(?=[0,9])",""))) { return true; } } From 65187dce80dbc30931d58c171800190c9a67f759 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:01:25 +0800 Subject: [PATCH 02/38] Update NecharTooltipFilter.java --- src/main/java/net/moecraft/nechar/NecharTooltipFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index 2cb8150..df23d4e 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -19,7 +19,7 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { @Override public boolean matches(ItemStack itemStack) { - return CONTEXT.contains(getSearchTooltip(itemStack), this.searchText) || super.matches(itemStack); + return CONTEXT.contains(getSearchTooltip(itemStack).replaceAll(",(?=[0,9])",""), this.searchText.replaceAll(",(?=[0,9])","")) || super.matches(itemStack); } } From b0028b6178189f58c0273422512e040e7d91a7ad Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:10:11 +0800 Subject: [PATCH 03/38] Update NecharDisplayFilter.java --- .../java/net/moecraft/nechar/NecharDisplayFilter.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 09bb720..a243ecd 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -17,12 +17,14 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { super(pattern); this.searchText = searchText; } - + private String deleteComma(String str){ + return str.replaceAll(",(?=[0,9])",""); + } @Override public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); - if (!displayName.isEmpty() && CONTEXT.contains(displayName.replaceAll(",(?=[0,9])",""), this.searchText.replaceAll(",(?=[0,9])",""))) { + if (!displayName.isEmpty() && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { return true; } @@ -31,7 +33,7 @@ public boolean matches(ItemStack itemStack) { itemStack.getItem() .getItemStackDisplayName(itemStack)); - if (displayName.isEmpty() && CONTEXT.contains(displayName.replaceAll(",(?=[0,9])",""), this.searchText.replaceAll(",(?=[0,9])",""))) { + if (displayName.isEmpty() && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { return true; } } From c846f9c101041d63df71d3c88e760219ff2df82c Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:11:18 +0800 Subject: [PATCH 04/38] Update NecharTooltipFilter.java --- src/main/java/net/moecraft/nechar/NecharTooltipFilter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index df23d4e..9451e76 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -16,10 +16,12 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { super(pattern); this.searchText = searchText; } - + private String deleteComma(String str){ + return str.replaceAll(",(?=[0,9])",""); + } @Override public boolean matches(ItemStack itemStack) { - return CONTEXT.contains(getSearchTooltip(itemStack).replaceAll(",(?=[0,9])",""), this.searchText.replaceAll(",(?=[0,9])","")) || super.matches(itemStack); + return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText) || super.matches(itemStack); } } From 2f92d35d7661e94a61425d5930f9888ec2a7312a Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:15:53 +0800 Subject: [PATCH 05/38] Update NecharTooltipFilter.java --- src/main/java/net/moecraft/nechar/NecharTooltipFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index 9451e76..d798e95 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -21,7 +21,7 @@ private String deleteComma(String str){ } @Override public boolean matches(ItemStack itemStack) { - return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText) || super.matches(itemStack); + return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) || super.matches(itemStack); } } From 1a98d8581bfd67fb8a9c7abf82c03b2fe3d986f5 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:18:57 +0800 Subject: [PATCH 06/38] Update NecharDisplayFilter.java --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index a243ecd..df8de3f 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -17,9 +17,11 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { super(pattern); this.searchText = searchText; } + private String deleteComma(String str){ return str.replaceAll(",(?=[0,9])",""); } + @Override public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); From 9ed8c8f1087c1a3f0c1f9680fbedecebb605ec1a Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:19:32 +0800 Subject: [PATCH 07/38] Update NecharTooltipFilter.java --- src/main/java/net/moecraft/nechar/NecharTooltipFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index d798e95..240ca58 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -21,7 +21,8 @@ private String deleteComma(String str){ } @Override public boolean matches(ItemStack itemStack) { - return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) || super.matches(itemStack); + return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) + || super.matches(itemStack); } } From 227809ec0cd97033cfa2384f8b3d879866b63bd7 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:23:45 +0800 Subject: [PATCH 08/38] Update NecharDisplayFilter.java --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index df8de3f..046cc7e 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -18,8 +18,8 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { this.searchText = searchText; } - private String deleteComma(String str){ - return str.replaceAll(",(?=[0,9])",""); + private String deleteComma(String str) { + return str.replaceAll(",(?=[0,9])", ""); } @Override From f69ed900bd0e11b7d4da741d3d0686dd9cfb3e1d Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:23:55 +0800 Subject: [PATCH 09/38] Update NecharTooltipFilter.java --- src/main/java/net/moecraft/nechar/NecharTooltipFilter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index 240ca58..2cf8dc1 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -16,9 +16,11 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { super(pattern); this.searchText = searchText; } - private String deleteComma(String str){ - return str.replaceAll(",(?=[0,9])",""); + + private String deleteComma(String str) { + return str.replaceAll(",(?=[0,9])", ""); } + @Override public boolean matches(ItemStack itemStack) { return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) From 6b06b5beb2d389188b0794b10198cffece5126bb Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:30:13 +0800 Subject: [PATCH 10/38] Update NecharDisplayFilter.java --- .../java/net/moecraft/nechar/NecharDisplayFilter.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 046cc7e..e5a8b83 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -17,16 +17,17 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { super(pattern); this.searchText = searchText; } - + private String deleteComma(String str) { return str.replaceAll(",(?=[0,9])", ""); } - + @Override public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); - if (!displayName.isEmpty() && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { + if (!displayName.isEmpty() + && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { return true; } @@ -35,7 +36,8 @@ public boolean matches(ItemStack itemStack) { itemStack.getItem() .getItemStackDisplayName(itemStack)); - if (displayName.isEmpty() && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { + if (!displayName.isEmpty() + && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { return true; } } From 078579fa59aa6e61e00e62683257bdd97f521507 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:32:21 +0800 Subject: [PATCH 11/38] Update NecharTooltipFilter.java --- src/main/java/net/moecraft/nechar/NecharTooltipFilter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index 2cf8dc1..8848d49 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -16,14 +16,15 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { super(pattern); this.searchText = searchText; } - + private String deleteComma(String str) { return str.replaceAll(",(?=[0,9])", ""); } - + @Override public boolean matches(ItemStack itemStack) { - return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) + return CONTEXT.contains( + deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) || super.matches(itemStack); } From edf8965f47a8a5d703da99a1c97b6e23e7ef35bf Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:36:08 +0800 Subject: [PATCH 12/38] Update NecharTooltipFilter.java --- src/main/java/net/moecraft/nechar/NecharTooltipFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index 8848d49..0e7e06c 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -23,8 +23,7 @@ private String deleteComma(String str) { @Override public boolean matches(ItemStack itemStack) { - return CONTEXT.contains( - deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) + return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) || super.matches(itemStack); } From 66316d694590c663421dcc905ab531a5c9008833 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:37:03 +0800 Subject: [PATCH 13/38] Update NecharDisplayFilter.java --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index e5a8b83..1fc964b 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -36,8 +36,7 @@ public boolean matches(ItemStack itemStack) { itemStack.getItem() .getItemStackDisplayName(itemStack)); - if (!displayName.isEmpty() - && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { + if (!displayName.isEmpty() && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { return true; } } From 3b4e427648615c6783670d1e03fb002abec7909f Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:37:58 +0800 Subject: [PATCH 14/38] Update NecharDisplayFilter.java --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 1fc964b..b74a56f 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -26,8 +26,7 @@ private String deleteComma(String str) { public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); - if (!displayName.isEmpty() - && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { + if (!displayName.isEmpty() && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { return true; } From ce4bf7f5a27ae0ddd3ded92f11deb940a5826262 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 20:57:55 +0800 Subject: [PATCH 15/38] Update NecharDisplayFilter.java Test --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index b74a56f..98f227f 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -19,7 +19,7 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { } private String deleteComma(String str) { - return str.replaceAll(",(?=[0,9])", ""); + return str.replaceAll(",", ""); } @Override From 11ef9ce3e53595d88e24a712c03cc645fa58acf2 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 21:32:23 +0800 Subject: [PATCH 16/38] Update NecharTooltipFilter.java --- .../java/net/moecraft/nechar/NecharTooltipFilter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index 0e7e06c..b1496ac 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -18,12 +18,16 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { } private String deleteComma(String str) { - return str.replaceAll(",(?=[0,9])", ""); + return str.replaceAll("(?<=[0-9]),(?=[0-9])", ""); } @Override public boolean matches(ItemStack itemStack) { - return CONTEXT.contains(deleteComma(getSearchTooltip(itemStack)), deleteComma(this.searchText)) + String tooltip = getSearchTooltip(itemStack); + if (this.searchText.contains(",")) { + return CONTEXT.contains(tooltip, this.searchText) || super.matches(itemStack); + } + return CONTEXT.contains(deleteComma(tooltip), deleteComma(this.searchText)) || super.matches(itemStack); } From 0b360fd49bdc542e453969b8dac4a7217258ee2d Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 22:37:28 +0800 Subject: [PATCH 17/38] many changes --- .../moecraft/nechar/NecharDisplayFilter.java | 17 ++---- .../moecraft/nechar/NecharTooltipFilter.java | 15 +---- .../moecraft/nechar/NotEnoughCharacters.java | 55 ++++++++++++++----- .../java/net/sst03/nechar/NecharUtils.java | 29 ++++++++++ 4 files changed, 77 insertions(+), 39 deletions(-) create mode 100644 src/main/java/net/sst03/nechar/NecharUtils.java diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 98f227f..f1c4c1f 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -1,12 +1,9 @@ package net.moecraft.nechar; -import static net.moecraft.nechar.NotEnoughCharacters.CONTEXT; - +import static net.sst03.nechar.NecharUtils.contain; import java.util.regex.Pattern; - import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; - import codechicken.nei.ItemList.PatternItemFilter; public class NecharDisplayFilter extends PatternItemFilter { @@ -18,15 +15,11 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { this.searchText = searchText; } - private String deleteComma(String str) { - return str.replaceAll(",", ""); - } - @Override public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); - if (!displayName.isEmpty() && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { + if (!displayName.isEmpty() && contain(displayName, this.searchText)) { return true; } @@ -35,12 +28,12 @@ public boolean matches(ItemStack itemStack) { itemStack.getItem() .getItemStackDisplayName(itemStack)); - if (!displayName.isEmpty() && CONTEXT.contains(deleteComma(displayName), deleteComma(this.searchText))) { + if (!displayName.isEmpty() && contain(displayName, this.searchText)) { return true; } } return super.matches(itemStack); } - -} + +} \ No newline at end of file diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index b1496ac..a2bca5d 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -1,11 +1,8 @@ package net.moecraft.nechar; -import static net.moecraft.nechar.NotEnoughCharacters.CONTEXT; - +import static net.sst03.nechar.NecharUtils.contain; import java.util.regex.Pattern; - import net.minecraft.item.ItemStack; - import codechicken.nei.search.TooltipFilter; public class NecharTooltipFilter extends TooltipFilter { @@ -17,17 +14,9 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { this.searchText = searchText; } - private String deleteComma(String str) { - return str.replaceAll("(?<=[0-9]),(?=[0-9])", ""); - } - @Override public boolean matches(ItemStack itemStack) { - String tooltip = getSearchTooltip(itemStack); - if (this.searchText.contains(",")) { - return CONTEXT.contains(tooltip, this.searchText) || super.matches(itemStack); - } - return CONTEXT.contains(deleteComma(tooltip), deleteComma(this.searchText)) + return contain(getSearchTooltip(itemStack), this.searchText) || super.matches(itemStack); } diff --git a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java index 2a1381d..b94b6e5 100644 --- a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java +++ b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java @@ -34,20 +34,47 @@ private static class CustomDictLoader extends DictLoader.Default { @Override public void load(BiConsumer feed) { super.load(feed); - feed.accept('\ue900', new String[] { "lu2", "jinlu" }); // 钅卢 - feed.accept('\ue901', new String[] { "du4", "jindu" }); // 钅杜 - feed.accept('\ue902', new String[] { "xi3", "jinxi" }); // 钅喜 - feed.accept('\ue903', new String[] { "bo1", "jinbo" }); // 钅波 - feed.accept('\ue904', new String[] { "hei1", "jinhei" }); // 钅黑 - feed.accept('\u9fcf', new String[] { "mai4", "jinmai" });// 钅麦 - feed.accept('\ue906', new String[] { "da2", "jinda" });// 钅达 - feed.accept('\ue907', new String[] { "lun2", "jinlun" });// 钅仑 - feed.accept('\u9fd4', new String[] { "ge1", "jinge" });// 钅哥 - feed.accept('\u9fed', new String[] { "ni3", "jiner" });// 钅尔 - feed.accept('\ue90a', new String[] { "fu1", "jinfu" });// 钅夫 - feed.accept('\ue90c', new String[] { "li4", "jinli" });// 钅立 - feed.accept('\u9fec', new String[] { "tian2", "shitian" });// 石田 - feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" });// 气奥 + feed.accept('\ue900', new String[] { "lu2", "jinlu" }); + feed.accept('\udf3b', new String[] { "lu2", "jinlu" }); // 钅卢 + + feed.accept('\ue901', new String[] { "du4", "jindu" }); + feed.accept('\udf4a', new String[] { "du4", "jindu" }); // 钅杜 + + feed.accept('\ue902', new String[] { "xi3", "jinxi" }); + feed.accept('\udf73', new String[] { "xi3", "jinxi" }); // 钅喜 + + feed.accept('\ue903', new String[] { "bo1", "jinbo" }); + feed.accept('\udf5b', new String[] { "bo1", "jinbo" }); // 钅波 + + feed.accept('\ue904', new String[] { "hei1", "jinhei" }); + feed.accept('\udf76', new String[] { "hei1", "jinhei" }); // 钅黑 + + feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); + //feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); // 钅麦 + + feed.accept('\ue906', new String[] { "da2", "jinda" }); + feed.accept('\udffc', new String[] { "da2", "jinda" }); // 钅达 + + feed.accept('\ue907', new String[] { "lun2", "jinlun" }); + feed.accept('\udf2d', new String[] { "lun2", "jinlun" }); // 钅仑 + + feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); + //feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); // 钅哥 + + feed.accept('\u9fed', new String[] { "ni3", "jiner" }); + //feed.accept('\u9fed', new String[] { "ni3", "jiner" }); // 钅尔 + + feed.accept('\ue90a', new String[] { "fu1", "jinfu" }); + feed.accept('\udce7', new String[] { "fu1", "jinfu" }); // 钅夫 + + feed.accept('\ue90c', new String[] { "li4", "jinli" }); + feed.accept('\udff7', new String[] { "li4", "jinli" }); // 钅立 + + feed.accept('\u9fec', new String[] { "tian2", "shitian" }); + //feed.accept('\u9fec', new String[] { "tian2", "shitian" }); // 石田 + + feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); + //feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); // 气奥 } } diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java new file mode 100644 index 0000000..069f29c --- /dev/null +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -0,0 +1,29 @@ +package net.sst03.nechar; + +import static net.moecraft.nechar.NotEnoughCharacters.CONTEXT; + +public class NecharUtils { + + private String deleteComma(String str) { + return str.replaceAll("(?<=[0-9]),(?=[0-9])", ""); + } + + private String deleteUnlegalChars(String str) { + return str.replaceAll("\ud872","").replaceAll("\ud86d",""); + } + + public static contain(String searchText,String sourseText) { + + if (!(searchText.contains("\ud872") || !searchText.contains("\ud86d"))) { + searchText = deleteUnlegalChars(searchText); + sourseText = deleteUnlegalChars(sourseText); + } + + if (!searchText.contains(",")) { + searchText = deleteComma(searchText); + sourseText = deleteComma(sourseText); + } + + return CONTEXT.contains(sourseText, searchText); + } +} \ No newline at end of file From 817a090e8aeee72fd6f19c3c15cfcd67a6bf120e Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 22:41:36 +0800 Subject: [PATCH 18/38] 1 --- src/main/java/net/sst03/nechar/NecharUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 069f29c..983df1c 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -12,7 +12,7 @@ private String deleteUnlegalChars(String str) { return str.replaceAll("\ud872","").replaceAll("\ud86d",""); } - public static contain(String searchText,String sourseText) { + public static String contain(String searchText,String sourseText) { if (!(searchText.contains("\ud872") || !searchText.contains("\ud86d"))) { searchText = deleteUnlegalChars(searchText); From eb0dddb7c19038e6cdf23f6061f3b402dd59852d Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 22:45:35 +0800 Subject: [PATCH 19/38] 2 --- src/main/java/net/sst03/nechar/NecharUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 983df1c..dd25575 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -4,17 +4,17 @@ public class NecharUtils { - private String deleteComma(String str) { + private static String deleteComma(String str) { return str.replaceAll("(?<=[0-9]),(?=[0-9])", ""); } - private String deleteUnlegalChars(String str) { + private static String deleteUnlegalChars(String str) { return str.replaceAll("\ud872","").replaceAll("\ud86d",""); } public static String contain(String searchText,String sourseText) { - if (!(searchText.contains("\ud872") || !searchText.contains("\ud86d"))) { + if (!(searchText.contains("\ud872") || searchText.contains("\ud86d"))) { searchText = deleteUnlegalChars(searchText); sourseText = deleteUnlegalChars(sourseText); } From a47b9b303e21a388b7dce4b7d6a66612696a9b79 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 22:48:43 +0800 Subject: [PATCH 20/38] 3 --- src/main/java/net/sst03/nechar/NecharUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index dd25575..5000228 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -12,7 +12,7 @@ private static String deleteUnlegalChars(String str) { return str.replaceAll("\ud872","").replaceAll("\ud86d",""); } - public static String contain(String searchText,String sourseText) { + public static boolean contain(String searchText,String sourseText) { if (!(searchText.contains("\ud872") || searchText.contains("\ud86d"))) { searchText = deleteUnlegalChars(searchText); From 42f8a71409e81666e9287b12a7dc24bab71b7470 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 22:57:09 +0800 Subject: [PATCH 21/38] 4 --- .../moecraft/nechar/NecharDisplayFilter.java | 5 +- .../moecraft/nechar/NecharTooltipFilter.java | 6 +- .../moecraft/nechar/NotEnoughCharacters.java | 55 ++++++++++--------- .../java/net/sst03/nechar/NecharUtils.java | 6 +- 4 files changed, 39 insertions(+), 33 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index f1c4c1f..1fd71a0 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -1,9 +1,12 @@ package net.moecraft.nechar; import static net.sst03.nechar.NecharUtils.contain; + import java.util.regex.Pattern; + import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; + import codechicken.nei.ItemList.PatternItemFilter; public class NecharDisplayFilter extends PatternItemFilter { @@ -35,5 +38,5 @@ public boolean matches(ItemStack itemStack) { return super.matches(itemStack); } - + } \ No newline at end of file diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index a2bca5d..32895b1 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -1,8 +1,11 @@ package net.moecraft.nechar; import static net.sst03.nechar.NecharUtils.contain; + import java.util.regex.Pattern; + import net.minecraft.item.ItemStack; + import codechicken.nei.search.TooltipFilter; public class NecharTooltipFilter extends TooltipFilter { @@ -16,8 +19,7 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { @Override public boolean matches(ItemStack itemStack) { - return contain(getSearchTooltip(itemStack), this.searchText) - || super.matches(itemStack); + return contain(getSearchTooltip(itemStack), this.searchText) || super.matches(itemStack); } } diff --git a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java index b94b6e5..c64be31 100644 --- a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java +++ b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java @@ -34,47 +34,48 @@ private static class CustomDictLoader extends DictLoader.Default { @Override public void load(BiConsumer feed) { super.load(feed); + // 钅卢 feed.accept('\ue900', new String[] { "lu2", "jinlu" }); - feed.accept('\udf3b', new String[] { "lu2", "jinlu" }); // 钅卢 - + feed.accept('\udf3b', new String[] { "lu2", "jinlu" }); + // 钅杜 feed.accept('\ue901', new String[] { "du4", "jindu" }); - feed.accept('\udf4a', new String[] { "du4", "jindu" }); // 钅杜 - + feed.accept('\udf4a', new String[] { "du4", "jindu" }); + // 钅喜 feed.accept('\ue902', new String[] { "xi3", "jinxi" }); - feed.accept('\udf73', new String[] { "xi3", "jinxi" }); // 钅喜 - + feed.accept('\udf73', new String[] { "xi3", "jinxi" }); + // 钅波 feed.accept('\ue903', new String[] { "bo1", "jinbo" }); - feed.accept('\udf5b', new String[] { "bo1", "jinbo" }); // 钅波 - + feed.accept('\udf5b', new String[] { "bo1", "jinbo" }); + // 钅黑 feed.accept('\ue904', new String[] { "hei1", "jinhei" }); - feed.accept('\udf76', new String[] { "hei1", "jinhei" }); // 钅黑 - + feed.accept('\udf76', new String[] { "hei1", "jinhei" }); + // 钅麦 feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); - //feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); // 钅麦 - + //feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); + // 钅达 feed.accept('\ue906', new String[] { "da2", "jinda" }); - feed.accept('\udffc', new String[] { "da2", "jinda" }); // 钅达 - + feed.accept('\udffc', new String[] { "da2", "jinda" }); + // 钅仑 feed.accept('\ue907', new String[] { "lun2", "jinlun" }); - feed.accept('\udf2d', new String[] { "lun2", "jinlun" }); // 钅仑 - + feed.accept('\udf2d', new String[] { "lun2", "jinlun" }); + // // 钅哥 feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); - //feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); // 钅哥 - + //feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); + // 钅尔 feed.accept('\u9fed', new String[] { "ni3", "jiner" }); - //feed.accept('\u9fed', new String[] { "ni3", "jiner" }); // 钅尔 - + //feed.accept('\u9fed', new String[] { "ni3", "jiner" }); + // 钅夫 feed.accept('\ue90a', new String[] { "fu1", "jinfu" }); - feed.accept('\udce7', new String[] { "fu1", "jinfu" }); // 钅夫 - + feed.accept('\udce7', new String[] { "fu1", "jinfu" }); + // 钅立 feed.accept('\ue90c', new String[] { "li4", "jinli" }); - feed.accept('\udff7', new String[] { "li4", "jinli" }); // 钅立 - + feed.accept('\udff7', new String[] { "li4", "jinli" }); + // 石田 feed.accept('\u9fec', new String[] { "tian2", "shitian" }); - //feed.accept('\u9fec', new String[] { "tian2", "shitian" }); // 石田 - + //feed.accept('\u9fec', new String[] { "tian2", "shitian" }); + // 气奥 feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); - //feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); // 气奥 + //feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); } } diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 5000228..6ce301b 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -8,15 +8,15 @@ private static String deleteComma(String str) { return str.replaceAll("(?<=[0-9]),(?=[0-9])", ""); } - private static String deleteUnlegalChars(String str) { + private static String deleteExtraChars(String str) { return str.replaceAll("\ud872","").replaceAll("\ud86d",""); } public static boolean contain(String searchText,String sourseText) { if (!(searchText.contains("\ud872") || searchText.contains("\ud86d"))) { - searchText = deleteUnlegalChars(searchText); - sourseText = deleteUnlegalChars(sourseText); + searchText = deleteExtraChars(searchText); + sourseText = deleteExtraChars(sourseText); } if (!searchText.contains(",")) { From 12b82402295fd402cf6d319b2231c567abdc177d Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 23:01:52 +0800 Subject: [PATCH 22/38] 5 --- .../net/moecraft/nechar/NotEnoughCharacters.java | 12 ++++++------ src/main/java/net/sst03/nechar/NecharUtils.java | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java index c64be31..2fb2caf 100644 --- a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java +++ b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java @@ -51,19 +51,19 @@ public void load(BiConsumer feed) { feed.accept('\udf76', new String[] { "hei1", "jinhei" }); // 钅麦 feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); - //feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); + // feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); // 钅达 feed.accept('\ue906', new String[] { "da2", "jinda" }); feed.accept('\udffc', new String[] { "da2", "jinda" }); // 钅仑 feed.accept('\ue907', new String[] { "lun2", "jinlun" }); feed.accept('\udf2d', new String[] { "lun2", "jinlun" }); - // // 钅哥 + // 钅哥 feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); - //feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); + // feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); // 钅尔 feed.accept('\u9fed', new String[] { "ni3", "jiner" }); - //feed.accept('\u9fed', new String[] { "ni3", "jiner" }); + // feed.accept('\u9fed', new String[] { "ni3", "jiner" }); // 钅夫 feed.accept('\ue90a', new String[] { "fu1", "jinfu" }); feed.accept('\udce7', new String[] { "fu1", "jinfu" }); @@ -72,10 +72,10 @@ public void load(BiConsumer feed) { feed.accept('\udff7', new String[] { "li4", "jinli" }); // 石田 feed.accept('\u9fec', new String[] { "tian2", "shitian" }); - //feed.accept('\u9fec', new String[] { "tian2", "shitian" }); + // feed.accept('\u9fec', new String[] { "tian2", "shitian" }); // 气奥 feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); - //feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); + // feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); } } diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 6ce301b..4ec12af 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -9,7 +9,8 @@ private static String deleteComma(String str) { } private static String deleteExtraChars(String str) { - return str.replaceAll("\ud872","").replaceAll("\ud86d",""); + return str.replaceAll("\ud872","") + .replaceAll("\ud86d",""); } public static boolean contain(String searchText,String sourseText) { From efd59d140f33df1263c409ccfdc819b4287e2345 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 23:07:00 +0800 Subject: [PATCH 23/38] 7 --- src/main/java/net/sst03/nechar/NecharUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 4ec12af..b18e545 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -9,11 +9,11 @@ private static String deleteComma(String str) { } private static String deleteExtraChars(String str) { - return str.replaceAll("\ud872","") - .replaceAll("\ud86d",""); + return str.replaceAll("\ud872", "") + .replaceAll("\ud86d", ""); } - public static boolean contain(String searchText,String sourseText) { + public static boolean contain(String searchText, String sourseText) { if (!(searchText.contains("\ud872") || searchText.contains("\ud86d"))) { searchText = deleteExtraChars(searchText); From 005bf56716079ce13c3225266b66825d20191012 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 23:07:54 +0800 Subject: [PATCH 24/38] 7 --- src/main/java/net/sst03/nechar/NecharUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index b18e545..21b6be9 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -27,4 +27,5 @@ public static boolean contain(String searchText, String sourseText) { return CONTEXT.contains(sourseText, searchText); } -} \ No newline at end of file + +} From 258cd95889cf029ef6837f786835beaed450e226 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 23:10:51 +0800 Subject: [PATCH 25/38] 8 --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 1fd71a0..29331ac 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -38,5 +38,4 @@ public boolean matches(ItemStack itemStack) { return super.matches(itemStack); } - -} \ No newline at end of file +} From 96d520a2e9c4a9de9d2f23783fc13eb8b08eb191 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 23:21:02 +0800 Subject: [PATCH 26/38] fix a stupid bug --- src/main/java/net/sst03/nechar/NecharUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 21b6be9..9f935d8 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -13,7 +13,7 @@ private static String deleteExtraChars(String str) { .replaceAll("\ud86d", ""); } - public static boolean contain(String searchText, String sourseText) { + public static boolean contain(String sourseText, String searchText) { if (!(searchText.contains("\ud872") || searchText.contains("\ud86d"))) { searchText = deleteExtraChars(searchText); From bda4803963eddaf32e1f8f8a36d5bb934e0564e2 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Tue, 25 Feb 2025 23:24:01 +0800 Subject: [PATCH 27/38] 10 --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 29331ac..1fd71a0 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -38,4 +38,5 @@ public boolean matches(ItemStack itemStack) { return super.matches(itemStack); } -} + +} \ No newline at end of file From f3ee73c94af19de199513473dc7e7dee90767662 Mon Sep 17 00:00:00 2001 From: SST-03 <70825063+SST-03@users.noreply.github.com> Date: Tue, 25 Feb 2025 23:28:52 +0800 Subject: [PATCH 28/38] 11 --- src/main/java/net/moecraft/nechar/NecharDisplayFilter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 1fd71a0..29331ac 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -38,5 +38,4 @@ public boolean matches(ItemStack itemStack) { return super.matches(itemStack); } - -} \ No newline at end of file +} From 637433a261639905d8beddcc1eb8aaf8e0e80c37 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 15:35:14 +0800 Subject: [PATCH 29/38] add configs && a special search rule --- .../moecraft/nechar/NotEnoughCharacters.java | 14 -- .../java/net/sst03/nechar/NecharUtils.java | 196 +++++++++++++++++- .../java/net/vfyjxf/nechar/NechConfig.java | 6 + 3 files changed, 193 insertions(+), 23 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java index 2fb2caf..544101f 100644 --- a/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java +++ b/src/main/java/net/moecraft/nechar/NotEnoughCharacters.java @@ -36,46 +36,32 @@ public void load(BiConsumer feed) { super.load(feed); // 钅卢 feed.accept('\ue900', new String[] { "lu2", "jinlu" }); - feed.accept('\udf3b', new String[] { "lu2", "jinlu" }); // 钅杜 feed.accept('\ue901', new String[] { "du4", "jindu" }); - feed.accept('\udf4a', new String[] { "du4", "jindu" }); // 钅喜 feed.accept('\ue902', new String[] { "xi3", "jinxi" }); - feed.accept('\udf73', new String[] { "xi3", "jinxi" }); // 钅波 feed.accept('\ue903', new String[] { "bo1", "jinbo" }); - feed.accept('\udf5b', new String[] { "bo1", "jinbo" }); // 钅黑 feed.accept('\ue904', new String[] { "hei1", "jinhei" }); - feed.accept('\udf76', new String[] { "hei1", "jinhei" }); // 钅麦 feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); - // feed.accept('\u9fcf', new String[] { "mai4", "jinmai" }); // 钅达 feed.accept('\ue906', new String[] { "da2", "jinda" }); - feed.accept('\udffc', new String[] { "da2", "jinda" }); // 钅仑 feed.accept('\ue907', new String[] { "lun2", "jinlun" }); - feed.accept('\udf2d', new String[] { "lun2", "jinlun" }); // 钅哥 feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); - // feed.accept('\u9fd4', new String[] { "ge1", "jinge" }); // 钅尔 feed.accept('\u9fed', new String[] { "ni3", "jiner" }); - // feed.accept('\u9fed', new String[] { "ni3", "jiner" }); // 钅夫 feed.accept('\ue90a', new String[] { "fu1", "jinfu" }); - feed.accept('\udce7', new String[] { "fu1", "jinfu" }); // 钅立 feed.accept('\ue90c', new String[] { "li4", "jinli" }); - feed.accept('\udff7', new String[] { "li4", "jinli" }); // 石田 feed.accept('\u9fec', new String[] { "tian2", "shitian" }); - // feed.accept('\u9fec', new String[] { "tian2", "shitian" }); // 气奥 feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); - // feed.accept('\u9feb', new String[] { "ao4", "qiao", "aoqi" }); } } diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 9f935d8..04d734c 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -2,30 +2,208 @@ import static net.moecraft.nechar.NotEnoughCharacters.CONTEXT; +import static net.vfyjxf.nechar.NechConfig.EnableIgnoreComma; +import static net.vfyjxf.nechar.NechConfig.EnableVoltageSpecialSearch; + public class NecharUtils { private static String deleteComma(String str) { return str.replaceAll("(?<=[0-9]),(?=[0-9])", ""); } - private static String deleteExtraChars(String str) { - return str.replaceAll("\ud872", "") - .replaceAll("\ud86d", ""); + private static String replaceExtraChars(String str) { + + if (str.contains("\ud872")) { + str = str.replaceAll("\ud872\udf3b","\ue900") // 钅卢 + .replaceAll("\ud872\udf4a","\ue901") // 钅杜 + .replaceAll("\ud872\udf73","\ue902") // 钅喜 + .replaceAll("\ud872\udf5b","\ue903") // 钅波 + .replaceAll("\ud872\udf76","\ue904") // 钅黑 + .replaceAll("\ud872\udf2d","\ue907"); // 钅仑 + } + + if (str.contains("\ud86d")) { + str = str.replaceAll("\ud86d\udffc","\ue906") // 钅达 + .replaceAll("\ud86d\udce7","\ue90a") // 钅夫 + .replaceAll("\ud86d\udff7","\ue90c"); // 钅仑 + } + + return str; } public static boolean contain(String sourseText, String searchText) { - if (!(searchText.contains("\ud872") || searchText.contains("\ud86d"))) { - searchText = deleteExtraChars(searchText); - sourseText = deleteExtraChars(sourseText); - } + searchText = replaceExtraChars(searchText); + sourseText = replaceExtraChars(sourseText); - if (!searchText.contains(",")) { + if (EnableIgnoreComma && !searchText.contains(",")) { searchText = deleteComma(searchText); sourseText = deleteComma(sourseText); } - return CONTEXT.contains(sourseText, searchText); + if (CONTEXT.contains(sourseText, searchText)) { + return true; + } + + // may be very slow, only try to find 1 voltage level + if (!EnableVoltageSpecialSearch) { + return false; + } + + searchText = searchText.toLowerCase(); + + if (searchText.contains("max")) { + sourseText = sourseText.toLowerCase(); + + if (!sourseText.contains("max")) { //check if "max" can be found + return false; + } + + String[] sList = searchText.split("max"); // check if texts between "max" can be found + + if (sList.length == 2 && !CONTEXT.contains(sourseText, sList[1])) { + return false; + } + + return CONTEXT.contains(sourseText, sList[0]); + + } else if (searchText.contains("zpm")) { + sourseText = sourseText.toLowerCase(); + + if (!sourseText.contains("zpm")) { //check if "zpm" can be found + return false; + } + + String[] sList = searchText.split("zpm"); // check if texts between "zpm" can be found + + if (sList.length == 2 && !CONTEXT.contains(sourseText, sList[1])) { + return false; + } + + return CONTEXT.contains(sourseText, sList[0]); + + } else if (searchText.contains("v")) { + sourseText = sourseText.toLowerCase(); + + if (!sourseText.contains("v")) { + return false; + } + + int i = 1;// voltage name is like "??v", not "v?" + final int l = searchText.length; + + //try to find a voltage name + while (i < l){ + int j = searchText.indexOf('v',i); + + if (j == -1) { // cannot find any voltage name + return false; + } + + i = j + 1; + switch(searchText.charAt(j - 1)) { // ulv/umv/uhv/uiv/uev are basicly same + case 'l' : + + if (!(sourseText.contains("lv") + || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + return false; + } + + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("ulv") + && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + return true; + } + + return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + + case 'm' : + + if (!(sourseText.contains("mv") + || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + return false; + } + + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("umv") + && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + return true; + } + + return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + + case 'h' : + + if (!(sourseText.contains("hv") + || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + return false; + } + + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uhv") + && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + return true; + } + + return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + + case 'e' : + + if (!(sourseText.contains("ev") + || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + return false; + } + + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uev") + && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + return true; + } + + return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + + case 'i' : + + if (!(sourseText.contains("iv") + || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + return false; + } + + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uiv") + && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + return true; + } + + return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + + case 'u' : + + if (!(sourseText.contains("uv") + || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + return false; + } + + if (searchText.charAt(j - 2) == 'l' && sourseText.contains("luv") + && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + return true; + } + + return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + + case 'x' : + + if (!searchText.charAt(j - 2) == 'u') { + break; + } + + return sourseText.contains("uxv") && CONTEXT.contains(sourseText, searchText.substring(j + 1)) + && CONTEXT.contains(sourseText, searchText.substring(0,j - 2)); + + default : + break; + } + } + } + + return false; + } + //return CONTEXT.contains(sourseText, searchText); } diff --git a/src/main/java/net/vfyjxf/nechar/NechConfig.java b/src/main/java/net/vfyjxf/nechar/NechConfig.java index ad6e991..a219b06 100644 --- a/src/main/java/net/vfyjxf/nechar/NechConfig.java +++ b/src/main/java/net/vfyjxf/nechar/NechConfig.java @@ -17,6 +17,8 @@ public class NechConfig { public static boolean EnableFIng2In = false; public static boolean EnableFEng2En = false; public static boolean EnableFU2V = false; + public static boolean EnableIgnoreComma = false; + public static boolean EnableVoltageSpecialSearch = false; public static Spell KeyboardType = Spell.QUANPIN; public static String[] neiAllowedLanguages = new String[0]; public static String[] transformerRegExpAdditionalList = new String[0]; @@ -147,6 +149,10 @@ public static void loadConfig(File configFile) { neiAllowedLanguages = config .get("nei", "allowedLanguages", new String[] { "zh_CN", "zh_TW" }, "List of languages PinIn is used for") .getStringList(); + EnableIgnoreComma = config.get("nei", "EnableIgnoreComma", false, "Set to true to enable ignore comma between numbers") + .getBoolean(); + EnableVoltageSpecialSearch = config.get("nei", "EnableVoltageSpecialSearch", false, "!Slow! Set to true to search Voltage names separately") + .getBoolean();; if (config.hasChanged()) config.save(); } From 1b5dcf44e359dce11477b85eda5b2f3d4ca6a6b8 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 15:41:14 +0800 Subject: [PATCH 30/38] fix grammar --- src/main/java/net/sst03/nechar/NecharUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 04d734c..a3a05eb 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -90,7 +90,7 @@ public static boolean contain(String sourseText, String searchText) { } int i = 1;// voltage name is like "??v", not "v?" - final int l = searchText.length; + final int l = searchText.length(); //try to find a voltage name while (i < l){ @@ -188,7 +188,7 @@ public static boolean contain(String sourseText, String searchText) { case 'x' : - if (!searchText.charAt(j - 2) == 'u') { + if (searchText.charAt(j - 2) != 'u') { break; } From 901abec24697e9bc56b5839b91b82a387a92e308 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 15:46:49 +0800 Subject: [PATCH 31/38] 2 --- .../java/net/sst03/nechar/NecharUtils.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index a3a05eb..4a3db38 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -1,7 +1,6 @@ package net.sst03.nechar; import static net.moecraft.nechar.NotEnoughCharacters.CONTEXT; - import static net.vfyjxf.nechar.NechConfig.EnableIgnoreComma; import static net.vfyjxf.nechar.NechConfig.EnableVoltageSpecialSearch; @@ -13,19 +12,19 @@ private static String deleteComma(String str) { private static String replaceExtraChars(String str) { - if (str.contains("\ud872")) { - str = str.replaceAll("\ud872\udf3b","\ue900") // 钅卢 - .replaceAll("\ud872\udf4a","\ue901") // 钅杜 - .replaceAll("\ud872\udf73","\ue902") // 钅喜 - .replaceAll("\ud872\udf5b","\ue903") // 钅波 - .replaceAll("\ud872\udf76","\ue904") // 钅黑 - .replaceAll("\ud872\udf2d","\ue907"); // 钅仑 + if (str.contains("\ud872")) { + str = str.replaceAll("\ud872\udf3b","\ue900") // 钅卢 + .replaceAll("\ud872\udf4a","\ue901") // 钅杜 + .replaceAll("\ud872\udf73","\ue902") // 钅喜 + .replaceAll("\ud872\udf5b","\ue903") // 钅波 + .replaceAll("\ud872\udf76","\ue904") // 钅黑 + .replaceAll("\ud872\udf2d","\ue907"); // 钅仑 } if (str.contains("\ud86d")) { - str = str.replaceAll("\ud86d\udffc","\ue906") // 钅达 - .replaceAll("\ud86d\udce7","\ue90a") // 钅夫 - .replaceAll("\ud86d\udff7","\ue90c"); // 钅仑 + str = str.replaceAll("\ud86d\udffc","\ue906") // 钅达 + .replaceAll("\ud86d\udce7","\ue90a") // 钅夫 + .replaceAll("\ud86d\udff7","\ue90c"); // 钅仑 } return str; @@ -55,7 +54,7 @@ public static boolean contain(String sourseText, String searchText) { if (searchText.contains("max")) { sourseText = sourseText.toLowerCase(); - if (!sourseText.contains("max")) { //check if "max" can be found + if (!sourseText.contains("max")) { // check if "max" can be found return false; } From 37d0d60993c07b8a3f5ffd54a524a3a42278dfd3 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 15:50:49 +0800 Subject: [PATCH 32/38] 3 --- .../java/net/sst03/nechar/NecharUtils.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 4a3db38..7a90378 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -12,19 +12,19 @@ private static String deleteComma(String str) { private static String replaceExtraChars(String str) { - if (str.contains("\ud872")) { - str = str.replaceAll("\ud872\udf3b","\ue900") // 钅卢 - .replaceAll("\ud872\udf4a","\ue901") // 钅杜 - .replaceAll("\ud872\udf73","\ue902") // 钅喜 - .replaceAll("\ud872\udf5b","\ue903") // 钅波 - .replaceAll("\ud872\udf76","\ue904") // 钅黑 - .replaceAll("\ud872\udf2d","\ue907"); // 钅仑 + if (str.contains("\ud872")) { + str = str.replaceAll("\ud872\udf3b","\ue900") // 钅卢 + .replaceAll("\ud872\udf4a","\ue901") // 钅杜 + .replaceAll("\ud872\udf73","\ue902") // 钅喜 + .replaceAll("\ud872\udf5b","\ue903") // 钅波 + .replaceAll("\ud872\udf76","\ue904") // 钅黑 + .replaceAll("\ud872\udf2d","\ue907"); // 钅仑 } if (str.contains("\ud86d")) { - str = str.replaceAll("\ud86d\udffc","\ue906") // 钅达 - .replaceAll("\ud86d\udce7","\ue90a") // 钅夫 - .replaceAll("\ud86d\udff7","\ue90c"); // 钅仑 + str = str.replaceAll("\ud86d\udffc","\ue906") // 钅达 + .replaceAll("\ud86d\udce7","\ue90a") // 钅夫 + .replaceAll("\ud86d\udff7","\ue90c"); // 钅仑 } return str; @@ -69,7 +69,7 @@ public static boolean contain(String sourseText, String searchText) { } else if (searchText.contains("zpm")) { sourseText = sourseText.toLowerCase(); - if (!sourseText.contains("zpm")) { //check if "zpm" can be found + if (!sourseText.contains("zpm")) { // check if "zpm" can be found return false; } @@ -91,9 +91,9 @@ public static boolean contain(String sourseText, String searchText) { int i = 1;// voltage name is like "??v", not "v?" final int l = searchText.length(); - //try to find a voltage name - while (i < l){ - int j = searchText.indexOf('v',i); + // try to find a voltage name + while (i < l) { + int j = searchText.indexOf('v', i); if (j == -1) { // cannot find any voltage name return false; From 6769d49af50ba8f71c1830fc192dbab7159dcb18 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 16:26:31 +0800 Subject: [PATCH 33/38] 4 --- .../java/net/sst03/nechar/NecharUtils.java | 98 +++++++++---------- .../java/net/vfyjxf/nechar/NechConfig.java | 6 +- 2 files changed, 50 insertions(+), 54 deletions(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index 7a90378..f1a75a3 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -13,18 +13,18 @@ private static String deleteComma(String str) { private static String replaceExtraChars(String str) { if (str.contains("\ud872")) { - str = str.replaceAll("\ud872\udf3b","\ue900") // 钅卢 - .replaceAll("\ud872\udf4a","\ue901") // 钅杜 - .replaceAll("\ud872\udf73","\ue902") // 钅喜 - .replaceAll("\ud872\udf5b","\ue903") // 钅波 - .replaceAll("\ud872\udf76","\ue904") // 钅黑 - .replaceAll("\ud872\udf2d","\ue907"); // 钅仑 + str = str.replaceAll("\ud872\udf3b", "\ue900") // 钅卢 + .replaceAll("\ud872\udf4a", "\ue901") // 钅杜 + .replaceAll("\ud872\udf73", "\ue902") // 钅喜 + .replaceAll("\ud872\udf5b", "\ue903") // 钅波 + .replaceAll("\ud872\udf76", "\ue904") // 钅黑 + .replaceAll("\ud872\udf2d", "\ue907"); // 钅仑 } if (str.contains("\ud86d")) { - str = str.replaceAll("\ud86d\udffc","\ue906") // 钅达 - .replaceAll("\ud86d\udce7","\ue90a") // 钅夫 - .replaceAll("\ud86d\udff7","\ue90c"); // 钅仑 + str = str.replaceAll("\ud86d\udffc", "\ue906") // 钅达 + .replaceAll("\ud86d\udce7", "\ue90a") // 钅夫 + .replaceAll("\ud86d\udff7", "\ue90c"); // 钅仑 } return str; @@ -100,109 +100,103 @@ public static boolean contain(String sourseText, String searchText) { } i = j + 1; - switch(searchText.charAt(j - 1)) { // ulv/umv/uhv/uiv/uev are basicly same - case 'l' : + switch (searchText.charAt(j - 1)) { // ulv/umv/uhv/uiv/uev are basicly same + case 'l': - if (!(sourseText.contains("lv") - || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + if (!(sourseText.contains("lv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { return false; } - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("ulv") - && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("ulv") + && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { return true; } - return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - case 'm' : + case 'm': - if (!(sourseText.contains("mv") - || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + if (!(sourseText.contains("mv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { return false; } - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("umv") - && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("umv") + && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { return true; } - return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - case 'h' : + case 'h': - if (!(sourseText.contains("hv") - || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + if (!(sourseText.contains("hv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { return false; } - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uhv") - && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uhv") + && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { return true; } - return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - case 'e' : + case 'e': - if (!(sourseText.contains("ev") - || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + if (!(sourseText.contains("ev") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { return false; } - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uev") - && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uev") + && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { return true; } - return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - case 'i' : + case 'i': - if (!(sourseText.contains("iv") - || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + if (!(sourseText.contains("iv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { return false; } - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uiv") - && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uiv") + && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { return true; } - return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); + return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - case 'u' : + case 'u': - if (!(sourseText.contains("uv") - || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { + if (!(sourseText.contains("uv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { return false; } - if (searchText.charAt(j - 2) == 'l' && sourseText.contains("luv") - && CONTEXT.contains(sourseText, searchText.substring(0,j - 2))) { + if (searchText.charAt(j - 2) == 'l' && sourseText.contains("luv") + && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { return true; } - return CONTEXT.contains(sourseText, searchText.substring(0,j - 1)); - - case 'x' : + return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); + + case 'x': if (searchText.charAt(j - 2) != 'u') { break; } return sourseText.contains("uxv") && CONTEXT.contains(sourseText, searchText.substring(j + 1)) - && CONTEXT.contains(sourseText, searchText.substring(0,j - 2)); + && CONTEXT.contains(sourseText, searchText.substring(0, j - 2)); - default : + default: break; } } } return false; - + } - //return CONTEXT.contains(sourseText, searchText); + // return CONTEXT.contains(sourseText, searchText); } diff --git a/src/main/java/net/vfyjxf/nechar/NechConfig.java b/src/main/java/net/vfyjxf/nechar/NechConfig.java index a219b06..5ca8710 100644 --- a/src/main/java/net/vfyjxf/nechar/NechConfig.java +++ b/src/main/java/net/vfyjxf/nechar/NechConfig.java @@ -149,9 +149,11 @@ public static void loadConfig(File configFile) { neiAllowedLanguages = config .get("nei", "allowedLanguages", new String[] { "zh_CN", "zh_TW" }, "List of languages PinIn is used for") .getStringList(); - EnableIgnoreComma = config.get("nei", "EnableIgnoreComma", false, "Set to true to enable ignore comma between numbers") + EnableIgnoreComma = config + .get("nei", "EnableIgnoreComma", false, "Set to true to enable ignore comma between numbers") .getBoolean(); - EnableVoltageSpecialSearch = config.get("nei", "EnableVoltageSpecialSearch", false, "!Slow! Set to true to search Voltage names separately") + EnableVoltageSpecialSearch = config + .get("nei", "EnableVoltageSpecialSearch", false, "!Slow! Set to true to search Voltage names separately") .getBoolean();; if (config.hasChanged()) config.save(); From 422cc46988bea7b812c8e019607a979df258b664 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 17:04:09 +0800 Subject: [PATCH 34/38] 5 --- .../moecraft/nechar/NecharDisplayFilter.java | 4 +- .../moecraft/nechar/NecharTooltipFilter.java | 2 +- .../java/net/sst03/nechar/NecharUtils.java | 175 +++--------------- 3 files changed, 33 insertions(+), 148 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 29331ac..9f1f96d 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -22,7 +22,7 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); - if (!displayName.isEmpty() && contain(displayName, this.searchText)) { + if (!displayName.isEmpty() && contain(displayName, this.searchText, true)) { return true; } @@ -31,7 +31,7 @@ public boolean matches(ItemStack itemStack) { itemStack.getItem() .getItemStackDisplayName(itemStack)); - if (!displayName.isEmpty() && contain(displayName, this.searchText)) { + if (!displayName.isEmpty() && contain(displayName, this.searchText, true)) { return true; } } diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index 32895b1..c9697ab 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -19,7 +19,7 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { @Override public boolean matches(ItemStack itemStack) { - return contain(getSearchTooltip(itemStack), this.searchText) || super.matches(itemStack); + return contain(getSearchTooltip(itemStack), this.searchText, false) || super.matches(itemStack); } } diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index f1a75a3..c4a39a7 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -30,14 +30,31 @@ private static String replaceExtraChars(String str) { return str; } - public static boolean contain(String sourseText, String searchText) { + private static boolean containWithVoltage(String voltage, String sourseText, String searchText) { + if (!searchText.contains(voltage)) { + return false; + } + if (!sourseText.contains(voltage)) { + return false; + } // check if [voltage] can be found + String[] sList = searchText.split(voltage, 2); // check if texts between "max" can be found + if (sList.length == 2 && !CONTEXT.contains(sourseText, sList[1])) { + return false; + } + return CONTEXT.contains(sourseText, sList[0]); + } + + private static String[] voltageListWithLetterV = { "ulv", "lv", "mv", "hv", "ev", "iv", "luv", "uv", "uhv", "uev", + "uiv", "umv", "uxv" }; + + public static boolean contain(String sourseText, String searchText, Boolean enableSpecialSearch) { - searchText = replaceExtraChars(searchText); sourseText = replaceExtraChars(sourseText); + searchText = replaceExtraChars(searchText); if (EnableIgnoreComma && !searchText.contains(",")) { - searchText = deleteComma(searchText); sourseText = deleteComma(sourseText); + searchText = deleteComma(searchText); } if (CONTEXT.contains(sourseText, searchText)) { @@ -49,153 +66,21 @@ public static boolean contain(String sourseText, String searchText) { return false; } + sourseText = sourseText.toLowerCase(); searchText = searchText.toLowerCase(); - if (searchText.contains("max")) { - sourseText = sourseText.toLowerCase(); - - if (!sourseText.contains("max")) { // check if "max" can be found - return false; - } - - String[] sList = searchText.split("max"); // check if texts between "max" can be found - - if (sList.length == 2 && !CONTEXT.contains(sourseText, sList[1])) { - return false; - } - - return CONTEXT.contains(sourseText, sList[0]); - - } else if (searchText.contains("zpm")) { - sourseText = sourseText.toLowerCase(); - - if (!sourseText.contains("zpm")) { // check if "zpm" can be found - return false; - } - - String[] sList = searchText.split("zpm"); // check if texts between "zpm" can be found - - if (sList.length == 2 && !CONTEXT.contains(sourseText, sList[1])) { - return false; - } - - return CONTEXT.contains(sourseText, sList[0]); - - } else if (searchText.contains("v")) { - sourseText = sourseText.toLowerCase(); - - if (!sourseText.contains("v")) { - return false; - } - - int i = 1;// voltage name is like "??v", not "v?" - final int l = searchText.length(); - - // try to find a voltage name - while (i < l) { - int j = searchText.indexOf('v', i); - - if (j == -1) { // cannot find any voltage name - return false; - } - - i = j + 1; - switch (searchText.charAt(j - 1)) { // ulv/umv/uhv/uiv/uev are basicly same - case 'l': - - if (!(sourseText.contains("lv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { - return false; - } - - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("ulv") - && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { - return true; - } - - return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - - case 'm': - - if (!(sourseText.contains("mv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { - return false; - } - - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("umv") - && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { - return true; - } - - return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - - case 'h': - - if (!(sourseText.contains("hv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { - return false; - } - - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uhv") - && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { - return true; - } - - return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - - case 'e': - - if (!(sourseText.contains("ev") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { - return false; - } - - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uev") - && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { - return true; - } - - return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - - case 'i': - - if (!(sourseText.contains("iv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { - return false; - } - - if (searchText.charAt(j - 2) == 'u' && sourseText.contains("uiv") - && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { - return true; - } - - return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - - case 'u': - - if (!(sourseText.contains("uv") || CONTEXT.contains(sourseText, searchText.substring(j + 1)))) { - return false; - } - - if (searchText.charAt(j - 2) == 'l' && sourseText.contains("luv") - && CONTEXT.contains(sourseText, searchText.substring(0, j - 2))) { - return true; - } - - return CONTEXT.contains(sourseText, searchText.substring(0, j - 1)); - - case 'x': - - if (searchText.charAt(j - 2) != 'u') { - break; - } - - return sourseText.contains("uxv") && CONTEXT.contains(sourseText, searchText.substring(j + 1)) - && CONTEXT.contains(sourseText, searchText.substring(0, j - 2)); - - default: - break; - } + if (containWithVoltage("zpm", sourseText, searchText) || containWithVoltage("max", sourseText, searchText)) { + return true; + } + if (!(sourseText.contains('v') || searchText.contains('v'))) { + return false; + } + for (String name : voltageListWithLetterV) { + if (containWithVoltage(name, sourseText, searchText)) { + return true; } } - return false; - } // return CONTEXT.contains(sourseText, searchText); From 162198fea3cf624ccae5ca896664b719b0f6edd8 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 17:05:28 +0800 Subject: [PATCH 35/38] 5.1 --- src/main/java/net/sst03/nechar/NecharUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index c4a39a7..d03426d 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -62,7 +62,7 @@ public static boolean contain(String sourseText, String searchText, Boolean enab } // may be very slow, only try to find 1 voltage level - if (!EnableVoltageSpecialSearch) { + if (!(EnableVoltageSpecialSearch || enableSpecialSearch)) { return false; } From e54d528af35e75eb9f585ea074615d273fbf4af5 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 17:07:48 +0800 Subject: [PATCH 36/38] 5.2 --- src/main/java/net/sst03/nechar/NecharUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index d03426d..f8ec0f4 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -72,7 +72,7 @@ public static boolean contain(String sourseText, String searchText, Boolean enab if (containWithVoltage("zpm", sourseText, searchText) || containWithVoltage("max", sourseText, searchText)) { return true; } - if (!(sourseText.contains('v') || searchText.contains('v'))) { + if (!(sourseText.contains("v") || searchText.contains("v"))) { return false; } for (String name : voltageListWithLetterV) { From 9bb6095ed35aed0f55ff4ddc2a651e4f817515d1 Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Wed, 26 Feb 2025 17:30:39 +0800 Subject: [PATCH 37/38] finish? --- .../moecraft/nechar/NecharDisplayFilter.java | 5 +++-- .../moecraft/nechar/NecharTooltipFilter.java | 4 +++- .../java/net/sst03/nechar/NecharUtils.java | 3 +-- .../java/net/vfyjxf/nechar/NechConfig.java | 22 ++++++++++++++----- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index 9f1f96d..ac1f957 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -1,6 +1,7 @@ package net.moecraft.nechar; import static net.sst03.nechar.NecharUtils.contain; +import static net.vfyjxf.nechar.NechConfig.EnableVoltageSpecialSearchName; import java.util.regex.Pattern; @@ -22,7 +23,7 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); - if (!displayName.isEmpty() && contain(displayName, this.searchText, true)) { + if (!displayName.isEmpty() && contain(displayName, this.searchText, EnableVoltageSpecialSearchName)) { return true; } @@ -31,7 +32,7 @@ public boolean matches(ItemStack itemStack) { itemStack.getItem() .getItemStackDisplayName(itemStack)); - if (!displayName.isEmpty() && contain(displayName, this.searchText, true)) { + if (!displayName.isEmpty() && contain(displayName, this.searchText, EnableVoltageSpecialSearchName)) { return true; } } diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index c9697ab..04e417c 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -1,6 +1,7 @@ package net.moecraft.nechar; import static net.sst03.nechar.NecharUtils.contain; +import static net.vfyjxf.nechar.NechConfig.EnableVoltageSpecialSearchTooltips; import java.util.regex.Pattern; @@ -19,7 +20,8 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { @Override public boolean matches(ItemStack itemStack) { - return contain(getSearchTooltip(itemStack), this.searchText, false) || super.matches(itemStack); + return contain(getSearchTooltip(itemStack), this.searchText, EnableVoltageSpecialSearchTooltips) + || super.matches(itemStack); } } diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/sst03/nechar/NecharUtils.java index f8ec0f4..364a2e9 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/sst03/nechar/NecharUtils.java @@ -2,7 +2,6 @@ import static net.moecraft.nechar.NotEnoughCharacters.CONTEXT; import static net.vfyjxf.nechar.NechConfig.EnableIgnoreComma; -import static net.vfyjxf.nechar.NechConfig.EnableVoltageSpecialSearch; public class NecharUtils { @@ -62,7 +61,7 @@ public static boolean contain(String sourseText, String searchText, Boolean enab } // may be very slow, only try to find 1 voltage level - if (!(EnableVoltageSpecialSearch || enableSpecialSearch)) { + if (!enableSpecialSearch) { return false; } diff --git a/src/main/java/net/vfyjxf/nechar/NechConfig.java b/src/main/java/net/vfyjxf/nechar/NechConfig.java index 5ca8710..abae831 100644 --- a/src/main/java/net/vfyjxf/nechar/NechConfig.java +++ b/src/main/java/net/vfyjxf/nechar/NechConfig.java @@ -18,7 +18,8 @@ public class NechConfig { public static boolean EnableFEng2En = false; public static boolean EnableFU2V = false; public static boolean EnableIgnoreComma = false; - public static boolean EnableVoltageSpecialSearch = false; + public static boolean EnableVoltageSpecialSearchName = false; + public static boolean EnableVoltageSpecialSearchTooltips = false; public static Spell KeyboardType = Spell.QUANPIN; public static String[] neiAllowedLanguages = new String[0]; public static String[] transformerRegExpAdditionalList = new String[0]; @@ -150,11 +151,22 @@ public static void loadConfig(File configFile) { .get("nei", "allowedLanguages", new String[] { "zh_CN", "zh_TW" }, "List of languages PinIn is used for") .getStringList(); EnableIgnoreComma = config - .get("nei", "EnableIgnoreComma", false, "Set to true to enable ignore comma between numbers") + .get("search", "EnableIgnoreComma", false, "Set to true to enable ignore comma between numbers") + .getBoolean(); + EnableVoltageSpecialSearchName = config + .get( + "search", + "EnableVoltageSpecialSearchName", + false, + "!Slow! Set to true to search Voltage names separately for item names") + .getBoolean(); + EnableVoltageSpecialSearchTooltips = config + .get( + "search", + "EnableVoltageSpecialSearchTooltips", + false, + "!Slow! Set to true to search Voltage names separately for tooltips") .getBoolean(); - EnableVoltageSpecialSearch = config - .get("nei", "EnableVoltageSpecialSearch", false, "!Slow! Set to true to search Voltage names separately") - .getBoolean();; if (config.hasChanged()) config.save(); } From 585e7f19a14e250913ac9bfba9ad50700e3d12fe Mon Sep 17 00:00:00 2001 From: Sam0324 Date: Sat, 1 Mar 2025 10:12:06 +0800 Subject: [PATCH 38/38] grammar fix --- .../moecraft/nechar/NecharDisplayFilter.java | 8 ++++---- .../moecraft/nechar/NecharTooltipFilter.java | 6 +++--- .../nechar/NecharUtils.java | 6 +++--- .../java/net/vfyjxf/nechar/NechConfig.java | 18 +++++++++--------- 4 files changed, 19 insertions(+), 19 deletions(-) rename src/main/java/net/{sst03 => moecraft}/nechar/NecharUtils.java (94%) diff --git a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java index ac1f957..45bf5b6 100644 --- a/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharDisplayFilter.java @@ -1,7 +1,7 @@ package net.moecraft.nechar; -import static net.sst03.nechar.NecharUtils.contain; -import static net.vfyjxf.nechar.NechConfig.EnableVoltageSpecialSearchName; +import static net.moecraft.nechar.NecharUtils.contain; +import static net.vfyjxf.nechar.NechConfig.enableVoltageSpecialSearchName; import java.util.regex.Pattern; @@ -23,7 +23,7 @@ public NecharDisplayFilter(String searchText, Pattern pattern) { public boolean matches(ItemStack itemStack) { String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(itemStack.getDisplayName()); - if (!displayName.isEmpty() && contain(displayName, this.searchText, EnableVoltageSpecialSearchName)) { + if (!displayName.isEmpty() && contain(displayName, this.searchText, enableVoltageSpecialSearchName)) { return true; } @@ -32,7 +32,7 @@ public boolean matches(ItemStack itemStack) { itemStack.getItem() .getItemStackDisplayName(itemStack)); - if (!displayName.isEmpty() && contain(displayName, this.searchText, EnableVoltageSpecialSearchName)) { + if (!displayName.isEmpty() && contain(displayName, this.searchText, enableVoltageSpecialSearchName)) { return true; } } diff --git a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java index 04e417c..457b60f 100644 --- a/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java +++ b/src/main/java/net/moecraft/nechar/NecharTooltipFilter.java @@ -1,7 +1,7 @@ package net.moecraft.nechar; -import static net.sst03.nechar.NecharUtils.contain; -import static net.vfyjxf.nechar.NechConfig.EnableVoltageSpecialSearchTooltips; +import static net.moecraft.nechar.NecharUtils.contain; +import static net.vfyjxf.nechar.NechConfig.enableVoltageSpecialSearchTooltips; import java.util.regex.Pattern; @@ -20,7 +20,7 @@ public NecharTooltipFilter(String searchText, Pattern pattern) { @Override public boolean matches(ItemStack itemStack) { - return contain(getSearchTooltip(itemStack), this.searchText, EnableVoltageSpecialSearchTooltips) + return contain(getSearchTooltip(itemStack), this.searchText, enableVoltageSpecialSearchTooltips) || super.matches(itemStack); } diff --git a/src/main/java/net/sst03/nechar/NecharUtils.java b/src/main/java/net/moecraft/nechar/NecharUtils.java similarity index 94% rename from src/main/java/net/sst03/nechar/NecharUtils.java rename to src/main/java/net/moecraft/nechar/NecharUtils.java index 364a2e9..faa0207 100644 --- a/src/main/java/net/sst03/nechar/NecharUtils.java +++ b/src/main/java/net/moecraft/nechar/NecharUtils.java @@ -1,7 +1,7 @@ -package net.sst03.nechar; +package net.moecraft.nechar; import static net.moecraft.nechar.NotEnoughCharacters.CONTEXT; -import static net.vfyjxf.nechar.NechConfig.EnableIgnoreComma; +import static net.vfyjxf.nechar.NechConfig.enableIgnoreComma; public class NecharUtils { @@ -51,7 +51,7 @@ public static boolean contain(String sourseText, String searchText, Boolean enab sourseText = replaceExtraChars(sourseText); searchText = replaceExtraChars(searchText); - if (EnableIgnoreComma && !searchText.contains(",")) { + if (enableIgnoreComma && !searchText.contains(",")) { sourseText = deleteComma(sourseText); searchText = deleteComma(searchText); } diff --git a/src/main/java/net/vfyjxf/nechar/NechConfig.java b/src/main/java/net/vfyjxf/nechar/NechConfig.java index abae831..a163a04 100644 --- a/src/main/java/net/vfyjxf/nechar/NechConfig.java +++ b/src/main/java/net/vfyjxf/nechar/NechConfig.java @@ -17,9 +17,9 @@ public class NechConfig { public static boolean EnableFIng2In = false; public static boolean EnableFEng2En = false; public static boolean EnableFU2V = false; - public static boolean EnableIgnoreComma = false; - public static boolean EnableVoltageSpecialSearchName = false; - public static boolean EnableVoltageSpecialSearchTooltips = false; + public static boolean enableIgnoreComma = false; + public static boolean enableVoltageSpecialSearchName = false; + public static boolean enableVoltageSpecialSearchTooltips = false; public static Spell KeyboardType = Spell.QUANPIN; public static String[] neiAllowedLanguages = new String[0]; public static String[] transformerRegExpAdditionalList = new String[0]; @@ -150,20 +150,20 @@ public static void loadConfig(File configFile) { neiAllowedLanguages = config .get("nei", "allowedLanguages", new String[] { "zh_CN", "zh_TW" }, "List of languages PinIn is used for") .getStringList(); - EnableIgnoreComma = config - .get("search", "EnableIgnoreComma", false, "Set to true to enable ignore comma between numbers") + enableIgnoreComma = config + .get("search", "enableIgnoreComma", false, "Set to true to enable ignore comma between numbers") .getBoolean(); - EnableVoltageSpecialSearchName = config + enableVoltageSpecialSearchName = config .get( "search", - "EnableVoltageSpecialSearchName", + "enableVoltageSpecialSearchName", false, "!Slow! Set to true to search Voltage names separately for item names") .getBoolean(); - EnableVoltageSpecialSearchTooltips = config + enableVoltageSpecialSearchTooltips = config .get( "search", - "EnableVoltageSpecialSearchTooltips", + "enableVoltageSpecialSearchTooltips", false, "!Slow! Set to true to search Voltage names separately for tooltips") .getBoolean();