Refactor: Rename package & update version

SakuraKoi · Jul 23, 2020 · 738bcce · 738bcce
1 parent a8066f9
commit 738bcce
Show file tree

Hide file tree

Showing 24 changed files with 46 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /.settings/
 /bin/
 /.idea/
+/classes/
diff --git a/src/plugin.yml b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: BridgingAnalyzer
 main: sakura.kooi.BridgingAnalyzer.BridgingAnalyzer
-version: 27
+version: 28
 author: SakuraKooi
 commands:
   bridge:

diff --git a/src/sakura/kooi/BridgingAnalyzer/BridgingAnalyzer.java b/src/sakura/kooi/BridgingAnalyzer/BridgingAnalyzer.java
@@ -22,11 +22,11 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
-import sakura.kooi.BridgingAnalyzer.Cmmands.*;
-import sakura.kooi.BridgingAnalyzer.Utils.Metrics;
-import sakura.kooi.BridgingAnalyzer.Utils.NoAIUtils;
-import sakura.kooi.BridgingAnalyzer.Utils.TitleUtils;
-import sakura.kooi.BridgingAnalyzer.Utils.Util;
+import sakura.kooi.BridgingAnalyzer.commands.*;
+import sakura.kooi.BridgingAnalyzer.utils.Metrics;
+import sakura.kooi.BridgingAnalyzer.utils.NoAIUtils;
+import sakura.kooi.BridgingAnalyzer.utils.TitleUtils;
+import sakura.kooi.BridgingAnalyzer.utils.Utils;
 import sakura.kooi.BridgingAnalyzer.api.BlockSkinProvider;
 
 import java.util.HashMap;
@@ -156,11 +156,11 @@ public void onDamage(EntityDamageEvent e) {
                 c.reset();
                 teleportCheckPoint((Player) e.getEntity());
                 TitleUtils.sendTitle((Player) e.getEntity(), "",
-                        "§4致命伤害 - " + Util.formatDouble(e.getFinalDamage() / 2) + " ❤", 10, 20, 10);
+                        "§4致命伤害 - " + Utils.formatDouble(e.getFinalDamage() / 2) + " ❤", 10, 20, 10);
                 e.setDamage(0.0);
             } else if (e.getFinalDamage() > 10) {
                 TitleUtils.sendTitle((Player) e.getEntity(), "",
-                        "§c严重伤害 - " + Util.formatDouble(e.getFinalDamage() / 2) + " ❤", 10, 20, 10);
+                        "§c严重伤害 - " + Utils.formatDouble(e.getFinalDamage() / 2) + " ❤", 10, 20, 10);
             }
             e.setDamage(0.0);
         }

diff --git a/src/sakura/kooi/BridgingAnalyzer/Counter.java b/src/sakura/kooi/BridgingAnalyzer/Counter.java
@@ -11,8 +11,8 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitTask;
-import sakura.kooi.BridgingAnalyzer.Utils.SoundMachine;
-import sakura.kooi.BridgingAnalyzer.Utils.Util;
+import sakura.kooi.BridgingAnalyzer.utils.SoundMachine;
+import sakura.kooi.BridgingAnalyzer.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -96,13 +96,13 @@ public double getBridgeSpeed() {
             if (peri > 1000L) {
                 result = counterBridge.size() / (peri / 1000.0);
                 if (result > maxBridge) {
-                    maxBridge = Util.formatDouble(result);
+                    maxBridge = Utils.formatDouble(result);
                 }
             } else {
                 result = counterBridge.size();
             }
         }
