Merge branch 'dev/feature' into feature/multiline-function-args

Author: Efnilite

.gitattributes

@@ -1,53 +1,51 @@
- # .gitattributes snippet to force users to use same line endings for project.
-        #
-        # Handle line endings automatically for files detected as text
-        # and leave all files detected as binary untouched.
-        * text eol=lf
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text eol=lf
 
-        #
-        # The above will handle all files NOT found below
-        # https://help.github.com/articles/dealing-with-line-endings/
-        # https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
+# The above will handle all files NOT found below
+# https://help.github.com/articles/dealing-with-line-endings/
+# https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
 
+# These files are text and should be normalized (Convert crlf => lf)
+*.php text
+*.css text
+*.js text
+*.json text
+*.htm text
+*.html text
+*.xml text
+*.txt text
+*.ini text
+*.inc text
+*.pl text
+*.rb text
+*.py text
+*.scm text
+*.sql text
+*.htaccess text
+*.sh text
+*.java text
 
+# These files are Windows-specific and should retain crlf
+*.bat text eol=crlf
 
-        # These files are text and should be normalized (Convert crlf => lf)
-        *.php text
-        *.css text
-        *.js text
-        *.json text
-        *.htm text
-        *.html text
-        *.xml text
-        *.txt text
-        *.ini text
-        *.inc text
-        *.pl text
-        *.rb text
-        *.py text
-        *.scm text
-        *.sql text
-        .htaccess text
-        *.sh text
-        *.java text
-
-        # These files are binary and should be left untouched
-        # (binary is a macro for -text -diff)
-        *.png binary
-        *.jpg binary
-        *.jpeg binary
-        *.gif binary
-        *.ico binary
-        *.mov binary
-        *.mp4 binary
-        *.mp3 binary
-        *.flv binary
-        *.fla binary
-        *.swf binary
-        *.gz binary
-        *.zip binary
-        *.7z binary
-        *.ttf binary
-        *.pyc binary
-	*.jar binary
-	*.class binary
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.flv binary
+*.fla binary
+*.swf binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.pyc binary
+*.jar binary
+*.class binary

.github/workflows/archive-docs.yml

@@ -2,43 +2,43 @@ name: Archive documentation
 
 on:
   release:
-    types: [published]
+    types: [ published ]
   workflow_dispatch:
 
 jobs:
   archive-docs:
