From 49a33adc281825623aace2542452729c120b6506 Mon Sep 17 00:00:00 2001 From: SaloEater Date: Wed, 30 Jul 2025 10:53:19 -0500 Subject: [PATCH 1/3] jewels inventory --- .../player/container/JewelsMenu.java | 65 +++++++++++++++++++ .../player/helper/JewelInvHelper.java | 12 +++- .../uncommon/localization/Words.java | 3 +- .../vanilla_mc/packets/OpenJewelsPacket.java | 13 ++-- .../resources/assets/mmorpg/lang/en_us.json | 1 + .../resources/assets/mmorpg/lang/es_ar.json | 1 + .../resources/assets/mmorpg/lang/es_es.json | 1 + .../resources/assets/mmorpg/lang/es_mx.json | 1 + .../resources/assets/mmorpg/lang/es_uy.json | 1 + .../resources/assets/mmorpg/lang/es_ve.json | 1 + .../resources/assets/mmorpg/lang/fr_fr.json | 1 + .../resources/assets/mmorpg/lang/ja_jp.json | 1 + .../resources/assets/mmorpg/lang/ko_kr.json | 1 + .../resources/assets/mmorpg/lang/pt_br.json | 3 +- .../resources/assets/mmorpg/lang/ru_ru.json | 1 + .../resources/assets/mmorpg/lang/uk_ua.json | 1 + .../resources/assets/mmorpg/lang/zh_cn.json | 1 + .../resources/assets/mmorpg/lang/zh_tw.json | 1 + 18 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/robertx22/mine_and_slash/capability/player/container/JewelsMenu.java diff --git a/src/main/java/com/robertx22/mine_and_slash/capability/player/container/JewelsMenu.java b/src/main/java/com/robertx22/mine_and_slash/capability/player/container/JewelsMenu.java new file mode 100644 index 000000000..e85ac786e --- /dev/null +++ b/src/main/java/com/robertx22/mine_and_slash/capability/player/container/JewelsMenu.java @@ -0,0 +1,65 @@ +package com.robertx22.mine_and_slash.capability.player.container; + +import com.robertx22.mine_and_slash.capability.player.helper.JewelInvHelper; +import com.robertx22.mine_and_slash.uncommon.localization.Words; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.world.Container; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.ChestMenu; +import net.minecraft.world.inventory.ClickType; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; + +public class JewelsMenu extends ChestMenu { + private Container container; + private int maxJewels; + private int firstPlayerInventoryIndex; + + public JewelsMenu(MenuType pType, int pContainerId, Inventory pPlayerInventory, Container pContainer, int pRows, int maxJewels) { + super(pType, pContainerId, pPlayerInventory, pContainer, pRows); + this.container = pContainer; + this.maxJewels = maxJewels; + this.firstPlayerInventoryIndex = pRows * 9; + ItemStack itemStack = new ItemStack(JewelInvHelper.GetPlaceholder()); + itemStack.setHoverName(Component.literal(Words.JEWEL_SOCKET_NOT_AVAILABLE.translate()).withStyle(ChatFormatting.DARK_RED, ChatFormatting.BOLD)); + for (int i = 0; i < container.getContainerSize(); i++) { + if (i >= maxJewels) { + container.setItem(i, itemStack); + } else if (JewelInvHelper.IsPlaceholder(itemStack)) { + container.setItem(i, new ItemStack(Items.AIR)); + } + } + } + + @Override + public ItemStack quickMoveStack(Player pPlayer, int pIndex) { + if (isJewelSlot(pIndex)) { + return ItemStack.EMPTY; + } + return super.quickMoveStack(pPlayer, pIndex); + } + + private boolean isJewelSlot(int pIndex) { + return pIndex >= maxJewels && pIndex < firstPlayerInventoryIndex; + } + + @Override + public void clicked(int pSlotId, int pButton, ClickType pClickType, Player pPlayer) { + if (isJewelSlot(pSlotId) || pClickType == ClickType.PICKUP_ALL) { + return; + } + super.clicked(pSlotId, pButton, pClickType, pPlayer); + } + + @Override + public boolean canTakeItemForPickAll(ItemStack pStack, Slot pSlot) { + if (isJewelSlot(pSlot.index)) { + return false; + } + return super.canTakeItemForPickAll(pStack, pSlot); + } +} diff --git a/src/main/java/com/robertx22/mine_and_slash/capability/player/helper/JewelInvHelper.java b/src/main/java/com/robertx22/mine_and_slash/capability/player/helper/JewelInvHelper.java index 0895fa55e..406ca0bf3 100644 --- a/src/main/java/com/robertx22/mine_and_slash/capability/player/helper/JewelInvHelper.java +++ b/src/main/java/com/robertx22/mine_and_slash/capability/player/helper/JewelInvHelper.java @@ -11,7 +11,9 @@ import com.robertx22.mine_and_slash.uncommon.utilityclasses.PlayerUtils; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import java.util.ArrayList; import java.util.List; @@ -82,13 +84,21 @@ public void checkRemoveJewels(Player p) { ExplainedResultUtil.sendErrorMessage(p, Chats.EQUIP_JEWEL_ERROR, Chats.YOU_LACK_JEWEL_SLOTS); unequip(p, i); } - } else { + } else if (!IsPlaceholder(stack)) { unequip(p, i); } } } + public static boolean IsPlaceholder(ItemStack stack) { + return stack.getDescriptionId().equals(GetPlaceholder().getDescriptionId()); + } + + public static Item GetPlaceholder() { + return Items.BARRIER; + } + public List getAllJewels() { List list = new ArrayList<>(); for (int i = 0; i < inv.getTotalSlots(); i++) { diff --git a/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Words.java b/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Words.java index afa113175..516ddae9b 100644 --- a/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Words.java +++ b/src/main/java/com/robertx22/mine_and_slash/uncommon/localization/Words.java @@ -364,7 +364,8 @@ public enum Words implements IAutoLocName { INCREASE_PERCENT_STAT("Extra ", "use for stat like \"(Extra) (attack speed)\", this is different with multiply stat prefix."), REDUCE_PERCENT_STAT("Lower "), EMPTY_BOX("Box"), - LEVEL_UP_TYPE_PLAYER("Player"); + LEVEL_UP_TYPE_PLAYER("Player"), + JEWEL_SOCKET_NOT_AVAILABLE("Unlock on talent tree"); private String localization = ""; diff --git a/src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/OpenJewelsPacket.java b/src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/OpenJewelsPacket.java index ef52c3328..ff6442acf 100644 --- a/src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/OpenJewelsPacket.java +++ b/src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/OpenJewelsPacket.java @@ -2,6 +2,8 @@ import com.robertx22.library_of_exile.main.MyPacket; import com.robertx22.library_of_exile.packets.ExilePacketContext; +import com.robertx22.mine_and_slash.capability.player.container.JewelsMenu; +import com.robertx22.mine_and_slash.capability.player.helper.JewelInvHelper; import com.robertx22.mine_and_slash.mmorpg.SlashRef; import com.robertx22.mine_and_slash.uncommon.datasaving.Load; import net.minecraft.network.FriendlyByteBuf; @@ -11,7 +13,6 @@ import net.minecraft.world.SimpleMenuProvider; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.ChestMenu; import net.minecraft.world.inventory.MenuType; public class OpenJewelsPacket extends MyPacket { @@ -40,18 +41,20 @@ public void saveToData(FriendlyByteBuf buf) { @Override public void onReceived(ExilePacketContext ctx) { - var inv = Load.player(ctx.getPlayer()).getJewels().inv; + JewelInvHelper jewels = Load.player(ctx.getPlayer()).getJewels(); + var inv = jewels.inv; Player p = ctx.getPlayer(); + int maxJewels = jewels.getJewelSocketsMaxStat(p); p.openMenu(new SimpleMenuProvider((i, playerInventory, playerEntity) -> { - return oneRow(i, playerInventory, inv); // todo why doesnt vanilla have this + return oneRow(i, playerInventory, inv, maxJewels); // todo why doesnt vanilla have this }, Component.literal(""))); } - public static ChestMenu oneRow(int pContainerId, Inventory pPlayerInventory, Container pContainer) { - return new ChestMenu(MenuType.GENERIC_9x1, pContainerId, pPlayerInventory, pContainer, 1); + public static JewelsMenu oneRow(int pContainerId, Inventory pPlayerInventory, Container pContainer, int maxJewels) { + return new JewelsMenu(MenuType.GENERIC_9x1, pContainerId, pPlayerInventory, pContainer, 1, maxJewels); } @Override diff --git a/src/main/resources/assets/mmorpg/lang/en_us.json b/src/main/resources/assets/mmorpg/lang/en_us.json index 5aade27fb..6fab4eb6f 100644 --- a/src/main/resources/assets/mmorpg/lang/en_us.json +++ b/src/main/resources/assets/mmorpg/lang/en_us.json @@ -2832,6 +2832,7 @@ "mmorpg.word.wiki": "Library", "mmorpg.word.worksonevent": "Works on Events:", "mmorpg.word.x_items": "Reward Amount: %1$s", + "mmorpg.word.jewel_socket_not_available": "Unlock on talent tree", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_ar.json b/src/main/resources/assets/mmorpg/lang/es_ar.json index 4ea6b4fe0..7d21a146a 100644 --- a/src/main/resources/assets/mmorpg/lang/es_ar.json +++ b/src/main/resources/assets/mmorpg/lang/es_ar.json @@ -2802,6 +2802,7 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", + "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_es.json b/src/main/resources/assets/mmorpg/lang/es_es.json index 4ea6b4fe0..7d21a146a 100644 --- a/src/main/resources/assets/mmorpg/lang/es_es.json +++ b/src/main/resources/assets/mmorpg/lang/es_es.json @@ -2802,6 +2802,7 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", + "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_mx.json b/src/main/resources/assets/mmorpg/lang/es_mx.json index 4ea6b4fe0..7d21a146a 100644 --- a/src/main/resources/assets/mmorpg/lang/es_mx.json +++ b/src/main/resources/assets/mmorpg/lang/es_mx.json @@ -2802,6 +2802,7 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", + "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_uy.json b/src/main/resources/assets/mmorpg/lang/es_uy.json index 4ea6b4fe0..7d21a146a 100644 --- a/src/main/resources/assets/mmorpg/lang/es_uy.json +++ b/src/main/resources/assets/mmorpg/lang/es_uy.json @@ -2802,6 +2802,7 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", + "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_ve.json b/src/main/resources/assets/mmorpg/lang/es_ve.json index 4ea6b4fe0..7d21a146a 100644 --- a/src/main/resources/assets/mmorpg/lang/es_ve.json +++ b/src/main/resources/assets/mmorpg/lang/es_ve.json @@ -2802,6 +2802,7 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", + "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/fr_fr.json b/src/main/resources/assets/mmorpg/lang/fr_fr.json index 0d8cb74fa..e40fce47c 100644 --- a/src/main/resources/assets/mmorpg/lang/fr_fr.json +++ b/src/main/resources/assets/mmorpg/lang/fr_fr.json @@ -2693,6 +2693,7 @@ "mmorpg.word.wiki": "Bibliothèque", "mmorpg.word.worksonevent": "Fonctionne sur les Événements:", "mmorpg.word.x_items": "Montant de Récompense: %1$s", + "mmorpg.word.jewel_socket_not_available": "Débloquer dans l'arbre de talents", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/ja_jp.json b/src/main/resources/assets/mmorpg/lang/ja_jp.json index 26fb5a1fa..8b117ee6c 100644 --- a/src/main/resources/assets/mmorpg/lang/ja_jp.json +++ b/src/main/resources/assets/mmorpg/lang/ja_jp.json @@ -2904,6 +2904,7 @@ "mmorpg.word.wiki": "ライブラリ", "mmorpg.word.worksonevent": "イベントでの作品:", "mmorpg.word.x_items": "報酬額: %1$s", + "mmorpg.word.jewel_socket_not_available": "タレントツリーでアンロック", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/ko_kr.json b/src/main/resources/assets/mmorpg/lang/ko_kr.json index 8a69db0d0..aa88e91b1 100644 --- a/src/main/resources/assets/mmorpg/lang/ko_kr.json +++ b/src/main/resources/assets/mmorpg/lang/ko_kr.json @@ -2687,6 +2687,7 @@ "mmorpg.word.wiki": "위키", "mmorpg.word.worksonevent": "Works on Events:", "mmorpg.word.x_items": "보상량: %1$s", + "mmorpg.word.jewel_socket_not_available": "재능 트리에서 잠금 해제", "mmorpg.omen.blood": "피의 징조", "mmorpg.omen.echoes": "메아리의 징조", "mmorpg.omen.fangs": "이빨의 징조", diff --git a/src/main/resources/assets/mmorpg/lang/pt_br.json b/src/main/resources/assets/mmorpg/lang/pt_br.json index 813bffa93..589809780 100644 --- a/src/main/resources/assets/mmorpg/lang/pt_br.json +++ b/src/main/resources/assets/mmorpg/lang/pt_br.json @@ -1272,7 +1272,8 @@ "mmorpg.word.very_hard": "Muito Difícil", "mmorpg.word.weapon": "Em Arma: ", "mmorpg.word.wiki": "Wiki", - + "mmorpg.word.jewel_socket_not_available": "Desbloqueie na árvore de talentos", + "_comment": " [CATEGORIA]: PALAVRAS - NOMES", "_comment": " [CATEGORIA]: ESTATÍSTICAS - NOMES", diff --git a/src/main/resources/assets/mmorpg/lang/ru_ru.json b/src/main/resources/assets/mmorpg/lang/ru_ru.json index ef3f92834..263a15c44 100644 --- a/src/main/resources/assets/mmorpg/lang/ru_ru.json +++ b/src/main/resources/assets/mmorpg/lang/ru_ru.json @@ -2192,6 +2192,7 @@ "mmorpg.word.weapon": "Оружие: ", "mmorpg.word.wiki": "Wiki", "mmorpg.word.wind": "Ветер", + "mmorpg.word.jewel_socket_not_available": "Разблокируется в дереве талантов", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/uk_ua.json b/src/main/resources/assets/mmorpg/lang/uk_ua.json index 8fbb4c70e..232021e9c 100644 --- a/src/main/resources/assets/mmorpg/lang/uk_ua.json +++ b/src/main/resources/assets/mmorpg/lang/uk_ua.json @@ -2675,6 +2675,7 @@ "mmorpg.word.wiki": "Бібліотека", "mmorpg.word.worksonevent": "\"Роботи над подіями:\"", "mmorpg.word.x_items": "Сума винагороди: %1$s", + "mmorpg.word.jewel_socket_not_available": "Розблоковується в дереві талантів", "mmorpg.omen.blood": "Знамення Крові", "mmorpg.omen.echoes": "\"Ознака відлуння\"", "mmorpg.omen.fangs": "Омен ікл", diff --git a/src/main/resources/assets/mmorpg/lang/zh_cn.json b/src/main/resources/assets/mmorpg/lang/zh_cn.json index 56f620ca9..fe0c6c60f 100644 --- a/src/main/resources/assets/mmorpg/lang/zh_cn.json +++ b/src/main/resources/assets/mmorpg/lang/zh_cn.json @@ -2802,6 +2802,7 @@ "mmorpg.word.wiki": "百科", "mmorpg.word.worksonevent": "生效于事件:", "mmorpg.word.x_items": "奖励数量:%1$s", + "mmorpg.word.jewel_socket_not_available": "在天赋树上解锁", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/zh_tw.json b/src/main/resources/assets/mmorpg/lang/zh_tw.json index 88880b4f0..a7b3b609e 100644 --- a/src/main/resources/assets/mmorpg/lang/zh_tw.json +++ b/src/main/resources/assets/mmorpg/lang/zh_tw.json @@ -2779,6 +2779,7 @@ "mmorpg.word.wiki": "資料庫", "mmorpg.word.worksonevent": "作用於事件:", "mmorpg.word.x_items": "獎勵數量:%1$s", + "mmorpg.word.jewel_socket_not_available": "在天賦樹上解鎖", "mmorpg.omen.blood": "血之預兆", "mmorpg.omen.echoes": "回音之預兆", "mmorpg.omen.fangs": "牙之預兆", From ddd4bee3b39e4f080d2f5dc1373e26751677e5bf Mon Sep 17 00:00:00 2001 From: SaloEater Date: Wed, 30 Jul 2025 15:28:14 -0500 Subject: [PATCH 2/3] clean up --- .../capability/player/container/JewelsMenu.java | 8 ++++---- .../vanilla_mc/packets/OpenJewelsPacket.java | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/robertx22/mine_and_slash/capability/player/container/JewelsMenu.java b/src/main/java/com/robertx22/mine_and_slash/capability/player/container/JewelsMenu.java index e85ac786e..22c3c1bfa 100644 --- a/src/main/java/com/robertx22/mine_and_slash/capability/player/container/JewelsMenu.java +++ b/src/main/java/com/robertx22/mine_and_slash/capability/player/container/JewelsMenu.java @@ -35,6 +35,10 @@ public JewelsMenu(MenuType pType, int pContainerId, Inventory pPlayerInventor } } + private boolean isJewelSlot(int pIndex) { + return pIndex >= maxJewels && pIndex < firstPlayerInventoryIndex; + } + @Override public ItemStack quickMoveStack(Player pPlayer, int pIndex) { if (isJewelSlot(pIndex)) { @@ -43,10 +47,6 @@ public ItemStack quickMoveStack(Player pPlayer, int pIndex) { return super.quickMoveStack(pPlayer, pIndex); } - private boolean isJewelSlot(int pIndex) { - return pIndex >= maxJewels && pIndex < firstPlayerInventoryIndex; - } - @Override public void clicked(int pSlotId, int pButton, ClickType pClickType, Player pPlayer) { if (isJewelSlot(pSlotId) || pClickType == ClickType.PICKUP_ALL) { diff --git a/src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/OpenJewelsPacket.java b/src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/OpenJewelsPacket.java index ff6442acf..fabab85b9 100644 --- a/src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/OpenJewelsPacket.java +++ b/src/main/java/com/robertx22/mine_and_slash/vanilla_mc/packets/OpenJewelsPacket.java @@ -40,15 +40,11 @@ public void saveToData(FriendlyByteBuf buf) { @Override public void onReceived(ExilePacketContext ctx) { - JewelInvHelper jewels = Load.player(ctx.getPlayer()).getJewels(); - var inv = jewels.inv; - Player p = ctx.getPlayer(); int maxJewels = jewels.getJewelSocketsMaxStat(p); - p.openMenu(new SimpleMenuProvider((i, playerInventory, playerEntity) -> { - return oneRow(i, playerInventory, inv, maxJewels); // todo why doesnt vanilla have this + return oneRow(i, playerInventory, jewels.inv, maxJewels); // todo why doesnt vanilla have this }, Component.literal(""))); } From efeee82be5d8732f112bae5002904975ac05711e Mon Sep 17 00:00:00 2001 From: SaloEater Date: Thu, 31 Jul 2025 14:02:11 -0500 Subject: [PATCH 3/3] reset translations --- src/main/resources/assets/mmorpg/lang/en_us.json | 1 - src/main/resources/assets/mmorpg/lang/es_ar.json | 1 - src/main/resources/assets/mmorpg/lang/es_es.json | 1 - src/main/resources/assets/mmorpg/lang/es_mx.json | 1 - src/main/resources/assets/mmorpg/lang/es_uy.json | 1 - src/main/resources/assets/mmorpg/lang/es_ve.json | 1 - src/main/resources/assets/mmorpg/lang/fr_fr.json | 1 - src/main/resources/assets/mmorpg/lang/ja_jp.json | 1 - src/main/resources/assets/mmorpg/lang/ko_kr.json | 1 - src/main/resources/assets/mmorpg/lang/pt_br.json | 3 +-- src/main/resources/assets/mmorpg/lang/ru_ru.json | 1 - src/main/resources/assets/mmorpg/lang/uk_ua.json | 1 - src/main/resources/assets/mmorpg/lang/zh_cn.json | 1 - src/main/resources/assets/mmorpg/lang/zh_tw.json | 1 - 14 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/main/resources/assets/mmorpg/lang/en_us.json b/src/main/resources/assets/mmorpg/lang/en_us.json index 6fab4eb6f..5aade27fb 100644 --- a/src/main/resources/assets/mmorpg/lang/en_us.json +++ b/src/main/resources/assets/mmorpg/lang/en_us.json @@ -2832,7 +2832,6 @@ "mmorpg.word.wiki": "Library", "mmorpg.word.worksonevent": "Works on Events:", "mmorpg.word.x_items": "Reward Amount: %1$s", - "mmorpg.word.jewel_socket_not_available": "Unlock on talent tree", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_ar.json b/src/main/resources/assets/mmorpg/lang/es_ar.json index 7d21a146a..4ea6b4fe0 100644 --- a/src/main/resources/assets/mmorpg/lang/es_ar.json +++ b/src/main/resources/assets/mmorpg/lang/es_ar.json @@ -2802,7 +2802,6 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", - "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_es.json b/src/main/resources/assets/mmorpg/lang/es_es.json index 7d21a146a..4ea6b4fe0 100644 --- a/src/main/resources/assets/mmorpg/lang/es_es.json +++ b/src/main/resources/assets/mmorpg/lang/es_es.json @@ -2802,7 +2802,6 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", - "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_mx.json b/src/main/resources/assets/mmorpg/lang/es_mx.json index 7d21a146a..4ea6b4fe0 100644 --- a/src/main/resources/assets/mmorpg/lang/es_mx.json +++ b/src/main/resources/assets/mmorpg/lang/es_mx.json @@ -2802,7 +2802,6 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", - "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_uy.json b/src/main/resources/assets/mmorpg/lang/es_uy.json index 7d21a146a..4ea6b4fe0 100644 --- a/src/main/resources/assets/mmorpg/lang/es_uy.json +++ b/src/main/resources/assets/mmorpg/lang/es_uy.json @@ -2802,7 +2802,6 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", - "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/es_ve.json b/src/main/resources/assets/mmorpg/lang/es_ve.json index 7d21a146a..4ea6b4fe0 100644 --- a/src/main/resources/assets/mmorpg/lang/es_ve.json +++ b/src/main/resources/assets/mmorpg/lang/es_ve.json @@ -2802,7 +2802,6 @@ "mmorpg.word.wiki": "Libreria", "mmorpg.word.worksonevent": "Funciona en eventos:", "mmorpg.word.x_items": "Cantidad de recompensa: %1$s", - "mmorpg.word.jewel_socket_not_available": "Desbloquear en el árbol de talentos", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/fr_fr.json b/src/main/resources/assets/mmorpg/lang/fr_fr.json index e40fce47c..0d8cb74fa 100644 --- a/src/main/resources/assets/mmorpg/lang/fr_fr.json +++ b/src/main/resources/assets/mmorpg/lang/fr_fr.json @@ -2693,7 +2693,6 @@ "mmorpg.word.wiki": "Bibliothèque", "mmorpg.word.worksonevent": "Fonctionne sur les Événements:", "mmorpg.word.x_items": "Montant de Récompense: %1$s", - "mmorpg.word.jewel_socket_not_available": "Débloquer dans l'arbre de talents", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/ja_jp.json b/src/main/resources/assets/mmorpg/lang/ja_jp.json index 8b117ee6c..26fb5a1fa 100644 --- a/src/main/resources/assets/mmorpg/lang/ja_jp.json +++ b/src/main/resources/assets/mmorpg/lang/ja_jp.json @@ -2904,7 +2904,6 @@ "mmorpg.word.wiki": "ライブラリ", "mmorpg.word.worksonevent": "イベントでの作品:", "mmorpg.word.x_items": "報酬額: %1$s", - "mmorpg.word.jewel_socket_not_available": "タレントツリーでアンロック", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/ko_kr.json b/src/main/resources/assets/mmorpg/lang/ko_kr.json index aa88e91b1..8a69db0d0 100644 --- a/src/main/resources/assets/mmorpg/lang/ko_kr.json +++ b/src/main/resources/assets/mmorpg/lang/ko_kr.json @@ -2687,7 +2687,6 @@ "mmorpg.word.wiki": "위키", "mmorpg.word.worksonevent": "Works on Events:", "mmorpg.word.x_items": "보상량: %1$s", - "mmorpg.word.jewel_socket_not_available": "재능 트리에서 잠금 해제", "mmorpg.omen.blood": "피의 징조", "mmorpg.omen.echoes": "메아리의 징조", "mmorpg.omen.fangs": "이빨의 징조", diff --git a/src/main/resources/assets/mmorpg/lang/pt_br.json b/src/main/resources/assets/mmorpg/lang/pt_br.json index 589809780..813bffa93 100644 --- a/src/main/resources/assets/mmorpg/lang/pt_br.json +++ b/src/main/resources/assets/mmorpg/lang/pt_br.json @@ -1272,8 +1272,7 @@ "mmorpg.word.very_hard": "Muito Difícil", "mmorpg.word.weapon": "Em Arma: ", "mmorpg.word.wiki": "Wiki", - "mmorpg.word.jewel_socket_not_available": "Desbloqueie na árvore de talentos", - + "_comment": " [CATEGORIA]: PALAVRAS - NOMES", "_comment": " [CATEGORIA]: ESTATÍSTICAS - NOMES", diff --git a/src/main/resources/assets/mmorpg/lang/ru_ru.json b/src/main/resources/assets/mmorpg/lang/ru_ru.json index 263a15c44..ef3f92834 100644 --- a/src/main/resources/assets/mmorpg/lang/ru_ru.json +++ b/src/main/resources/assets/mmorpg/lang/ru_ru.json @@ -2192,7 +2192,6 @@ "mmorpg.word.weapon": "Оружие: ", "mmorpg.word.wiki": "Wiki", "mmorpg.word.wind": "Ветер", - "mmorpg.word.jewel_socket_not_available": "Разблокируется в дереве талантов", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/uk_ua.json b/src/main/resources/assets/mmorpg/lang/uk_ua.json index 232021e9c..8fbb4c70e 100644 --- a/src/main/resources/assets/mmorpg/lang/uk_ua.json +++ b/src/main/resources/assets/mmorpg/lang/uk_ua.json @@ -2675,7 +2675,6 @@ "mmorpg.word.wiki": "Бібліотека", "mmorpg.word.worksonevent": "\"Роботи над подіями:\"", "mmorpg.word.x_items": "Сума винагороди: %1$s", - "mmorpg.word.jewel_socket_not_available": "Розблоковується в дереві талантів", "mmorpg.omen.blood": "Знамення Крові", "mmorpg.omen.echoes": "\"Ознака відлуння\"", "mmorpg.omen.fangs": "Омен ікл", diff --git a/src/main/resources/assets/mmorpg/lang/zh_cn.json b/src/main/resources/assets/mmorpg/lang/zh_cn.json index fe0c6c60f..56f620ca9 100644 --- a/src/main/resources/assets/mmorpg/lang/zh_cn.json +++ b/src/main/resources/assets/mmorpg/lang/zh_cn.json @@ -2802,7 +2802,6 @@ "mmorpg.word.wiki": "百科", "mmorpg.word.worksonevent": "生效于事件:", "mmorpg.word.x_items": "奖励数量:%1$s", - "mmorpg.word.jewel_socket_not_available": "在天赋树上解锁", "_comment": " [CATEGORY]: WORDS - NAMES", diff --git a/src/main/resources/assets/mmorpg/lang/zh_tw.json b/src/main/resources/assets/mmorpg/lang/zh_tw.json index a7b3b609e..88880b4f0 100644 --- a/src/main/resources/assets/mmorpg/lang/zh_tw.json +++ b/src/main/resources/assets/mmorpg/lang/zh_tw.json @@ -2779,7 +2779,6 @@ "mmorpg.word.wiki": "資料庫", "mmorpg.word.worksonevent": "作用於事件:", "mmorpg.word.x_items": "獎勵數量:%1$s", - "mmorpg.word.jewel_socket_not_available": "在天賦樹上解鎖", "mmorpg.omen.blood": "血之預兆", "mmorpg.omen.echoes": "回音之預兆", "mmorpg.omen.fangs": "牙之預兆",