diff --git a/.github/workflows/compile_snapshot.yml b/.github/workflows/compile_snapshot.yml index 541730a..0135b4f 100644 --- a/.github/workflows/compile_snapshot.yml +++ b/.github/workflows/compile_snapshot.yml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '21' - distribution: 'adopt' + distribution: 'temurin' - name: Deploy snapshot with Maven env: MVN_REPO_USER: ${{ secrets.MVN_REPO_USER }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8214a94..9130d03 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '21' - distribution: 'adopt' + distribution: 'temurin' - name: Deploy with Maven env: MVN_REPO_USER: ${{ secrets.MVN_REPO_USER }} diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index 17487bf..2e05684 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: '21' - distribution: 'adopt' + distribution: 'temurin' - name: Deploy snapshot with Maven env: MVN_REPO_USER: ${{ secrets.MVN_REPO_USER }} diff --git a/pom.xml b/pom.xml index 9388c5c..7bc8aa4 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.andrei1058.spigot.sidebar sidebar-pom pom - 25.2 + 25.2.1-SNAPSHOT sidebar-base sidebar-v1_21_R1 @@ -30,6 +30,10 @@ spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + placeholderapi + https://repo.extendedclip.com/content/repositories/placeholderapi/ + diff --git a/sidebar-base/pom.xml b/sidebar-base/pom.xml index 2506779..faa2152 100644 --- a/sidebar-base/pom.xml +++ b/sidebar-base/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 @@ -27,7 +27,7 @@ me.clip placeholderapi - 2.11.3 + 2.11.6 provided diff --git a/sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/PAPIAdapter.java b/sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/PAPIAdapter.java index a0e7eda..aedcd08 100644 --- a/sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/PAPIAdapter.java +++ b/sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/PAPIAdapter.java @@ -7,7 +7,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -class PAPIAdapter implements PAPISupport { +public class PAPIAdapter implements PAPISupport { @Override public String replacePlaceholders(Player p, String s) { return PlaceholderAPI.setPlaceholders(p, s); diff --git a/sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/SidebarManager.java b/sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/SidebarManager.java index eca3a30..91f2bfc 100644 --- a/sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/SidebarManager.java +++ b/sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/SidebarManager.java @@ -16,7 +16,7 @@ public class SidebarManager { private static SidebarManager instance; - private final SidebarProvider sidebarProvider; + private SidebarProvider sidebarProvider; private PAPISupport papiSupport = new PAPISupport() { @Override public String replacePlaceholders(Player p, String s) { @@ -155,6 +155,10 @@ public SidebarProvider getSidebarProvider() { return sidebarProvider; } + public void setSidebarProvider(SidebarProvider sidebarProvider) { + this.sidebarProvider = sidebarProvider; + } + public static SidebarManager getInstance() { return instance; } diff --git a/sidebar-cmn1/pom.xml b/sidebar-cmn1/pom.xml index b5d6f5f..bf5f25b 100644 --- a/sidebar-cmn1/pom.xml +++ b/sidebar-cmn1/pom.xml @@ -6,7 +6,7 @@ com.andrei1058.spigot.sidebar sidebar-pom - 25.2 + 25.2.1-SNAPSHOT sidebar-cmn1 @@ -40,4 +40,24 @@ provided + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 20 + 20 + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + \ No newline at end of file diff --git a/sidebar-v1_12_R1/pom.xml b/sidebar-v1_12_R1/pom.xml index dfc9a3b..318a733 100644 --- a/sidebar-v1_12_R1/pom.xml +++ b/sidebar-v1_12_R1/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_16_R3/pom.xml b/sidebar-v1_16_R3/pom.xml index 56e973c..5cfa2fc 100644 --- a/sidebar-v1_16_R3/pom.xml +++ b/sidebar-v1_16_R3/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_17_R1/pom.xml b/sidebar-v1_17_R1/pom.xml index 6ebf3e4..f40da2d 100644 --- a/sidebar-v1_17_R1/pom.xml +++ b/sidebar-v1_17_R1/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_18_R2/pom.xml b/sidebar-v1_18_R2/pom.xml index 9d2165d..084f4af 100644 --- a/sidebar-v1_18_R2/pom.xml +++ b/sidebar-v1_18_R2/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_19_R2/pom.xml b/sidebar-v1_19_R2/pom.xml index 266b2c4..f105f7c 100644 --- a/sidebar-v1_19_R2/pom.xml +++ b/sidebar-v1_19_R2/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_19_R3/pom.xml b/sidebar-v1_19_R3/pom.xml index 832fd39..52d1c5e 100644 --- a/sidebar-v1_19_R3/pom.xml +++ b/sidebar-v1_19_R3/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_20_R1/pom.xml b/sidebar-v1_20_R1/pom.xml index fe7688c..1d0de9f 100644 --- a/sidebar-v1_20_R1/pom.xml +++ b/sidebar-v1_20_R1/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_20_R2/pom.xml b/sidebar-v1_20_R2/pom.xml index cbbffe7..fafd146 100644 --- a/sidebar-v1_20_R2/pom.xml +++ b/sidebar-v1_20_R2/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_20_R3/pom.xml b/sidebar-v1_20_R3/pom.xml index 8d5dac1..e3f3d80 100644 --- a/sidebar-v1_20_R3/pom.xml +++ b/sidebar-v1_20_R3/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_20_R4/pom.xml b/sidebar-v1_20_R4/pom.xml index 3407a5d..a8ee94b 100644 --- a/sidebar-v1_20_R4/pom.xml +++ b/sidebar-v1_20_R4/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_21_R1/pom.xml b/sidebar-v1_21_R1/pom.xml index 8ddd317..1aff02b 100644 --- a/sidebar-v1_21_R1/pom.xml +++ b/sidebar-v1_21_R1/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0 diff --git a/sidebar-v1_8_R3/pom.xml b/sidebar-v1_8_R3/pom.xml index f388adc..2b73d21 100644 --- a/sidebar-v1_8_R3/pom.xml +++ b/sidebar-v1_8_R3/pom.xml @@ -5,7 +5,7 @@ sidebar-pom com.andrei1058.spigot.sidebar - 25.2 + 25.2.1-SNAPSHOT 4.0.0