diff options
Diffstat (limited to 'src/main')
18 files changed, 415 insertions, 92 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java index 8033e4a2..5c7f2a99 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java +++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java @@ -100,6 +100,7 @@ public class SkyblockerMod implements ClientModInitializer { CustomArmorDyeColors.init(); CustomArmorTrims.init(); TicTacToe.init(); + QuiverWarning.init(); containerSolverManager.init(); statusBarTracker.init(); scheduler.scheduleCyclic(Utils::update, 20); diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index 55fffa9c..577c87e4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -174,6 +174,10 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.CollapsibleObject() public Shortcuts shortcuts = new Shortcuts(); + @ConfigEntry.Category("quiverWarning") + @ConfigEntry.Gui.CollapsibleObject() + public QuiverWarning quiverWarning = new QuiverWarning(); + @ConfigEntry.Category("itemList") @ConfigEntry.Gui.CollapsibleObject() public ItemList itemList = new ItemList(); @@ -181,6 +185,10 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Category("itemTooltip") @ConfigEntry.Gui.CollapsibleObject() public ItemTooltip itemTooltip = new ItemTooltip(); + + @ConfigEntry.Category("itemInfoDisplay") + @ConfigEntry.Gui.CollapsibleObject + public ItemInfoDisplay itemInfoDisplay = new ItemInfoDisplay(); @ConfigEntry.Category("hitbox") @ConfigEntry.Gui.CollapsibleObject() @@ -298,6 +306,12 @@ public class SkyblockerConfig implements ConfigData { public boolean enableCommandArgShortcuts = true; } + public static class QuiverWarning { + public boolean enableQuiverWarning = true; + public boolean enableQuiverWarningInDungeons = true; + public boolean enableQuiverWarningAfterDungeon = true; + } + public static class Hitbox { public boolean oldFarmlandHitbox = true; public boolean oldLeverHitbox = false; @@ -387,6 +401,11 @@ public class SkyblockerConfig implements ConfigData { public boolean enableBazaarPrice = true; public boolean enableMuseumDate = true; } + + public static class ItemInfoDisplay { + @ConfigEntry.Gui.Tooltip + public boolean attributeShardInfo = true; + } public static class Locations { @ConfigEntry.Category("barn") diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java index 6c059741..0a1084cf 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/DrawContextMixin.java @@ -1,12 +1,16 @@ package me.xmrvizzy.skyblocker.mixin; +import com.llamalad7.mixinextras.sugar.Local; +import com.llamalad7.mixinextras.sugar.ref.LocalRef; import com.mojang.blaze3d.systems.RenderSystem; import dev.cbyrne.betterinject.annotations.Arg; import dev.cbyrne.betterinject.annotations.Inject; import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.skyblock.item.AttributeShards; import me.xmrvizzy.skyblocker.utils.ItemUtils; import me.xmrvizzy.skyblocker.utils.Utils; +import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.util.math.MatrixStack; @@ -14,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NbtCompound; import net.minecraft.util.Formatting; import net.minecraft.util.math.ColorHelper; + +import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -30,6 +36,9 @@ public abstract class DrawContextMixin { @Shadow public abstract void fill(RenderLayer layer, int x1, int x2, int y1, int y2, int color); + + @Shadow + public abstract int drawText(TextRenderer textRenderer, @Nullable String text, int x, int y, int color, boolean shadow); @Inject(method = "drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At("HEAD")) public void skyblocker$renderItemBar(@Arg ItemStack stack, @Arg(ordinal = 0) int x, @Arg(ordinal = 1) int y) { @@ -87,4 +96,38 @@ public abstract class DrawContextMixin { matrices.pop(); RenderSystem.enableDepthTest(); } + + @Inject(method = "drawItemInSlot(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V", at = @At("HEAD")) + private void skyblocker$renderAttributeShardDisplay(@Arg TextRenderer textRenderer, @Arg ItemStack stack, @Arg(ordinal = 0) int x, @Arg(ordinal = 1) int y, @Local(argsOnly = true) LocalRef<String> countOverride) { + if (!SkyblockerConfig.get().general.itemInfoDisplay.attributeShardInfo) return; + + NbtCompound nbt = stack.getNbt(); + + if (Utils.isOnSkyblock() && nbt != null && nbt.contains("ExtraAttributes")) { + NbtCompound extraAttributes = nbt.getCompound("ExtraAttributes"); + + if (extraAttributes.getString("id").equals("ATTRIBUTE_SHARD")) { + NbtCompound attributesTag = extraAttributes.getCompound("attributes"); + String[] attributes = attributesTag.getKeys().toArray(String[]::new); + + if (attributes.length != 0) { + String attributeId = attributes[0]; + int attributeLevel = attributesTag.getInt(attributeId); + + //Set item count + countOverride.set(Integer.toString(attributeLevel)); + + //Draw the attribute name + this.matrices.push(); + this.matrices.translate(0f, 0f, 200f); + + String attributeInitials = AttributeShards.getShortName(attributeId); + + this.drawText(textRenderer, attributeInitials, x, y, Formatting.AQUA.getColorValue(), true); + + this.matrices.pop(); + } + } + } + } }
\ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java new file mode 100644 index 00000000..cf793461 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/QuiverWarning.java @@ -0,0 +1,66 @@ +package me.xmrvizzy.skyblocker.skyblock; + +import me.xmrvizzy.skyblocker.SkyblockerMod; +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.utils.Utils; +import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import org.jetbrains.annotations.Nullable; + +public class QuiverWarning { + @Nullable + private static Type warning = null; + + public static void init() { + ClientReceiveMessageEvents.ALLOW_GAME.register(QuiverWarning::onChatMessage); + SkyblockerMod.getInstance().scheduler.scheduleCyclic(QuiverWarning::update, 10); + } + + public static boolean onChatMessage(Text text, boolean overlay) { + String message = text.getString(); + if (SkyblockerConfig.get().general.quiverWarning.enableQuiverWarning && message.endsWith("left in your Quiver!")) { + MinecraftClient.getInstance().inGameHud.setDefaultTitleFade(); + if (message.startsWith("You only have 50")) { + onChatMessage(Type.FIFTY_LEFT); + } else if (message.startsWith("You only have 10")) { + onChatMessage(Type.TEN_LEFT); + } else if (message.startsWith("You don't have any more")) { + onChatMessage(Type.EMPTY); + } + } + return true; + } + + private static void onChatMessage(Type warning) { + if (!Utils.isInDungeons()) { + MinecraftClient.getInstance().inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED)); + } else if (SkyblockerConfig.get().general.quiverWarning.enableQuiverWarningInDungeons) { + MinecraftClient.getInstance().inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED)); + QuiverWarning.warning = warning; + } + } + + public static void update() { + if (warning != null && SkyblockerConfig.get().general.quiverWarning.enableQuiverWarning && SkyblockerConfig.get().general.quiverWarning.enableQuiverWarningAfterDungeon && !Utils.isInDungeons()) { + InGameHud inGameHud = MinecraftClient.getInstance().inGameHud; + inGameHud.setDefaultTitleFade(); + inGameHud.setTitle(Text.translatable(warning.key).formatted(Formatting.RED)); + warning = null; + } + } + + private enum Type { + NONE(""), + FIFTY_LEFT("50Left"), + TEN_LEFT("10Left"), + EMPTY("empty"); + private final String key; + + Type(String key) { + this.key = "skyblocker.quiverWarning." + key; + } + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java new file mode 100644 index 00000000..0f106cdf --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/item/AttributeShards.java @@ -0,0 +1,59 @@ +package me.xmrvizzy.skyblocker.skyblock.item; + +import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; + +public class AttributeShards { + private static final Object2ObjectOpenHashMap<String, String> ID_2_SHORT_NAME = new Object2ObjectOpenHashMap<>(); + + static { + //Weapons + ID_2_SHORT_NAME.put("arachno", "A"); + ID_2_SHORT_NAME.put("attack_speed", "AS"); + ID_2_SHORT_NAME.put("blazing", "BL"); + ID_2_SHORT_NAME.put("combo", "C"); + ID_2_SHORT_NAME.put("elite", "E"); + ID_2_SHORT_NAME.put("ender", "EN"); + ID_2_SHORT_NAME.put("ignition", "I"); + ID_2_SHORT_NAME.put("life_recovery", "LR"); + ID_2_SHORT_NAME.put("mana_steal", "MS"); + ID_2_SHORT_NAME.put("midas_touch", "MT"); + ID_2_SHORT_NAME.put("undead", "U"); + + //Swords & Bows + ID_2_SHORT_NAME.put("warrior", "W"); + ID_2_SHORT_NAME.put("deadeye", "DE"); + + //Armor or Equipment + ID_2_SHORT_NAME.put("arachno_resistance", "AR"); + ID_2_SHORT_NAME.put("blazing_resistance", "BR"); + ID_2_SHORT_NAME.put("breeze", "B"); + ID_2_SHORT_NAME.put("dominance", "D"); + ID_2_SHORT_NAME.put("ender_resistance", "ER"); + ID_2_SHORT_NAME.put("experience", "XP"); + ID_2_SHORT_NAME.put("fortitude", "F"); + ID_2_SHORT_NAME.put("life_regeneration", "HR"); //Health regeneration + ID_2_SHORT_NAME.put("lifeline", "L"); + ID_2_SHORT_NAME.put("magic_find", "MF"); + ID_2_SHORT_NAME.put("mana_pool", "MP"); + ID_2_SHORT_NAME.put("mana_regeneration", "MR"); + ID_2_SHORT_NAME.put("mending", "V"); //Vitality + ID_2_SHORT_NAME.put("speed", "S"); + ID_2_SHORT_NAME.put("undead_resistance", "UR"); + ID_2_SHORT_NAME.put("veteran", "V"); + + //Fishing Gear + ID_2_SHORT_NAME.put("blazing_fortune", "BF"); + ID_2_SHORT_NAME.put("fishing_experience", "FE"); + ID_2_SHORT_NAME.put("infection", "IF"); + ID_2_SHORT_NAME.put("double_hook", "DH"); + ID_2_SHORT_NAME.put("fisherman", "FM"); + ID_2_SHORT_NAME.put("fishing_speed", "FS"); + ID_2_SHORT_NAME.put("hunter", "H"); + ID_2_SHORT_NAME.put("trophy_hunter", "TH"); + + } + + public static String getShortName(String id) { + return ID_2_SHORT_NAME.getOrDefault(id, ""); + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/MinionWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/MinionWidget.java index 039871b2..579828d4 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/MinionWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/MinionWidget.java @@ -97,29 +97,13 @@ public class MinionWidget extends Widget { @Override public void updateContent() { - for (int i = 48; i < 59; i++) { - Matcher m = PlayerListMgr.regexAt(i, MINION_PATTERN); - if (m != null) { - - String min = m.group("name"); - String lvl = m.group("level"); - String stat = m.group("status"); - - MutableText mt = Text.literal(min + " " + lvl).append(Text.literal(": ")); - Formatting format = Formatting.RED; - if (stat.equals("ACTIVE")) { - format = Formatting.GREEN; - } else if (stat.equals("SLOW")) { - format = Formatting.YELLOW; - } - // makes "BLOCKED" also red. in reality, it's some kind of crimson - mt.append(Text.literal(stat).formatted(format)); + // this looks a bit weird because if we used regex mismatch as a stop condition, + // it'd spam the chat. + // not sure if not having that debug output is worth the cleaner solution here... - IcoTextComponent itc = new IcoTextComponent(MIN_ICOS.get(min), mt); - this.addComponent(itc); - - } else { + for (int i = 48; i < 59; i++) { + if (!this.addMinionComponent(i)) { break; } } @@ -128,8 +112,39 @@ public class MinionWidget extends Widget { // a "And X more..." text is shown // look for that and add it to the widget String more = PlayerListMgr.strAt(59); - if (more != null) { + if (more == null) { + return; + } else if (more.startsWith("And ")) { this.addComponent(new PlainTextComponent(Text.of(more))); + } else { + this.addMinionComponent(59); + } + } + + public boolean addMinionComponent(int i) { + Matcher m = PlayerListMgr.regexAt(i, MINION_PATTERN); + if (m != null) { + + String min = m.group("name"); + String lvl = m.group("level"); + String stat = m.group("status"); + + MutableText mt = Text.literal(min + " " + lvl).append(Text.literal(": ")); + + Formatting format = Formatting.RED; + if (stat.equals("ACTIVE")) { + format = Formatting.GREEN; + } else if (stat.equals("SLOW")) { + format = Formatting.YELLOW; + } + // makes "BLOCKED" also red. in reality, it's some kind of crimson + mt.append(Text.literal(stat).formatted(format)); + + IcoTextComponent itc = new IcoTextComponent(MIN_ICOS.get(min), mt); + this.addComponent(itc); + return true; + } else { + return false; } } diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index 4a84719c..e815af0d 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -10,7 +10,6 @@ "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "Wert in %, relativ zur Skalierung des Vanilla-GUIs", "text.autoconfig.skyblocker.option.general.bars.enableBars": "Balken aktivieren", "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Leere Item-Tooltips in Menüs verstecken", - "text.autoconfig.skyblocker.category.locations": "Standorte", "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Karte aktivieren", @@ -33,10 +32,16 @@ "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Nachricht über Molten Wave ausblenden", "text.autoconfig.skyblocker.option.messages.hideAds": "Werbung im öffentlichen Chat ausblenden", "key.wikiLookup": "Wiki-Abfrage", - "key.skyblocker.playerTgl": "Tab-HUD auf Spielerliste umstellen", "key.skyblocker.defaultTgl": "Tab-HUD auf Standard umstellen", - "key.skyblocker.genericTgl": "Tab-HUD auf allgemeine Infos umstellen", "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Rechts", - "text.autoconfig.skyblocker.option.general.quicknav": "Schnellnavigation", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Schnellnavigation Einschalten" + "key.skyblocker.toggleB": "HUD auf Tab B umschalten", + "key.skyblocker.toggleA": "HUD auf Tab A umschalten", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "Ebene 1", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "Ebene 2", + "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "Ausgeschaltet", + "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Superpairs Solver aktivieren", + "text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver": "Ultrasequencer Solver aktivieren", + "text.autoconfig.skyblocker.option.general.bars.barpositions": "Balkenposition Bearbeiten", + "text.autoconfig.skyblocker.option.general.acceptReparty": "Automatische Annahme von Reparty", + "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "Gesundheitsposition" } diff --git a/src/main/resources/assets/skyblocker/lang/en_ca.json b/src/main/resources/assets/skyblocker/lang/en_ca.json index fb708354..ca98bba9 100644 --- a/src/main/resources/assets/skyblocker/lang/en_ca.json +++ b/src/main/resources/assets/skyblocker/lang/en_ca.json @@ -7,5 +7,18 @@ "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText": "Livid Colour Text", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip": "Text which will be sent in the chat during the Livid boss fight. The string \"[color]\" will be replaced with the livid colour.", "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Solve Select Coloured", - "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Defence Bar Position" + "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Defence Bar Position", + "skyblocker.customDyeColors.notDyeable": "§b[§6Skyblocker§b] §cThis item isn't a dyeable armour piece!", + "skyblocker.customDyeColors.added": "§b[§6Skyblocker§b] §fSet a custom dye colour for your currently held item!", + "skyblocker.customDyeColors.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom dye colour!", + "skyblocker.customArmorTrims.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have an armour trim set, but why not add one? ;)", + "skyblocker.customArmorTrims.added": "§b[§6Skyblocker§b] §fSet a custom armour trim for your currently held item!", + "skyblocker.customArmorTrims.unableToSetTrim": "§b[§6Skyblocker§b] §cUnable to set a custom armour trim :( (Are you in skyblock?, are you holding an item?)", + "skyblocker.customDyeColors.invalidHex": "§b[§6Skyblocker§b] §cInvalid HEX colour code!", + "skyblocker.customDyeColors.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom dye colour.", + "skyblocker.customDyeColors.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a custom dye colour set, but why not add one? ;)", + "skyblocker.customDyeColors.unableToSetColor": "§b[§6Skyblocker§b] §cUnable to set a custom dye colour :( (Are you in skyblock?, are you holding an item?)", + "skyblocker.customArmorTrims.notAnArmorPiece": "§b[§6Skyblocker§b] §cThis item isn't an armour piece!", + "skyblocker.customArmorTrims.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom armour trim.", + "skyblocker.customArmorTrims.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom armour trim!" } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 2c2a4a9c..33f6ff9c 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -37,8 +37,10 @@ "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts.@Tooltip": "Shortcuts for commands consisting of only one word. Edit shortcuts with \"/skyblocker shortcuts\". Shortcuts must be enabled for this to take effect.", "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts": "Enable Command Argument Shortcuts", "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts.@Tooltip": "Shortcuts that replace one or more word(s)/argument(s) of a command which has multiple words/arguments. Edit shortcuts with \"/skyblocker shortcuts\". Shortcuts must be enabled for this to take effect.", - "text.autoconfig.skyblocker.option.general.quicknav": "Quicknav", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Enable Quicknav", + "text.autoconfig.skyblocker.option.general.quiverWarning": "Quiver Warning", + "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarning": "Enable Quiver Warning", + "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningInDungeons": "Enable Quiver Warning In Dungeons", + "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningAfterDungeon": "Enable Quiver Warning After a Dungeon", "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "View backpack preview without holding Shift", "text.autoconfig.skyblocker.option.general.tabHud": "Fancy tab HUD", "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Enable fancy tab HUD", @@ -61,6 +63,9 @@ "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Enable Lowest BIN Price", "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Enable Bazaar buy/sell Price", "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Enable Museum & Date", + "text.autoconfig.skyblocker.option.general.itemInfoDisplay": "Item Info Display", + "text.autoconfig.skyblocker.option.general.itemInfoDisplay.attributeShardInfo": "Attribute Shard Info", + "text.autoconfig.skyblocker.option.general.itemInfoDisplay.attributeShardInfo.@Tooltip": "Displays the attribute's level as the stack count and the initials of the attribute's name.", "text.autoconfig.skyblocker.option.general.hitbox": "Hitboxes", "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "Enable 1.8 farmland hitbox", "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "Enable 1.8 lever hitbox", @@ -319,13 +324,13 @@ "skyblocker.shortcuts.deleteWarning": "Shortcut '%s' will be lost forever! (A long time!)", "skyblocker.shortcuts.new": "New Shortcut", "skyblocker.shortcuts.commandSuggestionTooltip": "Due to limitations of Minecraft, command suggestions will only work after a restart of the game.", - + "skyblocker.customItemNames.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom name.", "skyblocker.customItemNames.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a custom name set, but why not add one? ;)", "skyblocker.customItemNames.added": "§b[§6Skyblocker§b] §fSet a custom name for your currently held item!", "skyblocker.customItemNames.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom name!", "skyblocker.customItemNames.unableToSetName": "§b[§6Skyblocker§b] §cUnable to set a custom item name :( (Are you in skyblock?, are you holding an item?)", - + "skyblocker.customDyeColors.invalidHex": "§b[§6Skyblocker§b] §cInvalid HEX color code!", "skyblocker.customDyeColors.notDyeable": "§b[§6Skyblocker§b] §cThis item isn't a dyeable armor piece!", "skyblocker.customDyeColors.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom dye color.", @@ -333,12 +338,16 @@ "skyblocker.customDyeColors.added": "§b[§6Skyblocker§b] §fSet a custom dye color for your currently held item!", "skyblocker.customDyeColors.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom dye color!", "skyblocker.customDyeColors.unableToSetColor": "§b[§6Skyblocker§b] §cUnable to set a custom dye color :( (Are you in skyblock?, are you holding an item?)", - + "skyblocker.customArmorTrims.invalidMaterialOrPattern": "§b[§6Skyblocker§b] §cYou supplied either an invalid material, or an invalid trim pattern!", "skyblocker.customArmorTrims.notAnArmorPiece": "§b[§6Skyblocker§b] §cThis item isn't an armor piece!", "skyblocker.customArmorTrims.removed": "§b[§6Skyblocker§b] §fRemoved this item's custom armor trim.", "skyblocker.customArmorTrims.neverHad": "§b[§6Skyblocker§b] §fThis item doesn't have a armor trim set, but why not add one? ;)", "skyblocker.customArmorTrims.added": "§b[§6Skyblocker§b] §fSet a custom armor trim for your currently held item!", "skyblocker.customArmorTrims.noItemUuid": "§b[§6Skyblocker§b] §cYou must be holding an item that has a uuid in order to set a custom armor trim!", - "skyblocker.customArmorTrims.unableToSetTrim": "§b[§6Skyblocker§b] §cUnable to set a custom armor trim :( (Are you in skyblock?, are you holding an item?)" + "skyblocker.customArmorTrims.unableToSetTrim": "§b[§6Skyblocker§b] §cUnable to set a custom armor trim :( (Are you in skyblock?, are you holding an item?)", + + "skyblocker.quiverWarning.50Left": "You only have 50 Arrows left in your Quiver!", + "skyblocker.quiverWarning.10Left": "You only have 10 Arrows left in your Quiver!", + "skyblocker.quiverWarning.empty": "You don't have any more Arrows left in your Quiver!" } diff --git a/src/main/resources/assets/skyblocker/lang/es_es.json b/src/main/resources/assets/skyblocker/lang/es_es.json index a36f098c..5b2a9807 100644 --- a/src/main/resources/assets/skyblocker/lang/es_es.json +++ b/src/main/resources/assets/skyblocker/lang/es_es.json @@ -52,8 +52,6 @@ "text.autoconfig.skyblocker.option.messages.hideCombo": "Ocultar Mensajes de Combos", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Obscurece los cofres que ya han sido abiertos.", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "Habilitar Fondo", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Habilitar Navegación Rápida", - "text.autoconfig.skyblocker.option.general.quicknav": "Navegación Rápida", "text.autoconfig.skyblocker.option.general.itemTooltip": "Información extra de los objetos", "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cEl precio en la información en los objetos se actualiza cada 60 segundos. De lo contrario revisa lastest.log", "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "Este valor no importa si estas ciclando", diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json index 26a52d4f..3b09f940 100644 --- a/src/main/resources/assets/skyblocker/lang/fr_fr.json +++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json @@ -11,8 +11,6 @@ "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Position de la barre de mana", "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Position de la barre de défense", "text.autoconfig.skyblocker.option.general.bars.barpositions.experienceBarPosition": "Position de la barre d'XP", - "text.autoconfig.skyblocker.option.general.quicknav": "Navigation rapide", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Navigation rapide activée", "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Aperçu du sac à dos sans appuyer sur Maj", "text.autoconfig.skyblocker.option.general.itemTooltip": "Info-bulles des objets", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Afficher le prix des NPC", @@ -94,9 +92,7 @@ "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "Désactivé", "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Cacher les tooltips des items vides dans les menus", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "Valeur en %, relative à la taille de l'interface vanilla", - "key.skyblocker.playerTgl": "Passer le HUD Tab à la liste de joueurs", "key.skyblocker.defaultTgl": "Passer le HUD Tab à la vue par défaut", - "key.skyblocker.genericTgl": "Passer le HUD Tab aux infos générales", "text.autoconfig.skyblocker.option.general.tabHud": "HUD Tab joli", "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Activer le HUD Tab joli", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale": "Taille du HUD Tab joli", @@ -205,5 +201,13 @@ "text.autoconfig.skyblocker.option.quickNav.button12.item.count": "Nombre d'items", "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt": "NBT", "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "Titre du menu", - "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "Evènement de clic" + "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent": "Evènement de clic", + "text.autoconfig.skyblocker.option.general.experiments": "Aide aux expériences de la table d'expérimentation", + "text.autoconfig.skyblocker.option.general.experiments.enableChronomatronSolver": "Activer l'aide au Chronomatron", + "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Activer l'aide aux Superpairs", + "text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver": "Activer l'aide à l'Ultrasequencer", + "text.autoconfig.skyblocker.option.general.acceptReparty": "Accepter automatiquement les reparty (/rp)", + "text.autoconfig.skyblocker.option.general.fairySouls.enableFairySoulsHelper": "Activer l'aide au Fairy Souls", + "text.autoconfig.skyblocker.option.general.fairySouls": "Aide aux Fairy Souls", + "text.autoconfig.skyblocker.option.general.shortcuts": "Raccourcis" } diff --git a/src/main/resources/assets/skyblocker/lang/id_id.json b/src/main/resources/assets/skyblocker/lang/id_id.json index b015439c..90c0a281 100644 --- a/src/main/resources/assets/skyblocker/lang/id_id.json +++ b/src/main/resources/assets/skyblocker/lang/id_id.json @@ -1,32 +1,30 @@ -{
- "key.categories.skyblocker": "Skyblocker",
- "key.hotbarSlotLock": "Kunci Slot (Hotbar)",
- "text.autoconfig.skyblocker.title": "Pengaturan Skyblocker",
- "text.autoconfig.skyblocker.category.general": "Umum",
- "text.autoconfig.skyblocker.option.general.bars": "Darah, Mana, Pertahanan & Bar XP",
- "text.autoconfig.skyblocker.option.general.bars.enableBars": "Aktifkan Bar",
- "text.autoconfig.skyblocker.category.locations": "Lokasi",
- "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons",
- "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Aktifkan Peta",
- "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Pecahkan Teka Teki \"Tiga Orang Aneh\"",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Pecahkan Teka Teki \"Blaze\"",
- "text.autoconfig.skyblocker.category.messages": "Pesan",
- "text.autoconfig.skyblocker.option.messages.hideAbility": "Sembunyikan Cooldown Kemampuan",
- "text.autoconfig.skyblocker.option.messages.hideHeal": "Sembunyikan Pesan Penyembuhan",
- "text.autoconfig.skyblocker.option.messages.hideAOTE": "Sembunyikan Pesan AOTE",
- "text.autoconfig.skyblocker.option.messages.hideAds": "Sembunyikan Iklan dari Chat Publik",
- "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Aktifkan Harga NPC",
- "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Aktifkan Harga BIN Terendah",
- "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cInformasi harga item yang ditampilkan dalam tooltip akan diperbarui dalam jangka waktu maks. 60 detik. Jika pembaharuan gagal silahkan check latest.log",
- "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Aktifkan Rata-rata Harga BIN",
- "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Tipe Rata-rata",
- "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Aktifkan Harga Jual Beli Bazaar",
- "text.autoconfig.skyblocker.option.richPresence.info": "Informasi Skyblock",
- "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Diaktifkan",
- "text.autoconfig.skyblocker.option.general.itemList": "Daftar Item",
- "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Aktifkan Daftar Item",
- "key.wikiLookup": "Pencarian Wiki",
- "text.autoconfig.skyblocker.option.general.quicknav": "Navigasi Cepat",
- "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Aktifkan Navigasi Cepat",
- "text.autoconfig.skyblocker.option.general.itemTooltip": "Keterangan Item"
-}
+{ + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "Kunci Slot (Hotbar)", + "text.autoconfig.skyblocker.title": "Pengaturan Skyblocker", + "text.autoconfig.skyblocker.category.general": "Umum", + "text.autoconfig.skyblocker.option.general.bars": "Darah, Mana, Pertahanan & Bar XP", + "text.autoconfig.skyblocker.option.general.bars.enableBars": "Aktifkan Bar", + "text.autoconfig.skyblocker.category.locations": "Lokasi", + "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Aktifkan Peta", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Pecahkan Teka Teki \"Tiga Orang Aneh\"", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Pecahkan Teka Teki \"Blaze\"", + "text.autoconfig.skyblocker.category.messages": "Pesan", + "text.autoconfig.skyblocker.option.messages.hideAbility": "Sembunyikan Cooldown Kemampuan", + "text.autoconfig.skyblocker.option.messages.hideHeal": "Sembunyikan Pesan Penyembuhan", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "Sembunyikan Pesan AOTE", + "text.autoconfig.skyblocker.option.messages.hideAds": "Sembunyikan Iklan dari Chat Publik", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Aktifkan Harga NPC", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "Aktifkan Harga BIN Terendah", + "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cInformasi harga item yang ditampilkan dalam tooltip akan diperbarui dalam jangka waktu maks. 60 detik. Jika pembaharuan gagal silahkan check latest.log", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "Aktifkan Rata-rata Harga BIN", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Tipe Rata-rata", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Aktifkan Harga Jual Beli Bazaar", + "text.autoconfig.skyblocker.option.richPresence.info": "Informasi Skyblock", + "text.autoconfig.skyblocker.option.richPresence.enableRichPresence": "Diaktifkan", + "text.autoconfig.skyblocker.option.general.itemList": "Daftar Item", + "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Aktifkan Daftar Item", + "key.wikiLookup": "Pencarian Wiki", + "text.autoconfig.skyblocker.option.general.itemTooltip": "Keterangan Item" +} diff --git a/src/main/resources/assets/skyblocker/lang/ja_jp.json b/src/main/resources/assets/skyblocker/lang/ja_jp.json index 101da288..9a4b7a1d 100644 --- a/src/main/resources/assets/skyblocker/lang/ja_jp.json +++ b/src/main/resources/assets/skyblocker/lang/ja_jp.json @@ -11,8 +11,6 @@ "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": "Shiftキーを押さずにバックパックのプレビューを見る", "text.autoconfig.skyblocker.option.general.itemTooltip": "アイテムの詳細情報", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "NPC売りの値段を表示する", diff --git a/src/main/resources/assets/skyblocker/lang/ko_kr.json b/src/main/resources/assets/skyblocker/lang/ko_kr.json index 95f769d4..cfb4e556 100644 --- a/src/main/resources/assets/skyblocker/lang/ko_kr.json +++ b/src/main/resources/assets/skyblocker/lang/ko_kr.json @@ -15,8 +15,6 @@ "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": "Shift 를 누르지 않고 백팩 미리보기", "text.autoconfig.skyblocker.option.general.itemTooltip": "아이템 툴팁", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "NPC 가격 활성화", @@ -179,5 +177,33 @@ "text.autoconfig.skyblocker.option.messages.hideCombo": "콤보 메시지 가리기", "text.autoconfig.skyblocker.option.messages.hideAutopet": "Autopet 메시지 가리기", "text.autoconfig.skyblocker.option.messages.hideMana": "액션바에서 마나 사용 메시지 가리기", - "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBar 로 더 나은 기능을 사용합니다" + "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBar 로 더 나은 기능을 사용합니다", + "key.skyblocker.defaultTgl": "기본 보기로 탭 HUD 변경", + "key.skyblocker.toggleB": "B 스크린으로 탭 HUD 변경", + "key.skyblocker.toggleA": "A 스크린으로 탭 HUD 변경", + "text.autoconfig.skyblocker.option.general.tabHud": "미려한 탭 HUD", + "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "미려한 탭 HUD 활성화", + "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale": "미려한 탭 HUD 배율", + "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "GUI 비율에 대한 백분율", + "text.autoconfig.skyblocker.option.general.experiments.enableChronomatronSolver": "Chronomatron 해결기 활성화", + "text.autoconfig.skyblocker.option.general.experiments": "Experiments 해결기", + "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Superpairs 해결기 활성화", + "text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver": "Ultrasequencer 해결기 활성화", + "text.autoconfig.skyblocker.option.general.fishing": "낚시 도우미", + "text.autoconfig.skyblocker.option.general.fishing.enableFishingHelper": "낚시 도우미 활성화", + "text.autoconfig.skyblocker.option.general.fairySouls": "페어리 소울 도우미", + "text.autoconfig.skyblocker.option.general.fairySouls.enableFairySoulsHelper": "페어리 소울 도우미 활성화", + "text.autoconfig.skyblocker.option.general.etherwarpOverlay": "Etherwarp 오버레이", + "text.autoconfig.skyblocker.option.general.shortcuts": "단축키", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts": "단축키 활성화", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Hypixel 에서만 작동합니다. \"/skyblocker shortcuts\" 로 단축키를 수정하세요. 이 기능을 사용하려면 아래 옵션 중 하나 이상을 활성화해야 합니다.", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts": "명령어 단축키 활성화", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts.@Tooltip": "한 단어만으로 구성된 명령어 단축키입니다. \"/skyblocker shortcuts\" 로 단축키를 수정하세요. 이 기능을 사용하려면 단축키가 활성화되어야 합니다.", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts": "명령어 인수 단축키 활성화", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts.@Tooltip": "여러 단어나 인수를 가진 명령어의 하나 이상의 단어나 인수를 변경하는 단축키입니다. \"/skyblocker shortcuts\" 로 단축키를 수정하세요. 이 기능을 사용하려면 단축키가 활성화되어야 합니다.", + "text.autoconfig.skyblocker.option.general.quiverWarning": "화살통 경고", + "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarning": "화살통 경고 활성화", + "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningInDungeons": "던전에서 화살통 경고 활성화", + "text.autoconfig.skyblocker.option.general.quiverWarning.enableQuiverWarningAfterDungeon": "던전 후 화살통 경고 활성화", + "text.autoconfig.skyblocker.option.general.acceptReparty": "Reparty 자동 수락" } diff --git a/src/main/resources/assets/skyblocker/lang/nb_no.json b/src/main/resources/assets/skyblocker/lang/nb_no.json index 0f96ebb6..897379c2 100644 --- a/src/main/resources/assets/skyblocker/lang/nb_no.json +++ b/src/main/resources/assets/skyblocker/lang/nb_no.json @@ -10,8 +10,6 @@ "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "Helsebar posisjon", "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Mana Bar Posisjon", "text.autoconfig.skyblocker.option.general.bars.barpositions.defenceBarPosition": "Forsvarsbar posisjon", - "text.autoconfig.skyblocker.option.general.quicknav": "Hurtignavigasjon", - "text.autoconfig.skyblocker.option.general.quicknav.enableQuicknav": "Aktiver hurtignavigasjon", "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "Vis forhåndsvisning av ryggsekk uten å holde Shift nede", "text.autoconfig.skyblocker.option.general.itemTooltip": "Verktøytips for Gjenstad", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "Aktiver NPC-pris", diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json index 588d20a1..4781ae56 100644 --- a/src/main/resources/assets/skyblocker/lang/ru_ru.json +++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json @@ -28,8 +28,6 @@ "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Показывать Решение Starts With", "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §cИнформация о цене предмета обновится менее чем через 60 секунд. Если нет, проверьте latest.log", "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Скрывать сообщения Teleport Pad", - "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": "Можно выбрать, за сколько дней будет браться средняя цена", @@ -81,8 +79,6 @@ "text.autoconfig.skyblocker.option.quickNav.button3": "Кнопка 3", "text.autoconfig.skyblocker.option.general.tabHud": "Красивое TAB меню", "key.skyblocker.defaultTgl": "Показывать стандартное меню TAB", - "key.skyblocker.playerTgl": "Показывать список игроков в меню TAB", - "key.skyblocker.genericTgl": "Показывать общую информацию в меню TAB", "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "Включить красивое TAB меню", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale": "Размер TAB меню", "text.autoconfig.skyblocker.option.general.tabHud.tabHudScale.@Tooltip": "Значение в %, по отношению к размеру интерфейса игры", @@ -238,5 +234,11 @@ "text.autoconfig.skyblocker.option.slayer.vampireSlayer.enableHolyIceIndicator": "Включить Индикатор Holy Ice", "text.autoconfig.skyblocker.option.slayer.vampireSlayer.holyIceIndicatorTickDelay": "Задержка Индикатора Holy Ice (в тиках)", "text.autoconfig.skyblocker.option.slayer.vampireSlayer.holyIceUpdateFrequency": "Частота Обновления Индикатора Holy Ice (в тиках)", - "text.autoconfig.skyblocker.option.slayer.vampireSlayer.holyIceUpdateFrequency.@Tooltip": "Чем ниже значение, тем чаще происходит обновление, это может вызвать лаги." + "text.autoconfig.skyblocker.option.slayer.vampireSlayer.holyIceUpdateFrequency.@Tooltip": "Чем ниже значение, тем чаще происходит обновление, это может вызвать лаги.", + "text.autoconfig.skyblocker.option.general.etherwarpOverlay": "Окрасить Выбранный Блок Etherwarp", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts": "Включить Сокращения Команд", + "text.autoconfig.skyblocker.option.general.shortcuts": "Сокращения", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts": "Включить Сокращения", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Работает только на Хайпикселе. Сокращения можно редактировать при помощи \"/skyblocker shortcuts\". Хотя бы одна из опций должна быть включена, чтобы это работало.", + "text.autoconfig.skyblocker.option.general.tabHud.nameSorting": "Метод сортировки имен игроков" } diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index 215a0bc2..d812403d 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -15,8 +15,6 @@ "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": "查看背包预览无需按住shift键", "text.autoconfig.skyblocker.option.general.itemTooltip": "物品提示信息", "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "显示NPC价格", @@ -78,7 +76,7 @@ "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.option.locations.dwarvenMines.dwarvenHud": "矮人HUD", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud": "矮人矿井 HUD", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enabled": "启用", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.enableBackground": "启用背景", "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.x": "HUD所在横向位置", @@ -193,9 +191,7 @@ "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColor.@Tooltip": "将真 Livid 的颜色发送到聊天栏", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText": "真 Livid 颜色提示信息", "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.lividColorText.@Tooltip": "Livid Boss战时发送到聊天栏的信息， 字段 “[color]” 将被替换为真 Livid 的颜色", - "key.skyblocker.playerTgl": "将tab键所显示的列表改为玩家列表", "key.skyblocker.defaultTgl": "将tab键所显示的列表改为默认空岛生存列表", - "key.skyblocker.genericTgl": "将tab键所显示的列表改为通用信息列表", "text.autoconfig.skyblocker.option.general.tabHud.tabHudEnabled": "启用更好的Tab HUD", "text.autoconfig.skyblocker.option.locations.dungeons.mapX": "地图所在横向位置", "text.autoconfig.skyblocker.option.locations.dungeons.mapY": "地图所在纵向位置", @@ -216,5 +212,30 @@ "text.autoconfig.skyblocker.option.general.fairySouls": "仙女之魂助手", "text.autoconfig.skyblocker.option.general.fairySouls.enableFairySoulsHelper": "启用仙女之魂助手", "skyblocker.fairySouls.markAllFound": "将当前岛屿上的全部仙女之魂标记为已发现", - "text.autoconfig.skyblocker.option.slayer.vampireSlayer.steakStakeUpdateFrequency.@Tooltip": "值越小，更新越频繁（可能会导致卡顿）" + "text.autoconfig.skyblocker.option.slayer.vampireSlayer.steakStakeUpdateFrequency.@Tooltip": "值越小，更新越频繁（可能会导致卡顿）", + "text.autoconfig.skyblocker.option.general.shortcuts": "更精简的命令", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "使用 \"/skyblocker shortcuts\" 以编辑命令的精简版本, 以下选项必须至少启用之一方可有效. (仅在Hypixel服务器可用)", + "text.autoconfig.skyblocker.option.general.teleportOverlay": "传送类技能目标位置显示", + "text.autoconfig.skyblocker.option.general.teleportOverlay.enableTeleportOverlays": "启用传送类技能目标位置显示", + "text.autoconfig.skyblocker.option.general.teleportOverlay.enableWeirdTransmission": "启用 Weird Transmission 目标位置显示", + "text.autoconfig.skyblocker.option.general.teleportOverlay.enableInstantTransmission": "启用 Instant Transmission 技能目标位置显示", + "text.autoconfig.skyblocker.option.general.teleportOverlay.enableEtherTransmission": "启用 Ether Transmission 技能目标位置显示", + "text.autoconfig.skyblocker.option.general.teleportOverlay.enableSinrecallTransmission": "启用 Sinrecall Transmission 技能目标位置显示", + "text.autoconfig.skyblocker.option.general.teleportOverlay.enableWitherImpact": "启用 Wither Impact 目标位置显示", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts": "启用更精简的命令", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts": "启用命令别名", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts": "启用带参命令别名", + "text.autoconfig.skyblocker.option.general.tabHud.nameSorting": "玩家名排列顺序", + "text.autoconfig.skyblocker.option.general.etherwarpOverlay": "Etherwarp 技能目标位置显示", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver.@Tooltip": "以绿色边框标记正确的烈焰人，并将下一个烈焰人以白色线条与边框一同标记.", + "text.autoconfig.skyblocker.option.general.tabHud.plainPlayerNames.@Tooltip": "开启后在公共岛屿显示玩家名时不显示任何特殊效果。", + "text.autoconfig.skyblocker.option.messages.hideShowOff.@Tooltip": "过滤来自 /show 命令的消息", + "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow": "将星标怪物高亮", + "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip": "将玩家可见的星标怪物高亮", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTicTacToe": "井字棋谜题助手", + "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints": "地牢秘密路径点", + "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.enableSecretWaypoints": "启用地牢秘密路径点", + "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.noInitSecretWaypoints": "不对地牢秘密路径点进行初始化", + "text.autoconfig.skyblocker.option.general.tabHud.nameSorting.@Tooltip": "\"Alphabetical\" 以词典序排列玩家, 而 \"Default\" 以Hypixel默认顺序排列", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTicTacToe.@Tooltip": "以红色方块标记井字棋的下一步!" } diff --git a/src/main/resources/assets/skyblocker/lang/zh_tw.json b/src/main/resources/assets/skyblocker/lang/zh_tw.json index e9dbcc73..1f53842b 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_tw.json +++ b/src/main/resources/assets/skyblocker/lang/zh_tw.json @@ -18,5 +18,53 @@ "text.autoconfig.skyblocker.option.messages.hideAbility": "隱藏技能冷卻", "text.autoconfig.skyblocker.option.messages.hideHeal": "隱藏治療訊息", "text.autoconfig.skyblocker.option.messages.hideMana": "在動作欄中隱藏魔力消耗的提示訊息", - "text.autoconfig.skyblocker.option.general.bars": "血量，魔力，防御以及經驗計量條" + "text.autoconfig.skyblocker.option.general.bars": "血量，魔力，防御以及經驗計量條", + "text.autoconfig.skyblocker.category.messages": "訊息", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "平均類型", + "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.NONE": "關閉", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "顯示NPC價格", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableAvgBIN": "顯示平均BIN（立即購買）價格", + "text.autoconfig.skyblocker.option.general.backpackPreviewWithoutShift": "檢視揹包預覽無需按住shift鍵", + "text.autoconfig.skyblocker.option.general.itemTooltip": "物品資訊訊息", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "顯示博物館与日期訊息", + "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "啟用1.8的控制桿判定箱", + "text.autoconfig.skyblocker.option.general.hitbox": "判定箱", + "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §c物品資訊裡面的價格訊息會在最多60秒內更新。如果沒有，請檢查latest.log", + "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "啟用1.8的耕地判定箱", + "text.autoconfig.skyblocker.category.quickNav": "快速導航", + "text.autoconfig.skyblocker.option.quickNav.enableQuickNav": "啟用快速導航", + "text.autoconfig.skyblocker.option.quickNav.button1": "熱鍵1", + "text.autoconfig.skyblocker.option.quickNav.button1.render": "是否顯示該熱鍵", + "text.autoconfig.skyblocker.option.quickNav.button1.item": "熱鍵所顯示物品", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "啟用 Dungeon 地圖", + "text.autoconfig.skyblocker.option.locations.barn.solveTreasureHunter": "Treasure Hunter 助手", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "顯示電鑽燃料", + "text.autoconfig.skyblocker.option.locations.barn": "農業島嶼", + "text.autoconfig.skyblocker.option.locations.barn.solveHungryHiker": "Hungry Hikers 所需物品提示", + "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "隱藏 Molten Wave 技能的提示訊息", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "隱藏內爆技能的提示訊息", + "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "錢包", + "text.autoconfig.skyblocker.option.richPresence.info.LOCATION": "位置", + "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "如果您正在循環模式，這個值將不會生效", + "text.autoconfig.skyblocker.option.richPresence.customMessage": "自訂訊息", + "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName": "物品ID", + "text.autoconfig.skyblocker.option.quickNav.button1.item.count": "物品數量", + "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "物品NBT", + "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "快捷介面標題", + "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "點擊時所執行的指令", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Fetchur 所需物品提示", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.ACTION_BAR": "移至動作欄", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.PASS": "關閉", + "text.autoconfig.skyblocker.option.messages.chatFilterResult.FILTER": "啟用", + "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "已被更好的計量條取代", + "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": "顯示最低BIN（立即購買）價格", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "顯示集市購買/賣出價格" } |