Plugin rewrite #20

Author: piotrwyrw

config.yml

@@ -27,10 +27,6 @@ messages:
   mine_regen_all: '&7All mines have been regenerated.'
   permission_denied: '&cPermission denied.'
   must_be_player: '&cYou must be a player to excecute this command.'
-  could_not_save_economy: '&cCould not save economy.'
-  could_not_save_tickets: '&cCould not save tickets.'
-  economy_saved: '&7Economy was saved to a file.'
-  tickets_saved: '&7Tickets were saved to a file'
   reload_complete: '&7Reload complete.'
   seller_received: '&7You received a seller chest.'
   can_not_do_that_here: '&7You can not do that here!'

plugin.yml

@@ -1,9 +1,9 @@
 name: AntaresPrison
-version: 1.4
+version: 1.5
 api-version: 1.15
 depend: [PlaceholderAPI, Multiverse-Core]
 authors: [piotrwyrw, nathen418]
-description: Special thanks to the whole Antares community for helping to test and improve this plugin.
+description: Thanks to the whole Antares community for helping to develop this plugin!
 load: POSTWORLD
 main: org.piotrwyrw.antares.prison.AntaresPrison
 commands:

src/org/piotrwyrw/antares/prison/AntaresPrison.java

@@ -2,28 +2,27 @@
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
+import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.piotrwyrw.antares.prison.commands.PrisonCommand;
 import org.piotrwyrw.antares.prison.constants.MessageConstants;
 import org.piotrwyrw.antares.prison.events.*;
 import org.piotrwyrw.antares.prison.objects.MineAutoRegen;
+import org.piotrwyrw.antares.prison.utils.ListUtil;
 import org.piotrwyrw.antares.prison.utils.MessageSender;
 
 public class AntaresPrison extends JavaPlugin {
 
     static AntaresPrison antaresPrison;
     public Mines mines;
-    public Economy economy;
     public WorthManager worthManager;
     public World world;
     public MineAutoRegen autoRegen;
     public Rooms rooms;
-    public Tickets tickets;
     public Configuration config;
-    public Temporary temporary;
     public MessageSender msd;
+    public PrisonsUsers users;
 
     private boolean checkPlaceholderAPI() {
         if (!getServer().getPluginManager().getPlugin("PlaceholderAPI").isEnabled()) {
@@ -63,25 +62,23 @@ public void onEnable() {
 
         MessageConstants.updatePluginSummary();
 
+
+        users = new PrisonsUsers("users.yml");
+        users.loadFromFile();
         mines = new Mines("mines.yml");
-        economy = new Economy("economy.yml");
         worthManager = new WorthManager("worth.yml");
         rooms = new Rooms("rooms.yml");
-        tickets = new Tickets("tickets.yml");
         autoRegen = new MineAutoRegen();
         config = new Configuration("config.yml");
-        temporary = new Temporary();
 
         if (!config.loadFromFile())
             return;
 
         this.world = config.world;
 
         mines.loadFromFile();
-        economy.loadFromFile();
         worthManager.loadFromFile();
         rooms.loadFromFile();
-        tickets.loadFromFile();
 
         mines.regenAllMines();
 
@@ -93,6 +90,12 @@ public void onEnable() {
         registerCommands();
         registerEvents();
 
+        for (Player p : Bukkit.getOnlinePlayers()) {
+            if (users.getUser(p) != null)
+                continue;
+            users.addUser(new PrisonsUser(p.getUniqueId(), ListUtil.empty(), 0.0d));
+        }
+
     }
 
     private void registerEvents() {
@@ -124,17 +127,14 @@ private void registerCommands() {
     public void onDisable() {
         HandlerList.unregisterAll(this);
         msd.toAllAdmins(MessageConstants.PLUGIN_DISABLE, true);
+        users.saveToFile();
         Bukkit.getScheduler().cancelTasks(this);
-        economy.saveToFile();
-        tickets.saveToFile();
+        users = null;
         mines = null;
         worthManager = null;
-        economy = null;
         rooms = null;
         autoRegen = null;
         world = null;
-        tickets = null;
-        temporary = null;
         config = null;
         msd = null;
     }

src/org/piotrwyrw/antares/prison/Configuration.java

@@ -1,6 +1,5 @@
 package org.piotrwyrw.antares.prison;
 
-import com.mojang.brigadier.Message;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -77,10 +76,6 @@ public boolean loadFromFile() {
         MessageConstants.MINE_REGEN_ALL = safeLoad("messages.mine_regen_all", MessageConstants.MINE_REGEN_ALL);
         MessageConstants.PERMISSION_DENIED = safeLoad("messages.permission_denied", MessageConstants.PERMISSION_DENIED);
         MessageConstants.MUST_BE_PLAYER = safeLoad("messages.must_be_player", MessageConstants.MUST_BE_PLAYER);
-        MessageConstants.COULD_NOT_SAVE_ECONOMY = safeLoad("messages.could_not_save_economy", MessageConstants.COULD_NOT_SAVE_ECONOMY);
-        MessageConstants.COULD_NOT_SAVE_TICKETS = safeLoad("messages.could_not_save_tickets", MessageConstants.COULD_NOT_SAVE_TICKETS);
-        MessageConstants.ECONOMY_SAVED = safeLoad("messages.economy_saved", MessageConstants.ECONOMY_SAVED);
-        MessageConstants.TICKETS_SAVED = safeLoad("messages.tickets_saved", MessageConstants.TICKETS_SAVED);
         MessageConstants.RELOAD_COMPLETE = safeLoad("messages.reload_complete", MessageConstants.RELOAD_COMPLETE);
         MessageConstants.SELLER_RECEIVED = safeLoad("messages.seller_received", MessageConstants.SELLER_RECEIVED);
         MessageConstants.CANT_DO_THAT_HERE = safeLoad("messages.can_not_do_that_here", MessageConstants.CANT_DO_THAT_HERE);

src/org/piotrwyrw/antares/prison/Economy.java

@@ -8,7 +8,6 @@
 import org.piotrwyrw.antares.prison.constants.MessageConstants;
 import org.piotrwyrw.antares.prison.objects.Area;
 import org.piotrwyrw.antares.prison.objects.Mine;
-import org.piotrwyrw.antares.prison.utils.MessageSender;
 
 import java.io.File;
 import java.io.IOException;

src/org/piotrwyrw/antares/prison/Mines.java

@@ -23,11 +23,15 @@ public String getVersion() {
 
     @Override
     public String onPlaceholderRequest(Player p, String identifier) {
+        PrisonsUsers users = AntaresPrison.getInstance().users;
+        PrisonsUser user = users.getUser(p);
         if (identifier.equalsIgnoreCase("balance")) {
-            double bal = AntaresPrison.getInstance().economy.balanceOf(p);
+            double bal = user.getBalance();
             return "$" + bal;
+        } else if (identifier.equalsIgnoreCase("version")) {
+            return "v" + AntaresPrison.getInstance().getDescription().getVersion();
         } else if (identifier.equalsIgnoreCase("tier")) {
-            List<String> tickets = AntaresPrison.getInstance().tickets.tickets.get(p.getUniqueId());
+            List<String> tickets = user.getTickets();
             String tier = tickets.get(tickets.size() - 1).replace('_', ' ');
             return tier;
         } else {

src/org/piotrwyrw/antares/prison/PrisonPlaceHolders.java

@@ -0,0 +1,104 @@
+package org.piotrwyrw.antares.prison;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.List;
+import java.util.UUID;
+
+public class PrisonsUser {
+
+    private UUID uuid;
+    private List<String> tickets;
+    private double balance;
+    private String lastCommand;
+    private String lastMessage;
+
+    public PrisonsUser(UUID uuid, List<String> tickets, double balance) {
+        this.tickets = tickets;
+        this.balance = balance;
+        this.uuid = uuid;
+        this.lastCommand = "";
+        this.lastMessage = "";
+    }
+
+    /**
+     * !! Use isOnline first for safety !!
+     */
+    public Player getPlayer() {
+        return Bukkit.getPlayer(uuid);
+    }
+
+    public boolean isOnline() {
+        return Bukkit.getPlayer(uuid) != null;
+    }
+
+    public boolean hasTicket(String ticket) {
+        return tickets.contains(ticket);
+    }
+
+    public void setLastMessage(String message, boolean erase) {
+        this.lastMessage = message;
+        if (!erase)
+            return;
+        new BukkitRunnable(){
+
+            @Override
+            public void run() {
+                lastMessage = "";
+            }
+        }.runTaskLater(AntaresPrison.getInstance(), 20 * 20);
+    }
+
+    public void setLastCommand(String command, boolean erase) {
+        this.lastCommand = command;
+        if (!erase)
+            return;
+        new BukkitRunnable(){
+
+            @Override
+            public void run() {
+                lastCommand = "";
+            }
+        }.runTaskLater(AntaresPrison.getInstance(), 20 * 20);
+    }
+
+    public void addTicket(String ticket) {
+        if (tickets.contains(ticket))
+            return;
+        tickets.add(ticket);
+    }
+
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    public List<String> getTickets() {
+        return tickets;
+    }
+
+    public void setTickets(List<String> tickets) {
+        this.tickets = tickets;
+    }
+
+    public double getBalance() {
+        return balance;
+    }
+
+    public void setBalance(double balance) {
+        this.balance = balance;
+    }
+
+    public String getLastCommand() {
+        return lastCommand;
+    }
+
+    public String getLastMessage() {
+        return lastMessage;
+    }
+}