From 13687c92148724fa8533dcc8be4759d3522de57c Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:21:45 +0300 Subject: [PATCH 01/13] Fix ru_ru.json --- .../resources/assets/createqol/lang/ru_ru.json | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 39c3628..c8aa274 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -53,12 +53,12 @@ "item.createqol.empty_stock_manager": "Рабочее место складского распорядителя", "create.options.inventory_linker.label": "Режим привязки инвентаря", - "create.options.inventory_linker.inventory": "Инвентарь", - "create.options.inventory_linker.armor": "Броня", - "create.options.inventory_linker.off_hand": "Вторая рука", + "options.inventory_linker.inventory": "Инвентарь", + "options.inventory_linker.armor": "Броня", + "options.inventory_linker.off_hand": "Вторая рука", "create.options.brass_trash_can.label": "Режим работы мусоропровода", - "create.options.brass_trash_can.void": "Уничтожать всё", - "create.options.brass_trash_can.keep_64": "Оставлять по стаку", + "options.brass_trash_can.void": "Уничтожать всё", + "options.brass_trash_can.keep_64": "Оставлять по стаку", "tooltip.createqol.player_paper.linked_player": "Привязанный игрок: %s", "tooltip.createqol.player_paper.no_linked_player": "Игрок не привязан", @@ -120,7 +120,7 @@ "createqol.statue.slimArms": "Стройный", "createqol.statue.noGravity": "Без гравитации", "createqol.statue.invulnerable": "Заблокированный", - "createqol.statue.invulnerable1": "Отключить возможность", + "createqol.statue.invulnerable1": "Отключает возможность", "createqol.statue.invulnerable2": "настраивать этот манекен", "createqol.statue.invulnerable3": "другим игрокам", "createqol.statue.ownerInvulnerable": "Только владелец", @@ -132,6 +132,7 @@ "createqol.statue.noCape": "У этого игрока", "createqol.statue.noCape1": "нет плаща", "createqol.statue.mainTab": "Настройка манекена", + "createqol.statue.mainTab": "Основные настройки", "createqol.statue.rotation.cape": "Поворот", "createqol.statue.rotation.hat": "Положение головы", @@ -228,7 +229,7 @@ "createqol.ponder.ender_packager_addresses.header": "Маршрутизацией перемещаемых коробок по их адресам", "createqol.ponder.ender_packager_addresses.text_1": "Склад", "createqol.ponder.ender_packager_addresses.text_2": "Фабрика", - "createqol.ponder.ender_packager_addresses.text_3": "При размещении на эндер-телепаковщике таблички с текстом...", + "createqol.ponder.ender_packager_addresses.text_3": "Если разместить табличку с текстом на эндер-телепаковщик...", "createqol.ponder.ender_packager_addresses.text_4": "...этот текст назначается адресом телепаковщика — как у квакопорта", "createqol.ponder.ender_packager_addresses.text_5": "→ Склад", "createqol.ponder.ender_packager_addresses.text_6": "Если принимающий телепаковщик с соответствующим адресом занят...", From d0d0b3815656fa29b0117ccccfcfaa4155c1aef8 Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:23:05 +0300 Subject: [PATCH 02/13] Fix ru_ru.json again (for the last time) --- src/main/resources/assets/createqol/lang/ru_ru.json | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index c8aa274..83f9638 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -131,7 +131,6 @@ "createqol.statue.ownStatue1": "владельцем манекена", "createqol.statue.noCape": "У этого игрока", "createqol.statue.noCape1": "нет плаща", - "createqol.statue.mainTab": "Настройка манекена", "createqol.statue.mainTab": "Основные настройки", "createqol.statue.rotation.cape": "Поворот", From 416ecf499f9c975bd61a7f9c908f517ffc131931 Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:40:40 +0300 Subject: [PATCH 03/13] Dehardcode Statue strings --- .../client/screens/ConfigureStatueScreen.java | 2 +- .../client/screens/tabs/AnimationTab.java | 2 +- .../client/screens/tabs/MainStatueTab.java | 26 +++++++++---------- .../client/screens/tabs/SkinStatueTab.java | 2 +- .../screens/tabs/StatueTransformTab.java | 4 +-- .../assets/createqol/lang/en_us.json | 6 +++++ .../assets/createqol/lang/ru_ru.json | 8 +++++- 7 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/ConfigureStatueScreen.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/ConfigureStatueScreen.java index f494b2c..0b290d7 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/ConfigureStatueScreen.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/ConfigureStatueScreen.java @@ -141,7 +141,7 @@ protected void renderForeground(GuiGraphics graphics, int mouseX, int mouseY, fl getExampleStatue().setItemSlot(EquipmentSlot.values()[slot],getMenu().ghostInventory.getStackInSlot(slot)); } if (!hideBackground){ - graphics.drawString(Minecraft.getInstance().font,"Customize your Statue",getGuiLeft() + 5, getGuiTop() + 3,0xffffff); + graphics.drawString(Minecraft.getInstance().font,CreateQOLLang.translateDirect("statue.title"),getGuiLeft() + 5, getGuiTop() + 3,0xffffff); } int offsetX = 10; diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/AnimationTab.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/AnimationTab.java index 21f251e..d2fe457 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/AnimationTab.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/AnimationTab.java @@ -225,7 +225,7 @@ public void initWidgets(int x, int y) { nameEdit = new EditBox(Minecraft.getInstance().font, x + BASE_OFFSET + LOOP_X + 21, y + 173 - 19 + TEXT_Y_OFFSET,TEXT_BOX_WIDTH - 20,18,CommonComponents.EMPTY); nameEdit.setBordered(false); nameEdit.setFocused(false); - nameEdit.setHint(Component.literal("Animation Name")); + nameEdit.setHint(CreateQOLLang.translateDirect("statue.animation.publishName")); nameEdit.setTooltip(Tooltip.create(CreateQOLLang.translateDirect("statue.name_utility"))); if (animation != null) { diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/MainStatueTab.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/MainStatueTab.java index 2acab1d..5c0768a 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/MainStatueTab.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/MainStatueTab.java @@ -65,7 +65,7 @@ public void initWidgets(int x, int y) { nameTextBox.setBordered(false); nameTextBox.setTextColor(0xffffff); nameTextBox.setFocused(false); - nameTextBox.setHint(Component.literal("Name")); + nameTextBox.setHint(CreateQOLLang.translateDirect("statue.name")); List tip = new ArrayList<>(); tip.add(CreateQOLLang.translateDirect("statue.showName")); @@ -87,8 +87,8 @@ public void initWidgets(int x, int y) { showNameButton.green = getExampleStatue().isCustomNameVisible(); showNameButton.getToolTip().clear(); showNameButton.getToolTip().addAll(getExampleStatue().isCustomNameVisible() ? tipEnabled : tip); - showNameLabel = new Label(x + LABEL_X_OFFSET,y + SHOW_NAME_Y + LABEL_Y_OFFSET,Component.literal("Show Name")); - showNameLabel.text = Component.literal("Show Name"); + showNameLabel = new Label(x + LABEL_X_OFFSET,y + SHOW_NAME_Y + LABEL_Y_OFFSET,CreateQOLLang.translateDirect("statue.showName")); + showNameLabel.text = CreateQOLLang.translateDirect("statue.showName"); tip.clear(); tip.add(CreateQOLLang.translateDirect("statue.small")); @@ -110,8 +110,8 @@ public void initWidgets(int x, int y) { smallButton.green = getExampleStatue().isSmall(); smallButton.getToolTip().clear(); smallButton.getToolTip().addAll( getExampleStatue().isSmall() ? tipEnabled : tip); - smallLabel = new Label(x + LABEL_X_OFFSET,y + SMALL_Y + LABEL_Y_OFFSET,Component.literal("Small")); - smallLabel.text = Component.literal("Small"); + smallLabel = new Label(x + LABEL_X_OFFSET,y + SMALL_Y + LABEL_Y_OFFSET,CreateQOLLang.translateDirect("statue.small")); + smallLabel.text = CreateQOLLang.translateDirect("statue.small"); tip.clear(); tip.add(CreateQOLLang.translateDirect("statue.slimArms")); @@ -132,8 +132,8 @@ public void initWidgets(int x, int y) { slimArmsButton.green = getExampleStatue().isSlimArms(); slimArmsButton.getToolTip().clear(); slimArmsButton.getToolTip().addAll( getExampleStatue().isSlimArms() ? tipEnabled : tip); - slimArmsLabel = new Label(x + LABEL_X_OFFSET,y + SLIM_ARMS_Y + LABEL_Y_OFFSET,Component.literal("Slim Arms")); - slimArmsLabel.text = Component.literal("Slim Arms"); + slimArmsLabel = new Label(x + LABEL_X_OFFSET,y + SLIM_ARMS_Y + LABEL_Y_OFFSET,CreateQOLLang.translateDirect("statue.slimArms")); + slimArmsLabel.text = CreateQOLLang.translateDirect("statue.slimArms"); tip.clear(); tip.add(CreateQOLLang.translateDirect("statue.noGravity")); @@ -155,8 +155,8 @@ public void initWidgets(int x, int y) { ngButton.green = getExampleStatue().isNoGravity(); ngButton.getToolTip().clear(); ngButton.getToolTip().addAll( getExampleStatue().isNoGravity() ? tipEnabled : tip); - ngLabel = new Label(x + LABEL_X_OFFSET,y + NO_GRAVITY_Y + LABEL_Y_OFFSET,Component.literal("No Gravity")); - ngLabel.text = Component.literal("No Gravity"); + ngLabel = new Label(x + LABEL_X_OFFSET,y + NO_GRAVITY_Y + LABEL_Y_OFFSET,CreateQOLLang.translateDirect("statue.noGravity")); + ngLabel.text = CreateQOLLang.translateDirect("statue.noGravity"); tip.clear(); tip.add(CreateQOLLang.translateDirect("statue.invulnerable")); @@ -181,8 +181,8 @@ public void initWidgets(int x, int y) { invulnerableButton.green = getExampleStatue().isInvulnerable(); invulnerableButton.getToolTip().clear(); invulnerableButton.getToolTip().addAll( getExampleStatue().isInvulnerable() ? tipEnabled : tip); - invulnerableLabel = new Label(x + LABEL_X_OFFSET,y + INVUlNERABLE_Y + LABEL_Y_OFFSET,Component.literal("Invulnerable")); - invulnerableLabel.text = Component.literal("Invulnerable"); + invulnerableLabel = new Label(x + LABEL_X_OFFSET,y + INVUlNERABLE_Y + LABEL_Y_OFFSET,CreateQOLLang.translateDirect("statue.invulnerable")); + invulnerableLabel.text = CreateQOLLang.translateDirect("statue.invulnerable"); if (getExampleStatue().hasOwner() && !Minecraft.getInstance().player.getUUID().equals(getExampleStatue().getOwner().get())){ invulnerableButton.active = false; @@ -212,8 +212,8 @@ public void initWidgets(int x, int y) { invisibleButton.green = getExampleStatue().isInvisible(); invisibleButton.getToolTip().clear(); invisibleButton.getToolTip().addAll( getExampleStatue().isInvisible() ? tipEnabled : tip); - invisibleLabel = new Label(x + LABEL_X_OFFSET,y + INVISIBLE_Y + LABEL_Y_OFFSET,Component.literal("Invisible")); - invisibleLabel.text = Component.literal("Invisible"); + invisibleLabel = new Label(x + LABEL_X_OFFSET,y + INVISIBLE_Y + LABEL_Y_OFFSET,CreateQOLLang.translateDirect("statue.invisible")); + invisibleLabel.text = CreateQOLLang.translateDirect("statue.invisible"); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/SkinStatueTab.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/SkinStatueTab.java index 47e299a..8266fa4 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/SkinStatueTab.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/SkinStatueTab.java @@ -59,7 +59,7 @@ public void initWidgets(int x, int y) { playerSkinTextBox.setBordered(false); playerSkinTextBox.setTextColor(0xffffff); playerSkinTextBox.setFocused(false); - playerSkinTextBox.setHint(Component.literal("Player Name")); + playerSkinTextBox.setHint(CreateQOLLang.translateDirect("statue.playerName")); playerSkinTextBox.setFilter(StringUtil::isValidPlayerName); partsButtons = new ArrayList<>(); diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/StatueTransformTab.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/StatueTransformTab.java index b950fda..6e873d6 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/StatueTransformTab.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/tabs/StatueTransformTab.java @@ -184,11 +184,11 @@ public void initWidgets(int x, int y) { scale.withStepFunction(ctx->ctx.control ? 1 : ctx.shift ? 0.5f : 0.1f); scale.calling(i->{ getExampleStatue().setEntityScale(i); - scale.titled(Component.literal("Scale: " + String.format("%.2f",scale.getState()) )); + scale.titled(CreateQOLLang.translateDirect("statue.scaleScroll", String.format("%.2f", scale.getState()))); getParent().sendUpdatePacket(); }); scale.setState(getExampleStatue().getEntityScale()); - scale.titled(Component.literal("Scale: " + String.format("%.2f",scale.getState()))); + scale.titled(CreateQOLLang.translateDirect("statue.scaleScroll", String.format("%.2f", scale.getState()))); rotationLabel = new Label(x + 2* BASE_OFFSET, y+88 - LABEL_Y_OFFSET*3,CreateQOLLang.translateDirect("statue.rotation.cape")); rotationLabel.text = CreateQOLLang.translateDirect("statue.rotation.cape"); diff --git a/src/main/resources/assets/createqol/lang/en_us.json b/src/main/resources/assets/createqol/lang/en_us.json index b6fd6c2..4b24ed5 100644 --- a/src/main/resources/assets/createqol/lang/en_us.json +++ b/src/main/resources/assets/createqol/lang/en_us.json @@ -115,6 +115,8 @@ "entity.createqol.statue": "Statue", + "createqol.statue.title": "Customize your Statue", + "createqol.statue.name": "Name", "createqol.statue.showName": "Display the name", "createqol.statue.small": "Small Statue", "createqol.statue.slimArms": "Slim Arms", @@ -133,6 +135,8 @@ "createqol.statue.noCape1": "has no cape", "createqol.statue.mainTab": "Statue Customization", + "createqol.statue.playerName": "Player Name", + "createqol.statue.rotation.cape": "Statue Rotation", "createqol.statue.rotation.hat": "Head Rotation", "createqol.statue.rotation.left_sleeve": "Left Arm Rotation", @@ -178,6 +182,7 @@ "createqol.statue.transformTab": "Transform", "createqol.statue.position": "Position", "createqol.statue.scale": "Scale", + "createqol.statue.scaleScroll": "Scale: %s", "createqol.statue.animationTab": "Animation", "createqol.statue.publishedAnimationTab": "Shared Animations", @@ -207,6 +212,7 @@ "createqol.statue.animation.next_frame": "Next existing frame", "createqol.statue.animation.delete_frame": "Delete current frame", "createqol.statue.animation.publish": "Share animation to other players", + "createqol.statue.animation.publishName": "Animation Name", "createqol.statue.animation.delete": "Delete Shared Animation", "createqol.statue.owner": "Owner: %s", diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 83f9638..0cf63c3 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -115,6 +115,8 @@ "entity.createqol.statue": "Картонный манекен", + "createqol.statue.title": "Настройка картонного манекена", + "createqol.statue.name": "Имя манекена", "createqol.statue.showName": "Отображать имя", "createqol.statue.small": "Маленький", "createqol.statue.slimArms": "Стройный", @@ -133,6 +135,8 @@ "createqol.statue.noCape1": "нет плаща", "createqol.statue.mainTab": "Основные настройки", + "createqol.statue.playerName": "Имя игрока", + "createqol.statue.rotation.cape": "Поворот", "createqol.statue.rotation.hat": "Положение головы", "createqol.statue.rotation.left_sleeve": "Положение левой руки", @@ -178,6 +182,7 @@ "createqol.statue.transformTab": "Положение манекена", "createqol.statue.position": "Позиция", "createqol.statue.scale": "Размер", + "createqol.statue.scaleScroll": "Размер: %s", "createqol.statue.animationTab": "Анимация", "createqol.statue.publishedAnimationTab": "Опубликованные анимации", @@ -207,6 +212,7 @@ "createqol.statue.animation.next_frame": "Следующий ключевой кадр", "createqol.statue.animation.delete_frame": "Удалить ключевой кадр", "createqol.statue.animation.publish": "Опубликовать анимацию", + "createqol.statue.animation.publishName": "Название анимации", "createqol.statue.animation.delete": "Удалить анимацию", "createqol.statue.owner": "Владелец: %s", @@ -265,4 +271,4 @@ "createqol.gui.stock_manager.add_user": "Нанять", "createqol.logistically_linked.tuned_to": "Подключено к сети %s" -} +} \ No newline at end of file From 1a51b847a62e05078d0cfb735a825583c0c5a9be Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:53:13 +0300 Subject: [PATCH 04/13] Dehardcode armor & tools strings --- .../blocks/RefinedRadianceBacktankBlock.java | 3 +- .../blocks/ShadowRadianceBacktankBlock.java | 5 +- .../armors/RefinedRadianceArmorItem.java | 6 +- .../armors/RefinedRadianceChestplate.java | 6 +- .../items/armors/RefinedRadianceHelmet.java | 2 +- .../items/armors/ShadowRadianceArmorItem.java | 8 +-- .../armors/ShadowRadianceChestplate.java | 35 ++++----- .../items/armors/ShadowRadianceHelmet.java | 4 +- .../items/armors/ShadowSteelArmorItem.java | 6 +- .../items/armors/ShadowSteelChestplate.java | 11 +-- .../items/armors/ShadowSteelHelmet.java | 2 +- .../refinedradiance/RefinedRadianceAxe.java | 8 +-- .../refinedradiance/RefinedRadianceHoe.java | 8 +-- .../RefinedRadiancePickaxe.java | 8 +-- .../RefinedRadianceShovel.java | 8 +-- .../refinedradiance/RefinedRadianceSword.java | 4 +- .../shadowradiance/ShadowRadianceAxe.java | 10 +-- .../shadowradiance/ShadowRadianceHoe.java | 10 +-- .../shadowradiance/ShadowRadiancePickaxe.java | 10 +-- .../shadowradiance/ShadowRadianceShovel.java | 10 +-- .../shadowradiance/ShadowRadianceSword.java | 4 +- .../tools/shadowsteel/ShadowSteelAxe.java | 8 +-- .../tools/shadowsteel/ShadowSteelHoe.java | 8 +-- .../tools/shadowsteel/ShadowSteelPickaxe.java | 8 +-- .../tools/shadowsteel/ShadowSteelShovel.java | 8 +-- .../tools/shadowsteel/ShadowSteelSword.java | 4 +- .../utils/QOLConfigurableItem.java | 6 +- .../assets/createqol/lang/en_us.json | 71 +++++++++++++++++++ .../assets/createqol/lang/ru_ru.json | 71 +++++++++++++++++++ 29 files changed, 249 insertions(+), 103 deletions(-) diff --git a/src/main/java/fr/iglee42/createqualityoflife/blocks/RefinedRadianceBacktankBlock.java b/src/main/java/fr/iglee42/createqualityoflife/blocks/RefinedRadianceBacktankBlock.java index 4ac064c..e0e8623 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/blocks/RefinedRadianceBacktankBlock.java +++ b/src/main/java/fr/iglee42/createqualityoflife/blocks/RefinedRadianceBacktankBlock.java @@ -5,6 +5,7 @@ import com.simibubi.create.content.equipment.armor.BacktankBlock; import com.simibubi.create.content.equipment.armor.BacktankBlockEntity; import com.simibubi.create.content.equipment.armor.BacktankItem; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.blockentitites.RefinedRadianceBacktankBE; import fr.iglee42.createqualityoflife.blockentitites.ShadowRadianceBacktankBE; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; @@ -65,7 +66,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev if (level.getBlockEntity(pos) instanceof RefinedRadianceBacktankBE be){ if (!be.hasElytra() && player.getMainHandItem().is(Items.ELYTRA)) { if (!CreateQOLConfigs.server().equipments.armors.elytraAllowed.get()) { - player.displayClientMessage(Component.literal("Elytra are disabled by the config").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(CreateQOLLang.translateDirect("backtank.elytra_disabled").withStyle(ChatFormatting.RED), true); level.playSound(null, pos, AllSoundEvents.DENY.getMainEvent(), SoundSource.PLAYERS, 1, 1.45f); return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } diff --git a/src/main/java/fr/iglee42/createqualityoflife/blocks/ShadowRadianceBacktankBlock.java b/src/main/java/fr/iglee42/createqualityoflife/blocks/ShadowRadianceBacktankBlock.java index caa93cb..b4f312e 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/blocks/ShadowRadianceBacktankBlock.java +++ b/src/main/java/fr/iglee42/createqualityoflife/blocks/ShadowRadianceBacktankBlock.java @@ -5,6 +5,7 @@ import com.simibubi.create.content.equipment.armor.BacktankBlock; import com.simibubi.create.content.equipment.armor.BacktankBlockEntity; import com.simibubi.create.content.equipment.armor.BacktankItem; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.blockentitites.ShadowRadianceBacktankBE; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.items.armors.ShadowRadianceChestplate; @@ -75,7 +76,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev if (level.getBlockEntity(pos) instanceof ShadowRadianceBacktankBE be){ if (!be.hasPropeller() && AllItems.PROPELLER.is(player.getMainHandItem().getItem())) { if (!CreateQOLConfigs.server().equipments.armors.propellerAllowed.get()) { - player.displayClientMessage(Component.literal("Propellers are disabled by the config").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(CreateQOLLang.translateDirect("backtank.propeller_disabled").withStyle(ChatFormatting.RED), true); level.playSound(null, pos, AllSoundEvents.DENY.getMainEvent(), SoundSource.PLAYERS, 1, 1.45f); return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } @@ -86,7 +87,7 @@ protected ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Lev } if (!be.hasElytra() && player.getMainHandItem().is(Items.ELYTRA)) { if (!CreateQOLConfigs.server().equipments.armors.elytraAllowed.get()) { - player.displayClientMessage(Component.literal("Elytra are disabled by the config").withStyle(ChatFormatting.RED), true); + player.displayClientMessage(CreateQOLLang.translateDirect("backtank.elytra_disabled").withStyle(ChatFormatting.RED), true); level.playSound(null, pos, AllSoundEvents.DENY.getMainEvent(), SoundSource.PLAYERS, 1, 1.45f); return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java index 7f36bea..3714f64 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java @@ -51,16 +51,16 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, public void appendHoverText(@NotNull ItemStack stack, @NotNull TooltipContext p_41422_, @NotNull List components, @NotNull TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.literal("Diving : ") + components.add(Component.translatable("createqol.function.armor.diving") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.literal("Belt Blocking : ") + components.add(Component.translatable("createqol.function.armor.belt_blocking") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BOOTS_BELT, true), false, true))); } else if (getType().equals(ArmorItem.Type.LEGGINGS)){ - components.add(Component.literal("Step Height : ") + components.add(Component.translatable("createqol.function.armor.step_height") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.stepHeight.get(), true, stack.getOrDefault(QOLDataComponents.STEP_HEIGHT, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java index fa8dea8..12d9232 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java @@ -99,17 +99,17 @@ public void addConfigurations(List> list, ItemStack stack) { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Air : ") + components.add(Component.translatable("createqol.function.armor.air") .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/" + BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.literal("Elytra : ") + components.add(Component.translatable("createqol.function.armor.elytra") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.elytraAllowed.get() ,ShadowRadianceChestplate.hasElytra(stack) , ShadowRadianceChestplate.isElytraEnable(stack), true,false))); - components.add(Component.literal("Arms : ") + components.add(Component.translatable("createqol.function.armor.arms") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java index c3a40ec..95a79de 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java @@ -48,7 +48,7 @@ public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, i @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Goggles : ") + components.add(Component.translatable("createqol.function.armor.goggles") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java index d9fd00a..618530b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java @@ -45,20 +45,20 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, @Override public void appendHoverText(ItemStack stack, TooltipContext p_339594_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Effect : ") + components.add(Component.translatable("createqol.function.armor.effect") .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.literal("Diving : ") + components.add(Component.translatable("createqol.function.armor.diving") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.literal("Belt Blocking : ") + components.add(Component.translatable("createqol.function.armor.belt_blocking") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BOOTS_BELT, true), false, true))); - components.add(Component.literal("Lava Walking : ") + components.add(Component.translatable("createqol.function.armor.lava_walking") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsLavaWalking.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_LAVA, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java index cd46cca..31ea989 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java @@ -3,6 +3,7 @@ import com.simibubi.create.content.equipment.armor.BacktankItem; import com.simibubi.create.content.equipment.armor.BacktankUtil; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.client.screens.widgets.entries.BooleanEntry; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLArmorMaterials; @@ -189,36 +190,36 @@ private void pushVertically(Player p,double y){ @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Air : ") + components.add(Component.translatable("createqol.function.armor.air") .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/"+BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.literal("Effect : ") + components.add(Component.translatable("createqol.function.armor.effect") .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); - components.add(Component.literal("Arms : ") + components.add(Component.translatable("createqol.function.armor.arms") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); - components.add(Component.literal("Elytra : ") + components.add(Component.translatable("createqol.function.armor.elytra") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.elytraAllowed.get() ,hasElytra(stack) ,isElytraEnable(stack), true,false))); - components.add(Component.literal("Dash : ") + components.add(Component.translatable("createqol.function.armor.dash") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.armors.dashAllowed.get(), stack.getOrDefault(QOLDataComponents.DASH, true), (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.armors.dashCooldown.get())))); - components.add(Component.literal("Propeller : ") + components.add(Component.translatable("createqol.function.armor.propeller") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.propellerAllowed.get() , hasPropeller(stack) ,true,false,false))); if (hasPropeller(stack) && CreateQOLConfigs.server().equipments.armors.propellerAllowed.get()) { components.add(Component.empty()); - components.add(Component.literal("Fan : ") + components.add(Component.translatable("createqol.function.armor.fan") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true,true,isFansEnable(stack),false,true))); - components.add(Component.literal("Hover : ") + components.add(Component.translatable("createqol.function.armor.hover") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.hoverAllowed.get() ,true,isHoverEnable(stack),false,true))); } @@ -228,43 +229,43 @@ public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, public static void toggleFans(ItemStack chestplate,Player p) { if (!CreateQOLConfigs.server().equipments.armors.propellerAllowed.get()){ - p.displayClientMessage(Component.literal("Propeller is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.propeller_disabled").withStyle(ChatFormatting.RED),true); return; } if (isElytraEnable(chestplate)){ - p.displayClientMessage(Component.literal("Fan can't be enabled if the elytra are enabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.fan_unavailable").withStyle(ChatFormatting.RED),true); return; } chestplate.set(QOLDataComponents.BACKTANK_FANS, !chestplate.has(QOLDataComponents.BACKTANK_FANS) || Boolean.FALSE.equals(chestplate.get(QOLDataComponents.BACKTANK_FANS))); boolean fans = isFansEnable(chestplate); - p.displayClientMessage(Component.literal("Fan : ").append(QOLConfigurableItem.chooseState(true,true,fans,false,true)).withStyle(fans ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.fan_toggle").append(QOLConfigurableItem.chooseState(true,true,fans,false,true)).withStyle(fans ? ChatFormatting.GREEN : ChatFormatting.RED),true); } public static void toggleHover(ItemStack chestplate,Player p) { if (!CreateQOLConfigs.server().equipments.armors.propellerAllowed.get()){ - p.displayClientMessage(Component.literal("Propeller is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.propeller_disabled").withStyle(ChatFormatting.RED),true); return; } if (!CreateQOLConfigs.server().equipments.armors.hoverAllowed.get()){ - p.displayClientMessage(Component.literal("Hover is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.hover_disabled").withStyle(ChatFormatting.RED),true); return; } chestplate.set(QOLDataComponents.BACKTANK_HOVER, chestplate.has(QOLDataComponents.BACKTANK_HOVER) && Boolean.FALSE.equals(chestplate.get(QOLDataComponents.BACKTANK_HOVER))); boolean hover = isHoverEnable(chestplate); - p.displayClientMessage(Component.literal("Hover : ").append(QOLConfigurableItem.chooseState(true,true,hover,false,true)).withStyle(hover ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.hover_toggle").append(QOLConfigurableItem.chooseState(true,true,hover,false,true)).withStyle(hover ? ChatFormatting.GREEN : ChatFormatting.RED),true); } public static void toggleElytra(ItemStack chestplate,Player p) { if (!CreateQOLConfigs.server().equipments.armors.elytraAllowed.get()){ - p.displayClientMessage(Component.literal("Elytra are disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.elytra_disabled").withStyle(ChatFormatting.RED),true); return; } if (isFansEnable(chestplate)){ - p.displayClientMessage(Component.literal("Elytra can't be enabled if the fans is enabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.elytra_unavailable").withStyle(ChatFormatting.RED),true); return; } chestplate.set(QOLDataComponents.BACKTANK_ELYTRA_STATE, chestplate.has(QOLDataComponents.BACKTANK_ELYTRA_STATE) && Boolean.FALSE.equals(chestplate.get(QOLDataComponents.BACKTANK_ELYTRA_STATE))); boolean elytra = isElytraEnable(chestplate); - p.displayClientMessage(Component.literal("Elytra : ").append(QOLConfigurableItem.chooseState(true,true,elytra,false,true)).withStyle(elytra ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.elytra_toggle").append(QOLConfigurableItem.chooseState(true,true,elytra,false,true)).withStyle(elytra ? ChatFormatting.GREEN : ChatFormatting.RED),true); } public static boolean hasPropeller(ItemStack chestplate){ return chestplate.has(QOLDataComponents.BACKTANK_PROPELLERS) && Boolean.TRUE.equals(chestplate.get(QOLDataComponents.BACKTANK_PROPELLERS)); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java index 8ff2961..68868fe 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java @@ -54,10 +54,10 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Effect : ") + components.add(Component.translatable("createqol.function.armor.effect") .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); - components.add(Component.literal("Goggles : ") + components.add(Component.translatable("createqol.function.armor.goggles") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java index 260f7ce..ca09912 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java @@ -49,16 +49,16 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.literal("Diving : ") + components.add(Component.translatable("createqol.function.armor.diving") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.literal("Lava Walking : ") + components.add(Component.translatable("createqol.function.armor.lava_walking") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsLavaWalking.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_LAVA, true), false, true))); } else if (getType().equals(ArmorItem.Type.LEGGINGS)){ - components.add(Component.literal("Void Walk : ") + components.add(Component.translatable("createqol.function.armor.void_walk") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.voidWalking.get(), true, stack.getOrDefault(QOLDataComponents.VOID_WALK, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java index ed46157..f5e03e1 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java @@ -3,6 +3,7 @@ import com.simibubi.create.content.equipment.armor.BacktankItem; import com.simibubi.create.content.equipment.armor.BacktankUtil; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLArmorMaterials; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; @@ -35,11 +36,11 @@ public ShadowSteelChestplate(Properties properties, Supplier public static void dash(ItemStack chestplate, ServerPlayer player) { if (!chestplate.getOrDefault(QOLDataComponents.DASH,true)) return; if (!CreateQOLConfigs.server().equipments.armors.dashAllowed.get()){ - player.displayClientMessage(Component.literal("Dashing is disabled on this server !").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("chestplate.dash_disabled").withStyle(ChatFormatting.RED),true); return; } if (player.getCooldowns().isOnCooldown(chestplate.getItem())){ - player.displayClientMessage(Component.literal("Dashing is reloading, please wait!").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("chestplate.dash_reloading").withStyle(ChatFormatting.RED),true); return; } Vec3 look = player.getLookAngle().normalize().scale(2.5D); @@ -58,17 +59,17 @@ public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, i @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Air : ") + components.add(Component.translatable("createqol.function.armor.air") .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/" + BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.literal("Dash : ") + components.add(Component.translatable("createqol.function.armor.dash") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.armors.dashAllowed.get(), stack.getOrDefault(QOLDataComponents.DASH, true), (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.armors.dashCooldown.get())))); - components.add(Component.literal("Arms : ") + components.add(Component.translatable("createqol.function.armor.arms") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java index a8b4e42..de2a5a9 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java @@ -42,7 +42,7 @@ public ShadowSteelHelmet( Properties properties) { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Goggles : ") + components.add(Component.translatable("createqol.function.armor.goggles") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java index 2297521..61c1377 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java @@ -78,10 +78,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Casingifier : ") + components.add(Component.translatable("createqol.function.tools.casingifier") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.casingifier.get(), true, stack.getOrDefault(QOLDataComponents.CASINGIFIER,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -105,12 +105,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.casingifier.get()){ - p.displayClientMessage(Component.literal("Casingifier is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.casingifier_disabled").withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.CASINGIFIER,false); stack.set(QOLDataComponents.CASINGIFIER, enable); - p.displayClientMessage(Component.literal("Casingifier : ").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.casingifier_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java index 8b1c4e5..ae303e6 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java @@ -72,10 +72,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Harvesting : ") + components.add(Component.translatable("createqol.function.tools.harvesting") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.harvesting.get(), true, stack.getOrDefault(QOLDataComponents.HARVESTING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -97,12 +97,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.harvesting.get()){ - p.displayClientMessage(Component.literal("Harvesting is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.harvesting_disabled").withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.HARVESTING,false); stack.set(QOLDataComponents.HARVESTING, enable); - p.displayClientMessage(Component.literal("Harvesting : ").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.harvesting_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java index 2609dbd..02d1178 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java @@ -64,10 +64,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Vein Mine : ") + components.add(Component.translatable("createqol.function.tools.vein_mine") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.veinMine.get(), true, stack.getOrDefault(QOLDataComponents.VEIN_MINE,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -90,12 +90,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.veinMine.get()){ - p.displayClientMessage(Component.literal("Vein Mine is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.vein_mine_disabled").withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.VEIN_MINE,false); stack.set(QOLDataComponents.VEIN_MINE, enable); - p.displayClientMessage(Component.literal("Vein Mine : ").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.vein_mine_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java index 26f8117..3d074e3 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java @@ -60,10 +60,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Smelting : ") + components.add(Component.translatable("createqol.function.tools.smelting") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.smelting.get(), true, stack.getOrDefault(QOLDataComponents.SMELTING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -87,12 +87,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.smelting.get()){ - p.displayClientMessage(Component.literal("Smelting is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.smelting_disabled").withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.SMELTING,false); stack.set(QOLDataComponents.SMELTING, enable); - p.displayClientMessage(Component.literal("Smelting : ").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.smelting_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java index c855f03..89a92d4 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java @@ -123,10 +123,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.literal("Attraction : ") + components.add(Component.translatable("createqol.function.tools.attraction") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java index 7c25745..9f501fa 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java @@ -66,13 +66,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Casifier : ") + components.add(Component.translatable("createqol.function.tools.casingifier") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.casingifier.get(), true, stack.getOrDefault(QOLDataComponents.CASINGIFIER,false), false, true))); - components.add(Component.literal("Tree Decapitation : ") + components.add(Component.translatable("createqol.function.tools.tree_decapitation") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.treeDecapitation.get(), true, stack.getOrDefault(QOLDataComponents.TREE_DECAPITATION,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -92,14 +92,14 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand),true); if (player.isCrouching()){ if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.TREE_DECAPITATION,false)){ - player.displayClientMessage(Component.literal("Casingifier can't be enabled if tree decapitation is enabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(Component.translatable("createqol.tool.casingifier_unavailable").withStyle(ChatFormatting.RED),true); }else { RefinedRadianceAxe.toggleAbility(player.getItemInHand(hand),player); } } else { if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.CASINGIFIER,false)){ - player.displayClientMessage(Component.literal("Tree Decapitation can't be enabled if casingifier is enabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(Component.translatable("createqol.tool.tree_decapitation_unavailable").withStyle(ChatFormatting.RED),true); }else { ShadowSteelAxe.toggleAbility(player.getItemInHand(hand),player); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java index a07c8ac..f5ff3f2 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java @@ -57,13 +57,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Harvesting : ") + components.add(Component.translatable("createqol.function.tools.harvesting") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.harvesting.get(), true, stack.getOrDefault(QOLDataComponents.HARVESTING,false), false, true))); - components.add(Component.literal("Ploughing : ") + components.add(Component.translatable("createqol.function.tools.ploughing") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.ploughing.get(), true, stack.getOrDefault(QOLDataComponents.PLOUGHING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -91,14 +91,14 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand),true); if (player.isCrouching()){ if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.HARVESTING,false)){ - player.displayClientMessage(Component.literal("Ploughing can't be enabled if harvesting is enabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(Component.translatable("createqol.tool.ploughing_unavailable").withStyle(ChatFormatting.RED),true); }else { ShadowSteelHoe.toggleAbility(player.getItemInHand(hand),player); } } else { if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.PLOUGHING,false)){ - player.displayClientMessage(Component.literal("Harvesting can't be enabled if ploughing is enabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(Component.translatable("createqol.tool.harvesting_unavailable").withStyle(ChatFormatting.RED),true); }else { RefinedRadianceHoe.toggleAbility(player.getItemInHand(hand),player); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java index a4157e9..28a7c19 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java @@ -36,14 +36,14 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand),true); if (player.isCrouching()){ if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.VEIN_MINE,false)){ - player.displayClientMessage(Component.literal("Digging can't be enabled if vein mine is enabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(Component.translatable("createqol.tool.digging_unavailable").withStyle(ChatFormatting.RED),true); }else { ShadowSteelPickaxe.toggleAbility(player.getItemInHand(hand),player); } } else { if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.DIGGING,false)){ - player.displayClientMessage(Component.literal("Vein Mine can't be enabled if digging is enabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(Component.translatable("createqol.tool.vein_mine_unavailable").withStyle(ChatFormatting.RED),true); }else { RefinedRadiancePickaxe.toggleAbility(player.getItemInHand(hand),player); } @@ -65,13 +65,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.literal("Digging : ") + components.add(Component.translatable("createqol.function.tools.digging") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING, false), false, true))); - components.add(Component.literal("Vein Mine : ") + components.add(Component.translatable("createqol.function.tools.vein_mine") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.veinMine.get(), true, stack.getOrDefault(QOLDataComponents.VEIN_MINE,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java index f081e8c..0c259ad 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java @@ -45,13 +45,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Smelting : ") + components.add(Component.translatable("createqol.function.tools.smelting") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.smelting.get(), true, stack.getOrDefault(QOLDataComponents.SMELTING,false), false, true))); - components.add(Component.literal("Digging : ") + components.add(Component.translatable("createqol.function.tools.digging") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -79,14 +79,14 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand),true); if (player.isCrouching()){ if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.SMELTING,false)){ - player.displayClientMessage(Component.literal("Digging can't be enabled if smelting is enabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(Component.translatable("createqol.tool.digging_unavailable").withStyle(ChatFormatting.RED),true); }else { ShadowSteelShovel.toggleAbility(player.getItemInHand(hand),player); } } else { if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.DIGGING,false)){ - player.displayClientMessage(Component.literal("Smelting can't be enabled if digging is enabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(Component.translatable("createqol.tool.smelting_unavailable").withStyle(ChatFormatting.RED),true); }else { RefinedRadianceShovel.toggleAbility(player.getItemInHand(hand),player); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java index 813fc33..6248ded 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java @@ -134,10 +134,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.literal("Repulsion/Attraction : ") + components.add(Component.translatable("createqol.function.tools.repulsion_attraction") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java index bde9a62..7d07936 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java @@ -80,10 +80,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Tree Decapitation : ") + components.add(Component.translatable("createqol.function.tools.tree_decapitation") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.treeDecapitation.get(), true, stack.getOrDefault(QOLDataComponents.TREE_DECAPITATION,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -106,12 +106,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.treeDecapitation.get()){ - p.displayClientMessage(Component.literal("Tree Decapitation is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.tree_decapitation_disabled").withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.TREE_DECAPITATION,false); stack.set(QOLDataComponents.TREE_DECAPITATION, enable); - p.displayClientMessage(Component.literal("Tree Decapitation : ").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.tree_decapitation_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java index f9dbeb5..051bc10 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java @@ -63,10 +63,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Ploughing : ") + components.add(Component.translatable("createqol.function.tools.ploughing") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.ploughing.get(), true, stack.getOrDefault(QOLDataComponents.PLOUGHING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -89,12 +89,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.ploughing.get()){ - p.displayClientMessage(Component.literal("Ploughing is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.ploughing_disabled").withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.PLOUGHING,false); stack.set(QOLDataComponents.PLOUGHING, enable); - p.displayClientMessage(Component.literal("Ploughing : ").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.ploughing_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java index ae72012..09a22b4 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java @@ -55,12 +55,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.digging.get()){ - p.displayClientMessage(Component.literal("Digging is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.digging_disabled").withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.DIGGING,false); stack.set(QOLDataComponents.DIGGING, enable); - p.displayClientMessage(Component.literal("Digging : ").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.digging_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } public static void mineBlock(BlockEvent.BreakEvent event) { @@ -132,10 +132,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.literal("Digging : ") + components.add(Component.translatable("createqol.function.tools.digging") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING, false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java index d1961cf..e44f179 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java @@ -67,10 +67,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.literal("Digging : ") + components.add(Component.translatable("createqol.function.tools.digging") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -93,12 +93,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.digging.get()){ - p.displayClientMessage(Component.literal("Digging is disabled by the config").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.digging_disabled").withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.DIGGING,false); stack.set(QOLDataComponents.DIGGING, enable); - p.displayClientMessage(Component.literal("Digging : ").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(Component.translatable("createqol.tool.digging_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java index 9c3c6fa..06afad6 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java @@ -129,10 +129,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.literal("Reach : ") + components.add(Component.translatable("createqol.function.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.literal("Repulsion : ") + components.add(Component.translatable("createqol.function.tools.repulsion") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java b/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java index 1fc45a1..9c4c459 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java @@ -209,12 +209,12 @@ public ValueEntry getWidget(Configuration config) { } static Component chooseState(boolean config, boolean installed, boolean active, boolean activeReplaceInstall, boolean activeOnly){ - if (activeOnly) return Component.literal(!config ? "Disabled By Config" : (active ? "Enable" : "Disable")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); - return Component.literal(!config ? "Disabled By Config" : (installed ? (activeReplaceInstall ? (active ? "Enable" : "Disable") : "Installed") : "Not Installed")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); + if (activeOnly) return Component.translatable(!config ? "createqol.function.state.disabled_by_config" : (active ? "createqol.function.state.enabled" : "createqol.function.state.disabled")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); + return Component.translatable(!config ? "createqol.function.state.disabled_by_config" : (installed ? (activeReplaceInstall ? (active ? "createqol.function.state.enabled" : "createqol.function.state.disabled") : "createqol.function.state.installed") : "createqol.function.state.not_installed")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); } static Component cooldownState(boolean config, boolean active, int cooldown){ - return Component.literal(!config ? "Disabled By Config" : (active ? (cooldown > 0 ? cooldown / 20 + "s" : "Enable") : "Disable")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); + return !config ? Component.translatable("createqol.function.state.disabled_by_config").withStyle(ChatFormatting.RED) : (active ? (cooldown > 0 ? Component.literal(String.valueOf(cooldown / 20)).append(Component.translatable("createqol.function.state.seconds")).withStyle(ChatFormatting.YELLOW) : Component.translatable("createqol.function.state.enabled")).withStyle(ChatFormatting.YELLOW) : Component.translatable("createqol.function.state.disabled")).withStyle(ChatFormatting.YELLOW); } } diff --git a/src/main/resources/assets/createqol/lang/en_us.json b/src/main/resources/assets/createqol/lang/en_us.json index 4b24ed5..164572c 100644 --- a/src/main/resources/assets/createqol/lang/en_us.json +++ b/src/main/resources/assets/createqol/lang/en_us.json @@ -221,9 +221,80 @@ "createqol.statue.locked": "This statue is locked ! Only the owner can modify it.", "createqol.statue.name_utility": "The name is used when you share the animation. It won't be kept if you close the gui.", + "createqol.backtank.propeller_disabled": "Propellers are disabled by the config", + "createqol.backtank.elytra_disabled": "Elytra are disabled by the config", + "createqol.chestplate.use_fireworks": "Can be used as a boost with the shadow radiance chestplate by keeping pressed the jump key.", "createqol.chestplate.no_propeller": "You can't switch the fan/hover because the chestplate doesn't have a propeller installed.", "createqol.chestplate.no_elytra": "You can't switch the elytra because the chestplate doesn't have elytra installed", + "createqol.chestplate.propeller_disabled": "Propeller is disabled by the config", + "createqol.chestplate.fan_unavailable": "Fan can't be enabled if the elytra are enabled", + "createqol.chestplate.hover_disabled": "Hover is disabled by the config", + "createqol.chestplate.elytra_disabled": "Elytra are disabled by the config", + "createqol.chestplate.elytra_unavailable": "Elytra can't be enabled if the fans is enabled", + "createqol.chestplate.fan_toggle": "Fan : ", + "createqol.chestplate.hover_toggle": "Hover : ", + "createqol.chestplate.elytra_toggle": "Elytra : ", + "createqol.chestplate.dash_disabled": "Dashing is disabled on this server !", + "createqol.chestplate.dash_reloading": "Dashing is reloading, please wait!", + + "createqol.tool.casingifier_disabled": "Casingifier is disabled by the config", + "createqol.tool.casingifier_unavailable": "Casingifier can't be enabled if tree decapitation is enabled", + "createqol.tool.digging_disabled": "Digging is disabled by the config", + "createqol.tool.digging_unavailable": "Digging can't be enabled if vein mine is enabled", + "createqol.tool.harvesting_disabled": "Harvesting is disabled by the config", + "createqol.tool.harvesting_unavailable": "Harvesting can't be enabled if ploughing is enabled", + "createqol.tool.ploughing_disabled": "Ploughing is disabled by the config", + "createqol.tool.ploughing_unavailable": "Ploughing can't be enabled if harvesting is enabled", + "createqol.tool.smelting_disabled": "Smelting is disabled by the config", + "createqol.tool.smelting_unavailable": "Smelting can't be enabled if digging is enabled", + "createqol.tool.tree_decapitation_disabled": "Tree Decapitation is disabled by the config", + "createqol.tool.tree_decapitation_unavailable": "Tree Decapitation can't be enabled if casingifier is enabled", + "createqol.tool.vein_mine_disabled": "Vein Mine is disabled by the config", + "createqol.tool.vein_mine_unavailable": "Vein Mine can't be enabled if digging is enabled", + + "createqol.tool.casingifier_toggle": "Casingifier : ", + "createqol.tool.digging_toggle": "Digging : ", + "createqol.tool.harvesting_toggle": "Harvesting : ", + "createqol.tool.ploughing_toggle": "Ploughing : ", + "createqol.tool.reach_toggle": "Reach : ", + "createqol.tool.smelting_toggle": "Smelting : ", + "createqol.tool.tree_decapitation_toggle": "Tree Decapitation : ", + "createqol.tool.vein_mine_toggle": "Vein Mine : ", + + "createqol.function.armor.air": "Air : ", + "createqol.function.armor.arms": "Arms : ", + "createqol.function.armor.belt_blocking": "Belt Blocking : ", + "createqol.function.armor.dash": "Dash : ", + "createqol.function.armor.diving": "Diving : ", + "createqol.function.armor.effect": "Effect : ", + "createqol.function.armor.elytra": "Elytra : ", + "createqol.function.armor.fan": "Fan : ", + "createqol.function.armor.goggles": "Goggles : ", + "createqol.function.armor.hover": "Hover : ", + "createqol.function.armor.lava_walking": "Lava Walking : ", + "createqol.function.armor.propeller": "Propeller : ", + "createqol.function.armor.step_height": "Step Height : ", + "createqol.function.armor.void_walk": "Void Walk : ", + + "createqol.function.tools.attraction": "Attraction : ", + "createqol.function.tools.casingifier": "Casingifier : ", + "createqol.function.tools.digging": "Digging : ", + "createqol.function.tools.harvesting": "Harvesting : ", + "createqol.function.tools.ploughing": "Ploughing : ", + "createqol.function.tools.reach": "Reach : ", + "createqol.function.tools.repulsion_attraction": "Repulsion/Attraction : ", + "createqol.function.tools.repulsion": "Repulsion : ", + "createqol.function.tools.smelting": "Smelting : ", + "createqol.function.tools.tree_decapitation": "Tree Decapitation : ", + "createqol.function.tools.vein_mine": "Vein Mine : ", + + "createqol.function.state.disabled_by_config": "Disabled By Config", + "createqol.function.state.disabled": "Disable", + "createqol.function.state.enabled": "Enable", + "createqol.function.state.installed": "Installed", + "createqol.function.state.not_installed": "Not Installed", + "createqol.function.state.seconds": "s", "createqol.ponder.ender_packager.header": "Transfer packages remotely", "createqol.ponder.ender_packager.text_1": "Placing items in the two slots can specify a Frequency", diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 0cf63c3..3f03d28 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -221,9 +221,80 @@ "createqol.statue.locked": "Манекен заблокирован! Только владелец может его изменить.", "createqol.statue.name_utility": "Название отображается в разделе опубликованных анимаций. Оно не сохранится, если закрыть интерфейс до публикации.", + "createqol.backtank.propeller_disabled": "Установка пропеллера недоступна: режимы пропеллерной тяги и парения запрещены настройками мира/сервера", + "createqol.backtank.elytra_disabled": "Установка элитр недоступна: режим полёта запрещён настройками мира/сервера", + "createqol.chestplate.use_fireworks": "Находясь в инвентаре, может быть использован для ускорения полёта, когда надет нагрудник из пост-хроматического сплава, оснащённый элитрами — для этого зажмите [Пробел], находясь в режиме полёта.", "createqol.chestplate.no_propeller": "Режимы пропеллерной тяги и парения недоступны: баллон не оснащён пропеллером", "createqol.chestplate.no_elytra": "Режим полёта недоступен: баллон не оснащён элитрами", + "createqol.chestplate.propeller_disabled": "Режимы пропеллерной тяги и парения запрещены настройками мира/сервера", + "createqol.chestplate.fan_unavailable": "Режим пропеллерной тяги недоступен при активном режиме полёта", + "createqol.chestplate.hover_disabled": "Режим парения запрещён настройками мира/сервера", + "createqol.chestplate.elytra_disabled": "Режим полёта запрещён настройками мира/сервера", + "createqol.chestplate.elytra_unavailable": "Режим полёта недоступен при активном режиме пропеллерной тяги", + "createqol.chestplate.fan_toggle": "Режим пропеллерной тяги: ", + "createqol.chestplate.hover_toggle": "Режим парения: ", + "createqol.chestplate.elytra_toggle": "Режим полёта: ", + "createqol.chestplate.dash_disabled": "Функция рывка запрещена настройками мира/сервера", + "createqol.chestplate.dash_reloading": "Рывок перезаряжается...", + + "createqol.tool.casingifier_disabled": "Режим корпусификатора запрещён настройками мира/сервера", + "createqol.tool.casingifier_unavailable": "Режим корпусификатора недоступен при активном режиме лесоруба", + "createqol.tool.digging_disabled": "Режим расширенного копания запрещён настройками мира/сервера", + "createqol.tool.digging_unavailable": "Режим расширенного копания недоступен при активном режиме добычи залежи", + "createqol.tool.harvesting_disabled": "Режим автопосадки запрещён настройками мира/сервера", + "createqol.tool.harvesting_unavailable": "Режим автопосадки недоступен при активном режиме расширенной вспашки", + "createqol.tool.ploughing_disabled": "Режим расширенной вспашки запрещён настройками мира/сервера", + "createqol.tool.ploughing_unavailable": "Режим расширенной вспашки недоступен при активном режиме автопосадки", + "createqol.tool.smelting_disabled": "Режим автопереплавки запрещён настройками мира/сервера", + "createqol.tool.smelting_unavailable": "Режим автопереплавки недоступен при активном режиме расширенного копания", + "createqol.tool.tree_decapitation_disabled": "Режим лесоруба запрещён настройками мира/сервера", + "createqol.tool.tree_decapitation_unavailable": "Режим лесоруба недоступен при активном режиме корпусификатора", + "createqol.tool.vein_mine_disabled": "Режим добычи залежи запрещён настройками мира/сервера", + "createqol.tool.vein_mine_unavailable": "Режим добычи залежи недоступен при активном режиме расширенного копания", + + "createqol.tool.casingifier_toggle": "Режим корпусификатора: ", + "createqol.tool.digging_toggle": "Режим расширенного копания: ", + "createqol.tool.harvesting_toggle": "Режим автопосадки: ", + "createqol.tool.ploughing_toggle": "Режим расширенной вспашки: ", + "createqol.tool.reach_toggle": "Режим повышенной досягаемости: ", + "createqol.tool.smelting_toggle": "Режим автопереплавки: ", + "createqol.tool.tree_decapitation_toggle": "Режим лесоруба: ", + "createqol.tool.vein_mine_toggle": "Режим добычи залежи: ", + + "createqol.function.armor.air": "Воздух: ", + "createqol.function.armor.arms": "Рукава: ", + "createqol.function.armor.belt_blocking": "Сопротивление конвейерам: ", + "createqol.function.armor.dash": "Рывок: ", + "createqol.function.armor.diving": "Водолаз: ", + "createqol.function.armor.effect": "Эффект: ", + "createqol.function.armor.elytra": "Элитры: ", + "createqol.function.armor.fan": "Пропеллерная тяга: ", + "createqol.function.armor.goggles": "Инженерные очки: ", + "createqol.function.armor.hover": "Парение: ", + "createqol.function.armor.lava_walking": "Лаволаз: ", + "createqol.function.armor.propeller": "Пропеллер: ", + "createqol.function.armor.step_height": "Высокий шаг: ", + "createqol.function.armor.void_walk": "Левитация над бездной: ", + + "createqol.function.tools.attraction": "Притяжение: ", + "createqol.function.tools.casingifier": "Корпусификатор: ", + "createqol.function.tools.digging": "Расширенное копание: ", + "createqol.function.tools.harvesting": "Автопосадка: ", + "createqol.function.tools.ploughing": "Расширенная вспашка: ", + "createqol.function.tools.reach": "Досягаемость: ", + "createqol.function.tools.repulsion_attraction": "Отталкивание/притяжение: ", + "createqol.function.tools.repulsion": "Отталкивание: ", + "createqol.function.tools.smelting": "Автопереплавка: ", + "createqol.function.tools.tree_decapitation": "Лесоруб: ", + "createqol.function.tools.vein_mine": "Добыча залежи: ", + + "createqol.function.state.disabled_by_config": "запрещ.", + "createqol.function.state.disabled": "выкл.", + "createqol.function.state.enabled": "вкл.", + "createqol.function.state.installed": "уст.", + "createqol.function.state.not_installed": "не уст.", + "createqol.function.state.seconds": "с", "createqol.ponder.ender_packager.header": "Телепортацией коробок", "createqol.ponder.ender_packager.text_1": "Поместите предметы в два слота, чтобы указать частоту", From c88b926a180ca4ac05758c2fbb5f9c9f68c2fbfd Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:57:59 +0300 Subject: [PATCH 05/13] Dehardcode config screens strings --- .../client/screens/itemsconfig/InventoryConfigScreen.java | 4 ++-- .../client/screens/itemsconfig/ItemConfigScreen.java | 4 ++-- .../client/screens/itemsconfig/TooltipsConfigScreen.java | 8 ++++---- src/main/resources/assets/createqol/lang/en_us.json | 8 ++++++++ src/main/resources/assets/createqol/lang/ru_ru.json | 8 ++++++++ 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/InventoryConfigScreen.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/InventoryConfigScreen.java index 964f164..7faeb4e 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/InventoryConfigScreen.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/InventoryConfigScreen.java @@ -68,7 +68,7 @@ protected void init() { ItemConfigButton btn = new ItemConfigButton(guiLeft + 112-28,guiTop + 84, b->Minecraft.getInstance().setScreen(new ItemConfigScreen(40)),40); btn = btn.showing(player.getInventory().getItem(40)); addRenderableWidget(btn); - int boxWidth = font.width("Choose an item to configure") + 10; + int boxWidth = font.width(Component.translatable("createqol.gui.inventory_config_screen.title")) + 10; int boxHeight = 19; int boxPadding = 4; BoxWidget title = new BoxWidget(width / 2 - boxWidth / 2, height / 2 - 130, boxWidth, boxHeight) @@ -101,7 +101,7 @@ protected void renderWindow(GuiGraphics graphics, int mouseX, int mouseY, float //graphics.fill(guiLeft + 24, guiTop - 2 , guiLeft + 106-24, guiTop + 106,0xff00ff00); InventoryScreen.renderEntityInInventoryFollowsMouse(graphics, guiLeft + 24, guiTop - 2 , guiLeft + 106-24,guiTop + 106, 48, 0.05F, mouseX, mouseY, this.minecraft.player); - graphics.drawCenteredString(font, "Choose an item to configure", width / 2, height / 2 - 125, UIRenderHelper.COLOR_TEXT_STRONG_ACCENT.getFirst().getRGB()); + graphics.drawCenteredString(font, Component.translatable("createqol.gui.inventory_config_screen.title"), width / 2, height / 2 - 125, UIRenderHelper.COLOR_TEXT_STRONG_ACCENT.getFirst().getRGB()); AtomicReference button = new AtomicReference<>(); children().stream().filter(c->c instanceof ItemConfigButton).map(ItemConfigButton.class::cast).forEach(btn->{ if (btn.isHovered() && btn.active) button.set(btn); diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/ItemConfigScreen.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/ItemConfigScreen.java index 906bd5f..239c146 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/ItemConfigScreen.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/ItemConfigScreen.java @@ -84,7 +84,7 @@ protected void init() { goBack.showingElement(PonderGuiTextures.ICON_CONFIG_BACK.asStencil() .withElementRenderer(BoxWidget.gradientFactory.apply(goBack))); goBack.getToolTip() - .add(Component.literal("Go Back")); + .add(Component.translatable("createqol.gui.config_screen.go_back")); addRenderableWidget(goBack); if (item.has(QOLDataComponents.ITEM_TOOLTIPS)) list.children().add(new TooltipButtonEntry("Tooltips","Open the config menu to choose which tooltips are displayed")); @@ -151,7 +151,7 @@ protected void endFrame() { protected void renderWindow(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { int x = width / 2; - graphics.drawCenteredString(minecraft.font, Component.literal("Configure " ).append(item.getHoverName()) , x, 15, UIRenderHelper.COLOR_TEXT.getFirst().getRGB()); + graphics.drawCenteredString(minecraft.font, Component.translatable("createqol.gui.item_config_screen.title", item.getHoverName()), x, 15, UIRenderHelper.COLOR_TEXT.getFirst().getRGB()); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/TooltipsConfigScreen.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/TooltipsConfigScreen.java index b0aa9f1..d805ba3 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/TooltipsConfigScreen.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/itemsconfig/TooltipsConfigScreen.java @@ -85,7 +85,7 @@ protected void init() { goBack.showingElement(PonderGuiTextures.ICON_CONFIG_BACK.asStencil() .withElementRenderer(BoxWidget.gradientFactory.apply(goBack))); goBack.getToolTip() - .add(Component.literal("Go Back")); + .add(Component.translatable("createqol.gui.config_screen.go_back")); addRenderableWidget(goBack); ItemTooltips tooltips = item.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS,ItemTooltips.DEFAULT); @@ -101,7 +101,7 @@ protected void init() { enableAll.showingElement(AllIcons.I_CONFIRM.asStencil() .withElementRenderer(BoxWidget.gradientFactory.apply(enableAll))); enableAll.getToolTip() - .add(Component.literal("Enable All")); + .add(Component.translatable("createqol.gui.tooltips_config_screen.enable_all")); addRenderableWidget(enableAll); @@ -112,7 +112,7 @@ protected void init() { disableAll.showingElement(AllIcons.I_DISABLE.asStencil() .withElementRenderer(BoxWidget.gradientFactory.apply(disableAll))); disableAll.getToolTip() - .add(Component.literal("Disable All")); + .add(Component.translatable("createqol.gui.tooltips_config_screen.disable_all")); addRenderableWidget(disableAll); @@ -155,7 +155,7 @@ protected void endFrame() { protected void renderWindow(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) { int x = width / 2; - graphics.drawCenteredString(minecraft.font, Component.literal("Configure " ).append(item.getHoverName()).append(" Tooltips") , x, 15, UIRenderHelper.COLOR_TEXT.getFirst().getRGB()); + graphics.drawCenteredString(minecraft.font, Component.translatable("createqol.gui.tooltips_config_screen.title", item.getHoverName()), x, 15, UIRenderHelper.COLOR_TEXT.getFirst().getRGB()); } diff --git a/src/main/resources/assets/createqol/lang/en_us.json b/src/main/resources/assets/createqol/lang/en_us.json index 164572c..4bf9fba 100644 --- a/src/main/resources/assets/createqol/lang/en_us.json +++ b/src/main/resources/assets/createqol/lang/en_us.json @@ -342,4 +342,12 @@ "createqol.gui.stock_manager.add_user": "Add to network", "createqol.logistically_linked.tuned_to": "Tuned to %s" + "createqol.logistically_linked.tuned_to": "Tuned to %s", + + "createqol.gui.config_screen.go_back": "Go Back", + "createqol.gui.inventory_config_screen.title": "Choose an item to configure", + "createqol.gui.item_config_screen.title": "Configure %s", + "createqol.gui.tooltips_config_screen.enable_all": "Enable All", + "createqol.gui.tooltips_config_screen.disable_all": "Disable All", + "createqol.gui.tooltips_config_screen.title": "Configure %s Tooltips", } \ No newline at end of file diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 3f03d28..a42b951 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -342,4 +342,12 @@ "createqol.gui.stock_manager.add_user": "Нанять", "createqol.logistically_linked.tuned_to": "Подключено к сети %s" + "createqol.logistically_linked.tuned_to": "Подключено к сети %s", + + "createqol.gui.config_screen.go_back": "Назад", + "createqol.gui.inventory_config_screen.title": "Выберите настраиваемый предмет", + "createqol.gui.item_config_screen.title": "Настройка предмета «%s»", + "createqol.gui.tooltips_config_screen.enable_all": "Включить все подсказки", + "createqol.gui.tooltips_config_screen.disable_all": "Отключить все подсказки", + "createqol.gui.tooltips_config_screen.title": "Настройка подсказок предмета «%s»", } \ No newline at end of file From 8878bc56b89cb5855ad9f5c5f2e94adebbcf4331 Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Thu, 28 Aug 2025 17:01:36 +0300 Subject: [PATCH 06/13] Dehardcode display board edit screen strings --- .../client/screens/DisplayBoardEditScreen.java | 10 +++++----- src/main/resources/assets/createqol/lang/en_us.json | 3 ++- src/main/resources/assets/createqol/lang/ru_ru.json | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/fr/iglee42/createqualityoflife/client/screens/DisplayBoardEditScreen.java b/src/main/java/fr/iglee42/createqualityoflife/client/screens/DisplayBoardEditScreen.java index 671b18b..811821b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/client/screens/DisplayBoardEditScreen.java +++ b/src/main/java/fr/iglee42/createqualityoflife/client/screens/DisplayBoardEditScreen.java @@ -7,6 +7,7 @@ import com.simibubi.create.foundation.gui.widget.Indicator; import com.simibubi.create.foundation.gui.widget.Label; import com.simibubi.create.foundation.gui.widget.SelectionScrollInput; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.packets.ConfigureDisplayBoardPacket; import fr.iglee42.createqualityoflife.registries.QOLGuiTextures; import net.createmod.catnip.gui.AbstractSimiScreen; @@ -67,7 +68,7 @@ protected void init() { glowingButton.setIcon(glowingIndicator.state == Indicator.State.OFF ? AllIcons.I_FX_SURFACE_ON : AllIcons.I_FX_SURFACE_OFF); glowingIndicator.state = glowingIndicator.state == Indicator.State.OFF ? Indicator.State.GREEN : Indicator.State.OFF; }); - glowingButton.setToolTip(Component.literal("Glowing")); + glowingButton.setToolTip(CreateQOLLang.translateDirect("gui.display_board.glowing")); glowingIndicator = new Indicator(guiLeft + 53,guiTop + 64,Component.empty()); glowingIndicator.state = be.glowingLines[lineIndex] ? Indicator.State.GREEN : Indicator.State.OFF; @@ -77,10 +78,9 @@ protected void init() { colorScrollInput = new SelectionScrollInput(guiLeft + 144, guiTop + 49, 55, 16); colorScrollInputLabel = new Label(guiLeft + 144, guiTop + 52, Component.empty()).withShadow(); - colorScrollInput.forOptions(Arrays.stream(DyeColor.values()).map(DyeColor::getSerializedName).map(s->{ - String firstLetter = String.valueOf(s.charAt(0)).toUpperCase(); - return firstLetter + s.substring(1).replace("_"," "); - }).map(s->Component.literal(s).withStyle(Style.EMPTY.withColor(DyeColor.byName(!s.equals("Black") ?s.replace(" ","_").toLowerCase() : "gray",DyeColor.WHITE).getTextColor()))).toList()).calling(i->{ + colorScrollInput.forOptions(Arrays.stream(DyeColor.values()).map(DyeColor::getSerializedName) + .map(s -> Component.translatable("color.minecraft." + s.toLowerCase()) + .withStyle(Style.EMPTY.withColor(DyeColor.byName(!s.equals("black") ?s.toLowerCase() : "gray",DyeColor.WHITE).getTextColor()))).toList()).calling(i->{ DyeColor color = DyeColor.byId(i); colorScrollInputLabel.colored(color != DyeColor.BLACK ? color.getTextColor() : DyeColor.GRAY.getTextColor()); }).writingTo(colorScrollInputLabel); diff --git a/src/main/resources/assets/createqol/lang/en_us.json b/src/main/resources/assets/createqol/lang/en_us.json index 4bf9fba..7daa536 100644 --- a/src/main/resources/assets/createqol/lang/en_us.json +++ b/src/main/resources/assets/createqol/lang/en_us.json @@ -341,7 +341,6 @@ "createqol.gui.stock_manager.remove_user": "Remove from network", "createqol.gui.stock_manager.add_user": "Add to network", - "createqol.logistically_linked.tuned_to": "Tuned to %s" "createqol.logistically_linked.tuned_to": "Tuned to %s", "createqol.gui.config_screen.go_back": "Go Back", @@ -350,4 +349,6 @@ "createqol.gui.tooltips_config_screen.enable_all": "Enable All", "createqol.gui.tooltips_config_screen.disable_all": "Disable All", "createqol.gui.tooltips_config_screen.title": "Configure %s Tooltips", + + "createqol.gui.display_board.glowing": "Glowing", } \ No newline at end of file diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index a42b951..4a6240d 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -341,7 +341,6 @@ "createqol.gui.stock_manager.remove_user": "Уволить", "createqol.gui.stock_manager.add_user": "Нанять", - "createqol.logistically_linked.tuned_to": "Подключено к сети %s" "createqol.logistically_linked.tuned_to": "Подключено к сети %s", "createqol.gui.config_screen.go_back": "Назад", @@ -350,4 +349,6 @@ "createqol.gui.tooltips_config_screen.enable_all": "Включить все подсказки", "createqol.gui.tooltips_config_screen.disable_all": "Отключить все подсказки", "createqol.gui.tooltips_config_screen.title": "Настройка подсказок предмета «%s»", + + "createqol.gui.display_board.glowing": "Светящийся", } \ No newline at end of file From ba1031e5b534d989bb000feece1891e06bf6c602 Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Thu, 28 Aug 2025 17:04:35 +0300 Subject: [PATCH 07/13] Dehardcode the warning message string, split in two for easier editing --- src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java | 2 +- src/main/resources/assets/createqol/lang/en_us.json | 3 +++ src/main/resources/assets/createqol/lang/ru_ru.json | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java b/src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java index 4e6dda6..1cb0da2 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java +++ b/src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java @@ -195,7 +195,7 @@ private void playerJoin(PlayerEvent.PlayerLoggedInEvent event){ ServerPlayer player = (ServerPlayer) p; if (!p.hasPermissions(1)) return; if (isActivate(Features.STOCK_MANAGER) && CreateQOLConfigs.server().experimentalWarning.get()) - player.displayClientMessage(Component.literal("Warning: Stock Manager is a beta feature, some bugs and crash might appear.\nPlease report them on https://issues-qol.iglee.fr").withStyle(ChatFormatting.YELLOW),false); + player.displayClientMessage(CreateQOLLang.translateDirect("client_message.header").withStyle(ChatFormatting.YELLOW).append(CreateQOLLang.translateDirect("client_message.warning").withStyle(ChatFormatting.WHITE)),false); } diff --git a/src/main/resources/assets/createqol/lang/en_us.json b/src/main/resources/assets/createqol/lang/en_us.json index 7daa536..5685760 100644 --- a/src/main/resources/assets/createqol/lang/en_us.json +++ b/src/main/resources/assets/createqol/lang/en_us.json @@ -351,4 +351,7 @@ "createqol.gui.tooltips_config_screen.title": "Configure %s Tooltips", "createqol.gui.display_board.glowing": "Glowing", + + "createqol.client_message.header": "[Create: Quality Of Life]: ", + "createqol.client_message.warning": "Warning: Stock Manager is a beta feature, some bugs and crash might appear.\nPlease report them on https://issues-qol.iglee.fr" } \ No newline at end of file diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 4a6240d..f54bf5d 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -351,4 +351,7 @@ "createqol.gui.tooltips_config_screen.title": "Настройка подсказок предмета «%s»", "createqol.gui.display_board.glowing": "Светящийся", + + "createqol.client_message.header": "[Create: Quality Of Life]: ", + "createqol.client_message.warning": "Складской распорядитель находится на ранней стадии разработки — его использование может привести к сбоям игры;\n в случае обнаружения неисправности сообщите о ней на https://issues-qol.iglee.fr" } \ No newline at end of file From ef624dc9f616c85a0a736164d8f50287a6d59ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?igl=C3=A9e42?= Date: Wed, 27 Aug 2025 15:25:41 +0200 Subject: [PATCH 08/13] Fixes before release --- .../createqualityoflife/CreateQOLClient.java | 5 ++- .../items/PlayerPaperItem.java | 2 +- .../items/armors/ShadowRadianceArmorItem.java | 35 ++++++++++++++++++ .../RefinedRadiancePickaxe.java | 2 +- .../textures/block/inventory_linker.png | Bin 3474 -> 2448 bytes .../item/refined_radiance_axe_special.png | Bin 0 -> 597 bytes .../item/refined_radiance_hoe_special.png | Bin 0 -> 580 bytes .../item/refined_radiance_pickaxe_special.png | Bin 0 -> 567 bytes .../item/refined_radiance_shovel_special.png | Bin 0 -> 556 bytes .../createqol/textures/item/secret_hoe.png | Bin 0 -> 778 bytes .../textures/item/secret_hoe.png.mcmeta | 11 ++++++ .../item/shadow_radiance_axe_special.png | Bin 0 -> 596 bytes .../item/shadow_radiance_axe_special_2.png | Bin 0 -> 620 bytes .../shadow_radiance_axe_special_2.png.mcmeta | 10 +++++ .../item/shadow_radiance_hoe_special.png | Bin 0 -> 534 bytes .../item/shadow_radiance_hoe_special_2.png | Bin 0 -> 580 bytes .../item/shadow_radiance_pickaxe_special.png | Bin 0 -> 557 bytes .../shadow_radiance_pickaxe_special_2.png | Bin 0 -> 567 bytes .../item/shadow_radiance_shovel_special.png | Bin 0 -> 542 bytes .../item/shadow_radiance_shovel_special_2.png | Bin 0 -> 540 bytes .../item/shadow_steel_axe_special.png | Bin 0 -> 644 bytes .../item/shadow_steel_axe_special.png.mcmeta | 10 +++++ .../item/shadow_steel_hoe_special.png | Bin 0 -> 556 bytes .../item/shadow_steel_pickaxe_special.png | Bin 0 -> 580 bytes .../item/shadow_steel_shovel_special.png | Bin 0 -> 560 bytes 25 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/createqol/textures/item/refined_radiance_axe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/refined_radiance_hoe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/refined_radiance_pickaxe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/refined_radiance_shovel_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/secret_hoe.png create mode 100644 src/main/resources/assets/createqol/textures/item/secret_hoe.png.mcmeta create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_axe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_axe_special_2.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_axe_special_2.png.mcmeta create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_hoe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_hoe_special_2.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_pickaxe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_pickaxe_special_2.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_shovel_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_radiance_shovel_special_2.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_steel_axe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_steel_axe_special.png.mcmeta create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_steel_hoe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_steel_pickaxe_special.png create mode 100644 src/main/resources/assets/createqol/textures/item/shadow_steel_shovel_special.png diff --git a/src/main/java/fr/iglee42/createqualityoflife/CreateQOLClient.java b/src/main/java/fr/iglee42/createqualityoflife/CreateQOLClient.java index e0bc64c..82546ab 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/CreateQOLClient.java +++ b/src/main/java/fr/iglee42/createqualityoflife/CreateQOLClient.java @@ -10,6 +10,7 @@ import fr.iglee42.createqualityoflife.client.renderer.ArmorsArmsRenderer; import fr.iglee42.createqualityoflife.client.renderer.EnderRenderer; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; +import fr.iglee42.createqualityoflife.items.armors.ShadowRadianceArmorItem; import fr.iglee42.createqualityoflife.items.armors.ShadowRadianceChestplate; import fr.iglee42.createqualityoflife.items.armors.ShadowSteelArmorItem; import fr.iglee42.createqualityoflife.ponder.QOLPonderPlugin; @@ -220,7 +221,7 @@ public static void onLivingJump(LivingEvent.LivingJumpEvent event) { if (!(event.getEntity() instanceof LocalPlayer player)) return; ItemStack legs = player.getItemBySlot(EquipmentSlot.LEGS); - if (!(legs.getItem() instanceof ShadowSteelArmorItem)) return; + if (!(legs.getItem() instanceof ShadowSteelArmorItem) && !(legs.getItem() instanceof ShadowRadianceArmorItem)) return; if (!CreateQOLConfigs.server().equipments.armors.voidWalking.get()) return; if (!legs.getOrDefault(QOLDataComponents.VOID_WALK,true))return; @@ -245,7 +246,7 @@ public static void onPlayerTick(PlayerTickEvent.Post event) { if (player.getAbilities().flying) return; ItemStack legs = player.getItemBySlot(EquipmentSlot.LEGS); - if (!(legs.getItem() instanceof ShadowSteelArmorItem)) return; + if (!(legs.getItem() instanceof ShadowSteelArmorItem) && !(legs.getItem() instanceof ShadowRadianceArmorItem)) return; if (!CreateQOLConfigs.server().equipments.armors.voidWalking.get()) return; if (!legs.getOrDefault(QOLDataComponents.VOID_WALK,true))return; diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/PlayerPaperItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/PlayerPaperItem.java index 9090b57..6fa7b73 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/PlayerPaperItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/PlayerPaperItem.java @@ -42,7 +42,7 @@ public InteractionResultHolder use(Level p_41432_, Player player, Int @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (stack.has(QOLDataComponents.LINKED_PLAYER)){ - components.add(Component.translatable("tooltip.createqol.player_paper.linked_player",p_41422_.level().getPlayerByUUID(stack.get(QOLDataComponents.LINKED_PLAYER)).getName())); + if (p_41422_ != null && p_41422_.level() != null && p_41422_.level().getPlayerByUUID(stack.get(QOLDataComponents.LINKED_PLAYER)) != null) components.add(Component.translatable("tooltip.createqol.player_paper.linked_player",p_41422_.level().getPlayerByUUID(stack.get(QOLDataComponents.LINKED_PLAYER)).getName())); } else { components.add(Component.translatable("tooltip.createqol.player_paper.no_linked_player")); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java index 618530b..c3e08ca 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java @@ -18,6 +18,7 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlotGroup; import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.item.ArmorItem; @@ -28,8 +29,10 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.Nullable; +import java.util.AbstractMap; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.function.Consumer; public class ShadowRadianceArmorItem extends BaseArmorItem implements QOLConfigurableItem { @@ -62,6 +65,15 @@ public void appendHoverText(ItemStack stack, TooltipContext p_339594_, List> list, ItemStack stack) { List.of("You won't be pushed by belt if enabled"), (e,oE)->true )); + }else if (getType() == ArmorItem.Type.LEGGINGS){ + list.add(Configuration.ofBool("Void Walking", + stack.getOrDefault(QOLDataComponents.VOID_WALK,true), + QOLDataComponents.VOID_WALK, + List.of("Enable walking on void"), + (e,oE)-> CreateQOLConfigs.server().equipments.armors.voidWalking.get() + )); + list.add(Configuration.ofBool("Enable Step Height", + stack.getOrDefault(QOLDataComponents.STEP_HEIGHT,true), + QOLDataComponents.STEP_HEIGHT, + List.of("Should the leggings add step height"), + (e,oE)->CreateQOLConfigs.server().equipments.armors.stepHeight.get() + )); } } @@ -138,4 +163,14 @@ public int getBarWidth(ItemStack stack) { public int getBarColor(ItemStack stack) { return BacktankUtil.getBarColor(stack, getMaxDamage(stack)); } + + @Override + public Map, Map.Entry> getAppliedAttributes(ItemStack stack) { + if (getType().equals(ArmorItem.Type.LEGGINGS)){ + Map, Map.Entry> map = QOLConfigurableItem.super.getAppliedAttributes(stack); + if (CreateQOLConfigs.server().equipments.armors.stepHeight.get() && stack.getOrDefault(QOLDataComponents.STEP_HEIGHT,true)) map.put(Attributes.STEP_HEIGHT,new AbstractMap.SimpleEntry<>(0.5, AttributeModifier.Operation.ADD_VALUE)); + return map; + } + return QOLConfigurableItem.super.getAppliedAttributes(stack); + } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java index 02d1178..9b4d216 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java @@ -123,7 +123,7 @@ public int getBarColor(ItemStack stack) { public static void mineBlock(BlockEvent.BreakEvent event){ if (event.getLevel().isClientSide())return; if (event.isCanceled()) return; - if (!event.getPlayer().getMainHandItem().is(QOLItems.REFINED_RADIANCE_PICKAXE.get())) return; + if (!event.getPlayer().getMainHandItem().is(QOLItems.REFINED_RADIANCE_PICKAXE.get()) && !event.getPlayer().getMainHandItem().is(QOLItems.SHADOW_RADIANCE_PICKAXE.get())) return; if (!event.getPlayer().getMainHandItem().getOrDefault(QOLDataComponents.VEIN_MINE,false)) return; if (!event.getPlayer().getMainHandItem().isCorrectToolForDrops(event.getState())) return; int max = CreateQOLConfigs.server().equipments.tools.veinMineMaxBlocks.get(); diff --git a/src/main/resources/assets/createqol/textures/block/inventory_linker.png b/src/main/resources/assets/createqol/textures/block/inventory_linker.png index 7b621febff3b6769f14aa98d62689209a297bc7e..9c215c2e4100b9ce970a43b3567f97301af1108a 100644 GIT binary patch literal 2448 zcma)8dpr~B8=p&;m5@s=EjqEY#A%o0p2;P)gB(I~t(i-uV&#(CIwz8blx&QslS$^1 zA)9M8n@m`0Md`>+u1PbDZ8+2E{PX+k_kKRl`#jJ4d7k%qp6~O1p3i&T!`*q?7TqlX z0AL%+#nDs7@$0mCqila}dy*q#ayU-IiHzML8Zm79TWIvvkgO$vQ-n1(g)_-oz zEp1X|W*yObnzh;94(OM+QndVWu6f*NII&W)*!pBbbcJYjsn>U0VID}{18hMezmqLgEumjvvRPFDN8*f@_4FHn6~gGtGs-kjco6iE{fVsq8e$(*z8D> zu1;g(s=aVk6!=90gSZrtWI{^=x(U(3?#i`utBbEny7N~|#D<+M(vnmSh4z(Vs6IMc zmvSVmuCqlYNZfyQf&-_oa3!yIvYkNO`*$ixczw$?6by4K5`I-ihPVZ(!&O4rw>G1Kd@QpKFzoS^@8`9N^8k#8_3(n` zl+;Whw_I_z-a!5xfHp~eWLJ1^{=thuE|QFBM@>6-ymDxSng9LZ06Uuchoxs z$z~(Myq+5Bqz@v3B&XH?RMb|}=aAg66YuBymyWZvF$6eE8}}vNtnJIBaq!CL8lPRW zNQIoD>b^RMtJlR|HLJ|`BFG4ck5s79*`GqZw<$LZ^i$r20%vkv^`gleK~L_QMd%TE zijmx2j!Wgm!g)j z?$C?NPJNmo%r2Wozd+=$n0eIh<@SO6)IB~BPojqUHJ$I-VS1vS^-rkIOxPmovw2zP zX#3}@c2$l3O6GAH+$i1#eRLk6{!d9)ztstI#!E(jao5{MZ$msUdc!-_A^;l%>40xC zfNiK6^~L||k)}RE;wxH=b#1=Ou5)EWjC13Z&^-SKi49`7a7346q}V=4UF zJI^fz+TA&2Cz!Q?;|bZ>($Uuor_y3vL9rv@h?%oKB~x+PZMdHCe9ix`S#RIJDE)tu z>$hc&R-t~<;+(y>r&DC+z{lv&DnefCr_4tP|N83?*K|$#_3CSOzIFl9@cZLRKlQG6 z((7el_{RW8f5~YKRV~CN$pmAjsnluWI=yc;FPa4l?8fWHUaK^2f#iikXGq8UpdO<7G;IS3tIx(LsOH{g=mgtQph2(hVq zT0{SQ$%%A>%aBM|#eji}V8GaIMMSQ(RlDN8)u$>&k!8)nnj>97@yIH%`pj}# zzXe1Nl;5g}W@WtK!?S>)RunF4-o%w^j331MiVwHlHP;&;*~OVc&xwmm z7P{!TV$BfVuOqoW0CWr5igiC=bUce~`g8xTtb1x3(Ni2COop4Eo;IPN0ppgj6QtEqA<`i>sW26o)@MR^t-jrUs*&gf1li3cgkhUkuRPRCj55aQTIs8xR1 za>G&AB38twXE@O>dkO{*^2)rKM{W4t4B-Lk-)Y5*;X%6$Zoe0l*t`i??Hrg9AQ-mp zQDfQD7AKl+?&G#lu@yPLz!BlMN8g9rq~{Tvp0wUO_{bg5`nOTg#sjgl!KvQaP6!)_ z-63Q$28};&6H~GLOd-*!o_>=t641Yyd>ZcoXFU_Gb}iKDt|1lgKOP4HG2RudapG>*Y@Up+$zKB-LcZwmBF*`LEI+ znM1EEEIrc<(L*K*K5a~%q#v!ny!1kXE@`B(Foj$pUGnwx-6m1e_8BK*yYC47@Y5{S z3vQC{QET&fb8m2gfx-yZRpjwbSfSpn;c=>aCL!a@i z@PXxAk<`#}inD?}L<_1r97sVAIt~TGZ>b%|ooV;+8=w;R|8d#@Ym0f(I{v!HaQ6{@ zLa)s=RyQcDH6)WTiO`4y39)*~mg%-A9GVVgTgsW?hxQtgE8%JYE(OXC{cL%OnrAHc z-eMbV|7kCV(wlg*_7APzAdDY#cf()|m3L}q`AJ?H;c&w}KjsUY_1H>8(^TT9X%D00 yYLf2`FDuu;V}-`X5S3Hgz|KYKep~(h*AyZj2vrWWJrb|~j!;hSj@9-dzyAaLIJr0g literal 3474 zcmbVPi8s{!_y3GNdyO@OQno_MGQ%*GP}amGON25dMq?EDf81nddfnj8^DJg|h?m5SIF;hB@`&nxiea2w5FcyG ziuAnKYxlS|410i=5z4nN7Pl$ZyxLTUyymtj=4N<08dGFe+($CIk z2lYg1KvOU9&G#+cgHYV4UBd}z@~^F^1Lv--9V ^=rq(R`pNtN`uxbT+le<<;pY7 zCYdwVR(iEF-YCh!C+|JPC8-9f9>M!70U+SUhH$G282GxidnY~z4o%@2;-TC zj2Q0&_iypGrH^T6^wp;lXcHkTdNu>{_nYT}&hvGq>-vDY*XvH3Cf&INv;+c0MW`ua z_8)kXe2;#Alm`7t6WVBv+74dOq?x=EJX~v<=pF8j=t@wDuj5IN9xUhOHGVN2=^%uw zg(qE@LN)(Q+-84W0JGq^YU}UQb&sYj0ha;9&lnr3P$HER zNHf1+zntEPI_4e6poch@%agiU0F<^QN;?(=2Lrk#B}%A+T}(7SI(O0)fMaZhW8>l~ zy~m*2!T6G+=Ir~pP1S*5OCF1y1Bq|GM`h~m&*TdMcxUnPDwP`J@OC4SCeJ>LSRp#yR3b}y7J5sh14t|vb(^0ze;7SJKlzlsuar=pr2Y*y=t#2Tjq%{1hBp#sIJ|&E1mX$%p@z$HuHoc zR5ahjWNaBNAS=c@HCV2jO!tBdv2t-BZU~C;15DwTbrCie(3qi`wU2tbm6NTo7MqM6 zr{}29VE~^z)q$SVeX#hl_3x|R=xKg1fY~n?h6nN@K5Nk@%7(oBHD)+jK=ccy$qK6F zSUJZKz7w;HA!O2{E+~MzizSS zHTJqkCGKt`UHo!>Jd7G0OT;V=G(D(k_R?%QHg|Q|Q!zguTl!?-?rJ|P0m&h6XKz)O zN>v8Jlkz`n03Y@4&BuvvertBs9t*r~FkH8$g865#v>-j)GUp}dd4j)K@5J5ucacDt z4A;MwX8D^mrRTelrk=?O)jcCU#?cjKKf#lx`mp|WeP!`w=2I8um|wYbm!tr3nT&<{ipt`XrFQgY@7imEb)QbNRPP=O@UtTy&%g@d<~Tcc z%o|aQC?|3N!7IImp|2gfW0Yf)pPK!e6u zZsZ3xbDn6rK9?K-`hYoozcF03dUA{w(v-1Kb7c>Mn_rY(2ya<<^U0dyZ?kcB;MPQs zZa)ZUuEBLu+paDlf4)0e`#AH>wvgR?VL0+)goV?H5cx?JZm@|Rq1;$B|I4?c`9Xb0OBd z4h|p5=rj`nPM|(hIyUI*y}d1dxvx!bmv=^31z0mE0zE-;!Gwl6U((zFAW5Bn^_iz; zH7{zsL&C$}g4?cHOcIdP-=XH~c*k@(7scvJ8BgfGiTzDiWTr=6J}bVQC(vD_@2*6w z?jB}9FEH+*9qTqu2nM~&cb=&BJR)KLPh|gl{4E(+c*wH8O}zAd<8{~%iBj6ah)$Fs zF2xls(j0vlz|i5{>0b@tIQhvf(9pmk5lcD)0$e8XK1(?%h0`R}BgUicrsYAt#dt$d zMWfgF-T31M50W7&;=<65AzdWpEC4|8G8ehjMALijAUsTbgt)Orjm_!Sj~Tt6>$uG^ zw!S1D(LK~9-GWjE&y-ZBs1XHXG=-sTDJrXTz}H0e%K`Wh!`Re@6>$0LHv4kl?vY~O z@HtUco9uUC1$9cn>*?k2tvwL%dq@l#7!_*p5=Kpz?Vv4aUdzb%{zbsv1N*f6@D!l7 z<*NgHm~G+&fE5@R&+xpT(&Y0@J<7A=j`4<&U9?WslY&vEY?oH+cz z2En`NDwOV_TTv&s3!})H$?<8ja^|@OWn7{vTSnAiK30TL%E${|0du+e8lw+a2_Fi+ z0=eyTRv+jRvTlIMvO#|eB(#N-E<{mIouca0xnfcaYQXJg-)XCy=N(fcT?ORx4-Mh` zN_D&6kUyivIBvVY@oHCMtyl|QpA28<*6^@!?CP`V>=}o=jtd#%krVQcL97-sU}-oj z-o^MN-`KW-(CGM`Xpe{rRVb!cBrMQBgQIPoDPU<>=j%VrjiOfaDjR zF;Ywn+G@&<#o@A#;EUp5V1IS|V=N6Bfyrozth-4cXMiWyBi2f7L}>;5S8jDY-P5qJwh@C$^N}MEUdY|#!m_ML{+$WqYQRK zNk>NydCaO- zy}SBPrmECKySGf}uDUx#v}z(wr#t)lXIH56Z8W`f(ZRg^w+VUzITlaCbj8R|EK6K|ygT z13C387oOCDO$m>f1l{}G$46Ud5<}*H3QFW~wgnIEPoawx(PzufxyQkLDOm-5_id~b zG|CTdNR5K2+sCT$mwE{abhLBoP~9CfSY>BlAmQ7IH#5ve>GO2@lTq5aZ1RMZSzp28 zeW*6DJ=fzCI+VtISc?{BS4#(IZ?ci65Zl$%!~nn2)^j}kni8l_$XP;nKk2U#)t-KO>T^;zgt|F#BCg%;&BtPor`HOqn z3*^e@k2pvN`JAYK5%~mmHaNW3cUYS1+J^brQ}r+%jdbYPtHANR(m_(8F|znv8P0|J2IcY9uW0AwyEe73ghGyv=`tOeAz4)1xqNPxH&_1k@d8^0(zQ!8 z(D3;I_2^p!QSjfvQJ0R;O%#2!UpWgBVu|+n$MEEX(CZgf{)r%_M`YcZ&w(7ZOoW8J zw^;6Lz=K(%YU1vGALIuGQo(WIbwW!ewXKlLwratYFMPH7RhN(yyQ6Q)nMq4!Z9_E2 zVvZC|h3M8$H+FG!ByQTiI$n@Twg-^e@vrfTS-AUY34cfm7ta@Fg4}J` z)bH_^A+i&B6>}bf;^Jb)mYO8Z**E)+wr*rDUlj!W2WxHv7tbDX9w2sLS>z=0@h1x~ MHL|!)G;|6353fO;ga7~l diff --git a/src/main/resources/assets/createqol/textures/item/refined_radiance_axe_special.png b/src/main/resources/assets/createqol/textures/item/refined_radiance_axe_special.png new file mode 100644 index 0000000000000000000000000000000000000000..b5838aa977c3c1ce2f3e02678c6cc407b01597c7 GIT binary patch literal 597 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}-0G|-otM^X)2Z3*2e?8oNWYOENH#_5e!*Zfu@DT5 zCS2QriZ}~AB8wRq_zr_G*AN9$JwrXq zoV;6hKsDP^BRtbQJ+&A(fE-o^DMnTXMj*=zh^3)yP)KMnGK0mLfNVoXCUD3^0oj@D zEMW00AR7b{fEc77Mx$BE01V3s>gCZIV?V3k3Z z7C;tMm!W|HNY>~40T0#w>kEL)4o?@y5RG8p{y?F_3LLDNAu379i*ld-Q(r4E`CF|) zez}C3V;aM`D$WX>bJ2z}Z<;nTJepC*sp#jZ-Bqr4gyW^io<-s3ey(I|nNaJ&`6;Y~ zeZoY`iBI-U$$0dj%O_WVflc0(#YWe|Czr^HDjoUtuS8Y&@Slx)w`?!l+_mSc{A!KV eveSR=h)&c`F%c|$zm1C>=(@N7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/refined_radiance_hoe_special.png b/src/main/resources/assets/createqol/textures/item/refined_radiance_hoe_special.png new file mode 100644 index 0000000000000000000000000000000000000000..bc638d68f8c0cacbbd8a9c86a3eb66e01b445f98 GIT binary patch literal 580 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|~0G|-otM^XqKCN@JMG_L<4|5BCC%iL<=5A4rLn1o;L3#|9V}FCBOSRKZ!` z5n0T@z;_sg8IR|$NC65;l(KW=;=H%V71FG4U z8sVAd>8ZuQ0pzeUNHMZ9FalX#Kr9VqgM6>S$P5-|0#Br12Ft1ursg#RTvl<8!#?_mHn>}3|Lo|Y8&qj(JR^VU_SS#h^AhY84{j9l@<_YhU6KA~~XL?W~ z`E8E)jQ-E}a%btU;cYK>Zzy)omN=C7po*bWLSbHFv&yME&mT6ixvXNS%G}}0G|-otM^XqKCkc>!F2(+uN@&HwZ4 zdz(WqdTslExb=UuW^7#On(~6YCZHLA_m#f^Qlce6e!*Zv&*AN9$JwrXqoV;6hKsDP^BRtbQ zJ+&A(fE-o^DMnTXMj*=zh^3)ykk2(3nZe>rK(-+x6F4NIfb7h67O;30kPQL}Kn&6k zqtPs70EXQJb_N!p3Iii!1I7gqQ$add7eGv!0%U^#6VMzcu*x7y3m^-s%h138BVixj?=n3LGo}Ta?yjl*q%#LF-!v^;;x zV3-%p)$u|g>C{Y(x9&41%!tg?7d~=qW|5zbWAh0YHDN8eqfc6I`OW3$u9BX=aCL&y ze!tgTUmW(kMc-xEzxLLG4P~r%-`{0Udj9vw{#e1Cj9E|k?&Q6H6%BHcr>mdKI;Vst E0B(-4#{d8T literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/refined_radiance_shovel_special.png b/src/main/resources/assets/createqol/textures/item/refined_radiance_shovel_special.png new file mode 100644 index 0000000000000000000000000000000000000000..656ab3ba5eea67b325d7c3540a0bb44f39052add GIT binary patch literal 556 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|~0G|-otM^X)2Z3*2e?8oNWYOENH=n(`Qe`{^7D3%9=Bg_6=LKw~;}c|bObl?3?(gN;Hb7#J@dcmhO>_ z%)r2R7=#&*=dVZs3QCl?MwA5SrRIOG-LeC!*_ImN znda%K#lQjNurf$7vNA9NSzbUa4P}FTuffO+7H0yo4H=ohp%DdSXSTC|#j}8H5J&)G zkbW4AW+?;EHxt+ySb!=FjEoH!7eGt}>0n&|F=+~r4FXI+bC|#?gDfq8ET}F+0|St( z&-nu$s{Pj&0GZjIE{-7@!Lete#TpbiSOUCUx4e1#Z~Lu`v}ZNE)0stfn>b8q<8nE? z;tP9K$T1BM#pChoZI^x%EkP|#z{an^LB{Ts5MHQ(2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/secret_hoe.png b/src/main/resources/assets/createqol/textures/item/secret_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..aa4e3e939d562ddf5732a40e88b7d25810ff6fd2 GIT binary patch literal 778 zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3-o-7PBt_QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`y#stgT(90cvHQrP|Np;z{q^we*PDx0_B?xc#lpf(OUpbcD5$S@;mnyc z*R5L@6%|#G*YyAY|9P42-%saAN~@ebd-nh9o+5X{=g*(p+S&rmJN7_*Hjt7m3GxdD zs>BKy7)`jg0~K)=ctjR6Fz_7)VaDV6D^h@h5+$w?CBgY=CFO}lsSE*$nRz98ey$-3 zrh0~YmN|L1?0{;vrABzBd3tIwZ~!^13{s4&42(dQ7Z6KB*`ScnU}Of1GXdF#j7;E= zi2|}S+gZTkSwJ=jBmgl;Ka57RlmQr)6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2 zn7}H7EG>X6s4hbT1CXrG`2!xR{nr-&ZL{@saSXBW-#hvCq-F&Hm%^zJSY772{QR$f z_g$mJjpuilYVpr$R4iU)`to>CLeER9yJ-pgekH!(z9bx*F7Nz*L!M5;tVvt>A3tMS zcC>xUoM`ve30|3sGu&4*d=*)A|J&mSr3}|p?c(penkwM8-}8&PN7VF+So4B4r%!(4 zx>I$c@?i{Po?CV2uYF9l?mXEyfmN}WtQd@qFzEHNj z(Du29MHrT@cpUz7Mxg#93>tQu=HF?4{l7LtE=&H5 z^XI(_Zl1)pPY+ou9pxNS%G}-0G|+7J$0wbf}XV4itykx5k4(nkHpS+XIt~Y7)8bZKaX>>OTIbYeD&Um z-A5Mv|Nm{(rpaG_J=`%VF~`j~E-r4%)~&7{J}oURI!0DN^X4p?{})I}mIV0)|HlCs z7)`jg0~K)=ctjR6Fz_7)VaDV6D^h@h5+$w?CBgY=CFO}lsSE*$nRz98ey$-3rh0~Y zmN|L1?0{;vrABzBd3tIwZ~!^13{s4&42(dQ7Z6KB*`ScnU}Of1GXdF#j7;E=i2|}S z+gZTkSwJ=jBmgl;Ka57RlmQr)6WAG8fGP}(j13qUKuiVcU|j$)X$p`H0!%=2n7}H7 zEG>X6s4hbT1CXrG`2!xR{nr-&neCn~jv*SszWsqhhZJ~NlN%=p>4=3C{h#c`6ndZi zb6KJhV+w1+HSYtt#rL`%CW!a23LJmAUEq<>mc$_8Zcs?KBmYM(dwAQDK^=lSQ fxvKlRINZf9*-SA1gy4lLkn=oU{an^LB{Ts5zJj)A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/shadow_radiance_axe_special_2.png b/src/main/resources/assets/createqol/textures/item/shadow_radiance_axe_special_2.png new file mode 100644 index 0000000000000000000000000000000000000000..a557dc3cb26a51a19c002e892b9f0d597e459560 GIT binary patch literal 620 zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!3-qz8@W<}6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(Kn*g5>S3Py7%7UJ>*oyGrG!Z^6Uynpv^T2aAK5p82dD`Ud)kU+D!rHjm zC7-|f;cZiV_1=m9|G$0x^>Edu$v^{IFN$dbDUp&Ozu^CvfWhDYxgb!Uv%n*=n1O-s zFbFdq&tH)O6qG1&jVKAuPb(=;EJ|evNX*PD(erZ+Q83jr)U(XVyJZJdvn@5kGtJXe zi-7~kVP%kFWMyCkvb=y;8p;OwT7!`pEDrLwAtMtw6rzCa%yt&AcovWi0*ireegRYj zqtPs707^|@XJ7%UG%zwYU|aw(6=Wmp0*FadfNT(80-DPNRvBbz0c1gS85$UXWMczv zO7zb?2-3LO)5S5w!vE@|XuiV+94vROBs}h@^uDjZuJ=Pwe!;4ceK#DPzI6mdwFcbg zJM>smJl{si{nMQTpH#erBa)UJStPt*$?IJo8K!Jrvp%-yeq-DA+Uty7mVTmc?;cdd zt48M?DAHy>Zn>#B^IgI`>mASTO!G565MHBknni=NX2wFU2h9%;?~5*95cp#U>&@S- zXZ_j#zjeN{ZXxp>Zm_iT!^d{)CQS0%6{_u5|9tsiyPelhhUr53KNS3g13+H!boFyt I=akR{0O69ym;e9( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/shadow_radiance_axe_special_2.png.mcmeta b/src/main/resources/assets/createqol/textures/item/shadow_radiance_axe_special_2.png.mcmeta new file mode 100644 index 0000000..0b691bf --- /dev/null +++ b/src/main/resources/assets/createqol/textures/item/shadow_radiance_axe_special_2.png.mcmeta @@ -0,0 +1,10 @@ +{ + "animation": { + "frametime": 3, + "frames": [ + 0, + 1, + 2 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/createqol/textures/item/shadow_radiance_hoe_special.png b/src/main/resources/assets/createqol/textures/item/shadow_radiance_hoe_special.png new file mode 100644 index 0000000000000000000000000000000000000000..2f3a8a98619c8497363390d926d9821183e3408c GIT binary patch literal 534 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}Z0G|-o>Y~}+HpTz{|9}4G$EK~9&)xVa!lyND@^)X3#PHxWTk}9}cFC*v zPV7FiNKf7A|Nn1ae?45aX);iE&l=SlASGN94nJ@ErzW z#^d=bQhQV0J5OE3=IrGvOebzc&PSY zUjSq#db&7RsODU@>HpDX3)0T^pF7&DuwR3LVNn=!MA&n)JM0`v za?hW3IyVa`)fdlkXt8Ad<-lXYynN2NS%G|~0G|+7J#{A$KCQIaitykxUynp?c1c_Fz^nI8>^`!{Ut8e+|8GumjI|CX zUw=JJGEz8O?Y1mjXVs?3jbSF+XC~i2+zT{DJ?6LtkP<5i@(cct4KOfXI`9Ojg0sLQ zvY3H^?=T269?xHq0u+=eag8Vm&QB{TPb^Ah2uRG#E79|F4N)-FGt{%p$-89-RI@EL z!ZXd&Q;UHE$YEuWVq|4t1hTwQV0J5OE3=IrG zvOebzc&PSYUjSq_d%8G=XavWejTAeqz`+`@R?5jiX2tLOS#u}N6W%8$&U!h{^q@rY z+Z^#3{h#mU&eC7Q+g|S8Q0$y7aVYUY6+@?l!o0+0l~Z?~KWv;6v0}=^>*9$AR~f%s z8ns``NS%G|;0G|-o>Y~}+HpL=*TL1t5fBxo2T5LslaN5;-C(hmYxM}NUUynpv^T6Fl z7XAPKZPlj9W*TAK?2=!9J)AaqJJ5g)U!TYUDUp&OzhIztbim;6|6C9#&spFRSIesvJDxTz@ZQYWM{UsfW@y8IgZ~E5Em0rA{o|Az==e!<6 z*4?-7NZ5OpgL}<) w)`zkJwR2=Qh0B(iov35Ivj6+!nljg~%)5E`L##fzP5`;Z)78&qol`;+01;TE4gdfE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/shadow_radiance_pickaxe_special_2.png b/src/main/resources/assets/createqol/textures/item/shadow_radiance_pickaxe_special_2.png new file mode 100644 index 0000000000000000000000000000000000000000..adedf55da6603a6cb430b939f2314e9364317393 GIT binary patch literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}}0G|+7J#{A$KCQ}vp0wDC@Zhwo_fGhFB-)w>?mn{U|Nn2RHcjScm)!h6 z&%U=g^rF|c|A$-uM{CB$g{~?8`s*RkjOf!_z5*%Hk|4j}|5yNn_RZQ?Kn0uy9+AZi z419+{nDKc2iWH!rM2TxeNpOBzNqJ&XDnmeGW?qS&pKFMMsh**pWlr8LJD{3vsS%!O zo}O9^96$~$gA^kx10#^-1;o-&Hpu51jLcwhCLr68kqI0UQ9yQPI}2Dm3&;k61Rw_K zhtX)3G62JF0y_f>P=$e!u>s=(h^ZhQtP3C}O#!k&fC*?06If-Cr3H`$)n#a40Fw1N zf51bv|M~(Tv&z%OF+?Lc_FN#}5d{vGfGtXEGfH>g`M;($>1^8b)0LbYC*oxo6k47? zWiZT(=IVGMkaTLM##{H96J|ta>I)w^HnYgj#O+|ehkxBTYvb5}{vU${EK zX}{lVt}hPz-J|c9p!G5s{{Z5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/shadow_radiance_shovel_special.png b/src/main/resources/assets/createqol/textures/item/shadow_radiance_shovel_special.png new file mode 100644 index 0000000000000000000000000000000000000000..c215da2c0e518a09daacb48b03b0e1491822aa72 GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|;0G|-o>Y~~I|Nnpf=Eu1kAH8jgMfkKfZM|%39vB{+=IfC-ZSwZ3_fG6S zvS`(&$$IKeW*TAt|9|6Vm;CzcA<%%3FGhcWlt@XCUog-Rbim;6|6C9#&spFRSIesvJDxTz@ZQYWM{UsfW@qo@QdW!^2?FVxz91 zxOJKe@06WulwUqzc1xa9^0=Mf<=WlPZXWduWRLs^xSFS;@_1iU{ls`Z?hiFAo7R7p gYbuQkD`+>htQV6P;CkR#@)2aYr>mdKI;Vst09MAF&j0`b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/shadow_radiance_shovel_special_2.png b/src/main/resources/assets/createqol/textures/item/shadow_radiance_shovel_special_2.png new file mode 100644 index 0000000000000000000000000000000000000000..735ea5f975ead86d428d87ed1a44cf4b1233a957 GIT binary patch literal 540 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}Z0G|+7J$0wbf}XV4itykx5k4(nk3?JZz#=1~R1J*)Y3U#HT)5dKzqBe{ zy?5gO|8J`{O@5Xl@b%Y2pl%h`bwH9qxFpCg_&)|<*i?Im11QZ|;1OBOz`%DHgc*8{}gRMrN=$6Oe7l$OI07C?GqtodqnO1!RLj0uY1r!)P>18GvCn zft`T`sKUU=*nn{X#8i+D)&&rgrU2O>zyvgh39K^6(gMhW>M}Gi0Ll8CKj5L-e|-Uv zneOT07@`pzdnQnnNR=Pc|FhG(VtPvkb07Zp;VG#gX9+Zh~{$(J(#^; zcr0mt&fwB=MX^e(XiL95`*C{}KE;MNyq9L`pD(Rfyc@Z$Mpksm^+;ybOnW7R?^Tn+ bX9S;OcGKdUF@KMwFvxmOS3j3^P6*oyGrG!Z^6Uynpv^T2aAK5p82dD`Ud)kU+D!rHjm zC7-|f;cZhqFVp?|>74(sdy3o*EiBv$@|ya37fMR201ew4;oJhGBuaw(g8yR&3}=P) zUIEo`7I;J!GcfQS24TkI`72Vu8eJnwg7ec#$`gxH83GbB^GfvmTtgI0^$hhabMkK4 z0o80vjqptK^weVD0CHFvq!?Kl7=bJ=AeM%*L7||*$P5+-g@Yj@6F5|&fb7h67O;30 zkPQNhCo?d-04jpfXqGYnr6#a5umDvW7#SNdE`XQ{vXONG#H1-eHV7~Q&1C|s46?KU zvY@&Q4GciCu>m(F`sW@5Y25AU;uvD#e|6GZzGej;*O?r-Q&(R0z4za@{B-*VhP0Ev z+V44ETB2^caf;#2wFhk2te2^|ro0Z)OOToKSyp0g>AVQ52YY-j`-m4Pe)tk&aYZsC zBTj6mL(gk9pA({M*4wh3WnFW7UR(&%uXyi+AM+v)ezf$yz+~||rmd{BF}jAMkbO@2 zj{s-M1MCOe*Ue5}AowGrsU%+QYw*GP-w7A9S1^2MlF!m${vq%q<9S2d!^NDJYCW&` ev+n;Y_*ne=MT;dxdUlsVUh;JHb6Mw<&;$TOXV7l| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/shadow_steel_axe_special.png.mcmeta b/src/main/resources/assets/createqol/textures/item/shadow_steel_axe_special.png.mcmeta new file mode 100644 index 0000000..0b691bf --- /dev/null +++ b/src/main/resources/assets/createqol/textures/item/shadow_steel_axe_special.png.mcmeta @@ -0,0 +1,10 @@ +{ + "animation": { + "frametime": 3, + "frames": [ + 0, + 1, + 2 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/createqol/textures/item/shadow_steel_hoe_special.png b/src/main/resources/assets/createqol/textures/item/shadow_steel_hoe_special.png new file mode 100644 index 0000000000000000000000000000000000000000..25f10a41562fddd85d30cbe357382d181bb83b24 GIT binary patch literal 556 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}l0G|-o>Y~}+HpTz{|9}4G$EK~9&)xVa!lyND@^)X3#PHxWTk}9}c1a5h zH!Ur5J$0wP-h~BuP4hC{zn{*Llverwx~It95NMLjGffL1C0-Kb7YsBC3t)KW@GK6f zgtNdSvY3H^?=T269?xHq0u+=eag8Vm&QB{TPb^Ah2uRG#E79|F4N)-FGt{%p$-89- zRI@EL!ZXd&Q;UHE$YEuWVq|4t1hTwcG@7Lhz%ZP^&cFgxVPIrzz_`nd3nG=%l%I|EKWcj(2 zfk9!~Du&qicN&se9gk$jg(c-raNd$9BPEb{&$d>fB1>`ENS%G|y0G|-o>Y~}+HpL=*TL1t5fBxo2T5LslaGHgM+qoMbH*LM_>yc<{9;l^d z-q*WOQd-4KBaE9}a$ctU_tQE5U-uNb8%~?Ny&$g%Xc+UMr%!;CL`jfeFwiJ$fZ?pL z-YcLQ&H|6fVg?4j!ywFfJby(BSfgu1NpOBzNqJ&XDnmeGW?qS&pKFMMsh**pWlr8L zJD{3vsS%!Oo}O9^96$~$gA^kx10#^-1;o-&HYgM{7@5K1OhC3FBNI4OqJZqob{4RB z7LW}B2|x_e52Mj6WdMfb1a<}%pb7&cV*|zo5K}=qSQkJ{ngV2l029z0Ca}sNOA8{&803_>k{(y&S|MdkxX0@k_V~9p@?742fLkc{s7nr=ZmpwK#|NXx{Yj>03J(feZ zE$k=aWf&BWR6k|Vw4Gp1kM|TZVx2=9A*zl7iH~ zIG=ZqQ~z>(WpM-N-wo>uEPw1PXRf&)yCf_8!tcG+4sWXMCC{Jhs9_M;C8Su^>3$mI NBu`gAmvv4FO#m#(t&#u$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createqol/textures/item/shadow_steel_shovel_special.png b/src/main/resources/assets/createqol/textures/item/shadow_steel_shovel_special.png new file mode 100644 index 0000000000000000000000000000000000000000..fdf01524520dec662fbb76f094cee1b7a49a423b GIT binary patch literal 560 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}l0G|-o>Y~~I|Nnpf=Eu1kAH8jgMfkKfZM|%39vB{+=IfC-ZSr;t3pXt- zb4h6xJ#{BDjj+Dnh4V7qx!EQEzwRk=H~fA&2WZllr@S&iO1vb-L15RjOeSEA?V8lqsTXQ*eHlXuGw zsAgMgglC$krxpVTki*I##mLIQ2xNHyu{4wo3IPp9X0SLDkZs7w1P+lXAUm_21uUKg zWP?Bg5QFr?Xf#V1fMGa+oq+|Y!obMbfN=rDRFDqV1rU>_0NEhG1T=>UtTM>b0?2~u zGBhv%$@-i>;Gx=oeF2b}?djqeq7fW>=Au-C01w**S0UrTPyhOFX@vZ5&9~m{`0ptz z!_t=w2Ar1s0Zw||DU}W{uSQH`dvPK=cj;UE3x<-rd!_Yi6s?p#S%;e+QT`bAGQT7J vk+^r{!ZXzh%GWBnofj-$_fYiLVQb5H3jv{+EY&5yK~C^=^>bP0l+XkKVHcoX literal 0 HcmV?d00001 From 98c4d78fc09a8ac212bf95e7259fa6b85bddd867 Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Thu, 28 Aug 2025 17:22:33 +0300 Subject: [PATCH 09/13] Dehardcode armor strings added in "Fixes before release" commit --- .../items/armors/ShadowRadianceArmorItem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java index c3e08ca..c73fbb5 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java @@ -66,11 +66,11 @@ public void appendHoverText(ItemStack stack, TooltipContext p_339594_, List Date: Thu, 28 Aug 2025 19:17:55 +0300 Subject: [PATCH 10/13] Rename armor/tools "functions" to "abilities" for parity with how they are initially called in the config --- .../armors/RefinedRadianceArmorItem.java | 6 ++-- .../armors/RefinedRadianceChestplate.java | 6 ++-- .../items/armors/RefinedRadianceHelmet.java | 2 +- .../items/armors/ShadowRadianceArmorItem.java | 12 +++---- .../armors/ShadowRadianceChestplate.java | 16 ++++----- .../items/armors/ShadowRadianceHelmet.java | 4 +-- .../items/armors/ShadowSteelArmorItem.java | 6 ++-- .../items/armors/ShadowSteelChestplate.java | 6 ++-- .../items/armors/ShadowSteelHelmet.java | 2 +- .../refinedradiance/RefinedRadianceAxe.java | 4 +-- .../refinedradiance/RefinedRadianceHoe.java | 4 +-- .../RefinedRadiancePickaxe.java | 4 +-- .../RefinedRadianceShovel.java | 4 +-- .../refinedradiance/RefinedRadianceSword.java | 4 +-- .../shadowradiance/ShadowRadianceAxe.java | 6 ++-- .../shadowradiance/ShadowRadianceHoe.java | 6 ++-- .../shadowradiance/ShadowRadiancePickaxe.java | 6 ++-- .../shadowradiance/ShadowRadianceShovel.java | 6 ++-- .../shadowradiance/ShadowRadianceSword.java | 4 +-- .../tools/shadowsteel/ShadowSteelAxe.java | 4 +-- .../tools/shadowsteel/ShadowSteelHoe.java | 4 +-- .../tools/shadowsteel/ShadowSteelPickaxe.java | 4 +-- .../tools/shadowsteel/ShadowSteelShovel.java | 4 +-- .../tools/shadowsteel/ShadowSteelSword.java | 4 +-- .../utils/QOLConfigurableItem.java | 4 +-- .../assets/createqol/lang/en_us.json | 36 +++++++++---------- .../assets/createqol/lang/ru_ru.json | 28 +++++++-------- 27 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java index 3714f64..585cd22 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java @@ -51,16 +51,16 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, public void appendHoverText(@NotNull ItemStack stack, @NotNull TooltipContext p_41422_, @NotNull List components, @NotNull TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.translatable("createqol.function.armor.diving") + components.add(Component.translatable("createqol.ability.armor.diving") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.translatable("createqol.function.armor.belt_blocking") + components.add(Component.translatable("createqol.ability.armor.belt_blocking") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BOOTS_BELT, true), false, true))); } else if (getType().equals(ArmorItem.Type.LEGGINGS)){ - components.add(Component.translatable("createqol.function.armor.step_height") + components.add(Component.translatable("createqol.ability.armor.step_height") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.stepHeight.get(), true, stack.getOrDefault(QOLDataComponents.STEP_HEIGHT, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java index 12d9232..0a3779a 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java @@ -99,17 +99,17 @@ public void addConfigurations(List> list, ItemStack stack) { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.armor.air") + components.add(Component.translatable("createqol.ability.armor.air") .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/" + BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.translatable("createqol.function.armor.elytra") + components.add(Component.translatable("createqol.ability.armor.elytra") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.elytraAllowed.get() ,ShadowRadianceChestplate.hasElytra(stack) , ShadowRadianceChestplate.isElytraEnable(stack), true,false))); - components.add(Component.translatable("createqol.function.armor.arms") + components.add(Component.translatable("createqol.ability.armor.arms") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java index 95a79de..53fe97f 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java @@ -48,7 +48,7 @@ public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, i @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.armor.goggles") + components.add(Component.translatable("createqol.ability.armor.goggles") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java index c73fbb5..224da03 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java @@ -48,29 +48,29 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, @Override public void appendHoverText(ItemStack stack, TooltipContext p_339594_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.armor.effect") + components.add(Component.translatable("createqol.ability.armor.effect") .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.translatable("createqol.function.armor.diving") + components.add(Component.translatable("createqol.ability.armor.diving") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.translatable("createqol.function.armor.belt_blocking") + components.add(Component.translatable("createqol.ability.armor.belt_blocking") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BOOTS_BELT, true), false, true))); - components.add(Component.translatable("createqol.function.armor.lava_walking") + components.add(Component.translatable("createqol.ability.armor.lava_walking") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsLavaWalking.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_LAVA, true), false, true))); } else if (getType().equals(ArmorItem.Type.LEGGINGS)){ - components.add(Component.translatable("createqol.function.armor.void_walk") + components.add(Component.translatable("createqol.ability.armor.void_walk") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.voidWalking.get(), true, stack.getOrDefault(QOLDataComponents.VOID_WALK, true), false, true))); - components.add(Component.translatable("createqol.function.armor.step_height") + components.add(Component.translatable("createqol.ability.armor.step_height") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.stepHeight.get(), true, stack.getOrDefault(QOLDataComponents.STEP_HEIGHT, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java index 31ea989..8eae78c 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java @@ -190,36 +190,36 @@ private void pushVertically(Player p,double y){ @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.armor.air") + components.add(Component.translatable("createqol.ability.armor.air") .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/"+BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.translatable("createqol.function.armor.effect") + components.add(Component.translatable("createqol.ability.armor.effect") .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); - components.add(Component.translatable("createqol.function.armor.arms") + components.add(Component.translatable("createqol.ability.armor.arms") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); - components.add(Component.translatable("createqol.function.armor.elytra") + components.add(Component.translatable("createqol.ability.armor.elytra") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.elytraAllowed.get() ,hasElytra(stack) ,isElytraEnable(stack), true,false))); - components.add(Component.translatable("createqol.function.armor.dash") + components.add(Component.translatable("createqol.ability.armor.dash") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.armors.dashAllowed.get(), stack.getOrDefault(QOLDataComponents.DASH, true), (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.armors.dashCooldown.get())))); - components.add(Component.translatable("createqol.function.armor.propeller") + components.add(Component.translatable("createqol.ability.armor.propeller") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.propellerAllowed.get() , hasPropeller(stack) ,true,false,false))); if (hasPropeller(stack) && CreateQOLConfigs.server().equipments.armors.propellerAllowed.get()) { components.add(Component.empty()); - components.add(Component.translatable("createqol.function.armor.fan") + components.add(Component.translatable("createqol.ability.armor.fan") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true,true,isFansEnable(stack),false,true))); - components.add(Component.translatable("createqol.function.armor.hover") + components.add(Component.translatable("createqol.ability.armor.hover") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.hoverAllowed.get() ,true,isHoverEnable(stack),false,true))); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java index 68868fe..ddc401d 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java @@ -54,10 +54,10 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.armor.effect") + components.add(Component.translatable("createqol.ability.armor.effect") .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); - components.add(Component.translatable("createqol.function.armor.goggles") + components.add(Component.translatable("createqol.ability.armor.goggles") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java index ca09912..03b97a5 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java @@ -49,16 +49,16 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.translatable("createqol.function.armor.diving") + components.add(Component.translatable("createqol.ability.armor.diving") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.translatable("createqol.function.armor.lava_walking") + components.add(Component.translatable("createqol.ability.armor.lava_walking") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsLavaWalking.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_LAVA, true), false, true))); } else if (getType().equals(ArmorItem.Type.LEGGINGS)){ - components.add(Component.translatable("createqol.function.armor.void_walk") + components.add(Component.translatable("createqol.ability.armor.void_walk") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.voidWalking.get(), true, stack.getOrDefault(QOLDataComponents.VOID_WALK, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java index f5e03e1..998fe8d 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java @@ -59,17 +59,17 @@ public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, i @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.armor.air") + components.add(Component.translatable("createqol.ability.armor.air") .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/" + BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.translatable("createqol.function.armor.dash") + components.add(Component.translatable("createqol.ability.armor.dash") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.armors.dashAllowed.get(), stack.getOrDefault(QOLDataComponents.DASH, true), (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.armors.dashCooldown.get())))); - components.add(Component.translatable("createqol.function.armor.arms") + components.add(Component.translatable("createqol.ability.armor.arms") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java index de2a5a9..ba7e8d1 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java @@ -42,7 +42,7 @@ public ShadowSteelHelmet( Properties properties) { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.armor.goggles") + components.add(Component.translatable("createqol.ability.armor.goggles") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java index 61c1377..493ee9c 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java @@ -78,10 +78,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.casingifier") + components.add(Component.translatable("createqol.ability.tools.casingifier") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.casingifier.get(), true, stack.getOrDefault(QOLDataComponents.CASINGIFIER,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java index ae303e6..76677df 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java @@ -72,10 +72,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.harvesting") + components.add(Component.translatable("createqol.ability.tools.harvesting") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.harvesting.get(), true, stack.getOrDefault(QOLDataComponents.HARVESTING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java index 9b4d216..26f7d4e 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java @@ -64,10 +64,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.vein_mine") + components.add(Component.translatable("createqol.ability.tools.vein_mine") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.veinMine.get(), true, stack.getOrDefault(QOLDataComponents.VEIN_MINE,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java index 3d074e3..e79f0f2 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java @@ -60,10 +60,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.smelting") + components.add(Component.translatable("createqol.ability.tools.smelting") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.smelting.get(), true, stack.getOrDefault(QOLDataComponents.SMELTING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java index 89a92d4..78041ab 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java @@ -123,10 +123,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.function.tools.attraction") + components.add(Component.translatable("createqol.ability.tools.attraction") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java index 9f501fa..a19ee7d 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java @@ -66,13 +66,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.casingifier") + components.add(Component.translatable("createqol.ability.tools.casingifier") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.casingifier.get(), true, stack.getOrDefault(QOLDataComponents.CASINGIFIER,false), false, true))); - components.add(Component.translatable("createqol.function.tools.tree_decapitation") + components.add(Component.translatable("createqol.ability.tools.tree_decapitation") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.treeDecapitation.get(), true, stack.getOrDefault(QOLDataComponents.TREE_DECAPITATION,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java index f5ff3f2..9924345 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java @@ -57,13 +57,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.harvesting") + components.add(Component.translatable("createqol.ability.tools.harvesting") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.harvesting.get(), true, stack.getOrDefault(QOLDataComponents.HARVESTING,false), false, true))); - components.add(Component.translatable("createqol.function.tools.ploughing") + components.add(Component.translatable("createqol.ability.tools.ploughing") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.ploughing.get(), true, stack.getOrDefault(QOLDataComponents.PLOUGHING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java index 28a7c19..4e8252b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java @@ -65,13 +65,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.function.tools.digging") + components.add(Component.translatable("createqol.ability.tools.digging") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING, false), false, true))); - components.add(Component.translatable("createqol.function.tools.vein_mine") + components.add(Component.translatable("createqol.ability.tools.vein_mine") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.veinMine.get(), true, stack.getOrDefault(QOLDataComponents.VEIN_MINE,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java index 0c259ad..f29a829 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java @@ -45,13 +45,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.smelting") + components.add(Component.translatable("createqol.ability.tools.smelting") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.smelting.get(), true, stack.getOrDefault(QOLDataComponents.SMELTING,false), false, true))); - components.add(Component.translatable("createqol.function.tools.digging") + components.add(Component.translatable("createqol.ability.tools.digging") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java index 6248ded..4a47f20 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java @@ -134,10 +134,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.function.tools.repulsion_attraction") + components.add(Component.translatable("createqol.ability.tools.repulsion_attraction") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java index 7d07936..b639d3f 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java @@ -80,10 +80,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.tree_decapitation") + components.add(Component.translatable("createqol.ability.tools.tree_decapitation") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.treeDecapitation.get(), true, stack.getOrDefault(QOLDataComponents.TREE_DECAPITATION,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java index 051bc10..fce8ee7 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java @@ -63,10 +63,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.ploughing") + components.add(Component.translatable("createqol.ability.tools.ploughing") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.ploughing.get(), true, stack.getOrDefault(QOLDataComponents.PLOUGHING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java index 09a22b4..71dd32b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java @@ -132,10 +132,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.function.tools.digging") + components.add(Component.translatable("createqol.ability.tools.digging") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING, false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java index e44f179..8204116 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java @@ -67,10 +67,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.function.tools.digging") + components.add(Component.translatable("createqol.ability.tools.digging") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java index 06afad6..5a83c85 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java @@ -129,10 +129,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.function.tools.reach") + components.add(Component.translatable("createqol.ability.tools.reach") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.function.tools.repulsion") + components.add(Component.translatable("createqol.ability.tools.repulsion") .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java b/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java index 9c4c459..da24933 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java @@ -209,8 +209,8 @@ public ValueEntry getWidget(Configuration config) { } static Component chooseState(boolean config, boolean installed, boolean active, boolean activeReplaceInstall, boolean activeOnly){ - if (activeOnly) return Component.translatable(!config ? "createqol.function.state.disabled_by_config" : (active ? "createqol.function.state.enabled" : "createqol.function.state.disabled")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); - return Component.translatable(!config ? "createqol.function.state.disabled_by_config" : (installed ? (activeReplaceInstall ? (active ? "createqol.function.state.enabled" : "createqol.function.state.disabled") : "createqol.function.state.installed") : "createqol.function.state.not_installed")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); + if (activeOnly) return Component.translatable(!config ? "createqol.ability.state.disabled_by_config" : (active ? "createqol.ability.state.enabled" : "createqol.ability.state.disabled")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); + return Component.translatable(!config ? "createqol.ability.state.disabled_by_config" : (installed ? (activeReplaceInstall ? (active ? "createqol.ability.state.enabled" : "createqol.function.state.disabled") : "createqol.function.state.installed") : "createqol.function.state.not_installed")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); } static Component cooldownState(boolean config, boolean active, int cooldown){ diff --git a/src/main/resources/assets/createqol/lang/en_us.json b/src/main/resources/assets/createqol/lang/en_us.json index 5685760..fb33986 100644 --- a/src/main/resources/assets/createqol/lang/en_us.json +++ b/src/main/resources/assets/createqol/lang/en_us.json @@ -262,24 +262,24 @@ "createqol.tool.tree_decapitation_toggle": "Tree Decapitation : ", "createqol.tool.vein_mine_toggle": "Vein Mine : ", - "createqol.function.armor.air": "Air : ", - "createqol.function.armor.arms": "Arms : ", - "createqol.function.armor.belt_blocking": "Belt Blocking : ", - "createqol.function.armor.dash": "Dash : ", - "createqol.function.armor.diving": "Diving : ", - "createqol.function.armor.effect": "Effect : ", - "createqol.function.armor.elytra": "Elytra : ", - "createqol.function.armor.fan": "Fan : ", - "createqol.function.armor.goggles": "Goggles : ", - "createqol.function.armor.hover": "Hover : ", - "createqol.function.armor.lava_walking": "Lava Walking : ", - "createqol.function.armor.propeller": "Propeller : ", - "createqol.function.armor.step_height": "Step Height : ", - "createqol.function.armor.void_walk": "Void Walk : ", - - "createqol.function.tools.attraction": "Attraction : ", - "createqol.function.tools.casingifier": "Casingifier : ", - "createqol.function.tools.digging": "Digging : ", + "createqol.ability.armor.air": "Air : ", + "createqol.ability.armor.arms": "Arms : ", + "createqol.ability.armor.belt_blocking": "Belt Blocking : ", + "createqol.ability.armor.dash": "Dash : ", + "createqol.ability.armor.diving": "Diving : ", + "createqol.ability.armor.effect": "Effect : ", + "createqol.ability.armor.elytra": "Elytra : ", + "createqol.ability.armor.fan": "Fan : ", + "createqol.ability.armor.goggles": "Goggles : ", + "createqol.ability.armor.hover": "Hover : ", + "createqol.ability.armor.lava_walking": "Lava Walking : ", + "createqol.ability.armor.propeller": "Propeller : ", + "createqol.ability.armor.step_height": "Step Height : ", + "createqol.ability.armor.void_walk": "Void Walk : ", + + "createqol.ability.tools.attraction": "Attraction : ", + "createqol.ability.tools.casingifier": "Casingifier : ", + "createqol.ability.tools.digging": "Digging : ", "createqol.function.tools.harvesting": "Harvesting : ", "createqol.function.tools.ploughing": "Ploughing : ", "createqol.function.tools.reach": "Reach : ", diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index f54bf5d..17952f0 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -262,20 +262,20 @@ "createqol.tool.tree_decapitation_toggle": "Режим лесоруба: ", "createqol.tool.vein_mine_toggle": "Режим добычи залежи: ", - "createqol.function.armor.air": "Воздух: ", - "createqol.function.armor.arms": "Рукава: ", - "createqol.function.armor.belt_blocking": "Сопротивление конвейерам: ", - "createqol.function.armor.dash": "Рывок: ", - "createqol.function.armor.diving": "Водолаз: ", - "createqol.function.armor.effect": "Эффект: ", - "createqol.function.armor.elytra": "Элитры: ", - "createqol.function.armor.fan": "Пропеллерная тяга: ", - "createqol.function.armor.goggles": "Инженерные очки: ", - "createqol.function.armor.hover": "Парение: ", - "createqol.function.armor.lava_walking": "Лаволаз: ", - "createqol.function.armor.propeller": "Пропеллер: ", - "createqol.function.armor.step_height": "Высокий шаг: ", - "createqol.function.armor.void_walk": "Левитация над бездной: ", + "createqol.ability.armor.air": "Воздух: ", + "createqol.ability.armor.arms": "Рукава: ", + "createqol.ability.armor.belt_blocking": "Сопротивление конвейерам: ", + "createqol.ability.armor.dash": "Рывок: ", + "createqol.ability.armor.diving": "Водолаз: ", + "createqol.ability.armor.effect": "Эффект: ", + "createqol.ability.armor.elytra": "Элитры: ", + "createqol.ability.armor.fan": "Пропеллерная тяга: ", + "createqol.ability.armor.goggles": "Инженерные очки: ", + "createqol.ability.armor.hover": "Парение: ", + "createqol.ability.armor.lava_walking": "Лаволаз: ", + "createqol.ability.armor.propeller": "Пропеллер: ", + "createqol.ability.armor.step_height": "Высокий шаг: ", + "createqol.ability.armor.void_walk": "Левитация над бездной: ", "createqol.function.tools.attraction": "Притяжение: ", "createqol.function.tools.casingifier": "Корпусификатор: ", From 7374aa9d2d4f7ab26f3b4da251d9eafc2fd37880 Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Fri, 29 Aug 2025 15:54:48 +0300 Subject: [PATCH 11/13] Generic-ify armor/tools abilities --- .../createqualityoflife/CreateQOL.java | 2 +- .../armors/RefinedRadianceArmorItem.java | 6 +- .../armors/RefinedRadianceChestplate.java | 6 +- .../items/armors/RefinedRadianceHelmet.java | 2 +- .../items/armors/ShadowRadianceArmorItem.java | 12 +- .../armors/ShadowRadianceChestplate.java | 34 ++--- .../items/armors/ShadowRadianceHelmet.java | 4 +- .../items/armors/ShadowSteelArmorItem.java | 6 +- .../items/armors/ShadowSteelChestplate.java | 10 +- .../items/armors/ShadowSteelHelmet.java | 2 +- .../refinedradiance/RefinedRadianceAxe.java | 9 +- .../refinedradiance/RefinedRadianceHoe.java | 9 +- .../RefinedRadiancePickaxe.java | 9 +- .../RefinedRadianceShovel.java | 9 +- .../refinedradiance/RefinedRadianceSword.java | 4 +- .../shadowradiance/ShadowRadianceAxe.java | 11 +- .../shadowradiance/ShadowRadianceHoe.java | 11 +- .../shadowradiance/ShadowRadiancePickaxe.java | 11 +- .../shadowradiance/ShadowRadianceShovel.java | 11 +- .../shadowradiance/ShadowRadianceSword.java | 4 +- .../tools/shadowsteel/ShadowSteelAxe.java | 9 +- .../tools/shadowsteel/ShadowSteelHoe.java | 9 +- .../tools/shadowsteel/ShadowSteelPickaxe.java | 9 +- .../tools/shadowsteel/ShadowSteelShovel.java | 9 +- .../tools/shadowsteel/ShadowSteelSword.java | 4 +- .../packets/ToggleElytraPacket.java | 2 +- .../packets/ToggleFansPacket.java | 2 +- .../packets/ToggleHoverPacket.java | 2 +- .../utils/QOLConfigurableItem.java | 4 +- .../assets/createqol/lang/en_us.json | 130 ++++++++---------- .../assets/createqol/lang/ru_ru.json | 112 +++++++-------- 31 files changed, 220 insertions(+), 244 deletions(-) diff --git a/src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java b/src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java index 1cb0da2..51bb518 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java +++ b/src/main/java/fr/iglee42/createqualityoflife/CreateQOL.java @@ -213,7 +213,7 @@ public void onWorldTick(LevelTickEvent.Post event) { public void itemTooltips(ItemTooltipEvent event){ if (!event.getItemStack().is(Items.FIREWORK_ROCKET)) return; if (isActivate(Features.SHADOW_RADIANCE) && CreateQOLConfigs.server().equipments.armors.elytraBoostAllowed.get() && CreateQOLConfigs.server().equipments.armors.useFireworksForBoost.get()){ - event.getToolTip().add(2,CreateQOLLang.translateDirect("chestplate.use_fireworks").withStyle(ChatFormatting.YELLOW)); + event.getToolTip().add(2,CreateQOLLang.translateDirect("armor.ability.use_fireworks").withStyle(ChatFormatting.YELLOW)); } } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java index 585cd22..00e6f1f 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceArmorItem.java @@ -51,16 +51,16 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, public void appendHoverText(@NotNull ItemStack stack, @NotNull TooltipContext p_41422_, @NotNull List components, @NotNull TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.translatable("createqol.ability.armor.diving") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.diving").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.translatable("createqol.ability.armor.belt_blocking") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.belt_blocking").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BOOTS_BELT, true), false, true))); } else if (getType().equals(ArmorItem.Type.LEGGINGS)){ - components.add(Component.translatable("createqol.ability.armor.step_height") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.step_height").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.stepHeight.get(), true, stack.getOrDefault(QOLDataComponents.STEP_HEIGHT, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java index 0a3779a..3baa250 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceChestplate.java @@ -99,17 +99,17 @@ public void addConfigurations(List> list, ItemStack stack) { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.armor.air") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.air").getString()) .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/" + BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.translatable("createqol.ability.armor.elytra") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.elytra").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.elytraAllowed.get() ,ShadowRadianceChestplate.hasElytra(stack) , ShadowRadianceChestplate.isElytraEnable(stack), true,false))); - components.add(Component.translatable("createqol.ability.armor.arms") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.arms").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java index 53fe97f..ebb7d55 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/RefinedRadianceHelmet.java @@ -48,7 +48,7 @@ public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, i @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.armor.goggles") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.goggles").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java index 224da03..7cf6e3c 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceArmorItem.java @@ -48,29 +48,29 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, @Override public void appendHoverText(ItemStack stack, TooltipContext p_339594_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.armor.effect") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.effect").getString()) .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.translatable("createqol.ability.armor.diving") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.diving").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.translatable("createqol.ability.armor.belt_blocking") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.belt_blocking").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BOOTS_BELT, true), false, true))); - components.add(Component.translatable("createqol.ability.armor.lava_walking") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.lava_walking").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsLavaWalking.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_LAVA, true), false, true))); } else if (getType().equals(ArmorItem.Type.LEGGINGS)){ - components.add(Component.translatable("createqol.ability.armor.void_walk") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.void_walk").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.voidWalking.get(), true, stack.getOrDefault(QOLDataComponents.VOID_WALK, true), false, true))); - components.add(Component.translatable("createqol.ability.armor.step_height") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.step_height").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.stepHeight.get(), true, stack.getOrDefault(QOLDataComponents.STEP_HEIGHT, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java index 8eae78c..000addb 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceChestplate.java @@ -190,36 +190,36 @@ private void pushVertically(Player p,double y){ @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.armor.air") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.air").getString()) .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/"+BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.translatable("createqol.ability.armor.effect") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.effect").getString()) .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); - components.add(Component.translatable("createqol.ability.armor.arms") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.arms").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); - components.add(Component.translatable("createqol.ability.armor.elytra") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.elytra").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.elytraAllowed.get() ,hasElytra(stack) ,isElytraEnable(stack), true,false))); - components.add(Component.translatable("createqol.ability.armor.dash") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.dash").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.armors.dashAllowed.get(), stack.getOrDefault(QOLDataComponents.DASH, true), (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.armors.dashCooldown.get())))); - components.add(Component.translatable("createqol.ability.armor.propeller") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.propeller").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.propellerAllowed.get() , hasPropeller(stack) ,true,false,false))); if (hasPropeller(stack) && CreateQOLConfigs.server().equipments.armors.propellerAllowed.get()) { components.add(Component.empty()); - components.add(Component.translatable("createqol.ability.armor.fan") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.fan").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true,true,isFansEnable(stack),false,true))); - components.add(Component.translatable("createqol.ability.armor.hover") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.hover").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.hoverAllowed.get() ,true,isHoverEnable(stack),false,true))); } @@ -229,43 +229,43 @@ public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, public static void toggleFans(ItemStack chestplate,Player p) { if (!CreateQOLConfigs.server().equipments.armors.propellerAllowed.get()){ - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.propeller_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.disabled", CreateQOLLang.translateDirect("ability.armor.propeller_mode").getString()).withStyle(ChatFormatting.RED),true); return; } if (isElytraEnable(chestplate)){ - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.fan_unavailable").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.unavailable", CreateQOLLang.translateDirect("ability.armor.fan_mode").getString(), CreateQOLLang.translateDirect("ability.armor.elytra_mode").getString()).withStyle(ChatFormatting.RED),true); return; } chestplate.set(QOLDataComponents.BACKTANK_FANS, !chestplate.has(QOLDataComponents.BACKTANK_FANS) || Boolean.FALSE.equals(chestplate.get(QOLDataComponents.BACKTANK_FANS))); boolean fans = isFansEnable(chestplate); - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.fan_toggle").append(QOLConfigurableItem.chooseState(true,true,fans,false,true)).withStyle(fans ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.toggle_message", CreateQOLLang.translateDirect("ability.armor.fan_mode").getString()).append(QOLConfigurableItem.chooseState(true,true,fans,false,true)).withStyle(fans ? ChatFormatting.GREEN : ChatFormatting.RED),true); } public static void toggleHover(ItemStack chestplate,Player p) { if (!CreateQOLConfigs.server().equipments.armors.propellerAllowed.get()){ - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.propeller_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.disabled", CreateQOLLang.translateDirect("ability.armor.propeller_mode").getString()).withStyle(ChatFormatting.RED),true); return; } if (!CreateQOLConfigs.server().equipments.armors.hoverAllowed.get()){ - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.hover_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.disabled", CreateQOLLang.translateDirect("ability.armor.hover_mode").getString()).withStyle(ChatFormatting.RED),true); return; } chestplate.set(QOLDataComponents.BACKTANK_HOVER, chestplate.has(QOLDataComponents.BACKTANK_HOVER) && Boolean.FALSE.equals(chestplate.get(QOLDataComponents.BACKTANK_HOVER))); boolean hover = isHoverEnable(chestplate); - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.hover_toggle").append(QOLConfigurableItem.chooseState(true,true,hover,false,true)).withStyle(hover ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.toggle_message", CreateQOLLang.translateDirect("ability.armor.hover_mode").getString()).append(QOLConfigurableItem.chooseState(true,true,hover,false,true)).withStyle(hover ? ChatFormatting.GREEN : ChatFormatting.RED),true); } public static void toggleElytra(ItemStack chestplate,Player p) { if (!CreateQOLConfigs.server().equipments.armors.elytraAllowed.get()){ - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.elytra_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.disabled", CreateQOLLang.translateDirect("ability.armor.elytra_mode").getString()).withStyle(ChatFormatting.RED),true); return; } if (isFansEnable(chestplate)){ - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.elytra_unavailable").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.unavailable", CreateQOLLang.translateDirect("ability.armor.elytra_mode").getString(), CreateQOLLang.translateDirect("ability.armor.fan_mode").getString()).withStyle(ChatFormatting.RED),true); return; } chestplate.set(QOLDataComponents.BACKTANK_ELYTRA_STATE, chestplate.has(QOLDataComponents.BACKTANK_ELYTRA_STATE) && Boolean.FALSE.equals(chestplate.get(QOLDataComponents.BACKTANK_ELYTRA_STATE))); boolean elytra = isElytraEnable(chestplate); - p.displayClientMessage(CreateQOLLang.translateDirect("chestplate.elytra_toggle").append(QOLConfigurableItem.chooseState(true,true,elytra,false,true)).withStyle(elytra ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.armor.toggle_message", CreateQOLLang.translateDirect("ability.armor.elytra_mode").getString()).append(QOLConfigurableItem.chooseState(true,true,elytra,false,true)).withStyle(elytra ? ChatFormatting.GREEN : ChatFormatting.RED),true); } public static boolean hasPropeller(ItemStack chestplate){ return chestplate.has(QOLDataComponents.BACKTANK_PROPELLERS) && Boolean.TRUE.equals(chestplate.get(QOLDataComponents.BACKTANK_PROPELLERS)); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java index ddc401d..4867680 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowRadianceHelmet.java @@ -54,10 +54,10 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.armor.effect") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.effect").getString()) .withStyle(ChatFormatting.GOLD) .append(Component.translatable(providedEffect(stack).value().getDescriptionId()).withStyle(ChatFormatting.YELLOW))); - components.add(Component.translatable("createqol.ability.armor.goggles") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.goggles").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java index 03b97a5..8c37b6f 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelArmorItem.java @@ -49,16 +49,16 @@ public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; if (getType().equals(ArmorItem.Type.BOOTS)) { - components.add(Component.translatable("createqol.ability.armor.diving") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.diving").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsDiving.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_DIVING, false), false, true))); - components.add(Component.translatable("createqol.ability.armor.lava_walking") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.lava_walking").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.bootsLavaWalking.get(), true, stack.getOrDefault(QOLDataComponents.BOOTS_LAVA, true), false, true))); } else if (getType().equals(ArmorItem.Type.LEGGINGS)){ - components.add(Component.translatable("createqol.ability.armor.void_walk") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.void_walk").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.voidWalking.get(), true, stack.getOrDefault(QOLDataComponents.VOID_WALK, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java index 998fe8d..0fbe741 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelChestplate.java @@ -36,11 +36,11 @@ public ShadowSteelChestplate(Properties properties, Supplier public static void dash(ItemStack chestplate, ServerPlayer player) { if (!chestplate.getOrDefault(QOLDataComponents.DASH,true)) return; if (!CreateQOLConfigs.server().equipments.armors.dashAllowed.get()){ - player.displayClientMessage(CreateQOLLang.translateDirect("chestplate.dash_disabled").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("armor.ability.dash_disabled").withStyle(ChatFormatting.RED),true); return; } if (player.getCooldowns().isOnCooldown(chestplate.getItem())){ - player.displayClientMessage(CreateQOLLang.translateDirect("chestplate.dash_reloading").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("armor.ability.dash_reloading").withStyle(ChatFormatting.RED),true); return; } Vec3 look = player.getLookAngle().normalize().scale(2.5D); @@ -59,17 +59,17 @@ public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, i @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.armor.air") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.air").getString()) .withStyle(ChatFormatting.GOLD) .append(Component.literal(String.valueOf(BacktankUtil.getAir(stack))) .withStyle(ChatFormatting.YELLOW)) .append(Component.literal("/" + BacktankUtil.maxAir(stack)) .withStyle(ChatFormatting.GOLD))); - components.add(Component.translatable("createqol.ability.armor.dash") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.dash").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.armors.dashAllowed.get(), stack.getOrDefault(QOLDataComponents.DASH, true), (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.armors.dashCooldown.get())))); - components.add(Component.translatable("createqol.ability.armor.arms") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.arms").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(true, true, stack.getOrDefault(QOLDataComponents.BACKTANK_ARMS, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java index ba7e8d1..cad1e8b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/armors/ShadowSteelHelmet.java @@ -42,7 +42,7 @@ public ShadowSteelHelmet( Properties properties) { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.armor.goggles") + components.add(Component.translatable("createqol.ability.armor.toggle_message", Component.translatable("createqol.ability.armor.goggles").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.armors.helmetHaveGoggles.get(), true, stack.getOrDefault(QOLDataComponents.HELMET_GOGGLES, true), false, true))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java index 493ee9c..6a7d7d6 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceAxe.java @@ -11,6 +11,7 @@ import com.simibubi.create.foundation.utility.AbstractBlockBreakQueue; import com.simibubi.create.foundation.utility.BlockHelper; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; import fr.iglee42.createqualityoflife.registries.QOLItems; @@ -78,10 +79,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.casingifier") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.casingifier").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.casingifier.get(), true, stack.getOrDefault(QOLDataComponents.CASINGIFIER,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -105,12 +106,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.casingifier.get()){ - p.displayClientMessage(Component.translatable("createqol.tool.casingifier_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.disabled", CreateQOLLang.translateDirect("ability.tool.casingifier").getString()).withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.CASINGIFIER,false); stack.set(QOLDataComponents.CASINGIFIER, enable); - p.displayClientMessage(Component.translatable("createqol.tool.casingifier_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.toggle_message", CreateQOLLang.translateDirect("ability.tool.casingifier").getString()).append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java index 76677df..9d58c11 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceHoe.java @@ -8,6 +8,7 @@ import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.infrastructure.config.AllConfigs; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; import fr.iglee42.createqualityoflife.registries.QOLItems; @@ -72,10 +73,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.harvesting") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.harvesting").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.harvesting.get(), true, stack.getOrDefault(QOLDataComponents.HARVESTING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -97,12 +98,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.harvesting.get()){ - p.displayClientMessage(Component.translatable("createqol.tool.harvesting_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.disabled", CreateQOLLang.translateDirect("ability.tool.harvesting").getString()).withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.HARVESTING,false); stack.set(QOLDataComponents.HARVESTING, enable); - p.displayClientMessage(Component.translatable("createqol.tool.harvesting_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.toggle_message", CreateQOLLang.translateDirect("ability.tool.harvesting").getString()).append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java index 26f7d4e..a458496 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadiancePickaxe.java @@ -2,6 +2,7 @@ import com.simibubi.create.content.equipment.armor.BacktankUtil; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; import fr.iglee42.createqualityoflife.registries.QOLItems; @@ -64,10 +65,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.vein_mine") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.vein_mine").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.veinMine.get(), true, stack.getOrDefault(QOLDataComponents.VEIN_MINE,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -90,12 +91,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.veinMine.get()){ - p.displayClientMessage(Component.translatable("createqol.tool.vein_mine_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.disabled", CreateQOLLang.translateDirect("ability.tool.vein_mine").getString()).withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.VEIN_MINE,false); stack.set(QOLDataComponents.VEIN_MINE, enable); - p.displayClientMessage(Component.translatable("createqol.tool.vein_mine_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.toggle_message", CreateQOLLang.translateDirect("ability.tool.vein_mine").getString()).append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java index e79f0f2..a459528 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceShovel.java @@ -2,6 +2,7 @@ import com.simibubi.create.content.equipment.armor.BacktankUtil; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; import fr.iglee42.createqualityoflife.registries.QOLItems; @@ -60,10 +61,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.smelting") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.smelting").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.smelting.get(), true, stack.getOrDefault(QOLDataComponents.SMELTING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -87,12 +88,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.smelting.get()){ - p.displayClientMessage(Component.translatable("createqol.tool.smelting_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.disabled", CreateQOLLang.translateDirect("ability.tool.smelting").getString()).withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.SMELTING,false); stack.set(QOLDataComponents.SMELTING, enable); - p.displayClientMessage(Component.translatable("createqol.tool.smelting_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.toggle_message", CreateQOLLang.translateDirect("ability.tool.smelting").getString()).append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java index 78041ab..162f949 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/refinedradiance/RefinedRadianceSword.java @@ -123,10 +123,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.ability.tools.attraction") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.attraction").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java index a19ee7d..48c5965 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceAxe.java @@ -6,6 +6,7 @@ import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.advancement.CreateAdvancement; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.items.tools.refinedradiance.RefinedRadianceAxe; import fr.iglee42.createqualityoflife.items.tools.refinedradiance.RefinedRadianceHoe; @@ -66,13 +67,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.casingifier") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.casingifier").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.casingifier.get(), true, stack.getOrDefault(QOLDataComponents.CASINGIFIER,false), false, true))); - components.add(Component.translatable("createqol.ability.tools.tree_decapitation") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.tree_decapitation").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.treeDecapitation.get(), true, stack.getOrDefault(QOLDataComponents.TREE_DECAPITATION,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -92,14 +93,14 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand),true); if (player.isCrouching()){ if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.TREE_DECAPITATION,false)){ - player.displayClientMessage(Component.translatable("createqol.tool.casingifier_unavailable").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.unavailable", CreateQOLLang.translateDirect("ability.tool.casingifier").getString(), CreateQOLLang.translateDirect("ability.tool.tree_decapitation").getString()).withStyle(ChatFormatting.RED),true); }else { RefinedRadianceAxe.toggleAbility(player.getItemInHand(hand),player); } } else { if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.CASINGIFIER,false)){ - player.displayClientMessage(Component.translatable("createqol.tool.tree_decapitation_unavailable").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.unavailable", CreateQOLLang.translateDirect("ability.tool.tree_decapitation").getString(), CreateQOLLang.translateDirect("ability.tool.casingifier").getString()).withStyle(ChatFormatting.RED),true); }else { ShadowSteelAxe.toggleAbility(player.getItemInHand(hand),player); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java index 9924345..76371e6 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceHoe.java @@ -2,6 +2,7 @@ import com.mojang.datafixers.util.Pair; import com.simibubi.create.content.equipment.armor.BacktankUtil; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.client.screens.widgets.entries.BooleanEntry; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.items.tools.refinedradiance.RefinedRadianceHoe; @@ -57,13 +58,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.harvesting") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.harvesting").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.harvesting.get(), true, stack.getOrDefault(QOLDataComponents.HARVESTING,false), false, true))); - components.add(Component.translatable("createqol.ability.tools.ploughing") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.ploughing").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.ploughing.get(), true, stack.getOrDefault(QOLDataComponents.PLOUGHING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -91,14 +92,14 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand),true); if (player.isCrouching()){ if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.HARVESTING,false)){ - player.displayClientMessage(Component.translatable("createqol.tool.ploughing_unavailable").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.unavailable", CreateQOLLang.translateDirect("ability.tool.ploughing").getString(), CreateQOLLang.translateDirect("ability.tool.harvesting").getString()).withStyle(ChatFormatting.RED),true); }else { ShadowSteelHoe.toggleAbility(player.getItemInHand(hand),player); } } else { if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.PLOUGHING,false)){ - player.displayClientMessage(Component.translatable("createqol.tool.harvesting_unavailable").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.unavailable", CreateQOLLang.translateDirect("ability.tool.harvesting").getString(), CreateQOLLang.translateDirect("ability.tool.ploughing").getString()).withStyle(ChatFormatting.RED),true); }else { RefinedRadianceHoe.toggleAbility(player.getItemInHand(hand),player); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java index 4e8252b..49e7b1d 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadiancePickaxe.java @@ -1,6 +1,7 @@ package fr.iglee42.createqualityoflife.items.tools.shadowradiance; import com.simibubi.create.content.equipment.armor.BacktankUtil; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.client.screens.widgets.entries.BooleanEntry; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.items.tools.refinedradiance.RefinedRadiancePickaxe; @@ -36,14 +37,14 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand),true); if (player.isCrouching()){ if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.VEIN_MINE,false)){ - player.displayClientMessage(Component.translatable("createqol.tool.digging_unavailable").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.unavailable", CreateQOLLang.translateDirect("ability.tool.digging").getString(), CreateQOLLang.translateDirect("ability.tool.vein_mine").getString()).withStyle(ChatFormatting.RED),true); }else { ShadowSteelPickaxe.toggleAbility(player.getItemInHand(hand),player); } } else { if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.DIGGING,false)){ - player.displayClientMessage(Component.translatable("createqol.tool.vein_mine_unavailable").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.unavailable", CreateQOLLang.translateDirect("ability.tool.vein_mine").getString(), CreateQOLLang.translateDirect("ability.tool.digging").getString()).withStyle(ChatFormatting.RED),true); }else { RefinedRadiancePickaxe.toggleAbility(player.getItemInHand(hand),player); } @@ -65,13 +66,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.ability.tools.digging") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.digging").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING, false), false, true))); - components.add(Component.translatable("createqol.ability.tools.vein_mine") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.vein_mine").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.veinMine.get(), true, stack.getOrDefault(QOLDataComponents.VEIN_MINE,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java index f29a829..76f2343 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceShovel.java @@ -1,6 +1,7 @@ package fr.iglee42.createqualityoflife.items.tools.shadowradiance; import com.simibubi.create.content.equipment.armor.BacktankUtil; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.client.screens.widgets.entries.BooleanEntry; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.items.tools.refinedradiance.RefinedRadianceShovel; @@ -45,13 +46,13 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.smelting") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.smelting").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.smelting.get(), true, stack.getOrDefault(QOLDataComponents.SMELTING,false), false, true))); - components.add(Component.translatable("createqol.ability.tools.digging") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.digging").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -79,14 +80,14 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.isClientSide) return InteractionResultHolder.sidedSuccess(player.getItemInHand(hand),true); if (player.isCrouching()){ if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.SMELTING,false)){ - player.displayClientMessage(Component.translatable("createqol.tool.digging_unavailable").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.unavailable", CreateQOLLang.translateDirect("ability.tool.digging").getString(), CreateQOLLang.translateDirect("ability.tool.smelting").getString()).withStyle(ChatFormatting.RED),true); }else { ShadowSteelShovel.toggleAbility(player.getItemInHand(hand),player); } } else { if (player.getItemInHand(hand).getOrDefault(QOLDataComponents.DIGGING,false)){ - player.displayClientMessage(Component.translatable("createqol.tool.smelting_unavailable").withStyle(ChatFormatting.RED),true); + player.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.unavailable", CreateQOLLang.translateDirect("ability.tool.smelting").getString(), CreateQOLLang.translateDirect("ability.tool.digging").getString()).withStyle(ChatFormatting.RED),true); }else { RefinedRadianceShovel.toggleAbility(player.getItemInHand(hand),player); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java index 4a47f20..61fae26 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowradiance/ShadowRadianceSword.java @@ -134,10 +134,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.ability.tools.repulsion_attraction") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.repulsion_attraction").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java index b639d3f..2dbeff2 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelAxe.java @@ -11,6 +11,7 @@ import com.simibubi.create.foundation.utility.AbstractBlockBreakQueue; import com.simibubi.create.foundation.utility.BlockHelper; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; import fr.iglee42.createqualityoflife.registries.QOLItems; @@ -80,10 +81,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.tree_decapitation") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.tree_decapitation").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.treeDecapitation.get(), true, stack.getOrDefault(QOLDataComponents.TREE_DECAPITATION,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -106,12 +107,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.treeDecapitation.get()){ - p.displayClientMessage(Component.translatable("createqol.tool.tree_decapitation_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.disabled", CreateQOLLang.translateDirect("ability.tool.tree_decapitation").getString()).withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.TREE_DECAPITATION,false); stack.set(QOLDataComponents.TREE_DECAPITATION, enable); - p.displayClientMessage(Component.translatable("createqol.tool.tree_decapitation_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.toggle_message", CreateQOLLang.translateDirect("ability.tool.tree_decapitation").getString()).append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java index fce8ee7..b0d25fb 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelHoe.java @@ -7,6 +7,7 @@ import com.simibubi.create.foundation.mixin.accessor.CropBlockAccessor; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.infrastructure.config.AllConfigs; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; import fr.iglee42.createqualityoflife.registries.QOLItems; @@ -63,10 +64,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.ploughing") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.ploughing").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.ploughing.get(), true, stack.getOrDefault(QOLDataComponents.PLOUGHING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -89,12 +90,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.ploughing.get()){ - p.displayClientMessage(Component.translatable("createqol.tool.ploughing_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.disabled", CreateQOLLang.translateDirect("ability.tool.ploughing").getString()).withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.PLOUGHING,false); stack.set(QOLDataComponents.PLOUGHING, enable); - p.displayClientMessage(Component.translatable("createqol.tool.ploughing_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.toggle_message", CreateQOLLang.translateDirect("ability.tool.ploughing").getString()).append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } @Override diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java index 71dd32b..7bfc926 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelPickaxe.java @@ -2,6 +2,7 @@ import com.simibubi.create.content.equipment.armor.BacktankUtil; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; import fr.iglee42.createqualityoflife.registries.QOLItems; @@ -55,12 +56,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.digging.get()){ - p.displayClientMessage(Component.translatable("createqol.tool.digging_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.disabled", CreateQOLLang.translateDirect("ability.tool.digging").getString()).withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.DIGGING,false); stack.set(QOLDataComponents.DIGGING, enable); - p.displayClientMessage(Component.translatable("createqol.tool.digging_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.toggle_message", CreateQOLLang.translateDirect("ability.tool.digging").getString()).append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } public static void mineBlock(BlockEvent.BreakEvent event) { @@ -132,10 +133,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.ability.tools.digging") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.digging").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING, false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java index 8204116..c9f3d5f 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelShovel.java @@ -2,6 +2,7 @@ import com.simibubi.create.content.equipment.armor.BacktankUtil; import fr.iglee42.createqualityoflife.CreateQOL; +import fr.iglee42.createqualityoflife.CreateQOLLang; import fr.iglee42.createqualityoflife.config.CreateQOLConfigs; import fr.iglee42.createqualityoflife.registries.QOLDataComponents; import fr.iglee42.createqualityoflife.registries.QOLItems; @@ -67,10 +68,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH,true), false, true))); - components.add(Component.translatable("createqol.ability.tools.digging") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.digging").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.digging.get(), true, stack.getOrDefault(QOLDataComponents.DIGGING,false), false, true))); super.appendHoverText(stack, p_41422_, components, p_41424_); @@ -93,12 +94,12 @@ public InteractionResultHolder use(Level level, Player player, Intera public static void toggleAbility(ItemStack stack, Player p) { if (!CreateQOLConfigs.server().equipments.tools.digging.get()){ - p.displayClientMessage(Component.translatable("createqol.tool.digging_disabled").withStyle(ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.disabled", CreateQOLLang.translateDirect("ability.tool.digging").getString()).withStyle(ChatFormatting.RED),true); return; } boolean enable = !stack.getOrDefault(QOLDataComponents.DIGGING,false); stack.set(QOLDataComponents.DIGGING, enable); - p.displayClientMessage(Component.translatable("createqol.tool.digging_toggle").append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); + p.displayClientMessage(CreateQOLLang.translateDirect("ability.tool.toggle_message", CreateQOLLang.translateDirect("ability.tool.digging").getString()).append(QOLConfigurableItem.chooseState(true,true,enable,false,true)).withStyle(enable ? ChatFormatting.GREEN : ChatFormatting.RED),true); } diff --git a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java index 5a83c85..bbda013 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java +++ b/src/main/java/fr/iglee42/createqualityoflife/items/tools/shadowsteel/ShadowSteelSword.java @@ -129,10 +129,10 @@ public Type type() { @Override public void appendHoverText(ItemStack stack, @Nullable TooltipContext p_41422_, List components, TooltipFlag p_41424_) { if (!stack.getOrDefault(QOLDataComponents.ITEM_TOOLTIPS, ItemTooltips.DEFAULT).isEnable(ItemTooltips.Tooltip.OPTIONS)) return; - components.add(Component.translatable("createqol.ability.tools.reach") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.reach").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.chooseState(CreateQOLConfigs.server().equipments.tools.reach.get(), true, stack.getOrDefault(QOLDataComponents.REACH, true), false, true))); - components.add(Component.translatable("createqol.ability.tools.repulsion") + components.add(Component.translatable("createqol.ability.tool.toggle_message", Component.translatable("createqol.ability.tool.repulsion").getString()) .withStyle(ChatFormatting.GOLD) .append(QOLConfigurableItem.cooldownState(CreateQOLConfigs.server().equipments.tools.swordsAbilities.get(), true, (int) Math.ceil(Minecraft.getInstance().player.getCooldowns().getCooldownPercent(this,0) * CreateQOLConfigs.server().equipments.tools.swordsCooldowns.get())))); diff --git a/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleElytraPacket.java b/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleElytraPacket.java index 3fe24a0..7bd966c 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleElytraPacket.java +++ b/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleElytraPacket.java @@ -29,7 +29,7 @@ public void handle(ServerPlayer player) { if ((QOLItems.SHADOW_RADIANCE_CHESTPLATE.is(backtank) ||QOLItems.REFINED_RADIANCE_CHESTPLATE.is(backtank)) && ShadowRadianceChestplate.hasElytra(chestplate)){ ShadowRadianceChestplate.toggleElytra(chestplate,player); }else if (QOLItems.SHADOW_RADIANCE_CHESTPLATE.is(backtank) && !ShadowRadianceChestplate.hasElytra(chestplate)){ - player.sendSystemMessage(CreateQOLLang.translateDirect("chestplate.no_elytra").withStyle(ChatFormatting.RED),true); + player.sendSystemMessage(CreateQOLLang.translateDirect("armor.ability.no_elytra").withStyle(ChatFormatting.RED),true); } } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleFansPacket.java b/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleFansPacket.java index 68100be..c47df60 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleFansPacket.java +++ b/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleFansPacket.java @@ -30,7 +30,7 @@ public void handle(ServerPlayer player) { if (QOLItems.SHADOW_RADIANCE_CHESTPLATE.is(backtank) && ShadowRadianceChestplate.hasPropeller(chestplate)){ ShadowRadianceChestplate.toggleFans(chestplate,player); }else if (QOLItems.SHADOW_RADIANCE_CHESTPLATE.is(backtank) && !ShadowRadianceChestplate.hasPropeller(chestplate)){ - player.sendSystemMessage(CreateQOLLang.translateDirect("chestplate.no_propeller").withStyle(ChatFormatting.RED),true); + player.sendSystemMessage(CreateQOLLang.translateDirect("armor.ability.no_propeller").withStyle(ChatFormatting.RED),true); } } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleHoverPacket.java b/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleHoverPacket.java index 1322492..ffd1e6b 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleHoverPacket.java +++ b/src/main/java/fr/iglee42/createqualityoflife/packets/ToggleHoverPacket.java @@ -29,7 +29,7 @@ public void handle(ServerPlayer player) { if (QOLItems.SHADOW_RADIANCE_CHESTPLATE.is(backtank) && ShadowRadianceChestplate.hasPropeller(chestplate)){ ShadowRadianceChestplate.toggleHover(chestplate,player); } else if (QOLItems.SHADOW_RADIANCE_CHESTPLATE.is(backtank) && !ShadowRadianceChestplate.hasPropeller(chestplate)){ - player.sendSystemMessage(CreateQOLLang.translateDirect("chestplate.no_propeller").withStyle(ChatFormatting.RED),true); + player.sendSystemMessage(CreateQOLLang.translateDirect("armor.ability.no_propeller").withStyle(ChatFormatting.RED),true); } } } diff --git a/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java b/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java index da24933..0755571 100644 --- a/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java +++ b/src/main/java/fr/iglee42/createqualityoflife/utils/QOLConfigurableItem.java @@ -210,11 +210,11 @@ public ValueEntry getWidget(Configuration config) { static Component chooseState(boolean config, boolean installed, boolean active, boolean activeReplaceInstall, boolean activeOnly){ if (activeOnly) return Component.translatable(!config ? "createqol.ability.state.disabled_by_config" : (active ? "createqol.ability.state.enabled" : "createqol.ability.state.disabled")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); - return Component.translatable(!config ? "createqol.ability.state.disabled_by_config" : (installed ? (activeReplaceInstall ? (active ? "createqol.ability.state.enabled" : "createqol.function.state.disabled") : "createqol.function.state.installed") : "createqol.function.state.not_installed")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); + return Component.translatable(!config ? "createqol.ability.state.disabled_by_config" : (installed ? (activeReplaceInstall ? (active ? "createqol.ability.state.enabled" : "createqol.ability.state.disabled") : "createqol.ability.state.installed") : "createqol.ability.state.not_installed")).withStyle(!config ? ChatFormatting.RED : ChatFormatting.YELLOW); } static Component cooldownState(boolean config, boolean active, int cooldown){ - return !config ? Component.translatable("createqol.function.state.disabled_by_config").withStyle(ChatFormatting.RED) : (active ? (cooldown > 0 ? Component.literal(String.valueOf(cooldown / 20)).append(Component.translatable("createqol.function.state.seconds")).withStyle(ChatFormatting.YELLOW) : Component.translatable("createqol.function.state.enabled")).withStyle(ChatFormatting.YELLOW) : Component.translatable("createqol.function.state.disabled")).withStyle(ChatFormatting.YELLOW); + return !config ? Component.translatable("createqol.ability.state.disabled_by_config").withStyle(ChatFormatting.RED) : (active ? (cooldown > 0 ? Component.literal(String.valueOf(cooldown / 20)).append(Component.translatable("createqol.ability.state.seconds")).withStyle(ChatFormatting.YELLOW) : Component.translatable("createqol.ability.state.enabled")).withStyle(ChatFormatting.YELLOW) : Component.translatable("createqol.ability.state.disabled")).withStyle(ChatFormatting.YELLOW); } } diff --git a/src/main/resources/assets/createqol/lang/en_us.json b/src/main/resources/assets/createqol/lang/en_us.json index fb33986..49f3ef0 100644 --- a/src/main/resources/assets/createqol/lang/en_us.json +++ b/src/main/resources/assets/createqol/lang/en_us.json @@ -221,80 +221,62 @@ "createqol.statue.locked": "This statue is locked ! Only the owner can modify it.", "createqol.statue.name_utility": "The name is used when you share the animation. It won't be kept if you close the gui.", - "createqol.backtank.propeller_disabled": "Propellers are disabled by the config", - "createqol.backtank.elytra_disabled": "Elytra are disabled by the config", - - "createqol.chestplate.use_fireworks": "Can be used as a boost with the shadow radiance chestplate by keeping pressed the jump key.", - "createqol.chestplate.no_propeller": "You can't switch the fan/hover because the chestplate doesn't have a propeller installed.", - "createqol.chestplate.no_elytra": "You can't switch the elytra because the chestplate doesn't have elytra installed", - "createqol.chestplate.propeller_disabled": "Propeller is disabled by the config", - "createqol.chestplate.fan_unavailable": "Fan can't be enabled if the elytra are enabled", - "createqol.chestplate.hover_disabled": "Hover is disabled by the config", - "createqol.chestplate.elytra_disabled": "Elytra are disabled by the config", - "createqol.chestplate.elytra_unavailable": "Elytra can't be enabled if the fans is enabled", - "createqol.chestplate.fan_toggle": "Fan : ", - "createqol.chestplate.hover_toggle": "Hover : ", - "createqol.chestplate.elytra_toggle": "Elytra : ", - "createqol.chestplate.dash_disabled": "Dashing is disabled on this server !", - "createqol.chestplate.dash_reloading": "Dashing is reloading, please wait!", - - "createqol.tool.casingifier_disabled": "Casingifier is disabled by the config", - "createqol.tool.casingifier_unavailable": "Casingifier can't be enabled if tree decapitation is enabled", - "createqol.tool.digging_disabled": "Digging is disabled by the config", - "createqol.tool.digging_unavailable": "Digging can't be enabled if vein mine is enabled", - "createqol.tool.harvesting_disabled": "Harvesting is disabled by the config", - "createqol.tool.harvesting_unavailable": "Harvesting can't be enabled if ploughing is enabled", - "createqol.tool.ploughing_disabled": "Ploughing is disabled by the config", - "createqol.tool.ploughing_unavailable": "Ploughing can't be enabled if harvesting is enabled", - "createqol.tool.smelting_disabled": "Smelting is disabled by the config", - "createqol.tool.smelting_unavailable": "Smelting can't be enabled if digging is enabled", - "createqol.tool.tree_decapitation_disabled": "Tree Decapitation is disabled by the config", - "createqol.tool.tree_decapitation_unavailable": "Tree Decapitation can't be enabled if casingifier is enabled", - "createqol.tool.vein_mine_disabled": "Vein Mine is disabled by the config", - "createqol.tool.vein_mine_unavailable": "Vein Mine can't be enabled if digging is enabled", - - "createqol.tool.casingifier_toggle": "Casingifier : ", - "createqol.tool.digging_toggle": "Digging : ", - "createqol.tool.harvesting_toggle": "Harvesting : ", - "createqol.tool.ploughing_toggle": "Ploughing : ", - "createqol.tool.reach_toggle": "Reach : ", - "createqol.tool.smelting_toggle": "Smelting : ", - "createqol.tool.tree_decapitation_toggle": "Tree Decapitation : ", - "createqol.tool.vein_mine_toggle": "Vein Mine : ", - - "createqol.ability.armor.air": "Air : ", - "createqol.ability.armor.arms": "Arms : ", - "createqol.ability.armor.belt_blocking": "Belt Blocking : ", - "createqol.ability.armor.dash": "Dash : ", - "createqol.ability.armor.diving": "Diving : ", - "createqol.ability.armor.effect": "Effect : ", - "createqol.ability.armor.elytra": "Elytra : ", - "createqol.ability.armor.fan": "Fan : ", - "createqol.ability.armor.goggles": "Goggles : ", - "createqol.ability.armor.hover": "Hover : ", - "createqol.ability.armor.lava_walking": "Lava Walking : ", - "createqol.ability.armor.propeller": "Propeller : ", - "createqol.ability.armor.step_height": "Step Height : ", - "createqol.ability.armor.void_walk": "Void Walk : ", - - "createqol.ability.tools.attraction": "Attraction : ", - "createqol.ability.tools.casingifier": "Casingifier : ", - "createqol.ability.tools.digging": "Digging : ", - "createqol.function.tools.harvesting": "Harvesting : ", - "createqol.function.tools.ploughing": "Ploughing : ", - "createqol.function.tools.reach": "Reach : ", - "createqol.function.tools.repulsion_attraction": "Repulsion/Attraction : ", - "createqol.function.tools.repulsion": "Repulsion : ", - "createqol.function.tools.smelting": "Smelting : ", - "createqol.function.tools.tree_decapitation": "Tree Decapitation : ", - "createqol.function.tools.vein_mine": "Vein Mine : ", - - "createqol.function.state.disabled_by_config": "Disabled By Config", - "createqol.function.state.disabled": "Disable", - "createqol.function.state.enabled": "Enable", - "createqol.function.state.installed": "Installed", - "createqol.function.state.not_installed": "Not Installed", - "createqol.function.state.seconds": "s", + "createqol.backtank.propeller_disabled": "Unable to equip: Propeller modes are disabled by the config", + "createqol.backtank.elytra_disabled": "Unable to equip: Elytra mode are disabled by the config", + + "createqol.armor.ability.use_fireworks": "Can be used as a boost with the shadow radiance chestplate by keeping pressed the jump key.", + "createqol.armor.ability.no_propeller": "You can't switch the fan/hover because the chestplate doesn't have a propeller installed.", + "createqol.armor.ability.no_elytra": "You can't switch the elytra because the chestplate doesn't have elytra installed", + "createqol.armor.ability.dash_disabled": "Dashing is disabled on this server !", + "createqol.armor.ability.dash_reloading": "Dashing is reloading, please wait!", + + "createqol.ability.armor.disabled": "%s is disabled by the config", + "createqol.ability.armor.unavailable": "%1$s can't be enabled while the %2$s is enabled", + "createqol.ability.armor.reloading": "%s is reloading, please wait!", + "createqol.ability.armor.toggle_message": "%s : ", + + "createqol.ability.tool.disabled": "%s ability is disabled by the config", + "createqol.ability.tool.unavailable": "%1$s ability can't be enabled while the %2$s ability is enabled", + "createqol.ability.tool.toggle_message": "%s : ", + + "createqol.ability.armor.propeller_mode": "Propeller mode", + "createqol.ability.armor.fan_mode": "Fan mode", + "createqol.ability.armor.hover_mode": "Hover mode", + "createqol.ability.armor.elytra_mode": "Elytra mode", + + "createqol.ability.tool.attraction": "Attraction", + "createqol.ability.tool.casingifier": "Casingifier", + "createqol.ability.tool.digging": "Digging", + "createqol.ability.tool.harvesting": "Harvesting", + "createqol.ability.tool.ploughing": "Ploughing", + "createqol.ability.tool.reach": "Reach", + "createqol.ability.tool.repulsion_attraction": "Repulsion/Attraction", + "createqol.ability.tool.repulsion": "Repulsion", + "createqol.ability.tool.smelting": "Smelting", + "createqol.ability.tool.tree_decapitation": "Tree Decapitation", + "createqol.ability.tool.vein_mine": "Vein Mine", + + "createqol.ability.armor.air": "Air", + "createqol.ability.armor.arms": "Arms", + "createqol.ability.armor.belt_blocking": "Belt Blocking", + "createqol.ability.armor.dash": "Dash", + "createqol.ability.armor.diving": "Diving", + "createqol.ability.armor.effect": "Effect", + "createqol.ability.armor.elytra": "Elytra", + "createqol.ability.armor.fan": "Fan", + "createqol.ability.armor.goggles": "Goggles", + "createqol.ability.armor.hover": "Hover", + "createqol.ability.armor.lava_walking": "Lava Walking", + "createqol.ability.armor.propeller": "Propeller", + "createqol.ability.armor.step_height": "Step Height", + "createqol.ability.armor.void_walk": "Void Walk", + + "createqol.ability.state.disabled_by_config": "Disabled By Config", + "createqol.ability.state.disabled": "Disabled", + "createqol.ability.state.enabled": "Enabled", + "createqol.ability.state.installed": "Installed", + "createqol.ability.state.not_installed": "Not Installed", + "createqol.ability.state.seconds": "s", "createqol.ponder.ender_packager.header": "Transfer packages remotely", "createqol.ponder.ender_packager.text_1": "Placing items in the two slots can specify a Frequency", diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 17952f0..7b33a1c 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -227,74 +227,56 @@ "createqol.chestplate.use_fireworks": "Находясь в инвентаре, может быть использован для ускорения полёта, когда надет нагрудник из пост-хроматического сплава, оснащённый элитрами — для этого зажмите [Пробел], находясь в режиме полёта.", "createqol.chestplate.no_propeller": "Режимы пропеллерной тяги и парения недоступны: баллон не оснащён пропеллером", "createqol.chestplate.no_elytra": "Режим полёта недоступен: баллон не оснащён элитрами", - "createqol.chestplate.propeller_disabled": "Режимы пропеллерной тяги и парения запрещены настройками мира/сервера", - "createqol.chestplate.fan_unavailable": "Режим пропеллерной тяги недоступен при активном режиме полёта", - "createqol.chestplate.hover_disabled": "Режим парения запрещён настройками мира/сервера", - "createqol.chestplate.elytra_disabled": "Режим полёта запрещён настройками мира/сервера", - "createqol.chestplate.elytra_unavailable": "Режим полёта недоступен при активном режиме пропеллерной тяги", - "createqol.chestplate.fan_toggle": "Режим пропеллерной тяги: ", - "createqol.chestplate.hover_toggle": "Режим парения: ", - "createqol.chestplate.elytra_toggle": "Режим полёта: ", "createqol.chestplate.dash_disabled": "Функция рывка запрещена настройками мира/сервера", "createqol.chestplate.dash_reloading": "Рывок перезаряжается...", - "createqol.tool.casingifier_disabled": "Режим корпусификатора запрещён настройками мира/сервера", - "createqol.tool.casingifier_unavailable": "Режим корпусификатора недоступен при активном режиме лесоруба", - "createqol.tool.digging_disabled": "Режим расширенного копания запрещён настройками мира/сервера", - "createqol.tool.digging_unavailable": "Режим расширенного копания недоступен при активном режиме добычи залежи", - "createqol.tool.harvesting_disabled": "Режим автопосадки запрещён настройками мира/сервера", - "createqol.tool.harvesting_unavailable": "Режим автопосадки недоступен при активном режиме расширенной вспашки", - "createqol.tool.ploughing_disabled": "Режим расширенной вспашки запрещён настройками мира/сервера", - "createqol.tool.ploughing_unavailable": "Режим расширенной вспашки недоступен при активном режиме автопосадки", - "createqol.tool.smelting_disabled": "Режим автопереплавки запрещён настройками мира/сервера", - "createqol.tool.smelting_unavailable": "Режим автопереплавки недоступен при активном режиме расширенного копания", - "createqol.tool.tree_decapitation_disabled": "Режим лесоруба запрещён настройками мира/сервера", - "createqol.tool.tree_decapitation_unavailable": "Режим лесоруба недоступен при активном режиме корпусификатора", - "createqol.tool.vein_mine_disabled": "Режим добычи залежи запрещён настройками мира/сервера", - "createqol.tool.vein_mine_unavailable": "Режим добычи залежи недоступен при активном режиме расширенного копания", - - "createqol.tool.casingifier_toggle": "Режим корпусификатора: ", - "createqol.tool.digging_toggle": "Режим расширенного копания: ", - "createqol.tool.harvesting_toggle": "Режим автопосадки: ", - "createqol.tool.ploughing_toggle": "Режим расширенной вспашки: ", - "createqol.tool.reach_toggle": "Режим повышенной досягаемости: ", - "createqol.tool.smelting_toggle": "Режим автопереплавки: ", - "createqol.tool.tree_decapitation_toggle": "Режим лесоруба: ", - "createqol.tool.vein_mine_toggle": "Режим добычи залежи: ", - - "createqol.ability.armor.air": "Воздух: ", - "createqol.ability.armor.arms": "Рукава: ", - "createqol.ability.armor.belt_blocking": "Сопротивление конвейерам: ", - "createqol.ability.armor.dash": "Рывок: ", - "createqol.ability.armor.diving": "Водолаз: ", - "createqol.ability.armor.effect": "Эффект: ", - "createqol.ability.armor.elytra": "Элитры: ", - "createqol.ability.armor.fan": "Пропеллерная тяга: ", - "createqol.ability.armor.goggles": "Инженерные очки: ", - "createqol.ability.armor.hover": "Парение: ", - "createqol.ability.armor.lava_walking": "Лаволаз: ", - "createqol.ability.armor.propeller": "Пропеллер: ", - "createqol.ability.armor.step_height": "Высокий шаг: ", - "createqol.ability.armor.void_walk": "Левитация над бездной: ", - - "createqol.function.tools.attraction": "Притяжение: ", - "createqol.function.tools.casingifier": "Корпусификатор: ", - "createqol.function.tools.digging": "Расширенное копание: ", - "createqol.function.tools.harvesting": "Автопосадка: ", - "createqol.function.tools.ploughing": "Расширенная вспашка: ", - "createqol.function.tools.reach": "Досягаемость: ", - "createqol.function.tools.repulsion_attraction": "Отталкивание/притяжение: ", - "createqol.function.tools.repulsion": "Отталкивание: ", - "createqol.function.tools.smelting": "Автопереплавка: ", - "createqol.function.tools.tree_decapitation": "Лесоруб: ", - "createqol.function.tools.vein_mine": "Добыча залежи: ", - - "createqol.function.state.disabled_by_config": "запрещ.", - "createqol.function.state.disabled": "выкл.", - "createqol.function.state.enabled": "вкл.", - "createqol.function.state.installed": "уст.", - "createqol.function.state.not_installed": "не уст.", - "createqol.function.state.seconds": "с", + "createqol.ability.armor.disabled": "%s запрещён настройками мира/сервера", + "createqol.ability.armor.unavailable": "%1$s не может быть включён, пока активен %2$s", + "createqol.ability.armor.reloading": "%s перезаряжается...", + "createqol.ability.armor.toggle_message": "%s: ", + + "createqol.ability.tool.disabled": "Режим «%s» запрещён настройками мира/сервера", + "createqol.ability.tool.unavailable": "Режим «%1$s» не может быть включён, пока активен режим «%2$s»", + "createqol.ability.tool.toggle_message": "«%s»: ", + + "createqol.ability.armor.propeller_mode": "Режим пропеллерной тяги/парения", + "createqol.ability.armor.fan_mode": "Режим пропеллерной тяги", + "createqol.ability.armor.hover_mode": "Режим парения", + "createqol.ability.armor.elytra_mode": "Режим полёта", + + "createqol.ability.tool.attraction": "Притягивание", + "createqol.ability.tool.casingifier": "Корпусификатор", + "createqol.ability.tool.digging": "Расширенное копание", + "createqol.ability.tool.harvesting": "Автопосадка", + "createqol.ability.tool.ploughing": "Расширенная вспашка", + "createqol.ability.tool.reach": "Повышенная досягаемость", + "createqol.ability.tool.repulsion_attraction": "Притягивание/отталкивание", + "createqol.ability.tool.repulsion": "Отталкивание", + "createqol.ability.tool.smelting": "Автопереплавка", + "createqol.ability.tool.tree_decapitation": "Лесоруб", + "createqol.ability.tool.vein_mine": "Добыча залежи", + + "createqol.ability.armor.air": "Воздух", + "createqol.ability.armor.arms": "Рукава", + "createqol.ability.armor.belt_blocking": "Сопротивление конвейерам", + "createqol.ability.armor.dash": "Рывок", + "createqol.ability.armor.diving": "Водолаз", + "createqol.ability.armor.effect": "Эффект", + "createqol.ability.armor.elytra": "Элитры", + "createqol.ability.armor.fan": "Пропеллерная тяга", + "createqol.ability.armor.goggles": "Инженерные очки", + "createqol.ability.armor.hover": "Парение", + "createqol.ability.armor.lava_walking": "Лаволаз", + "createqol.ability.armor.propeller": "Пропеллер", + "createqol.ability.armor.step_height": "Высокий шаг", + "createqol.ability.armor.void_walk": "Левитация над бездной", + + "createqol.ability.state.disabled_by_config": "запрещ.", + "createqol.ability.state.disabled": "выкл.", + "createqol.ability.state.enabled": "вкл.", + "createqol.ability.state.installed": "уст.", + "createqol.ability.state.not_installed": "не уст.", + "createqol.ability.state.seconds": "с", "createqol.ponder.ender_packager.header": "Телепортацией коробок", "createqol.ponder.ender_packager.text_1": "Поместите предметы в два слота, чтобы указать частоту", From 3507aab7287d8d3a97646632a579320f05466100 Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Fri, 29 Aug 2025 16:03:35 +0300 Subject: [PATCH 12/13] Fix ru_ru.json --- src/main/resources/assets/createqol/lang/ru_ru.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 7b33a1c..13957ee 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -224,11 +224,11 @@ "createqol.backtank.propeller_disabled": "Установка пропеллера недоступна: режимы пропеллерной тяги и парения запрещены настройками мира/сервера", "createqol.backtank.elytra_disabled": "Установка элитр недоступна: режим полёта запрещён настройками мира/сервера", - "createqol.chestplate.use_fireworks": "Находясь в инвентаре, может быть использован для ускорения полёта, когда надет нагрудник из пост-хроматического сплава, оснащённый элитрами — для этого зажмите [Пробел], находясь в режиме полёта.", - "createqol.chestplate.no_propeller": "Режимы пропеллерной тяги и парения недоступны: баллон не оснащён пропеллером", - "createqol.chestplate.no_elytra": "Режим полёта недоступен: баллон не оснащён элитрами", - "createqol.chestplate.dash_disabled": "Функция рывка запрещена настройками мира/сервера", - "createqol.chestplate.dash_reloading": "Рывок перезаряжается...", + "createqol.ability.armor.use_fireworks": "Находясь в инвентаре, может быть использован для ускорения полёта, когда надет нагрудник из пост-хроматического сплава, оснащённый элитрами — для этого зажмите [Пробел], находясь в режиме полёта.", + "createqol.ability.armor.no_propeller": "Режимы пропеллерной тяги и парения недоступны: баллон не оснащён пропеллером", + "createqol.ability.armor.no_elytra": "Режим полёта недоступен: баллон не оснащён элитрами", + "createqol.ability.armor.dash_disabled": "Функция рывка запрещена настройками мира/сервера", + "createqol.ability.armor.dash_reloading": "Рывок перезаряжается...", "createqol.ability.armor.disabled": "%s запрещён настройками мира/сервера", "createqol.ability.armor.unavailable": "%1$s не может быть включён, пока активен %2$s", From 6790d2c7e38a594879b6d6762b213caf62578b6e Mon Sep 17 00:00:00 2001 From: VladisCrafter <122053125+VladisCrafter@users.noreply.github.com> Date: Fri, 29 Aug 2025 16:05:50 +0300 Subject: [PATCH 13/13] Fix ru_ru.json again lol --- src/main/resources/assets/createqol/lang/ru_ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/createqol/lang/ru_ru.json b/src/main/resources/assets/createqol/lang/ru_ru.json index 13957ee..e7453b6 100644 --- a/src/main/resources/assets/createqol/lang/ru_ru.json +++ b/src/main/resources/assets/createqol/lang/ru_ru.json @@ -237,7 +237,7 @@ "createqol.ability.tool.disabled": "Режим «%s» запрещён настройками мира/сервера", "createqol.ability.tool.unavailable": "Режим «%1$s» не может быть включён, пока активен режим «%2$s»", - "createqol.ability.tool.toggle_message": "«%s»: ", + "createqol.ability.tool.toggle_message": "%s: ", "createqol.ability.armor.propeller_mode": "Режим пропеллерной тяги/парения", "createqol.ability.armor.fan_mode": "Режим пропеллерной тяги",