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 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: 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))); 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); } } 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 000000000..c86af6a39 Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_axe_lit.png differ 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 000000000..08f035ecd Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_hoe_lit.png differ 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 000000000..e0d06209b Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_pickaxe_lit.png differ 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 000000000..5a8b1be99 Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_shovel_lit.png differ 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 9133aed02..b0f2f383c 100644 Binary files a/src/main/resources/assets/anvilcraft/textures/item/ember_metal_sword.png and b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_sword.png differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_metal_sword_lit.png b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_sword_lit.png new file mode 100644 index 000000000..6484d9d3a Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_metal_sword_lit.png differ 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 000000000..0133fe4b6 Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_scissor_blade.png differ 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 000000000..45e09d9fe Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_scissor_blade_lit.png differ 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 000000000..9f90a11af Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_trident.png differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/ember_trident_lit.png b/src/main/resources/assets/anvilcraft/textures/item/ember_trident_lit.png new file mode 100644 index 000000000..d6cc98742 Binary files /dev/null and b/src/main/resources/assets/anvilcraft/textures/item/ember_trident_lit.png differ