Skip to content

Commit 3547812

Browse files
test setup with 2 servers
1 parent 3f7dd30 commit 3547812

File tree

7 files changed

+96
-15
lines changed

7 files changed

+96
-15
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
.gradle
2-
build/
1+
/.gradle/
2+
/.idea/
3+
/build/
34
!gradle/wrapper/gradle-wrapper.jar
45
!**/src/main/**/build/
56
!**/src/test/**/build/

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/workspace.xml

Lines changed: 54 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
plugins {
22
id 'java'
33
id 'xyz.jpenilla.run-velocity' version '2.3.1'
4+
id 'xyz.jpenilla.run-paper' version '2.3.1'
45
}
56

67
group = 'org.zeroBzeroT'
7-
version = '2.0.0'
8+
version = "${project.plugin_version}"
89
description = 'A Velocity plugin for the hover player list in the server list.'
910

1011
repositories {
@@ -13,9 +14,9 @@ repositories {
1314
}
1415

1516
dependencies {
16-
// Velocity API
17-
// https://repo.papermc.io/service/rest/repository/browse/maven-public/com/velocitypowered/velocity-api/
18-
compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: "3.4.0-SNAPSHOT"
17+
compileOnly group: 'com.velocitypowered', name: 'velocity-api', version: "${project.velocity_api_version}"
18+
annotationProcessor group: 'com.velocitypowered', name: 'velocity-api', version: "${project.velocity_api_version}"
19+
implementation group: 'org.bstats', name: 'bstats-velocity', version: '3.1.0'
1920
}
2021

2122
java {
@@ -36,20 +37,40 @@ processResources {
3637
}
3738
}
3839

39-
test {
40-
useJUnitPlatform()
41-
}
40+
// put jar artifact in build/dist/
41+
jar.destinationDirectory.set(layout.buildDirectory.dir('dist'))
4242

43+
// test setup
44+
runPaper.disablePluginJarDetection()
4345
tasks {
4446
runVelocity {
45-
runDirectory = layout.projectDirectory.dir('run')
47+
runDirectory = layout.projectDirectory.dir('run').dir('proxy')
4648
dependsOn('build')
47-
systemProperty('com.mojang.eula.agree', 'true')
48-
velocityVersion("3.4.0-SNAPSHOT")
49+
velocityVersion("${project.velocity_api_version}")
4950
downloadPlugins {
5051
url("https://github.com/ViaVersion/ViaBackwards/releases/download/5.3.2/ViaBackwards-5.3.2.jar")
5152
url("https://github.com/ViaVersion/ViaVersion/releases/download/5.3.2/ViaVersion-5.3.2.jar")
5253
url("https://github.com/zeroBzeroT/AnarchyQueue/releases/download/3.0.8/AnarchyQueue-3.0.8-INDEV.jar")
5354
}
5455
}
56+
57+
tasks.register('runServerMain', runServer.getClass() as Class<Task>) {
58+
minecraftVersion("${project.minecraft_version}")
59+
systemProperty('com.mojang.eula.agree', 'true')
60+
systemProperty('Paper.skipServerPropertiesComments', 'true')
61+
runDirectory = layout.projectDirectory.dir('run').dir('main')
62+
dependsOn('build')
63+
}
64+
65+
tasks.register('runServerQueue', runServer.getClass() as Class<Task>) {
66+
minecraftVersion("${project.minecraft_version}")
67+
systemProperty('com.mojang.eula.agree', 'true')
68+
systemProperty('Paper.skipServerPropertiesComments', 'true')
69+
runDirectory = layout.projectDirectory.dir('run').dir('queue')
70+
downloadPlugins {
71+
github("zeroBzeroT", "QueueServerPlugin", "3.0.0-SNAPSHOT", "queueplugin-3.0.0-SNAPSHOT+1.20.6-paper.jar")
72+
url("https://ci.dmulloy2.net/job/ProtocolLib/723/artifact/build/libs/ProtocolLib.jar")
73+
}
74+
dependsOn('build')
75+
}
5576
}

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
plugin_version=2.0.0
2+
velocity_api_version=3.4.0-SNAPSHOT
3+
minecraft_version=1.20.4

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rootProject.name = 'ServerPingPlayerList'
1+
rootProject.name = 'ServerPingPlayerList'

0 commit comments

Comments
 (0)