Bumped to Java 16 & 1.17

This commit is contained in:
SBDeveloper 2021-07-21 12:44:38 +02:00
parent 2105904ba2
commit 30041b6210
5 changed files with 21 additions and 53 deletions

View file

@ -1,7 +0,0 @@
# ShowAPI
Make perfect shows with this API!
It will support Spigot 1.9.x - 1.16.x.
This API is still in development. Updates will follow soon.

59
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>nl.SBDeveloper</groupId> <groupId>nl.SBDeveloper</groupId>
<artifactId>ShowAPI</artifactId> <artifactId>ShowAPI</artifactId>
<version>1.2</version> <version>1.3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>ShowAPI</name> <name>ShowAPI</name>
<url>https://sbdplugins.nl</url> <url>https://sbdplugins.nl</url>
@ -16,12 +16,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<distributionManagement> <pluginRepositories>
<repository> <pluginRepository>
<id>iobyte-nexus</id> <id>maven-snapshots</id>
<url>https://nexus.iobyte.nl/repository/maven-releases</url> <url>https://repository.apache.org/content/repositories/snapshots/</url>
</repository> </pluginRepository>
</distributionManagement> </pluginRepositories>
<build> <build>
<defaultGoal>clean package</defaultGoal> <defaultGoal>clean package</defaultGoal>
@ -30,9 +30,9 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.9.0-SNAPSHOT</version>
<configuration> <configuration>
<release>11</release> <release>16</release>
<compilerArgs> <compilerArgs>
<arg>-parameters</arg> <arg>-parameters</arg>
</compilerArgs> </compilerArgs>
@ -41,7 +41,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version> <version>3.3.1-SNAPSHOT</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -78,33 +78,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<executions>
<execution>
<id>default-deploy</id>
<phase>deploy</phase>
<goals>
<goal>deploy</goal>
</goals>
</execution>
</executions>
<configuration>
<serverId>nexus</serverId>
<nexusUrl>https://nexus.iobyte.nl/</nexusUrl>
<skipStaging>true</skipStaging>
</configuration>
</plugin>
</plugins> </plugins>
<resources> <resources>
<resource> <resource>
@ -137,25 +110,25 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>1.16.4-R0.1-SNAPSHOT</version> <version>1.17.1-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.16.4-R0.1-SNAPSHOT</version> <version>1.17.1-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.inventivetalent</groupId> <groupId>org.inventivetalent</groupId>
<artifactId>apimanager</artifactId> <artifactId>apimanager</artifactId>
<version>1.0.3-SNAPSHOT</version> <version>1.0.5-SNAPSHOT</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains</groupId> <groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
<version>18.0.0</version> <version>21.0.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -167,12 +140,12 @@
<dependency> <dependency>
<groupId>com.github.cryptomorin</groupId> <groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId> <artifactId>XSeries</artifactId>
<version>7.8.0</version> <version>8.2.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.fierioziy.particlenativeapi</groupId> <groupId>com.github.fierioziy.particlenativeapi</groupId>
<artifactId>ParticleNativeAPI-plugin</artifactId> <artifactId>ParticleNativeAPI-plugin</artifactId>
<version>3.0.0</version> <version>3.1.0</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

View file

@ -7,7 +7,7 @@ public enum TriggerType {
FIREWORK(FireworkTrigger.class, 6), FIREWORK(FireworkTrigger.class, 6),
FAKE_FIREWORK(FakeFireworkTrigger.class, 7), FAKE_FIREWORK(FakeFireworkTrigger.class, 7),
SPOT(SpotTrigger.class, 6), SPOT(SpotTrigger.class, 6),
LASER(LaserTrigger.class, 6), // LASER(LaserTrigger.class, 6),
ANIMA(AnimaTrigger.class, 2), ANIMA(AnimaTrigger.class, 2),
PARTICLE(ParticleTrigger.class, 7); PARTICLE(ParticleTrigger.class, 7);

View file

@ -11,8 +11,10 @@ public class LaserTrigger extends TriggerTask {
private final String name; private final String name;
private Location newLocation; private Location newLocation;
//TODO Fix laser for 1.17
public LaserTrigger(String[] data) { public LaserTrigger(String[] data) {
super(TriggerType.LASER, data); //super(TriggerType.LASER, data);
super(null, data);
this.name = data[0]; this.name = data[0];

View file

@ -1,7 +1,7 @@
name: ShowAPI name: ShowAPI
version: ${project.version} version: ${project.version}
main: nl.sbdeveloper.showapi.ShowAPIPlugin main: nl.sbdeveloper.showapi.ShowAPIPlugin
api-version: 1.13 api-version: 1.17
authors: [SBDeveloper] authors: [SBDeveloper]
description: Make perfect shows with this API! description: Make perfect shows with this API!
website: https://sbdplugins.nl website: https://sbdplugins.nl