new edit sub commands

pom.xml

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

src/main/java/me/SuperRonanCraft/BetterRTP/player/commands/types/CmdEdit.java

@@ -6,7 +6,9 @@ import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
 import me.SuperRonanCraft.BetterRTP.player.commands.RTPCommand;
 import me.SuperRonanCraft.BetterRTP.references.worlds.WORLD_TYPE;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
@@ -29,9 +31,9 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
                         case WORLD:
                             if (args.length >= 5) {
                                 for (World world : Bukkit.getWorlds()) {
-                                    if (world.getName().toLowerCase().startsWith(args[2].toLowerCase())) {
+                                    if (world.getName().startsWith(args[2])) {
                                         for (RTP_CMD_EDIT_SUB sub_cmd : RTP_CMD_EDIT_SUB.values())
-                                            if (isAllowedAccess(cmd, sub_cmd) && sub_cmd.name().toLowerCase().startsWith(args[3].toLowerCase())) {
+                                            if (sub_cmd.name().toLowerCase().startsWith(args[3].toLowerCase())) {
                                                 editWorld(sendi, sub_cmd, args[4], args[2]);
                                                 return;
                                             }
@@ -39,19 +41,47 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
                                         return;
                                     }
                                 }
-                                BetterRTP.getInstance().getText().getNotExist(sendi, label);
+                                BetterRTP.getInstance().getText().getNotExist(sendi, args[2]);
                                 return;
                             }
                             usage(sendi, label, cmd);
                             return;
                         case DEFAULT:
                             for (RTP_CMD_EDIT_SUB sub_cmd : RTP_CMD_EDIT_SUB.values())
-                                if (isAllowedAccess(cmd, sub_cmd) && sub_cmd.name().toLowerCase().startsWith(args[2].toLowerCase())) {
+                                if (sub_cmd.name().toLowerCase().startsWith(args[2].toLowerCase())) {
                                     editDefault(sendi, sub_cmd, args[3]);
                                     return;
                                 }
                             usage(sendi, label, cmd);
                             return;
+                        case WORLD_TYPE:
+                            for (World world : Bukkit.getWorlds()) {
+                                if (world.getName().startsWith(args[2])) {
+                                    editWorldtype(sendi, args[2], args[3]);
+                                    //usage(sendi, label, cmd);
+                                    return;
+                                }
+                            }
+                            BetterRTP.getInstance().getText().getNotExist(sendi, args[2]);
+                            return;
+                        case OVERRIDE:
+                            for (World world : Bukkit.getWorlds()) {
+                                if (world.getName().startsWith(args[2])) {
+                                    editOverride(sendi, args[2], args[3]);
+                                    //usage(sendi, label, cmd);
+                                    return;
+                                }
+                            }
+                            BetterRTP.getInstance().getText().getNotExist(sendi, args[2]);
+                            return;
+                        case BLACKLISTEDBLOCKS:
+                            if (args[2].equalsIgnoreCase("add")) {
+                                editBlacklisted(sendi, args[3], true);
+                            } else if (args[2].equalsIgnoreCase("remove")) {
+                                editBlacklisted(sendi, args[3], false);
+                            } else
+                                usage(sendi, label, cmd);
+                            return;
                     }
                 }
         } else if (args.length >= 2) {
@@ -110,7 +140,7 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
     }
 
     private void editDefault(CommandSender sendi, RTP_CMD_EDIT_SUB cmd, String val) {
-        Object value = val;
+        Object value;
         try {
             value = cmd.getResult(val);
         } catch (Exception e) {
@@ -133,8 +163,110 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
         }
     }
 
