price check fix + time placeholder changes

BetterRTPAddons/pom.xml

@@ -109,7 +109,7 @@
         <dependency>
             <groupId>me.SuperRonanCraft</groupId>
             <artifactId>BetterRTP</artifactId>
-            <version>3.4.0</version>
+            <version>3.4.5</version>
             <scope>provided</scope>
         </dependency>
         <!-- ProtocolLib -->

pom.xml

@@ -7,7 +7,7 @@
     <groupId>me.SuperRonanCraft</groupId>
     <artifactId>BetterRTP</artifactId>
     <packaging>jar</packaging>
-    <version>3.5.0-DEV2</version>
+    <version>3.5.0-DEV3</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/Commands.java

@@ -4,20 +4,10 @@ import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.types.CmdTeleport;
 import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
 import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CommandEvent_After;
-import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP;
 import me.SuperRonanCraft.BetterRTP.references.messages.MessagesCore;
-import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownData;
-import me.SuperRonanCraft.BetterRTP.references.rtpinfo.CooldownHandler;
-import me.SuperRonanCraft.BetterRTP.player.rtp.RTPSetupInformation;
-import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE;
 import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CommandEvent;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldLocations;
 import org.bukkit.Bukkit;
-import org.bukkit.block.Biome;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/me/SuperRonanCraft/BetterRTP/player/events/Join.java

@@ -4,10 +4,8 @@ import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_TYPE;
 import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
-import me.SuperRonanCraft.BetterRTP.references.messages.Message;
 import me.SuperRonanCraft.BetterRTP.references.messages.Message_RTP;
 import me.SuperRonanCraft.BetterRTP.references.web.Updater;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.references.helpers.HelperRTP;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPLoader.java

@@ -1,7 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import me.SuperRonanCraft.BetterRTP.references.rtpinfo.PermissionGroup;
 import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.*;

src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPParticles.java

@@ -1,7 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPPotions.java

@@ -1,7 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;

src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java

@@ -1,11 +1,7 @@
 package me.SuperRonanCraft.BetterRTP.player.rtp;
 
-import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import me.SuperRonanCraft.BetterRTP.references.messages.Message;
-import me.SuperRonanCraft.BetterRTP.references.messages.Message_RTP;
-import me.SuperRonanCraft.BetterRTP.references.messages.MessagesCore;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 

src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTP_ERROR_REQUEST_REASON.java