-        return Util.formatDouble(result);
+        return Utils.formatDouble(result);
     }
 
     public int getCPS() {
@@ -123,7 +123,7 @@ public int getMaxCPS() {
 
     public void instantBreakBlock() {
         for (Block b : allBlock) {
-            Util.breakBlock(b);
+            Utils.breakBlock(b);
             BridgingAnalyzer.getPlacedBlocks().remove(b);
         }
         allBlock.clear();
@@ -172,7 +172,7 @@ public void setCheckPoint(Location loc) {
             Chest chest = (Chest) target.getState();
             for (ItemStack stack : chest.getBlockInventory().getContents())
                 if (stack != null) {
-                    Util.addItem(player.getInventory(), stack.clone());
+                    Utils.addItem(player.getInventory(), stack.clone());
                 }
             player.getWorld().playSound(player.getLocation(), SoundMachine.get("ITEM_PICKUP", "ENTITY_ITEM_PICKUP"), 1,
                     1);
@@ -188,7 +188,7 @@ public void teleportCheckPoint() {
             Chest chest = (Chest) target.getState();
             for (ItemStack stack : chest.getBlockInventory().getContents())
                 if (stack != null) {
-                    Util.addItem(player.getInventory(), stack.clone());
+                    Utils.addItem(player.getInventory(), stack.clone());
                 }
             player.getWorld().playSound(player.getLocation(), SoundMachine.get("ITEM_PICKUP", "ENTITY_ITEM_PICKUP"), 1,
                     1);
@@ -234,7 +234,7 @@ public void run() {
                     BridgingAnalyzer.getPlacedBlocks().remove(b);
                 }
                 if (b != null) {
-                    Util.breakBlock(b);
+                    Utils.breakBlock(b);
                     BridgingAnalyzer.getPlacedBlocks().remove(b);
                 }
             } else {

diff --git a/src/sakura/kooi/BridgingAnalyzer/CounterListener.java b/src/sakura/kooi/BridgingAnalyzer/CounterListener.java
@@ -13,8 +13,8 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.inventory.ItemStack;
-import sakura.kooi.BridgingAnalyzer.Utils.ActionBarUtils;
-import sakura.kooi.BridgingAnalyzer.Utils.TitleUtils;
+import sakura.kooi.BridgingAnalyzer.utils.ActionBarUtils;
+import sakura.kooi.BridgingAnalyzer.utils.TitleUtils;
 
 public class CounterListener implements Listener {
     @EventHandler

diff --git a/src/sakura/kooi/BridgingAnalyzer/HighlightListener.java b/src/sakura/kooi/BridgingAnalyzer/HighlightListener.java
@@ -8,7 +8,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
-import sakura.kooi.BridgingAnalyzer.Utils.ParticleEffects;
+import sakura.kooi.BridgingAnalyzer.utils.ParticleEffects;
 
 import java.util.HashMap;
 

diff --git a/src/sakura/kooi/BridgingAnalyzer/TriggerBlockListener.java b/src/sakura/kooi/BridgingAnalyzer/TriggerBlockListener.java
@@ -12,7 +12,7 @@
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.Vector;
-import sakura.kooi.BridgingAnalyzer.Utils.*;
+import sakura.kooi.BridgingAnalyzer.utils.*;
 
 public class TriggerBlockListener implements Listener {
     @EventHandler
@@ -22,7 +22,7 @@ public void antiTriggerBlockCover(BlockPlaceEvent e) {
             if (isTriggerBlock(e.getBlock().getRelative(BlockFace.DOWN)) || isTriggerBlock(e.getBlock().getRelative(BlockFace.DOWN,
                     2))) {
                 Bukkit.getScheduler().runTaskLater(BridgingAnalyzer.getInstance(), () -> {
-                    Util.breakBlock(e.getBlock());
+                    Utils.breakBlock(e.getBlock());
                     BridgingAnalyzer.getCounter(e.getPlayer()).removeBlockRecord(e.getBlock());
                 }, 100);
             }

diff --git a/...idgingAnalyzer/Cmmands/BridgeCommand.java → ...dgingAnalyzer/commands/BridgeCommand.java b/...idgingAnalyzer/Cmmands/BridgeCommand.java → ...dgingAnalyzer/commands/BridgeCommand.java
@@ -1,12 +1,12 @@
-package sakura.kooi.BridgingAnalyzer.Cmmands;
+package sakura.kooi.BridgingAnalyzer.commands;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import sakura.kooi.BridgingAnalyzer.BridgingAnalyzer;
 import sakura.kooi.BridgingAnalyzer.Counter;
-import sakura.kooi.BridgingAnalyzer.Utils.SendMessageUtils;
+import sakura.kooi.BridgingAnalyzer.utils.SendMessageUtils;
 
 public class BridgeCommand implements CommandExecutor {
 
@@ -18,12 +18,13 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
         if (args.length != 1) {
             SendMessageUtils.sendMessage(sender,
-                    "§b§l搭路练习 §7>> §b骚操作练习 最终版 §lBy.SakuraKooi",
+                    "§b§l搭路练习 §7>> §b§lBridgingAnalyzer | By.SakuraKooi",
                     "§b§l搭路练习 §7>> §e/bridge highlight    §a启用/禁用侧搭辅助指示",
                     "§b§l搭路练习 §7>> §e/bridge pvp         §a启用/禁用伤害屏蔽",
                     "§b§l搭路练习 §7>> §e/bridge speed       §a启用/禁用搭路速度统计",
                     "§b§l搭路练习 §7>> §e/bridge stand       §a启用/禁用走搭位置指示",
-                    "§b§l搭路练习 §7>> §d所配置的参数仅对您有效, 其他玩家不受影响."
+                    "§b§l搭路练习 §7>> §d所配置的参数仅对您有效, 其他玩家不受影响",
+                    "§b§l搭路练习 §7>> §bhttps://github.com/SakuraKoi/BridgingAnalyzer"
             );
             return true;
         }

diff --git a/...ridgingAnalyzer/Cmmands/ClearCommand.java → ...idgingAnalyzer/commands/ClearCommand.java b/...ridgingAnalyzer/Cmmands/ClearCommand.java → ...idgingAnalyzer/commands/ClearCommand.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Cmmands;
+package sakura.kooi.BridgingAnalyzer.commands;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;

diff --git a/...ingAnalyzer/Cmmands/SaveWorldCommand.java → ...ngAnalyzer/commands/SaveWorldCommand.java b/...ingAnalyzer/Cmmands/SaveWorldCommand.java → ...ngAnalyzer/commands/SaveWorldCommand.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Cmmands;
+package sakura.kooi.BridgingAnalyzer.commands;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -8,7 +8,7 @@
 import org.bukkit.command.CommandSender;
 import sakura.kooi.BridgingAnalyzer.BridgingAnalyzer;
 import sakura.kooi.BridgingAnalyzer.Counter;
-import sakura.kooi.BridgingAnalyzer.Utils.Util;
+import sakura.kooi.BridgingAnalyzer.utils.Utils;
 
 public class SaveWorldCommand implements CommandExecutor {
 
@@ -20,7 +20,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                 c.instantBreakBlock();
             }
             for (Block b : Counter.scheduledBreakBlocks) {
-                Util.breakBlock(b);
+                Utils.breakBlock(b);
             }
             for (World world : Bukkit.getWorlds()) {
                 world.save();

diff --git a/...ridgingAnalyzer/Cmmands/StuckCommand.java → ...idgingAnalyzer/commands/StuckCommand.java b/...ridgingAnalyzer/Cmmands/StuckCommand.java → ...idgingAnalyzer/commands/StuckCommand.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Cmmands;
+package sakura.kooi.BridgingAnalyzer.commands;
 
 import org.bukkit.Material;
 import org.bukkit.block.Block;

diff --git a/...er/Cmmands/VillagerSpawnPointCommand.java → ...r/commands/VillagerSpawnPointCommand.java b/...er/Cmmands/VillagerSpawnPointCommand.java → ...r/commands/VillagerSpawnPointCommand.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Cmmands;
+package sakura.kooi.BridgingAnalyzer.commands;
 
 import org.bukkit.Location;
 import org.bukkit.Material;

diff --git a/...ridgingAnalyzer/Utils/ActionBarUtils.java → ...ridgingAnalyzer/utils/ActionBarUtils.java b/...ridgingAnalyzer/Utils/ActionBarUtils.java → ...ridgingAnalyzer/utils/ActionBarUtils.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.entity.Player;
 

diff --git a/...BridgingAnalyzer/Utils/FireworkUtils.java → ...BridgingAnalyzer/utils/FireworkUtils.java b/...BridgingAnalyzer/Utils/FireworkUtils.java → ...BridgingAnalyzer/utils/FireworkUtils.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Color;
 import org.bukkit.FireworkEffect;

diff --git a/.../kooi/BridgingAnalyzer/Utils/Metrics.java → .../kooi/BridgingAnalyzer/utils/Metrics.java b/.../kooi/BridgingAnalyzer/Utils/Metrics.java → .../kooi/BridgingAnalyzer/utils/Metrics.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;

diff --git a/...ooi/BridgingAnalyzer/Utils/NoAIUtils.java → ...ooi/BridgingAnalyzer/utils/NoAIUtils.java b/...ooi/BridgingAnalyzer/Utils/NoAIUtils.java → ...ooi/BridgingAnalyzer/utils/NoAIUtils.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.entity.Entity;
 

diff --git a/...idgingAnalyzer/Utils/ParticleEffects.java → ...idgingAnalyzer/utils/ParticleEffects.java b/...idgingAnalyzer/Utils/ParticleEffects.java → ...idgingAnalyzer/utils/ParticleEffects.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Color;

diff --git a/.../BridgingAnalyzer/Utils/ParticleRing.java → .../BridgingAnalyzer/utils/ParticleRing.java b/.../BridgingAnalyzer/Utils/ParticleRing.java → .../BridgingAnalyzer/utils/ParticleRing.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

diff --git a/...idgingAnalyzer/Utils/ReflectionUtils.java → ...idgingAnalyzer/utils/ReflectionUtils.java b/...idgingAnalyzer/Utils/ReflectionUtils.java → ...idgingAnalyzer/utils/ReflectionUtils.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Bukkit;
 

diff --git a/...dgingAnalyzer/Utils/SendMessageUtils.java → ...dgingAnalyzer/utils/SendMessageUtils.java b/...dgingAnalyzer/Utils/SendMessageUtils.java → ...dgingAnalyzer/utils/SendMessageUtils.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.command.CommandSender;
 

diff --git a/.../BridgingAnalyzer/Utils/SoundMachine.java → .../BridgingAnalyzer/utils/SoundMachine.java b/.../BridgingAnalyzer/Utils/SoundMachine.java → .../BridgingAnalyzer/utils/SoundMachine.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Sound;
 

diff --git a/...ingAnalyzer/Utils/TeleportRingEffect.java → ...ingAnalyzer/utils/TeleportRingEffect.java b/...ingAnalyzer/Utils/TeleportRingEffect.java → ...ingAnalyzer/utils/TeleportRingEffect.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;

diff --git a/...oi/BridgingAnalyzer/Utils/TitleUtils.java → ...oi/BridgingAnalyzer/utils/TitleUtils.java b/...oi/BridgingAnalyzer/Utils/TitleUtils.java → ...oi/BridgingAnalyzer/utils/TitleUtils.java
@@ -1,4 +1,4 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

diff --git a/...ura/kooi/BridgingAnalyzer/Utils/Util.java → ...ra/kooi/BridgingAnalyzer/utils/Utils.java b/...ura/kooi/BridgingAnalyzer/Utils/Util.java → ...ra/kooi/BridgingAnalyzer/utils/Utils.java
@@ -1,12 +1,12 @@
-package sakura.kooi.BridgingAnalyzer.Utils;
+package sakura.kooi.BridgingAnalyzer.utils;
 
 import org.bukkit.Effect;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-public class Util {
+public class Utils {
     public static void breakBlock(Block b) {
         if (!b.getChunk().isLoaded()) {
             b.getChunk().load(false);