From f06f601baa0e7b0d9c26b7723f6f4b4885e19569 Mon Sep 17 00:00:00 2001 From: xinyihl <1012737146@qq.com> Date: Fri, 10 Nov 2023 20:40:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20Get=20->=20Ut?= =?UTF-8?q?il=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../bluemapsetmarkers/BlueMapSetMarkers.java | 18 +++++------- .../bluemapsetmarkers/api/Api.java | 12 +++++++- .../commands/AdminCommands.java | 4 +-- .../commands/PlayerCommands.java | 8 ++--- .../bluemapsetmarkers/data/Data.java | 10 ++----- .../bluemapsetmarkers/data/PlayerData.java | 4 --- .../events/AdminGUIEvent.java | 6 ++-- .../events/PlayerGUIEvent.java | 4 +-- .../bluemapsetmarkers/events/SignWatcher.java | 9 +++--- .../bluemapsetmarkers/gui/AdminGUI.java | 8 ++--- .../bluemapsetmarkers/gui/PlayerGUI.java | 6 ++-- .../bluemapsetmarkers/utils/AddMarker.java | 2 +- .../bluemapsetmarkers/utils/AdminTabList.java | 6 ++-- .../bluemapsetmarkers/utils/Judge.java | 2 +- .../utils/PlayerTabList.java | 6 ++-- .../bluemapsetmarkers/utils/SendMessages.java | 22 ++++---------- .../utils/{Get.java => Util.java} | 29 +------------------ src/main/resources/plugin.yml | 5 ++++ 19 files changed, 60 insertions(+), 103 deletions(-) rename src/main/java/org/siberianhusy/bluemapsetmarkers/utils/{Get.java => Util.java} (82%) diff --git a/pom.xml b/pom.xml index f4d6017..890a44f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.siberianhusy BlueMapSetMarkers - 2.0 + 2.1 jar BlueMapSetMarkers diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/BlueMapSetMarkers.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/BlueMapSetMarkers.java index 90501f0..c3f15c6 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/BlueMapSetMarkers.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/BlueMapSetMarkers.java @@ -10,11 +10,10 @@ import org.siberianhusy.bluemapsetmarkers.events.AdminGUIEvent; import org.siberianhusy.bluemapsetmarkers.events.PlayerGUIEvent; import org.siberianhusy.bluemapsetmarkers.events.SignWatcher; +import org.siberianhusy.bluemapsetmarkers.utils.LoadData; import java.util.Objects; -import static org.siberianhusy.bluemapsetmarkers.utils.LoadData.*; - public class BlueMapSetMarkers extends JavaPlugin { public static BlueMapSetMarkers plugin; @@ -24,11 +23,11 @@ public void onEnable() { plugin = this; this.saveResource("Data/data.yml",false); //创建标记数据储存文件 - createFiles(); + LoadData.createFiles(); //加载并注册标签和标记 for (World world : Bukkit.getWorlds()) { - loadWorldMarkerSet(world); - registerWorld(world); + LoadData.loadWorldMarkerSet(world); + LoadData.registerWorld(world); } //获取BlueMap WEB路径 BlueMapAPI.onEnable(api -> Data.webRoot = api.getWebApp().getWebRoot()); @@ -36,7 +35,7 @@ public void onEnable() { this.saveDefaultConfig(); //保存语言文件 this.saveResource("Messages/messages.yml",false); - loadPlayerData(); + LoadData.loadPlayerData(); //注册玩家指令 Objects.requireNonNull(Bukkit.getPluginCommand("BlueMapSetMarkers")).setExecutor(new PlayerCommands()); Objects.requireNonNull(Bukkit.getPluginCommand("BlueMapSerMarkersAdmin")).setExecutor(new AdminCommands()); @@ -46,16 +45,15 @@ public void onEnable() { //注册事件 Bukkit.getPluginManager().registerEvents(new PlayerGUIEvent(),this); Bukkit.getPluginManager().registerEvents(new AdminGUIEvent(),this); - Bukkit.getPluginManager().registerEvents(new SignWatcher(), this); + Bukkit.getPluginManager().registerEvents(new SignWatcher(),this); this.getLogger().info("BlueMapMarkers加载完成！欢迎使用！"); } @Override public void onDisable() { this.getLogger().info("开始保存数据！"); - // 插件卸载时执行 - for (World world : Bukkit.getWorlds()) saveWorldMarkerSet(world); - savePlayerData(); + for (World world : Bukkit.getWorlds()) LoadData.saveWorldMarkerSet(world); + LoadData.savePlayerData(); this.getLogger().info("BlueMapSetMarkers已卸载！感谢使用！"); } } diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/api/Api.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/api/Api.java index 6a96d40..16dd8cb 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/api/Api.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/api/Api.java @@ -10,9 +10,14 @@ import java.awt.image.BufferedImage; -import static org.siberianhusy.bluemapsetmarkers.utils.Get.getBufferedImage; +import static org.siberianhusy.bluemapsetmarkers.utils.Util.getBufferedImage; public class Api { + /** + * @param name 要删除的标记名称 + * @param world 要删除的标记所在世界 + * @return 返回 true 删除成功 + */ //删除标记点 public static boolean delMarker(String name, World world){ if (!Judge.judgeMarkerName(name)){ @@ -23,6 +28,11 @@ public static boolean delMarker(String name, World world){ } } + /** + * @param location Location + * @param name 要添加的标记名称 + * @param icon 要添加的标记图标 + */ //添加标记 public static void addMarker(Location location, String name, String icon){ Vector2i anchor; diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/AdminCommands.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/AdminCommands.java index c278a5c..f8480cc 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/AdminCommands.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/AdminCommands.java @@ -35,7 +35,7 @@ else if (args.length==1){ } //查看所有标记点名字 else if (args[0].equalsIgnoreCase("search")){ - List nameList = Get.getMarkersNameList(); + List nameList = Util.getMarkersNameList(); StringBuilder message = new StringBuilder("&c现有的标记点:&9"); for (String mes : nameList){ message.append(mes).append(" "); @@ -116,6 +116,6 @@ else if (args[0].equalsIgnoreCase("reload")){ @Override public @Nullable List onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) { - return AdminTabList.returnList(strings,strings.length,commandSender); + return AdminTabList.returnList(strings,strings.length); } } diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/PlayerCommands.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/PlayerCommands.java index 80a0664..564ca83 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/PlayerCommands.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/PlayerCommands.java @@ -47,7 +47,7 @@ else if (args.length==2) { //添加默认图标的标记 if (args[0].equalsIgnoreCase("add")){ Location location = player.getLocation(); - AddMarker.addMarker(location,args[1],Get.getConfigString("iconUrl"),player); + AddMarker.addMarker(location,args[1], Util.getConfigString("iconUrl"),player); return true; } //删除标记 @@ -68,19 +68,17 @@ else if (args[0].equalsIgnoreCase("del")) { Location location = player.getLocation(); AddMarker.addMarker(location,args[1],args[2],player); SendMessages.sendMessagesString(sender,"add",args[1]); - return true; } //否则返回帮助列表 else { SendMessages.sendMessagesList(sender,"help"); - return true; } } //返回帮助列表 else { SendMessages.sendMessagesList(sender,"help"); - return true; } + return true; } //当命令发送者不为玩家时执行 else { @@ -91,6 +89,6 @@ else if (args[0].equalsIgnoreCase("del")) { @Override public @Nullable List onTabComplete(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) { - return PlayerTabList.returnList(strings,strings.length,commandSender); + return PlayerTabList.returnList(strings,strings.length); } } diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/data/Data.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/data/Data.java index a8b0f6a..5b6d65b 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/data/Data.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/data/Data.java @@ -5,7 +5,7 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.siberianhusy.bluemapsetmarkers.BlueMapSetMarkers; -import org.siberianhusy.bluemapsetmarkers.utils.Get; +import org.siberianhusy.bluemapsetmarkers.utils.Util; import java.io.File; import java.nio.file.Path; @@ -15,22 +15,16 @@ import java.util.concurrent.ConcurrentHashMap; public class Data { - //BlueMap WEB路径 public static Path webRoot; - //创建存储地图和MarkerSet的映射 public static Map worldMarkers = new ConcurrentHashMap<>(); - //创建数据配置 public static List playerData = new ArrayList<>(); public static File messagesFile = new File(BlueMapSetMarkers.plugin.getDataFolder(), "Messages/messages.yml"); public static FileConfiguration messages = YamlConfiguration.loadConfiguration(messagesFile); - //世界列表 - public static List worldList = Get.getWorldList(); - - + public static List worldList = Util.getWorldList(); public static File dataFile = new File(BlueMapSetMarkers.plugin.getDataFolder(), "Data/data.yml"); public static FileConfiguration data = YamlConfiguration.loadConfiguration(dataFile); } diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/data/PlayerData.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/data/PlayerData.java index 67312c2..a9542b1 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/data/PlayerData.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/data/PlayerData.java @@ -4,19 +4,15 @@ public class PlayerData { private String player; private String name; - public String getPlayer() { return player; } - public void setPlayer(String player) { this.player = player; } - public String getName() { return name; } - public void setName(String name) { this.name = name; } diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/events/AdminGUIEvent.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/events/AdminGUIEvent.java index 5f90962..081d70e 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/events/AdminGUIEvent.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/events/AdminGUIEvent.java @@ -11,8 +11,8 @@ import org.siberianhusy.bluemapsetmarkers.data.Data; import org.siberianhusy.bluemapsetmarkers.gui.AdminGUI; import org.siberianhusy.bluemapsetmarkers.utils.DelMarker; -import org.siberianhusy.bluemapsetmarkers.utils.Get; import org.siberianhusy.bluemapsetmarkers.utils.SendMessages; +import org.siberianhusy.bluemapsetmarkers.utils.Util; import java.util.List; @@ -34,9 +34,9 @@ public static void adminMarkerGUIClick(InventoryClickEvent event){ if (event.getWhoClicked().getOpenInventory().getTitle().equals("标记列表-管理")){ event.setCancelled(true); Player player = (Player) event.getWhoClicked(); - List markers = Get.getMarkerList(world); + List markers = Util.getMarkerList(world); if (event.getRawSlot()<= markers.size()){ - Marker marker = Get.getMarker(world,markers.get(event.getRawSlot())); + Marker marker = Util.getMarker(world,markers.get(event.getRawSlot())); if (event.isLeftClick()){ Vector3d pos ; if (marker!=null){ diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/events/PlayerGUIEvent.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/events/PlayerGUIEvent.java index 4b0c2f8..39debbe 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/events/PlayerGUIEvent.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/events/PlayerGUIEvent.java @@ -8,7 +8,7 @@ import org.siberianhusy.bluemapsetmarkers.data.Data; import org.siberianhusy.bluemapsetmarkers.gui.PlayerGUI; import org.siberianhusy.bluemapsetmarkers.utils.DelMarker; -import org.siberianhusy.bluemapsetmarkers.utils.Get; +import org.siberianhusy.bluemapsetmarkers.utils.Util; import java.util.List; @@ -31,7 +31,7 @@ public static void playerMarkerGUIClick(InventoryClickEvent event){ if (event.getWhoClicked().getOpenInventory().getTitle().equals("标记列表-玩家")){ event.setCancelled(true); Player player = (Player) event.getWhoClicked(); - List markerList = Get.getMarkerList(world); + List markerList = Util.getMarkerList(world); if (event.getRawSlot()<=markerList.size()){ if (event.isRightClick()){ DelMarker.delMarker(markerList.get(event.getRawSlot()),world,player); diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/events/SignWatcher.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/events/SignWatcher.java index 973584a..4465a35 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/events/SignWatcher.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/events/SignWatcher.java @@ -9,7 +9,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.block.SignChangeEvent; import org.siberianhusy.bluemapsetmarkers.utils.AddMarker; -import org.siberianhusy.bluemapsetmarkers.utils.Get; +import org.siberianhusy.bluemapsetmarkers.utils.Util; import static org.siberianhusy.bluemapsetmarkers.BlueMapSetMarkers.plugin; @@ -21,24 +21,25 @@ public void onSignWrite(SignChangeEvent event) { Block block = event.getBlock(); Location location = block.getLocation(); Player player = event.getPlayer(); + if (header == Component.empty() || header == null) return; if (!header.toString().contains("[map]")) return; Component clabel1 = event.line(1); if (clabel1 == Component.empty() || clabel1 == null) return; - Component clabel2 = event.line(2); String label = LegacyComponentSerializer.legacySection().serialize(clabel1) + LegacyComponentSerializer.legacySection().serialize(clabel2); Component cicon = event.line(3); if (cicon == Component.empty() || cicon == null) { - AddMarker.addMarker(location,label,Get.getConfigString("iconUrl"),player); + AddMarker.addMarker(location,label, Util.getConfigString("iconUrl"),player); event.line(0, Component.empty()); return; } + String icon = LegacyComponentSerializer.legacySection().serialize(cicon); AddMarker.addMarker(location,label,icon,player); - // Delete [map] and icon lines + event.line(0, Component.empty()); event.line(3, Component.empty()); } diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/gui/AdminGUI.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/gui/AdminGUI.java index 2f93f12..02b9a8a 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/gui/AdminGUI.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/gui/AdminGUI.java @@ -7,8 +7,8 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import org.siberianhusy.bluemapsetmarkers.utils.Get; import org.siberianhusy.bluemapsetmarkers.utils.Replace; +import org.siberianhusy.bluemapsetmarkers.utils.Util; import java.util.List; @@ -17,14 +17,12 @@ public static void adminGUI(Player player,String titie,World world){ Inventory adminGUI = Bukkit.createInventory(player,6*9,titie); //设置图标 ItemStack markerItem = new ItemStack(Material.NAME_TAG); - //设置计数器 - int count=0; //遍历世界标记 - List markers = Get.getMarkerList(world); + List markers = Util.getMarkerList(world); for (int i = 0; i < markers.size(); i++) { ItemMeta markerMeta = markerItem.getItemMeta(); markerMeta.setDisplayName(markers.get(i)); - List lore = Get.getMarkerInfo(markers.get(i),world); + List lore = Util.getMarkerInfo(markers.get(i),world); lore.add("&c左键传送到标记点"); lore.add("&c右键删除标记点"); lore = Replace.replaceColor(lore); diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/gui/PlayerGUI.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/gui/PlayerGUI.java index 7f290a9..54797da 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/gui/PlayerGUI.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/gui/PlayerGUI.java @@ -10,8 +10,8 @@ import org.bukkit.inventory.meta.ItemMeta; import org.siberianhusy.bluemapsetmarkers.data.Data; import org.siberianhusy.bluemapsetmarkers.data.PlayerData; -import org.siberianhusy.bluemapsetmarkers.utils.Get; import org.siberianhusy.bluemapsetmarkers.utils.Replace; +import org.siberianhusy.bluemapsetmarkers.utils.Util; import java.util.List; import java.util.Map; @@ -30,8 +30,8 @@ public static void playerGUI(Player player,String title,World world){ ItemMeta markerMeta = markerItem.getItemMeta(); markerMeta.setDisplayName(entry.getKey()); List lore; - lore = Get.getMarkerInfo(entry.getKey(), world); - PlayerData playerData = Data.playerData.get(Get.getPlayerData(entry.getKey())); + lore = Util.getMarkerInfo(entry.getKey(), world); + PlayerData playerData = Data.playerData.get(Util.getPlayerData(entry.getKey())); if (playerData.getPlayer().equals(player.getName())){ if (lore != null) { lore.add("&c右键删除该标记!"); diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AddMarker.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AddMarker.java index 872bc94..a0f7dcd 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AddMarker.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AddMarker.java @@ -10,7 +10,7 @@ import java.awt.image.BufferedImage; -import static org.siberianhusy.bluemapsetmarkers.utils.Get.getBufferedImage; +import static org.siberianhusy.bluemapsetmarkers.utils.Util.getBufferedImage; public class AddMarker { diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AdminTabList.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AdminTabList.java index 5cc666b..c22c5f7 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AdminTabList.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AdminTabList.java @@ -1,14 +1,12 @@ package org.siberianhusy.bluemapsetmarkers.utils; -import org.bukkit.command.CommandSender; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; public enum AdminTabList { FIRST(Arrays.asList("help","gui","search","get","set"),0,null,new int[]{1}), - SECOND(Get.getMarkersNameList(),1,"del",new int[]{2}); + SECOND(Util.getMarkersNameList(),1,"del",new int[]{2}); private final List list;//返回的List private final int befPos;//识别的上个参数的位 @@ -38,7 +36,7 @@ public int getBefPos() { return befPos; } - public static List returnList(String[] Para, int curNum, CommandSender sender) { + public static List returnList(String[] Para, int curNum) { for(AdminTabList tab : AdminTabList.values() ){ if(tab.getBefPos()-1 >= Para.length){ continue; diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Judge.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Judge.java index 396d9f7..0b73f12 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Judge.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Judge.java @@ -9,7 +9,7 @@ public class Judge { //判断标签名字是否存在，若存在则返回true public static boolean judgeMarkerName(String name){ - List MarkersName = Get.getMarkersNameList(); + List MarkersName = Util.getMarkersNameList(); for (String s : MarkersName) { if (s.equals(name)) { return true; diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/PlayerTabList.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/PlayerTabList.java index 81a56e8..acccfd4 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/PlayerTabList.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/PlayerTabList.java @@ -1,14 +1,12 @@ package org.siberianhusy.bluemapsetmarkers.utils; -import org.bukkit.command.CommandSender; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; public enum PlayerTabList { FIRST(Arrays.asList("help","add","addhelp","del","gui"),0,null,new int[]{1}), - SECOND(Get.getMarkersNameList(),1,"del",new int[]{2}); + SECOND(Util.getMarkersNameList(),1,"del",new int[]{2}); private final List list;//返回的List private final int befPos;//识别的上个参数的位 @@ -38,7 +36,7 @@ public int getBefPos() { return befPos; } - public static List returnList(String[] Para, int curNum, CommandSender sender) { + public static List returnList(String[] Para, int curNum) { for(PlayerTabList tab : PlayerTabList.values() ){ if(tab.getBefPos()-1 >= Para.length){ continue; diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/SendMessages.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/SendMessages.java index 2306afd..70d4c7c 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/SendMessages.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/SendMessages.java @@ -8,38 +8,26 @@ public class SendMessages { //发送信息(列表) -sender public static void sendMessagesList(CommandSender sender,String key){ - List messages = Get.getMessagesList(key); + List messages = Util.getMessagesList(key); for (String message : messages) { sender.sendMessage(Replace.replaceColor(message)); } } - //发送信息(列表) -player - public static void sendMessagesList(Player player,String key){ - List messages = Get.getMessagesList(key); - for (String message : messages) { - player.sendMessage(Replace.replaceColor(message)); - } - } //发送信息(字符串) -sender public static void sendMessagesString(CommandSender sender,String key){ - sender.sendMessage(Get.getMessagesString(key)); + sender.sendMessage(Util.getMessagesString(key)); } //发送信息(字符串) -sender(替换[name]) public static void sendMessagesString(CommandSender sender,String key,String name){ - sender.sendMessage(Get.getMessagesString(key,name)); - } - - //发送信息(字符串) -player - public static void sendMessagesString(Player player,String key){ - player.sendMessage(Get.getMessagesString(key)); + sender.sendMessage(Util.getMessagesString(key,name)); } //发送信息(字符串) -player(替换[name]) public static void sendMessagesString(Player player,String key,String name){ - player.sendMessage(Get.getMessagesString(key,name)); + player.sendMessage(Util.getMessagesString(key,name)); } //发送标记点信息 public static void sendMarkerInfo(String name,Player player){ - List info = Get.getMarkerInfo(name, player.getWorld()); + List info = Util.getMarkerInfo(name, player.getWorld()); if (info!=null){ for (String mes : info){ player.sendMessage(Replace.replaceColor(mes)); diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Get.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Util.java similarity index 82% rename from src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Get.java rename to src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Util.java index 6c5db1c..a19d3ab 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Get.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/Util.java @@ -3,9 +3,7 @@ import com.flowpowered.math.vector.Vector3d; import de.bluecolored.bluemap.api.markers.Marker; import org.bukkit.Bukkit; -import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.entity.Player; import org.siberianhusy.bluemapsetmarkers.BlueMapSetMarkers; import org.siberianhusy.bluemapsetmarkers.data.Data; @@ -19,7 +17,7 @@ import java.util.Map; import java.util.Objects; -public class Get { +public class Util { //通过直链获取图片信息 public static BufferedImage getBufferedImage(String imgUrl) { URL url; @@ -43,10 +41,6 @@ public static BufferedImage getBufferedImage(String imgUrl) { } return img; } - //获取玩家Location - public static Location playerGetLocation(Player player){ - return player.getLocation(); - } //获取messages。yml中的列表 public static List getMessagesList(String key){ @@ -106,17 +100,6 @@ public static int getPlayerData(String name) { public static List getWorldList(){ return new ArrayList<>(Bukkit.getWorlds()); } - //获取世界列表中世界对应索引,不存在返回-1 - public static int getWorldListIndex(World world){ - int count = 0; - for (World world1:Data.worldList){ - if (world1.getName().equals(world.getName())){ - return count; - } - count++; - } - return -1; - } //获取标记列表 public static List getMarkerList(World world){ List markerList = new ArrayList<>(); @@ -125,16 +108,6 @@ public static List getMarkerList(World world){ } return markerList; } - //获取标记列表中标记对应索引，不存在返回-1 - public static int getMarkerListIndex(World world,String markerName){ - int count = 0; - for (String name : getMarkerList(world)){ - if (name.equals(markerName)){ - return count; - } - } - return -1; - } //获取标记名对应的标记 public static Marker getMarker(World world,String name){ for (Map.Entry entry : Data.worldMarkers.get(world).getMarkers().entrySet()){ diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 4c08224..c7f6208 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,12 @@ name: BlueMapSetMarkers +description: "A BlueMap addition plugin. Allows you to manage markers" +website: https://github.com/Atleisure/BlueMapSetMarkers +authors: [Atleisure, xinyihl] version: '${project.version}' main: org.siberianhusy.bluemapsetmarkers.BlueMapSetMarkers api-version: '1.19' +depend: [ BlueMap ] + commands: BlueMapSetMarkers: aliases: sm From 2955d5e1cc635d39daf21ec4d9188574b97f45c8 Mon Sep 17 00:00:00 2001 From: xinyihl <1012737146@qq.com> Date: Fri, 10 Nov 2023 21:03:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?README.md=20=E4=BF=AE=E6=94=B9/asm=20get=20?= =?UTF-8?q?->=20/asm=20info?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 39 ++++++++++--------- .../commands/AdminCommands.java | 3 +- .../bluemapsetmarkers/utils/AdminTabList.java | 2 +- src/main/resources/plugin.yml | 15 +++++-- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 8ef0a74..1c38e51 100644 --- a/README.md +++ b/README.md @@ -5,32 +5,33 @@ - /sm add [name] [icon] 添加标记点 - /sm addhelp 添加标记点帮助 - /sm del [name] 删除标记点 -### 添加帮助 -/sm add name [icon] 添加标记点 -[icon]为可选参数，应该为图片直链 -建议32x32大小的图片 -若不加[icon]则默认为命名牌 -icon默认图片链接可在config.yml修改 -也可以使用指令修改 -#### 告示牌添加 + +### 管理员指令 +- /asm help 插件管理员帮助 +- /asm gui 打开标记点管理GUI +- /asm del [name] 删除标记点 +- /asm info [name] 查看name标记点的所有信息 +- /asm set [icon] 设置默认icon链接 +- /asm search 查看所有标记点 +- /asm reload 插件重载 + +#### 添加帮助 +/sm add [name] <icon> 添加标记点 +[icon]为可选参数，应该为图片直链，建议32x32大小的图片 +若不加 <icon> 则默认为命名牌，icon默认图片链接可在config.yml修改 +也可以使用指令 /asm set [icon] 修改 + +### 告示牌添加 第一行：[map] 第二行：name1 第三行：name2 第四行：icon直链 前三行为必要，第四行不写使用默认图标 破坏告示牌不会删除标记，需要使用指令删除 -### 管理员指令 -- /asm help 插件管理员帮助 -- /asm gui 打开标记点管理GUI -- /asm del name 删除标记点 -- /asm get name 查看name标记点的所有信息 -- /asm set icon 设置默认icon链接 -- /asm search &查看所有标记点 -- /asm reload 插件重载 + ### 注意事项 本插件需要以[BlueMap](https://github.com/BlueMap-Minecraft/BlueMap)作为前置插件 -本插件使用1.19的paper-api，但1.20测试可用 -其他版本未测试 +本插件使用1.19的paper-api，但1.20测试可用，其他版本未测试 管理员权限节点：`bluemapsetmarkers.admin` ->欢迎各位对插件提出建议反馈bug(QQ:3088506834) \ No newline at end of file +> 欢迎各位对插件提出建议反馈bug(QQ:3088506834) \ No newline at end of file diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/AdminCommands.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/AdminCommands.java index f8480cc..1c7feab 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/AdminCommands.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/commands/AdminCommands.java @@ -63,7 +63,7 @@ else if (args.length==2) { return true; } //获取标记点信息 - else if (args[0].equalsIgnoreCase("get")){ + else if (args[0].equalsIgnoreCase("info")){ SendMessages.sendMarkerInfo(args[1],player); return true; } @@ -108,7 +108,6 @@ else if (args[0].equalsIgnoreCase("reload")){ //其他指令需要在游戏中使用 else { sender.sendMessage(Replace.replaceColor("&c其他指令需要在游戏中使用")); - return true; } } diff --git a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AdminTabList.java b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AdminTabList.java index c22c5f7..caf13ce 100644 --- a/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AdminTabList.java +++ b/src/main/java/org/siberianhusy/bluemapsetmarkers/utils/AdminTabList.java @@ -5,7 +5,7 @@ import java.util.List; public enum AdminTabList { - FIRST(Arrays.asList("help","gui","search","get","set"),0,null,new int[]{1}), + FIRST(Arrays.asList("help","gui","search","info","set"),0,null,new int[]{1}), SECOND(Util.getMarkersNameList(),1,"del",new int[]{2}); private final List list;//返回的List diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c7f6208..584318d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,5 @@ name: BlueMapSetMarkers +prefix: BMSMarkers description: "A BlueMap addition plugin. Allows you to manage markers" website: https://github.com/Atleisure/BlueMapSetMarkers authors: [Atleisure, xinyihl] @@ -10,8 +11,16 @@ depend: [ BlueMap ] commands: BlueMapSetMarkers: aliases: sm - description: BlueMapSerMarkers help + description: 玩家命令 + permission: bluemapsetmarkers.player BlueMapSerMarkersAdmin: aliases: asm - description: BlueMapSetMarkers Admin help - permission: bluemapsetmarkers.admin \ No newline at end of file + description: 管理员命令 + permission: bluemapsetmarkers.admin +permissions: + bluemapsetmarkers.player: + description: 玩家权限 + default: true + bluemapsetmarkers.admin: + description: 管理员权限 + default: op \ No newline at end of file From b05f3e5c945cb074fc15bc84c25b82aae20d3ced Mon Sep 17 00:00:00 2001 From: xinyihl <1012737146@qq.com> Date: Fri, 10 Nov 2023 21:05:32 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1c38e51..935378b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ### 玩家指令 - /sm help 插件帮助 - /sm gui 打开标记点GUI -- /sm add [name] [icon] 添加标记点 +- /sm add [name] <icon> 添加标记点 - /sm addhelp 添加标记点帮助 - /sm del [name] 删除标记点 @@ -34,4 +34,4 @@ 本插件使用1.19的paper-api，但1.20测试可用，其他版本未测试 管理员权限节点：`bluemapsetmarkers.admin` -> 欢迎各位对插件提出建议反馈bug(QQ:3088506834) \ No newline at end of file +> 欢迎各位对插件提出建议反馈bug(QQ:3088506834)