Skip to content

Commit

Permalink
Merge branch 'dm94:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
dm94 authored Nov 3, 2024
2 parents bc42087 + 4e36aa5 commit 59fe5d6
Show file tree
Hide file tree
Showing 22 changed files with 42 additions and 100 deletions.
11 changes: 0 additions & 11 deletions src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java

This file was deleted.

43 changes: 0 additions & 43 deletions src/main/java/com/deeme/behaviours/aitrainer/AiTrainerDummy.java

This file was deleted.

37 changes: 0 additions & 37 deletions src/main/java/com/deeme/behaviours/pvplog/PVPLogDummy.java

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/com/deeme/tasks/WeeklySchedule.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_bg.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_cs.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_el.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/main/resources/com/deeme/lang/strings_es.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_hu.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_it.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_lt.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_pl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_pt.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_ro.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/main/resources/com/deeme/lang/strings_ru.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_sv.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_tr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/com/deeme/lang/strings_uk.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions src/main/resources/plugin.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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"
}

0 comments on commit 59fe5d6

Please sign in to comment.