Merge branch 'Anvil-Dev:releases/1.21' into releases/1.21

.github/workflows/crowdin.yml

@@ -4,10 +4,10 @@ on:
   push:
     paths:
       - src/generated/resources/assets/anvilcraft/lang/en_us.json
-      - 'crowdin.yml'
-      - '.github/workflows/**'
+      - crowdin.yml
+      - .github/workflows/**
     branches:
-      - 'dev/1.21'
+      - releases/1.21
   schedule:
     - cron: 0 * * * *
 
@@ -27,7 +27,7 @@ jobs:
         with:
           upload_sources: true
           download_translations: true
-          localization_branch_name: 'dev/1.21'
+          localization_branch_name: releases/1.21
           push_translations: true
           create_pull_request: false
-          download_translations_args: '--all'
+          download_translations_args: --all

.github/workflows/pull_request.yml

@@ -1,7 +1,7 @@
 name: Pull Request Check
 on:
   workflow_dispatch:
-  push:
+  pull_request:
     branches:
       - releases/**
     paths:

src/main/java/dev/dubhe/anvilcraft/client/gui/component/SilencerButton.java

@@ -99,7 +99,7 @@ private static Component highlighted(
         ChatFormatting highlightFormatting
     ) {
         try {
-            String[] parts = original.split(Pattern.quote(hightlighted));
+            String[] parts = original.split(Pattern.quote(hightlighted), -1);
             List<Component> components = new ArrayList<>();
             for (String s : parts) {
                 components.add(Component.literal(s).copy().setStyle(Style.EMPTY.applyFormat(originalFormatting)));

src/main/java/dev/dubhe/anvilcraft/client/gui/component/TeslaTowerButton.java

@@ -93,7 +93,7 @@ private static Component highlighted(
         ChatFormatting originalFormatting
     ) {
         try {
-            String[] parts = original.split(Pattern.quote(hightlighted));
+            String[] parts = original.split(Pattern.quote(hightlighted), -1);
             List<Component> components = new ArrayList<>();
             for (String s : parts) {
                 components.add(Component.literal(s).copy().setStyle(Style.EMPTY.applyFormat(originalFormatting)));

src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java

@@ -77,15 +77,14 @@ private void onSearchTextChange(String text) {
             String search = text.replaceFirst("#", "");
             allFilter.stream()
                     .filter(it -> it.right().contains(search))
-                    .filter(it -> whiteFilters.stream().anyMatch(it2 -> it.left().getId().equals(it2.left().getId()) && it.right().equals(it2.right())))
+                    .filter(it -> whiteFilters.stream().noneMatch(it2 -> it.left().getId().equals(it2.left().getId()) && it.right().equals(it2.right())))
                     .forEach(filteredFilters::add);
         } else {
             if (text.startsWith("~")) {
                 try {
                     Pattern search = Pattern.compile(text.replaceFirst("~", ""));
                     allFilter.stream()
                             .filter(it -> search.matcher(it.left().getId()).matches())
-                            .filter(it -> whiteFilters.stream().anyMatch(it2 -> it.left().getId().equals(it2.left().getId()) && it.right().equals(it2.right())))
                             .forEach(filteredFilters::add);
                 } catch (Exception ignored) {
                     // intentionally empty
@@ -94,7 +93,7 @@ private void onSearchTextChange(String text) {
             allFilter.stream()
                     .filter(it -> it.left().title().getString().contains(filterText))
                     .filter(it ->
-                            whiteFilters.stream().noneMatch(it1 -> it1.left().equals(it.first())))
+                            whiteFilters.stream().noneMatch(it2 -> it.left().getId().equals(it2.left().getId()) && it.right().equals(it2.right())))
                     .forEach(filteredFilters::add);
         }
     }