Fix item limit/shop expiration checker interval, force enable "look_close_caching" for performance

Author: Bestem0r

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>me.bestemor.villagermarket</groupId>
     <artifactId>VillagerMarket</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
+    <version>1.11.1-SNAPSHOT</version>
 
     <repositories>
         <repository>

src/main/java/net/bestemor/villagermarket/VMPlugin.java

@@ -52,7 +52,7 @@ protected void onPluginEnable() {
         this.playerListener = new PlayerListener(this);
         registerEvents();
 
-        //Bukkit.getLogger().warning("[VillagerMarket] §cYou are running a §aBETA 1.11.0-#6 of VillagerMarket! Please expect and report all bugs in my discord server");
+        //Bukkit.getLogger().warning("[VillagerMarket] §cYou are running a §aBETA 1.11.1-#1 of VillagerMarket! Please expect and report all bugs in my discord server");
 
         Bukkit.getScheduler().runTaskLater(this, () -> {
             if (Bukkit.getPluginManager().getPlugin("VillagerBank") != null) {

src/main/java/net/bestemor/villagermarket/listener/PlayerListener.java

@@ -48,11 +48,8 @@ public class PlayerListener implements Listener {
     private final List<UUID> cancelledPlayers = new ArrayList<>();
     private final Map<UUID, Entity> cachedEntities = new HashMap<>();
 
-    private final boolean performanceMode;
-
     public PlayerListener(VMPlugin plugin) {
         this.plugin = plugin;
-        this.performanceMode = ConfigManager.getBoolean("look_close_caching");
     }
 
     public void addCancelledPlayer(UUID uuid) {
@@ -109,7 +106,7 @@ public void playerRightClick(PlayerInteractEntityEvent event) {
     @EventHandler
     public void onMove(PlayerMoveEvent event) {
         Player p = event.getPlayer();
-        for (Entity e : performanceMode ? cachedEntities.values() : plugin.getShopManager().getEntities()) {
+        for (Entity e : cachedEntities.values()) {
             if (p.getWorld().getName().equals(e.getWorld().getName()) && p.getLocation().distanceSquared(e.getLocation()) < 25) {
                 e.teleport(e.getLocation().setDirection(p.getLocation().subtract(e.getLocation()).toVector()));
             }

src/main/java/net/bestemor/villagermarket/shop/PlayerShop.java

@@ -312,6 +312,8 @@ public void abandon() {
             player.sendMessage(ConfigManager.getMessage("messages.expired"));
         }
 
+        VMPlugin.log.add(new Date() + ": " + offlinePlayer.getName() + " abandoned shop: " + entityUUID.toString());
+
         storageHolder.clear();
         trustedPlayers.clear();
         shopfrontHolder.closeAll();
@@ -323,7 +325,6 @@ public void abandon() {
         super.timesRented = 0;
         super.updateMenu(ShopMenu.EDIT_SHOP);
 
-        VMPlugin.log.add(new Date() + ": " + offlinePlayer.getName() + " abandoned shop: " + entityUUID.toString());
         updateRedstone(false);
     }
 

src/main/java/net/bestemor/villagermarket/shop/ShopManager.java

@@ -242,7 +242,7 @@ public boolean isBlackListed(Material material) {
 
     /** Thread check if rent time has expired and runs abandon() method */
     private void beginExpireThread() {
-        long interval = 20 * ConfigManager.getLong("expire_check_interval");
+        long interval = 20L * ConfigManager.getInt("expire_check_interval");
 
         Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, () -> {
             for (VillagerShop villagerShop : shops.values()) {
@@ -263,16 +263,16 @@ private void beginExpireThread() {
         }, 20L, interval);
     }
 
-    public List<Entity> getEntities() {
+    public List<UUID> geEntityUUIDs() {
         return shops.values().stream()
-                .map(s -> VMUtils.getEntity(s.entityUUID))
+                .map(VillagerShop::getEntityUUID)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 
     /** Thread updates redstone output for all Villagers */
     private void beginRedstoneThread() {
-        long interval = 20 * ConfigManager.getLong("redstone_update_interval");
+        long interval = 20L * ConfigManager.getInt("redstone_update_interval");
 
         Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () -> {
             for (VillagerShop villagerShop : shops.values()) {

src/main/resources/config.yml

@@ -35,9 +35,6 @@ per_adminshop_permissions: false
 buy_shop_permission: false
 #Will drop spawn egg when a shops created with spawn egg is removed
 drop_spawn_egg: true
-#Shops must be interacted with before shopkeeper will look at nearby players
-#Enable if you are experiencing lag issues on large servers
-look_close_caching: false
 #Will disable announcing new updates when joining
 disable_update_announce: false
 #Language to use

src/main/resources/config_8.yml

@@ -35,9 +35,6 @@ per_adminshop_permissions: false
 buy_shop_permission: false
 #Will drop spawn egg when a shops created with spawn egg is removed
 drop_spawn_egg: true
-#Shops must be interacted with before shopkeeper will look at nearby players
-#Enable if you are experiencing lag issues on large servers
-look_close_caching: false
 #Will disable announcing new updates when joining
 disable_update_announce: false
 #Language to use

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 name: VillagerMarket
 main: net.bestemor.villagermarket.VMPlugin
-version: 1.11.0
+version: 1.11.1
 author: Bestem0r
 description: A plugin made by Bestem0r to create Villager Shops
 api-version: 1.13