-      if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
-      runs-on: ubuntu-latest
-      steps:
-          - name: Configure workflow
-            id: configuration
-            run: |
-              echo "BRANCH_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-              echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/archives/${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-              echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
-              echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
-          - name: Checkout Skript
-            uses: actions/checkout@v6
-            with:
-                submodules: recursive
-                path: skript
-          - name: Setup documentation environment
-            uses: ./skript/.github/workflows/docs/setup-docs
-            with:
-                docs_deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
-                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
-          - name: Generate documentation
-            uses: ./skript/.github/workflows/docs/generate-docs
-            with:
-                docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
-                docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
-                skript_repo_dir: ${{ steps.configuration.outputs.SKRIPT_REPO_DIR }}
-                is_release: true
-                generate_javadocs: true
-          - name: Push archive documentation
-            uses: ./skript/.github/workflows/docs/push-docs
-            with:
-                docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
-                git_name: Archive Docs Bot
-                git_email: archivedocs@skriptlang.org
-                git_commit_message: "Update ${{ steps.configuration.outputs.BRANCH_NAME }} archive docs"
+    if: "! contains(toJSON(github.event.commits.*.message), '[ci skip]')"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Configure workflow
+        id: configuration
+        run: |
+          echo "BRANCH_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+          echo "DOCS_OUTPUT_DIR=${GITHUB_WORKSPACE}/skript-docs/docs/archives/${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          echo "DOCS_REPO_DIR=${GITHUB_WORKSPACE}/skript-docs" >> $GITHUB_OUTPUT
+          echo "SKRIPT_REPO_DIR=${GITHUB_WORKSPACE}/skript" >> $GITHUB_OUTPUT
+      - name: Checkout Skript
+        uses: actions/checkout@v6
+        with:
+          submodules: recursive
+          path: skript
+      - name: Setup documentation environment
+        uses: ./skript/.github/workflows/docs/setup-docs
+        with:
+          docs_repo: "SkriptLang/skript-docs"
+          docs_token: ${{ secrets.DOCS_TOKEN }}
+      - name: Generate documentation
+        uses: ./skript/.github/workflows/docs/generate-docs
+        with:
+          docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
+          docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+          skript_repo_dir: ${{ steps.configuration.outputs.SKRIPT_REPO_DIR }}
+          is_release: true
+          generate_javadocs: true
+      - name: Push archive documentation
+        uses: ./skript/.github/workflows/docs/push-docs
+        with:
+          docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+          git_name: Archive Docs Bot
+          git_email: archivedocs@skriptlang.org
+          git_commit_message: "Update ${{ steps.configuration.outputs.BRANCH_NAME }} archive docs"

.github/workflows/checkstyle.yml

@@ -16,7 +16,7 @@ jobs:
               with:
                   submodules: recursive
             - name: validate gradle wrapper
-              uses: gradle/actions/wrapper-validation@v5
+              uses: gradle/actions/wrapper-validation@v6
             - name: Set up JDK 21
               uses: actions/setup-java@v5
               with:

.github/workflows/cleanup-docs.yml

@@ -17,14 +17,14 @@ jobs:
       - name: Checkout Skript
         uses: actions/checkout@v6
         with:
-            ref: ${{ github.event.repository.default_branch }}
-            submodules: recursive
-            path: skript
+          ref: ${{ github.event.repository.default_branch }}
+          submodules: recursive
+          path: skript
       - name: Setup documentation environment
         uses: ./skript/.github/workflows/docs/setup-docs
         with:
-            docs_deploy_key: ${{ secrets.DOCS_DEPLOY_KEY }}
-            docs_output_dir: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
+          docs_repo: "SkriptLang/skript-docs"
+          docs_token: ${{ secrets.DOCS_TOKEN }}
       - name: Cleanup nightly documentation
         env:
           DOCS_OUTPUT_DIR: ${{ steps.configuration.outputs.DOCS_OUTPUT_DIR }}
@@ -33,7 +33,7 @@ jobs:
       - name: Push nightly documentation cleanup
         uses: ./skript/.github/workflows/docs/push-docs
         with:
-            docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
-            git_name: Nightly Docs Bot
-            git_email: nightlydocs@skriptlang.org
-            git_commit_message: "Delete ${{ steps.configuration.outputs.BRANCH_NAME }} branch nightly docs"
+          docs_repo_dir: ${{ steps.configuration.outputs.DOCS_REPO_DIR }}
+          git_name: Nightly Docs Bot
+          git_email: nightlydocs@skriptlang.org
+          git_commit_message: "Delete ${{ steps.configuration.outputs.BRANCH_NAME }} branch nightly docs"

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

@@ -28,7 +28,7 @@ jobs:
               with:
                   submodules: recursive
             - name: validate gradle wrapper
-              uses: gradle/actions/wrapper-validation@v5
+              uses: gradle/actions/wrapper-validation@v6
             - name: Set up JDK 21
               uses: actions/setup-java@v5
               with:

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

@@ -28,7 +28,7 @@ jobs:
               with:
                   submodules: recursive
             - name: validate gradle wrapper
-              uses: gradle/actions/wrapper-validation@v5
+              uses: gradle/actions/wrapper-validation@v6
             - name: Set up JDK 21
               uses: actions/setup-java@v5
               with:

.github/workflows/repo.yml

@@ -12,7 +12,7 @@ jobs:
               with:
                   submodules: recursive
             - name: validate gradle wrapper
-              uses: gradle/actions/wrapper-validation@v5
+              uses: gradle/actions/wrapper-validation@v6
             - name: Set up JDK 21
               uses: actions/setup-java@v5
               with:

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

@@ -34,7 +34,7 @@ jobs:
           sed -i "s|^distributionUrl=.*$|distributionUrl=${LATEST_GRADLE_DOWNLOAD_URL}|" gradle/wrapper/gradle-wrapper.properties
           ./gradlew wrapper --gradle-version ${LATEST_GRADLE_VERSION}
       - name: Validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
       - name: Build Skript and run test scripts
         run: ./gradlew clean quickTest
       - name: Commit and push changes

build.gradle

@@ -4,7 +4,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 import java.time.LocalTime
 
 plugins {
-	id 'com.gradleup.shadow' version '9.2.2'
+	id 'com.gradleup.shadow' version '9.4.1'
 	id 'maven-publish'
 	id 'java'
 	id 'checkstyle'
@@ -27,7 +27,6 @@ allprojects {
 dependencies {
 	shadow group: 'io.papermc', name: 'paperlib', version: '1.0.8'
 	shadow group: 'org.bstats', name: 'bstats-bukkit', version: '3.1.0'
-	shadow group: 'net.kyori', name: 'adventure-text-serializer-bungeecord', version: '4.4.1'
 
 	implementation group: 'io.papermc.paper', name: 'paper-api', version: '1.21.11-R0.1-SNAPSHOT'
 	implementation group: 'com.google.code.findbugs', name: 'findbugs', version: '3.0.1'
@@ -105,7 +104,6 @@ tasks.withType(ShadowJar).configureEach {
 		include(dependency('io.papermc:paperlib'))
 		include(dependency('org.bstats:bstats-bukkit'))
 		include(dependency('org.bstats:bstats-base'))
-		include(dependency('net.kyori:adventure-text-serializer-bungeecord'))
 	}
 	relocate 'io.papermc.lib', 'ch.njol.skript.paperlib'
 	relocate 'org.bstats', 'ch.njol.skript.bstats'

code-conventions.md

@@ -141,7 +141,25 @@ but this is not strictly required:
   String string = "example string " +
         "with more to add";
   ```
-  
+
+#### Module Organization
+
+When creating modules, they should be organized in the following manner:
+```text
+module
+|- elements
+|  |- expressions
+|  |  |- ExprX.java
+|  |- effects
+|  |  |- EffY.java
+|- submodule
+|  |- elements
+|  |- Submodule.java
+|- Module.java
+```
+
+#### Syntax Class Organization
+
 * When extending one of following classes: SimpleExpression, SimplePropertyExpression, Effect, Condition...
   - Put overridden methods in order
   - Put static registration before all methods
@@ -153,7 +171,6 @@ but this is not strictly required:
   - Section: init -> walk -> toString
   - Structure: init -> (preLoad) -> load -> (postLoad) -> unload -> (postUnload) -> (getPriority) -> toString
 
-
 ### Naming
 * Class names are written in `UpperCamelCase`
   - The file name should match its primary class name (e.g. `MyClass` goes in `MyClass.java`.)