Skip to content

Commit d4c1a33

Browse files
committed
Sync with template v10
1 parent 93c3b92 commit d4c1a33

File tree

10 files changed

+34
-34
lines changed

10 files changed

+34
-34
lines changed

.github/workflows/check-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
runs-on: ${{ matrix.os }}
2828
steps:
2929
- name: Checkout repository
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
with:
3232
fetch-depth: 0
3333
- name: Validate Gradle wrapper
34-
uses: gradle/wrapper-validation-action@v3
34+
uses: gradle/actions/wrapper-validation@v5
3535
- name: Setup JDK ${{ matrix.java }}
36-
uses: actions/setup-java@v4
36+
uses: actions/setup-java@v5
3737
with:
3838
distribution: zulu
3939
java-version: ${{ matrix.java }}
@@ -44,7 +44,7 @@ jobs:
4444
run: ./gradlew build --stacktrace
4545
- name: Capture build artifacts
4646
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v5
4848
with:
4949
name: artifacts
5050
path: |

.github/workflows/release-platform-curseforge.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
with:
2525
fetch-depth: 0
2626
- name: Validate Gradle wrapper
27-
uses: gradle/wrapper-validation-action@v3
27+
uses: gradle/actions/wrapper-validation@v5
2828
- name: Setup JDK ${{ matrix.java }}
29-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
3030
with:
3131
distribution: zulu
3232
java-version: ${{ matrix.java }}
@@ -39,7 +39,7 @@ jobs:
3939
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
4040
- name: Capture build artifacts
4141
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
42-
uses: actions/upload-artifact@v4
42+
uses: actions/upload-artifact@v5
4343
with:
4444
name: artifacts
4545
path: |

.github/workflows/release-platform-github.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
with:
2525
fetch-depth: 0
2626
- name: Validate Gradle wrapper
27-
uses: gradle/wrapper-validation-action@v3
27+
uses: gradle/actions/wrapper-validation@v5
2828
- name: Setup JDK ${{ matrix.java }}
29-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
3030
with:
3131
distribution: zulu
3232
java-version: ${{ matrix.java }}
@@ -39,7 +39,7 @@ jobs:
3939
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4040
- name: Capture build artifacts
4141
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
42-
uses: actions/upload-artifact@v4
42+
uses: actions/upload-artifact@v5
4343
with:
4444
name: artifacts
4545
path: |

.github/workflows/release-platform-modrinth.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
with:
2525
fetch-depth: 0
2626
- name: Validate Gradle wrapper
27-
uses: gradle/wrapper-validation-action@v3
27+
uses: gradle/actions/wrapper-validation@v5
2828
- name: Setup JDK ${{ matrix.java }}
29-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
3030
with:
3131
distribution: zulu
3232
java-version: ${{ matrix.java }}
@@ -39,7 +39,7 @@ jobs:
3939
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
4040
- name: Capture build artifacts
4141
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
42-
uses: actions/upload-artifact@v4
42+
uses: actions/upload-artifact@v5
4343
with:
4444
name: artifacts
4545
path: |

.github/workflows/release-subproject-fabric.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
with:
2525
fetch-depth: 0
2626
- name: Validate Gradle wrapper
27-
uses: gradle/wrapper-validation-action@v3
27+
uses: gradle/actions/wrapper-validation@v5
2828
- name: Setup JDK ${{ matrix.java }}
29-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
3030
with:
3131
distribution: zulu
3232
java-version: ${{ matrix.java }}
@@ -41,7 +41,7 @@ jobs:
4141
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
4242
- name: Capture build artifacts
4343
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
44-
uses: actions/upload-artifact@v4
44+
uses: actions/upload-artifact@v5
4545
with:
4646
name: artifacts
4747
path: |

.github/workflows/release-subproject-neoforge.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v5
2424
with:
2525
fetch-depth: 0
2626
- name: Validate Gradle wrapper
27-
uses: gradle/wrapper-validation-action@v3
27+
uses: gradle/actions/wrapper-validation@v5
2828
- name: Setup JDK ${{ matrix.java }}
29-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
3030
with:
3131
distribution: zulu
3232
java-version: ${{ matrix.java }}
@@ -41,7 +41,7 @@ jobs:
4141
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
4242
- name: Capture build artifacts
4343
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
44-
uses: actions/upload-artifact@v4
44+
uses: actions/upload-artifact@v5
4545
with:
4646
name: artifacts
4747
path: |

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
runs-on: ${{ matrix.os }}
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
with:
3030
fetch-depth: 0
3131
- name: Validate Gradle wrapper
32-
uses: gradle/wrapper-validation-action@v3
32+
uses: gradle/actions/wrapper-validation@v5
3333
- name: Setup JDK ${{ matrix.java }}
34-
uses: actions/setup-java@v4
34+
uses: actions/setup-java@v5
3535
with:
3636
distribution: zulu
3737
java-version: ${{ matrix.java }}
@@ -46,7 +46,7 @@ jobs:
4646
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
4747
- name: Capture build artifacts
4848
if: ${{ runner.os == 'Linux' && matrix.java == '21' }}
49-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@v5
5050
with:
5151
name: artifacts
5252
path: |

.github/workflows/sync-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Setup NodeJS
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@v6
1919
with:
2020
node-version: 22
2121
- run: curl https://raw.githubusercontent.com/TerminalMC/.github/HEAD/.github/labels.yml -o ./labels.yml

common/src/main/java/dev/terminalmc/clientsort/platform/Services.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ public class Services {
2525

2626
public static final IPlatformServices PLATFORM = load(IPlatformServices.class);
2727

28-
public static <T> T load(Class<T> clazz) {
29-
final T loadedService = ServiceLoader.load(clazz)
28+
public static <T> T load(Class<T> service) {
29+
final T loadedService = ServiceLoader.load(service, service.getClassLoader())
3030
.findFirst()
3131
.orElseThrow(() -> new NullPointerException(
32-
"Failed to load service for " + clazz.getName()));
33-
ClientSort.LOG.debug("Loaded {} for service {}", loadedService, clazz);
32+
"Failed to load service for " + service.getName()));
33+
ClientSort.LOG.debug("Loaded {} for service {}", loadedService, service);
3434
return loadedService;
3535
}
3636
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# All other plural properties expect CSV list format.
88

99
# Template Project Sync Version
10-
template_version=8
10+
template_version=10
1111

1212
# Mod Version
1313
mod_version=2.1.1

0 commit comments

Comments
 (0)