Add TpsWatcher, Spilt nms stuff from Util class into ReflectFactory

Author: Ghost-chu

src/main/java/org/maxgamer/quickshop/QuickShop.java

@@ -111,7 +111,7 @@ public class QuickShop extends JavaPlugin implements QuickShopAPI {
     private JavaTextManager textManager;
     private boolean priceChangeRequiresFee = false;
     private final Map<String, Integer> limits = new HashMap<>(15);
-    private final GameVersion gameVersion = GameVersion.get(Util.getNMSVersion());
+    private final GameVersion gameVersion = GameVersion.get(ReflectFactory.getNMSVersion());
     /* Public QuickShop API End */
 
     /**
@@ -255,6 +255,8 @@ public class QuickShop extends JavaPlugin implements QuickShopAPI {
     private WorldEditAdapter worldEditAdapter;
     @Getter
     private ShopPurger shopPurger;
+    @Getter
+    private final TpsWatcher tpsWatcher = new TpsWatcher();
 
     /**
      * Use for mock bukkit
@@ -349,7 +351,7 @@ private void load3rdParty() {
             }
         }
         if (getConfig().getBoolean("plugin.WorldEdit")) {
-            String nmsVersion = Util.getNMSVersion();
+            String nmsVersion = ReflectFactory.getNMSVersion();
             GameVersion gameVersion = GameVersion.get(nmsVersion);
             this.worldEditPlugin = Bukkit.getPluginManager().getPlugin("WorldEdit");
             if (this.worldEditPlugin != null) {
@@ -637,6 +639,9 @@ public final void onDisable() {
         if (calendarWatcher != null) {
             calendarWatcher.stop();
         }
+        if (tpsWatcher != null) {
+            tpsWatcher.cancel();
+        }
         /* Unload UpdateWatcher */
         if (this.updateWatcher != null) {
             this.updateWatcher.uninit();
@@ -940,6 +945,7 @@ public void run() {
         }
         calendarWatcher = new CalendarWatcher(this);
         calendarWatcher.start();
+        tpsWatcher.runTaskTimer(this, 1000, 50);
         this.shopPurger = new ShopPurger(this, false);
         shopPurger.runTaskAsynchronously(this);
         Util.debugLog("Now using display-type: " + AbstractDisplayItem.getNowUsing().name());

src/main/java/org/maxgamer/quickshop/util/ReflectFactory.java

@@ -43,6 +43,74 @@ public class ReflectFactory {
     private static Method itemStack_saveMethod;
     private static Class<?> nbtTagCompoundClass;
     private static Class<?> craftServerClass;
+    private static Class<?> cachedNMSClass;
+    private static String nmsVersion;
+    private static Object serverInstance;
+    private static Field tpsField;
+
+
+    @NotNull
+    public static String getNMSVersion() {
+        if (nmsVersion == null) {
+            String name = Bukkit.getServer().getClass().getPackage().getName();
+            nmsVersion = name.substring(name.lastIndexOf('.') + 1);
+        }
+        return nmsVersion;
+    }
+
+    /**
+     * Get MinecraftServer's TPS
+     *
+     * @return TPS (e.g 19.92)
+     */
+    @NotNull
+    public static Double getTPS() {
+        return QuickShop.getInstance().getTpsWatcher().getAverageTPS();
+//        if (serverInstance == null || tpsField == null) {
+//            try {
+//                serverInstance = getNMSClass("MinecraftServer").getMethod("getServer").invoke(null);
+//                tpsField = serverInstance.getClass().getField("recentTps");
+//            } catch (NoSuchFieldException
+//                    | SecurityException
+//                    | IllegalAccessException
+//                    | IllegalArgumentException
+//                    | InvocationTargetException
+//                    | NoSuchMethodException e) {
+//                serverInstance = null;
+//                tpsField = null;
+//                Util.debugLog("Failed to get TPS " + e.getMessage());
+//                try {
+//
+//                }catch (Exception exception){
+//                    return 20.0;
+//                }
+//            }
+//        }
+//        try {
+//            double[] tps = ((double[]) tpsField.get(serverInstance));
+//            return tps[0];
+//        } catch (IllegalAccessException ignored) {
+//            return 20.0;
+//        }
+    }
+
+    @NotNull
+    public static Class<?> getNMSClass(@Nullable String className) {
+        if (cachedNMSClass != null) {
+            return cachedNMSClass;
+        }
+        if (className == null) {
+            className = "MinecraftServer";
+        }
+        String name = Bukkit.getServer().getClass().getPackage().getName();
+        String version = name.substring(name.lastIndexOf('.') + 1);
+        try {
+            cachedNMSClass = Class.forName("net.minecraft.server." + version + "." + className);
+            return cachedNMSClass;
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     static {
         String name = Bukkit.getServer().getClass().getPackage().getName();

src/main/java/org/maxgamer/quickshop/util/Util.java

@@ -61,8 +61,6 @@
 
 import java.io.*;
 import java.lang.management.ManagementFactory;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.text.DecimalFormat;
@@ -84,24 +82,18 @@ public class Util {
     private static final List<BlockFace> VERTICAL_FACING = Collections.unmodifiableList(Arrays.asList(BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST));
     private static final List<String> DEBUG_LOGS = new ArrayList<>();
     private static final ReentrantReadWriteLock LOCK = new ReentrantReadWriteLock();
-    @Getter
-    private static final Map<String, String> CURRENCY_SYMBOL_MAPPING = new HashMap<>();
+
     private static final ThreadLocal<MineDown> MINEDOWN = ThreadLocal.withInitial(() -> new MineDown(""));
     private static int bypassedCustomStackSize = -1;
     private static Yaml yaml = null;
     private static Boolean devMode = null;
     @Setter
     private static QuickShop plugin;
-    private static Object serverInstance;
-    private static Field tpsField;
     @Getter
     private static boolean disableDebugLogger = false;
     @Getter
     @Nullable
     private static DyeColor dyeColor = null;
-    @Nullable
-    private static Class<?> cachedNMSClass = null;
-    private volatile static String nmsVersion;
 
     /**
      * Convert strArray to String. E.g "Foo, Bar"
@@ -353,73 +345,7 @@ public static void debugLog(@NotNull String... logs) {
         LOCK.writeLock().unlock();
     }
 
-    /**
-     * Formats the given number according to how vault would like it. E.g. $50 or 5 dollars.
-     *
-     * @param n    price
-     * @param shop shop
-     * @return The formatted string.
-     */
-    @NotNull
-    public static String format(double n, @Nullable Shop shop) {
-        if (shop == null) {
-            return "Error: Shop null";
-        }
-        return format(n, plugin.getConfig().getBoolean("shop.disable-vault-format", false), shop.getLocation().getWorld(), shop);
-    }
-
-    @NotNull
-    public static String format(double n, boolean internalFormat, @NotNull World world, @Nullable Shop shop) {
-        if (shop != null) {
-            return format(n, internalFormat, world, shop.getCurrency());
-        } else {
-            return format(n, internalFormat, world, (Shop) null);
-        }
-    }
-
-    @NotNull
-    public static String format(double n, boolean internalFormat, @NotNull World world, @Nullable String currency) {
-        if (internalFormat) {
-            return getInternalFormat(n, currency);
-        }
-
-        if (plugin == null) {
-            Util.debugLog("Called format before Plugin booted up, forcing fixing.");
-            plugin = QuickShop.getInstance();
-        }
-        if (plugin.getEconomy() == null) {
-            Util.debugLog("Called format before Economy booted up, using built-in formatter.");
-            return getInternalFormat(n, currency);
-        }
-        try {
-            String formatted = plugin.getEconomy().format(n, world, currency);
-            if (StringUtils.isEmpty(formatted)) {
-                Util.debugLog(
-                        "Use alternate-currency-symbol to formatting, Cause economy plugin returned null");
-                return getInternalFormat(n, currency);
-            } else {
-                return formatted;
-            }
-        } catch (NumberFormatException e) {
-            Util.debugLog("format", e.getMessage());
-            Util.debugLog(
-                    "format", "Use alternate-currency-symbol to formatting, Cause NumberFormatException");
-            return getInternalFormat(n, currency);
-        }
-    }
 
-    private static String getInternalFormat(double amount, @Nullable String currency) {
-        if (StringUtils.isEmpty(currency)) {
-            Util.debugLog("Format: Currency is null");
-            String formatted = plugin.getConfig().getBoolean("use-decimal-format", false) ? MsgUtil.decimalFormat(amount) : Double.toString(amount);
-            return plugin.getConfig().getBoolean("shop.currency-symbol-on-right", false) ? formatted + plugin.getConfig().getString("shop.alternate-currency-symbol", "$") : plugin.getConfig().getString("shop.alternate-currency-symbol", "$") + formatted;
-        } else {
-            Util.debugLog("Format: Currency is: [" + currency + "]");
-            String formatted = plugin.getConfig().getBoolean("use-decimal-format", false) ? MsgUtil.decimalFormat(amount) : Double.toString(amount);
-            String symbol = CURRENCY_SYMBOL_MAPPING.getOrDefault(currency, currency);
-            return plugin.getConfig().getBoolean("shop.currency-symbol-on-right", false) ? formatted + symbol : symbol + formatted;
-        }
-    }
 
     /**
      * return the right side for given blockFace
@@ -625,7 +551,6 @@ public static void initialize() {
         SHOPABLES.clear();
         RESTRICTED_PRICES.clear();
         CUSTOM_STACKSIZE.clear();
-        CURRENCY_SYMBOL_MAPPING.clear();
         devMode = plugin.getConfig().getBoolean("dev-mode");
 
         for (String s : plugin.getConfig().getStringList("shop-blocks")) {
@@ -688,14 +613,7 @@ public static void initialize() {
             dyeColor = DyeColor.valueOf(plugin.getConfig().getString("shop.sign-dye-color"));
         } catch (Exception ignored) {
         }
-        List<String> symbols = plugin.getConfig().getStringList("shop.alternate-currency-symbol-list");
-        symbols.forEach(entry -> {
-            String[] splits = entry.split(";", 2);
-            if (splits.length < 2) {
-                plugin.getLogger().warning("Invalid entry in alternate-currency-symbol-list: " + entry);
-            }
-            CURRENCY_SYMBOL_MAPPING.put(splits[0], splits[1]);
-        });
+
         InteractUtil.init(plugin.getConfig());
     }
 
@@ -1171,14 +1089,6 @@ public static String getClassPrefix() {
         return "[" + className + "-" + methodName + "] ";
     }
 
-    @NotNull
-    public static String getNMSVersion() {
-        if (nmsVersion == null) {
-            String name = Bukkit.getServer().getClass().getPackage().getName();
-            nmsVersion = name.substring(name.lastIndexOf('.') + 1);
-        }
-        return nmsVersion;
-    }
 
     /**
      * Get the sign material using by plugin. With compatiabily process.
@@ -1194,37 +1104,6 @@ public static Material getSignMaterial() {
         return Material.OAK_WALL_SIGN;
     }
 
-    /**
-     * Get MinecraftServer's TPS
-     *
-     * @return TPS (e.g 19.92)
-     */
-    @NotNull
-    public static Double getTPS() {
-        if (serverInstance == null || tpsField == null) {
-            try {
-                serverInstance = getNMSClass("MinecraftServer").getMethod("getServer").invoke(null);
-                tpsField = serverInstance.getClass().getField("recentTps");
-            } catch (NoSuchFieldException
-                    | SecurityException
-                    | IllegalAccessException
-                    | IllegalArgumentException
-                    | InvocationTargetException
-                    | NoSuchMethodException e) {
-                plugin.getLogger().log(Level.WARNING, "Failed to getting server TPS, please report to QuickShop.", e);
-                serverInstance = null;
-                tpsField = null;
-                Util.debugLog("Failed to get TPS " + e.getMessage());
-                return 20.0;
-            }
-        }
-        try {
-            double[] tps = ((double[]) tpsField.get(serverInstance));
-            return tps[0];
-        } catch (IllegalAccessException ignored) {
-            return 20.0;
-        }
-    }
 
     @SneakyThrows
     public static void makeExportBackup(@Nullable String backupName) {
@@ -1253,23 +1132,6 @@ public static void makeExportBackup(@Nullable String backupName) {
         });
     }
 
-    @NotNull
-    public static Class<?> getNMSClass(@Nullable String className) {
-        if (cachedNMSClass != null) {
-            return cachedNMSClass;
-        }
-        if (className == null) {
-            className = "MinecraftServer";
-        }
-        String name = Bukkit.getServer().getClass().getPackage().getName();
-        String version = name.substring(name.lastIndexOf('.') + 1);
-        try {
-            cachedNMSClass = Class.forName("net.minecraft.server." + version + "." + className);
-            return cachedNMSClass;
-        } catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-    }
 
     /**
      * Check QuickShop is running on dev edition or not.

src/main/java/org/maxgamer/quickshop/watcher/TpsWatcher.java

@@ -0,0 +1,66 @@
+/*
+ * This file is a part of project QuickShop, the name is TpsWatcher.java
+ *  Copyright (C) PotatoCraft Studio and contributors
+ *
+ *  This program is free software: you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the
+ *  Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ *  for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.maxgamer.quickshop.watcher;
+
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.LinkedList;
+
+/**
+ * @author EssentialsX
+ * https://github.com/EssentialsX/Essentials/blob/90e4845627551a02a5868141544396bf50ac51a9/Essentials/src/main/java/com/earth2me/essentials/EssentialsTimer.java#L13
+ */
+public class TpsWatcher extends BukkitRunnable {
+    private final LinkedList<Double> history = new LinkedList<>();
+    @SuppressWarnings("FieldCanBeLocal")
+    private final long tickInterval = 50;
+    private transient long lastPoll = System.nanoTime();
+
+    public TpsWatcher() {
+        history.add(20d);
+    }
+
+    @Override
+    public void run() {
+        final long startTime = System.nanoTime();
+        long timeSpent = (startTime - lastPoll) / 1000;
+        if (timeSpent == 0) {
+            timeSpent = 1;
+        }
+        if (history.size() > 10) {
+            history.remove();
+        }
+        final double tps = tickInterval * 1000000.0 / timeSpent;
+        if (tps <= 21) {
+            history.add(tps);
+        }
+        lastPoll = startTime;
+    }
+
+    public double getAverageTPS() {
+        double avg = 0;
+        for (final Double f : history) {
+            if (f != null) {
+                avg += f;
+            }
+        }
+        return avg / history.size();
+    }
+}