From 1d432896909ff269d1d2a363b5c5d67513c58dd3 Mon Sep 17 00:00:00 2001 From: YocyCraft Date: Mon, 2 Dec 2024 01:52:53 +0800 Subject: [PATCH 1/5] Fix search menu of Tesla Tower --- .../anvilcraft/client/gui/component/TeslaTowerButton.java | 2 +- .../dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/component/TeslaTowerButton.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/component/TeslaTowerButton.java index 4295a2a66..7faa83e83 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/component/TeslaTowerButton.java +++ b/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 components = new ArrayList<>(); for (String s : parts) { components.add(Component.literal(s).copy().setStyle(Style.EMPTY.applyFormat(originalFormatting))); diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java index eb558277e..36cc2025b 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/TeslaTowerScreen.java @@ -77,7 +77,7 @@ 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("~")) { @@ -85,7 +85,6 @@ private void onSearchTextChange(String text) { 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); } } From 3926ec8f5f4eaf6d3c7dc85287d389647b7be431 Mon Sep 17 00:00:00 2001 From: XeKr <987820727@qq.com> Date: Wed, 4 Dec 2024 17:22:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BD=99=E7=83=AC=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=9A=84=E7=82=B9=E7=87=83=E7=8A=B6=E6=80=81=E8=B4=B4=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../textures/item/ember_metal_axe_lit.png | Bin 0 -> 248 bytes .../textures/item/ember_metal_hoe_lit.png | Bin 0 -> 241 bytes .../textures/item/ember_metal_pickaxe_lit.png | Bin 0 -> 270 bytes .../textures/item/ember_metal_shovel_lit.png | Bin 0 -> 239 bytes .../textures/item/ember_metal_sword.png | Bin 259 -> 256 bytes .../textures/item/ember_metal_sword_lit.png | Bin 0 -> 263 bytes .../textures/item/ember_scissor_blade.png | Bin 0 -> 241 bytes .../textures/item/ember_scissor_blade_lit.png | Bin 0 -> 249 bytes .../anvilcraft/textures/item/ember_trident.png | Bin 0 -> 248 bytes .../textures/item/ember_trident_lit.png | Bin 0 -> 255 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_metal_axe_lit.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_metal_hoe_lit.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_metal_pickaxe_lit.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_metal_shovel_lit.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_metal_sword_lit.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_scissor_blade.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_scissor_blade_lit.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_trident.png create mode 100644 src/main/resources/assets/anvilcraft/textures/item/ember_trident_lit.png diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_metal_axe_lit.png b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_axe_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..c86af6a39bbc3d7f291caaf1ca564647753aeefe GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!foxd5LK*E{oteC3pXUE}OAl{j3?zafxENo~-lu@QKx& zNsoiWreD@sbkH-1w}+{yq+!Y(0pTgUQ#5@vISf^QS-Y~g6*qVMF43>}_4o46ea@%F iztk{(*qwV-^#Fq=JNv)H9I*tTEexKnelF{r5}E+EGFN{9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_metal_hoe_lit.png b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_hoe_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..08f035ecdb758d2902de9372eb26dc7a375cb8a6 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!foxd5LK*Tcp9J*E;H0(pGpl<&+J`gM)dUQ$j0 z%xvPCE17))Z6=O9ZIv@0`As;ykawEFfl$c;S81;PZQs7I@2fj}Up!!c!*AAu`TsJX b3MMegTe~DWM4fP(o9u literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_metal_pickaxe_lit.png b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_pickaxe_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..e0d06209b039384e5b1d5d6d5986aac99c29b718 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fo^#Gp`S6?~hJM)ElOeKC@<5UtBi&0h2(^iub5Y!TtI9$xX zA&|#jQVytg-kNz#K#I2{$S?Rm5@4`>q0|PHNbz)W45_$PbN;4Kg8~O@Kup)uU;pn* zd#$`|^6|joojV-fhJImPsuF4%E$sO~^_p&952M(&zkE-0tRL7I?e>|_JYl25fsAbq z9ebs}u$@1i%HXRfKow*Hz9w2#5l)z4*}Q$iB} DCzE7e literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_metal_shovel_lit.png b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_shovel_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..5a8b1be9906fbfc4cf9df7902d15f00948ad9a8e GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!foxd5LKS6?~h!^Qk}<_m2Ir@;&CM>*ZiKaf1g|6 z>iai%qokb=GMX^DtJOHOS30nE>P^3t^o&0vQZc*J=AL17>s|c?U-UEL+>P@0*Rn`3 Y1jKL{AFkOZ1T>t%)78&qol`;+09JHREC2ui literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_metal_sword.png b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_sword.png index 9133aed0281803fbc66ee5d72049bb8590b74cb8..b0f2f383c2de37803aec72e5279b4f5768649410 100644 GIT binary patch delta 186 zcmZo>YG9h+SAV#e-&aog&U~R5Rdstwxjb#P4S_s8rV>&Df?A>y3=9lj=hmM9Qrsm$ ze!>6YfWgb3@e@!u&eO#)q~cacuP4(11rFxSyF&l}KWOrB^*g7s;EavR(?{VGSW~~~ z+?e`YP{#KrOLO}tA)B4uZpo2*@-}SPe*LDgYwF#d+{OoYH~w0}CfXomzGA0s!(Zzopr0O+tx{Qv*} delta 189 zcmZo*YG#_?SKnhQak!X2Pg`w6AWw{{`knbgzH-X;l5$c4f?A>y3=9m*#Xf5QDejUW zzu^CHz~JT2_z5VS=;`7ZQgJJ!*OTdh0ta*9N|k^A4~k9^v$UMtVDx#yl1!NQtB6S5$ZfplR!?k5RNS1uY}RJ8?PhNeaNE~9^TFkYzAF!y798hYcSr8P j&(?U$u!8RJ21bTeG8~T*OuMClwlR3R`njxgN@xNA%y~na**BDjx4S_s|i}~-&7s}IC^OaNnb&a#fR6JJL9Xz0^>bP0l+XkKPC#A} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_scissor_blade.png b/src/main/resources/assets/anvilcraft/textures/item/ember_scissor_blade.png new file mode 100644 index 0000000000000000000000000000000000000000..0133fe4b6b88960541a8372a170b6eb01bb98f33 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!foxd5LK*B(=e!^Ql*a>^S5dG5>?icwY1(^iub5Y!Tt04jMp z_hKQC;wlO93;quS44cmAoCk^qd%8G=RNRU=`!uK882f|cb><#TrYI&fe5#pVePGe6YYIArYOkEro}um9C<+O}=} b4U7y0Y8-y=e7)>}#xr=j`njxgN@xNALvK_0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_scissor_blade_lit.png b/src/main/resources/assets/anvilcraft/textures/item/ember_scissor_blade_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..45e09d9fe9a390c4c1277985a02607dab2a7adda GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!fo#Q>iW*F0@Cdr7%F^M!t03dvf^J+nKI$Bu*I=&hgf!TxjbPw%JJKt{h;~R in3LaMU%d2@(}3ZUCnvApLTwkI6%3xPelF{r5}E)t^jMYv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_trident.png b/src/main/resources/assets/anvilcraft/textures/item/ember_trident.png new file mode 100644 index 0000000000000000000000000000000000000000..9f90a11afbaa6124c865bdf4dba68ff3bd3c4f05 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!foxd5LK*F0^t!^Qj?0(tJt7qXX>^OaNXF_q8~m5>q;1S(DmNFeW zKjF3OuE|??a*{4(UAVZ=l!tTnRB2yLTju3~r+YUXKlHP#l3(tiW*E{ot4j1$1X{-IZ#_21kY%eL-V=A#BkVi{YLP|go zsH$>Gs4bAIIkAgxby$O;h788$*a6) zC}YXn-v;OXk;vd$@?2>>QSTSWi> literal 0 HcmV?d00001 From e4078981b8064444b1265ea7b4ba2718c333d174 Mon Sep 17 00:00:00 2001 From: YocyCraft <80801884+YocyCraft@users.noreply.github.com> Date: Wed, 4 Dec 2024 20:37:37 +0800 Subject: [PATCH 3/5] Also fix search of sliencer --- .../dubhe/anvilcraft/client/gui/component/SilencerButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/component/SilencerButton.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/component/SilencerButton.java index a1263966d..bb928ce00 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/component/SilencerButton.java +++ b/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 components = new ArrayList<>(); for (String s : parts) { components.add(Component.literal(s).copy().setStyle(Style.EMPTY.applyFormat(originalFormatting))); From 7eb5e5749dc731e7a804675c96372f561fe83a53 Mon Sep 17 00:00:00 2001 From: Gugle Date: Thu, 5 Dec 2024 00:42:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20pr=20=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c47c6e0e4..54c88fe37 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -1,7 +1,7 @@ name: Pull Request Check on: workflow_dispatch: - push: + pull_request: branches: - releases/** paths: From 32f5211878c9cfd2a9a2315fad7dddf2b7a7e990 Mon Sep 17 00:00:00 2001 From: Gugle Date: Thu, 5 Dec 2024 00:51:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20crowdin=20=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/crowdin.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 8e313de91..8e21fd89e 100644 --- a/.github/workflows/crowdin.yml +++ b/.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