Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.0.0-milestone.4.5 #634

Merged
merged 47 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
450fe6c
Merge pull request #611 from refinedmods/main
raoulvdberge Jul 10, 2024
d607e38
feat: ability to extract resources other than item from the interface
raoulvdberge Jul 13, 2024
16bf161
ci: re-add sonar exclusions
raoulvdberge Jul 13, 2024
f461e49
Merge pull request #619 from refinedmods/feat/GH-616/iface-bucket-ext…
raoulvdberge Jul 13, 2024
22e08a9
fix: crash when trying to export fluids on Fabric
raoulvdberge Jul 13, 2024
285cfe5
Merge pull request #622 from refinedmods/fix/GH-621/exporter-crash
raoulvdberge Jul 13, 2024
3e02db0
style: cleanup
raoulvdberge Jul 13, 2024
13c41ea
Merge pull request #623 from refinedmods/fix/NO-ISSUE/cleanup
raoulvdberge Jul 14, 2024
611fb7a
refactor: cleanup duplication around storage types
raoulvdberge Jul 17, 2024
8d793d1
ci: store refined architect version for gradle in gradle.properties
raoulvdberge Jul 17, 2024
30e9191
Merge pull request #626 from refinedmods/refactor/NO-ISSUE/storage-types
raoulvdberge Jul 17, 2024
d961e5f
feat: stack upgrade gametest setup
starforcraft Jul 12, 2024
5842cfc
Merge pull request #615 from starforcraft/feat/GH-248/stacktests
raoulvdberge Jul 18, 2024
55f0ed7
feat: support for neoforge config screen
raoulvdberge Jul 20, 2024
d6756d0
fix: use neoforge safe saveddata saving
raoulvdberge Jul 20, 2024
8da072f
fix: crash in logs when trying to quick craft empty result slot
raoulvdberge Jul 20, 2024
ee0c73a
fix: remove comments using tooltip translations
raoulvdberge Jul 20, 2024
c58ec21
Merge pull request #628 from refinedmods/feat/NO-ISSUE/config-screen
raoulvdberge Jul 20, 2024
406f5a4
chore: update translation French from crowdin
raoulvdberge Jul 20, 2024
1ebca57
chore: update translation Spanish from crowdin
raoulvdberge Jul 20, 2024
030cbbd
chore: update translation German from crowdin
raoulvdberge Jul 20, 2024
7294971
chore: update translation Hungarian from crowdin
raoulvdberge Jul 20, 2024
162f365
chore: update translation Italian from crowdin
raoulvdberge Jul 20, 2024
86befeb
chore: update translation Japanese from crowdin
raoulvdberge Jul 20, 2024
4e80571
chore: update translation Korean from crowdin
raoulvdberge Jul 20, 2024
2cce584
chore: update translation Polish from crowdin
raoulvdberge Jul 20, 2024
5784ed8
chore: update translation Russian from crowdin
raoulvdberge Jul 20, 2024
adcc8dd
chore: update translation Chinese Simplified from crowdin
raoulvdberge Jul 20, 2024
fef643f
chore: update translation Chinese Traditional from crowdin
raoulvdberge Jul 20, 2024
6cb51c1
chore: update translation Portuguese, Brazilian from crowdin
raoulvdberge Jul 20, 2024
8374b72
chore: update translation Indonesian from crowdin
raoulvdberge Jul 20, 2024
a94bf00
chore: update translation Turkish from crowdin
raoulvdberge Jul 20, 2024
43e0aef
Merge pull request #629 from refinedmods/crowdin-translations
raoulvdberge Jul 20, 2024
328e1bf
refactor: remove platform prefix from modules, rename platform-api to…
raoulvdberge Jul 21, 2024
0e80e96
chore: update git-blame-ignore-revs
raoulvdberge Jul 22, 2024
3d7183b
Merge pull request #630 from refinedmods/refactor/NO-ISSUE/pkgrename
raoulvdberge Jul 22, 2024
82a6ace
refactor: minor renames for constructor / destructor strategies
raoulvdberge Jul 22, 2024
b5492b0
refactor: move amount override to support package
raoulvdberge Jul 22, 2024
14908e8
refactor: rename storage channel to root storage
raoulvdberge Jul 22, 2024
f286971
refactor: minor renames for network bound item
raoulvdberge Jul 23, 2024
77e867c
refactor: rename wireless transmitter api and make it part of network…
raoulvdberge Jul 23, 2024
1550061
feat: add neoforge block capability for network nodes
raoulvdberge Jul 23, 2024
89db325
feat: add fabric block capability for network nodes
raoulvdberge Jul 24, 2024
0f02a97
Merge pull request #632 from refinedmods/refactor/NO-ISSUE/platform-caps
raoulvdberge Jul 25, 2024
5f59e3d
fix: silicon tag missing and recipes not using silicon tag
raoulvdberge Jul 25, 2024
7d5db78
Merge pull request #633 from refinedmods/fix/GH-631/silicon
raoulvdberge Jul 25, 2024
d356f29
chore: prepare release v2.0.0-milestone.4.5
raoulvdberge Jul 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@

