Merge branch 'refs/heads/master' into msgtoggle

Author: CitralFlo

README.md

@@ -81,15 +81,15 @@ For Maven projects use:
 
 For Gradle projects use:
 ```kts
-compileOnly("com.eternalcode:eternalcore-api:1.5.0")
+compileOnly("com.eternalcode:eternalcore-api:1.5.1")
 ```
 
 For Maven projects use:
 ```xml
 <dependency>
     <groupId>com.eternalcode</groupId>
     <artifactId>eternalcore-api</artifactId>
-    <version>1.5.0</version>
+    <version>1.5.1</version>
     <scope>provided</scope>
 </dependency>
 ```

buildSrc/src/main/kotlin/Versions.kt

@@ -15,7 +15,7 @@ object Versions {
     const val ADVENTURE_PLATFORM = "4.3.4"
     const val ADVENTURE_TEXT_MINIMESSAGE = "4.18.0"
     const val ADVENTURE_PLATFORM_FACET = "4.3.4"
-    const val CDN_CONFIGS = "1.14.5"
+    const val CDN_CONFIGS = "1.14.6"
 
     const val MARIA_DB = "3.5.1"
     const val POSTGRESQL = "42.7.4"

buildSrc/src/main/kotlin/eternalcode-java.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "com.eternalcode"
-version = "1.5.0"
+version = "1.5.1"
 
 checkstyle {
     toolVersion = "10.21.1"

buildSrc/src/main/kotlin/eternalcore-publish.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "com.eternalcode"
-version = "1.5.0"
+version = "1.5.1"
 
 java {
     withSourcesJar()

eternalcore-api/src/main/java/com/eternalcode/core/feature/warp/Warp.java

@@ -2,10 +2,26 @@
 
 import org.bukkit.Location;
 
+import java.util.List;
+import org.bukkit.permissions.Permissible;
+
 public interface Warp {
 
     Location getLocation();
 
     String getName();
 
+    List<String> getPermissions();
+
+    default boolean hasPermissions(Permissible permissible) {
+        List<String> permissions = this.getPermissions();
+        if (permissions.isEmpty()) {
+            return true;
+        }
+
+        return permissions
+            .stream()
+            .anyMatch(permission -> permissible.hasPermission(permission));
+    }
+
 }

eternalcore-api/src/main/java/com/eternalcode/core/feature/warp/WarpService.java

@@ -4,18 +4,23 @@
 
 import java.util.Collection;
 import java.util.Optional;
+import org.jetbrains.annotations.ApiStatus.Experimental;
 
 public interface WarpService {
 
     Warp createWarp(String name, Location location);
 
     void removeWarp(String warp);
 
-    boolean warpExists(String name);
+    @Experimental
+    Warp addPermissions(String warp, String... permissions);
 
-    Optional<Warp> findWarp(String name);
+    @Experimental
+    Warp removePermissions(String warp, String... permissions);
+
+    boolean isExist(String name);
 
-    Collection<String> getNamesOfWarps();
+    Optional<Warp> findWarp(String name);
 
-    boolean hasWarps();
+    Collection<Warp> getWarps();
 }

eternalcore-api/src/main/java/com/eternalcode/core/feature/warp/event/PreWarpTeleportEvent.java

@@ -1,10 +1,14 @@
 package com.eternalcode.core.feature.warp.event;
 
 import com.eternalcode.core.feature.warp.Warp;
+import com.google.common.base.Preconditions;
+import java.time.Duration;
+import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Called before teleportation to warp.
@@ -16,12 +20,15 @@ public class PreWarpTeleportEvent extends Event implements Cancellable {
     private final Player player;
     private Warp warp;
     private boolean cancelled;
+    private Duration teleportTime;
+    private @Nullable Location destination;
 
-    public PreWarpTeleportEvent(Player player, Warp warp) {
+    public PreWarpTeleportEvent(Player player, Warp warp, Duration teleportTime) {
         super(false);
 
         this.player = player;
         this.warp = warp;
+        this.teleportTime = teleportTime;
     }
 
     public Player getPlayer() {
@@ -33,9 +40,28 @@ public Warp getWarp() {
     }
 
     public void setWarp(Warp warp) {
+        Preconditions.checkNotNull(warp, "Warp cannot be null");
         this.warp = warp;
     }
 
+    public Duration getTeleportTime() {
+        return this.teleportTime;
+    }
+
+    public void setTeleportTime(Duration teleportTime) {
+        Preconditions.checkNotNull(teleportTime, "Teleport time cannot be null");
+        this.teleportTime = teleportTime;
+    }
+
+    public Location getDestination() {
+        return this.destination != null ? this.destination : this.warp.getLocation();
+    }
+
+    public void setDestination(Location destination) {
+        Preconditions.checkNotNull(destination, "Destination cannot be null");
+        this.destination = destination;
+    }
+
     @Override
     public boolean isCancelled() {
         return this.cancelled;

eternalcore-api/src/main/java/com/eternalcode/core/feature/warp/event/WarpTeleportEvent.java

@@ -1,8 +1,8 @@
 package com.eternalcode.core.feature.warp.event;
 
 import com.eternalcode.core.feature.warp.Warp;
+import org.bukkit.Location;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
@@ -15,12 +15,14 @@ public class WarpTeleportEvent extends Event {
 
     private final Player player;
     private final Warp warp;
+    private final Location destination;
 
-    public WarpTeleportEvent(Player player, Warp warp) {
+    public WarpTeleportEvent(Player player, Warp warp, Location destination) {
         super(false);
 
         this.player = player;
         this.warp = warp;
+        this.destination = destination;
     }
 
     public Player getPlayer() {
@@ -31,6 +33,10 @@ public Warp getWarp() {
         return this.warp;
     }
 
+    public Location getDestination() {
+        return this.destination;
+    }
+
     @Override
     public HandlerList getHandlers() {
         return HANDLER_LIST;

eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/LocationsConfiguration.java

@@ -1,8 +1,8 @@
 package com.eternalcode.core.configuration.implementation;
 
+import com.eternalcode.commons.bukkit.position.Position;
 import com.eternalcode.core.configuration.ReloadableConfig;
 import com.eternalcode.core.injector.annotations.component.ConfigurationFile;
-import com.eternalcode.commons.bukkit.position.Position;
 import net.dzikoysk.cdn.entity.Description;
 import net.dzikoysk.cdn.entity.Exclude;
 import net.dzikoysk.cdn.source.Resource;
@@ -21,7 +21,8 @@ public class LocationsConfiguration implements ReloadableConfig {
     @Description("# This is spawn location, for your own safety, please don't touch it.")
     public Position spawn = EMPTY_POSITION;
 
-    @Description("# These are warp locations, for your own safety, please don't touch it.")
+    @Description("# Warps now are stored in warps.yml. This is deprecated.")
+    @Deprecated
     public Map<String, Position> warps = new HashMap<>();
 
     @Description("# This is jail location, for your own safety, please don't touch it.")

eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java

@@ -5,15 +5,13 @@
 import com.eternalcode.core.feature.afk.AfkSettings;
 import com.eternalcode.core.feature.automessage.AutoMessageSettings;
 import com.eternalcode.core.feature.chat.ChatSettings;
-import com.eternalcode.core.feature.jail.JailSettings;
 import com.eternalcode.core.feature.helpop.HelpOpSettings;
+import com.eternalcode.core.feature.jail.JailSettings;
 import com.eternalcode.core.feature.randomteleport.RandomTeleportSettingsImpl;
 import com.eternalcode.core.feature.spawn.SpawnSettings;
 import com.eternalcode.core.injector.annotations.Bean;
 import com.eternalcode.core.injector.annotations.component.ConfigurationFile;
 import com.eternalcode.core.feature.teleportrequest.TeleportRequestSettings;
-import java.util.LinkedHashMap;
-import java.util.Set;
 import net.dzikoysk.cdn.entity.Contextual;
 import net.dzikoysk.cdn.entity.Description;
 import net.dzikoysk.cdn.entity.Exclude;
@@ -24,7 +22,9 @@
 
 import java.io.File;
 import java.time.Duration;
+import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Set;
 
 @ConfigurationFile
 public class PluginConfiguration implements ReloadableConfig {
@@ -261,7 +261,7 @@ public Duration repairDelay() {
 
     @Contextual
     public static class Format {
-        public String separator = "&7, ";
+        public String separator = "<gray>,</gray> ";
     }
 
     @Bean
@@ -352,7 +352,6 @@ public static class Warp {
 
         @Description("# Texture of the item (only for PLAYER_HEAD material)")
         public String itemTexture = "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzk4ODVlODIzZmYxNTkyNjdjYmU4MDkwOTNlMzNhNDc2ZTI3NDliNjU5OGNhNGEyYTgxZWU2OTczODAzZmI2NiJ9fX0=";
-
     }
 
     @Description({ " ", "# Butcher" })