From 13b09e3be36ab38b92e14c7d808fb04ecdc65b82 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Wed, 22 Mar 2023 12:01:14 +0300 Subject: a cleaner PriceInfoTooltip --- .../skyblocker/config/SkyblockerConfig.java | 5 +- .../skyblocker/skyblock/item/PriceInfoTooltip.java | 134 +++++++-------------- 2 files changed, 44 insertions(+), 95 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 97284bc1..4d3ce5e9 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -6,7 +6,6 @@ import me.shedaniel.autoconfig.annotation.Config; import me.shedaniel.autoconfig.annotation.ConfigEntry; import me.shedaniel.autoconfig.serializer.GsonConfigSerializer; import me.xmrvizzy.skyblocker.chat.ChatFilterResult; -import net.minecraft.item.ItemStack; import java.util.ArrayList; import java.util.List; @@ -219,8 +218,8 @@ public class SkyblockerConfig implements ConfigData { public String toString() { return switch (this) { - case ONE_DAY -> "1 day price"; - case THREE_DAY -> "3 day price"; + case ONE_DAY -> "1 day avg"; + case THREE_DAY -> "3 day avg"; case BOTH -> "Both"; }; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java index dfc498a1..c7df6a99 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -9,10 +9,8 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; -import net.minecraft.text.LiteralTextContent; import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableTextContent; import net.minecraft.util.Formatting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,8 +23,10 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.zip.GZIPInputStream; @@ -42,6 +42,7 @@ public class PriceInfoTooltip { private static JsonObject isMuseumJson; private static boolean nullMsgSend = false; private final static Gson gson = new Gson(); + private static final Map apiAddresses; public static void onInjectTooltip(ItemStack stack, TooltipContext context, List lines) { if (!Utils.isOnSkyblock || client.player == null) return; @@ -184,7 +185,7 @@ public class PriceInfoTooltip { /** * this method converts the "timestamp" variable into the same date format as Hypixel represents it in the museum. - * Currently there are two types of timestamps the legacy which is built like this + * Currently, there are two types of timestamps the legacy which is built like this * "dd/MM/yy hh:mm" ("25/04/20 16:38") and the current which is built like this * "MM/dd/yy hh:mm aa" ("12/24/20 11:08 PM"). Since Hypixel transforms the two formats into one format without * taking into account of their formats, we do the same. The final result looks like this @@ -194,7 +195,7 @@ public class PriceInfoTooltip { * This causes the museum rank to be much worse than it should be. * * @param stack the item under the pointer - * @return if the item have an "Timestamp" it will be shown formated on the tooltip + * @return if the item have a "Timestamp" it will be shown formated on the tooltip */ public static String getTimestamp(ItemStack stack) { NbtCompound tag = getInternalNameForItem(stack); @@ -289,108 +290,57 @@ public class PriceInfoTooltip { SkyblockerConfig.Average type = SkyblockerConfig.get().general.itemTooltip.avg; if (type == SkyblockerConfig.Average.BOTH || oneDayAvgPricesJson == null || threeDayAvgPricesJson == null) { - futureList.add(CompletableFuture.runAsync(() -> downloadAvgPrices(SkyblockerConfig.Average.THREE_DAY))); - futureList.add(CompletableFuture.runAsync(() -> downloadAvgPrices(SkyblockerConfig.Average.ONE_DAY))); - } else { - futureList.add(CompletableFuture.runAsync(() -> downloadAvgPrices(type))); + futureList.add(CompletableFuture.runAsync(() -> oneDayAvgPricesJson = downloadPrices("1 day avg"))); + futureList.add(CompletableFuture.runAsync(() -> threeDayAvgPricesJson = downloadPrices("3 day avg"))); + } else if (type == SkyblockerConfig.Average.ONE_DAY) { + futureList.add(CompletableFuture.runAsync(() -> oneDayAvgPricesJson = downloadPrices("1 day avg"))); + } else if (type == SkyblockerConfig.Average.THREE_DAY) { + futureList.add(CompletableFuture.runAsync(() -> threeDayAvgPricesJson = downloadPrices("3 day avg"))); } } - if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN) { - futureList.add(CompletableFuture.runAsync(PriceInfoTooltip::downloadLowestPrices)); - } - if (SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice) { - futureList.add(CompletableFuture.runAsync(PriceInfoTooltip::downloadBazaarPrices)); - } - if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice && npcPricesJson == null) { - futureList.add(CompletableFuture.runAsync(PriceInfoTooltip::downloadNPCPrices)); - } - if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate && isMuseumJson == null) { - futureList.add(CompletableFuture.runAsync(PriceInfoTooltip::downloadIsMuseum)); - } + if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN) + futureList.add(CompletableFuture.runAsync(() -> lowestPricesJson = downloadPrices("lowest bin"))); + + if (SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice) + futureList.add(CompletableFuture.runAsync(() -> bazaarPricesJson = downloadPrices("bazaar"))); + + if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice && npcPricesJson == null) + futureList.add(CompletableFuture.runAsync(() -> npcPricesJson = downloadPrices("npc"))); + + if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate && isMuseumJson == null) + futureList.add(CompletableFuture.runAsync(() -> isMuseumJson = downloadPrices("museum"))); + minute++; CompletableFuture.allOf(futureList.toArray(new CompletableFuture[0])) .whenComplete((unused, throwable) -> nullMsgSend = false); }, 1200); } - private static void downloadAvgPrices(SkyblockerConfig.Average type) { - JsonObject result = null; - String avgDay = null; - switch (type) { - case ONE_DAY -> avgDay = "1day.json.gz"; - case THREE_DAY -> avgDay = "3day.json.gz"; - } + private static JsonObject downloadPrices(String type) { try { - URL apiAddr = new URL("https://moulberry.codes/auction_averages_lbin/" + avgDay); - try (InputStream src = apiAddr.openStream()) { - try (GZIPInputStream gzipOutput = new GZIPInputStream(src)) { - try (InputStreamReader reader = new InputStreamReader(gzipOutput)) { - result = new Gson().fromJson(reader, JsonObject.class); - } - } - } + String url = apiAddresses.get(type); + URL apiAddress = new URL(url); + InputStream src = apiAddress.openStream(); + InputStreamReader reader = new InputStreamReader(url.contains(".gz") ? new GZIPInputStream(src) : src); + return new Gson().fromJson(reader, JsonObject.class); } catch (IOException e) { - LOGGER.warn("[Skyblocker] Failed to download average BIN prices!", e); - } - switch (type) { - case ONE_DAY -> oneDayAvgPricesJson = result; - case THREE_DAY -> threeDayAvgPricesJson = result; - } - } + LOGGER.warn("[Skyblocker] Failed to download " + type + " prices!", e); - private static void downloadBazaarPrices() { - JsonObject result = null; - try { - URL apiAddr = new URL("https://hysky.de/api/bazaar"); - InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); - result = new Gson().fromJson(reader, JsonObject.class); - } catch (IOException e) { - LOGGER.warn("[Skyblocker] Failed to download bazaar prices!", e); - } - bazaarPricesJson = result; - } + if (type.equals("lowest bin")) + lowestPricesJson = downloadPrices("lowest bin backup"); - private static void downloadLowestPrices() { - JsonObject result = null; - try { - URL apiAddr = new URL("https://lb.tricked.pro/lowestbins"); - InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); - result = new Gson().fromJson(reader, JsonObject.class); - } catch (IOException e) { - LOGGER.warn("[Skyblocker] Failed to download lowest BIN prices from the main source!", e); - try { - URL apiAddr = new URL("https://lb2.tricked.pro/lowestbins"); - InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); - result = new Gson().fromJson(reader, JsonObject.class); - } catch (IOException e2) { - LOGGER.warn("[Skyblocker] Failed to download lowest BIN prices from the backup source!", e2); - } + return null; } - lowestPricesJson = result; } - private static void downloadNPCPrices() { - JsonObject result = null; - try { - URL apiAddr = new URL("https://hysky.de/api/npcprice"); - InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); - result = new Gson().fromJson(reader, JsonObject.class); - } catch (IOException e) { - LOGGER.warn("[Skyblocker] Failed to download NPC prices!", e); - } - npcPricesJson = result; + static { + apiAddresses = new HashMap<>(); + apiAddresses.put("1 day avg", "https://moulberry.codes/auction_averages_lbin/1day.json.gz"); + apiAddresses.put("3 day avg", "https://moulberry.codes/auction_averages_lbin/3day.json.gz"); + apiAddresses.put("bazaar", "https://hysky.de/api/bazaar"); + apiAddresses.put("lowest bin", "https://lb.tricked.pro/lowestbins"); + apiAddresses.put("lowest bin backup", "https://lb2.tricked.pro/lowestbins"); + apiAddresses.put("npc", "https://hysky.de/api/npcprice"); + apiAddresses.put("museum", "https://hysky.de/api/museum"); } - - private static void downloadIsMuseum() { - JsonObject result = null; - try { - URL apiAddr = new URL("https://hysky.de/api/museum"); - InputStreamReader reader = new InputStreamReader(apiAddr.openStream()); - result = new Gson().fromJson(reader, JsonObject.class); - } catch (IOException e) { - LOGGER.warn("[Skyblocker] Failed to download museum items!", e); - } - isMuseumJson = result; - } - } -- cgit From f362d95f9b8477c1f8190e79ca390a09adb658c5 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Wed, 22 Mar 2023 12:33:17 +0300 Subject: fix recipe book --- .../java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java index 17e9aebc..7bfa0997 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java @@ -16,7 +16,7 @@ import java.nio.file.Path; import java.util.*; public class ItemRegistry { - protected static final String REMOTE_ITEM_REPO = "https://github.com/KonaeAkira/NotEnoughUpdates-REPO.git"; + protected static final String REMOTE_ITEM_REPO = "https://github.com/NotEnoughUpdates/NotEnoughUpdates-REPO"; protected static final Path LOCAL_ITEM_REPO_DIR = FabricLoader.getInstance().getConfigDir().resolve("skyblocker/item-repo"); private static final Path ITEM_LIST_DIR = LOCAL_ITEM_REPO_DIR.resolve("items"); @@ -135,7 +135,7 @@ class Recipe { private static ItemStack getItemStack(String internalName) { try { if (internalName.length() > 0) { - int count = Integer.parseInt(internalName.split(":")[1]); + int count = Integer.parseInt(internalName.split(":").length > 1 ? internalName.split(":")[1] : "1"); internalName = internalName.split(":")[0]; ItemStack itemStack = ItemRegistry.itemsMap.get(internalName).copy(); itemStack.setCount(count); -- cgit From 4a3b5a00c174d9c7abe2cfaed84ac09bf464650a Mon Sep 17 00:00:00 2001 From: Fix3d Date: Wed, 22 Mar 2023 13:55:34 +0300 Subject: fix freezing while open wiki and... get wiki link from local repo which is same and exist for recipe book --- .../skyblocker/skyblock/item/WikiLookup.java | 29 +++++----------------- .../skyblocker/skyblock/itemlist/ItemRegistry.java | 16 ++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java index afaf487f..76b4e7c3 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/WikiLookup.java @@ -1,9 +1,7 @@ package me.xmrvizzy.skyblocker.skyblock.item; import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; +import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry; import me.xmrvizzy.skyblocker.utils.Utils; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.client.MinecraftClient; @@ -16,11 +14,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Util; import org.lwjgl.glfw.GLFW; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.net.URLConnection; +import java.util.concurrent.CompletableFuture; public class WikiLookup { public static KeyBinding wikiLookup; @@ -51,23 +45,12 @@ public class WikiLookup { if (Utils.isOnSkyblock) { id = getSkyblockId(slot); try { - //Setting up a connection with the repo - String urlString = "https://raw.githubusercontent.com/NotEnoughUpdates/NotEnoughUpdates-REPO/master/items/" + id + ".json"; - URL url = new URL(urlString); - URLConnection request = url.openConnection(); - request.connect(); - - //yoinking the wiki link - JsonElement root = JsonParser.parseReader(new InputStreamReader((InputStream) request.getContent())); - JsonObject rootobj = root.getAsJsonObject(); - String wikiLink = rootobj.get("info").getAsJsonArray().get(1).getAsString(); - Util.getOperatingSystem().open(wikiLink); - } catch (IOException | NullPointerException e) { - e.printStackTrace(); - client.player.sendMessage(Text.of("Can't locate a wiki article for this item..."), false); + String wikiLink = ItemRegistry.getWikiLink(id); + CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink)); } catch (IndexOutOfBoundsException | IllegalStateException e) { e.printStackTrace(); - client.player.sendMessage(Text.of("Error while retrieving wiki article..."), false); + if (client.player != null) + client.player.sendMessage(Text.of("Error while retrieving wiki article..."), false); } } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java index 7bfa0997..2bb16a34 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java @@ -4,13 +4,16 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.MinecraftClient; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.text.Text; import org.eclipse.jgit.api.Git; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; @@ -24,6 +27,7 @@ public class ItemRegistry { protected static List items = new ArrayList<>(); protected static Map itemsMap = new HashMap<>(); protected static List recipes = new ArrayList<>(); + static final MinecraftClient client = MinecraftClient.getInstance(); // TODO: make async public static void init() { @@ -95,6 +99,18 @@ public class ItemRegistry { }); } + public static String getWikiLink(String internalName) { + try { + String fileContent = Files.readString(ITEM_LIST_DIR.resolve(internalName + ".json")); + JsonObject fileJson = JsonParser.parseString(fileContent).getAsJsonObject(); + return fileJson.get("info").getAsJsonArray().get(1).getAsString(); + } catch (IOException | NullPointerException e) { + e.printStackTrace(); + client.player.sendMessage(Text.of("Can't locate a wiki article for this item..."), false); + return null; + } + } + public static List getRecipes(String internalName) { List result = new ArrayList<>(); for (Recipe recipe : recipes) -- cgit From 47e9ec4135540eb03e2363ddfc6ca7535e77377e Mon Sep 17 00:00:00 2001 From: Fix3d Date: Fri, 24 Mar 2023 19:15:34 +0300 Subject: more readability for PriceInfoTooltip --- .../skyblocker/skyblock/item/PriceInfoTooltip.java | 157 +++++++++++---------- 1 file changed, 81 insertions(+), 76 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java index c7df6a99..608122ad 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -56,11 +56,9 @@ public class PriceInfoTooltip { if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice) { if (npcPricesJson == null) { - if (!nullMsgSend) { - client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false); - nullMsgSend = true; - } - } else if (npcPricesJson.has(name)) { + nullWarning(); + } + else if (npcPricesJson.has(name)) { lines.add(Text.literal(String.format("%-21s", "NPC Price:")) .formatted(Formatting.YELLOW) .append(getCoinsMessage(npcPricesJson.get(name).getAsDouble(), count))); @@ -70,11 +68,9 @@ public class PriceInfoTooltip { boolean bazaarExist = false; if (SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice && !bazaarOpened) { if (bazaarPricesJson == null) { - if (!nullMsgSend) { - client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false); - nullMsgSend = true; - } - } else if (bazaarPricesJson.has(name)) { + nullWarning(); + } + else if (bazaarPricesJson.has(name)) { JsonObject getItem = bazaarPricesJson.getAsJsonObject(name); lines.add(Text.literal(String.format("%-18s", "Bazaar buy Price:")) .formatted(Formatting.GOLD) @@ -93,11 +89,9 @@ public class PriceInfoTooltip { // bazaarOpened & bazaarExist check for lbin, because Skytils keeps some bazaar item data in lbin api if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN && !bazaarOpened && !bazaarExist) { if (lowestPricesJson == null) { - if (!nullMsgSend) { - client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false); - nullMsgSend = true; - } - } else if (lowestPricesJson.has(name)) { + nullWarning(); + } + else if (lowestPricesJson.has(name)) { lines.add(Text.literal(String.format("%-19s", "Lowest BIN Price:")) .formatted(Formatting.GOLD) .append(getCoinsMessage(lowestPricesJson.get(name).getAsDouble(), count))); @@ -106,11 +100,9 @@ public class PriceInfoTooltip { if (SkyblockerConfig.get().general.itemTooltip.enableAvgBIN) { if (threeDayAvgPricesJson == null || oneDayAvgPricesJson == null) { - if (!nullMsgSend) { - client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false); - nullMsgSend = true; - } - } else if (threeDayAvgPricesJson.has(name) || oneDayAvgPricesJson.has(name)) { + nullWarning(); + } + else if (threeDayAvgPricesJson.has(name) || oneDayAvgPricesJson.has(name)) { /* We are skipping check average prices for potions and runes because there is no data for their in API. @@ -156,11 +148,9 @@ public class PriceInfoTooltip { if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate && !bazaarOpened) { if (isMuseumJson == null) { - if (!nullMsgSend) { - client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false); - nullMsgSend = true; - } - } else if (isMuseumJson.has(name)) { + nullWarning(); + } + else if (isMuseumJson.has(name)) { String itemCategory = isMuseumJson.get(name).toString().replaceAll("\"", ""); String format = switch (itemCategory) { case "Weapons" -> "%-18s"; @@ -170,15 +160,23 @@ public class PriceInfoTooltip { lines.add(Text.literal(String.format(format, "Museum: (" + itemCategory + ")")) .formatted(Formatting.LIGHT_PURPLE) .append(Text.literal(timestamp != null ? timestamp : "").formatted(Formatting.RED))); - } else if (timestamp != null) { + } + else if (timestamp != null) { lines.add(Text.literal(String.format("%-21s", "Obtained: ")) .formatted(Formatting.LIGHT_PURPLE) .append(Text.literal(timestamp).formatted(Formatting.RED))); } } } + + private static void nullWarning() { + if (!nullMsgSend && client.player != null) { + client.player.sendMessage(Text.translatable("skyblocker.itemTooltip.nullMessage"), false); + nullMsgSend = true; + } + } - public static NbtCompound getInternalNameForItem(ItemStack stack) { + public static NbtCompound getItemNBT(ItemStack stack) { if (stack == null) return null; return stack.getNbt(); } @@ -198,80 +196,85 @@ public class PriceInfoTooltip { * @return if the item have a "Timestamp" it will be shown formated on the tooltip */ public static String getTimestamp(ItemStack stack) { - NbtCompound tag = getInternalNameForItem(stack); - String internalName = null; + NbtCompound tag = getItemNBT(stack); + if (tag != null && tag.contains("ExtraAttributes", 10)) { NbtCompound ea = tag.getCompound("ExtraAttributes"); if (ea.contains("timestamp", 8)) { - internalName = ea.getString("timestamp"); - SimpleDateFormat dt = new SimpleDateFormat("MM/dd/yy"); + SimpleDateFormat nbtFormat = new SimpleDateFormat("MM/dd/yy"); try { - Date date = dt.parse(internalName); - SimpleDateFormat dt1 = new SimpleDateFormat("MMMM dd, yyyy", Locale.ENGLISH); - internalName = dt1.format(date); + Date date = nbtFormat.parse(ea.getString("timestamp")); + SimpleDateFormat skyblockerFormat = new SimpleDateFormat("MMMM dd, yyyy", Locale.ENGLISH); + return skyblockerFormat.format(date); } catch (ParseException e) { LOGGER.warn("[Skyblocker-tooltip] getTimestamp", e); } } } - return internalName; + + return null; } public static String getInternalNameFromNBT(ItemStack stack) { - NbtCompound tag = getInternalNameForItem(stack); - String internalName = null; + NbtCompound tag = getItemNBT(stack); if (tag != null && tag.contains("ExtraAttributes", 10)) { NbtCompound ea = tag.getCompound("ExtraAttributes"); if (ea.contains("id", 8)) { - internalName = ea.getString("id"); - } else { - return null; - } - - if ("ENCHANTED_BOOK".equals(internalName)) { - if (ea.contains("enchantments")) { - NbtCompound enchants = ea.getCompound("enchantments"); - String enchant = enchants.getKeys().stream().findFirst().get(); - internalName += "-" + enchant.toUpperCase(Locale.ENGLISH) + "-" + enchants.getInt(enchant); - } - } else if ("PET".equals(internalName)) { - if (ea.contains("petInfo")) { - JsonObject petInfo = gson.fromJson(ea.getString("petInfo"), JsonObject.class); - internalName += "-" + petInfo.get("type").getAsString() + "-" + petInfo.get("tier").getAsString(); - } - } else if ("POTION".equals(internalName)) { - String enhanced = ea.contains("enhanced") ? "-ENHANCED" : ""; - String extended = ea.contains("extended") ? "-EXTENDED" : ""; - String splash = ea.contains("splash") ? "-SPLASH" : ""; - if (ea.contains("potion") && ea.contains("potion_level")) { - internalName += "-" + ea.getString("potion").toUpperCase(Locale.ENGLISH) + "-" + ea.getInt("potion_level") - + enhanced + extended + splash; + String internalName = ea.getString("id"); + + // Transformation to API format. + if ("ENCHANTED_BOOK".equals(internalName)) { + if (ea.contains("enchantments")) { + NbtCompound enchants = ea.getCompound("enchantments"); + String enchant = enchants.getKeys().stream().findFirst().get(); + return internalName + "-" + enchant.toUpperCase(Locale.ENGLISH) + "-" + enchants.getInt(enchant); + } + } else if ("PET".equals(internalName)) { + if (ea.contains("petInfo")) { + JsonObject petInfo = gson.fromJson(ea.getString("petInfo"), JsonObject.class); + return internalName + "-" + petInfo.get("type").getAsString() + "-" + petInfo.get("tier").getAsString(); + } + } else if ("POTION".equals(internalName)) { + String enhanced = ea.contains("enhanced") ? "-ENHANCED" : ""; + String extended = ea.contains("extended") ? "-EXTENDED" : ""; + String splash = ea.contains("splash") ? "-SPLASH" : ""; + if (ea.contains("potion") && ea.contains("potion_level")) { + return internalName + "-" + ea.getString("potion").toUpperCase(Locale.ENGLISH) + "-" + ea.getInt("potion_level") + + enhanced + extended + splash; + } + } else if ("RUNE".equals(internalName)) { + if (ea.contains("runes")) { + NbtCompound runes = ea.getCompound("runes"); + String rune = runes.getKeys().stream().findFirst().get(); + return internalName + "-" + rune.toUpperCase(Locale.ENGLISH) + "-" + runes.getInt(rune); + } } - } else if ("RUNE".equals(internalName)) { - if (ea.contains("runes")) { - NbtCompound runes = ea.getCompound("runes"); - String rune = runes.getKeys().stream().findFirst().get(); - internalName += "-" + rune.toUpperCase(Locale.ENGLISH) + "-" + runes.getInt(rune); - } - } + return internalName; + } + else + return null; } - return internalName; + else + return null; } private static Text getCoinsMessage(double price, int count) { if (count == 1) { String priceString = String.format(Locale.ENGLISH, "%1$,.1f", price); return Text.literal(priceString + " Coins").formatted(Formatting.DARK_AQUA); - } else { - String priceString = String.format(Locale.ENGLISH, "%1$,.1f", price * count); - MutableText priceText = Text.literal(priceString + " Coins ").formatted(Formatting.DARK_AQUA); - priceString = String.format(Locale.ENGLISH, "%1$,.1f", price); - MutableText priceText2 = Text.literal( "(" + priceString + " each)").formatted(Formatting.GRAY); - return priceText.append(priceText2); + } + else { + String priceStringTotal = String.format(Locale.ENGLISH, "%1$,.1f", price * count); + MutableText priceTextTotal = Text.literal(priceStringTotal + " Coins ").formatted(Formatting.DARK_AQUA); + + String priceStringEach = String.format(Locale.ENGLISH, "%1$,.1f", price); + MutableText priceTextEach = Text.literal( "(" + priceStringEach + " each)").formatted(Formatting.GRAY); + + return priceTextTotal.append(priceTextEach); } } @@ -292,9 +295,11 @@ public class PriceInfoTooltip { if (type == SkyblockerConfig.Average.BOTH || oneDayAvgPricesJson == null || threeDayAvgPricesJson == null) { futureList.add(CompletableFuture.runAsync(() -> oneDayAvgPricesJson = downloadPrices("1 day avg"))); futureList.add(CompletableFuture.runAsync(() -> threeDayAvgPricesJson = downloadPrices("3 day avg"))); - } else if (type == SkyblockerConfig.Average.ONE_DAY) { + } + else if (type == SkyblockerConfig.Average.ONE_DAY) { futureList.add(CompletableFuture.runAsync(() -> oneDayAvgPricesJson = downloadPrices("1 day avg"))); - } else if (type == SkyblockerConfig.Average.THREE_DAY) { + } + else if (type == SkyblockerConfig.Average.THREE_DAY) { futureList.add(CompletableFuture.runAsync(() -> threeDayAvgPricesJson = downloadPrices("3 day avg"))); } } -- cgit From ea05cbb827c06ec7480a3006e39ccfec1c7bf137 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Tue, 28 Mar 2023 10:54:30 +0300 Subject: async updateItemRepo --- .../skyblock/itemlist/ItemListWidget.java | 25 ++++++++++++++-------- .../skyblocker/skyblock/itemlist/ItemRegistry.java | 20 ++++++++++++----- 2 files changed, 31 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java index a635cea2..75d53323 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java @@ -13,7 +13,6 @@ import net.minecraft.client.render.GameRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.screen.AbstractRecipeScreenHandler; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableTextContent; import net.minecraft.util.Formatting; @Environment(value= EnvType.CLIENT) @@ -39,8 +38,10 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select this.searchField = ((RecipeBookWidgetAccessor)this).getSearchField(); int x = (this.parentWidth - 147) / 2 - this.leftOffset; int y = (this.parentHeight - 166) / 2; - this.results = new SearchResultsWidget(this.client, x , y); - this.updateSearchResult(); + if (ItemRegistry.filesImported) { + this.results = new SearchResultsWidget(this.client, x, y); + this.updateSearchResult(); + } } @Override @@ -56,33 +57,39 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select int j = (this.parentHeight - 166) / 2; this.drawTexture(matrices, i, j, 1, 1, 147, 166); this.searchField = ((RecipeBookWidgetAccessor)this).getSearchField(); - if (!this.searchField.isFocused() && this.searchField.getText().isEmpty()) { + + if (!ItemRegistry.filesImported && !this.searchField.isFocused() && this.searchField.getText().isEmpty()) { + Text hintText = (Text.literal("Loading...")).formatted(Formatting.ITALIC).formatted(Formatting.GRAY); + drawTextWithShadow(matrices, this.client.textRenderer, hintText, i + 25, j + 14, -1); + } else if (!this.searchField.isFocused() && this.searchField.getText().isEmpty()) { Text hintText = (Text.translatable("gui.recipebook.search_hint")).formatted(Formatting.ITALIC).formatted(Formatting.GRAY); drawTextWithShadow(matrices, this.client.textRenderer, hintText, i + 25, j + 14, -1); } else { this.searchField.render(matrices, mouseX, mouseY, delta); } - this.updateSearchResult(); - this.results.render(matrices, mouseX, mouseY, delta); + if (ItemRegistry.filesImported && results != null){ + this.updateSearchResult(); + this.results.render(matrices, mouseX, mouseY, delta); + } matrices.pop(); } } @Override public void drawTooltip(MatrixStack matrices, int x, int y, int mouseX, int mouseY) { - if (this.isOpen()) { + if (this.isOpen() && ItemRegistry.filesImported && results != null) { this.results.drawTooltip(matrices, mouseX, mouseY); } } @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.isOpen() && !this.client.player.isSpectator()) { + if (this.isOpen() && !this.client.player.isSpectator() && ItemRegistry.filesImported && results != null) { if (this.searchField.mouseClicked(mouseX, mouseY, button)) { this.results.closeRecipeView(); return true; } - if (this.results.mouseClicked(mouseX, mouseY, button)) return true; + return this.results.mouseClicked(mouseX, mouseY, button); } return false; } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java index 2bb16a34..f0958514 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java @@ -17,8 +17,10 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; +import java.util.concurrent.CompletableFuture; public class ItemRegistry { + private static final Logger LOGGER = LoggerFactory.getLogger(ItemRegistry.class); protected static final String REMOTE_ITEM_REPO = "https://github.com/NotEnoughUpdates/NotEnoughUpdates-REPO"; protected static final Path LOCAL_ITEM_REPO_DIR = FabricLoader.getInstance().getConfigDir().resolve("skyblocker/item-repo"); @@ -27,13 +29,20 @@ public class ItemRegistry { protected static List items = new ArrayList<>(); protected static Map itemsMap = new HashMap<>(); protected static List recipes = new ArrayList<>(); - static final MinecraftClient client = MinecraftClient.getInstance(); + protected static final MinecraftClient client = MinecraftClient.getInstance(); + static boolean filesImported = false; - // TODO: make async public static void init() { - updateItemRepo(); - ItemStackBuilder.init(); - importItemFiles(); + CompletableFuture.runAsync(ItemRegistry::updateItemRepo) + .whenComplete((result, ex) -> { + if (ex == null) { + ItemStackBuilder.init(); + importItemFiles(); + } + else { + LOGGER.error("[Skyblocker-ItemRegistry] " + ex); + } + }); } private static void updateItemRepo() { @@ -97,6 +106,7 @@ public class ItemRegistry { } return lhsFamilyName.compareTo(rhsFamilyName); }); + filesImported = true; } public static String getWikiLink(String internalName) { -- cgit From 16e61da08b98ecaaff5ce71458958178732f6d29 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Wed, 29 Mar 2023 17:17:51 +0300 Subject: conflicts resolved --- .../java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java | 4 +++- .../skyblocker/skyblock/itemlist/ItemListWidget.java | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 4d3ce5e9..e711e681 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -66,7 +66,7 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Category("button8") @ConfigEntry.Gui.CollapsibleObject(startExpanded = false) - public QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"), "none", "/warp dungeon"); + public QuickNavItem button8 = new QuickNavItem(true, new ItemData("player_head", 1, "tag:{SkullOwner:{Id:[I;1605800870,415127827,-1236127084,15358548],Properties:{textures:[{Value:\"e3RleHR1cmVzOntTS0lOOnt1cmw6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzg5MWQ1YjI3M2ZmMGJjNTBjOTYwYjJjZDg2ZWVmMWM0MGExYjk0MDMyYWU3MWU3NTQ3NWE1NjhhODI1NzQyMSJ9fX0=\"}]}}}"), "none", "/warp dungeon_hub"); @ConfigEntry.Category("button9") @ConfigEntry.Gui.CollapsibleObject(startExpanded = false) @@ -174,6 +174,7 @@ public class SkyblockerConfig implements ConfigData { RIGHT, NONE; + @Override public String toString() { return switch (this) { case LAYER1 -> "Layer 1"; @@ -216,6 +217,7 @@ public class SkyblockerConfig implements ConfigData { THREE_DAY, BOTH; + @Override public String toString() { return switch (this) { case ONE_DAY -> "1 day avg"; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java index 75d53323..7434b92b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java @@ -49,7 +49,7 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select if (this.isOpen()) { matrices.push(); matrices.translate(0.0D, 0.0D, 100.0D); - RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShader(GameRenderer::getPositionTexProgram); RenderSystem.setShaderTexture(0, TEXTURE); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); this.searchField = ((RecipeBookWidgetAccessor)this).getSearchField(); @@ -88,9 +88,9 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select if (this.searchField.mouseClicked(mouseX, mouseY, button)) { this.results.closeRecipeView(); return true; - } - return this.results.mouseClicked(mouseX, mouseY, button); - } - return false; + } else + return this.results.mouseClicked(mouseX, mouseY, button); + } else + return false; } -} +} \ No newline at end of file -- cgit From da7f2e8dc92f40764d71a1408dd5d4a9add7625f Mon Sep 17 00:00:00 2001 From: Fix3d Date: Wed, 29 Mar 2023 17:45:11 +0300 Subject: forgotten null check --- .../java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java index 7434b92b..86fe580d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java @@ -85,7 +85,7 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { if (this.isOpen() && !this.client.player.isSpectator() && ItemRegistry.filesImported && results != null) { - if (this.searchField.mouseClicked(mouseX, mouseY, button)) { + if (this.searchField != null && this.searchField.mouseClicked(mouseX, mouseY, button)) { this.results.closeRecipeView(); return true; } else -- cgit From bd8415eafe741d37f658c3235658a1f2d9fb4ed2 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Sat, 1 Apr 2023 13:22:24 -0400 Subject: Migrated to ClientReceiveMessageEvents and some fixes (cherry picked from commit 9a8799ac40b12bed3e5e4d7aa32054eba7882580) --- .../skyblocker/chat/ChatMessageListener.java | 38 +++++++++++++++++++- .../skyblocker/mixin/ChatHudListenerMixin.java | 41 ---------------------- src/main/resources/skyblocker.mixins.json | 1 - 3 files changed, 37 insertions(+), 43 deletions(-) delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java index 2e23bf31..a5d3aa41 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java @@ -7,11 +7,19 @@ import me.xmrvizzy.skyblocker.skyblock.dungeon.ThreeWeirdos; import me.xmrvizzy.skyblocker.skyblock.dungeon.Trivia; import me.xmrvizzy.skyblocker.skyblock.dwarven.Fetchur; import me.xmrvizzy.skyblocker.skyblock.dwarven.Puzzler; +import me.xmrvizzy.skyblocker.utils.Utils; +import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.text.Text; +@FunctionalInterface public interface ChatMessageListener { + /** + * An event called when a game message is received. Register your listeners in {@link ChatMessageListener#init()}. + */ Event EVENT = EventFactory.createArrayBacked(ChatMessageListener.class, (listeners) -> (message, asString) -> { for (ChatMessageListener listener : listeners) { @@ -21,6 +29,9 @@ public interface ChatMessageListener { return ChatFilterResult.PASS; }); + /** + * Registers {@link ChatMessageListener}s to {@link ChatMessageListener#EVENT} and registers {@link ChatMessageListener#EVENT} to {@link ClientReceiveMessageEvents#ALLOW_GAME} + */ static void init() { ChatMessageListener[] listeners = new ChatMessageListener[]{ // Features @@ -41,8 +52,33 @@ public interface ChatMessageListener { new TeleportPadFilter(), new AutopetFilter(), }; - for (ChatMessageListener listener : listeners) + // Register all listeners to EVENT + for (ChatMessageListener listener : listeners) { EVENT.register(listener); + } + // Register EVENT to ClientReceiveMessageEvents.ALLOW_GAME from fabric api + ClientReceiveMessageEvents.ALLOW_GAME.register((message, overlay) -> { + if (!Utils.isOnSkyblock) { + return true; + } + ChatFilterResult result = EVENT.invoker().onMessage(message, message.getString()); + switch (result) { + case ACTION_BAR -> { + if (overlay) { + return true; + } + ClientPlayerEntity player = MinecraftClient.getInstance().player; + if (player != null) { + player.sendMessage(message, true); + return false; + } + } + case FILTER -> { + return false; + } + } + return true; + }); } ChatFilterResult onMessage(Text message, String asString); diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java deleted file mode 100644 index 8176a810..00000000 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/ChatHudListenerMixin.java +++ /dev/null @@ -1,41 +0,0 @@ -package me.xmrvizzy.skyblocker.mixin; - -import me.xmrvizzy.skyblocker.chat.ChatFilterResult; -import me.xmrvizzy.skyblocker.chat.ChatMessageListener; -import me.xmrvizzy.skyblocker.utils.Utils; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.hud.ChatHud; -import net.minecraft.client.gui.hud.MessageIndicator; -import net.minecraft.client.network.ClientPlayerEntity; -import net.minecraft.network.message.MessageSignatureData; -import net.minecraft.text.Text; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(ChatHud.class) -public abstract class ChatHudListenerMixin { - @Shadow - @Final - private MinecraftClient client; - - @Inject(method = "addMessage(Lnet/minecraft/text/Text;Lnet/minecraft/network/message/MessageSignatureData;ILnet/minecraft/client/gui/hud/MessageIndicator;Z)V", at = @At("HEAD"), cancellable = true) - public void skyblocker$onMessage(Text message, MessageSignatureData signature, int ticks, MessageIndicator indicator, boolean refresh, CallbackInfo ci) { - if (!Utils.isOnSkyblock) - return; - String asString = message.getString(); - ChatFilterResult result = ChatMessageListener.EVENT.invoker().onMessage(message, asString); - switch (result) { - case ACTION_BAR: - ClientPlayerEntity player = client.player; - if (player != null) - player.sendMessage(message, true); - case FILTER: - ci.cancel(); - } - } - -} diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index fc37cfb0..b54d5eb0 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -3,7 +3,6 @@ "package": "me.xmrvizzy.skyblocker.mixin", "compatibilityLevel": "JAVA_17", "client": [ - "ChatHudListenerMixin", "ClientPlayerEntityMixin", "InGameHudMixin", "ItemRendererMixin", -- cgit From d7a62f213b0bddae9b1cc925b7626b8f4cb25823 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Sat, 15 Apr 2023 00:33:36 +0300 Subject: fix average price on pets and some cleanup for timestamp --- .../skyblocker/skyblock/item/PriceInfoTooltip.java | 92 ++++++++++++---------- 1 file changed, 49 insertions(+), 43 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java index 608122ad..e0cb97aa 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -51,7 +51,6 @@ public class PriceInfoTooltip { if (name == null) return; int count = stack.getCount(); - String timestamp = getTimestamp(stack); boolean bazaarOpened = lines.stream().anyMatch(each -> each.getString().contains("Buy price:") || each.getString().contains("Sell price:")); if (SkyblockerConfig.get().general.itemTooltip.enableNPCPrice) { @@ -102,46 +101,50 @@ public class PriceInfoTooltip { if (threeDayAvgPricesJson == null || oneDayAvgPricesJson == null) { nullWarning(); } - else if (threeDayAvgPricesJson.has(name) || oneDayAvgPricesJson.has(name)) { + else { /* - We are skipping check average prices for potions and runes - because there is no data for their in API. + We are skipping check average prices for potions, runes + and enchanted books because there is no data for their in API. */ if (name.contains("PET-")) { name = name.replace("PET-", "") - .replace("COMMON", "0") .replace("UNCOMMON", "1") + .replace("COMMON", "0") .replace("RARE", "2") .replace("EPIC", "3") .replace("LEGENDARY", "4") .replace("MYTHIC", "5") .replace("-", ";"); - } else if (name.contains("ENCHANTED_BOOK-")) { - name = name.replace("ENCHANTED_BOOK-", "").replace("-", ";"); - } else if (name.contains("POTION-")) { - name = ""; - } else if (name.contains("RUNE-")) { + } else if (name.contains("POTION-") || name.contains("RUNE-") || name.contains("ENCHANTED_BOOK-")) { name = ""; } else { name = name.replace(":", "-"); } - SkyblockerConfig.Average type = SkyblockerConfig.get().general.itemTooltip.avg; - - // "No data" line because of API not keeping old data, it causes NullPointerException - if (!name.isEmpty() && (type == SkyblockerConfig.Average.ONE_DAY || type == SkyblockerConfig.Average.BOTH)) { - lines.add(Text.literal(String.format("%-19s", "1 Day Avg. Price:")) - .formatted(Formatting.GOLD) - .append(oneDayAvgPricesJson.get(name) == null - ? Text.literal("No data").formatted(Formatting.RED) - : getCoinsMessage(oneDayAvgPricesJson.get(name).getAsDouble(), count))); - } - if (!name.isEmpty() && (type == SkyblockerConfig.Average.THREE_DAY || type == SkyblockerConfig.Average.BOTH)) { - lines.add(Text.literal(String.format("%-19s", "3 Day Avg. Price:")) - .formatted(Formatting.GOLD) - .append(threeDayAvgPricesJson.get(name) == null - ? Text.literal("No data").formatted(Formatting.RED) - : getCoinsMessage(threeDayAvgPricesJson.get(name).getAsDouble(), count))); + if (!name.isEmpty() && (threeDayAvgPricesJson.has(name) || oneDayAvgPricesJson.has(name))) { + SkyblockerConfig.Average type = SkyblockerConfig.get().general.itemTooltip.avg; + + // "No data" line because of API not keeping old data, it causes NullPointerException + if (type == SkyblockerConfig.Average.ONE_DAY || type == SkyblockerConfig.Average.BOTH) { + lines.add( + Text.literal(String.format("%-19s", "1 Day Avg. Price:")) + .formatted(Formatting.GOLD) + .append(oneDayAvgPricesJson.get(name) == null + ? Text.literal("No data").formatted(Formatting.RED) + : getCoinsMessage(oneDayAvgPricesJson.get(name).getAsDouble(), count) + ) + ); + } + if (type == SkyblockerConfig.Average.THREE_DAY || type == SkyblockerConfig.Average.BOTH) { + lines.add( + Text.literal(String.format("%-19s", "3 Day Avg. Price:")) + .formatted(Formatting.GOLD) + .append(threeDayAvgPricesJson.get(name) == null + ? Text.literal("No data").formatted(Formatting.RED) + : getCoinsMessage(threeDayAvgPricesJson.get(name).getAsDouble(), count) + ) + ); + } } } } @@ -149,22 +152,25 @@ public class PriceInfoTooltip { if (SkyblockerConfig.get().general.itemTooltip.enableMuseumDate && !bazaarOpened) { if (isMuseumJson == null) { nullWarning(); - } - else if (isMuseumJson.has(name)) { - String itemCategory = isMuseumJson.get(name).toString().replaceAll("\"", ""); - String format = switch (itemCategory) { - case "Weapons" -> "%-18s"; - case "Armor" -> "%-19s"; - default -> "%-20s"; - }; - lines.add(Text.literal(String.format(format, "Museum: (" + itemCategory + ")")) - .formatted(Formatting.LIGHT_PURPLE) - .append(Text.literal(timestamp != null ? timestamp : "").formatted(Formatting.RED))); - } - else if (timestamp != null) { - lines.add(Text.literal(String.format("%-21s", "Obtained: ")) - .formatted(Formatting.LIGHT_PURPLE) - .append(Text.literal(timestamp).formatted(Formatting.RED))); + } + else { + String timestamp = getTimestamp(stack); + + if (isMuseumJson.has(name)) { + String itemCategory = isMuseumJson.get(name).toString().replaceAll("\"", ""); + String format = switch (itemCategory) { + case "Weapons" -> "%-18s"; + case "Armor" -> "%-19s"; + default -> "%-20s"; + }; + lines.add(Text.literal(String.format(format, "Museum: (" + itemCategory + ")")) + .formatted(Formatting.LIGHT_PURPLE) + .append(Text.literal(timestamp).formatted(Formatting.RED))); + } else if (!timestamp.isEmpty()) { + lines.add(Text.literal(String.format("%-21s", "Obtained: ")) + .formatted(Formatting.LIGHT_PURPLE) + .append(Text.literal(timestamp).formatted(Formatting.RED))); + } } } } @@ -214,7 +220,7 @@ public class PriceInfoTooltip { } } - return null; + return ""; } public static String getInternalNameFromNBT(ItemStack stack) { -- cgit From 21b64be8d85d37e107ffd628416031e0839c9990 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Sun, 16 Apr 2023 05:39:40 +0300 Subject: add update repository command "/skyblocker updaterepository" --- .../me/xmrvizzy/skyblocker/SkyblockerInitializer.java | 2 ++ .../skyblocker/skyblock/itemlist/ItemRegistry.java | 18 +++++++----------- src/main/resources/assets/skyblocker/lang/en_us.json | 2 ++ 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java index 3d713727..f17ab1fb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java +++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerInitializer.java @@ -4,6 +4,7 @@ import me.xmrvizzy.skyblocker.chat.ChatMessageListener; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import me.xmrvizzy.skyblocker.discord.DiscordRPCManager; import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock; +import me.xmrvizzy.skyblocker.skyblock.api.RepositoryUpdate; import me.xmrvizzy.skyblocker.skyblock.api.StatsCommand; import me.xmrvizzy.skyblocker.skyblock.dwarven.DwarvenHud; import me.xmrvizzy.skyblocker.skyblock.item.PriceInfoTooltip; @@ -20,6 +21,7 @@ public class SkyblockerInitializer implements ClientModInitializer { PriceInfoTooltip.init(); WikiLookup.init(); ItemRegistry.init(); + RepositoryUpdate.init(); StatsCommand.init(); DwarvenHud.init(); ChatMessageListener.init(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java index ea7184cc..91a59fcb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java @@ -22,15 +22,15 @@ import java.util.concurrent.CompletableFuture; public class ItemRegistry { private static final Logger LOGGER = LoggerFactory.getLogger(ItemRegistry.class); protected static final String REMOTE_ITEM_REPO = "https://github.com/NotEnoughUpdates/NotEnoughUpdates-REPO"; - protected static final Path LOCAL_ITEM_REPO_DIR = FabricLoader.getInstance().getConfigDir().resolve("skyblocker/item-repo"); + public static final Path LOCAL_ITEM_REPO_DIR = FabricLoader.getInstance().getConfigDir().resolve("skyblocker/item-repo"); - private static final Path ITEM_LIST_DIR = LOCAL_ITEM_REPO_DIR.resolve("items"); + protected static final Path ITEM_LIST_DIR = LOCAL_ITEM_REPO_DIR.resolve("items"); protected static final List items = new ArrayList<>(); protected static final Map itemsMap = new HashMap<>(); protected static final List recipes = new ArrayList<>(); - protected static final MinecraftClient client = MinecraftClient.getInstance(); - static boolean filesImported = false; + public static final MinecraftClient client = MinecraftClient.getInstance(); + public static boolean filesImported = false; public static void init() { CompletableFuture.runAsync(ItemRegistry::updateItemRepo) @@ -46,20 +46,16 @@ public class ItemRegistry { } private static void updateItemRepo() { + Git git; if (!Files.isDirectory(LOCAL_ITEM_REPO_DIR)) { try { - Git.cloneRepository() + git = Git.cloneRepository() .setURI(REMOTE_ITEM_REPO) .setDirectory(LOCAL_ITEM_REPO_DIR.toFile()) .setBranchesToClone(List.of("refs/heads/master")) .setBranch("refs/heads/master") .call(); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - try { - Git.open(LOCAL_ITEM_REPO_DIR.toFile()).pull().call(); + git.close(); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 8e7e4041..c0f540b6 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -96,5 +96,7 @@ "skyblocker.update.hover_text": "Open Modrinth", "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Update Notification", + "skyblocker.updaterepository.failed": "§b[§6Skyblocker§b] §cUpdating local repository failed. Remove files manually and restart game.", + "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Automatically set your API key!" } -- cgit From a32e5f58919d7af7a2a86e5a3152146e54f0c552 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Sun, 16 Apr 2023 05:48:36 +0300 Subject: forgot unversioned files :P --- .../skyblocker/skyblock/api/RepositoryUpdate.java | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/main/java/me/xmrvizzy/skyblocker/skyblock/api/RepositoryUpdate.java (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/RepositoryUpdate.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/RepositoryUpdate.java new file mode 100644 index 00000000..db039559 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/RepositoryUpdate.java @@ -0,0 +1,52 @@ +package me.xmrvizzy.skyblocker.skyblock.api; + +import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemRegistry; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; +import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; +import net.minecraft.text.Text; + +import java.io.File; +import java.nio.file.Files; +import java.util.concurrent.CompletableFuture; + +public class RepositoryUpdate { + + //TODO add button to config for this + public static void init(){ + ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register( + ClientCommandManager.literal("skyblocker") + .then(ClientCommandManager.literal("updaterepository") + .executes(context -> { + CompletableFuture.runAsync(() -> { + try { + ItemRegistry.filesImported = false; + File dir = ItemRegistry.LOCAL_ITEM_REPO_DIR.toFile(); + recursiveDelete(dir); + } catch (Exception ex) { + ItemRegistry.client.player.sendMessage( + Text.translatable("skyblocker.updaterepository.failed") + , false + ); + return; + } + + ItemRegistry.init(); + }); + + return 1; + }) + ) + ) + ); + + } + + private static void recursiveDelete(File dir) { + if (dir.isDirectory() && !Files.isSymbolicLink(dir.toPath())) { + for (File child : dir.listFiles()) { + recursiveDelete(child); + } + } + dir.delete(); + } +} -- cgit From 06db7ab46b5d6bd33bbc584172c43e88dce998e1 Mon Sep 17 00:00:00 2001 From: Fix3d Date: Sat, 22 Apr 2023 13:54:53 +0300 Subject: now runes have avg prices --- .../skyblocker/skyblock/item/PriceInfoTooltip.java | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java index e0cb97aa..d9263f9a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/PriceInfoTooltip.java @@ -86,6 +86,7 @@ public class PriceInfoTooltip { } // bazaarOpened & bazaarExist check for lbin, because Skytils keeps some bazaar item data in lbin api + boolean lbinExist = false; if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN && !bazaarOpened && !bazaarExist) { if (lowestPricesJson == null) { nullWarning(); @@ -94,6 +95,7 @@ public class PriceInfoTooltip { lines.add(Text.literal(String.format("%-19s", "Lowest BIN Price:")) .formatted(Formatting.GOLD) .append(getCoinsMessage(lowestPricesJson.get(name).getAsDouble(), count))); + lbinExist = true; } } @@ -115,13 +117,16 @@ public class PriceInfoTooltip { .replace("LEGENDARY", "4") .replace("MYTHIC", "5") .replace("-", ";"); - } else if (name.contains("POTION-") || name.contains("RUNE-") || name.contains("ENCHANTED_BOOK-")) { + } else if (name.contains("RUNE-")) { + name = name.replace("RUNE-", ""); + name = name.substring(0, name.indexOf("-")) + "_RUNE;" + name.substring(name.lastIndexOf("-") + 1); + } else if (name.contains("POTION-") || name.contains("ENCHANTED_BOOK-")) { name = ""; } else { name = name.replace(":", "-"); } - if (!name.isEmpty() && (threeDayAvgPricesJson.has(name) || oneDayAvgPricesJson.has(name))) { + if (!name.isEmpty() && lbinExist) { SkyblockerConfig.Average type = SkyblockerConfig.get().general.itemTooltip.avg; // "No data" line because of API not keeping old data, it causes NullPointerException @@ -244,12 +249,13 @@ public class PriceInfoTooltip { return internalName + "-" + petInfo.get("type").getAsString() + "-" + petInfo.get("tier").getAsString(); } } else if ("POTION".equals(internalName)) { + // New API just contains 'enhanced' tag. String enhanced = ea.contains("enhanced") ? "-ENHANCED" : ""; - String extended = ea.contains("extended") ? "-EXTENDED" : ""; - String splash = ea.contains("splash") ? "-SPLASH" : ""; + //String extended = ea.contains("extended") ? "-EXTENDED" : ""; + //String splash = ea.contains("splash") ? "-SPLASH" : ""; if (ea.contains("potion") && ea.contains("potion_level")) { return internalName + "-" + ea.getString("potion").toUpperCase(Locale.ENGLISH) + "-" + ea.getInt("potion_level") - + enhanced + extended + splash; + + enhanced; //+ extended + splash; } } else if ("RUNE".equals(internalName)) { if (ea.contains("runes")) { @@ -310,7 +316,7 @@ public class PriceInfoTooltip { } } if (SkyblockerConfig.get().general.itemTooltip.enableLowestBIN) - futureList.add(CompletableFuture.runAsync(() -> lowestPricesJson = downloadPrices("lowest bin"))); + futureList.add(CompletableFuture.runAsync(() -> lowestPricesJson = downloadPrices("lowest bins"))); if (SkyblockerConfig.get().general.itemTooltip.enableBazaarPrice) futureList.add(CompletableFuture.runAsync(() -> bazaarPricesJson = downloadPrices("bazaar"))); @@ -337,8 +343,8 @@ public class PriceInfoTooltip { } catch (IOException e) { LOGGER.warn("[Skyblocker] Failed to download " + type + " prices!", e); - if (type.equals("lowest bin")) - lowestPricesJson = downloadPrices("lowest bin backup"); + if (type.equals("lowest bins")) + lowestPricesJson = downloadPrices("lowest bins backup"); return null; } @@ -349,8 +355,8 @@ public class PriceInfoTooltip { apiAddresses.put("1 day avg", "https://moulberry.codes/auction_averages_lbin/1day.json.gz"); apiAddresses.put("3 day avg", "https://moulberry.codes/auction_averages_lbin/3day.json.gz"); apiAddresses.put("bazaar", "https://hysky.de/api/bazaar"); - apiAddresses.put("lowest bin", "https://lb.tricked.pro/lowestbins"); - apiAddresses.put("lowest bin backup", "https://lb2.tricked.pro/lowestbins"); + apiAddresses.put("lowest bins", "https://lb.tricked.pro/lowestbins"); + apiAddresses.put("lowest bins backup", "https://lb2.tricked.pro/lowestbins"); apiAddresses.put("npc", "https://hysky.de/api/npcprice"); apiAddresses.put("museum", "https://hysky.de/api/museum"); } -- cgit From 6e58eddaab6d2830976ee06ae1f3b2801308408c Mon Sep 17 00:00:00 2001 From: Fix3d Date: Sat, 22 Apr 2023 14:21:49 +0300 Subject: fix wikiLink --- .../me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java index 91a59fcb..0a581da8 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java @@ -109,7 +109,12 @@ public class ItemRegistry { try { String fileContent = Files.readString(ITEM_LIST_DIR.resolve(internalName + ".json")); JsonObject fileJson = JsonParser.parseString(fileContent).getAsJsonObject(); - return fileJson.get("info").getAsJsonArray().get(1).getAsString(); + //TODO optional official or unofficial wiki link + try { + return fileJson.get("info").getAsJsonArray().get(1).getAsString(); + } catch (IndexOutOfBoundsException e) { + return fileJson.get("info").getAsJsonArray().get(0).getAsString(); + } } catch (IOException | NullPointerException e) { e.printStackTrace(); client.player.sendMessage(Text.of("Can't locate a wiki article for this item..."), false); -- cgit From 46170500518e94e86758af11267fb08021d48170 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Tue, 2 May 2023 18:12:56 -0400 Subject: Added Container Solver docs --- src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java | 3 +++ .../java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java | 3 +++ 2 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java b/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java index ec086934..ecec2449 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java +++ b/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java @@ -6,6 +6,9 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; +/** + * Abstract class for container solvers. Extend this class to add a new container solver, like terminal solvers or experiment solvers. + */ public abstract class ContainerSolver { private final Pattern CONTAINER_NAME; protected final static int GREEN_HIGHLIGHT = 128 << 24 | 64 << 16 | 196 << 8 | 64; diff --git a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java b/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java index 276ac3b9..b50231fb 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java +++ b/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java @@ -18,6 +18,9 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * Manager class for {@link ContainerSolver}s like terminal solvers and experiment solvers. To add a new container solver, extend {@link ContainerSolver} and register it in {@link #ContainerSolverManager()}. + */ public class ContainerSolverManager extends DrawableHelper { private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile(""); private final ContainerSolver[] solvers; -- cgit From 9c1d500ff84641612c178f883e2dbeb2f3bfef84 Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Wed, 3 May 2023 17:14:28 -0400 Subject: Refactored container to gui --- .../java/me/xmrvizzy/skyblocker/SkyblockerMod.java | 2 +- .../skyblocker/container/ColorHighlight.java | 4 - .../skyblocker/container/ContainerSolver.java | 39 ---------- .../container/ContainerSolverManager.java | 89 ---------------------- .../me/xmrvizzy/skyblocker/gui/ColorHighlight.java | 4 + .../xmrvizzy/skyblocker/gui/ContainerSolver.java | 39 ++++++++++ .../skyblocker/gui/ContainerSolverManager.java | 89 ++++++++++++++++++++++ .../skyblocker/mixin/MinecraftClientMixin.java | 2 +- .../skyblocker/skyblock/dungeon/CroesusHelper.java | 4 +- .../skyblock/dungeon/terminal/ColorTerminal.java | 4 +- .../skyblock/dungeon/terminal/OrderTerminal.java | 4 +- .../dungeon/terminal/StartsWithTerminal.java | 4 +- .../skyblock/quicknav/QuickNavButton.java | 2 +- 13 files changed, 143 insertions(+), 143 deletions(-) delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/container/ColorHighlight.java delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java delete mode 100644 src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/gui/ColorHighlight.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolver.java create mode 100644 src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolverManager.java (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java index f804d90e..c519109a 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java +++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java @@ -1,6 +1,6 @@ package me.xmrvizzy.skyblocker; -import me.xmrvizzy.skyblocker.container.ContainerSolverManager; +import me.xmrvizzy.skyblocker.gui.ContainerSolverManager; import me.xmrvizzy.skyblocker.discord.DiscordRPCManager; import me.xmrvizzy.skyblocker.skyblock.BackpackPreview; import me.xmrvizzy.skyblocker.skyblock.StatusBarTracker; diff --git a/src/main/java/me/xmrvizzy/skyblocker/container/ColorHighlight.java b/src/main/java/me/xmrvizzy/skyblocker/container/ColorHighlight.java deleted file mode 100644 index c4380eab..00000000 --- a/src/main/java/me/xmrvizzy/skyblocker/container/ColorHighlight.java +++ /dev/null @@ -1,4 +0,0 @@ -package me.xmrvizzy.skyblocker.container; - -public record ColorHighlight(int slot, int color) { -} \ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java b/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java deleted file mode 100644 index ecec2449..00000000 --- a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolver.java +++ /dev/null @@ -1,39 +0,0 @@ -package me.xmrvizzy.skyblocker.container; - -import net.minecraft.item.ItemStack; - -import java.util.List; -import java.util.Map; -import java.util.regex.Pattern; - -/** - * Abstract class for container solvers. Extend this class to add a new container solver, like terminal solvers or experiment solvers. - */ -public abstract class ContainerSolver { - private final Pattern CONTAINER_NAME; - protected final static int GREEN_HIGHLIGHT = 128 << 24 | 64 << 16 | 196 << 8 | 64; - protected final static int GRAY_HIGHLIGHT = 128 << 24 | 64 << 16 | 64 << 8 | 64; - - public ContainerSolver(String containerName) { - CONTAINER_NAME = Pattern.compile(containerName); - } - - public abstract boolean isEnabled(); - - public Pattern getName() { - return CONTAINER_NAME; - } - - public abstract List getColors(String[] groups, Map slots); - - public void trimEdges(Map slots, int rows) { - for (int i = 0; i < rows; i++) { - slots.remove(9 * i); - slots.remove(9 * i + 8); - } - for (int i = 1; i < 8; i++) { - slots.remove(i); - slots.remove((rows - 1) * 9 + i); - } - } -} diff --git a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java b/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java deleted file mode 100644 index b50231fb..00000000 --- a/src/main/java/me/xmrvizzy/skyblocker/container/ContainerSolverManager.java +++ /dev/null @@ -1,89 +0,0 @@ -package me.xmrvizzy.skyblocker.container; - -import com.mojang.blaze3d.systems.RenderSystem; -import me.xmrvizzy.skyblocker.skyblock.dungeon.CroesusHelper; -import me.xmrvizzy.skyblocker.skyblock.dungeon.terminal.ColorTerminal; -import me.xmrvizzy.skyblocker.skyblock.dungeon.terminal.OrderTerminal; -import me.xmrvizzy.skyblocker.skyblock.dungeon.terminal.StartsWithTerminal; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.gui.screen.ingame.GenericContainerScreen; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.item.ItemStack; -import net.minecraft.screen.slot.Slot; -import org.jetbrains.annotations.NotNull; - -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Manager class for {@link ContainerSolver}s like terminal solvers and experiment solvers. To add a new container solver, extend {@link ContainerSolver} and register it in {@link #ContainerSolverManager()}. - */ -public class ContainerSolverManager extends DrawableHelper { - private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile(""); - private final ContainerSolver[] solvers; - private ContainerSolver currentSolver = null; - private String[] groups; - private List highlights; - - public ContainerSolverManager() { - solvers = new ContainerSolver[]{ - new ColorTerminal(), - new OrderTerminal(), - new StartsWithTerminal(), - new CroesusHelper() - }; - } - - public void onSetScreen(@NotNull GenericContainerScreen screen) { - String screenName = screen.getTitle().getString(); - Matcher matcher = PLACEHOLDER_PATTERN.matcher(screenName); - for (ContainerSolver solver : solvers) { - if (solver.isEnabled()) { - matcher.usePattern(solver.getName()); - matcher.reset(); - if (matcher.matches()) { - currentSolver = solver; - groups = new String[matcher.groupCount()]; - for (int i = 0; i < groups.length; i++) - groups[i] = matcher.group(i + 1); - return; - } - } - } - currentSolver = null; - } - - public void clearScreen() { - currentSolver = null; - } - - public void markDirty() { - highlights = null; - } - - public void onDraw(MatrixStack matrices, List slots) { - if (currentSolver == null) - return; - if (highlights == null) - highlights = currentSolver.getColors(groups, slotMap(slots)); - RenderSystem.disableDepthTest(); - RenderSystem.colorMask(true, true, true, false); - for (ColorHighlight highlight : highlights) { - Slot slot = slots.get(highlight.slot()); - int color = highlight.color(); - fillGradient(matrices, slot.x, slot.y, slot.x + 16, slot.y + 16, color, color); - } - RenderSystem.colorMask(true, true, true, true); - RenderSystem.enableDepthTest(); - } - - private Map slotMap(List slots) { - Map slotMap = new TreeMap<>(); - for (int i = 0; i < slots.size(); i++) - slotMap.put(i, slots.get(i).getStack()); - return slotMap; - } -} diff --git a/src/main/java/me/xmrvizzy/skyblocker/gui/ColorHighlight.java b/src/main/java/me/xmrvizzy/skyblocker/gui/ColorHighlight.java new file mode 100644 index 00000000..5120ceac --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/gui/ColorHighlight.java @@ -0,0 +1,4 @@ +package me.xmrvizzy.skyblocker.gui; + +public record ColorHighlight(int slot, int color) { +} \ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolver.java b/src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolver.java new file mode 100644 index 00000000..84de64eb --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolver.java @@ -0,0 +1,39 @@ +package me.xmrvizzy.skyblocker.gui; + +import net.minecraft.item.ItemStack; + +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + +/** + * Abstract class for gui solvers. Extend this class to add a new gui solver, like terminal solvers or experiment solvers. + */ +public abstract class ContainerSolver { + private final Pattern CONTAINER_NAME; + protected final static int GREEN_HIGHLIGHT = 128 << 24 | 64 << 16 | 196 << 8 | 64; + protected final static int GRAY_HIGHLIGHT = 128 << 24 | 64 << 16 | 64 << 8 | 64; + + public ContainerSolver(String containerName) { + CONTAINER_NAME = Pattern.compile(containerName); + } + + public abstract boolean isEnabled(); + + public Pattern getName() { + return CONTAINER_NAME; + } + + public abstract List getColors(String[] groups, Map slots); + + public void trimEdges(Map slots, int rows) { + for (int i = 0; i < rows; i++) { + slots.remove(9 * i); + slots.remove(9 * i + 8); + } + for (int i = 1; i < 8; i++) { + slots.remove(i); + slots.remove((rows - 1) * 9 + i); + } + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolverManager.java b/src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolverManager.java new file mode 100644 index 00000000..c965154f --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/gui/ContainerSolverManager.java @@ -0,0 +1,89 @@ +package me.xmrvizzy.skyblocker.gui; + +import com.mojang.blaze3d.systems.RenderSystem; +import me.xmrvizzy.skyblocker.skyblock.dungeon.CroesusHelper; +import me.xmrvizzy.skyblocker.skyblock.dungeon.terminal.ColorTerminal; +import me.xmrvizzy.skyblocker.skyblock.dungeon.terminal.OrderTerminal; +import me.xmrvizzy.skyblocker.skyblock.dungeon.terminal.StartsWithTerminal; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.screen.ingame.GenericContainerScreen; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ItemStack; +import net.minecraft.screen.slot.Slot; +import org.jetbrains.annotations.NotNull; + +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Manager class for {@link ContainerSolver}s like terminal solvers and experiment solvers. To add a new gui solver, extend {@link ContainerSolver} and register it in {@link #ContainerSolverManager()}. + */ +public class ContainerSolverManager extends DrawableHelper { + private static final Pattern PLACEHOLDER_PATTERN = Pattern.compile(""); + private final ContainerSolver[] solvers; + private ContainerSolver currentSolver = null; + private String[] groups; + private List highlights; + + public ContainerSolverManager() { + solvers = new ContainerSolver[]{ + new ColorTerminal(), + new OrderTerminal(), + new StartsWithTerminal(), + new CroesusHelper() + }; + } + + public void onSetScreen(@NotNull GenericContainerScreen screen) { + String screenName = screen.getTitle().getString(); + Matcher matcher = PLACEHOLDER_PATTERN.matcher(screenName); + for (ContainerSolver solver : solvers) { + if (solver.isEnabled()) { + matcher.usePattern(solver.getName()); + matcher.reset(); + if (matcher.matches()) { + currentSolver = solver; + groups = new String[matcher.groupCount()]; + for (int i = 0; i < groups.length; i++) + groups[i] = matcher.group(i + 1); + return; + } + } + } + currentSolver = null; + } + + public void clearScreen() { + currentSolver = null; + } + + public void markDirty() { + highlights = null; + } + + public void onDraw(MatrixStack matrices, List slots) { + if (currentSolver == null) + return; + if (highlights == null) + highlights = currentSolver.getColors(groups, slotMap(slots)); + RenderSystem.disableDepthTest(); + RenderSystem.colorMask(true, true, true, false); + for (ColorHighlight highlight : highlights) { + Slot slot = slots.get(highlight.slot()); + int color = highlight.color(); + fillGradient(matrices, slot.x, slot.y, slot.x + 16, slot.y + 16, color, color); + } + RenderSystem.colorMask(true, true, true, true); + RenderSystem.enableDepthTest(); + } + + private Map slotMap(List slots) { + Map slotMap = new TreeMap<>(); + for (int i = 0; i < slots.size(); i++) + slotMap.put(i, slots.get(i).getStack()); + return slotMap; + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java index 2bc47bba..1f9009b7 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/MinecraftClientMixin.java @@ -1,7 +1,7 @@ package me.xmrvizzy.skyblocker.mixin; import me.xmrvizzy.skyblocker.SkyblockerMod; -import me.xmrvizzy.skyblocker.container.ContainerSolverManager; +import me.xmrvizzy.skyblocker.gui.ContainerSolverManager; import me.xmrvizzy.skyblocker.skyblock.HotbarSlotLock; import me.xmrvizzy.skyblocker.utils.Utils; import net.minecraft.client.MinecraftClient; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java index c536542b..ec3655f0 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/CroesusHelper.java @@ -1,8 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; -import me.xmrvizzy.skyblocker.container.ColorHighlight; -import me.xmrvizzy.skyblocker.container.ContainerSolver; +import me.xmrvizzy.skyblocker.gui.ColorHighlight; +import me.xmrvizzy.skyblocker.gui.ContainerSolver; import net.minecraft.item.ItemStack; import java.util.ArrayList; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java index f5c97738..0bfc0d60 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/ColorTerminal.java @@ -1,8 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon.terminal; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; -import me.xmrvizzy.skyblocker.container.ColorHighlight; -import me.xmrvizzy.skyblocker.container.ContainerSolver; +import me.xmrvizzy.skyblocker.gui.ColorHighlight; +import me.xmrvizzy.skyblocker.gui.ContainerSolver; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java index c61395f4..1cf0dcfc 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/OrderTerminal.java @@ -1,8 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon.terminal; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; -import me.xmrvizzy.skyblocker.container.ColorHighlight; -import me.xmrvizzy.skyblocker.container.ContainerSolver; +import me.xmrvizzy.skyblocker.gui.ColorHighlight; +import me.xmrvizzy.skyblocker.gui.ContainerSolver; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java index 7c56746f..26d2a2c4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/terminal/StartsWithTerminal.java @@ -1,8 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon.terminal; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; -import me.xmrvizzy.skyblocker.container.ColorHighlight; -import me.xmrvizzy.skyblocker.container.ContainerSolver; +import me.xmrvizzy.skyblocker.gui.ColorHighlight; +import me.xmrvizzy.skyblocker.gui.ContainerSolver; import net.minecraft.item.ItemStack; import java.util.ArrayList; diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index e31827ab..042d96d9 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -19,7 +19,7 @@ import net.minecraft.util.Identifier; @Environment(value=EnvType.CLIENT) public class QuickNavButton extends ClickableWidget { private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); - private static final Identifier BUTTON_TEXTURE = new Identifier("textures/gui/container/creative_inventory/tabs.png"); + private static final Identifier BUTTON_TEXTURE = new Identifier("textures/gui/gui/creative_inventory/tabs.png"); private final int index; private boolean toggled; -- cgit From 36dd1eaefdedf54644706a7acfc310ec18f3683f Mon Sep 17 00:00:00 2001 From: Kevinthegreat <92656833+kevinthegreat1@users.noreply.github.com> Date: Mon, 8 May 2023 17:28:03 -0400 Subject: Fixed wrong refactor --- .../java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index 042d96d9..e31827ab 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -19,7 +19,7 @@ import net.minecraft.util.Identifier; @Environment(value=EnvType.CLIENT) public class QuickNavButton extends ClickableWidget { private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); - private static final Identifier BUTTON_TEXTURE = new Identifier("textures/gui/gui/creative_inventory/tabs.png"); + private static final Identifier BUTTON_TEXTURE = new Identifier("textures/gui/container/creative_inventory/tabs.png"); private final int index; private boolean toggled; -- cgit From 98065a3e8152a1acc12154afba627d300c107bce Mon Sep 17 00:00:00 2001 From: Serhan Date: Tue, 9 May 2023 01:21:39 +0200 Subject: Added translation using Weblate (Turkish) [skip ci] --- .../resources/assets/skyblocker/lang/tr_TR.json | 190 +++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 src/main/resources/assets/skyblocker/lang/tr_TR.json (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json new file mode 100644 index 00000000..9f0be7cd --- /dev/null +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -0,0 +1,190 @@ +{ + "key.categories.skyblocker": "", + "key.hotbarSlotLock": "", + "key.wikiLookup": "", + "text.autoconfig.skyblocker.title": "", + "text.autoconfig.skyblocker.category.general": "", + "text.autoconfig.skyblocker.option.general.bars": "", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "", + "text.autoconfig.skyblocker.option.general.quicknav": "", + "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "", + "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "", + "text.autoconfig.skyblocker.option.general.itemTooltip": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "", + "text.autoconfig.skyblocker.option.general.hitbox": "", + "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", + "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "", + "skyblocker.itemTooltip.nullMessage": "", + "skyblocker.itemTooltip.noData": "", + "text.autoconfig.skyblocker.category.richPresence": "", + "text.autoconfig.skyblocker.option.richPresence.info": "", + "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "", + "text.autoconfig.skyblocker.option.richPresence.info.BITS": "", + "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "", + "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "", + "text.autoconfig.skyblocker.option.richPresence.cycleMode": "", + "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "", + "text.autoconfig.skyblocker.option.richPresence.customMessage": "", + "text.autoconfig.skyblocker.category.quickNav": "", + "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "", + "text.autoconfig.skyblocker.option.quickNav.button1": "", + "text.autoconfig.skyblocker.option.quickNav.button1.render": "", + "text.autoconfig.skyblocker.option.quickNav.button1.item": "", + "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button2": "", + "text.autoconfig.skyblocker.option.quickNav.button2.render": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button3": "", + "text.autoconfig.skyblocker.option.quickNav.button3.render": "", + "text.autoconfig.skyblocker.option.quickNav.button3.item": "", + "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button4": "", + "text.autoconfig.skyblocker.option.quickNav.button4.render": "", + "text.autoconfig.skyblocker.option.quickNav.button4.item": "", + "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button5": "", + "text.autoconfig.skyblocker.option.quickNav.button5.render": "", + "text.autoconfig.skyblocker.option.quickNav.button5.item": "", + "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button6": "", + "text.autoconfig.skyblocker.option.quickNav.button6.render": "", + "text.autoconfig.skyblocker.option.quickNav.button6.item": "", + "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button7": "", + "text.autoconfig.skyblocker.option.quickNav.button7.render": "", + "text.autoconfig.skyblocker.option.quickNav.button7.item": "", + "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button8": "", + "text.autoconfig.skyblocker.option.quickNav.button8.render": "", + "text.autoconfig.skyblocker.option.quickNav.button8.item": "", + "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button9": "", + "text.autoconfig.skyblocker.option.quickNav.button9.render": "", + "text.autoconfig.skyblocker.option.quickNav.button9.item": "", + "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button10": "", + "text.autoconfig.skyblocker.option.quickNav.button10.render": "", + "text.autoconfig.skyblocker.option.quickNav.button10.item": "", + "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button11": "", + "text.autoconfig.skyblocker.option.quickNav.button11.render": "", + "text.autoconfig.skyblocker.option.quickNav.button11.item": "", + "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button12": "", + "text.autoconfig.skyblocker.option.quickNav.button12.render": "", + "text.autoconfig.skyblocker.option.quickNav.button12.item": "", + "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "", + "text.autoconfig.skyblocker.option.general.itemList": "", + "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "", + "text.autoconfig.skyblocker.category.locations": "", + "text.autoconfig.skyblocker.option.locations.dungeons": "", + "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "", + "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "", + "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "", + "text.autoconfig.skyblocker.category.messages": "", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "", + "text.autoconfig.skyblocker.option.messages.hideAbility": "", + "text.autoconfig.skyblocker.option.messages.hideHeal": "", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "", + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "", + "text.autoconfig.skyblocker.option.messages.hideAds": "", + "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "", + "text.autoconfig.skyblocker.option.messages.hideCombo": "", + "text.autoconfig.skyblocker.option.messages.hideAutopet": "", + "text.autoconfig.skyblocker.option.messages.hideMana": "", + "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "", + "skyblocker.update.update_message": "", + "skyblocker.update.update_link": "", + "skyblocker.update.update_message_end": "", + "skyblocker.update.hover_text": "", + "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "", + "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "", + "skyblocker.api.got_key": "" +} -- cgit From a47c68f022809c33f149f90af14d1c20bf271bad Mon Sep 17 00:00:00 2001 From: Fix3d Date: Sun, 14 May 2023 00:23:25 +0300 Subject: revert jgit pull with some modifications --- .../skyblocker/skyblock/api/RepositoryUpdate.java | 6 +++++- .../skyblocker/skyblock/itemlist/ItemListWidget.java | 7 ++++++- .../skyblocker/skyblock/itemlist/ItemRegistry.java | 18 +++++++++++++++--- 3 files changed, 26 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/RepositoryUpdate.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/RepositoryUpdate.java index db039559..3854dd88 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/RepositoryUpdate.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/RepositoryUpdate.java @@ -11,7 +11,11 @@ import java.util.concurrent.CompletableFuture; public class RepositoryUpdate { - //TODO add button to config for this + /** + * Adds command to update repository manually from ingame. + *

+ * TODO A button could be added to the settings menu that will trigger this command. + */ public static void init(){ ClientCommandRegistrationCallback.EVENT.register((dispatcher, registryAccess) -> dispatcher.register( ClientCommandManager.literal("skyblocker") diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java index e99d6dac..d9acc75c 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemListWidget.java @@ -68,7 +68,12 @@ public class ItemListWidget extends RecipeBookWidget implements Drawable, Select } else { this.searchField.render(matrices, mouseX, mouseY, delta); } - if (ItemRegistry.filesImported && results != null){ + if (ItemRegistry.filesImported){ + if (results == null) { + int x = (this.parentWidth - 147) / 2 - this.leftOffset; + int y = (this.parentHeight - 166) / 2; + this.results = new SearchResultsWidget(this.client, x, y); + } this.updateSearchResult(); this.results.render(matrices, mouseX, mouseY, delta); } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java index 0a581da8..68f587bc 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ItemRegistry.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.text.Text; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.PullResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,16 +47,27 @@ public class ItemRegistry { } private static void updateItemRepo() { - Git git; if (!Files.isDirectory(LOCAL_ITEM_REPO_DIR)) { try { - git = Git.cloneRepository() + Git.cloneRepository() .setURI(REMOTE_ITEM_REPO) .setDirectory(LOCAL_ITEM_REPO_DIR.toFile()) .setBranchesToClone(List.of("refs/heads/master")) .setBranch("refs/heads/master") .call(); - git.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } else { + try { + PullResult pull = Git.open(LOCAL_ITEM_REPO_DIR.toFile()).pull().setRebase(true).call(); + if (pull.getRebaseResult() == null) { + LOGGER.info("[Skyblocker Repository Update] No update result"); + } else if (pull.getRebaseResult().getStatus().isSuccessful()) { + LOGGER.info("[Skyblocker Repository Update] Status: " + pull.getRebaseResult().getStatus().name()); + } else if (!pull.getRebaseResult().getStatus().isSuccessful()) { + LOGGER.warn("[Skyblocker Repository Update] Status: " + pull.getRebaseResult().getStatus().name()); + } } catch (Exception e) { e.printStackTrace(); } -- cgit From 539a79b72a102c6fc8a0ef249b84889656a8df21 Mon Sep 17 00:00:00 2001 From: ElSebas02 Date: Tue, 16 May 2023 02:25:33 +0200 Subject: Added translation using Weblate (Spanish) [skip ci] --- .../resources/assets/skyblocker/lang/es_ES.json | 190 +++++++++++++++++++++ 1 file changed, 190 insertions(+) create mode 100644 src/main/resources/assets/skyblocker/lang/es_ES.json (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json new file mode 100644 index 00000000..9f0be7cd --- /dev/null +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -0,0 +1,190 @@ +{ + "key.categories.skyblocker": "", + "key.hotbarSlotLock": "", + "key.wikiLookup": "", + "text.autoconfig.skyblocker.title": "", + "text.autoconfig.skyblocker.category.general": "", + "text.autoconfig.skyblocker.option.general.bars": "", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "", + "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "", + "text.autoconfig.skyblocker.option.general.quicknav": "", + "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "", + "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "", + "text.autoconfig.skyblocker.option.general.itemTooltip": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "", + "text.autoconfig.skyblocker.option.general.hitbox": "", + "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", + "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "", + "skyblocker.itemTooltip.nullMessage": "", + "skyblocker.itemTooltip.noData": "", + "text.autoconfig.skyblocker.category.richPresence": "", + "text.autoconfig.skyblocker.option.richPresence.info": "", + "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "", + "text.autoconfig.skyblocker.option.richPresence.info.BITS": "", + "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "", + "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "", + "text.autoconfig.skyblocker.option.richPresence.cycleMode": "", + "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "", + "text.autoconfig.skyblocker.option.richPresence.customMessage": "", + "text.autoconfig.skyblocker.category.quickNav": "", + "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "", + "text.autoconfig.skyblocker.option.quickNav.button1": "", + "text.autoconfig.skyblocker.option.quickNav.button1.render": "", + "text.autoconfig.skyblocker.option.quickNav.button1.item": "", + "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button2": "", + "text.autoconfig.skyblocker.option.quickNav.button2.render": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button3": "", + "text.autoconfig.skyblocker.option.quickNav.button3.render": "", + "text.autoconfig.skyblocker.option.quickNav.button3.item": "", + "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button4": "", + "text.autoconfig.skyblocker.option.quickNav.button4.render": "", + "text.autoconfig.skyblocker.option.quickNav.button4.item": "", + "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button5": "", + "text.autoconfig.skyblocker.option.quickNav.button5.render": "", + "text.autoconfig.skyblocker.option.quickNav.button5.item": "", + "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button6": "", + "text.autoconfig.skyblocker.option.quickNav.button6.render": "", + "text.autoconfig.skyblocker.option.quickNav.button6.item": "", + "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button7": "", + "text.autoconfig.skyblocker.option.quickNav.button7.render": "", + "text.autoconfig.skyblocker.option.quickNav.button7.item": "", + "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button8": "", + "text.autoconfig.skyblocker.option.quickNav.button8.render": "", + "text.autoconfig.skyblocker.option.quickNav.button8.item": "", + "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button9": "", + "text.autoconfig.skyblocker.option.quickNav.button9.render": "", + "text.autoconfig.skyblocker.option.quickNav.button9.item": "", + "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button10": "", + "text.autoconfig.skyblocker.option.quickNav.button10.render": "", + "text.autoconfig.skyblocker.option.quickNav.button10.item": "", + "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button11": "", + "text.autoconfig.skyblocker.option.quickNav.button11.render": "", + "text.autoconfig.skyblocker.option.quickNav.button11.item": "", + "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "", + "text.autoconfig.skyblocker.option.quickNav.button12": "", + "text.autoconfig.skyblocker.option.quickNav.button12.render": "", + "text.autoconfig.skyblocker.option.quickNav.button12.item": "", + "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "", + "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "", + "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "", + "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "", + "text.autoconfig.skyblocker.option.general.itemList": "", + "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "", + "text.autoconfig.skyblocker.category.locations": "", + "text.autoconfig.skyblocker.option.locations.dungeons": "", + "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "", + "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "", + "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "", + "text.autoconfig.skyblocker.category.messages": "", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "", + "text.autoconfig.skyblocker.option.messages.hideAbility": "", + "text.autoconfig.skyblocker.option.messages.hideHeal": "", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "", + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "", + "text.autoconfig.skyblocker.option.messages.hideAds": "", + "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "", + "text.autoconfig.skyblocker.option.messages.hideCombo": "", + "text.autoconfig.skyblocker.option.messages.hideAutopet": "", + "text.autoconfig.skyblocker.option.messages.hideMana": "", + "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "", + "skyblocker.update.update_message": "", + "skyblocker.update.update_link": "", + "skyblocker.update.update_message_end": "", + "skyblocker.update.hover_text": "", + "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "", + "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "", + "skyblocker.api.got_key": "" +} -- cgit From aadfb7e7d79865d8999a828c6cf9dbcca16944ec Mon Sep 17 00:00:00 2001 From: ElSebas02 Date: Tue, 16 May 2023 00:33:32 +0000 Subject: Translated using Weblate (Spanish) [skip ci] Currently translated at 22.3% (42 of 188 strings) Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/es/ --- .../resources/assets/skyblocker/lang/es_ES.json | 98 +++++++++++----------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json index 9f0be7cd..a5accf5d 100644 --- a/src/main/resources/assets/skyblocker/lang/es_ES.json +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -1,51 +1,51 @@ { - "key.categories.skyblocker": "", - "key.hotbarSlotLock": "", - "key.wikiLookup": "", - "text.autoconfig.skyblocker.title": "", - "text.autoconfig.skyblocker.category.general": "", - "text.autoconfig.skyblocker.option.general.bars": "", - "text.autoconfig.skyblocker.option.general.bars.enableBars": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "", + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "Bloqueo de Slot (Hotbar)", + "key.wikiLookup": "Búsqueda en la Wiki", + "text.autoconfig.skyblocker.title": "Ajustes de Skyblocker", + "text.autoconfig.skyblocker.category.general": "General", + "text.autoconfig.skyblocker.option.general.bars": "Salud, Mana, Defensa & Barra de XP", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "Habilitar Barras", + "text.autoconfig.skyblocker.option.general.bars.barpositions": "Configurar Posición de Barras", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "Capa 1", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "Capa 2", + "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Derecha", + "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "Deshabilitado", + "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "Posición de la Barra de Salud", + "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Posición de la Barra de Mana", + "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Posición de la Barra de Defensa", + "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "Posición de la Barra de Experiencia", "text.autoconfig.skyblocker.option.general.quicknav": "", "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "", - "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "", + "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Ver la previsualización de la mochila sin sostener Shift", "text.autoconfig.skyblocker.option.general.itemTooltip": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "", - "text.autoconfig.skyblocker.option.general.hitbox": "", - "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", - "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Habilitar Precios de NPC", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Habilitar Precios Promedio de BIN", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Tipo Promedio", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "Puedes elegir cuantos días de precio promedio sera", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "Precio de 1 día", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "Precio de 3 días", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "Ambos", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Habilitar el precio mas bajo de BIN", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Habilitar los precios de compra/venta del Bazar", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Habilitar Museo & datos", + "text.autoconfig.skyblocker.option.general.hitbox": "Cajas de Colisión", + "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "Habilitar la Caja de Colisión de la 1.8 para la tierra de cultivo", + "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "Habilitar la Caja de Colisión de la 1.8 para la palanca", "skyblocker.itemTooltip.nullMessage": "", - "skyblocker.itemTooltip.noData": "", - "text.autoconfig.skyblocker.category.richPresence": "", - "text.autoconfig.skyblocker.option.richPresence.info": "", - "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "", - "text.autoconfig.skyblocker.option.richPresence.info.BITS": "", - "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "", + "skyblocker.itemTooltip.noData": "§cSin Información", + "text.autoconfig.skyblocker.category.richPresence": "Discord Rich Presence", + "text.autoconfig.skyblocker.option.richPresence.info": "Información de Skyblock", + "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "CARTERA", + "text.autoconfig.skyblocker.option.richPresence.info.BITS": "BITS", + "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "LOCALIZACIÓN", "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "", - "text.autoconfig.skyblocker.option.richPresence.cycleMode": "", - "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "", - "text.autoconfig.skyblocker.option.richPresence.customMessage": "", - "text.autoconfig.skyblocker.category.quickNav": "", - "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "", - "text.autoconfig.skyblocker.option.quickNav.button1": "", + "text.autoconfig.skyblocker.option.richPresence.cycleMode": "Ciclar Información de Skyblock", + "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Habilitado", + "text.autoconfig.skyblocker.option.richPresence.customMessage": "Mensaje Personalizado", + "text.autoconfig.skyblocker.category.quickNav": "Navegación Rápida", + "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Habilitar Navegación Rápida", + "text.autoconfig.skyblocker.option.quickNav.button1": "Botón 1", "text.autoconfig.skyblocker.option.quickNav.button1.render": "", "text.autoconfig.skyblocker.option.quickNav.button1.item": "", "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "", @@ -58,10 +58,10 @@ "text.autoconfig.skyblocker.option.quickNav.button2.item": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "", + "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Titulo de la Interfaz", "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button3": "", + "text.autoconfig.skyblocker.option.quickNav.button3": "Botón 3", "text.autoconfig.skyblocker.option.quickNav.button3.render": "", "text.autoconfig.skyblocker.option.quickNav.button3.item": "", "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "", @@ -69,7 +69,7 @@ "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button4": "", + "text.autoconfig.skyblocker.option.quickNav.button4": "Botón 4", "text.autoconfig.skyblocker.option.quickNav.button4.render": "", "text.autoconfig.skyblocker.option.quickNav.button4.item": "", "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "", @@ -77,7 +77,7 @@ "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button5": "", + "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", "text.autoconfig.skyblocker.option.quickNav.button5.render": "", "text.autoconfig.skyblocker.option.quickNav.button5.item": "", "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "", @@ -85,7 +85,7 @@ "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button6": "", + "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", "text.autoconfig.skyblocker.option.quickNav.button6.render": "", "text.autoconfig.skyblocker.option.quickNav.button6.item": "", "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "", @@ -93,7 +93,7 @@ "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button7": "", + "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", "text.autoconfig.skyblocker.option.quickNav.button7.render": "", "text.autoconfig.skyblocker.option.quickNav.button7.item": "", "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "", -- cgit From fd5112de41c466ed9c7c613b86574c4e5f6d167e Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 11:37:19 +0200 Subject: Update translation files [skip ci] Updated by "Remove blank strings" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- .../resources/assets/skyblocker/lang/es_ES.json | 76 +---------------- .../resources/assets/skyblocker/lang/tr_TR.json | 94 ---------------------- 2 files changed, 1 insertion(+), 169 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json index a5accf5d..bed2bb52 100644 --- a/src/main/resources/assets/skyblocker/lang/es_ES.json +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -15,10 +15,8 @@ "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Posición de la Barra de Mana", "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Posición de la Barra de Defensa", "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "Posición de la Barra de Experiencia", - "text.autoconfig.skyblocker.option.general.quicknav": "", "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "", "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Ver la previsualización de la mochila sin sostener Shift", - "text.autoconfig.skyblocker.option.general.itemTooltip": "", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Habilitar Precios de NPC", "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Habilitar Precios Promedio de BIN", "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Tipo Promedio", @@ -32,159 +30,87 @@ "text.autoconfig.skyblocker.option.general.hitbox": "Cajas de Colisión", "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "Habilitar la Caja de Colisión de la 1.8 para la tierra de cultivo", "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "Habilitar la Caja de Colisión de la 1.8 para la palanca", - "skyblocker.itemTooltip.nullMessage": "", "skyblocker.itemTooltip.noData": "§cSin Información", "text.autoconfig.skyblocker.category.richPresence": "Discord Rich Presence", "text.autoconfig.skyblocker.option.richPresence.info": "Información de Skyblock", "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "CARTERA", "text.autoconfig.skyblocker.option.richPresence.info.BITS": "BITS", "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "LOCALIZACIÓN", - "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "", "text.autoconfig.skyblocker.option.richPresence.cycleMode": "Ciclar Información de Skyblock", "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Habilitado", "text.autoconfig.skyblocker.option.richPresence.customMessage": "Mensaje Personalizado", "text.autoconfig.skyblocker.category.quickNav": "Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Habilitar Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.button1": "Botón 1", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "", "text.autoconfig.skyblocker.option.quickNav.button1.item": "", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button2": "", - "text.autoconfig.skyblocker.option.quickNav.button2.render": "", "text.autoconfig.skyblocker.option.quickNav.button2.item": "", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Titulo de la Interfaz", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button3": "Botón 3", - "text.autoconfig.skyblocker.option.quickNav.button3.render": "", "text.autoconfig.skyblocker.option.quickNav.button3.item": "", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button4": "Botón 4", - "text.autoconfig.skyblocker.option.quickNav.button4.render": "", "text.autoconfig.skyblocker.option.quickNav.button4.item": "", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", - "text.autoconfig.skyblocker.option.quickNav.button5.render": "", "text.autoconfig.skyblocker.option.quickNav.button5.item": "", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", - "text.autoconfig.skyblocker.option.quickNav.button6.render": "", "text.autoconfig.skyblocker.option.quickNav.button6.item": "", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", - "text.autoconfig.skyblocker.option.quickNav.button7.render": "", "text.autoconfig.skyblocker.option.quickNav.button7.item": "", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button8": "", - "text.autoconfig.skyblocker.option.quickNav.button8.render": "", "text.autoconfig.skyblocker.option.quickNav.button8.item": "", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button9": "", - "text.autoconfig.skyblocker.option.quickNav.button9.render": "", "text.autoconfig.skyblocker.option.quickNav.button9.item": "", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button10": "", - "text.autoconfig.skyblocker.option.quickNav.button10.render": "", "text.autoconfig.skyblocker.option.quickNav.button10.item": "", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button11": "", - "text.autoconfig.skyblocker.option.quickNav.button11.render": "", "text.autoconfig.skyblocker.option.quickNav.button11.item": "", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button12": "", - "text.autoconfig.skyblocker.option.quickNav.button12.render": "", "text.autoconfig.skyblocker.option.quickNav.button12.item": "", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "", "text.autoconfig.skyblocker.option.general.itemList": "", - "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "", "text.autoconfig.skyblocker.category.locations": "", - "text.autoconfig.skyblocker.option.locations.dungeons": "", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "", - "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "", "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "", - "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "", - "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "", "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "", "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "", "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "", "text.autoconfig.skyblocker.category.messages": "", - "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "", "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "", - "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "", "text.autoconfig.skyblocker.option.messages.hideAbility": "", - "text.autoconfig.skyblocker.option.messages.hideHeal": "", "text.autoconfig.skyblocker.option.messages.hideAOTE": "", - "text.autoconfig.skyblocker.option.messages.hideImplosion": "", "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "", - "text.autoconfig.skyblocker.option.messages.hideAds": "", "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "", - "text.autoconfig.skyblocker.option.messages.hideCombo": "", "text.autoconfig.skyblocker.option.messages.hideAutopet": "", - "text.autoconfig.skyblocker.option.messages.hideMana": "", "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "", - "skyblocker.update.update_message": "", "skyblocker.update.update_link": "", - "skyblocker.update.update_message_end": "", "skyblocker.update.hover_text": "", - "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "", - "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "", - "skyblocker.api.got_key": "" + "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "" } diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json index 9f0be7cd..6418957c 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_TR.json +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -1,190 +1,96 @@ { - "key.categories.skyblocker": "", "key.hotbarSlotLock": "", - "key.wikiLookup": "", "text.autoconfig.skyblocker.title": "", - "text.autoconfig.skyblocker.category.general": "", "text.autoconfig.skyblocker.option.general.bars": "", - "text.autoconfig.skyblocker.option.general.bars.enableBars": "", "text.autoconfig.skyblocker.option.general.bars.barpositions": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "", "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "", "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "", "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "", "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "", - "text.autoconfig.skyblocker.option.general.quicknav": "", "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "", - "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "", "text.autoconfig.skyblocker.option.general.itemTooltip": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "", "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "", "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "", "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "", - "text.autoconfig.skyblocker.option.general.hitbox": "", "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", - "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "", "skyblocker.itemTooltip.nullMessage": "", - "skyblocker.itemTooltip.noData": "", "text.autoconfig.skyblocker.category.richPresence": "", - "text.autoconfig.skyblocker.option.richPresence.info": "", "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "", - "text.autoconfig.skyblocker.option.richPresence.info.BITS": "", "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "", - "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "", "text.autoconfig.skyblocker.option.richPresence.cycleMode": "", - "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "", "text.autoconfig.skyblocker.option.richPresence.customMessage": "", - "text.autoconfig.skyblocker.category.quickNav": "", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "", - "text.autoconfig.skyblocker.option.quickNav.button1": "", "text.autoconfig.skyblocker.option.quickNav.button1.render": "", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "", "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button2": "", "text.autoconfig.skyblocker.option.quickNav.button2.render": "", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button3": "", "text.autoconfig.skyblocker.option.quickNav.button3.render": "", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "", "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button4": "", "text.autoconfig.skyblocker.option.quickNav.button4.render": "", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "", "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button5": "", "text.autoconfig.skyblocker.option.quickNav.button5.render": "", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "", "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button6": "", "text.autoconfig.skyblocker.option.quickNav.button6.render": "", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "", "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button7": "", "text.autoconfig.skyblocker.option.quickNav.button7.render": "", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "", "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button8": "", "text.autoconfig.skyblocker.option.quickNav.button8.render": "", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "", "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button9": "", "text.autoconfig.skyblocker.option.quickNav.button9.render": "", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "", "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button10": "", "text.autoconfig.skyblocker.option.quickNav.button10.render": "", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "", "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button11": "", "text.autoconfig.skyblocker.option.quickNav.button11.render": "", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "", "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "", - "text.autoconfig.skyblocker.option.quickNav.button12": "", "text.autoconfig.skyblocker.option.quickNav.button12.render": "", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "", "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "", - "text.autoconfig.skyblocker.option.general.itemList": "", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "", - "text.autoconfig.skyblocker.category.locations": "", "text.autoconfig.skyblocker.option.locations.dungeons": "", - "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "", - "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "", "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "", - "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "", "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "", - "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "", "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "", "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "", - "text.autoconfig.skyblocker.category.messages": "", "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "", - "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "", "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "", - "text.autoconfig.skyblocker.option.messages.hideAbility": "", "text.autoconfig.skyblocker.option.messages.hideHeal": "", - "text.autoconfig.skyblocker.option.messages.hideAOTE": "", "text.autoconfig.skyblocker.option.messages.hideImplosion": "", - "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "", "text.autoconfig.skyblocker.option.messages.hideAds": "", - "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "", "text.autoconfig.skyblocker.option.messages.hideCombo": "", - "text.autoconfig.skyblocker.option.messages.hideAutopet": "", "text.autoconfig.skyblocker.option.messages.hideMana": "", - "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "", "skyblocker.update.update_message": "", - "skyblocker.update.update_link": "", "skyblocker.update.update_message_end": "", - "skyblocker.update.hover_text": "", "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "", - "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "", "skyblocker.api.got_key": "" } -- cgit From 7210ae582bc5c7835f7a7cf68a193d04d210fc6d Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 11:37:19 +0200 Subject: Update translation files [skip ci] Updated by "Remove blank strings" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- .../resources/assets/skyblocker/lang/es_ES.json | 35 ---------------- .../resources/assets/skyblocker/lang/tr_TR.json | 47 ---------------------- 2 files changed, 82 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json index bed2bb52..b3494d81 100644 --- a/src/main/resources/assets/skyblocker/lang/es_ES.json +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -15,7 +15,6 @@ "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Posición de la Barra de Mana", "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Posición de la Barra de Defensa", "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "Posición de la Barra de Experiencia", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "", "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Ver la previsualización de la mochila sin sostener Shift", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Habilitar Precios de NPC", "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Habilitar Precios Promedio de BIN", @@ -42,75 +41,41 @@ "text.autoconfig.skyblocker.category.quickNav": "Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Habilitar Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.button1": "Botón 1", - "text.autoconfig.skyblocker.option.quickNav.button1.item": "", "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button2": "", - "text.autoconfig.skyblocker.option.quickNav.button2.item": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Titulo de la Interfaz", "text.autoconfig.skyblocker.option.quickNav.button3": "Botón 3", - "text.autoconfig.skyblocker.option.quickNav.button3.item": "", "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button4": "Botón 4", - "text.autoconfig.skyblocker.option.quickNav.button4.item": "", "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", - "text.autoconfig.skyblocker.option.quickNav.button5.item": "", "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", - "text.autoconfig.skyblocker.option.quickNav.button6.item": "", "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", - "text.autoconfig.skyblocker.option.quickNav.button7.item": "", "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button8": "", - "text.autoconfig.skyblocker.option.quickNav.button8.item": "", "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button9": "", - "text.autoconfig.skyblocker.option.quickNav.button9.item": "", "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button10": "", - "text.autoconfig.skyblocker.option.quickNav.button10.item": "", "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button11": "", - "text.autoconfig.skyblocker.option.quickNav.button11.item": "", "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "", "text.autoconfig.skyblocker.option.quickNav.button12": "", - "text.autoconfig.skyblocker.option.quickNav.button12.item": "", "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "", - "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "", "text.autoconfig.skyblocker.option.general.itemList": "", - "text.autoconfig.skyblocker.category.locations": "", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "", - "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "", - "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "", "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "", "text.autoconfig.skyblocker.category.messages": "", - "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "", "text.autoconfig.skyblocker.option.messages.hideAbility": "", - "text.autoconfig.skyblocker.option.messages.hideAOTE": "", "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "", - "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "", "text.autoconfig.skyblocker.option.messages.hideAutopet": "", - "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "", "skyblocker.update.update_link": "", - "skyblocker.update.hover_text": "", "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "" } diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json index 6418957c..771dd871 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_TR.json +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -1,96 +1,49 @@ { - "key.hotbarSlotLock": "", "text.autoconfig.skyblocker.title": "", - "text.autoconfig.skyblocker.option.general.bars": "", "text.autoconfig.skyblocker.option.general.bars.barpositions": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "", "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "", "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "", "text.autoconfig.skyblocker.option.general.itemTooltip": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "", "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "", "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", - "skyblocker.itemTooltip.nullMessage": "", "text.autoconfig.skyblocker.category.richPresence": "", - "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "", "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "", - "text.autoconfig.skyblocker.option.richPresence.cycleMode": "", "text.autoconfig.skyblocker.option.richPresence.customMessage": "", - "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "", "text.autoconfig.skyblocker.option.quickNav.button1.render": "", - "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button2.render": "", - "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button3.render": "", - "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button4.render": "", - "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button5.render": "", - "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button6.render": "", - "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button7.render": "", - "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button8.render": "", - "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button9.render": "", - "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button10.render": "", - "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button11.render": "", - "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "", "text.autoconfig.skyblocker.option.quickNav.button12.render": "", - "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName": "", "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "", - "text.autoconfig.skyblocker.option.locations.dungeons": "", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "", - "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "", "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "", "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "", "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "", - "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "", "text.autoconfig.skyblocker.option.messages.hideHeal": "", - "text.autoconfig.skyblocker.option.messages.hideImplosion": "", "text.autoconfig.skyblocker.option.messages.hideAds": "", - "text.autoconfig.skyblocker.option.messages.hideCombo": "", "text.autoconfig.skyblocker.option.messages.hideMana": "", - "skyblocker.update.update_message": "", "skyblocker.update.update_message_end": "", - "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "", "skyblocker.api.got_key": "" } -- cgit From b63065afe9d703c426c87484c40cdbd553c98e9a Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 11:37:19 +0200 Subject: Update translation files [skip ci] Updated by "Remove blank strings" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- .../resources/assets/skyblocker/lang/es_ES.json | 20 +---------------- .../resources/assets/skyblocker/lang/tr_TR.json | 26 +--------------------- 2 files changed, 2 insertions(+), 44 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json index b3494d81..7a7c5546 100644 --- a/src/main/resources/assets/skyblocker/lang/es_ES.json +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -41,41 +41,23 @@ "text.autoconfig.skyblocker.category.quickNav": "Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Habilitar Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.button1": "Botón 1", - "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button2": "", - "text.autoconfig.skyblocker.option.quickNav.button2.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Titulo de la Interfaz", "text.autoconfig.skyblocker.option.quickNav.button3": "Botón 3", - "text.autoconfig.skyblocker.option.quickNav.button3.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button4": "Botón 4", - "text.autoconfig.skyblocker.option.quickNav.button4.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", - "text.autoconfig.skyblocker.option.quickNav.button5.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", - "text.autoconfig.skyblocker.option.quickNav.button6.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", - "text.autoconfig.skyblocker.option.quickNav.button7.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button8": "", - "text.autoconfig.skyblocker.option.quickNav.button8.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button9": "", - "text.autoconfig.skyblocker.option.quickNav.button9.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button10": "", - "text.autoconfig.skyblocker.option.quickNav.button10.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button11": "", - "text.autoconfig.skyblocker.option.quickNav.button11.item.count": "", "text.autoconfig.skyblocker.option.quickNav.button12": "", - "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "", "text.autoconfig.skyblocker.option.general.itemList": "", - "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "", "text.autoconfig.skyblocker.category.messages": "", - "text.autoconfig.skyblocker.option.messages.hideAbility": "", "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "", - "text.autoconfig.skyblocker.option.messages.hideAutopet": "", - "skyblocker.update.update_link": "", - "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "" + "skyblocker.update.update_link": "" } diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json index 771dd871..d04cb3a4 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_TR.json +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -1,49 +1,25 @@ { - "text.autoconfig.skyblocker.title": "", "text.autoconfig.skyblocker.option.general.bars.barpositions": "", - "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "", "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "", - "text.autoconfig.skyblocker.option.general.itemTooltip": "", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "", "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", - "text.autoconfig.skyblocker.category.richPresence": "", "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "", - "text.autoconfig.skyblocker.option.richPresence.customMessage": "", "text.autoconfig.skyblocker.option.quickNav.button1.render": "", - "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button2.render": "", - "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button3.render": "", - "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button4.render": "", - "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button5.render": "", - "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button6.render": "", - "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button7.render": "", - "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button8.render": "", - "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button9.render": "", - "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button10.render": "", - "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button11.render": "", - "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt": "", "text.autoconfig.skyblocker.option.quickNav.button12.render": "", - "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "", - "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "", "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "", "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "", - "text.autoconfig.skyblocker.option.messages.hideHeal": "", "text.autoconfig.skyblocker.option.messages.hideAds": "", - "text.autoconfig.skyblocker.option.messages.hideMana": "", - "skyblocker.update.update_message_end": "", - "skyblocker.api.got_key": "" + "skyblocker.update.update_message_end": "" } -- cgit From c8b930c75071e72672f305612226aadf93cd2ebf Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 11:37:20 +0200 Subject: Update translation files [skip ci] Updated by "Remove blank strings" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- src/main/resources/assets/skyblocker/lang/es_ES.json | 9 +-------- src/main/resources/assets/skyblocker/lang/tr_TR.json | 14 +------------- 2 files changed, 2 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json index 7a7c5546..f9e02879 100644 --- a/src/main/resources/assets/skyblocker/lang/es_ES.json +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -41,7 +41,6 @@ "text.autoconfig.skyblocker.category.quickNav": "Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "Habilitar Navegación Rápida", "text.autoconfig.skyblocker.option.quickNav.button1": "Botón 1", - "text.autoconfig.skyblocker.option.quickNav.button2": "", "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt": "NBT", "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle": "Titulo de la Interfaz", "text.autoconfig.skyblocker.option.quickNav.button3": "Botón 3", @@ -49,15 +48,9 @@ "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", - "text.autoconfig.skyblocker.option.quickNav.button8": "", "text.autoconfig.skyblocker.option.quickNav.button9": "", - "text.autoconfig.skyblocker.option.quickNav.button10": "", "text.autoconfig.skyblocker.option.quickNav.button11": "", - "text.autoconfig.skyblocker.option.quickNav.button12": "", "text.autoconfig.skyblocker.option.general.itemList": "", - "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "", - "text.autoconfig.skyblocker.category.messages": "", - "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "", - "skyblocker.update.update_link": "" + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "" } diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json index d04cb3a4..a093f313 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_TR.json +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -1,25 +1,13 @@ { - "text.autoconfig.skyblocker.option.general.bars.barpositions": "", "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "", "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", - "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "", "text.autoconfig.skyblocker.option.quickNav.button1.render": "", - "text.autoconfig.skyblocker.option.quickNav.button2.render": "", "text.autoconfig.skyblocker.option.quickNav.button3.render": "", - "text.autoconfig.skyblocker.option.quickNav.button4.render": "", "text.autoconfig.skyblocker.option.quickNav.button5.render": "", - "text.autoconfig.skyblocker.option.quickNav.button6.render": "", "text.autoconfig.skyblocker.option.quickNav.button7.render": "", - "text.autoconfig.skyblocker.option.quickNav.button8.render": "", "text.autoconfig.skyblocker.option.quickNav.button9.render": "", - "text.autoconfig.skyblocker.option.quickNav.button10.render": "", "text.autoconfig.skyblocker.option.quickNav.button11.render": "", - "text.autoconfig.skyblocker.option.quickNav.button12.render": "", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "", - "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "", - "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "", - "text.autoconfig.skyblocker.option.messages.hideAds": "", - "skyblocker.update.update_message_end": "" + "text.autoconfig.skyblocker.option.messages.hideAds": "" } -- cgit From 0687c2429ebf4e2b6e952522239851c630aebb22 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 11:37:20 +0200 Subject: Update translation files [skip ci] Updated by "Remove blank strings" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- src/main/resources/assets/skyblocker/lang/es_ES.json | 5 +---- src/main/resources/assets/skyblocker/lang/tr_TR.json | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json index f9e02879..1aedbdc5 100644 --- a/src/main/resources/assets/skyblocker/lang/es_ES.json +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -48,9 +48,6 @@ "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", - "text.autoconfig.skyblocker.option.quickNav.button9": "", "text.autoconfig.skyblocker.option.quickNav.button11": "", - "text.autoconfig.skyblocker.option.general.itemList": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "", - "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "" + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "" } diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json index a093f313..2a53a662 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_TR.json +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -1,13 +1,7 @@ { - "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "", "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", - "text.autoconfig.skyblocker.option.quickNav.button1.render": "", "text.autoconfig.skyblocker.option.quickNav.button3.render": "", - "text.autoconfig.skyblocker.option.quickNav.button5.render": "", "text.autoconfig.skyblocker.option.quickNav.button7.render": "", - "text.autoconfig.skyblocker.option.quickNav.button9.render": "", "text.autoconfig.skyblocker.option.quickNav.button11.render": "", - "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "", - "text.autoconfig.skyblocker.option.messages.hideAds": "" + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "" } -- cgit From bd8a100c632e7948b453c22e2a09816422bb31ab Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 11:37:20 +0200 Subject: Update translation files [skip ci] Updated by "Remove blank strings" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- src/main/resources/assets/skyblocker/lang/es_ES.json | 1 - src/main/resources/assets/skyblocker/lang/tr_TR.json | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json index 1aedbdc5..dae2073f 100644 --- a/src/main/resources/assets/skyblocker/lang/es_ES.json +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -48,6 +48,5 @@ "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", - "text.autoconfig.skyblocker.option.quickNav.button11": "", "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "" } diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json index 2a53a662..329eb16b 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_TR.json +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -1,7 +1,4 @@ { - "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "", "text.autoconfig.skyblocker.option.quickNav.button3.render": "", - "text.autoconfig.skyblocker.option.quickNav.button7.render": "", - "text.autoconfig.skyblocker.option.quickNav.button11.render": "", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "" + "text.autoconfig.skyblocker.option.quickNav.button11.render": "" } -- cgit From f79d6913258c3009e1680c353bd59a34ef577c09 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 11:37:20 +0200 Subject: Update translation files [skip ci] Updated by "Remove blank strings" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- src/main/resources/assets/skyblocker/lang/es_ES.json | 3 +-- src/main/resources/assets/skyblocker/lang/tr_TR.json | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/es_ES.json b/src/main/resources/assets/skyblocker/lang/es_ES.json index dae2073f..5aa55294 100644 --- a/src/main/resources/assets/skyblocker/lang/es_ES.json +++ b/src/main/resources/assets/skyblocker/lang/es_ES.json @@ -47,6 +47,5 @@ "text.autoconfig.skyblocker.option.quickNav.button4": "Botón 4", "text.autoconfig.skyblocker.option.quickNav.button5": "Botón 5", "text.autoconfig.skyblocker.option.quickNav.button6": "Botón 6", - "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "" + "text.autoconfig.skyblocker.option.quickNav.button7": "Botón 7" } diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json index 329eb16b..9b9ce11c 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_TR.json +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -1,4 +1,3 @@ { - "text.autoconfig.skyblocker.option.quickNav.button3.render": "", "text.autoconfig.skyblocker.option.quickNav.button11.render": "" } -- cgit From 647074f9ea9bc08c933d7258fa2a74ab4de2faad Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 11:37:20 +0200 Subject: Update translation files [skip ci] Updated by "Remove blank strings" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- src/main/resources/assets/skyblocker/lang/tr_TR.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/tr_TR.json b/src/main/resources/assets/skyblocker/lang/tr_TR.json index 9b9ce11c..0967ef42 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_TR.json +++ b/src/main/resources/assets/skyblocker/lang/tr_TR.json @@ -1,3 +1 @@ -{ - "text.autoconfig.skyblocker.option.quickNav.button11.render": "" -} +{} -- cgit From adaf280a8083dd774c9b49cdc1ae56b1642a6531 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 17 May 2023 13:22:30 +0200 Subject: Update translation files [skip ci] Updated by "Cleanup translation files" hook in Weblate. Translation: Skyblocker/Skyblocker Translate-URL: https://translate.hysky.de/projects/Skyblocker/skyblocker/ --- .../resources/assets/skyblocker/lang/ru_ru.json | 116 ++++++++++----------- 1 file changed, 56 insertions(+), 60 deletions(-) (limited to 'src') diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index 693d2e8f..8240f0cb 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -1,61 +1,57 @@ { - "key.categories.skyblocker": "Skyblocker", - "key.hotbarSlotLock": "Блокировка слотов (В хотбаре)", - "text.autoconfig.skyblocker.title": "Настройки Skyblocker", - - "text.autoconfig.skyblocker.category.general": "Основные", - "text.autoconfig.skyblocker.option.general.bars": "Полоски здоровья, маны, защиты и опыта", - "text.autoconfig.skyblocker.option.general.bars.enableBars": "Включить полоски", - - "text.autoconfig.skyblocker.category.locations": "Локации", - "text.autoconfig.skyblocker.option.locations.dungeons": "Катакомбы", - "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Включить карту", - "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Решать головоломку \"Три чудака\"", - "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Решать головоломку с ифритами", - "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Решать головоломку с вопросами", - "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Гномьи шахты", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Показывать топливо дрели", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Решать загадку Fetchur-а", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Решать загадку Puzzler-а", - - "text.autoconfig.skyblocker.category.messages": "Сообщения", - "text.autoconfig.skyblocker.option.messages.hideAbility": "Скрывать перезарядку способностей", - "text.autoconfig.skyblocker.option.messages.hideHeal": "Скрывать сообщения об исцелении", - "text.autoconfig.skyblocker.option.messages.hideAOTE": "Скрывать сообщения AOTE/AOTV", - "text.autoconfig.skyblocker.option.messages.hideImplosion": "Скрывать сообщения Implosion", - "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Скрывать сообщения Molten Wave", - "text.autoconfig.skyblocker.option.messages.hideAds": "Скрывать рекламу в чате", - "text.autoconfig.skyblocker.option.locations.dungeons.oldLevers": "Хитбокс рычагов из 1.8", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Авто-решение терминалов", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Решать выбор по цвету", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Решать клик по возрастанию", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Решать начинается с", - "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cИнформация о цене предмета обновится через менее чем 60 секунд. Если нет, проверьте latest.log.", - "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Скрывать сообщения телепортаторов", - "skyblocker.update.update_link": " §2§nНажми,§r", - "text.autoconfig.skyblocker.option.general.quicknav": "Кнопки быстрого доступа", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Включено", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Показать средние цены на BIN", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Период времени (для средней цены)", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "Можно выбрать, за сколько дней будет браться средняя цена", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Показать минимальную цену на BIN", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Показать цены на Bazaar-е", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Показать дату получения", - "text.autoconfig.skyblocker.category.richPresence": "Активность в Discord", - "text.autoconfig.skyblocker.option.richPresence.info": "Отображаемая информация", - "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "Не имеет значения при цикличном отбражении", - "text.autoconfig.skyblocker.option.richPresence.cycleMode": "Отображать все опции циклично", - "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Включено", - "text.autoconfig.skyblocker.option.richPresence.customMessage": "Своё сообщение", - "text.autoconfig.skyblocker.option.general.itemList": "Список предметов", - "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Включено", - "text.autoconfig.skyblocker.option.messages.hideCombo": "Скрывать сообщения о комбо", - "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2Доступна новая версия!", - "skyblocker.update.update_message_end": " §aчтобы узнать об изменениях.", - "skyblocker.update.hover_text": "Открыть Modrinth", - "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Оповещать об обновлениях", - "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Ключ API установлен автоматически!", - "key.wikiLookup": "Быстрый переход на вики", - "text.autoconfig.skyblocker.option.general.itemTooltip": "Описание предметов", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Показать цены у NPC" -} \ No newline at end of file + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "Блокировка слотов (В хотбаре)", + "text.autoconfig.skyblocker.title": "Настройки Skyblocker", + "text.autoconfig.skyblocker.category.general": "Основные", + "text.autoconfig.skyblocker.option.general.bars": "Полоски здоровья, маны, защиты и опыта", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "Включить полоски", + "text.autoconfig.skyblocker.category.locations": "Локации", + "text.autoconfig.skyblocker.option.locations.dungeons": "Катакомбы", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Включить карту", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Решать головоломку \"Три чудака\"", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Решать головоломку с ифритами", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Решать головоломку с вопросами", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Гномьи шахты", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Показывать топливо дрели", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Решать загадку Fetchur-а", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Решать загадку Puzzler-а", + "text.autoconfig.skyblocker.category.messages": "Сообщения", + "text.autoconfig.skyblocker.option.messages.hideAbility": "Скрывать перезарядку способностей", + "text.autoconfig.skyblocker.option.messages.hideHeal": "Скрывать сообщения об исцелении", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "Скрывать сообщения AOTE/AOTV", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "Скрывать сообщения Implosion", + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Скрывать сообщения Molten Wave", + "text.autoconfig.skyblocker.option.messages.hideAds": "Скрывать рекламу в чате", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Авто-решение терминалов", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Решать выбор по цвету", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Решать клик по возрастанию", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Решать начинается с", + "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cИнформация о цене предмета обновится через менее чем 60 секунд. Если нет, проверьте latest.log.", + "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Скрывать сообщения телепортаторов", + "skyblocker.update.update_link": " §2§nНажми,§r", + "text.autoconfig.skyblocker.option.general.quicknav": "Кнопки быстрого доступа", + "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Включено", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Показать средние цены на BIN", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Период времени (для средней цены)", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.@Tooltip": "Можно выбрать, за сколько дней будет браться средняя цена", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Показать минимальную цену на BIN", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Показать цены на Bazaar-е", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Показать дату получения", + "text.autoconfig.skyblocker.category.richPresence": "Активность в Discord", + "text.autoconfig.skyblocker.option.richPresence.info": "Отображаемая информация", + "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "Не имеет значения при цикличном отбражении", + "text.autoconfig.skyblocker.option.richPresence.cycleMode": "Отображать все опции циклично", + "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Включено", + "text.autoconfig.skyblocker.option.richPresence.customMessage": "Своё сообщение", + "text.autoconfig.skyblocker.option.general.itemList": "Список предметов", + "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Включено", + "text.autoconfig.skyblocker.option.messages.hideCombo": "Скрывать сообщения о комбо", + "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2Доступна новая версия!", + "skyblocker.update.update_message_end": " §aчтобы узнать об изменениях.", + "skyblocker.update.hover_text": "Открыть Modrinth", + "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Оповещать об обновлениях", + "skyblocker.api.got_key": "§b[§6Skyblocker§b] §2Ключ API установлен автоматически!", + "key.wikiLookup": "Быстрый переход на вики", + "text.autoconfig.skyblocker.option.general.itemTooltip": "Описание предметов", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Показать цены у NPC" +} -- cgit