clean up

Author: Ghost-chu

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

@@ -744,26 +744,6 @@ private void initConfiguration() {
             getLogger().severe("Failed to save config.yml from jar, The binary file of QuickShop may corrupted. Please re-download from our website.");
         }
         reloadConfiguration();
-        /*
-        From https://bukkit.gamepedia.com/Configuration_API_Reference#CopyDefaults:
-        The copyDefaults option changes the behavior of Configuration's save method.
-        By default, the defaults of the configuration will not be written to the target save file.
-        If set to true, it will write out the default values, to the target file.
-        However, once written, you will not be able to tell the difference between a default and a value from the configuration.
-        ==========================================================================================================================
-        getConfiguration().options().copyDefaults(true).header("Read the example-configuration.yml file to get commented example config file."); // Load defaults.
-        saveDefaultConfig();
-        reloadConfig();
-        */
-//        getConfiguration().options().copyHeader(false).header(
-//                "=================================\n" +
-//                        "=    QuickShop  Configuration   =\n" +
-//                        "=================================\n" +
-//                        "\nNotes:\n" +
-//                        "Please read the example-configuration.yml file to get a commented example config.\n" +
-//                        "Please read the example-configuration.yml file to get a commented example config.\n" +
-//                        "Please read the example-configuration.yml file to get a commented example config.\n"
-//        );
         if (getConfiguration().getOrDefault("config-version", 0) == 0) {
             getConfiguration().set("config-version", 1);
         }
@@ -844,11 +824,6 @@ public final void onEnable() {
         MsgUtil.loadItemi18n();
         MsgUtil.loadEnchi18n();
         MsgUtil.loadPotioni18n();
-        //    shopControlPanelManager = new ShopControlPanel(this);
-//        this.previewProtectionLore = MsgUtil.getMessageOfflinePlayer("quickshop-gui-preview", null);
-//        if (this.previewProtectionLore == null || this.previewProtectionLore.isEmpty()) {
-//            this.previewProtectionLore = ChatColor.RED + "FIXME: DON'T SET THIS TO EMPTY STRING";
-//        }
 
         /* Load 3rd party supports */
         load3rdParty();

src/main/java/org/maxgamer/quickshop/shop/SimpleInfo.java

@@ -104,10 +104,6 @@ public void setAction(@NotNull ShopAction action) {
         return this.item;
     }
 
-    /*
-     * public Material getMaterial(){ return this.item.getType(); } public byte
-     * getData(){ return this.getData(); }
-     */
 
     /**
      * @return Location loc, Get shop's location,

src/main/java/org/maxgamer/quickshop/shop/SimpleShopManager.java

@@ -92,7 +92,6 @@ public class SimpleShopManager implements ShopManager, Reloadable {
     @Getter
     private Trader cacheUnlimitedShopAccount;
     private SimplePriceLimiter priceLimiter;
-    //private boolean useFastShopSearchAlgorithm;
     private boolean useOldCanBuildAlgorithm;
     private boolean autoSign;
 
@@ -420,66 +419,9 @@ public void createShop(@NotNull Shop shop, @NotNull Info info) {
             Util.debugLog("Location is null.");
             return null;
         }
-
-        //if (this.useFastShopSearchAlgorithm) {
         return getShopIncludeAttached_Fast(loc, false, useCache);
-        //  } else {
-        //      return getShopIncludeAttached_Classic(loc);
-        // }
     }
 
-//    public @Nullable Shop getShopIncludeAttached_Classic(@NotNull Location loc) {
-//        @Nullable Shop shop;
-//        // Get location's chunk all shops
-//        @Nullable Map<Location, Shop> inChunk = getShops(loc.getChunk());
-//        // Found some shops in this chunk.
-//        if (inChunk != null) {
-//            shop = inChunk.get(loc);
-//            if (shop != null) {
-//                // Okay, shop was founded.
-//                return shop;
-//            }
-//            // Ooops, not founded that shop in this chunk.
-//        }
-//        @Nullable Block secondHalfShop = Util.getSecondHalf(loc.getBlock());
-//        if (secondHalfShop != null) {
-//            inChunk = getShops(secondHalfShop.getChunk());
-//            if (inChunk != null) {
-//                shop = inChunk.get(secondHalfShop.getLocation());
-//                if (shop != null) {
-//                    // Okay, shop was founded.
-//                    return shop;
-//                }
-//                // Oooops, no any shops matched.
-//            }
-//        }
-//
-//        // only check if is sign
-//        Block block = loc.getBlock();
-//        BlockState state = PaperLib.getBlockState(loc.getBlock(), false).getState();
-//        if (state instanceof Sign) {
-//            // If that chunk nothing we founded, we should check it is attached.
-//            @Nullable Block attachedBlock = Util.getAttached(block);
-//            // Check is attached on some block.
-//            if (attachedBlock == null) {
-//                // Nope
-//                return null;
-//            } else {
-//                // Okay we know it on some blocks.
-//                // We need set new location and chunk.
-//                inChunk = getShops(attachedBlock.getChunk());
-//                // Found some shops in this chunk
-//                if (inChunk != null) {
-//                    shop = inChunk.get(attachedBlock.getLocation());
-//                    // Okay, shop was founded.
-//                    return shop;
-//                    // Oooops, no any shops matched.
-//                }
-//            }
-//        }
-//        return null;
-//    }
-
     @Override
     public void bakeShopRuntimeRandomUniqueIdCache(@NotNull Shop shop) {
         shopRuntimeUUIDCaching.put(shop.getRuntimeRandomUniqueId(), shop);

src/main/java/org/maxgamer/quickshop/util/mojangapi/MojangAPI.java

@@ -78,9 +78,6 @@ public static class ResourcesAPI {
         protected final Cache<String, String> requestCachePool = CacheBuilder.newBuilder()
                 .expireAfterWrite(7, TimeUnit.DAYS)
                 .build();
-        //        private final LoadingCache<URL, Optional<String>> request = CacheBuilder.newBuilder()
-//                .expireAfterAccess(10, TimeUnit.MINUTES)
-//                .build(new HttpCacheLoader());
         private final MojangApiMirror apiMirror;
 
         public ResourcesAPI(MojangApiMirror mirror) {
@@ -90,25 +87,11 @@ public ResourcesAPI(MojangApiMirror mirror) {
         public Optional<String> get(@NotNull String hash) {
             String url = apiMirror.getResourcesDownloadRoot() + "/" + hash.substring(0, 2) + "/" + hash;
             return Optional.ofNullable(HttpUtil.createGet(url));
-            // return data;
-
-
-//            try {
-//                return request.get(new URL(apiMirror.getResourcesDownloadRoot() + "/" + hash.substring(0, 2) + "/" + hash));
-//            } catch (ExecutionException | MalformedURLException e) {
-//                return Optional.empty();
-//            }
         }
     }
 
 
     public static class AssetsAPI {
-        protected final Cache<String, String> requestCachePool = CacheBuilder.newBuilder()
-                .expireAfterWrite(7, TimeUnit.DAYS)
-                .build();
-        //        private final LoadingCache<URL, Optional<String>> request = CacheBuilder.newBuilder()
-//                .expireAfterAccess(10, TimeUnit.MINUTES)
-//                .build(new HttpCacheLoader());
         private final MetaAPI metaAPI;
 
         AssetsAPI(@NotNull MojangApiMirror apiMirror, @NotNull String version) {
@@ -135,14 +118,6 @@ public Optional<AssetsFileData> getGameAssetsFile() {
             }
             String data = HttpUtil.createGet(assetIndexBean.getUrl());
             return Optional.of(new AssetsFileData(data, assetIndexBean.getSha1(), assetIndexBean.getId()));
-
-//            try {
-//                Optional<String> fileContent = request.get(new URL(assetIndexBean.getUrl()));
-//                return fileContent.map(s -> new AssetsFileData(s, assetIndexBean.getSha1(), assetIndexBean.getId()));
-//            } catch (ExecutionException | MalformedURLException e) {
-//                return Optional.empty();
-//            }
-
         }
 
 
@@ -208,13 +183,6 @@ public static class AssetIndexBean {
     }
 
     public static class MetaAPI {
-        //Cache with URL and Content(String)
-//        private final LoadingCache<URL, Optional<String>> request = CacheBuilder.newBuilder()
-//                .expireAfterAccess(10, TimeUnit.MINUTES)
-//                .build(new HttpCacheLoader());
-        protected final Cache<String, String> requestCachePool = CacheBuilder.newBuilder()
-                .expireAfterWrite(7, TimeUnit.DAYS)
-                .build();
         private final String metaEndpoint;
         private final String version;
 
@@ -232,10 +200,6 @@ public MetaAPI(@NotNull MojangApiMirror mirror, @NotNull String version) {
         public Optional<String> get() {
 
             String result = HttpUtil.createGet(this.metaEndpoint);
-//            Optional<String> result = request.get(this.metaEndpoint);
-//            if (!result.isPresent()) {
-//                return Optional.empty();
-//            }
             if (result == null) {
                 Util.debugLog("Request Meta Endpoint failed.");
                 return Optional.empty();