13
0

Fix build and TutorialCommand

Dieser Commit ist enthalten in:
yoyosource 2022-08-22 21:35:08 +02:00
Ursprung bf34d8a8ba
Commit 5f9a9ffe49
2 geänderte Dateien mit 26 neuen und 4 gelöschten Zeilen

Datei anzeigen

@ -37,6 +37,18 @@ plugins {
id 'com.github.johnrengelman.shadow' version '5.0.0' id 'com.github.johnrengelman.shadow' version '5.0.0'
} }
ext.swdep = { s ->
if (file("${rootDir}/lib/${s}.jar").exists()) {
return files("${rootDir}/lib/${s}.jar")
} else {
if (s.contains("-")) {
return "de.steamwar:${s.toLowerCase().replace('-', ':')}"
} else {
return "de.steamwar:${s.toLowerCase()}:RELEASE"
}
}
}
group 'de.steamwar' group 'de.steamwar'
version '' version ''
@ -81,6 +93,14 @@ sourceSets {
repositories { repositories {
mavenCentral() mavenCentral()
maven {
url = uri('https://steamwar.de/maven/')
credentials {
username = steamwarProperties.getProperty("maven.username")
password = steamwarProperties.getProperty("maven.password")
}
}
} }
dependencies { dependencies {
@ -89,8 +109,8 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok:1.18.22' annotationProcessor 'org.projectlombok:lombok:1.18.22'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly files("${projectDir}/lib/SpigotCore.jar") compileOnly swdep("SpigotCore")
compileOnly files("${projectDir}/lib/Spigot-1.15.jar") compileOnly swdep("Spigot-1.15")
} }
task buildProject { task buildProject {

Datei anzeigen

@ -1,7 +1,9 @@
package de.steamwar.tutorial.commands; package de.steamwar.tutorial.commands;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.comms.packets.ExecuteCommandPacket; import de.steamwar.network.NetworkSender;
import de.steamwar.network.packets.client.ExecuteCommandPacket;
import de.steamwar.sql.SteamwarUser;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class TutorialCommand extends SWCommand { public class TutorialCommand extends SWCommand {
@ -16,6 +18,6 @@ public class TutorialCommand extends SWCommand {
} }
public static void rate(Player player) { public static void rate(Player player) {
new ExecuteCommandPacket(player, "tutorial rate " + System.getProperty("tutorial")).send(player); NetworkSender.send(new ExecuteCommandPacket(SteamwarUser.get(player).getId(), "tutorial rate " + System.getProperty("tutorial")), player);
} }
} }