diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 856e83b..aed439b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ on: types: [ opened, synchronize, reopened ] jobs: build: - uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.19.1 + uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.20.0 with: mutation-testing: false secrets: inherit diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index c6d98d5..d939997 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -17,7 +17,7 @@ on: type: string jobs: draft: - uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.19.1 + uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.20.0 with: release-type: ${{ inputs.release-type }} version-number-override: ${{ inputs.version-number-override }} diff --git a/.github/workflows/issue-for-unsupported-version.yml b/.github/workflows/issue-for-unsupported-version.yml index 002c2ac..299dcb1 100644 --- a/.github/workflows/issue-for-unsupported-version.yml +++ b/.github/workflows/issue-for-unsupported-version.yml @@ -4,4 +4,4 @@ on: types: [ labeled, unlabeled, reopened ] jobs: unsupported-labeler: - uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.19.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.20.0 \ No newline at end of file diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 894c052..c932c2c 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,7 +7,7 @@ on: - closed jobs: publish-release: - uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.19.1 + uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.20.0 secrets: inherit with: project-name: 'Refined Storage - REI Integration' diff --git a/.github/workflows/resolved-issue-locking.yml b/.github/workflows/resolved-issue-locking.yml index f8dbbdf..8426e8b 100644 --- a/.github/workflows/resolved-issue-locking.yml +++ b/.github/workflows/resolved-issue-locking.yml @@ -4,4 +4,4 @@ on: - cron: '0 0 * * *' jobs: lock: - uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.19.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.20.0 \ No newline at end of file diff --git a/.github/workflows/validate-branch-name.yml b/.github/workflows/validate-branch-name.yml index c1733fb..bd5a157 100644 --- a/.github/workflows/validate-branch-name.yml +++ b/.github/workflows/validate-branch-name.yml @@ -2,4 +2,4 @@ name: Validate branch name on: [ pull_request ] jobs: validate-branch-name: - uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.19.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.20.0 \ No newline at end of file diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index f5fb9ae..d18cbc9 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -4,4 +4,4 @@ on: types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ] jobs: validate-changelog: - uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.19.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.20.0 \ No newline at end of file diff --git a/.github/workflows/validate-commit-messages.yml b/.github/workflows/validate-commit-messages.yml index 620b9e8..3005b5a 100644 --- a/.github/workflows/validate-commit-messages.yml +++ b/.github/workflows/validate-commit-messages.yml @@ -2,4 +2,4 @@ name: Validate commit messages on: [ pull_request ] jobs: validate-commit-messages: - uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.19.1 \ No newline at end of file + uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.20.0 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 3074607..c8e9e5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [0.5.0] - 2024-12-08 + +### Fixed + +- Support for Refined Storage v2.0.0-milestone.4.11. +- Recipe transfer not working in the Wireless Crafting Grid. + ## [0.4.0] - 2024-10-12 ### Added @@ -80,7 +87,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Support for REI collapsable entries. - Grid / REI search box synchronization options. -[Unreleased]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.4.0...HEAD +[Unreleased]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.5.0...HEAD + +[0.5.0]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.4.0...v0.5.0 [0.4.0]: https://github.com/refinedmods/refinedstorage-rei-integration/compare/v0.3.1...v0.4.0 diff --git a/gradle.properties b/gradle.properties index 04c28be..828b71e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -refinedarchitectVersion=0.19.1 -refinedstorageVersion=2.0.0-milestone.4.8 +refinedarchitectVersion=0.20.0 +refinedstorageVersion=2.0.0-milestone.4.11 # https://linkie.shedaniel.dev/dependencies?loader=neoforge&version=1.21 # https://linkie.shedaniel.dev/dependencies?loader=fabric&version=1.21 architecturyVersion=13.0.3 diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/de_de.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/de_de.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/de_de.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/es_es.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/es_es.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/es_es.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/fr_fr.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/fr_fr.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/fr_fr.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/hu_hu.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/hu_hu.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/hu_hu.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/id_id.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/id_id.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/id_id.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/it_it.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/it_it.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/it_it.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ja_jp.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ja_jp.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ja_jp.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ko_kr.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ko_kr.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ko_kr.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/pl_pl.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/pl_pl.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/pl_pl.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/pt_br.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/pt_br.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/pt_br.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ru_ru.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ru_ru.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/ru_ru.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/zh_cn.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/zh_cn.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/zh_cn.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/zh_tw.json b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/zh_tw.json new file mode 100644 index 0000000..3c309dc --- /dev/null +++ b/refinedstorage-rei-integration-common/src/main/resources/assets/refinedstorage_rei_integration/lang/zh_tw.json @@ -0,0 +1,13 @@ +{ + "gui.refinedstorage_rei_integration.grid.synchronizer": "REI", + "gui.refinedstorage_rei_integration.grid.synchronizer.help": "Sync the search box text to the REI filter.", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way": "REI two-way", + "gui.refinedstorage_rei_integration.grid.synchronizer.two_way.help": "Sync the search box text to the REI filter, and the REI filter to the search box text.", + "block.refinedstorage_rei_integration.controller.fully_charged": "Fully charged Controllers", + "gui.refinedstorage_rei_integration.transfer.missing": "Missing items", + "gui.refinedstorage_rei_integration.transfer.missing_but_all_autocraftable": "Missing items, all are autocraftable", + "gui.refinedstorage_rei_integration.transfer.missing_but_some_autocraftable": "Missing items, some are autocraftable", + "gui.refinedstorage_rei_integration.transfer.ctrl_click_to_autocraft": "CTRL + click to autocraft", + "gui.refinedstorage_rei_integration.transfer.all_autocraftable": "All are autocraftable", + "gui.refinedstorage_rei_integration.transfer.some_autocraftable": "Some are autocraftable" +} \ No newline at end of file diff --git a/refinedstorage-rei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/CraftingGridTransferHandler.java b/refinedstorage-rei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/CraftingGridTransferHandler.java index 369df77..358f53f 100644 --- a/refinedstorage-rei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/CraftingGridTransferHandler.java +++ b/refinedstorage-rei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/CraftingGridTransferHandler.java @@ -3,8 +3,8 @@ import com.refinedmods.refinedstorage.api.grid.view.GridView; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.list.MutableResourceList; -import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; -import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.common.api.RefinedStorageClientApi; +import com.refinedmods.refinedstorage.common.grid.AbstractCraftingGridContainerMenu; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.awt.Color; @@ -45,7 +45,7 @@ class CraftingGridTransferHandler extends AbstractTransferHandler { @Override public Result handle(final Context context) { - if (!(context.getMenu() instanceof CraftingGridContainerMenu containerMenu) + if (!(context.getMenu() instanceof AbstractCraftingGridContainerMenu containerMenu) || !context.getDisplay().getCategoryIdentifier().equals(BuiltinPlugin.CRAFTING) || !(context.getDisplay() instanceof DefaultCraftingDisplay defaultCraftingDisplay)) { return Result.createNotApplicable(); @@ -68,12 +68,12 @@ public Result handle(final Context context) { .blocksFurtherHandling(); } - private Result doActuallyCrafting(final Context context, final CraftingGridContainerMenu containerMenu, + private Result doActuallyCrafting(final Context context, final AbstractCraftingGridContainerMenu containerMenu, final TransferType type, final TransferInputs transferInputs, final List ingredients) { if (type.canOpenAutocraftingPreview() && Screen.hasControlDown()) { final List craftingRequests = transferInputs.createCraftingRequests(); - RefinedStorageApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getContainerScreen()); + RefinedStorageClientApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getContainerScreen()); return Result.createSuccessful().blocksFurtherHandling(false); } else { doTransfer(ingredients, containerMenu); @@ -98,7 +98,8 @@ private static Component getTooltip(final TransferType type) { }; } - private void doTransfer(final List ingredients, final CraftingGridContainerMenu containerMenu) { + private void doTransfer(final List ingredients, + final AbstractCraftingGridContainerMenu containerMenu) { final List> inputs = getInputs(ingredients); containerMenu.transferRecipe(inputs); } diff --git a/refinedstorage-rei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/PatternGridTransferHandler.java b/refinedstorage-rei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/PatternGridTransferHandler.java index f6a5d3f..dfafa28 100644 --- a/refinedstorage-rei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/PatternGridTransferHandler.java +++ b/refinedstorage-rei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/rei/fabric/PatternGridTransferHandler.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.grid.view.GridView; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; -import com.refinedmods.refinedstorage.common.autocrafting.PatternGridContainerMenu; +import com.refinedmods.refinedstorage.common.autocrafting.patterngrid.PatternGridContainerMenu; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.List; diff --git a/refinedstorage-rei-integration-fabric/src/main/resources/fabric.mod.json b/refinedstorage-rei-integration-fabric/src/main/resources/fabric.mod.json index 05016aa..fa7b218 100644 --- a/refinedstorage-rei-integration-fabric/src/main/resources/fabric.mod.json +++ b/refinedstorage-rei-integration-fabric/src/main/resources/fabric.mod.json @@ -33,7 +33,7 @@ "fabricloader": ">=0.14.6", "fabric-api": "*", "minecraft": "~1.21", - "refinedstorage": ">=2.0.0-milestone.4.8", + "refinedstorage": ">=2.0.0-milestone.4.11", "roughlyenoughitems": ">=16", "java": ">=17" } diff --git a/refinedstorage-rei-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/CraftingGridTransferHandler.java b/refinedstorage-rei-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/CraftingGridTransferHandler.java index 7306d78..08a1313 100644 --- a/refinedstorage-rei-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/CraftingGridTransferHandler.java +++ b/refinedstorage-rei-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/CraftingGridTransferHandler.java @@ -3,8 +3,8 @@ import com.refinedmods.refinedstorage.api.grid.view.GridView; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.api.resource.list.MutableResourceList; -import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; -import com.refinedmods.refinedstorage.common.grid.CraftingGridContainerMenu; +import com.refinedmods.refinedstorage.common.api.RefinedStorageClientApi; +import com.refinedmods.refinedstorage.common.grid.AbstractCraftingGridContainerMenu; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.awt.Color; @@ -45,7 +45,7 @@ class CraftingGridTransferHandler extends AbstractTransferHandler { @Override public Result handle(final Context context) { - if (!(context.getMenu() instanceof CraftingGridContainerMenu containerMenu) + if (!(context.getMenu() instanceof AbstractCraftingGridContainerMenu containerMenu) || !context.getDisplay().getCategoryIdentifier().equals(BuiltinPlugin.CRAFTING) || !(context.getDisplay() instanceof DefaultCraftingDisplay defaultCraftingDisplay)) { return Result.createNotApplicable(); @@ -68,12 +68,12 @@ public Result handle(final Context context) { .blocksFurtherHandling(); } - private Result doActuallyCrafting(final Context context, final CraftingGridContainerMenu containerMenu, + private Result doActuallyCrafting(final Context context, final AbstractCraftingGridContainerMenu containerMenu, final TransferType type, final TransferInputs transferInputs, final List ingredients) { if (type.canOpenAutocraftingPreview() && Screen.hasControlDown()) { final List craftingRequests = transferInputs.createCraftingRequests(); - RefinedStorageApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getContainerScreen()); + RefinedStorageClientApi.INSTANCE.openAutocraftingPreview(craftingRequests, context.getContainerScreen()); return Result.createSuccessful().blocksFurtherHandling(false); } else { doTransfer(ingredients, containerMenu); @@ -98,7 +98,8 @@ private static Component getTooltip(final TransferType type) { }; } - private void doTransfer(final List ingredients, final CraftingGridContainerMenu containerMenu) { + private void doTransfer(final List ingredients, + final AbstractCraftingGridContainerMenu containerMenu) { final List> inputs = getInputs(ingredients); containerMenu.transferRecipe(inputs); } diff --git a/refinedstorage-rei-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/PatternGridTransferHandler.java b/refinedstorage-rei-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/PatternGridTransferHandler.java index c919552..2d18177 100644 --- a/refinedstorage-rei-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/PatternGridTransferHandler.java +++ b/refinedstorage-rei-integration-neoforge/src/main/java/com/refinedmods/refinedstorage/rei/forge/PatternGridTransferHandler.java @@ -3,7 +3,7 @@ import com.refinedmods.refinedstorage.api.grid.view.GridView; import com.refinedmods.refinedstorage.api.resource.ResourceAmount; import com.refinedmods.refinedstorage.common.api.RefinedStorageApi; -import com.refinedmods.refinedstorage.common.autocrafting.PatternGridContainerMenu; +import com.refinedmods.refinedstorage.common.autocrafting.patterngrid.PatternGridContainerMenu; import com.refinedmods.refinedstorage.common.support.resource.ItemResource; import java.util.List; diff --git a/refinedstorage-rei-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml b/refinedstorage-rei-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml index 4369be2..b6434a2 100644 --- a/refinedstorage-rei-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml +++ b/refinedstorage-rei-integration-neoforge/src/main/templates/META-INF/neoforge.mods.toml @@ -14,7 +14,7 @@ REI integration for Refined Storage. [[dependencies.refinedstorage_rei_integration]] modId = "refinedstorage" type = "required" -versionRange = "2.0.0-milestone.4.8" +versionRange = "2.0.0-milestone.4.11" side = "BOTH" [[dependencies.refinedstorage_rei_integration]] modId = "roughlyenoughitems"