Better Tooltips, Inventory Tweaks language support

src/main/java/meteordevelopment/meteorclient/mixin/HandledScreenMixin.java

@@ -16,6 +16,7 @@
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -74,17 +75,21 @@ private void onInit(CallbackInfo info) {
         InventoryTweaks invTweaks = Modules.get().get(InventoryTweaks.class);
 
         if (invTweaks.isActive() && invTweaks.showButtons() && invTweaks.canSteal(getScreenHandler())) {
+
+            String steal = I18n.translate("modules.meteor-client.inventory-tweaks.steal");
+            String dump = I18n.translate("modules.meteor-client.inventory-tweaks.dump");
+
             addDrawableChild(
-                new ButtonWidget.Builder(Text.literal("Steal"), button -> invTweaks.steal(getScreenHandler()))
+                new ButtonWidget.Builder(Text.literal(steal), button -> invTweaks.steal(getScreenHandler()))
                     .position(x, y - 22)
-                    .size(40, 20)
+                    .size(steal.length() * 10, 20)
                     .build()
             );
 
             addDrawableChild(
-                new ButtonWidget.Builder(Text.literal("Dump"), button -> invTweaks.dump(getScreenHandler()))
-                    .position(x + 42, y - 22)
-                    .size(40, 20)
+                new ButtonWidget.Builder(Text.literal(dump), button -> invTweaks.dump(getScreenHandler()))
+                    .position(x + steal.length() * 10 + 2, y - 22)
+                    .size(dump.length() * 10, 20)
                     .build()
             );
         }

src/main/java/meteordevelopment/meteorclient/systems/modules/render/BetterTooltips.java

@@ -22,6 +22,7 @@
 import meteordevelopment.meteorclient.utils.tooltip.*;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.block.entity.BeehiveBlockEntity;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.*;
 import net.minecraft.component.type.SuspiciousStewEffectsComponent.StewEffect;
@@ -295,12 +296,12 @@ private void appendTooltip(ItemStackTooltipEvent event) {
                 BlockStateComponent blockStateComponent = event.itemStack().get(DataComponentTypes.BLOCK_STATE);
                 if (blockStateComponent != null) {
                     String level = blockStateComponent.properties().get("honey_level");
-                    event.appendStart(Text.literal(String.format("%sHoney level: %s%s%s.", Formatting.GRAY, Formatting.YELLOW, level, Formatting.GRAY)));
+                    event.appendStart(Text.literal(I18n.translate("modules.meteor-client.better-tooltips.beehive.honey-level", level)));
                 }
 
                 List<BeehiveBlockEntity.BeeData> bees = event.itemStack().get(DataComponentTypes.BEES);
                 if (bees != null) {
-                    event.appendStart(Text.literal(String.format("%sBees: %s%d%s.", Formatting.GRAY, Formatting.YELLOW, bees.size(), Formatting.GRAY)));
+                    event.appendStart(Text.literal(I18n.translate("modules.meteor-client.better-tooltips.beehive.bees", bees.size())));
                 }
             }
         }
@@ -315,12 +316,12 @@ private void appendTooltip(ItemStackTooltipEvent event) {
 
                 ByteCountDataOutput.INSTANCE.reset();
 
-                if (byteCount >= 1024) count = String.format("%.2f kb", byteCount / (float) 1024);
-                else count = String.format("%d bytes", byteCount);
+                if (byteCount >= 1024) count = I18n.translate("modules.meteor-client.better-tooltips.kilobytes", byteCount / (float) 1024);
+                else count = I18n.translate("modules.meteor-client.better-tooltips.bytes", byteCount);
 
-                event.appendEnd(Text.literal(count).formatted(Formatting.GRAY));
+                event.appendEnd(Text.literal(count));
             } catch (Exception e) {
-                event.appendEnd(Text.literal("Error getting bytes.").formatted(Formatting.RED));
+                event.appendEnd(Text.literal(I18n.translate("modules.meteor-client.better-tooltips.error-getting-bytes")));
             }
         }
 
@@ -340,7 +341,7 @@ private void getTooltipData(TooltipDataEvent event) {
         else if (event.itemStack.getItem() == Items.ENDER_CHEST && previewEChest()) {
             event.tooltipData = EChestMemory.isKnown()
                 ? new ContainerTooltipComponent(EChestMemory.ITEMS.toArray(new ItemStack[27]), ECHEST_COLOR)
-                : new TextTooltipComponent(Text.literal("Unknown inventory.").formatted(Formatting.DARK_RED));
+                : new TextTooltipComponent(Text.literal(I18n.translate("modules.meteor-client.better-tooltips.unknown-inventory")));
         }
 
         // Map preview
@@ -426,7 +427,7 @@ private void appendPreviewTooltipText(ItemStackTooltipEvent event, boolean space
         )) {
             // we don't want to add the spacer if the tooltip is hidden
             if (spacer) event.appendEnd(Text.literal(""));
-            event.appendEnd(Text.literal("Hold " + Formatting.YELLOW + keybind + Formatting.RESET + " to preview"));
+            event.appendEnd(Text.literal(I18n.translate("modules.meteor-client.better-tooltips.hold-to-preview", keybind)));
         }
     }
 

src/main/resources/assets/meteor-client/lang/en_us.json

@@ -1,4 +1,18 @@
 {
   "key.meteor-client.open-gui": "Open GUI",
-  "key.meteor-client.open-commands": "Open Commands"
+  "key.meteor-client.open-commands": "Open Commands",
+
+  "modules.meteor-client.better-tooltips.beehive.honey-level": "§7Honey level: §e%s§7.",
+  "modules.meteor-client.better-tooltips.beehive.bees": "§7Bees: §e%d§7.",
+
+  "modules.meteor-client.better-tooltips.kilobytes": "§7%.2f kb",
+  "modules.meteor-client.better-tooltips.bytes": "§7%d bytes",
+  "modules.meteor-client.better-tooltips.error-getting-bytes": "§cError getting bytes.",
+
+  "modules.meteor-client.better-tooltips.unknown-inventory": "§4Unknown inventory",
+
+  "modules.meteor-client.better-tooltips.hold-to-preview": "Hold §e%s§r to preview",
+
+  "modules.meteor-client.inventory-tweaks.dump": "Dump",
+  "modules.meteor-client.inventory-tweaks.steal": "Steal"
 }

src/main/resources/assets/meteor-client/lang/ru_ru.json

@@ -0,0 +1,18 @@
+{
+  "key.meteor-client.open-gui": "Открыть меню",
+  "key.meteor-client.open-commands": "Открыть команды",
+
+  "modules.meteor-client.better-tooltips.beehive.honey-level": "§7Уровень мёда: §e%s§7.",
+  "modules.meteor-client.better-tooltips.beehive.bees": "§7Пчел: §e%d§7.",
+
+  "modules.meteor-client.better-tooltips.kilobytes": "§7%.2f кб",
+  "modules.meteor-client.better-tooltips.bytes": "§7%d байт",
+  "modules.meteor-client.better-tooltips.error-getting-bytes": "§cОшибка при получении байтов.",
+
+  "modules.meteor-client.better-tooltips.unknown-inventory": "§4Неизвестный инвентарь",
+
+  "modules.meteor-client.better-tooltips.hold-to-preview": "Удерживайте §e%s§r для предпросмотра",
+
+  "modules.meteor-client.inventory-tweaks.dump": "Сложить",
+  "modules.meteor-client.inventory-tweaks.steal": "Взять"
+}