Skip to content

Develop #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrei1058 merged 23 commits into from
Feb 10, 2025
Merged

Develop #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
06c7a6e
Merge pull request #16 from andrei1058/master
andrei1058 Feb 9, 2023
198c8ed
fix prefix and suffix length
andrei1058 Feb 17, 2023
d6c01d4
Merge remote-tracking branch 'origin/develop' into develop
andrei1058 Feb 17, 2023
9decf18
fix prefix and suffix length
andrei1058 Feb 17, 2023
4877a0d
fix bw #662
andrei1058 Feb 17, 2023
684d894
check identifier length
andrei1058 Feb 25, 2023
fe6f92c
Merge branch 'master' into develop
andrei1058 Jun 25, 2023
e049569
Add 1_20_R1 Support (#28)
JT122406 Jun 25, 2023
48408c6
fix first line getting skipped
andrei1058 Oct 14, 2023
a80969b
fix placeholders being registered after title, fix first line getting…
andrei1058 Oct 14, 2023
8971c2b
fix placeholders being registered after title, fix first line getting…
andrei1058 Oct 15, 2023
70ddd0c
Merge branch 'master' into develop
andrei1058 Oct 28, 2023
809150b
Merge remote-tracking branch 'origin/master'
andrei1058 Oct 28, 2023
5f22878
Merge branch 'master' into develop
andrei1058 Oct 28, 2023
fb58396
clean up
andrei1058 Oct 28, 2023
7e65949
clean up (#37)
andrei1058 Oct 28, 2023
2e9384b
Add 1.20 R2 support (#38)
andrei1058 Oct 28, 2023
8a90929
workflow update
andrei1058 Feb 10, 2025
d77c7e6
Merge branch 'updateworkflow' into develop
andrei1058 Feb 10, 2025
d9a1d2f
papi version update
andrei1058 Feb 10, 2025
87ee90a
skip docs
andrei1058 Feb 10, 2025
f068373
version update
andrei1058 Feb 10, 2025
f763525
expose
andrei1058 Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/compile_snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 5 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-pom</artifactId>
<packaging>pom</packaging>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
<modules>
<module>sidebar-base</module>
<module>sidebar-v1_21_R1</module>
Expand All @@ -30,6 +30,10 @@
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
</repositories>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions sidebar-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -27,7 +27,7 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.11.3</version>
<version>2.11.6</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/PAPIAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 5 additions & 1 deletion sidebar-base/src/main/java/com/andrei1058/spigot/sidebar/SidebarManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -155,6 +155,10 @@ public SidebarProvider getSidebarProvider() {
return sidebarProvider;
}

public void setSidebarProvider(SidebarProvider sidebarProvider) {
this.sidebarProvider = sidebarProvider;
}

public static SidebarManager getInstance() {
return instance;
}
Expand Down
22 changes: 21 additions & 1 deletion sidebar-cmn1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<artifactId>sidebar-pom</artifactId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>

<artifactId>sidebar-cmn1</artifactId>
Expand Down Expand Up @@ -40,4 +40,24 @@
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>20</source>
<target>20</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion sidebar-v1_12_R1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_16_R3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_17_R1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_18_R2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_19_R2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_19_R3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_20_R1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_20_R2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_20_R3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_20_R4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_21_R1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion sidebar-v1_8_R3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>sidebar-pom</artifactId>
<groupId>com.andrei1058.spigot.sidebar</groupId>
<version>25.2</version>
<version>25.2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down