Skip to content

Commit f2f9e37

Browse files
committed
fix build
1 parent 4c0d370 commit f2f9e37

File tree

5 files changed

+74
-25
lines changed

5 files changed

+74
-25
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Buils RandomSpawnPlus
1+
name: Buils RandomSpawnPlus5 - Gradle
22

33
on: [ push ]
44

@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/setup-java@v3
1414
with:
1515
distribution: "temurin"
16-
java-version: 17
16+
java-version: 8
1717
- name: Grant execute permission for gradlew
1818
run: chmod +x gradlew
1919
- name: Build

.github/workflows/maven.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Build RandomSpawnPlus5 - Maven
2+
3+
on: [ push ]
4+
5+
jobs:
6+
build:
7+
name: Build
8+
runs-on: ubuntu-latest
9+
if: "!contains(github.event.commits[0].message, '[ci-skip]')"
10+
steps:
11+
- uses: actions/checkout@v3
12+
- name: Set up JDK 17
13+
uses: actions/setup-java@v3
14+
with:
15+
java-version: '17'
16+
distribution: 'temurin'
17+
cache: maven
18+
- name: Build with Maven
19+
run: mvn -B package --file pom.xml
20+
- name: Upload RandomSpawnPlus5
21+
uses: actions/upload-artifact@v3
22+
with:
23+
name: RandomSpawnPlus5-maven
24+
path: target/

build.gradle

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@ repositories {
2222
}
2323
maven { url = "https://repo.aikar.co/content/groups/aikar/" }
2424
maven { url = "https://hub.spigotmc.org/nexus/content/groups/public/" }
25-
maven { url 'https://jitpack.io' }
25+
maven { url = "https://jitpack.io" }
2626
}
2727

2828
dependencies {
2929
compileOnly 'io.papermc.paper:paper-api:1.19-R0.1-SNAPSHOT'
3030
compileOnly 'org.projectlombok:lombok:1.18.24'
31-
compileOnly 'net.essentialsx:EssentialsX:2.19.0'
31+
compileOnly 'net.essentialsx:EssentialsX:2.19.4'
3232
compileOnly 'net.luckperms:api:5.4'
3333
compileOnly "com.github.MilkBowl:VaultAPI:1.7"
3434
implementation "co.aikar:acf-paper:0.5.1-SNAPSHOT"
3535
implementation "io.papermc:paperlib:1.0.7"
36+
annotationProcessor 'org.projectlombok:lombok:1.18.24'
3637
}
3738

3839
def targetJavaVersion = 17
@@ -45,12 +46,6 @@ java {
4546
}
4647
}
4748

48-
tasks.withType(JavaCompile).configureEach {
49-
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
50-
options.release = targetJavaVersion
51-
}
52-
}
53-
5449
processResources {
5550
def props = [version: version]
5651
inputs.properties props

pom.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>systems.kscott</groupId>
88
<artifactId>randomspawnplus</artifactId>
9-
<version>3.4.3</version>
9+
<version>5.0.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>RandomSpawnPlus</name>
@@ -38,7 +38,7 @@
3838
<relocations>
3939
<relocation>
4040
<pattern>co.aikar.commands</pattern>
41-
<shadedPattern>systems.kscott.randomspawnplus3.acf</shadedPattern> <!-- Replace this -->
41+
<shadedPattern>systems.kscott.randomspawnplus.acf</shadedPattern> <!-- Replace this -->
4242
</relocation>
4343
</relocations>
4444
</configuration>
@@ -71,15 +71,15 @@
7171
<repositories>
7272
<repository>
7373
<id>papermc-repo</id>
74-
<url>https://papermc.io/repo/repository/maven-public/</url>
74+
<url>https://repo.papermc.io/repository/maven-public/</url>
7575
</repository>
7676
<repository>
7777
<id>sonatype</id>
7878
<url>https://oss.sonatype.org/content/groups/public/</url>
7979
</repository>
8080
<repository>
8181
<id>ess-repo</id>
82-
<url>https://ci.ender.zone/plugin/repository/everything/</url>
82+
<url>https://repo.essentialsx.net/releases/</url>
8383
</repository>
8484
<repository>
8585
<id>aikar</id>
@@ -93,9 +93,9 @@
9393

9494
<dependencies>
9595
<dependency>
96-
<groupId>com.destroystokyo.paper</groupId>
96+
<groupId>io.papermc.paper</groupId>
9797
<artifactId>paper-api</artifactId>
98-
<version>1.15.2-R0.1-SNAPSHOT</version>
98+
<version>1.19-R0.1-SNAPSHOT</version>
9999
<scope>provided</scope>
100100
</dependency>
101101
<dependency>
@@ -106,30 +106,30 @@
106106
<dependency>
107107
<groupId>org.projectlombok</groupId>
108108
<artifactId>lombok</artifactId>
109-
<version>1.18.12</version>
109+
<version>1.18.24</version>
110110
<scope>provided</scope>
111111
</dependency>
112112
<dependency>
113-
<groupId>net.ess3</groupId>
113+
<groupId>net.essentialsx</groupId>
114114
<artifactId>EssentialsX</artifactId>
115-
<version>2.17.0</version>
115+
<version>2.19.4</version>
116116
<scope>provided</scope>
117117
</dependency>
118118
<dependency>
119119
<groupId>co.aikar</groupId>
120-
<artifactId>acf-PAPER</artifactId>
121-
<version>0.5.0-SNAPSHOT</version>
120+
<artifactId>acf-paper</artifactId>
121+
<version>0.5.1-SNAPSHOT</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>io.papermc</groupId>
125125
<artifactId>paperlib</artifactId>
126-
<version>1.0.2</version>
126+
<version>1.0.7</version>
127127
<scope>compile</scope>
128128
</dependency>
129129
<dependency>
130130
<groupId>net.luckperms</groupId>
131131
<artifactId>api</artifactId>
132-
<version>5.0</version>
132+
<version>5.4</version>
133133
<scope>provided</scope>
134134
</dependency>
135135
<dependency>
@@ -139,4 +139,4 @@
139139
<scope>provided</scope>
140140
</dependency>
141141
</dependencies>
142-
</project>
142+
</project>

src/main/resources/plugin.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,36 @@
11
name: RandomSpawnPlus5
22
version: '${version}'
3-
main: systems.kscott.randomspawnplus.Randomspawnplus
3+
main: systems.kscott.randomspawnplus.RandomSpawnPlus
44
api-version: 1.19
5+
softdepend: [Essentials, Factions, Vault, LuckPerms]
56
authors: [ 89apt89, Dreeam ]
67
description: A comprehensive random spawning plugin for modern Minecraft versions.
8+
load: POSTWORLD
9+
10+
commands:
11+
wild:
12+
description: Get a wild spawn
13+
usage: /wild [player]
14+
rsp:
15+
description: Main plugin command
16+
usage: /rsp
17+
18+
permissions:
19+
randomspawnplus.randomspawn:
20+
description: Enable random spawns
21+
default: op
22+
randomspawnplus.wild:
23+
description: Teleport to a random location
24+
default: op
25+
randomspawnplus.wild.others:
26+
description: Teleport others to a random location
27+
default: op
28+
randomspawnplus.wild.bypasscooldown:
29+
description: Bypass the teleport cooldown
30+
default: op
31+
randomspawnplus.wild.bypasscost:
32+
description: Bypass the /wild cost
33+
default: op
34+
randomspawnplus.manage:
35+
description: Access to the /rsp (and /rsp reload) command
36+
default: op

0 commit comments

Comments
 (0)