SteamWar/BauSystem2.0
Archiviert
12
0

Move and update things
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed

Dieser Commit ist enthalten in:
yoyosource 2024-06-01 14:54:14 +02:00
Ursprung 5e8dbdc55c
Commit 410a48fd2c
20 geänderte Dateien mit 162 neuen und 265 gelöschten Zeilen

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -46,22 +46,10 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly libraries.base
annotationProcessor libraries.base
compileOnly project(":BauSystem_GUI")
annotationProcessor project(":BauSystem_GUI")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
}

Datei anzeigen

@ -0,0 +1,55 @@
/*
* This file is a part of the SteamWar software.
*
* Copyright (C) 2021 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
plugins {
id 'base'
id 'java'
}
apply from: '../module.gradle'
group 'steamwar'
version '1.0'
compileJava.options.encoding = 'UTF-8'
sourceCompatibility = 17
targetCompatibility = 17
sourceSets {
main {
java {
srcDirs = ['src/', 'build/generated/sources/annotationProcessor/java/main/']
}
resources {
srcDirs = ['src/']
exclude '**/*.java', '**/*.kt'
}
}
}
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly libraries.base
annotationProcessor libraries.base
compileOnly project(":BauSystem_GUI")
annotationProcessor project(":BauSystem_GUI")
}

Datei anzeigen

@ -1,23 +1,23 @@
/*
* This file is a part of the SteamWar software.
* This file is a part of the SteamWar software.
*
* Copyright (C) 2021 SteamWar.de-Serverteam
* Copyright (C) 2024 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.features.loadtimer;
package de.steamwar.bausystem.loadtimer;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.features.tpslimit.TPSUtils;

Datei anzeigen

@ -1,23 +1,23 @@
/*
* This file is a part of the SteamWar software.
* This file is a part of the SteamWar software.
*
* Copyright (C) 2021 SteamWar.de-Serverteam
* Copyright (C) 2024 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.features.loadtimer;
package de.steamwar.bausystem.loadtimer;
import de.steamwar.bausystem.region.Region;
import de.steamwar.command.SWCommand;

Datei anzeigen

@ -1,23 +1,23 @@
/*
* This file is a part of the SteamWar software.
* This file is a part of the SteamWar software.
*
* Copyright (C) 2021 SteamWar.de-Serverteam
* Copyright (C) 2024 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.features.loadtimer;
package de.steamwar.bausystem.loadtimer;
import de.steamwar.bausystem.BauSystem;
import de.steamwar.bausystem.Permission;

Datei anzeigen

@ -1,23 +1,23 @@
/*
* This file is a part of the SteamWar software.
* This file is a part of the SteamWar software.
*
* Copyright (C) 2021 SteamWar.de-Serverteam
* Copyright (C) 2024 SteamWar.de-Serverteam
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.steamwar.bausystem.features.loadtimer;
package de.steamwar.bausystem.loadtimer;
import de.steamwar.bausystem.region.Region;
import de.steamwar.linkage.Linked;
@ -30,7 +30,7 @@ import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.EntitySpawnEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import static de.steamwar.bausystem.features.loadtimer.Loadtimer.*;
import static de.steamwar.bausystem.loadtimer.Loadtimer.*;
@Linked
public class LoadtimerListener implements Listener {

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -45,19 +45,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -47,19 +47,7 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
implementation 'org.luaj:luaj-jse:3.0.1'
}

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -45,19 +45,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -46,24 +46,12 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly libraries.base
annotationProcessor libraries.base
compileOnly project(":BauSystem_GUI")
annotationProcessor project(":BauSystem_GUI")
compileOnly project(":BauSystem_Scoreboard")
annotationProcessor project(":BauSystem_Scoreboard")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
}

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -47,19 +47,6 @@ sourceSets {
dependencies {
implementation project(":BauSystem_PluginBase")
compileOnly 'org.projectlombok:lombok:1.18.22'
annotationProcessor 'org.projectlombok:lombok:1.18.22'
compileOnly 'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT'
// compileOnly 'com.mojang:authlib:1.5.25'
// compileOnly 'io.netty:netty-all:4.1.68.Final'
compileOnly swdep('Spigot-1.20')
compileOnly swdep('SpigotCore')
annotationProcessor swdep('SpigotCore')
compileOnly swdep('FastAsyncWorldEdit-1.18')
// compileOnly swdep('AxiomPaper')
// implementation 'org.luaj:luaj-jse:3.0.1'
compileOnly libraries.base
annotationProcessor libraries.base
}

Datei anzeigen

@ -68,6 +68,27 @@ allprojects {
}
}
ext.libraries = [
base: [
// Spigot Things
swdep('Spigot-1.20'),
'org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT',
'com.mojang:authlib:1.5.25',
'io.netty:netty-all:4.1.68.Final',
// Base Dependencies
swdep('SpigotCore'),
swdep('FastAsyncWorldEdit-1.18'),
swdep('AxiomPaper'),
// Lombok
'org.projectlombok:lombok:1.18.22',
// Other
'org.luaj:luaj-jse:3.0.1',
]
]
dependencies {
file('.').listFiles().each {
if (!it.isDirectory()) {