-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from nova-27/better-commands
コマンドの改善
- Loading branch information
Showing
14 changed files
with
432 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 0 additions & 33 deletions
33
src/main/java/com/github/nova_27/mcplugin/crafterepost/SchematicWriter.java
This file was deleted.
Oops, something went wrong.
92 changes: 0 additions & 92 deletions
92
src/main/java/com/github/nova_27/mcplugin/crafterepost/SpigotCommand.java
This file was deleted.
Oops, something went wrong.
107 changes: 107 additions & 0 deletions
107
src/main/java/com/github/nova_27/mcplugin/crafterepost/Utils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package com.github.nova_27.mcplugin.crafterepost; | ||
|
|
||
| import com.sk89q.worldedit.IncompleteRegionException; | ||
| import com.sk89q.worldedit.LocalSession; | ||
| import com.sk89q.worldedit.WorldEdit; | ||
| import com.sk89q.worldedit.WorldEditException; | ||
| import com.sk89q.worldedit.bukkit.BukkitAdapter; | ||
| import com.sk89q.worldedit.bukkit.BukkitPlayer; | ||
| import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard; | ||
| import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat; | ||
| import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter; | ||
| import com.sk89q.worldedit.function.operation.ForwardExtentCopy; | ||
| import com.sk89q.worldedit.function.operation.Operations; | ||
| import com.sk89q.worldedit.regions.Region; | ||
| import com.sk89q.worldedit.session.SessionManager; | ||
| import org.bukkit.entity.Player; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.OutputStream; | ||
| import java.util.Objects; | ||
|
|
||
| public class Utils { | ||
| /** | ||
| * wand選択範囲を取得する | ||
| * | ||
| * @param player 対象プレイヤー | ||
| * @return 選択範囲 | ||
| * @throws IncompleteRegionException 範囲未選択の場合 | ||
| */ | ||
| public static Region getSelection(Player player) throws IncompleteRegionException { | ||
| BukkitPlayer actor = BukkitAdapter.adapt(player); | ||
| SessionManager manager = WorldEdit.getInstance().getSessionManager(); | ||
| LocalSession localSession = manager.get(actor); | ||
|
|
||
| return localSession.getSelection(); | ||
| } | ||
|
|
||
| /** | ||
| * OutputStreamにSchematicを書き出す | ||
| * | ||
| * @param region 書き出す地域 | ||
| * @param outputStream 書き出し先 | ||
| */ | ||
| public static void writeSchematic(@NotNull Region region, @NotNull OutputStream outputStream) throws WorldEditException, IOException { | ||
| BlockArrayClipboard clipboard = new BlockArrayClipboard(region); | ||
| ForwardExtentCopy forwardExtentCopy = new ForwardExtentCopy( | ||
| Objects.requireNonNull(region.getWorld()), region, clipboard, region.getMinimumPoint() | ||
| ); | ||
| //forwardExtentCopy.setCopyingEntities(true); | ||
| Operations.complete(forwardExtentCopy); | ||
|
|
||
| try (ClipboardWriter clipboardWriter = BuiltInClipboardFormat.SPONGE_SCHEMATIC.getWriter(outputStream)) { | ||
| clipboardWriter.write(clipboard); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 有効なファイル名かどうか | ||
| * | ||
| * @param fileName 検証するファイル名 | ||
| * @return trueなら有効 | ||
| */ | ||
| public static boolean isValidFileName(String fileName) { | ||
| return !fileName.matches("^.*[\\\\|/|:|\\*|?|\"|<|>|\\|].*$"); | ||
| } | ||
|
|
||
| /** | ||
| * コマンド引数からFileインスタンスを生成する | ||
| * | ||
| * @param args コマンド引数 | ||
| * @param ext 拡張子 | ||
| * @return 生成したFile | ||
| * @throws IOException エラーが発生したらメッセージ付きでthrow | ||
| */ | ||
| public static File createFileInstanceFromArgs(String[] args, String ext) throws IOException { | ||
| var doOverwrite = false; | ||
| var fileName = ""; | ||
|
|
||
| for (var arg : args) { | ||
| if (arg.startsWith("-")) { | ||
| // フラグだったら | ||
| if (arg.equalsIgnoreCase("-f")) { | ||
| doOverwrite = true; | ||
| } else { | ||
| throw new IOException("無効なフラグ: " + arg); | ||
| } | ||
| } else { | ||
| //ファイル名なら | ||
| fileName = arg; | ||
| } | ||
| } | ||
|
|
||
| if (fileName.equals("")) throw new IOException("保存ファイル名を指定してください"); | ||
|
|
||
| fileName += "." + ext; | ||
| if (!isValidFileName(fileName)) throw new IOException("ファイル名に禁則文字が含まれています"); | ||
|
|
||
| var file = new File(CrafterePost.getInstance().getDataFolder(), fileName); | ||
| if (!doOverwrite && file.exists()) throw new IOException("ファイルが存在します\n上書きするには -f フラグを使用してください"); | ||
|
|
||
| if (!file.createNewFile() && !file.canWrite()) throw new IOException("ファイルを書き出すことができません"); | ||
|
|
||
| return file; | ||
| } | ||
| } |
17 changes: 17 additions & 0 deletions
17
src/main/java/com/github/nova_27/mcplugin/crafterepost/command/BaseCommand.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package com.github.nova_27.mcplugin.crafterepost.command; | ||
|
|
||
| import org.bukkit.command.CommandSender; | ||
| import org.bukkit.entity.Player; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public abstract class BaseCommand { | ||
| public abstract String getName(); | ||
|
|
||
| public abstract boolean checkPermission(Player player); | ||
|
|
||
| public abstract void onCommand(CommandSender sender, String label, String[] args); | ||
|
|
||
| public abstract @Nullable List<String> onTabComplete(CommandSender sender, String[] args); | ||
| } |
Oops, something went wrong.