# Rename "refinedstorage2" to "refinedstorage"
03d02f1e07e1e6e9726404c236c3af227126ade0
# Remove "platform" prefix from modules
328e1bfeb40342a81c375da4a5f75c9a36fe8ef8
48 changes: 25 additions & 23 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ These are the most important things to know before contributing (also explained
- Branch names must be formatted correctly. The format is `{category}/GH-{issue number}/{lowercase-description}`.
Category must match a
category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum).
You can also use `NO-ISSUE` instead of a GitHub issue number.
- We use [Checkstyle](https://checkstyle.sourceforge.io/) in our build workflow to validate coding style. It is
recommended to import the [config/checkstyle/checkstyle.xml](../config/checkstyle/checkstyle.xml)
or [config/intellij-code-style.xml](../config/intellij-code-style.xml) file into your
Expand Down Expand Up @@ -47,7 +48,7 @@ Because we use merge commits when merging a PR, branch names will be part of the
branch names must follow a certain standard.

The format is `{category}/GH-{issue number}/{lowercase-description}` and a branch name can be maximum 50 characters of
length.
length. You can also use `NO-ISSUE` instead of a GitHub issue number.

Category must match a
category [used in our Commitlint config](https://github.com/conventional-changelog/commitlint/tree/master/%40commitlint/config-conventional#type-enum).
Expand Down Expand Up @@ -140,7 +141,7 @@ easily set up networks for testing.
### Integration testing

To test the entire chain from Minecraft to the API modules, we use integration tests. These tests are located in the
test source set of the `refinedstorage-platform-neoforge` module.
test source set of the `refinedstorage-neoforge` module.

We write these integration tests as Minecraft gametests.

Expand All @@ -150,8 +151,8 @@ Our [SonarQube quality gate](https://sonarcloud.io/organizations/refinedmods/qua
test coverage percentage of 80%. This an aggregated percentage over all
the API modules, with an exclusion for the platform modules.

> The `refinedstorage-platform-*` modules are excluded because they contain a lot of Minecraft-specific code and are
> harder to test.
> The `refinedstorage-neoforge` and `refinedstorage-fabric` modules are excluded because they contain a lot of
> Minecraft-specific code and are harder to test.

### Mutation testing

Expand Down Expand Up @@ -260,22 +261,23 @@ The workflow takes care of the following:

## Modules

Refined Storage is split up into various modules.

Most modules aren't dependent on Minecraft or a mod loader. Only modules that start
with `refinedstorage-platform-*` have dependencies on Minecraft.

| Name | Use in addons | Description |
|----------------------------------|---------------|----------------------------------------------------------------------------------------------------|
| `refinedstorage-core-api` | ✔️ | Contains some utility classes and enums. |
| `refinedstorage-grid-api` | ✔️ | Contains Grid related functionality. |
| `refinedstorage-network-api` | ✔️ | Contains storage network related functionality. |
| `refinedstorage-network` | ❌ | Contains implementations of `refinedstorage-network-api`. |
| `refinedstorage-network-test` | ✔️ | JUnit extension which helps with setting up a network and a network node for testing. |
| `refinedstorage-query-parser` | ✔️ | A query parser, contains a lexer and parser. Only used for Grid query parsing. |
| `refinedstorage-resource-api` | ✔️ | Contains API for handling resources. |
| `refinedstorage-storage-api` | ✔️ | Contains storage related functionality. |
| `refinedstorage-platform-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. |
| `refinedstorage-platform-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. |
| `refinedstorage-platform-forge` | ❌ | The platform module for Forge. This module contains Forge specific code and the integration tests. |
| `refinedstorage-platform-common` | ❌ | Common mod code. Most gameplay code is in here. |
Refined Storage is split up into various modules. Most modules aren't dependent on Minecraft or a mod loader. Only
the `refinedstorage-common`, `refinedstorage-neoforge` and `refinedstorage-fabric` modules have dependencies on
Minecraft.

| Name | Use in addons | Description |
|-------------------------------|---------------|----------------------------------------------------------------------------------------------------------|
| `refinedstorage-core-api` | ✔️ | Contains some utility classes and enums. |
| `refinedstorage-grid-api` | ✔️ | Contains Grid related functionality. |
| `refinedstorage-network-api` | ✔️ | Contains storage network related functionality. |
| `refinedstorage-network` | ❌ | Contains implementations of `refinedstorage-network-api`. |
| `refinedstorage-network-test` | ✔️ | JUnit extension which helps with setting up a network and a network node for testing. |
| `refinedstorage-query-parser` | ✔️ | A query parser, contains a lexer and parser. Only used for Grid query parsing. |
| `refinedstorage-resource-api` | ✔️ | Contains API for handling resources. |
| `refinedstorage-storage-api` | ✔️ | Contains storage related functionality. |
| `refinedstorage-common-api` | ✔️ | Implements the various Refined Storage API modules for use in Minecraft. |
| `refinedstorage-common` | ❌ | Common mod code. Most gameplay code is in here. |
| `refinedstorage-fabric-api` | ✔️ | Additional API for the Fabric platform. |
| `refinedstorage-fabric` | ❌ | The platform module for Fabric. This module contains Fabric specific code. |
| `refinedstorage-neoforge-api` | ✔️ | Additional API for the NeoForge platform. |
| `refinedstorage-neoforge` | ❌ | The platform module for NeoForge. This module contains NeoForge specific code and the integration tests. |
7 changes: 4 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#file: noinspection YAMLSchemaValidation,YAMLSchemaValidation
blank_issues_enabled: true
contact_links:
- name: Discord Community Support
url: https://discordapp.com/invite/VYzsydb
about: Please ask and answer questions here. Issues should be used for bugs and feature requests.
- name: Discord Community Support
url: https://discordapp.com/invite/VYzsydb
about: Please ask and answer questions here. Issues should be used for bugs and feature requests.
38 changes: 19 additions & 19 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ name: Enhancement
description: Do you have a suggestion for a new feature or improvement? Let us know.
labels: [ enhancement ]
body:
- type: markdown
attributes:
value: |
Provide a summary of the enhancement in the title above.

Please follow following guidelines before proposing an enchancement:
1) Ensure that you are running on the latest version (to ensure that the enhancement does not exist yet).
2) Ensure that your enhancement hasn't already been posted. Please look in the closed issues as well (for enhancements that have been denied).

We might close your issue, without explanation, if you do not follow these guidelines.
- type: textarea
id: describe
attributes:
label: Describe your enhancement
description: |
Be as detailed as possible.
Tell us how your idea should work. Why should we consider this?
validations:
required: true
- type: markdown
attributes:
value: |
Provide a summary of the enhancement in the title above.
Please follow following guidelines before proposing an enchancement:
1) Ensure that you are running on the latest version (to ensure that the enhancement does not exist yet).
2) Ensure that your enhancement hasn't already been posted. Please look in the closed issues as well (for enhancements that have been denied).
We might close your issue, without explanation, if you do not follow these guidelines.
- type: textarea
id: describe
attributes:
label: Describe your enhancement
description: |
Be as detailed as possible.
Tell us how your idea should work. Why should we consider this?
validations:
required: true
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
types: [ opened, synchronize, reopened ]
jobs:
build:
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].4
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].9
with:
gametests: true
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
type: string
jobs:
draft:
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].4
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].9
with:
release-type: ${{ inputs.release-type }}
version-number-override: ${{ inputs.version-number-override }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-for-unsupported-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on:
types: [ labeled, unlabeled, reopened ]
jobs:
unsupported-labeler:
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].4
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].9
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- closed
jobs:
publish-release:
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].4
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].9
secrets: inherit
with:
project-name: 'Refined Storage'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/resolved-issue-locking.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Lock resolved issues and PRs
on:
schedule:
- cron: '0 0 * * *'
- cron: '0 0 * * 1'
jobs:
lock:
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].4
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].9
2 changes: 1 addition & 1 deletion .github/workflows/validate-branch-name.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: Validate branch name
on: [ pull_request ]
jobs:
validate-branch-name:
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].4
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].9
2 changes: 1 addition & 1 deletion .github/workflows/validate-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ on:
types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
jobs:
validate-changelog:
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].4
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].9
2 changes: 1 addition & 1 deletion .github/workflows/validate-commit-messages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: Validate commit messages
on: [ pull_request ]
jobs:
validate-commit-messages:
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].4
uses: refinedmods/refinedarchitect/.github/workflows/[email protected].9
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ eclipse/
*.iws
.idea/
!.idea/dictionaries/refinedstorage.xml
!.idea/inspectionProfiles/refinedstorage.xml
!.idea/icon.png
out/
/bin/
Expand Down
31 changes: 31 additions & 0 deletions .idea/dictionaries/refinedstorage.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/inspectionProfiles/refinedstorage.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading