Version 1.3.4a (integrated reload system and code optimization)

Draww · Feb 9, 2018 · a732e79 · a732e79
1 parent 85f4d9e
commit a732e79
Show file tree

Hide file tree

Showing 8 changed files with 137 additions and 71 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.drawwdev</groupId>
     <artifactId>Raffle</artifactId>
-    <version>1.3.4</version>
+    <version>1.3.4a</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/com/drawwdev/raffle/CustomRaffle.java b/src/main/java/com/drawwdev/raffle/CustomRaffle.java
@@ -18,11 +18,11 @@ public class CustomRaffle extends Raffle {
     private String name;
 
     public CustomRaffle(String id) {
-        super(Main.getInstance().getConfigs().get("custom").getConfig().getInt("CustomRaffles" + id + ".time"), null, null, Main.getInstance().getConfigs().get("custom").getConfig().getString("CustomRaffles" + id + ".datatype", ""), RaffleType.CUSTOM);
+        super(Main.getInstance().getConfigs().get("custom").getConfig().getInt("CustomRaffles." + id + ".time"), null, null, Main.getInstance().getConfigs().get("custom").getConfig().getString("CustomRaffles." + id + ".datatype", ""), RaffleType.CUSTOM);
         config = Main.getInstance().getConfigs().get("custom");
-        actions = config.getConfig().getStringList("CustomRaffles" + id + ".actions");
-        predicate = config.getConfig().getStringList("CustomRaffles" + id + ".predicate");
-        name = config.getConfig().getString("CustomRaffles" + id + ".name");
+        actions = config.getConfig().getStringList("CustomRaffles." + id + ".actions");
+        predicate = config.getConfig().getStringList("CustomRaffles." + id + ".predicate");
+        name = config.getConfig().getString("CustomRaffles." + id + ".name");
         setConsumer((player, raffleData, fromPlayer) -> Main.getInstance().getScriptSystem().executeActions(player, getActions(), raffleData));
         setPredicate((player, raffleData) -> {
             Boolean r = false;

diff --git a/src/main/java/com/drawwdev/raffle/RaffleBuilder.java b/src/main/java/com/drawwdev/raffle/RaffleBuilder.java
@@ -21,7 +21,7 @@ public class RaffleBuilder {
 
     public RaffleBuilder(RaffleStorage raffle, String raffleName){
         this.raffle = raffle;
-        this.raffleName = raffleName.toUpperCase();
+        this.raffleName = raffleName;
         this.raffleType = RaffleType.NORMAL;
     }
 

diff --git a/src/main/java/com/drawwdev/raffle/RaffleCommand.java b/src/main/java/com/drawwdev/raffle/RaffleCommand.java
@@ -97,11 +97,17 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                     player.sendMessage(cc("&f- &b" + r + "&7(" + raffle.getDatatype() + ") " + state));
                 }
             }
+        } else if (args[0].equalsIgnoreCase("reload")){
+            plugin.reloadConfig();
+            Main.getInstance().getConfigs().get("custom").load();
+            getRaffleManager().reload();
+            player.sendMessage(cc(plugin.getConfig().getString("prefix") + " &7All systems reloaded and restored!"));
         } else if (args[0].equalsIgnoreCase("help")) {
             player.sendMessage(cc("&6o0=======&c[&eRaffle Help&c]&6========0o"));
             player.sendMessage(cc("&b/" + label + " start <type> <data> &f- &e" + "Starting a raffle"));
             player.sendMessage(cc("&b/" + label + " stop &f- &e" + "Stop the raffle"));
             player.sendMessage(cc("&b/" + label + " types &f- &e" + "RaffleStorage types"));
+            player.sendMessage(cc("&b/" + label + " reload &f- &e" + "Reloads the all systems"));
         }
         return true;
     }

diff --git a/src/main/java/com/drawwdev/raffle/RaffleLoader.java b/src/main/java/com/drawwdev/raffle/RaffleLoader.java
@@ -90,7 +90,7 @@ public void loadCustomRaffle(){
                 if (raffleStorage.getAllKey().stream().noneMatch(p -> p.equals(custom))){
                     CustomRaffle customRaffle = new CustomRaffle(custom);
                     try {
-                        raffleStorage.newBuilder(customRaffle.getName())
+                        raffleStorage.newBuilder(customRaffle.getName().toUpperCase())
                                 .setType(RaffleType.CUSTOM)
                                 .setTime(customRaffle.getTime())
                                 .setDatatype(customRaffle.getDatatype())

diff --git a/src/main/java/com/drawwdev/raffle/RaffleManager.java b/src/main/java/com/drawwdev/raffle/RaffleManager.java
@@ -34,6 +34,11 @@ public RaffleManager(Main plugin) {
         reset();
     }
 
+    public void reload(){
+        reset();
+        raffleStorage = new RaffleLoader(plugin, new RaffleStorage(plugin)).load();
+    }
+
     public void start(Player player, String raffleName, RaffleData raffleData, String... nonGroup) throws RaffleException {
         if (getStatus()) throw new RaffleException(" &7There's a raffle going on!");
         if (getRaffleStorage().getConsumer(raffleName) == null)

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Raffle
 main: com.drawwdev.raffle.Main
-version: 1.3.4
+version: 1.3.4a
 author: drawwdev
 commands:
   raffle: