Merge pull request 'Standalone FightSystem' (#326) from standalone into master

Reviewed-on: #326
Reviewed-by: YoyoNow <jwsteam@nidido.de>

BUILDING.md

@@ -1,23 +0,0 @@
-# Building
-
-Building SteamWar.de software requires certain libraries,
-which cannot be provided over traditional ways (like maven)
-due to copyright issues with compiled Spigot packages.
-For building these libraries have to be named in a lib
-directory named like in the following list.
-A subset of the following libraries is required to build this software
-(this is the list for being able to build all SteamWar.de software):
-
-    - BungeeCord.jar            https://ci.md-5.net/job/BungeeCord/
-    - BungeeTabListPlus.jar     https://www.spigotmc.org/resources/bungeetablistplus.313/
-    - PersistentBungeeCore.jar  https://steamwar.de/devlabs/SteamWar/PersistentBungeeCore
-    - ProtocolLib.jar           https://www.spigotmc.org/resources/protocollib.1997/
-    - Spigot-1.8.jar            https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.8.9)
-    - Spigot-1.9.jar            https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.9.4)
-    - Spigot-1.10.jar           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.10.2)
-    - Spigot-1.12.jar           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.12.2)
-    - Spigot-1.14.jar           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.14.4)
-    - Spigot-1.15.jar           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.15.2)
-    - SpigotCore.jar            https://steamwar.de/devlabs/SteamWar/SpigotCore
-    - WorldEdit-1.12.jar        https://dev.bukkit.org/projects/worldedit/files (6.1.9)
-    - WorldEdit-1.15.jar        https://dev.bukkit.org/projects/worldedit/files (newest)

FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.java

@@ -19,6 +19,8 @@
 
 package de.steamwar.fightsystem;
 
+import com.comphenix.tinyprotocol.TinyProtocol;
+import de.steamwar.core.Core;
 import de.steamwar.fightsystem.commands.*;
 import de.steamwar.fightsystem.countdown.*;
 import de.steamwar.fightsystem.event.HellsBells;
@@ -56,6 +58,11 @@ public class FightSystem extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        if(Core.getInstance() == null) {
+            Core.setInstance(this);
+            TinyProtocol.init();
+        }
+
         message = new Message("de.steamwar.fightsystem.FightSystem", FightSystem.class.getClassLoader());
 
         new EntityDamage();

FightSystem_Core/src/de/steamwar/fightsystem/commands/AkCommand.java

@@ -19,7 +19,9 @@
 
 package de.steamwar.fightsystem.commands;
 
+import de.steamwar.core.Core;
 import de.steamwar.fightsystem.ArenaMode;
+import de.steamwar.fightsystem.FightSystem;
 import de.steamwar.fightsystem.fight.Kit;
 import de.steamwar.fightsystem.states.FightState;
 import de.steamwar.fightsystem.states.StateDependentCommand;
@@ -42,8 +44,10 @@ public class AkCommand implements CommandExecutor {
             return false;
         }
         Player player = (Player) sender;
+        if(!player.isOp())
+            return false;
 
-        if(SteamwarUser.get(player.getUniqueId()).getUserGroup() != UserGroup.Developer){
+        if(SteamwarUser.get(player.getUniqueId()).getUserGroup() != UserGroup.Developer && Core.getInstance() != FightSystem.getPlugin()){
             return false;
         }
 

FightSystem_Standalone/pom.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     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/>.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>steamwar</groupId>
+        <artifactId>FightSystem</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <properties>
+        <main.basedir>${project.basedir}/..</main.basedir>
+    </properties>
+
+    <artifactId>FightSystem_Standalone</artifactId>
+    <version>1.0</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <artifactSet>
+                        <includes>
+                            <include>steamwar:FightSystem_Main</include>
+                        </includes>
+                    </artifactSet>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeArtifactIds>SpigotCore</includeArtifactIds>
+                            <excludes>plugin.yml,META-INF/**</excludes>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <finalName>FightSystem_Standalone</finalName>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>steamwar</groupId>
+            <artifactId>FightSystem_Main</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    
+</project>

README.md

@@ -1,2 +1,36 @@
 # FightSystem
 
+## Server setup
+
+**Currently FightSystem takes more or less total control over the server, so using a server running FightSystem as server
+for different purposes is currently not possible.**
+
+1. Install a WorldEdit plugin and the FightSystem plugin on the server
+2. Start the server once (will instantly shutdown due to missing FightSystem configuration)
+3. Configure FightSystem by modifying `plugins/FightSystem/config.yml`
+4. Create a `backup` folder inside your world folder and copy your `region` folder and `level.dat` into it
+5. Create a `config.yml` in the world folder and configure the file as described at the end of `plugins/FightSystem/config.yml`
+6. Start and join the server (as op), create a basic kit, save it with `/ak [kitname]`
+7. Configure the kit as default kit
+8. Restart the server and have fun!
+
+To start a server in the testarena mode start the server with the flag `-DfightID=-1` prior to `-jar`.
+
+## Compiling
+
+Building SteamWar.de software requires certain libraries,
+which cannot be provided over traditional ways (like maven)
+due to copyright issues with compiled Spigot packages.
+The following libraries are required to be in the `lib`
+directory exactly named like in the list:
+
+- `Spigot-1.8.jar`            https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.8.9)
+- `Spigot-1.9.jar`            https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.9.4)
+- `Spigot-1.10.jar`           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.10.2)
+- `Spigot-1.12.jar`           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.12.2)
+- `Spigot-1.14.jar`           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.14.4)
+- `Spigot-1.15.jar`           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.15.2)
+- `Spigot-1.18.jar`           https://hub.spigotmc.org/jenkins/job/BuildTools/ (1.18.1, Use the jar from Spigot/Spigot-Server/target)
+- `SpigotCore.jar`            https://steamwar.de/devlabs/SteamWar/SpigotCore
+- `WorldEdit-1.12.jar`        https://dev.bukkit.org/projects/worldedit/files (6.1.9)
+- `WorldEdit-1.15.jar`        https://dev.bukkit.org/projects/worldedit/files (newest)

pom.xml

@@ -60,6 +60,7 @@
         <module>FightSystem_18</module>
         <module>FightSystem_Core</module>
         <module>FightSystem_Main</module>
+        <module>FightSystem_Standalone</module>
     </modules>
 
     <repositories>

steamwarci.yml

@@ -4,3 +4,4 @@ build:
 
 artifacts:
   "/binarys/fightsystem.jar": "FightSystem_Main/target/fightsystem.jar"
+  "/binarys/FightSystem_Standalone.jar": "FightSystem_Standalone/target/FightSystem_Standalone.jar"