2.0 refactor

.github/workflows/gradle.yml

@@ -1,9 +1,5 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+# Builds both modules and runs their JUnit tests.
+# The Skript tests (skriptTest) are not run here: the skript-test Gradle plugin is only published to mavenLocal for now.
 
 name: Java CI with Gradle
 
@@ -12,6 +8,7 @@ on:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -23,21 +20,40 @@ jobs:
 
     steps:
     - uses: actions/checkout@v6
-    - name: Set up JDK 17
+    - name: Set up JDK 25
       uses: actions/setup-java@v5
       with:
-        java-version: '17'
+        java-version: '25'
         distribution: 'temurin'
-        cache: gradle
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Grant execute permission for gradlew
-      run: chmod +x gradlew 
-    - name: Build with Gradle
-      uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+      run: chmod +x gradlew
+    # 'build' runs the JUnit tests of shapes-lib and skript-particle before packaging the plugin
+    - name: Build and test with Gradle
+      run: ./gradlew build
+    # Shows the results on the job's summary page and annotates failing tests. annotate_only skips creating a
+    # separate check run, which would need 'checks: write' (and is unavailable to PRs from forks).
+    - name: Publish test results
+      uses: mikepenz/action-junit-report@v5
+      if: always()
       with:
-        arguments: build
+        report_paths: '*/build/test-results/test/TEST-*.xml'
+        annotate_only: true
+        detailed_summary: true
+        include_passed: true
+        group_suite: true
+    - name: Upload test reports
+      uses: actions/upload-artifact@v6
+      if: failure()
+      with:
+        name: test-reports
+        path: |
+          */build/reports/tests/test/
+          */build/test-results/test/*.xml
     - name: Upload Nightly Build
       uses: actions/upload-artifact@v6
       if: success()
       with:
-          name: skript-particle-nightly
-          path: build/libs/*
+        name: skript-particle-nightly
+        path: skript-particle/build/libs/*.jar

.gitignore

@@ -7,5 +7,8 @@
 /src/test/skriptparticle/
 CLAUDE.md
 /.claude
-/shapes-lib/build
-/skript-particle/build
+/shapes-lib/build/
+/skript-particle/build/
+/skript-particle/.gradle/
+/net/minecraft/network
+/benchmark

README.md

@@ -1,7 +1,7 @@
 # skript-particle
  Skript addon for creating complex particle effects with minimal hassle.
 
- **Requires Skript 2.14+, Java 21, Paper 1.21.1+**
+ **Requires Skript 2.16+, Java 21, Paper 1.21.1+**
 
  Download at the [releases page.](https://github.com/sovdeeth/skript-particle/releases) 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,2 +1,12 @@
+pluginManagement {
+    repositories {
+        mavenLocal()
+        gradlePluginPortal()
+        maven {
+            url 'https://repo.papermc.io/repository/maven-public/'
+        }
+    }
+}
+
 rootProject.name = 'skript-particle-root'
 include 'shapes-lib', 'skript-particle'

shapes-lib/build.gradle

@@ -10,8 +10,15 @@ repositories {
 
 dependencies {
     api "org.joml:joml:${jomlVersion}"
+    compileOnly 'org.jetbrains:annotations:24.0.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+tasks.named('test') {
+    useJUnitPlatform()
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(25))
 }

shapes-lib/src/main/java/com/sovdee/shapes/modifiers/Easable.java

@@ -0,0 +1,18 @@
+package com.sovdee.shapes.modifiers;
+
+/**
+ * Something that has an {@link EasingFunction}.
+ */
+public interface Easable {
+
+    /**
+     * @return the easing function used to distribute rotation along the axis
+     */
+    EasingFunction getEasing();
+
+    /**
+     * @param easing the easing function used to distribute rotation along the axis
+     */
+    void setEasing(EasingFunction easing);
+
+}