Skip to content

Commit

Permalink
feat: adds support for MC 1.16.2
Browse files Browse the repository at this point in the history
  • Loading branch information
timbru31 committed Aug 12, 2020
1 parent 3376b65 commit 8692076
Show file tree
Hide file tree
Showing 8 changed files with 517 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/maven-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
mkdir -p BuildTools
cd BuildTools
wget -q https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
[ -f ~/.m2/repository/org/bukkit/craftbukkit/1.15.2-R0.1-SNAPSHOT/craftbukkit-1.16.2-R0.1-SNAPSHOT.jar ] || java -jar BuildTools.jar --rev 1.16.2
[ -f ~/.m2/repository/org/bukkit/craftbukkit/1.15.2-R0.1-SNAPSHOT/craftbukkit-1.16.1-R0.1-SNAPSHOT.jar ] || java -jar BuildTools.jar --rev 1.16.1
[ -f ~/.m2/repository/org/bukkit/craftbukkit/1.15.2-R0.1-SNAPSHOT/craftbukkit-1.15.2-R0.1-SNAPSHOT.jar ] || java -jar BuildTools.jar --rev 1.15.2 --compile craftbukkit
[ -f ~/.m2/repository/org/bukkit/craftbukkit/1.14.4-R0.1-SNAPSHOT/craftbukkit-1.14.4-R0.1-SNAPSHOT.jar ] || java -jar BuildTools.jar --rev 1.14.4 --compile craftbukkit
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This Bukkit (compatible with CraftBukkit, Spigot, Paper) plugin adds a way to ob
- Economy addon [SilkSpawnersEcoAddon](https://dev.bukkit.org/projects/silkspawnersecoaddon)
- Shop addon [SilkSpawnersShopAddon](https://spigotmc.org/resources/12028/) (login required, Premium Plugin)
- BossBarAPI support for >= 1.9, otherwise BarAPI can be used
- Support for multiple Minecraft versions, from 1.8.X to 1.16.1
- Support for multiple Minecraft versions, from 1.8.X to 1.16.2

_Third party features, all of them can be disabled_

Expand Down Expand Up @@ -306,6 +306,7 @@ Please follow the Sun Coding Guidelines, thanks!
Unfortunately, I can't give access to https://repo.dustplanet.de/artifactory/private due to the DMCA of CraftBukkit and the prohibiton to distribute those binaries. To successfully build SilkSpawners using Maven, you must first run Spigot's BuildTools for several versions in order to compile each module - this will populate the local `.m2` cache of yours.

```sh
java -jar BuildTools.jar --rev 1.16.2
java -jar BuildTools.jar --rev 1.16.1
java -jar BuildTools.jar --rev 1.15.2 --compile craftbukkit
java -jar BuildTools.jar --rev 1.14.4 --compile craftbukkit
Expand Down Expand Up @@ -349,7 +350,7 @@ The file `./plugins/bStats/config.yml` contains an option to _opt-out_.

## Donation

[![PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif "Donation via PayPal")](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=T9TEV7Q88B9M2)
[![PayPal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif 'Donation via PayPal')](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=T9TEV7Q88B9M2)

![BitCoin](https://dustplanet.de/wp-content/uploads/2015/01/bitcoin-logo-plain.png "Donation via BitCoins")
![BitCoin](https://dustplanet.de/wp-content/uploads/2015/01/bitcoin-logo-plain.png 'Donation via BitCoins')
1NnrRgdy7CfiYN63vKHiypSi3MSctCP55C
2 changes: 1 addition & 1 deletion modules/API/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version>
<version>1.16.2-R0.1-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
8 changes: 7 additions & 1 deletion modules/SilkSpawners/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version>
<version>1.16.2-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>
Expand Down Expand Up @@ -185,6 +185,12 @@
<version>6.3.2-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>de.dustplanet</groupId>
<artifactId>silkspawners-v1_16_R2</artifactId>
<version>6.3.2-SNAPSHOT</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>de.dustplanet</groupId>
<artifactId>silkspawners-API</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class SilkSpawners extends JavaPlugin {
private static final int PLUGIN_ID = 35_890;
private static final int BSTATS_PLUGIN_ID = 273;
private static final String[] COMPATIBLE_MINECRAFT_VERSIONS = { "v1_8_R1", "v1_8_R2", "v1_8_R3", "v1_9_R1", "v1_9_R2", "v1_10_R1",
"v1_11_R1", "v1_12_R1", "v1_13_R1", "v1_13_R2", "v1_14_R1", "v1_15_R1", "v1_16_R1" };
"v1_11_R1", "v1_12_R1", "v1_13_R1", "v1_13_R2", "v1_14_R1", "v1_15_R1", "v1_16_R1", "v1_16_R2" };
public CommentedConfiguration config;
public CommentedConfiguration localization;
public CommentedConfiguration mobs;
Expand Down
39 changes: 39 additions & 0 deletions modules/v1_16_R2/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>silkspawners-v1_16_R2</artifactId>
<packaging>jar</packaging>
<name>SilkSpawners for v1_16_R2</name>
<version>6.3.2-SNAPSHOT</version>

<parent>
<groupId>de.dustplanet</groupId>
<artifactId>silkspawners-parent</artifactId>
<version>6.3.2-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.16.2-R0.1-SNAPSHOT</version>
<type>jar</type>
<exclusions>
<exclusion>
<groupId>org.spigotmc</groupId>
<artifactId>minecraft-server</artifactId>
</exclusion>
<exclusion>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-parent</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>de.dustplanet</groupId>
<artifactId>silkspawners-API</artifactId>
<version>6.3.2-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit 8692076

Please sign in to comment.