Skip to content

Commit 3de8522

Browse files
committed
Merge branch 'main' of https://github.com/VazkiiMods/Zeta
2 parents 52bb1b6 + 2685e5d commit 3de8522

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/gradle.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v2
10-
- name: Set up JDK
11-
uses: actions/setup-java@v2
12-
with:
13-
distribution: 'temurin'
14-
java-version: '17'
9+
- name: Checkout Repository
10+
uses: actions/checkout@v4
11+
- name: Setup Java
12+
run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
1513
- name: Validate gradlew integrity
1614
uses: gradle/wrapper-validation-action@v1
1715
- name: Cache
@@ -45,7 +43,7 @@ jobs:
4543
gpg --local-user "Violet Moon Signing Key" --armor \
4644
--detach-sign ${{ steps.calculate_artifact_names.outputs.forge }}
4745
- name: Archive Forge Artifacts
48-
uses: actions/upload-artifact@v2
46+
uses: actions/upload-artifact@v4
4947
with:
5048
name: Forge
5149
path: |

src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,6 @@ protected <O> void trackRegisteredObject(ResourceKey<Registry<O>> keyGeneric, Ho
285285
* Gets all the registered objects from this Zeta
286286
*/
287287
public <O> Collection<Holder<O>> getRegisteredObjects(ResourceKey<Registry<O>> registry) {
288-
return (Collection<Holder<O>>) (Collection) myRegisteredObjects.get((ResourceKey) registry);
288+
return (Collection<Holder<O>>) (Collection) myRegisteredObjects.getOrDefault((ResourceKey) registry, List.of());
289289
}
290290
}

0 commit comments

Comments
 (0)