Skip to content

Commit d8d2726

Browse files
committed
build: update to latest bwlang changes
1 parent 02108c9 commit d8d2726

File tree

7 files changed

+55
-594
lines changed

7 files changed

+55
-594
lines changed

.github/workflows/build-master.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ jobs:
1414

1515
steps:
1616
- name: Checkout Repository
17-
uses: actions/checkout@v4
17+
uses: actions/checkout@v6
1818
- name: Validate Gradle Wrapper
19-
uses: gradle/actions/wrapper-validation@v4
19+
uses: gradle/actions/wrapper-validation@v5
2020
- name: Set the Build number
2121
id: calculated_build_number
2222
env:
2323
NUM: ${{ github.run_number }}
2424
run: echo "build_n=$(($NUM+865))" >> $GITHUB_OUTPUT
2525
- name: Set up JDK 17
26-
uses: actions/setup-java@v4
26+
uses: actions/setup-java@v5
2727
with:
2828
distribution: 'temurin'
2929
java-version: 17
3030
- name: Setup Gradle
31-
uses: gradle/actions/setup-gradle@v4
31+
uses: gradle/actions/setup-gradle@v5
3232
- name: Grant execute permission for gradlew
3333
run: chmod +x gradlew
3434
- name: Build with Gradle
@@ -44,7 +44,7 @@ jobs:
4444
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
4545
BUILD_NUMBER: ${{ steps.calculated_build_number.outputs.build_n }}
4646
- name: Upload the final artifact
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v6
4848
with:
4949
path: |
5050
plugin/*/build/libs/BedWars*.jar

.github/workflows/check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ jobs:
1010

1111
steps:
1212
- name: Checkout Repository
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414
- name: Validate Gradle Wrapper
15-
uses: gradle/actions/wrapper-validation@v4
15+
uses: gradle/actions/wrapper-validation@v5
1616
- name: Set up JDK 17
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with:
1919
distribution: 'temurin'
2020
java-version: 17
2121
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@v4
22+
uses: gradle/actions/setup-gradle@v5
2323
with:
2424
add-job-summary-as-pr-comment: on-failure
2525
- name: Grant execute permission for gradlew

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ subprojects {
3131

3232
configureJavac(JavaVersion.VERSION_11)
3333

34-
val buildNumber = System.getenv("BUILD_NUMBER") ?: "dev"
34+
val buildNumber = providers.environmentVariable("BUILD_NUMBER").orElse("dev")
3535

3636
tasks.withType<Jar> {
3737
archiveClassifier.set(buildNumber)

plugin/common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
compileOnly(libs.parties.api)
99

1010
/* SHADED */
11-
implementation("org.screamingsandals.language.bedwars:BedWarsLanguage:${Regex("^\\d+\\.\\d+").find(project.version.toString())?.value}-SNAPSHOT")
11+
api("org.screamingsandals.language.bedwars:BedWarsLanguage:${Regex("^\\d+\\.\\d+").find(project.version.toString())?.value}-SNAPSHOT")
1212
implementation(libs.hikari)
1313
implementation(libs.mclogs.api) {
1414
exclude(group="*", module="*")

plugin/common/src/main/java/org/screamingsandals/bedwars/commands/admin/SpawnerCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.screamingsandals.bedwars.game.ItemSpawnerImpl;
3030
import org.screamingsandals.bedwars.game.TeamImpl;
3131
import org.screamingsandals.bedwars.lang.LangKeys;
32+
import org.screamingsandals.bedwars.lang.LangUtils;
3233
import org.screamingsandals.bedwars.utils.ArenaUtils;
3334
import org.screamingsandals.lib.hologram.Hologram;
3435
import org.screamingsandals.lib.lang.Message;
@@ -339,7 +340,7 @@ public void construct(CommandManager<CommandSender> manager, Command.Builder<Com
339340
sender.sendMessage(Message.of(LangKeys.ADMIN_ARENA_EDIT_SUCCESS_SPAWNER_INITIAL_INTERVAL_SET)
340341
.placeholder("type", itemSpawner.getItemSpawnerType().toSpawnerType(game).getItemName())
341342
.placeholder("interval", value)
342-
.placeholder("unit", Message.of(LangKeys.toUnitLangKey(unit, value != 1)))
343+
.placeholder("unit", Message.of(LangUtils.toUnitLangKey(unit, value != 1)))
343344
.defaultPrefix()
344345
);
345346
}))

0 commit comments

Comments
 (0)