2.2.1

Author: mfnalex

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 2.2.1
+- Got rid of ChestSortAPI as shaded dependency
+- Fixed leaves not using the proper tool
+- Fixed BestTools sometimes not recognizing interaction when mining cobblestone generators for hours
+- Added config option "consider-swords-for-cobwebs" (default: false)
+
+## 2.2.0
+- Added config option "consider-swords-for-cobwebs"
+
+## 2.1.0
+- Added support for BentoBox/OneBlock's magic block generator
+
 ## 2.0.2
 - Fixed RAW_IRON_BLOCK not changing to a proper tool
 

pom.xml

@@ -9,7 +9,7 @@
     <name>BestTools</name>
     <!--<url>https://www.chestsort.de</url>-->
     <description>Automatically switches to the best tools. Most efficient Auto-Tool plugin!</description>
-    <version>2.0.2</version>
+    <version>2.2.1</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -33,8 +33,7 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.2.0</version>
                 <configuration>
-                    <finalName>BestTools</finalName>
-                    <outputDirectory>C:\mctest\plugins</outputDirectory>
+                    <finalName>BestTools-${project.version}</finalName>
                 </configuration>
             </plugin>
             <plugin>
@@ -149,12 +148,6 @@
             <version>1.1.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>de.jeff_media</groupId>
-            <artifactId>ChestSortAPI</artifactId>
-            <version>12.0.0</version> <!-- The API version is independent of the ChestSort version -->
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>

src/main/java/de/jeff_media/BestTools/BestToolsHandler.java

@@ -47,6 +47,8 @@ public class BestToolsHandler {
     final ArrayList<Material> allTools = new ArrayList<>();
     final ArrayList<Material> instaBreakableByHand = new ArrayList<>();
 
+    final EnumSet<Material> leaves = EnumSet.noneOf(Material.class);
+
 
     final ArrayList<Material> weapons = new ArrayList<>();
 
@@ -65,6 +67,12 @@ public class BestToolsHandler {
             globalBlacklist.add(mat);
         }
 
+        Arrays.stream(Material.values()).forEach(material -> {
+            if(material.name().endsWith("_LEAVES")) {
+                leaves.add(material);
+            }
+        });
+
 
     }
 
@@ -296,14 +304,14 @@ ItemStack getBestToolFromInventory(@NotNull Material mat, Player p, boolean hotb
         ItemStack[] items = inventoryToArray(p,hotbarOnly);
 
         Tool bestType;
-        if(!LeavesUtils.isLeaves(mat)) {
+        if(!LeavesUtils.isLeaves(mat) && mat != Material.COBWEB) {
             bestType=getBestToolType(mat);
         } else {
             if(LeavesUtils.hasShears(hotbarOnly, p.getInventory().getStorageContents())) {
                 bestType = Tool.SHEARS;
-            }  else if(LeavesUtils.hasHoe(hotbarOnly,p.getInventory().getStorageContents())) {
+            }  else if(LeavesUtils.hasHoe(hotbarOnly,p.getInventory().getStorageContents()) && mat != Material.COBWEB) {
                 bestType = Tool.HOE;
-            } else if(main.getConfig().getBoolean("consider-swords-for-leaves") && LeavesUtils.hasSword(hotbarOnly, p.getInventory().getStorageContents())) {
+            } else if(((main.getConfig().getBoolean("consider-swords-for-cobwebs") && mat == Material.COBWEB)||(mat != Material.COBWEB && main.getConfig().getBoolean("consider-swords-for-leaves"))) && LeavesUtils.hasSword(hotbarOnly, p.getInventory().getStorageContents())) {
                 bestType = Tool.SWORD;
             } else {
                 bestType = Tool.NONE;

src/main/java/de/jeff_media/BestTools/BestToolsListener.java

@@ -1,13 +1,18 @@
 package de.jeff_media.BestTools;
 
+import de.jeff_media.BestTools.events.BestToolsNotifyEvent;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Monster;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.EquipmentSlot;
@@ -72,6 +77,20 @@ public void onPlayerAttackEntity(EntityDamageByEntityEvent e) {
 
     }
 
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = false)
+    public void onBreak(BlockBreakEvent event) {
+        //System.out.println("BlockBreakEvent LISTENER");
+        //System.out.println(event.getBlock());
+        Bukkit.getScheduler().runTaskLater(main, () -> {
+            Bukkit.getPluginManager().callEvent(new BestToolsNotifyEvent(event.getPlayer(), event.getBlock()));
+            //Bukkit.getPluginManager().callEvent(new PlayerInteractEvent(event.getPlayer(), Action.LEFT_CLICK_BLOCK, event.getPlayer().getInventory().getItemInMainHand(),event.getBlock(),BlockFace.SELF,EquipmentSlot.HAND));
+        },1);
+    }
+
+    @EventHandler
+    public void onNotify(BestToolsNotifyEvent event) {
+        onPlayerInteractWithBlock(new PlayerInteractEvent(event.getPlayer(), Action.LEFT_CLICK_BLOCK, event.getPlayer().getInventory().getItemInMainHand(),event.getBlock(),BlockFace.SELF,EquipmentSlot.HAND));
+    }
 
     @EventHandler
     public void onPlayerInteractWithBlock(PlayerInteractEvent event) {
@@ -80,6 +99,9 @@ public void onPlayerInteractWithBlock(PlayerInteractEvent event) {
         //for (RegisteredListener registeredListener : event.getHandlers().getRegisteredListeners()) {
         //    main.debug(registeredListener.getPlugin().getName()+": "+registeredListener.getListener().getClass().getName() + " @ "+registeredListener.getPriority().name());
         //}
+//        if(main.debug && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+//            main.getLogger().warning(event.getClickedBlock().getType().name());
+//        }
         //
 
         long st= main.measurePerformance ? System.nanoTime() : 0;

src/main/java/de/jeff_media/BestTools/GUIHandler.java

@@ -1,6 +1,5 @@
 package de.jeff_media.BestTools;
 
-import de.jeff_media.chestsort.api.ChestSortEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;

src/main/java/de/jeff_media/BestTools/events/BestToolsNotifyEvent.java

@@ -0,0 +1,32 @@
+package de.jeff_media.BestTools.events;
+
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+
+public class BestToolsNotifyEvent extends PlayerEvent {
+
+    private static final HandlerList HANDLERS = new HandlerList();
+    private final Block block;
+
+    public BestToolsNotifyEvent(@NotNull Player who, Block block) {
+        super(who);
+        this.block = block;
+    }
+
+    public Block getBlock() {
+        return block;
+    }
+
+    @NotNull
+    @Override
+    public HandlerList getHandlers() {
+        return HANDLERS;
+    }
+
+    public static HandlerList getHandlerList() {
+        return HANDLERS;
+    }
+}

src/main/resources/config.yml

@@ -83,6 +83,9 @@ dont-switch-during-battle: true
 # leaves with it.
 consider-swords-for-leaves: false
 
+# Uses swords for cobwebs if you don't have shears.
+consider-swords-for-cobwebs: false
+
 # Allow /besttools to switch to your sword/axe (whatever is better) when attacking mobs?
 use-sword-on-hostile-mobs: true
 
@@ -153,7 +156,7 @@ message-besttools-disabled: "&7BestTools has been &cdisabled&7."
 message-refill-enabled: "&7Refill has been &aenabled&7."
 message-refill-disabled: "&7Refill has been &cdisabled&7."
 message-besttools-usage: "&7Hint: Type &6/besttools&7 or &6/bt&7 to automatically use the best tool when breaking blocks."
-message-refill-usage": "&7Hint: Type &6/refill&7 or &6/rf&7 to automatically refill empty items from your inventory."
+message-refill-usage: "&7Hint: Type &6/refill&7 or &6/rf&7 to automatically refill empty items from your inventory."
 message-hotbar-only-enabled: "&7BestTools will only use tools from your hotbar."
 message-hotbar-only-disabled: "&7BestTools will use all tools from your inventory."
 gui-favorite-slot: "Set as favorite slot"
@@ -168,7 +171,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Refill has been &aenabled&7."
 #message-refill-disabled: "&7Refill has been &cdisabled&7."
 #message-besttools-usage: "&7Hint: Type &6/besttools&7 or &6/bt&7 to automatically use the best tool when breaking blocks."
-#message-refill-usage": "&7Hint: Type &6/refill&7 or &6/rf&7 to automatically refill empty items from your inventory."
+#message-refill-usage: "&7Hint: Type &6/refill&7 or &6/rf&7 to automatically refill empty items from your inventory."
 #message-hotbar-only-enabled: "&7BestTools will only use tools from your hotbar."
 #message-hotbar-only-disabled: "&7BestTools will use all tools from your inventory."
 #gui-favorite-slot: "Set as favorite slot"
@@ -213,7 +216,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Hervullen is &aingeschakeld&7."
 #message-refill-disabled: "&7Hervullen is &cuitgeschakeld&7."
 #message-besttools-usage: "&7Hint: Type &6/besttools&7 of &6/bt&7 om automatisch het beste gereedschap te gebruiken om blokken te breken."
-#message-refill-usage": "&7Hint: Type &6/refill&7 of &6/rf&7 om automatisch lege vakken te hervullen uit je inventaris."
+#message-refill-usage: "&7Hint: Type &6/refill&7 of &6/rf&7 om automatisch lege vakken te hervullen uit je inventaris."
 #message-hotbar-only-enabled: "&7BestTools zal alleen gereedschap uit je hotbar gebruiken."
 #message-hotbar-only-disabled: "&7BestTools zal alle gereedschappen uit je inventaris gebruiken."
 #gui-favorite-slot: "Zet als favoriete vak"
@@ -228,7 +231,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7La recharge a été &activée&7."
 #message-refill-disabled: "&7La recharge a été &cdésactivée&7."
 #message-besttools-usage: "&7Astuce: Tapez &6/bt&7 pour utiliser automatiquement le BestTools lors de la rupture des blocs."
-#message-refill-usage": "&7Astuce: Tapez &6/rf&7 pour remplir automatiquement les articles vides de votre inventaire."
+#message-refill-usage: "&7Astuce: Tapez &6/rf&7 pour remplir automatiquement les articles vides de votre inventaire."
 #message-hotbar-only-enabled: "&7BestTools n'utilisera que les outils de votre hotbar."
 #message-hotbar-only-disabled: "&7BestTools utilisera tous les outils de votre inventaire."
 #gui-favorite-slot: "Définir comme emplacement favori"
@@ -243,7 +246,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Refill wurde &aaktiviert&7."
 #message-refill-disabled: "&7Refill wurde &cdeaktiviert&7."
 #message-besttools-usage: "&Hinweis: Benutze &6/besttools&7 oder &6/bt&7 um die automatische Werkzeugauswahl zu aktivieren."
-#message-refill-usage": "&7Hinweis: Benutze &6/refill&7 oder &6/rf&7 um die automatische Itemauffüllung zu aktivieren."
+#message-refill-usage: "&7Hinweis: Benutze &6/refill&7 oder &6/rf&7 um die automatische Itemauffüllung zu aktivieren."
 #message-hotbar-only-enabled: "&7BestTools wird nur Werkzeuge aus deiner Hotbar benutzen."
 #message-hotbar-only-disabled: "&7BestTools wird alle Werkzeuge aus deinem Inventar benutzen."
 #gui-favorite-slot: "Als Lieblingsslot festlegen"
@@ -258,7 +261,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Auto-refill został &awłączony&7."
 #message-refill-disabled: "&7Auto-refill został &cwyłączony&7."
 #message-besttools-usage: "&7Podpowiedź: Wpisz &6/besttools&7 lub &6/bt&7 by automatycznie użyć naodpowiedniejszych narzędzi do niszczenia danego typu bloków."
-#message-refill-usage": "&7Podpowiedź: Wpisz &6/refill&7 lub &6/rf&7 by automatycznie wypełnić pasek szybkiego wyboru przedmiotami z ekwipunku."
+#message-refill-usage: "&7Podpowiedź: Wpisz &6/refill&7 lub &6/rf&7 by automatycznie wypełnić pasek szybkiego wyboru przedmiotami z ekwipunku."
 #message-hotbar-only-enabled: "&7BestTools będzie używać tylko narzędzi z paska szybkiego wyboru."
 #message-hotbar-only-disabled: "&7BestTools będzie używać wszystkich narzędzi z ekwipunku."
 #gui-favorite-slot: "Ustaw ten slot jako ulubiony"
@@ -273,7 +276,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Reabastecimento foi &ahabilitado&7."
 #message-refill-disabled: "&7Reabastecimento foi &cdesabilitado&7."
 #message-besttools-usage: "&7Dica: Digite &6/besttools&7 ou &6/bt&7 para usar a melhor ferramente automaticamente ao quebrar blocos."
-#message-refill-usage": "&7Dica: Digite &6/refill&7 ou &6/rf&7 para reabastecer-se automaticamente com itens do inventário."
+#message-refill-usage: "&7Dica: Digite &6/refill&7 ou &6/rf&7 para reabastecer-se automaticamente com itens do inventário."
 #message-hotbar-only-enabled: "&7BestTools usará apenas as ferramentas da sua barra rápida."
 #message-hotbar-only-disabled: "&7BestTools usará todas as ferramentas do seu inventário."
 #gui-favorite-slot: "Definir como slot favorito"
@@ -288,7 +291,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Заполнение &aактивировано&7."
 #message-refill-disabled: "&7Заполнение &cдеактивировано&7."
 #message-besttools-usage: "&7Подсказка: Введите &6/besttools&7 или &6/bt&7 чтобы автоматически использовать лучший предмет для ломания блоков."
-#message-refill-usage": "&7Подсказка: Введите &6/refill&7 или &6/rf&7 чтобы автоматически наполнять ваши предметы в инвентаре."
+#message-refill-usage: "&7Подсказка: Введите &6/refill&7 или &6/rf&7 чтобы автоматически наполнять ваши предметы в инвентаре."
 #message-hotbar-only-enabled: "&7BestTools будет использовать только инструменты с вашей панели быстрого доступа."
 #message-hotbar-only-disabled: "&7BestTools будет использовать все инструменты из вашего инвентаря."
 #gui-favorite-slot: "Установить любимый слот"
@@ -303,7 +306,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Has &aactivado &7la reposición automática de objetos."
 #message-refill-disabled: "&7Has &cdesactivado &7la reposición automática de objetos."
 #message-besttools-usage: "&7Usa el comando &6/besttools &7para cambiar automáticamente la herramienta que mejor convenga para cada situación."
-#message-refill-usage": "&7Usa el comando &6/refill &7para reponer automáticamente los bloques de tu inventario."
+#message-refill-usage: "&7Usa el comando &6/refill &7para reponer automáticamente los bloques de tu inventario."
 #message-hotbar-only-enabled: "&7Ahora solo se seleccionarán automáticamente las herramientas alojadas en tu cinturón."
 #message-hotbar-only-disabled: "&7Ahora se seleccionarán automáticamente las herramientas de tu inventario y tu cinturón."
 #gui-favorite-slot: "&7Determina la ranura que quieres utilizar de tu cinturón."
@@ -318,7 +321,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Refill har &aaktiverats&7."
 #message-refill-disabled: "&7Refill has been &cdisabled&7."
 #message-besttools-usage: "&7Tips: Skriv &6/besttools&7 eller &6/bt&7 för att automatiskt använda det bästa verktyget när du bryter block."
-#message-refill-usage": "&7Tips: Skriv &6/refill&7 eller &6/rf&7 för att automatiskt fylla på tomma föremål från ditt lager."
+#message-refill-usage: "&7Tips: Skriv &6/refill&7 eller &6/rf&7 för att automatiskt fylla på tomma föremål från ditt lager."
 #message-hotbar-only-enabled: "&7BestTools kommer endast att använda verktyg från din hotbar."
 #message-hotbar-only-disabled: "&7BestTools kommer att använda alla verktyg från ditt inventarium."
 #gui-favorite-slot: "Ange som favoritplats"
@@ -333,7 +336,7 @@ gui-refill-lore: "Automatically refills empty hotbar slots."
 #message-refill-enabled: "&7Otomatik doldurma &aaktif edildi&7."
 #message-refill-disabled: "&7Otomatik doldurma &cdeaktif edildi&7."
 #message-besttools-usage: "&7İpucu: Blok kırarken otomatik olarak en iyi aleti kullanmak için &6/besttols&7 veya &6/bt&7 yazınız."
-#message-refill-usage": "&7İpucu: Slotunuzdaki blokları otomatik doldurmak için &6/refill&7 veya &6/rf&7 yazınız."
+#message-refill-usage: "&7İpucu: Slotunuzdaki blokları otomatik doldurmak için &6/refill&7 veya &6/rf&7 yazınız."
 #message-hotbar-only-enabled: "&7BestTools sadece slotlarınızdaki aletleri kullanacaktır."
 #message-hotbar-only-disabled: "&7BestTools envanterinizdeki bütün aletleri kullanacaktır."
 #gui-favorite-slot: "Favori slot olarak seç"