Version 1.5 Update

APickledWalrus · Sep 26, 2020 · 2e1dcc9 · 2e1dcc9
1 parent 82bead1
commit 2e1dcc9
Show file tree

Hide file tree

Showing 22 changed files with 538 additions and 733 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,3 +15,9 @@ jobs:
         java-version: 1.8
     - name: Build with Gradle
       run: ./gradlew build
+    - name: Upload artifact
+      uses: actions/upload-artifact@v2
+      if: success()
+      with:
+        name: skript-placeholders-dev
+        path: build/libs/skript-placeholders.jar
diff --git a/build.gradle b/build.gradle
@@ -14,9 +14,10 @@ repositories {
 }
 
 dependencies {
+    implementation 'org.eclipse.jdt:org.eclipse.jdt.annotation:1.1.0'
     implementation 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT'
     implementation 'com.github.SkriptLang:Skript:2.3'
-    implementation 'me.clip:placeholderapi:2.10.6'
+    implementation 'me.clip:placeholderapi:2.10.8'
     implementation('be.maximvdw:MVdWPlaceholderAPI:3.0.1-SNAPSHOT') {
     	exclude group: 'org.spigotmc'
     }

diff --git a/src/main/java/io/github/apickledwalrus/placeholderaddon/mvdwapi/MvdwAPIEvent.java b/src/main/java/io/github/apickledwalrus/placeholderaddon/mvdwapi/MvdwAPIEvent.java
diff --git a/src/main/java/io/github/apickledwalrus/placeholderaddon/mvdwapi/MvdwAPIListener.java b/src/main/java/io/github/apickledwalrus/placeholderaddon/mvdwapi/MvdwAPIListener.java
diff --git a/...in/java/io/github/apickledwalrus/placeholderaddon/placeholderapi/PlaceholderAPIEvent.java b/...in/java/io/github/apickledwalrus/placeholderaddon/placeholderapi/PlaceholderAPIEvent.java
diff --git a/...va/io/github/apickledwalrus/placeholderaddon/skript/events/EvtMvdwPlaceholderRequest.java b/...va/io/github/apickledwalrus/placeholderaddon/skript/events/EvtMvdwPlaceholderRequest.java
diff --git a/...va/io/github/apickledwalrus/placeholderaddon/skript/events/EvtPapiPlaceholderRequest.java b/...va/io/github/apickledwalrus/placeholderaddon/skript/events/EvtPapiPlaceholderRequest.java
diff --git a/...ava/io/github/apickledwalrus/placeholderaddon/skript/expressions/ExprMvdwPlaceholder.java b/...ava/io/github/apickledwalrus/placeholderaddon/skript/expressions/ExprMvdwPlaceholder.java