[v2.0.7-jv8]

Author: yuttyann

src/main/java/com/github/yuttyann/scriptblockplus/command/ScriptBlockPlusCommand.java

@@ -41,7 +41,6 @@
 import com.github.yuttyann.scriptblockplus.script.ScriptKey;
 import com.github.yuttyann.scriptblockplus.utils.*;
 import com.github.yuttyann.scriptblockplus.selector.CommandSelector;
-import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
 
 import org.bukkit.*;
@@ -81,7 +80,6 @@ public CommandData[] getUsages() {
                 new CommandData(SBConfig.BACKUP_COMMAND.getValue(), Permission.COMMAND_BACKUP.getNode()),
                 new CommandData(SBConfig.CHECKVER_COMMAND.getValue(), Permission.COMMAND_CHECKVER.getNode()),
                 new CommandData(SBConfig.DATAMIGR_COMMAND.getValue(), Permission.COMMAND_DATAMIGR.getNode()),
-                new CommandData(SBConfig.EXPORT_COMMAND.getValue(), Permission.COMMAND_EXPORT.getNode()),
                 new CommandData(SBConfig.CREATE_COMMAND.getValue(), typeNodes),
                 new CommandData(SBConfig.ADD_COMMAND.getValue(), typeNodes),
                 new CommandData(SBConfig.REMOVE_COMMAND.getValue(), typeNodes),
@@ -93,8 +91,7 @@ public CommandData[] getUsages() {
     }
 
     @Override
-    public boolean runCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label,
-            String[] args) {
+    public boolean runCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         int length = args.length;
         if (length == 1) {
             if (equals(args[0], "tool")) {
@@ -114,20 +111,16 @@ public boolean runCommand(@NotNull CommandSender sender, @NotNull Command comman
             }
         }
         if (length == 2) {
-            if (equals(args[0], "export") && equals(args[1], "sound", "material")) {
-                return doExport(sender, args);
-            } else if (equals(args[0], ScriptKey.types()) && equals(args[1], "remove", "view")) {
+            if (equals(args[0], ScriptKey.types()) && equals(args[1], "remove", "view")) {
                 return setAction(sender, args);
             } else if (equals(args[0], "selector") && equals(args[1], "paste", "remove")) {
                 return doSelector(sender, args);
             }
         }
-        if (length == 3 && equals(args[0], ScriptKey.types()) && equals(args[1], "redstone")
-                && equals(args[2], "false")) {
+        if (length == 3 && equals(args[0], ScriptKey.types()) && equals(args[1], "redstone") && equals(args[2], "false")) {
             return setAction(sender, args);
         }
-        if (length > 3 && equals(args[0], ScriptKey.types()) && equals(args[1], "redstone")
-                && equals(args[2], "true")) {
+        if (length > 3 && equals(args[0], ScriptKey.types()) && equals(args[1], "redstone") && equals(args[2], "true")) {
             return setAction(sender, args);
         }
         if (length > 2) {
@@ -144,34 +137,6 @@ && equals(args[2], "true")) {
         return false;
     }
 
-    private boolean doExport(@NotNull CommandSender sender, @NotNull String[] args) {
-        if (!hasPermission(sender, Permission.COMMAND_EXPORT, false) || !equals(args[1], "sound", "material")) {
-            return false;
-        }
-        String type = args[1].toLowerCase(Locale.ROOT);
-        String path = "export/" + type + "_v" + Utils.getServerVersion() + "_.txt";
-        File file = new File(getPlugin().getDataFolder(), path);
-        File parent = file.getParentFile();
-        if (!parent.exists()) {
-            parent.mkdirs();
-        }
-        new Thread(() -> {
-            SBConfig.EXPORT_START.replace(type).send(sender);
-            try (BufferedWriter writer = new BufferedWriter(
-                    new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8))) {
-                for (Enum<?> value : type.equals("sound") ? Sound.values() : Material.values()) {
-                    writer.write(value.name());
-                    writer.newLine();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                SBConfig.EXPORT_END.replace(type).send(sender);
-            }
-        }).start();
-        return true;
-    }
-
     private boolean doTool(@NotNull CommandSender sender) {
         if (!hasPermission(sender, Permission.COMMAND_TOOL)) {
             return false;
@@ -377,13 +342,7 @@ public void tabComplete(@NotNull CommandSender sender, @NotNull Command command,
             Set<String> set = setCommandPermissions(sender, new LinkedHashSet<String>());
             StreamUtils.fForEach(set, s -> StringUtils.startsWith(s, prefix), empty::add);
         } else if (args.length == 2) {
-            if (equals(args[0], "export")) {
-                if (Permission.COMMAND_EXPORT.has(sender)) {
-                    String prefix = args[1].toLowerCase(Locale.ROOT);
-                    String[] answers = new String[] { "sound", "material" };
-                    StreamUtils.fForEach(answers, s -> s.startsWith(prefix), empty::add);
-                }
-            } else if (equals(args[0], "selector")) {
+            if (equals(args[0], "selector")) {
                 if (Permission.COMMAND_SELECTOR.has(sender)) {
                     String prefix = args[1].toLowerCase(Locale.ROOT);
                     String[] answers = new String[] { "paste", "remove" };
@@ -428,7 +387,7 @@ public void tabComplete(@NotNull CommandSender sender, @NotNull Command command,
                     } else if (args.length == 4 && equals(args[1], "redstone") && equals(args[2], "true")) {
                         String prefix = args[3].toLowerCase(Locale.ROOT);
                         List<String> answers = Lists.newArrayList("@a", "@e", "@p", "@r");
-                        StreamUtils.forEach(Filter.values(), t -> answers.add(Filter.getPrefix() + t.getSyntax() + "}"));
+                        StreamUtils.forEach(Filter.values(), f -> answers.add(Filter.getPrefix() + f.getSyntax() + "}"));
                         StreamUtils.fForEach(answers, s -> s.startsWith(prefix), empty::add);
                     } else if (args.length == 5 && equals(args[1], "redstone") && equals(args[2], "true") && args[3].startsWith(Filter.getPrefix())) {
                         String prefix = args[4].toLowerCase(Locale.ROOT);
@@ -447,7 +406,6 @@ private Set<String> setCommandPermissions(@NotNull CommandSender sender, @NotNul
         StreamUtils.ifAction(Permission.COMMAND_BACKUP.has(sender), () -> set.add("backup"));
         StreamUtils.ifAction(Permission.COMMAND_CHECKVER.has(sender), () -> set.add("checkver"));
         StreamUtils.ifAction(Permission.COMMAND_DATAMIGR.has(sender), () -> set.add("datamigr"));
-        StreamUtils.ifAction(Permission.COMMAND_EXPORT.has(sender), () -> set.add("export"));
         StreamUtils.ifAction(Permission.COMMAND_SELECTOR.has(sender), () -> set.add("selector"));
         StreamUtils.fForEach(ScriptKey.values(), s -> Permission.has(sender, s, true), s -> set.add(s.getName()));
         return set;

src/main/java/com/github/yuttyann/scriptblockplus/enums/Permission.java

@@ -32,7 +32,6 @@ public enum Permission {
     COMMAND_BACKUP("scriptblockplus.command.backup"),
     COMMAND_CHECKVER("scriptblockplus.command.checkver"),
     COMMAND_DATAMIGR("scriptblockplus.command.datamigr"),
-    COMMAND_EXPORT("scriptblockplus.command.export"),
     /*
     COMMAND_INTERACT("scriptblockplus.command.interact"),
     COMMAND_BREAK("scriptblockplus.command.break"),

src/main/java/com/github/yuttyann/scriptblockplus/file/config/SBConfig.java

@@ -59,7 +59,6 @@ public final class SBConfig {
     public static final ConfigKey<String> BACKUP_COMMAND = stringKey("BackupCommandMessage", "");
     public static final ConfigKey<String> CHECKVER_COMMAND = stringKey("CheckVerCommandMessage", "");
     public static final ConfigKey<String> DATAMIGR_COMMAND = stringKey("DatamigrCommandMessage", "");
-    public static final ConfigKey<String> EXPORT_COMMAND = stringKey("ExportCommandMessage", "");
     public static final ConfigKey<String> CREATE_COMMAND = stringKey("CreateCommandMessage", "");
     public static final ConfigKey<String> ADD_COMMAND = stringKey("AddCommandMessage", "");
     public static final ConfigKey<String> REMOVE_COMMAND = stringKey("RemoveCommandMessage", "");
@@ -153,16 +152,6 @@ public final class SBConfig {
 
 
     // Replace Keys
-    /**
-     * Parameter: {@link String} name
-     */
-    public static final ReplaceKey EXPORT_START = replaceKey("ExportStartMessage", "", "%name%");
-
-    /**
-     * Parameter: {@link String} name
-     */
-    public static final ReplaceKey EXPORT_END = replaceKey("ExportEndMessage", "", "%name%");
-
     /**
      * Parameter: {@link String} name, {@link String} path, {@link String} size
      */

src/main/java/com/github/yuttyann/scriptblockplus/script/option/chat/BypassOP.java

@@ -24,7 +24,7 @@
 import org.bukkit.entity.Player;
 
 /**
- * ScriptBlockPlus Bypass オプションクラス
+ * ScriptBlockPlus BypassOP オプションクラス
  * @author yuttyann44581
  */
 @OptionTag(name = "bypass_op", syntax = "@bypass ")

src/main/java/com/github/yuttyann/scriptblockplus/script/option/vault/BypassGroup.java

@@ -24,6 +24,10 @@
 
 import org.bukkit.entity.Player;
 
+/**
+ * ScriptBlockPlus BypassGroup オプションクラス
+ * @author yuttyann44581
+ */
 @OptionTag(name = "bypass_group", syntax = "@bypassGROUP:")
 public class BypassGroup extends BaseOption {
 

src/main/java/com/github/yuttyann/scriptblockplus/script/option/vault/BypassPerm.java

@@ -24,6 +24,10 @@
 
 import org.bukkit.entity.Player;
 
+/**
+ * ScriptBlockPlus BypassPerm オプションクラス
+ * @author yuttyann44581
+ */
 @OptionTag(name = "bypass_perm", syntax = "@bypassPERM:")
 public class BypassPerm extends BaseOption {
 

src/main/resources/lang/en.yml

@@ -10,7 +10,6 @@ ReloadCommandMessage: 'reload - Reload the plugin.'
 BackupCommandMessage: 'backup - Make a backup of the plugin data.'
 CheckVerCommandMessage: 'checkver - Check new version.'
 DataMigrCommandMessage: 'datamigr - Migrate old data from ScriptBlock to ScriptBlockPlus.'
-ExportCommandMessage: 'export <sound | material> - Output BukkitAPI sound and material as Text.'
 CreateCommandMessage: '<scriptkey> create <options> - Create a new script to the block.'
 AddCommandMessage: '<scriptkey> add <options> - Add a new script to the block.'
 RemoveCommandMessage: '<scriptkey> remove - Remove the script from the block.'
@@ -64,10 +63,6 @@ DataMigrStartMessage: '&7Start migrating from Scriptblock....'
 DataMigrEndMessage: '&bMigrating completed.'
 UpdateDownloadStartMessage: '&6Start downloading the latest ScriptBlockPlus...'
 
-# %name% : name of the class(Sound, Material)
-ExportStartMessage: '&7Outputing BukkitAPI %name% to text ....'
-ExportEndMessage: '&bOutput of BukkitAPI''s Sound is complete.'
-
 # %name% : Downloaded file name
 # %path% : File save destination
 # %size% : File capacity

src/main/resources/lang/ja.yml

@@ -9,8 +9,7 @@ ToolCommandMessage: 'tool - 送信者に補助ツールを配布します。'
 ReloadCommandMessage: 'reload - 全てのファイルの再読み込みを行います。'
 BackupCommandMessage: 'backup - プラグインデータのバックアップを作成します。'
 CheckVerCommandMessage: 'checkver - 最新のプラグインが存在するかチェックします。'
-DataMigrCommandMessage: 'datamigr - ScriptBlockのスクリプトをPlusに移行します。'
-ExportCommandMessage: 'export <sound | material> - BukkitAPIのSound、MaterialをTXTに出力します。'
+DataMigrCommandMessage: 'datamigr - ScriptBlockのスクリプトをSBPlusへ移行します。'
 CreateCommandMessage: '<scriptkey> create <options> - ブロックにスクリプトを設定します。'
 AddCommandMessage: '<scriptkey> add <options> - ブロックにスクリプトを追加します。'
 RemoveCommandMessage: '<scriptkey> remove - ブロックのスクリプトを削除します。'
@@ -64,10 +63,6 @@ DataMigrStartMessage: '&7ScriptBlockのスクリプトを移行しています..
 DataMigrEndMessage: '&bスクリプトの移行が完了しました。'
 UpdateDownloadStartMessage: '&6最新のプラグインをダウンロードしています...'
 
-# %name% : クラス名(Sound, Material)
-ExportStartMessage: '&7BukkitAPIの"%name%"をTXTに出力しています....'
-ExportEndMessage: '&bBukkitAPIの"%name%"の出力が完了しました。'
-
 # %name% : ファイル名
 # %path% : ファイルパス
 # %size% : ファイルサイズ

src/main/resources/lang/zh.yml

@@ -10,7 +10,6 @@ ReloadCommandMessage: 'reload - 重载插件'
 BackupCommandMessage: 'backup - 备份插件数据'
 CheckVerCommandMessage: 'checkver - 查询最新版本'
 DataMigrCommandMessage: 'datamigr - 将ScriptBlock的旧数据转移至ScriptBlockPlus'
-ExportCommandMessage: 'export <sound | material> - 将BukkitAPI声音和材质输出为文本'
 CreateCommandMessage: '<交互方式> create <脚本内容> - 创建脚本方块'
 AddCommandMessage: '<交互方式> add <脚本内容> - 添加脚本方块'
 RemoveCommandMessage: '<交互方式> remove - 移除脚本方块'
@@ -64,10 +63,6 @@ DataMigrStartMessage: '&7开始从ScriptBlock转移数据....'
 DataMigrEndMessage: '&b数据转移完毕'
 UpdateDownloadStartMessage: '&6开始下载最新版本ScriptBlockPlus...如果发生卡顿 请不要启用自动更新'
 
-# %name% : 班级名称(Sound, Material)
-ExportStartMessage: '&7将BukkitAPI的"%name%"输出到文本....'
-ExportEndMessage: '&bBukkitAPI"%name%"输出完成。'
-
 # %name% : 文件名
 # %path% : 文件路径
 # %size% : 文件大小

src/main/resources/plugin.yml

@@ -17,7 +17,6 @@ commands:
            /<command> backup - Make a backup of the plugin data.
            /<command> checkver - Check new version.
            /<command> datamigr - Migrate old data from ScriptBlock to ScriptBlockPlus.
-           /<command> export <sound | material> - Output BukkitAPI sound and material as Text.
            /<command> <scriptkey> create <options> - Create a new script to the block.
            /<command> <scriptkey> add <options> - Add a new script to the block.
            /<command> <scriptkey> remove - Remove the script from the block.
@@ -48,7 +47,6 @@ permissions:
       scriptblockplus.command.backup: true
       scriptblockplus.command.checkver: true
       scriptblockplus.command.datamigr: true
-      scriptblockplus.command.export: true
       scriptblockplus.command.interact: true
       scriptblockplus.command.break: true
       scriptblockplus.command.walk: true
@@ -70,8 +68,6 @@ permissions:
     default: false
   scriptblockplus.command.datamigr:
     default: false
-  scriptblockplus.command.export:
-    default: false
   scriptblockplus.command.interact:
     default: false
   scriptblockplus.command.break: