Added Wars API

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.angeschossen</groupId>
     <artifactId>LandsAPI</artifactId>
-    <version>4.9.2</version>
+    <version>4.9.3</version>
     <name>LandsAPI</name>
 
 

src/main/java/me/angeschossen/lands/api/events/war/WarDeclareEvent.java

@@ -1,6 +1,6 @@
 package me.angeschossen.lands.api.events.war;
 
-import me.angeschossen.lands.api.war.WarEntity;
+import me.angeschossen.lands.api.war.entity.WarEntity;
 import org.bukkit.Bukkit;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

src/main/java/me/angeschossen/lands/api/land/Land.java

@@ -6,7 +6,7 @@
 import me.angeschossen.lands.api.player.TrustedPlayer;
 import me.angeschossen.lands.api.role.enums.ManagementSetting;
 import me.angeschossen.lands.api.war.War;
-import me.angeschossen.lands.api.war.WarEntity;
+import me.angeschossen.lands.api.war.entity.WarEntity;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
@@ -172,7 +172,7 @@ public interface Land extends BalanceHolder, WarEntity {
 
     boolean canManagement(UUID playerUUID, ManagementSetting managementSetting);
 
-    boolean canManagement(Player player, ManagementSetting managementSetting, boolean sendMessage);
+    boolean canManagement(Player player, @NotNull ManagementSetting managementSetting, boolean sendMessage);
 
     /**
      * Get trusted player.

src/main/java/me/angeschossen/lands/api/war/War.java

@@ -1,34 +1,37 @@
 package me.angeschossen.lands.api.war;
 
 import me.angeschossen.lands.api.role.enums.RoleSetting;
+import me.angeschossen.lands.api.war.entity.WarEntity;
+import me.angeschossen.lands.api.war.entity.WarStats;
 import me.angeschossen.lands.api.war.enums.WarSetting;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
 
 public interface War {
 
-    boolean canAction(Player player, RoleSetting landsAction, @Nullable Material material, boolean sendMessage);
+    boolean canAction(@NotNull Player player, @NotNull RoleSetting landsAction, @Nullable Material material, boolean sendMessage);
 
-    boolean toggleRoleAction(RoleSetting landsAction);
+    boolean toggleRoleAction(@NotNull RoleSetting landsAction);
 
-    boolean toggleSetting(WarSetting warSetting);
+    boolean toggleSetting(@NotNull WarSetting warSetting);
 
-    int getId();
+    @NotNull
+    Set<RoleSetting> getRoleSettings();
 
-    Set<RoleSetting> getRoleActions();
-
-    boolean isParticipating(WarEntity entity);
+    boolean isParticipating(@NotNull WarEntity entity);
 
     boolean isEndingSoon();
 
-    boolean attackersWin();
-
+    @Nullable
     WarEntity getWinner();
 
+    @NotNull
     WarStats getAttackerStats();
 
+    @NotNull
     WarStats getDefenderStats();
 }

src/main/java/me/angeschossen/lands/api/war/WarDeclaration.java → src/main/java/me/angeschossen/lands/api/war/declaration/WarDeclaration.java

@@ -1,19 +1,17 @@
-package me.angeschossen.lands.api.war;
+package me.angeschossen.lands.api.war.declaration;
 
+import me.angeschossen.lands.api.war.War;
 import me.angeschossen.lands.api.war.enums.WarTeam;
 
-
 public interface WarDeclaration {
 
-    void stop();
-
     void setTribute(double tribute);
 
     double getTribute();
 
     double getMaxTribute(WarTeam warTeam);
 
-    boolean isValid();
-
     boolean startsSoon();
+
+    War start();
 }

src/main/java/me/angeschossen/lands/api/war/entity/WarEntity.java

@@ -0,0 +1,48 @@
+package me.angeschossen.lands.api.war.entity;
+
+import me.angeschossen.lands.api.holders.BalanceHolder;
+import me.angeschossen.lands.api.player.LandPlayer;
+import me.angeschossen.lands.api.war.enums.WarEntityType;
+import me.angeschossen.lands.api.war.enums.WarTeam;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.UUID;
+
+public interface WarEntity extends BalanceHolder {
+
+    @Nullable
+    WarTeam getWarTeam();
+
+    @NotNull
+    UUID getOwnerUID();
+
+    @NotNull
+    Collection<Player> getOnlinePlayers();
+
+    @NotNull
+    Collection<? extends LandPlayer> getOnlineLandPlayers();
+
+    boolean leaveWar();
+
+    void addWarShieldTime(long seconds);
+
+    boolean hasWarShield();
+
+    long getWarShield();
+
+    boolean hasWarEntity(@NotNull WarEntity entity);
+
+    boolean isInWar();
+
+    WarEntityType getType();
+
+    boolean isWarField();
+
+    @NotNull
+    WarStats getStats();
+
+    boolean isTrusted(@NotNull UUID uuid);
+}

src/main/java/me/angeschossen/lands/api/war/WarStats.java → src/main/java/me/angeschossen/lands/api/war/entity/WarStats.java

@@ -1,8 +1,7 @@
-package me.angeschossen.lands.api.war;
+package me.angeschossen.lands.api.war.entity;
 
 public interface WarStats {
 
-
     int getWon();
 
     int getLost();

src/main/java/me/angeschossen/lands/api/war/enums/WarSetting.java

@@ -1,26 +1,5 @@
 package me.angeschossen.lands.api.war.enums;
 
 public enum WarSetting {
-
-    FRIENDLY_FIRE(1);
-
-    private final int id;
-
-    WarSetting(int id) {
-        this.id = id;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public static WarSetting getById(int id) throws IllegalArgumentException{
-        for (WarSetting warSetting : values()) {
-            if (warSetting.getId() == id) {
-                return warSetting;
-            }
-        }
-
-        throw new IllegalArgumentException("No warsetting with id " + id + " found.");
-    }
+    FRIENDLY_FIRE
 }

src/main/java/me/angeschossen/lands/api/war/enums/WarTeam.java

@@ -1,6 +1,5 @@
 package me.angeschossen.lands.api.war.enums;
 
 public enum WarTeam {
-
     ATTACKER, DEFENDER, NEUTRAL
 }