diff options
4 files changed, 23 insertions, 22 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java index c4dc6fff..2b9961a9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/Inventory.java @@ -10,6 +10,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.widget.ClickableWidget; +import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.tooltip.TooltipType; @@ -52,7 +53,7 @@ public class Inventory implements ProfileViewerPage { context.drawTexture(TEXTURE, rootX, rootYAdjusted + dimensions.leftInt() * 18 + 17, 0, 215, dimensions.rightInt() * 18 + 7, 7); context.drawTexture(TEXTURE, rootX + dimensions.rightInt() * 18 + 7, rootYAdjusted + dimensions.leftInt() * 18 + 17, 169, 215, 7, 7); - context.drawText(textRenderer, Text.translatable("skyblocker.profileviewer.inventory." + containerName), rootX + 7, rootYAdjusted + 7, Color.DARK_GRAY.getRGB(), false); + context.drawText(textRenderer, I18n.translate("skyblocker.profileviewer.inventory." + containerName), rootX + 7, rootYAdjusted + 7, Color.DARK_GRAY.getRGB(), false); if (containerList.size() > itemsPerPage) { previousPage.setX(rootX + 44); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/InventoryPage.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/InventoryPage.java index d215e6fc..6aa92ef6 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/InventoryPage.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/InventoryPage.java @@ -22,15 +22,15 @@ import java.util.List; import java.util.Map; public class InventoryPage implements ProfileViewerPage { - private static final String[] INVENTORY_PAGES = {"Inventory", "Enderchest", "Backpack", "Wardrobe", "Pets", "Accessory Bag"}; + private static final String[] INVENTORY_PAGES = {"inventory", "enderchest", "backpack", "wardrobe", "pets", "accessoryBag"}; private static final int TOTAL_HEIGHT = 165; private static final Map<String, ItemStack> ICON_MAP = Map.ofEntries( - Map.entry("Wardrobe", Ico.L_CHESTPLATE), - Map.entry("Inventory", Ico.CHEST), - Map.entry("Backpack", ProfileViewerUtils.createSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzYyZjNiM2EwNTQ4MWNkZTc3MjQwMDA1YzBkZGNlZTFjMDY5ZTU1MDRhNjJjZTA5Nzc4NzlmNTVhMzkzOTYxNDYifX19")), - Map.entry("Pets", Ico.BONE), - Map.entry("Enderchest", Ico.E_CHEST), - Map.entry("Accessory Bag", ProfileViewerUtils.createSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTYxYTkxOGMwYzQ5YmE4ZDA1M2U1MjJjYjkxYWJjNzQ2ODkzNjdiNGQ4YWEwNmJmYzFiYTkxNTQ3MzA5ODVmZiJ9fX0=")) + Map.entry("wardrobe", Ico.L_CHESTPLATE), + Map.entry("inventory", Ico.CHEST), + Map.entry("backpack", ProfileViewerUtils.createSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHBzOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzYyZjNiM2EwNTQ4MWNkZTc3MjQwMDA1YzBkZGNlZTFjMDY5ZTU1MDRhNjJjZTA5Nzc4NzlmNTVhMzkzOTYxNDYifX19")), + Map.entry("pets", Ico.BONE), + Map.entry("enderchest", Ico.E_CHEST), + Map.entry("accessoryBag", ProfileViewerUtils.createSkull("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTYxYTkxOGMwYzQ5YmE4ZDA1M2U1MjJjYjkxYWJjNzQ2ODkzNjdiNGQ4YWEwNmJmYzFiYTkxNTQ3MzA5ODVmZiJ9fX0=")) ); private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java index 7a83b2e0..abfd3b67 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/profileviewer/inventory/PlayerInventory.java @@ -9,6 +9,7 @@ import it.unimi.dsi.fastutil.ints.IntIntPair; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.tooltip.TooltipType; @@ -31,9 +32,9 @@ public class PlayerInventory implements ProfileViewerPage { // Z-STACKING forces this nonsense of separating the Background texture and Item Drawing :( public void render(DrawContext context, int mouseX, int mouseY, float delta, int rootX, int rootY) { - drawContainerTextures(context, "Armor", rootX, rootY + 108, IntIntPair.of(1, 4)); - drawContainerTextures(context, "Inventory", rootX, rootY + 2, IntIntPair.of(4, 9)); - drawContainerTextures(context, "Equipment", rootX + 90, rootY + 108, IntIntPair.of(1, 4)); + drawContainerTextures(context, "armor", rootX, rootY + 108, IntIntPair.of(1, 4)); + drawContainerTextures(context, "inventory", rootX, rootY + 2, IntIntPair.of(4, 9)); + drawContainerTextures(context, "equipment", rootX + 90, rootY + 108, IntIntPair.of(1, 4)); tooltip.clear(); drawContainerItems(context, rootX, rootY + 108, IntIntPair.of(1, 4), 36, 40, mouseX, mouseY); @@ -43,7 +44,7 @@ public class PlayerInventory implements ProfileViewerPage { } private void drawContainerTextures(DrawContext context, String containerName, int rootX, int rootY, IntIntPair dimensions) { - if (containerName.equals("Inventory")) { + if (containerName.equals("inventory")) { context.drawTexture(TEXTURE, rootX, rootY + dimensions.leftInt() + 10, 0, 136, dimensions.rightInt() * 18 + 7, dimensions.leftInt() * 18 + 17); context.drawTexture(TEXTURE, rootX + dimensions.rightInt() * 18 + 7, rootY, 169, 0, 7, dimensions.leftInt() * 18 + 21); context.drawTexture(TEXTURE, rootX, rootY, 0, 0, dimensions.rightInt() * 18 + 7, 14); @@ -54,8 +55,7 @@ public class PlayerInventory implements ProfileViewerPage { context.drawTexture(TEXTURE, rootX, rootY + dimensions.leftInt() * 18 + 17, 0, 215, dimensions.rightInt() * 18 + 7, 7); context.drawTexture(TEXTURE, rootX + dimensions.rightInt() * 18 + 7, rootY + dimensions.leftInt() * 18 + 17, 169, 215, 7, 7); } - - context.drawText(textRenderer, Text.translatable("skyblocker.profileviewer.inventory." + containerName), rootX + 7, rootY + 7, Color.DARK_GRAY.getRGB(), false); + context.drawText(textRenderer, I18n.translate("skyblocker.profileviewer.inventory." + containerName), rootX + 7, rootY + 7, Color.DARK_GRAY.getRGB(), false); } private void drawContainerItems(DrawContext context, int rootX, int rootY, IntIntPair dimensions, int startIndex, int endIndex, int mouseX, int mouseY) { diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index ffbe716f..6c285f2f 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -936,14 +936,14 @@ "skyblocker.waypoints.ordered.import.coleWeight.success": "Successfully imported waypoints from the Cole Weight format.", "skyblocker.waypoints.ordered.import.coleWeight.fail": "§cFailed to import waypoints from the Cole Weight format. Make sure to have the waypoint data copied to your clipboard!", - "skyblocker.profileviewer.inventory.Inventory": "Inventory", - "skyblocker.profileviewer.inventory.Armor": "Armor", - "skyblocker.profileviewer.inventory.Equipment": "Equipment", - "skyblocker.profileviewer.inventory.Enderchest": "Enderchest", - "skyblocker.profileviewer.inventory.Backpack": "Backpack", - "skyblocker.profileviewer.inventory.Wardrobe": "Wardrobe", - "skyblocker.profileviewer.inventory.Pets": "Pets", - "skyblocker.profileviewer.inventory.Accessory Bag": "Accessory Bag", + "skyblocker.profileviewer.inventory.inventory": "Inventory", + "skyblocker.profileviewer.inventory.armor": "Armor", + "skyblocker.profileviewer.inventory.equipment": "Equipment", + "skyblocker.profileviewer.inventory.enderchest": "Enderchest", + "skyblocker.profileviewer.inventory.backpack": "Backpack", + "skyblocker.profileviewer.inventory.wardrobe": "Wardrobe", + "skyblocker.profileviewer.inventory.pets": "Pets", + "skyblocker.profileviewer.inventory.accessoryBag": "Accessory Bag", "skyblocker.profileviewer.inventory.inactive": "Locked Slot", "skyblocker.profileviewer.inventory.inactive.description.backpack": "The selected backpack", "skyblocker.profileviewer.inventory.inactive.description.general": "does not contain this slot", |