Fix build

AlexProgrammerDE · AlexProgrammerDE · commit d0cf39f57ed9 · 2022-11-01T10:54:27.000+01:00
diff --git a/build-data/src/main/java/net/pistonmaster/pistonqueue/data/PluginData.java b/build-data/src/main/java/net/pistonmaster/pistonqueue/data/PluginData.java
@@ -1,4 +1,4 @@
-package net.pistonmaster.pistonmotd.data;
+package net.pistonmaster.pistonqueue.data;
 
 public class PluginData {
     public static final String NAME = "PistonMOTD";
diff --git a/buildSrc/src/main/kotlin/pq.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/pq.java-conventions.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 }
 
 dependencies {
+    implementation("org.jetbrains:annotations:20.1.0")
     compileOnly("org.projectlombok:lombok:1.18.24")
     annotationProcessor("org.projectlombok:lombok:1.18.24")
 }
diff --git a/buildSrc/src/main/kotlin/pq.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/pq.shadow-conventions.gradle.kts
@@ -29,4 +29,5 @@ fun ShadowJar.configureRelocations() {
     relocate("org.checkerframework", "net.pistonmaster.pistonqueue.shadow.checkerframework")
     relocate("org.yaml.snakeyaml", "net.pistonmaster.pistonqueue.shadow.snakeyaml")
     relocate("com.google.errorprone", "net.pistonmaster.pistonqueue.shadow.google.errorprone")
+    relocate("org.intellij.lang.annotations", "net.pistonmaster.pistonmotd.shadow.annotations.intellij")
 }
diff --git a/bukkit/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml
@@ -1,4 +1,4 @@
-# PistonQueue V${project.version}
+# PistonQueue V${version}
 # Note - Operators and users with the permission "queue.admin" will be excluded from restrictions.
 
 forceLocation: true # Force the user to remain in a certain position.
diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: PistonQueueBukkit
-version: ${project.version}
+version: ${version}
 api-version: 1.13
 main: net.pistonmaster.pistonqueue.bukkit.PistonQueueBukkit
 author: AlexProgrammerDE
diff --git a/bungee/src/main/resources/bungee.yml b/bungee/src/main/resources/bungee.yml
@@ -1,6 +1,6 @@
 name: PistonQueue
 main: net.pistonmaster.pistonqueue.bungee.PistonQueueBungee
-description: ${project.description}
-version: ${project.version}
+description: ${description}
+version: ${version}
 author: AlexProgrammerDE
 softDepends: [ "PistonMOTD" ]
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -5,4 +5,5 @@ plugins {
 dependencies {
     implementation("org.spongepowered:configurate-yaml:4.1.2")
     compileOnly("net.pistonmaster:pistonmotd-api:5.0.0-SNAPSHOT")
+    compileOnly("com.google.guava:guava:28.0-jre")
 }
diff --git a/shared/src/main/resources/proxy_config.yml b/shared/src/main/resources/proxy_config.yml
@@ -1,4 +1,4 @@
-# PistonQueue V${project.version}
+# PistonQueue V${version}
 # Make the main server the default one you log in to
 # READ ME: all colours are orange by default just add & and colour
 # to change the colours to your liking

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package net.pistonmaster.pistonmotd.data;`
	`1`	`+package net.pistonmaster.pistonqueue.data;`
`2`	`2`
`3`	`3`	`public class PluginData {`
`4`	`4`	`public static final String NAME = "PistonMOTD";`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
	`9`	`+ implementation("org.jetbrains:annotations:20.1.0")`
`9`	`10`	`compileOnly("org.projectlombok:lombok:1.18.24")`
`10`	`11`	`annotationProcessor("org.projectlombok:lombok:1.18.24")`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,5 @@ fun ShadowJar.configureRelocations() {`
`29`	`29`	`relocate("org.checkerframework", "net.pistonmaster.pistonqueue.shadow.checkerframework")`
`30`	`30`	`relocate("org.yaml.snakeyaml", "net.pistonmaster.pistonqueue.shadow.snakeyaml")`
`31`	`31`	`relocate("com.google.errorprone", "net.pistonmaster.pistonqueue.shadow.google.errorprone")`
	`32`	`+ relocate("org.intellij.lang.annotations", "net.pistonmaster.pistonmotd.shadow.annotations.intellij")`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# PistonQueue V${project.version}`
	`1`	`+# PistonQueue V${version}`
`2`	`2`	`# Note - Operators and users with the permission "queue.admin" will be excluded from restrictions.`
`3`	`3`
`4`	`4`	`forceLocation: true # Force the user to remain in a certain position.`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ plugins {`
`5`	`5`	`dependencies {`
`6`	`6`	`implementation("org.spongepowered:configurate-yaml:4.1.2")`
`7`	`7`	`compileOnly("net.pistonmaster:pistonmotd-api:5.0.0-SNAPSHOT")`
	`8`	`+ compileOnly("com.google.guava:guava:28.0-jre")`
`8`	`9`	`}`