@@ -9,7 +9,7 @@ public enum RTP_ERROR_REQUEST_REASON {
     WORLD_DISABLED(MessagesCore.DISABLED_WORLD),
     COOLDOWN(MessagesCore.COOLDOWN),
     PRICE_ECONOMY(MessagesCore.FAILED_PRICE),
-    PRICE_HUNGER(MessagesCore.FAILED_PRICE);
+    PRICE_HUNGER(MessagesCore.FAILED_HUNGER);
 
     @Getter private final MessagesCore msg;
 

src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepEconomy.java

@@ -1,7 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.depends;
 
 import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import me.SuperRonanCraft.BetterRTP.references.messages.MessagesCore;
@@ -9,7 +8,6 @@ import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldPlayer;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.GameMode;
-import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.RegisteredServiceProvider;
@@ -62,11 +60,7 @@ public class DepEconomy {
         int price = pWorld.getPrice();
         if (e != null && price != 0 && !PermissionNode.BYPASS_ECONOMY.check(sendi)) {
             try {
-                boolean passed_economy = e.getBalance(pWorld.getPlayer()) >= price;
+                return e.getBalance(pWorld.getPlayer()) >= price;
-                if (!passed_economy) {
-                    MessagesCore.FAILED_PRICE.send(sendi, price);
-                    return false;
-                }
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -82,11 +76,7 @@ public class DepEconomy {
         if (hunger != 0
                 && !PermissionNode.BYPASS_HUNGER.check(sendi)
                 && (player.getGameMode() == GameMode.SURVIVAL || player.getGameMode() == GameMode.ADVENTURE)) {
-            boolean has_hunger = player.getFoodLevel() > hunger;
+            return player.getFoodLevel() > hunger;
-            if (!has_hunger) {
-                MessagesCore.FAILED_HUNGER.send(sendi);
-                return false;
-            }
         }
         //Default value
         return true;

src/main/java/me/SuperRonanCraft/BetterRTP/references/depends/DepPlaceholderAPI.java

@@ -57,6 +57,13 @@ public class DepPlaceholderAPI extends PlaceholderExpansion {
         } else if (request.equalsIgnoreCase("canrtp")) {
             World world = player.getWorld();
             return canRTP(player, world);
+        } else if (request.startsWith("price")) {
+            if (request.equalsIgnoreCase("price")) {
+                return price(player, player.getWorld());
+            } else if (request.startsWith("price_")) {
+                World world = getWorld(request.replace("price_", ""));
+                return price(player, world);
+            }
         }
         return null;
     }
@@ -98,6 +105,14 @@ public class DepPlaceholderAPI extends PlaceholderExpansion {
         return BetterRTP.getInstance().getSettings().getPlaceholder_true();
     }
 
+    private String price(Player player, World world) {
+        if (world == null) return "Invalid World";
+        world = HelperRTP.getActualWorld(player, world);
+        RTPSetupInformation setupInformation = new RTPSetupInformation(world, player, player, true);
+        WorldPlayer pWorld = HelperRTP.getPlayerWorld(setupInformation);
+        return String.valueOf(pWorld.getPrice());
+    }
+
     private World getWorld(String world_name) {
         World world = null;
         if (world_name.length() > 0)

src/main/java/me/SuperRonanCraft/BetterRTP/references/file/FileBasics.java

@@ -1,116 +0,0 @@
-package me.SuperRonanCraft.BetterRTP.references.file;
-
-import me.SuperRonanCraft.BetterRTP.BetterRTP;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class FileBasics {
-
-    List<FILETYPE> types = new ArrayList<>();
-
-    void load() {
-        types.clear();
-        for (FILETYPE type : FILETYPE.values()) {
-            type.load();
-            types.add(type);
-        }
-    }
-
-    public enum FILETYPE {
-        CONFIG("config"),
-        ECO("economy"),
-        SIGNS("signs"),
-        EFFECTS("effects"),
-        LOCATIONS("locations"),
-        PLACEHOLDERS("placeholders")
-        ;
-
-        private final String fileName;
-        private final YamlConfiguration config = new YamlConfiguration();
-        private final File file;
-
-        FILETYPE(String str) {
-            this.fileName = str + ".yml";
-            this.file = new File(BetterRTP.getInstance().getDataFolder(), fileName);
-        }
-
-        //PUBLIC
-        public String getString(String path) {
-            if (config.isString(path))
-                return config.getString(path);
-            return "SOMETHING WENT WRONG";
-        }
-
-        public boolean getBoolean(String path) {
-            return config.getBoolean(path);
-        }
-
-        public int getInt(String path) {
-            return config.getInt(path);
-        }
-
-        public List<String> getStringList(String path) {
-            if (config.isList(path))
-                return config.getStringList(path);
-            return new ArrayList<>();
-        }
-
-        public ConfigurationSection getConfigurationSection(String path) {
-            return config.getConfigurationSection(path);
-        }
-
-        public boolean isString(String path) {
-            return config.isString(path);
-        }
-
-        public boolean isList(String path) {
-            return config.isList(path);
-        }
-
-        public List<Map<?, ?>> getMapList(String path) {
-            return config.getMapList(path);
-        }
-
-        public YamlConfiguration getConfig() {
-            return config;
-        }
-
-        public File getFile() {
-            return file;
-        }
-
-        public void setValue(String path, Object value) {
-            config.set(path, value);
-        }
-
-        //PROCCESSING
-        private void load() {
-            if (!file.exists()) {
-                BetterRTP.getInstance().saveResource(fileName, false);
-                try {
-                    config.load(file);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            } else {
-                try {
-                    config.load(file);
-                    final InputStream in = BetterRTP.getInstance().getResource(fileName);
-                    if (in != null) {
-                        config.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(in)));
-                        config.options().copyDefaults(true);
-                        in.close();
-                    }
-                    config.save(file);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-}

src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/HelperDate.java

@@ -5,6 +5,7 @@ import me.SuperRonanCraft.BetterRTP.references.settings.Settings;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.concurrent.TimeUnit;
 
 public class HelperDate {
@@ -21,6 +22,45 @@ public class HelperDate {
         return fromTo(0L, amount);
     }
 
+    /*public static void main(String[] args) {
+        long min = 0L;
+        long max = 11040000L;
+        long diffInMillies = max - min;
+        long days, hours, minutes, seconds;
+
+        days = TimeUnit.DAYS.convert(diffInMillies, TimeUnit.MILLISECONDS);
+        diffInMillies -= (((1000 * 60) * 60) * 24) * days;
+        hours = TimeUnit.HOURS.convert(diffInMillies, TimeUnit.MILLISECONDS);
+        diffInMillies -= ((1000 * 60) * 60) * hours;
+        minutes = TimeUnit.MINUTES.convert(diffInMillies, TimeUnit.MILLISECONDS);
+        diffInMillies -= (1000 * 60) * minutes;
+        seconds = TimeUnit.SECONDS.convert(diffInMillies, TimeUnit.MILLISECONDS);
+
+        LinkedList<String> lst = new LinkedList<>();
+        if (days > 0)
+            lst.add("{0} Days".replace("{0}", String.valueOf(days)));
+        if (hours > 0)
+            lst.add("{0} Hours".replace("{0}", String.valueOf(hours)));
+        if (minutes > 0)
+            lst.add("{0} Mins".replace("{0}", String.valueOf(minutes)));
+        if (seconds > 0)
+            lst.add("{0} Secs".replace("{0}", String.valueOf(seconds)));
+
+        StringBuilder time_str = new StringBuilder();
+
+        for (int i = 0; i < lst.size(); i++) {
+            String str = lst.get(i);
+            if (lst.size() - i - 1 >= 2) {
+                str += ", ";
+            } else if (lst.size() - 1 - i == 1) {
+                str += " and ";
+            }
+            time_str.append(str);
+        }
+
+        System.out.println(time_str);
+    }*/
+
     public static String fromTo(Long from, Long to) {
         Settings settings = BetterRTP.getInstance().getSettings();
         long min = Math.min(from, to);
@@ -40,15 +80,28 @@ public class HelperDate {
         diffInMillies -= (1000 * 60) * minutes;
         seconds = TimeUnit.SECONDS.convert(diffInMillies, TimeUnit.MILLISECONDS);
 
-        String time_str = "";
+        LinkedList<String> lst = new LinkedList<>();
         if (days > 0)
-            time_str += settings.getPlaceholder_timeDays().replace("{0}", String.valueOf(days));
+            lst.add(settings.getPlaceholder_timeDays().replace("{0}", String.valueOf(days)));
-        if (days > 0 || hours > 0)
+        if (hours > 0)
-            time_str += settings.getPlaceholder_timeHours().replace("{0}", String.valueOf(hours));
+            lst.add(settings.getPlaceholder_timeHours().replace("{0}", String.valueOf(hours)));
-        if (days > 0 || hours > 0 || minutes > 0)
+        if (minutes > 0)
-            time_str += settings.getPlaceholder_timeMinutes().replace("{0}", String.valueOf(minutes));
+            lst.add(settings.getPlaceholder_timeMinutes().replace("{0}", String.valueOf(minutes)));
-        time_str += settings.getPlaceholder_timeSeconds().replace("{0}", String.valueOf(seconds));
+        if (seconds > 0)
+            lst.add(settings.getPlaceholder_timeSeconds().replace("{0}", String.valueOf(seconds)));
 
-        return time_str;
+        StringBuilder time_str = new StringBuilder();
+
+        for (int i = 0; i < lst.size(); i++) {
+            String str = lst.get(i);
+            if (lst.size() - i - 1 >= 2) {
+                str += settings.getPlaceholder_timeSeparator_middle();
+            } else if (lst.size() - 1 - i == 1) {
+                str += settings.getPlaceholder_timeSeparator_last();
+            }
+            time_str.append(str);
+        }
+
+        return time_str.toString();
     }
 }

src/main/java/me/SuperRonanCraft/BetterRTP/references/helpers/HelperRTP_EditWorlds.java

@@ -2,9 +2,7 @@ package me.SuperRonanCraft.BetterRTP.references.helpers;
 
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.commands.types.CmdEdit;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
-import me.SuperRonanCraft.BetterRTP.references.messages.Message;
 import me.SuperRonanCraft.BetterRTP.references.messages.Message_RTP;
 import me.SuperRonanCraft.BetterRTP.references.messages.MessagesCore;
 import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WORLD_TYPE;

src/main/java/me/SuperRonanCraft/BetterRTP/references/messages/MessagesCore.java

@@ -29,7 +29,6 @@ public enum MessagesCore {
     SIGN("Sign"),
     MOVED("Moved"),
     ALREADY("Already"),
-    PREFIX("Prefix"),
     //EDIT
     EDIT_ERROR("Edit.Error"),
     EDIT_SET("Edit.Set"),

src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/CooldownHandler.java

@@ -5,11 +5,9 @@ import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.PermissionNode;
 import me.SuperRonanCraft.BetterRTP.references.database.DatabaseCooldowns;
 import me.SuperRonanCraft.BetterRTP.references.database.DatabaseHandler;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import me.SuperRonanCraft.BetterRTP.references.player.HelperPlayer;
 import me.SuperRonanCraft.BetterRTP.references.player.playerdata.PlayerData;
-import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.RTPWorld;
 import me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds.WorldPlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.World;

src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/worlds/WorldCustom.java

@@ -2,7 +2,6 @@ package me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds;
 
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_SHAPE;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import me.SuperRonanCraft.BetterRTP.references.messages.Message_RTP;
 import org.bukkit.Bukkit;

src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/worlds/WorldDefault.java

@@ -2,7 +2,6 @@ package me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds;
 
 
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_SHAPE;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import org.bukkit.World;

src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/worlds/WorldPermissionGroup.java

@@ -3,7 +3,6 @@ package me.SuperRonanCraft.BetterRTP.references.rtpinfo.worlds;
 import lombok.Getter;
 import lombok.NonNull;
 import me.SuperRonanCraft.BetterRTP.player.rtp.RTP_SHAPE;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import me.SuperRonanCraft.BetterRTP.references.messages.Message_RTP;

src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/Settings.java

@@ -1,8 +1,6 @@
 package me.SuperRonanCraft.BetterRTP.references.settings;
 
 import lombok.Getter;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
-import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 
 public class Settings {
@@ -35,6 +33,8 @@ public class Settings {
     @Getter private String placeholder_timeSeconds;
     @Getter private String placeholder_timeZero;
     @Getter private String placeholder_timeInf;
+    @Getter private String placeholder_timeSeparator_middle;
+    @Getter private String placeholder_timeSeparator_last;
 
 
     public void load() { //Load Settings
@@ -65,6 +65,8 @@ public class Settings {
         placeholder_timeSeconds = FileOther.FILETYPE.PLACEHOLDERS.getString("Config.TimeFormat.Seconds");
         placeholder_timeZero = FileOther.FILETYPE.PLACEHOLDERS.getString("Config.TimeFormat.ZeroAll");
         placeholder_timeInf = FileOther.FILETYPE.PLACEHOLDERS.getString("Config.TimeFormat.Infinite");
+        placeholder_timeSeparator_middle = FileOther.FILETYPE.PLACEHOLDERS.getString("Config.TimeFormat.Separator.Middle");
+        placeholder_timeSeparator_last = FileOther.FILETYPE.PLACEHOLDERS.getString("Config.TimeFormat.Separator.Last");
         depends.load();
     }
 

src/main/java/me/SuperRonanCraft/BetterRTP/references/settings/SoftDepends.java

@@ -3,7 +3,6 @@ package me.SuperRonanCraft.BetterRTP.references.settings;
 import lombok.Getter;
 import lombok.Setter;
 import me.SuperRonanCraft.BetterRTP.references.depends.regionPlugins.REGIONPLUGINS;
-import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.BetterRTP;
 import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
 import org.bukkit.Bukkit;

src/main/resources/placeholders.yml

@@ -6,16 +6,21 @@ betterrtp_cooldowntime: 'Get cooldown time subject to in current world'
 betterrtp_cooldowntime_<world_name>: 'Get cooldown time subject to in specified world'
 betterrtp_canrtp_<world_name>: 'Get the reason or yes output if player can rtp in set world'
 betterrtp_canrtp: 'Get the reason or yes output if player can rtp in current world'
+betterrtp_price: 'Get the price of rtp''ing in current world'
+betterrtp_price_<world_name>: 'Get the price of rtp''ing in specified world'
 
 ##Config section for placeholder outputs
 Config:
   TimeFormat:
-    Days: '{0} Day(s), '
+    Days: '{0} Day(s)'
-    Hours: '{0} Hours, '
+    Hours: '{0} Hour(s)'
-    Minutes: '{0} Mins and '
+    Minutes: '{0} Min(s)'
     Seconds: '{0} Secs'
     ZeroAll: 'None'
     Infinite: 'Inf'
+    Separator:
+      Middle:  ', ' #Ex: 1 Days, 5 Hours, 2 mins and 5 secs
+      Last:  ' and ' #Ex: 1 Mins and 10 Secs
   CanRTP:
     Success: '&aYes'
     NoPermission: '&cNo Permission'