diff --git a/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java b/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java deleted file mode 100644 index 100c6ede..00000000 --- a/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.deeme.behaviours; - -import eu.darkbot.api.PluginAPI; -import eu.darkbot.api.extensions.Feature; - -@Feature(name = "Urgent Detector [OLD]", description = "Use the other Urgent Detector") -public class UrgentDetectorDummy { - public UrgentDetectorDummy(PluginAPI api) throws SecurityException { - throw new UnsupportedOperationException("Use the other Urgent Detector, this one will be deleted"); - } -} diff --git a/src/main/java/com/deeme/behaviours/aitrainer/AiTrainerDummy.java b/src/main/java/com/deeme/behaviours/aitrainer/AiTrainerDummy.java deleted file mode 100644 index f3095299..00000000 --- a/src/main/java/com/deeme/behaviours/aitrainer/AiTrainerDummy.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.deeme.behaviours.aitrainer; - -import com.deemeplus.behaviours.aitrainer.AiTrainer; - -import eu.darkbot.api.PluginAPI; -import eu.darkbot.api.extensions.Behavior; -import eu.darkbot.api.extensions.Feature; -import eu.darkbot.api.extensions.Task; -import eu.darkbot.api.managers.AuthAPI; -import eu.darkbot.api.managers.HeroAPI; -import eu.darkbot.api.managers.HeroItemsAPI; -import eu.darkbot.api.managers.StatsAPI; -import eu.darkbot.api.utils.Inject; - -@Feature(name = "AI Trainer", description = "Send information about the missiles and lasers used for AI training purposes") -public class AiTrainerDummy implements Behavior, Task { - - private AiTrainer privateBehavior; - - @Inject - public AiTrainerDummy(PluginAPI api, HeroAPI hero, StatsAPI stats, HeroItemsAPI items, AuthAPI auth) { - this.privateBehavior = new AiTrainer(api, hero, stats, items, auth); - } - - @Override - public void onTickTask() { - if (this.privateBehavior == null) { - return; - } - - this.privateBehavior.onTickTask(); - } - - @Override - public void onTickBehavior() { - if (this.privateBehavior == null) { - return; - } - - this.privateBehavior.onTickBehavior(); - } - -} diff --git a/src/main/java/com/deeme/behaviours/pvplog/PVPLogDummy.java b/src/main/java/com/deeme/behaviours/pvplog/PVPLogDummy.java deleted file mode 100644 index 8aa3dd96..00000000 --- a/src/main/java/com/deeme/behaviours/pvplog/PVPLogDummy.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.deeme.behaviours.pvplog; - -import com.deemeplus.behaviours.pvplog.PVPLog; - -import eu.darkbot.api.PluginAPI; -import eu.darkbot.api.extensions.Behavior; -import eu.darkbot.api.extensions.Feature; -import eu.darkbot.api.extensions.Task; - -@Feature(name = "PVPLog", description = "Send a battle log for training purposes") -public class PVPLogDummy implements Behavior, Task { - - private PVPLog privateBehaviour; - - public PVPLogDummy(PluginAPI api) { - this.privateBehaviour = new PVPLog(api); - } - - @Override - public void onTickTask() { - if (this.privateBehaviour == null) { - return; - } - - this.privateBehaviour.onTickTask(); - } - - @Override - public void onTickBehavior() { - if (this.privateBehaviour == null) { - return; - } - - this.privateBehaviour.onTickBehavior(); - } - -} diff --git a/src/main/java/com/deeme/tasks/WeeklySchedule.java b/src/main/java/com/deeme/tasks/WeeklySchedule.java index b07444fb..1c58e0a7 100644 --- a/src/main/java/com/deeme/tasks/WeeklySchedule.java +++ b/src/main/java/com/deeme/tasks/WeeklySchedule.java @@ -239,7 +239,7 @@ private void setProfile() { } private boolean isRunningPalladiumModule() { - return botApi.getModule().getClass() == PalladiumHangar.class; + return botApi.getModule() != null && botApi.getModule().getClass() == PalladiumHangar.class; } private void tryUpdateHangarList() { diff --git a/src/main/resources/com/deeme/lang/strings_bg.properties b/src/main/resources/com/deeme/lang/strings_bg.properties index 875ee8f0..5b3f7301 100644 --- a/src/main/resources/com/deeme/lang/strings_bg.properties +++ b/src/main/resources/com/deeme/lang/strings_bg.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_cs.properties b/src/main/resources/com/deeme/lang/strings_cs.properties index aab1867e..1f06163f 100644 --- a/src/main/resources/com/deeme/lang/strings_cs.properties +++ b/src/main/resources/com/deeme/lang/strings_cs.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_de.properties b/src/main/resources/com/deeme/lang/strings_de.properties index 52d2c897..91ebc32f 100644 --- a/src/main/resources/com/deeme/lang/strings_de.properties +++ b/src/main/resources/com/deeme/lang/strings_de.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_el.properties b/src/main/resources/com/deeme/lang/strings_el.properties index 3c8de73b..bfa0369a 100644 --- a/src/main/resources/com/deeme/lang/strings_el.properties +++ b/src/main/resources/com/deeme/lang/strings_el.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_en.properties b/src/main/resources/com/deeme/lang/strings_en.properties index a3322b44..700d5649 100644 --- a/src/main/resources/com/deeme/lang/strings_en.properties +++ b/src/main/resources/com/deeme/lang/strings_en.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_es.properties b/src/main/resources/com/deeme/lang/strings_es.properties index 59efc67c..6fbe8aea 100644 --- a/src/main/resources/com/deeme/lang/strings_es.properties +++ b/src/main/resources/com/deeme/lang/strings_es.properties @@ -9,7 +9,7 @@ general.auto_cloak=Camuflaje automático general.auto_cloak.desc=Usará el camuflaje automáticamente general.next_check_time=Tiempo mínimo por comprobación general.next_check_time.desc=Tiempo mínimo por comprobación en segundos -general.time_per_tick=Min time per tick +general.time_per_tick=Tiempo entre ticks general.time_per_tick.desc=Min time per tick in seconds general.default_ammo=Munición por defecto general.default_rocket=Misil por defecto @@ -346,7 +346,7 @@ best_rocket_launcher.rockets_to_use_pvp=Misiles a usar contra jugadores generic_gate=Generic Gate generic_gate.min_radius=Radio mínimo para NPCs generic_gate.repair=Lógica de reparación -generic_gate.repair_config=Use repair config when need repair +generic_gate.repair_config=Usar configuración de reparación cuando se necesite reparar generic_gate.repair_config.desc=When the health value of the health drops below the repair configuration, the repair config will be used generic_gate.attack_closest=Atacar siempre al NPC más cercano generic_gate.attack_closest.desc=Puede funcionar mejor que la otra lógica @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Cantidad quantity_condition=Condición de cantidad quantity_condition.min_quantity=Comprar si es menor a quantity_condition.min_quantity.desc=Cuando la cantidad es menor de la configurada la condición se activa. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Cantidad de enemigos a considerar como tren diff --git a/src/main/resources/com/deeme/lang/strings_fr.properties b/src/main/resources/com/deeme/lang/strings_fr.properties index 448508ce..e9de2944 100644 --- a/src/main/resources/com/deeme/lang/strings_fr.properties +++ b/src/main/resources/com/deeme/lang/strings_fr.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_hu.properties b/src/main/resources/com/deeme/lang/strings_hu.properties index 0d66ea08..73b9c39d 100644 --- a/src/main/resources/com/deeme/lang/strings_hu.properties +++ b/src/main/resources/com/deeme/lang/strings_hu.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_it.properties b/src/main/resources/com/deeme/lang/strings_it.properties index e4a21880..97d092da 100644 --- a/src/main/resources/com/deeme/lang/strings_it.properties +++ b/src/main/resources/com/deeme/lang/strings_it.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_lt.properties b/src/main/resources/com/deeme/lang/strings_lt.properties index 8ae74bf7..d1af768b 100644 --- a/src/main/resources/com/deeme/lang/strings_lt.properties +++ b/src/main/resources/com/deeme/lang/strings_lt.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_pl.properties b/src/main/resources/com/deeme/lang/strings_pl.properties index 65e72111..a55532d9 100644 --- a/src/main/resources/com/deeme/lang/strings_pl.properties +++ b/src/main/resources/com/deeme/lang/strings_pl.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Ilość quantity_condition=Stan ilości quantity_condition.min_quantity=Kup, jeśli mniej niż quantity_condition.min_quantity.desc=Gdy ilość przedmiotu jest poniżej zaznaczonej ilości, warunek jest aktywowany. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anty pociąg anti_train.max_enemies=Przeciwnicy uważani jako pociąg diff --git a/src/main/resources/com/deeme/lang/strings_pt.properties b/src/main/resources/com/deeme/lang/strings_pt.properties index 42ecb8ea..537fa0b5 100644 --- a/src/main/resources/com/deeme/lang/strings_pt.properties +++ b/src/main/resources/com/deeme/lang/strings_pt.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantidade quantity_condition=Condição de Quantidade quantity_condition.min_quantity=Compra se menos que quantity_condition.min_quantity.desc=Quando a quantidade do item estiver abaixo da quantidade escolhida, a condição é ativada. +quantity_condition.item_to_control=Item a ser usado para verificar +quantity_condition.item_to_control.desc=Este é o item que o bot utilizará para verificar a quantidade que ele tem e ativar a condição se estiver abaixo dessa quantidade. anti_train=Anti Train anti_train.max_enemies=Inimigos para considerar um Train diff --git a/src/main/resources/com/deeme/lang/strings_ro.properties b/src/main/resources/com/deeme/lang/strings_ro.properties index eefa2048..3e99e677 100644 --- a/src/main/resources/com/deeme/lang/strings_ro.properties +++ b/src/main/resources/com/deeme/lang/strings_ro.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_ru.properties b/src/main/resources/com/deeme/lang/strings_ru.properties index 1ebdd70d..07eb914b 100644 --- a/src/main/resources/com/deeme/lang/strings_ru.properties +++ b/src/main/resources/com/deeme/lang/strings_ru.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Кол-во quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train @@ -412,9 +414,9 @@ quest_module.pvp_quests=PVP Квесты quest_module.pvp_quests.desc=For the use of this option it is mandatory to have a PVP module configured. quest_module.gg_quests=GG Quests quest_module.gg_quests.desc=For the use of this option it is mandatory to have a GG module configured. -quest_module.update_npc_list=Update NPC List +quest_module.update_npc_list=Обновить список NPC quest_module.show_options=Show in status -quest_module.show_options.rewards=Rewards +quest_module.show_options.rewards=Награды quest_module.show_options.conditions=Conditions quest_module.show_options.conditions_completed=Conditions Completed quest_module.condition_config=Condition Config diff --git a/src/main/resources/com/deeme/lang/strings_sv.properties b/src/main/resources/com/deeme/lang/strings_sv.properties index 77541a3d..ef6c386e 100644 --- a/src/main/resources/com/deeme/lang/strings_sv.properties +++ b/src/main/resources/com/deeme/lang/strings_sv.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_tr.properties b/src/main/resources/com/deeme/lang/strings_tr.properties index e2ea5e0f..ee378fc9 100644 --- a/src/main/resources/com/deeme/lang/strings_tr.properties +++ b/src/main/resources/com/deeme/lang/strings_tr.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Miktar quantity_condition=Miktar koşulu quantity_condition.min_quantity=Daha az ise satın al quantity_condition.min_quantity.desc=İtemin miktarı belirlenen miktarın altındaysa, bu koşul etkinleştirilir. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Tren anti_train.max_enemies=Treni olarak kabul edilecek düşmanlar diff --git a/src/main/resources/com/deeme/lang/strings_uk.properties b/src/main/resources/com/deeme/lang/strings_uk.properties index f0a06abc..d00509b8 100644 --- a/src/main/resources/com/deeme/lang/strings_uk.properties +++ b/src/main/resources/com/deeme/lang/strings_uk.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 1f8a7c86..671c9847 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.3", + "version": "2.3.4", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", @@ -31,11 +31,10 @@ "com.deeme.behaviours.bestrocketlauncher.AutoBestRocketLauncherDummy", "com.deeme.behaviours.autocloack.AutoCloack", "com.deeme.behaviours.antitrain.AntiTrain", - "com.deeme.behaviours.urgentdetector.UrgentDetector", - "com.deeme.behaviours.UrgentDetectorDummy" + "com.deeme.behaviours.urgentdetector.UrgentDetector" ], "donation": "https://ko-fi.com/deeme", "discord": "https://discord.gg/GPRTRRZJPw", - "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.3/DmPlugin.jar", + "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.4/DmPlugin.jar", "update": "https://raw.githubusercontent.com/darkbot-reloaded/DmPlugin/master/src/main/resources/plugin.json" }