Skip to content

Commit 67891cb

Browse files
committed
Merge branch 'dev/patch' into dev/feature
2 parents f14e614 + fa0fbba commit 67891cb

File tree

10 files changed

+18
-16
lines changed

10 files changed

+18
-16
lines changed

.github/workflows/archive-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
1919
echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
2020
- name: Checkout Skript
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
submodules: recursive
2424
path: skript

.github/workflows/checkstyle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v5
15+
- uses: actions/checkout@v6
1616
with:
1717
submodules: recursive
1818
- name: validate gradle wrapper
19-
uses: gradle/actions/wrapper-validation@v4
19+
uses: gradle/actions/wrapper-validation@v5
2020
- name: Set up JDK 21
2121
uses: actions/setup-java@v5
2222
with:
@@ -28,7 +28,7 @@ jobs:
2828
- name: Run checkstyle
2929
run: ./gradlew clean checkstyleMain
3030
- name: Upload checkstyle report
31-
uses: actions/upload-artifact@v4
31+
uses: actions/upload-artifact@v6
3232
if: success()
3333
with:
3434
name: checkstyle-report

.github/workflows/cleanup-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/nightly/${BRANCH_NAME}" >> $GITHUB_OUTPUT
1616
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
1717
- name: Checkout Skript
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919
with:
2020
ref: ${{ github.event.repository.default_branch }}
2121
submodules: recursive

.github/workflows/java-21-builds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
strategy:
2525
matrix: ${{ fromJSON(needs.prepare.outputs.matrix) }}
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
submodules: recursive
3030
- name: validate gradle wrapper
31-
uses: gradle/actions/wrapper-validation@v4
31+
uses: gradle/actions/wrapper-validation@v5
3232
- name: Set up JDK 21
3333
uses: actions/setup-java@v5
3434
with:
@@ -40,7 +40,7 @@ jobs:
4040
- name: Build Skript and run test scripts
4141
run: ./gradlew clean customTest -PtestEnvs="${{ matrix.envs }}" -PtestEnvJavaVersion=21
4242
- name: Upload Nightly Build
43-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@v6
4444
if: success() && matrix.id == 1
4545
with:
4646
name: skript-nightly

.github/workflows/junit-21-builds.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ jobs:
2424
strategy:
2525
matrix: ${{ fromJSON(needs.prepare.outputs.matrix) }}
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
submodules: recursive
3030
- name: validate gradle wrapper
31-
uses: gradle/actions/wrapper-validation@v4
31+
uses: gradle/actions/wrapper-validation@v5
3232
- name: Set up JDK 21
3333
uses: actions/setup-java@v5
3434
with:

.github/workflows/nightly-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
3434
echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
3535
- name: Checkout Skript
36-
uses: actions/checkout@v5
36+
uses: actions/checkout@v6
3737
with:
3838
submodules: recursive
3939
path: skript

.github/workflows/release-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
1919
echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
2020
- name: Checkout Skript
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
submodules: recursive
2424
path: skript

.github/workflows/repo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
publish:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v5
11+
- uses: actions/checkout@v6
1212
with:
1313
submodules: recursive
1414
- name: validate gradle wrapper
15-
uses: gradle/actions/wrapper-validation@v4
15+
uses: gradle/actions/wrapper-validation@v5
1616
- name: Set up JDK 21
1717
uses: actions/setup-java@v5
1818
with:

.github/workflows/update-gradle-wrapper.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
permissions:
1111
contents: write
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
with:
1515
submodules: recursive
1616
- name: Set up JDK 21
@@ -34,7 +34,7 @@ jobs:
3434
sed -i "s|^distributionUrl=.*$|distributionUrl=${LATEST_GRADLE_DOWNLOAD_URL}|" gradle/wrapper/gradle-wrapper.properties
3535
./gradlew wrapper --gradle-version ${LATEST_GRADLE_VERSION}
3636
- name: Validate gradle wrapper
37-
uses: gradle/wrapper-validation-action@v2
37+
uses: gradle/actions/wrapper-validation@v5
3838
- name: Build Skript and run test scripts
3939
run: ./gradlew clean quickTest
4040
- name: Commit and push changes

src/main/java/org/skriptlang/skript/bukkit/base/types/ItemStackClassInfo.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import ch.njol.skript.classes.ClassInfo;
99
import ch.njol.skript.classes.ConfigurationSerializer;
1010
import ch.njol.skript.classes.Parser;
11+
import ch.njol.skript.expressions.base.EventValueExpression;
1112
import ch.njol.skript.lang.ParseContext;
1213
import org.bukkit.Material;
1314
import org.bukkit.enchantments.Enchantment;
@@ -46,6 +47,7 @@ public ItemStackClassInfo() {
4647
.parser(new ItemStackParser())
4748
.cloner(ItemStack::clone)
4849
.serializer(new ConfigurationSerializer<>())
50+
.defaultExpression(new EventValueExpression<>(ItemStack.class))
4951
.property(Property.AMOUNT,
5052
"The number of items in this stack. Can be set.",
5153
Skript.instance(),

0 commit comments

Comments
 (0)