+    private void editWorldtype(CommandSender sendi, String world, String val) {
+        //sendi.sendMessage("Editting worldtype for world " + world + " to " + val);
+        WORLD_TYPE type;
+        try {
+            type = WORLD_TYPE.valueOf(val.toUpperCase());
+        } catch (Exception e) {
+            //e.printStackTrace();
+            BetterRTP.getInstance().getText().getEditError(sendi);
+            return;
+        }
+
+        FileBasics.FILETYPE file = FileBasics.FILETYPE.CONFIG;
+        YamlConfiguration config = file.getConfig();
+
+        List<Map<?, ?>> world_map = config.getMapList("WorldType");
+        List<Map<?, ?>> removeList = new ArrayList<>();
+        for (Map<?, ?> m : world_map) {
+            for (Map.Entry<?, ?> entry : m.entrySet()) {
+                if (entry.getKey().equals(world))
+                    removeList.add(m);
+            }
+        }
+        for (Map<?, ?> o : removeList)
+            world_map.remove(o);
+        Map<String, String> newIndex = new HashMap<>();
+        newIndex.put(world, type.name());
+        world_map.add(newIndex);
+        config.set("WorldType", world_map);
+
+        try {
+            config.save(file.getFile());
+            BetterRTP.getInstance().getRTP().load();
+            BetterRTP.getInstance().getText().getEditSet(sendi, RTP_CMD_EDIT.WORLD_TYPE.name(), val);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void editOverride(CommandSender sendi, String world, String val) {
+
+        FileBasics.FILETYPE file = FileBasics.FILETYPE.CONFIG;
+        YamlConfiguration config = file.getConfig();
+
+        List<Map<?, ?>> world_map = config.getMapList("Overrides");
+        List<Map<?, ?>> removeList = new ArrayList<>();
+        for (Map<?, ?> m : world_map) {
+            for (Map.Entry<?, ?> entry : m.entrySet()) {
+                if (entry.getKey().equals(world))
+                    removeList.add(m);
+            }
+        }
+        for (Map<?, ?> o : removeList)
+            world_map.remove(o);
+        if (!val.equals("REMOVE_OVERRIDE")) {
+            Map<String, String> newIndex = new HashMap<>();
+            newIndex.put(world, val);
+            world_map.add(newIndex);
+        } else {
+            val = "(removed override)";
+        }
+        config.set("Overrides", world_map);
+
+        try {
+            config.save(file.getFile());
+            BetterRTP.getInstance().getRTP().load();
+            BetterRTP.getInstance().getText().getEditSet(sendi, RTP_CMD_EDIT.OVERRIDE.name(), val);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void editBlacklisted(CommandSender sendi, String block, boolean add) {
+
+        FileBasics.FILETYPE file = FileBasics.FILETYPE.CONFIG;
+        YamlConfiguration config = file.getConfig();
+
+        List<String> world_map = config.getStringList("BlacklistedBlocks");
+        List<String> removeList = new ArrayList<>();
+        for (String m : world_map) {
+            if (m.equals(block)) {
+                removeList.add(m);
+            }
+        }
+        for (String o : removeList)
+            world_map.remove(o);
+        if (add) {
+            world_map.add(block);
+        } else {
+            block = "(removed " + block + ")";
+        }
+        config.set("BlacklistedBlocks", world_map);
+
+        try {
+            config.save(file.getFile());
+            BetterRTP.getInstance().getRTP().load();
+            BetterRTP.getInstance().getText().getEditSet(sendi, RTP_CMD_EDIT.BLACKLISTEDBLOCKS.name(), block);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     //rtp edit default <max/min/center/useworldborder> <value>
     //rtp edit world [<world>] <max/min/center/useworldborder> <value>
+    //rtp edit worldtype <world> <value>
     @Override
     public List<String> tabComplete(CommandSender sendi, String[] args) {
         List<String> list = new ArrayList<>();
@@ -146,6 +278,8 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
             for (RTP_CMD_EDIT cmd : RTP_CMD_EDIT.values())
                 if (cmd.name().equalsIgnoreCase(args[1])) {
                     switch (cmd) {
+                        case WORLD_TYPE:
+                        case OVERRIDE:
                         case WORLD: //List all worlds
                             for (World world : Bukkit.getWorlds())
                                 if (world.getName().toLowerCase().startsWith(args[2].toLowerCase()))
@@ -153,6 +287,11 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
                             break;
                         case DEFAULT:
                             list.addAll(tabCompleteSub(args, cmd));
+                            break;
+                        case BLACKLISTEDBLOCKS:
+                            list.add("add");
+                            list.add("remove");
+                            break;
                     }
                 }
         } else if (args.length == 4) {
@@ -167,6 +306,31 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
                             else if (args[2].equalsIgnoreCase(RTP_CMD_EDIT_SUB.CENTER_Z.name()))
                                 list.add(String.valueOf(((Player) sendi).getLocation().getBlockZ()));
                             break;
+                        case WORLD_TYPE:
+                            for (WORLD_TYPE _type : WORLD_TYPE.values())
+                                list.add(_type.name());
+                            break;
+                        case OVERRIDE:
+                            for (World world : Bukkit.getWorlds())
+                                if (world.getName().toLowerCase().startsWith(args[2].toLowerCase()))
+                                    list.add(world.getName());
+                            list.add("REMOVE_OVERRIDE");
+                            break;
+                        case BLACKLISTEDBLOCKS:
+                            if (args[2].equalsIgnoreCase("add")) {
+                                for (Material block : Material.values()) {
+                                    if (list.size() > 20)
+                                        break;
+                                    if (block.name().startsWith(args[3].toUpperCase()))
+                                        list.add(block.name());
+                                }
+                            } else if (args[2].equalsIgnoreCase("remove")) {
+                                for (String block : BetterRTP.getInstance().getRTP().blockList) {
+                                    if (block.startsWith(args[3]))
+                                        list.add(block);
+                                }
+                            }
+                            break;
                     }
         } else if (args.length == 5) {
             for (RTP_CMD_EDIT cmd : RTP_CMD_EDIT.values())
@@ -185,20 +349,12 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
         List<String> list = new ArrayList<>();
         for (RTP_CMD_EDIT_SUB sub_cmd : RTP_CMD_EDIT_SUB.values()) {
 
-            if (isAllowedAccess(cmd, sub_cmd) && sub_cmd.name().toLowerCase().startsWith(args[args.length - 1].toLowerCase()))
+            if (sub_cmd.name().toLowerCase().startsWith(args[args.length - 1].toLowerCase()))
                 list.add(sub_cmd.name().toLowerCase());
         }
         return list;
     }
 
-    private boolean isAllowedAccess(RTP_CMD_EDIT cmd, RTP_CMD_EDIT_SUB sub) {
-        //Check if this sub command is allowed
-        for (RTP_CMD_EDIT cmd_checking : sub.getAllowed())
-            if (cmd_checking == cmd)
-                return true;
-        return false;
-    }
-
     @Override
     public boolean permission(CommandSender sendi) {
         return BetterRTP.getInstance().getPerms().getEdit(sendi);
@@ -211,6 +367,12 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
                     BetterRTP.getInstance().getText().getUsageEditDefault(sendi, label); break;
                 case WORLD:
                     BetterRTP.getInstance().getText().getUsageEditWorld(sendi, label); break;
+                case WORLD_TYPE:
+                    BetterRTP.getInstance().getText().getUsageWorldtype(sendi, label); break;
+                case OVERRIDE:
+                    BetterRTP.getInstance().getText().getUsageOverride(sendi, label); break;
+                case BLACKLISTEDBLOCKS:
+                    BetterRTP.getInstance().getText().getUsageBlacklistedBlocks(sendi, label); break;
             }
         else
             BetterRTP.getInstance().getText().getUsageEdit(sendi, label);
@@ -222,25 +384,22 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
     }
 
     enum RTP_CMD_EDIT {
-        WORLD, DEFAULT, WORLD_TYPE
+        WORLD, DEFAULT, WORLD_TYPE, OVERRIDE, BLACKLISTEDBLOCKS
     }
 
     enum RTP_CMD_EDIT_SUB {
-        CENTER_X("CenterX", "INT", null),
+        CENTER_X("CenterX", "INT"),
-        CENTER_Z("CenterZ", "INT", null),
+        CENTER_Z("CenterZ", "INT"),
-        MAX("MaxRadius", "INT", null),
+        MAX("MaxRadius", "INT"),
-        MIN("MinRadius", "INT", null),
+        MIN("MinRadius", "INT"),
-        USEWORLDBORDER("UseWorldBorder", "BOL", null),
+        USEWORLDBORDER("UseWorldBorder", "BOL");
-        WORLDTYPE("WorldType", "WORLDTYPE", new RTP_CMD_EDIT[]{RTP_CMD_EDIT.WORLD_TYPE});
 
         private final String type;
         private final String str;
-        private final RTP_CMD_EDIT[] allowed;
 
-        RTP_CMD_EDIT_SUB(String str, String type, RTP_CMD_EDIT[] allowed_cmds) {
+        RTP_CMD_EDIT_SUB(String str, String type) {
             this.str = str;
             this.type = type;
-            this.allowed = allowed_cmds;
         }
 
         String get() {
@@ -256,11 +415,5 @@ public class CmdEdit implements RTPCommand, RTPCommandHelpable { //Edit a worlds
                 return WORLD_TYPE.valueOf(input).name();
             return null;
         }
-
-        RTP_CMD_EDIT[] getAllowed() {
-            if (this.allowed == null)
-                return new RTP_CMD_EDIT[]{RTP_CMD_EDIT.WORLD, RTP_CMD_EDIT.DEFAULT};
-            return allowed;
-        }
     }
 }

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

@@ -23,7 +23,7 @@ public class RTP {
     public HashMap<String, RTPWorld> customWorlds = new HashMap<>();
     public HashMap<String, String> overriden = new HashMap<>();
     public WorldDefault defaultWorld = new WorldDefault();
-    List<String> disabledWorlds, blockList;
+    public List<String> disabledWorlds, blockList;
     int maxAttempts, delayTime;
     boolean cancelOnMove, cancelOnDamage;
     public HashMap<String, WORLD_TYPE> world_type = new HashMap<>();

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

@@ -223,6 +223,18 @@ public class Messages {
         sms(sendi, getLang().getString(preU + "Edit.World").replaceAll("%command%", cmd));
     }
 
+    public void getUsageWorldtype(CommandSender sendi, String cmd) {
+        sms(sendi, getLang().getString(preU + "Edit.Worldtype").replaceAll("%command%", cmd));
+    }
+
+    public void getUsageOverride(CommandSender sendi, String cmd) {
+        sms(sendi, getLang().getString(preU + "Edit.Override").replaceAll("%command%", cmd));
+    }
+
+    public void getUsageBlacklistedBlocks(CommandSender sendi, String cmd) {
+        sms(sendi, getLang().getString(preU + "Edit.BlacklistedBlocks").replaceAll("%command%", cmd));
+    }
+
     // Not Found
     public void error(CommandSender sendi) {
         sms(sendi, "&cERROR &7Seems like your Administrator did not update their language file!");

src/main/resources/lang/chs.yml

@@ -55,3 +55,6 @@ Usage:
     Base: '&c用法&7：/%command% edit <default/世界> [参数...]'
     Default: '&c用法&7：/%command% edit default <max/min/useworldborder/center> <值>'
     World: '&c用法&7：/%command% edit world <world> <max/min/useworldborder/center> <值>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/cht.yml

@@ -54,4 +54,7 @@ Usage:
 #  Edit:
 #    Base: '&cUsage&7: /%command% edit <default/world> [args...]'
 #    Default: '&cUsage&7: /%command% edit default <max/min/useworldborder/center> <value>'
-#    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/cs.yml

@@ -55,3 +55,6 @@ Usage:
     Base: '&cPoužití&7: /%command% edit <default/svět> [hodnoty...]'
     Default: '&cPoužití&7: /%command% edit default <max/min/useworldborder/center> <hodnota>'
     World: '&cPoužití&7: /%command% edit world <svět> <max/min/useworldborder/center> <hodnota>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/du.yml

@@ -54,4 +54,7 @@ Usage:
 #  Edit:
 #    Base: '&cUsage&7: /%command% edit <default/world> [args...]'
 #    Default: '&cUsage&7: /%command% edit default <max/min/useworldborder/center> <value>'
-#    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/en.yml

@@ -54,4 +54,7 @@ Usage:
   Edit:
     Base: '&cUsage&7: /%command% edit <default/world> [args...]'
     Default: '&cUsage&7: /%command% edit default <max/min/useworldborder/center> <value>'
-    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/es.yml

@@ -55,3 +55,6 @@ Usage:
     Base: '&cUso&7: /%command% edit <default/world> [args...]'
     Default: '&cUso&7: /%command% edit default <max/min/useworldborder/center> <value>'
     World: '&cUso&7: /%command% edit world <mundo> <max/min/useworldborder/center> <value>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/fr.yml

@@ -55,3 +55,6 @@ Usage:
     Base: '&cUtilisation&7: /%command% edit <default/world> [args...]'
     Default: '&cUtilisation&7: /%command% edit default <max/min/useworldborder/center> <value>'
     World: '&cUtilisation&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/ja.yml

@@ -54,4 +54,7 @@ Usage:
 #  Edit:
 #    Base: '&cUsage&7: /%command% edit <default/world> [args...]'
 #    Default: '&cUsage&7: /%command% edit default <max/min/useworldborder/center> <value>'
-#    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/pl.yml

@@ -54,4 +54,7 @@ Usage:
   Edit:
     Base: '&cUsage&7: /%command% edit <default/world> [args...]'
     Default: '&cUsage&7: /%command% edit default <max/min/useworldborder/center> <value>'
-    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/ro.yml

@@ -54,3 +54,6 @@ Usage:
     Base: '&cFolosire&7: /%command% edit <default/world> [args...]'
     Default: '&cFolosire&7: /%command% edit default <max/min/useworldborder/center> <value>'
     World: '&cFolosire&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/lang/ru.yml

@@ -54,4 +54,7 @@ Usage:
   Edit:
     Base: '&cUsage&7: /%command% edit <default/world> [аргументы...]'
     Default: '&cUsage&7: /%command% edit default <max/min/useworldborder/center> <value>'
-    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+    World: '&cUsage&7: /%command% edit world <world> <max/min/useworldborder/center> <value>'
+#    Worldtype: '&cUsage&7: /%command% edit world_type <world> <NETHER/NORMAL>'
+#    Override: '&cUsage&7: /%command% edit override <world> <world_to>'
+#    BlacklistedBlocks: '&cUsage&7: /%command% edit blacklistedblocks <add/remove> <block_id>'

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 main: me.SuperRonanCraft.BetterRTP.BetterRTP
-version: '3.0.5'
+version: '3.0.6'
 name: BetterRTP
 author: SuperRonanCraft
 softdepend: