From 89da963a760217e6fc7357d7f2a68d6abf7ce2c5 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Wed, 18 Jan 2023 11:07:26 +0100 Subject: [PATCH 1/7] Compat MythicLib --- .../net/Indyuce/mmocore/party/MMOCoreTargetRestriction.java | 6 ++++-- .../Indyuce/mmocore/listener/option/PlayerProfileCheck.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/party/MMOCoreTargetRestriction.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/party/MMOCoreTargetRestriction.java index 0e67bf43..3f3e9cae 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/party/MMOCoreTargetRestriction.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/party/MMOCoreTargetRestriction.java @@ -1,7 +1,9 @@ package net.Indyuce.mmocore.party; -import io.lumine.mythic.lib.comp.target.InteractionType; -import io.lumine.mythic.lib.comp.target.TargetRestriction; +import io.lumine.mythic.lib.comp.interaction.InteractionType; +import io.lumine.mythic.lib.comp.interaction.TargetRestriction; +import io.lumine.mythic.lib.comp.interaction.InteractionType; +import io.lumine.mythic.lib.comp.interaction.TargetRestriction; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.guild.AbstractGuild; diff --git a/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/option/PlayerProfileCheck.java b/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/option/PlayerProfileCheck.java index 5ff87df0..52b5cbc1 100644 --- a/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/option/PlayerProfileCheck.java +++ b/MMOCore-Dist/src/main/java/net/Indyuce/mmocore/listener/option/PlayerProfileCheck.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.listener.option; import io.lumine.mythic.lib.MythicLib; -import io.lumine.mythic.lib.comp.target.InteractionType; +import io.lumine.mythic.lib.comp.interaction.InteractionType; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.InventoryManager; import org.bukkit.entity.EntityType; From a827c27ec2f0e17e1398b33ed5a35add75b21903 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Mon, 23 Jan 2023 14:39:30 +0100 Subject: [PATCH 2/7] Fixed bug linked to PlayerClickEvent for GUI. --- .../java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java index e7470db4..bbe3e3fc 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java @@ -6,6 +6,7 @@ import net.Indyuce.mmocore.gui.api.adaptor.ClassicAdaptor; import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.TriggerItem; import org.apache.commons.lang.Validate; +import org.bukkit.Material; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; @@ -87,7 +88,8 @@ public abstract class GeneratedInventory extends PluginInventory { public void whenClicked(InventoryClickContext context) { context.setCancelled(true); InventoryItem item = getBySlot(context.getSlot()); - if (item == null) + //Checks that the click corresponds to a GUI Item. + if (item == null || context.getClickedItem() == null || context.getClickedItem().getType() == Material.AIR) return; if (item instanceof TriggerItem) From c62d468991e0efe1cb6d0d76b646dbf227695535 Mon Sep 17 00:00:00 2001 From: Ka0rX Date: Mon, 23 Jan 2023 17:37:51 +0100 Subject: [PATCH 3/7] New placeholders when casting skills. --- .../main/java/net/Indyuce/mmocore/skill/CastableSkill.java | 5 +++-- MMOCore-Dist/src/main/resources/default/messages.yml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java index 7de8ee76..c9a31247 100644 --- a/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java +++ b/MMOCore-API/src/main/java/net/Indyuce/mmocore/skill/CastableSkill.java @@ -43,13 +43,14 @@ public class CastableSkill extends Skill { // Cooldown check if (skillMeta.getCaster().getData().getCooldownMap().isOnCooldown(this)) { - if (loud) MMOCore.plugin.configManager.getSimpleMessage("casting.on-cooldown").send(playerData.getPlayer()); + if (loud) MMOCore.plugin.configManager.getSimpleMessage("casting.on-cooldown", + "cooldown",MythicLib.plugin.getMMOConfig().decimal.format(skillMeta.getCaster().getData().getCooldownMap().getCooldown(this))).send(playerData.getPlayer()); return false; } // Mana cost if (playerData.getMana() < getModifier("mana")) { - if (loud) MMOCore.plugin.configManager.getSimpleMessage("casting.no-mana", "mana", playerData.getProfess().getManaDisplay().getName()).send(playerData.getPlayer()); + if (loud) MMOCore.plugin.configManager.getSimpleMessage("casting.no-mana", "mana-required",MythicLib.plugin.getMMOConfig().decimal.format((getModifier("mana")-playerData.getMana())),"mana", playerData.getProfess().getManaDisplay().getName()).send(playerData.getPlayer()); return false; } diff --git a/MMOCore-Dist/src/main/resources/default/messages.yml b/MMOCore-Dist/src/main/resources/default/messages.yml index bb41193d..ef1e2be6 100644 --- a/MMOCore-Dist/src/main/resources/default/messages.yml +++ b/MMOCore-Dist/src/main/resources/default/messages.yml @@ -57,9 +57,9 @@ casting: no-stamina: '&6[{index}] &9&l{skill}' split: '&7 &7 - &7 ' no-longer: '%&cYou cancelled skill casting.' - no-mana: '&cYou do not have enough {mana}!' + no-mana: '&cYou do not have enough {mana}, {mana-required} more required!' no-stamina: '&cYou do not have enough stamina!' - on-cooldown: '&cThis skill is on cooldown.' + on-cooldown: '&cThis skill is on a {cooldown} cooldown.' # Combat Log now-in-combat: '%&cYou are now in combat!' From eee717539b27a6852628e95e10c7d8d26d35fda8 Mon Sep 17 00:00:00 2001 From: Taner <11832079-Tanerx@users.noreply.gitlab.com> Date: Mon, 23 Jan 2023 17:03:17 +0000 Subject: [PATCH 4/7] Update Crowdin configuration file --- crowdin.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 crowdin.yml diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 00000000..05dfa962 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,5 @@ +files: + - source: MMOCore-Dist/src/main/resources/default/gui/*.yml + translation: /**/MMOCore-Dist/src/main/resources/default/translation/%language%/gui/%file_name%.%file_extension% + - source: MMOCore-Dist/src/main/resources/default/messages.yml + translation: /**/MMOCore-Dist/src/main/resources/default/translation/%language%/%file_name%.%file_extension% From 74e7ac4bfa871e05d84afb269d4574c947a709ff Mon Sep 17 00:00:00 2001 From: Taner <11832079-Tanerx@users.noreply.gitlab.com> Date: Mon, 23 Jan 2023 17:27:53 +0000 Subject: [PATCH 5/7] Delete crowdin.yml --- crowdin.yml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 crowdin.yml diff --git a/crowdin.yml b/crowdin.yml deleted file mode 100644 index 05dfa962..00000000 --- a/crowdin.yml +++ /dev/null @@ -1,5 +0,0 @@ -files: - - source: MMOCore-Dist/src/main/resources/default/gui/*.yml - translation: /**/MMOCore-Dist/src/main/resources/default/translation/%language%/gui/%file_name%.%file_extension% - - source: MMOCore-Dist/src/main/resources/default/messages.yml - translation: /**/MMOCore-Dist/src/main/resources/default/translation/%language%/%file_name%.%file_extension% From d68d74a0a6306040a6e77cebabb7ba1b645f38e8 Mon Sep 17 00:00:00 2001 From: Taner <11832079-Tanerx@users.noreply.gitlab.com> Date: Mon, 23 Jan 2023 17:30:48 +0000 Subject: [PATCH 6/7] Update Crowdin configuration file --- crowdin.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 crowdin.yml diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 00000000..05dfa962 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,5 @@ +files: + - source: MMOCore-Dist/src/main/resources/default/gui/*.yml + translation: /**/MMOCore-Dist/src/main/resources/default/translation/%language%/gui/%file_name%.%file_extension% + - source: MMOCore-Dist/src/main/resources/default/messages.yml + translation: /**/MMOCore-Dist/src/main/resources/default/translation/%language%/%file_name%.%file_extension% From 55eab768fe6ecb5e0bf4b88071e161f0de72f362 Mon Sep 17 00:00:00 2001 From: Taner <11832079-Tanerx@users.noreply.gitlab.com> Date: Tue, 24 Jan 2023 08:42:29 +0000 Subject: [PATCH 7/7] Update messages.yml --- MMOCore-Dist/src/main/resources/default/messages.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/MMOCore-Dist/src/main/resources/default/messages.yml b/MMOCore-Dist/src/main/resources/default/messages.yml index bb41193d..1c74aec4 100644 --- a/MMOCore-Dist/src/main/resources/default/messages.yml +++ b/MMOCore-Dist/src/main/resources/default/messages.yml @@ -1,4 +1,3 @@ - # Level & Experience level-up: - '' @@ -176,7 +175,7 @@ skill-max-level-hit: '&cYou already hit the max level for that skill.' no-skill-placeholder: 'No Skill Bound' not-skill-reallocation-point: '&cYou do not have 1 skill reallocation point.' no-skill-points-spent: '&cYou have not spent any skill points.' -skill-points-reallocated: '&eYou successfully reset your attributes. You now have &6{points} &eskill points.' +skill-points-reallocated: '&eYou successfully reset your skill points. You now have &6{points} &eskill points.' max-points-reached: '&cYou reached the maximum points you can spend. You need to reallocate your points to rollback.' # Skill Trees no-skill-tree-points-spent: '&cYou have not spent any skill tree points.' @@ -186,4 +185,4 @@ skill-node-max-level-hit: '&cYou already hit the max level for that skill node.' not-enough-skill-tree-points: '&cYou need one skill tree point.' reallocated-points: '&eYou successfully reset the skill tree {skill-tree}. &eYou now have &6{points} &eskill tree points.' not-skill-tree-reallocation-point: '&cYou do not have 1 skill tree reallocation point.' -no-skill-tree: '&cYour class doesn''t have any skill tree.' \ No newline at end of file +no-skill-tree: '&cYour class doesn''t have any skill tree.'