diff options
Diffstat (limited to 'src')
11 files changed, 136 insertions, 34 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 358a6635..a7569adb 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -214,6 +214,9 @@ public class SkyblockerConfig { public ItemInfoDisplay itemInfoDisplay = new ItemInfoDisplay(); @SerialEntry + public ItemProtection itemProtection = new ItemProtection(); + + @SerialEntry public WikiLookup wikiLookup = new WikiLookup(); @SerialEntry @@ -552,6 +555,30 @@ public class SkyblockerConfig { } } + public static class ItemProtection { + @SerialEntry + public SlotLockStyle slotLockStyle = SlotLockStyle.FANCY; + } + + public enum SlotLockStyle { + CLASSIC(new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png")), + FANCY(new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/fancy_slot_lock.png")); + + public final Identifier tex; + + SlotLockStyle(Identifier tex) { + this.tex = tex; + } + + @Override + public String toString() { + return switch (this) { + case CLASSIC -> "Classic"; + case FANCY -> "FANCY"; + }; + } + } + public static class WikiLookup { @SerialEntry public boolean enableWikiLookup = true; diff --git a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java index 406dd885..808b3c2c 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/GeneralCategory.java @@ -457,6 +457,20 @@ public class GeneralCategory { .build()) .build()) + //Item Protection + .group(OptionGroup.createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.itemProtection")) + .collapsed(true) + .option(Option.<SkyblockerConfig.SlotLockStyle>createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.general.itemProtection.slotLockStyle")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.general.itemProtection.slotLockStyle.@Tooltip"))) + .binding(defaults.general.itemProtection.slotLockStyle, + () -> config.general.itemProtection.slotLockStyle, + newValue -> config.general.itemProtection.slotLockStyle = newValue) + .controller(ConfigUtils::createEnumCyclingListController) + .build()) + .build()) + //Wiki Lookup .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.general.wikiLookup")) diff --git a/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java b/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java index 25288ed2..c8f6f272 100644 --- a/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixin/InGameHudMixin.java @@ -3,7 +3,6 @@ package de.hysky.skyblocker.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.sugar.Local; import com.mojang.blaze3d.systems.RenderSystem; -import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.skyblock.FancyStatusBars; import de.hysky.skyblocker.skyblock.dungeon.DungeonMap; @@ -21,6 +20,9 @@ import net.minecraft.client.gui.hud.InGameHud; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; + +import java.util.function.Supplier; + import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -33,7 +35,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(InGameHud.class) public abstract class InGameHudMixin { @Unique - private static final Identifier SLOT_LOCK = new Identifier(SkyblockerMod.NAMESPACE, "textures/gui/slot_lock.png"); + private static final Supplier<Identifier> SLOT_LOCK_ICON = () -> SkyblockerConfigManager.get().general.itemProtection.slotLockStyle.tex; @Unique private final FancyStatusBars statusBars = new FancyStatusBars(); @@ -52,7 +54,7 @@ public abstract class InGameHudMixin { if (SkyblockerConfigManager.get().general.itemInfoDisplay.itemRarityBackgrounds) ItemRarityBackgrounds.tryDraw(player.getInventory().main.get(index), context, x, y); if (HotbarSlotLock.isLocked(index)) { RenderSystem.enableBlend(); - context.drawTexture(SLOT_LOCK, x, y, 0, 0, 16, 16, 16, 16); + context.drawTexture(SLOT_LOCK_ICON.get(), x, y, 0, 0, 16, 16, 16, 16); RenderSystem.disableBlend(); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java index 27ee1605..640f71bd 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/PartyEntryListWidget.java @@ -53,7 +53,7 @@ public class PartyEntryListWidget extends ElementListWidget<PartyEntry> { public void updateDisplay() { List<PartyEntry> entries = new ArrayList<>(partyEntries); - entries.removeIf(partyEntry -> !partyEntry.note.contains(search) && !(partyEntry instanceof PartyEntry.YourParty)); + entries.removeIf(partyEntry -> !partyEntry.note.toLowerCase().contains(search) && !(partyEntry instanceof PartyEntry.YourParty)); entries.sort(Comparator.comparing(PartyEntry::isLocked)); entries.sort(Comparator.comparing(partyEntry -> !(partyEntry instanceof PartyEntry.YourParty))); if (entries.isEmpty() && !partyEntries.isEmpty()) { @@ -63,7 +63,7 @@ public class PartyEntryListWidget extends ElementListWidget<PartyEntry> { } public void setSearch(String s) { - search = s; + search = s.toLowerCase(); updateDisplay(); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java index 472e6d61..24dcc229 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/JacobsContestWidget.java @@ -1,9 +1,5 @@ package de.hysky.skyblocker.skyblock.tabhud.widget; -import java.util.HashMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import de.hysky.skyblocker.skyblock.tabhud.util.Ico; import de.hysky.skyblocker.skyblock.tabhud.util.PlayerListMgr; import de.hysky.skyblocker.skyblock.tabhud.widget.component.IcoTextComponent; @@ -14,6 +10,12 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static java.util.Map.entry; + // this widget shows info about the current jacob's contest (garden only) public class JacobsContestWidget extends Widget { @@ -22,23 +24,20 @@ public class JacobsContestWidget extends Widget { Formatting.BOLD); //TODO Properly match the contest placement and display it - private static final Pattern CROP_PATTERN = Pattern.compile("(?:☘|○) (?<crop>[A-Za-z ]+)(?:.+)?"); + private static final Pattern CROP_PATTERN = Pattern.compile("(?<fortune>[☘○]) (?<crop>[A-Za-z ]+).*"); - private static final HashMap<String, ItemStack> FARM_DATA = new HashMap<>(); - - // again, there HAS to be a better way to do this - static { - FARM_DATA.put("Wheat", new ItemStack(Items.WHEAT)); - FARM_DATA.put("Sugar Cane", new ItemStack(Items.SUGAR_CANE)); - FARM_DATA.put("Carrot", new ItemStack(Items.CARROT)); - FARM_DATA.put("Potato", new ItemStack(Items.POTATO)); - FARM_DATA.put("Melon", new ItemStack(Items.MELON_SLICE)); - FARM_DATA.put("Pumpkin", new ItemStack(Items.PUMPKIN)); - FARM_DATA.put("Cocoa Beans", new ItemStack(Items.COCOA_BEANS)); - FARM_DATA.put("Nether Wart", new ItemStack(Items.NETHER_WART)); - FARM_DATA.put("Cactus", new ItemStack(Items.CACTUS)); - FARM_DATA.put("Mushroom", new ItemStack(Items.RED_MUSHROOM)); - } + private static final Map<String, ItemStack> FARM_DATA = Map.ofEntries( + entry("Wheat", new ItemStack(Items.WHEAT)), + entry("Sugar Cane", new ItemStack(Items.SUGAR_CANE)), + entry("Carrot", new ItemStack(Items.CARROT)), + entry("Potato", new ItemStack(Items.POTATO)), + entry("Melon", new ItemStack(Items.MELON_SLICE)), + entry("Pumpkin", new ItemStack(Items.PUMPKIN)), + entry("Cocoa Beans", new ItemStack(Items.COCOA_BEANS)), + entry("Nether Wart", new ItemStack(Items.NETHER_WART)), + entry("Cactus", new ItemStack(Items.CACTUS)), + entry("Mushroom", new ItemStack(Items.RED_MUSHROOM)) + ); public JacobsContestWidget() { super(TITLE, Formatting.YELLOW.getColorValue()); @@ -54,7 +53,7 @@ public class JacobsContestWidget extends Widget { this.addSimpleIcoText(Ico.CLOCK, "Starts in:", Formatting.GOLD, 76); } - TableComponent tc = new TableComponent(1, 3, Formatting.YELLOW .getColorValue()); + TableComponent tc = new TableComponent(1, 3, Formatting.YELLOW.getColorValue()); for (int i = 77; i < 80; i++) { Matcher item = PlayerListMgr.regexAt(i, CROP_PATTERN); @@ -63,7 +62,11 @@ public class JacobsContestWidget extends Widget { itc = new IcoTextComponent(); } else { String cropName = item.group("crop").trim(); //Trimming is needed because during a contest the space separator will be caught - itc = new IcoTextComponent(FARM_DATA.get(cropName), Text.of(cropName)); + if (item.group("fortune").equals("☘")) { + itc = new IcoTextComponent(FARM_DATA.get(cropName), Text.literal(cropName).append(Text.literal(" ☘").formatted(Formatting.GOLD))); + } else { + itc = new IcoTextComponent(FARM_DATA.get(cropName), Text.of(cropName)); + } } tc.addToCell(0, i - 77, itc); } diff --git a/src/main/resources/assets/skyblocker/lang/en_ca.json b/src/main/resources/assets/skyblocker/lang/en_ca.json index da8193d1..416f9d9b 100644 --- a/src/main/resources/assets/skyblocker/lang/en_ca.json +++ b/src/main/resources/assets/skyblocker/lang/en_ca.json @@ -27,5 +27,9 @@ "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.lossColor": "Loss Colour", "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgrounds.@Tooltip": "Displays a coloured background behind an item, the colour represents the item's rarity.", "text.autoconfig.skyblocker.option.general.itemTooltip.enableExoticTooltip.@Tooltip": "Displays the type of exotic below the item's name if an armour piece is exotic.", - "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColorGlow": "Enable Livid Colour Glow" + "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColorGlow": "Enable Livid Colour Glow", + "skyblocker.tips.customArmorDyeColors": "Apply a custom dye colour to your leather armour with /skyblocker custom dyeColor", + "skyblocker.tips.customArmorTrims": "You can set custom armour trims on your armour using /skyblocker custom armorTrim.", + "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColorTitle": "Enable Livid Colour Title", + "text.autoconfig.skyblocker.option.locations.dungeons.lividColor.enableLividColorTitle.@Tooltip": "Display the livid colour in the title during the Livid boss fight." } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index 0422a7cc..527205cf 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -95,6 +95,9 @@ "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundStyle": "Item Rarity Background Style", "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundStyle.@Tooltip": "Choose between a circular or a square background style!", "text.autoconfig.skyblocker.option.general.itemInfoDisplay.itemRarityBackgroundsOpacity": "Item Rarity Backgrounds Opacity", + "text.autoconfig.skyblocker.option.general.itemProtection": "Item Protection", + "text.autoconfig.skyblocker.option.general.itemProtection.slotLockStyle": "Slot Lock Icon Style", + "text.autoconfig.skyblocker.option.general.itemProtection.slotLockStyle.@Tooltip": "Choose between the fancy or the classic slot lock icon.", "text.autoconfig.skyblocker.option.general.wikiLookup": "Wiki Lookup", "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup": "Enable Wiki Lookup", "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup.@Tooltip": "Opens the wiki page of the hovered item with the F4 key.", diff --git a/src/main/resources/assets/skyblocker/lang/pt_br.json b/src/main/resources/assets/skyblocker/lang/pt_br.json index 11242adf..02e52b02 100644 --- a/src/main/resources/assets/skyblocker/lang/pt_br.json +++ b/src/main/resources/assets/skyblocker/lang/pt_br.json @@ -105,7 +105,7 @@ "text.autoconfig.skyblocker.option.general.itemTooltip.avg": "Tipo Mediano", "text.autoconfig.skyblocker.option.general.itemTooltip.avg.ONE_DAY": "Preço de 1 dia", "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Ativar Preço de compra/venda do Bazar", - "text.autoconfig.skyblocker.option.messages.hideAOTE": "Esconder Mensagens do AOTE", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "Esconder Mensagens da Habilidade de Teleporte", "text.autoconfig.skyblocker.option.messages.hideTeleportPad": "Esconder Mensagens do Pad de Teleporte", "text.autoconfig.skyblocker.option.messages.hideShowOff": "Esconder Mensagens de Show Off", "text.autoconfig.skyblocker.option.slayer.vampireSlayer.effigyUpdateFrequency": "Frequência de Atualização (Ticks) de Waypoints de Effigy", @@ -280,5 +280,8 @@ "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.includeKismet.@Tooltip": "Se ativado, o preço de uma Kismet usada será subtraído no cálculo da margem de lucro", "text.autoconfig.skyblocker.option.locations.dungeons.dungeonChestProfit.includeEssence": "Incluir essência", "text.autoconfig.skyblocker.option.locations.dungeons.secretWaypoints.showSecretText": "Exibir texto secreto", - "text.autoconfig.skyblocker.option.quickNav.button.clickEvent": "Evento ao clicar" + "text.autoconfig.skyblocker.option.quickNav.button.clickEvent": "Evento ao clicar", + "text.autoconfig.skyblocker.option.general.waypoints.enableWaypoints": "Ativar Waypoints", + "text.autoconfig.skyblocker.option.general.waypoints.waypointType": "Tipo de Waypoint", + "text.autoconfig.skyblocker.option.general.waypoints.waypointType.generalNote": "\n\n\nEssa opção não aplica para todos os waypoints. Alguns waypoints como waypoints secretos tem seu próprio opção de tipo de waypoint." } diff --git a/src/main/resources/assets/skyblocker/lang/tr_tr.json b/src/main/resources/assets/skyblocker/lang/tr_tr.json index 362c7e55..b46463fb 100644 --- a/src/main/resources/assets/skyblocker/lang/tr_tr.json +++ b/src/main/resources/assets/skyblocker/lang/tr_tr.json @@ -50,7 +50,7 @@ "text.autoconfig.skyblocker.category.general": "Genel", "text.autoconfig.skyblocker.option.general.bars": "Can, Mana, Defans ve XP Barları", "text.autoconfig.skyblocker.option.general.bars.enableBars": "Barları Etkinleştir", - "text.autoconfig.skyblocker.option.general.bars.barpositions": "Bar Konumları", + "text.autoconfig.skyblocker.option.general.bars.barpositions": "Çubuk Konumlarını Ayarla", "text.autoconfig.skyblocker.option.general.bars.barpositions.NONE": "Devre dışı", "text.autoconfig.skyblocker.option.general.bars.barpositions.healthBarPosition": "Can barı konumu", "text.autoconfig.skyblocker.option.general.bars.barpositions.manaBarPosition": "Mana barı konumu", @@ -61,5 +61,43 @@ "text.autoconfig.skyblocker.option.general.fishing": "Balık Tutma Yardımcısı", "text.autoconfig.skyblocker.option.general.fishing.enableFishingHelper": "Balık tutma yardımcısını aktifleştir", "text.autoconfig.skyblocker.category.messages": "Mesajlar", - "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosion mesajını filtrele" + "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosion mesajını filtrele", + "key.skyblocker.toggleB": "Tab HUD'unda B ekranını aç", + "key.skyblocker.toggleA": "Tab HUD'unda A ekranını aç", + "text.autoconfig.skyblocker.option.general.mythologicalRitual": "Mitolojik Ayin Yardımcısı", + "text.autoconfig.skyblocker.option.general.mythologicalRitual.enableMythologicalRitualHelper": "Mitolojik Ayin Yardımcısını Etkinleştir", + "text.autoconfig.skyblocker.option.general.fairySouls.highlightFoundSouls": "Bulunmuş peri ruhlarını göster", + "text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls": "Sadece yakındaki peri ruhlarını göster", + "text.autoconfig.skyblocker.option.general.fairySouls.highlightOnlyNearbySouls.@Tooltip": "Etkinleştirildiğinde sadece 50 blokluk mesafedeki peri ruhları gösterilir", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "Katman 2", + "text.autoconfig.skyblocker.option.general.shortcuts.config": "Kısayol Ayarları...", + "text.autoconfig.skyblocker.option.general.acceptReparty": "Tekrar parti davetini otomatik kabul et", + "text.autoconfig.skyblocker.option.general.experiments.enableUltrasequencerSolver": "Ultrasekans Çözücüsünü Etkinleştir", + "text.autoconfig.skyblocker.option.general.experiments.enableSuperpairsSolver": "Süperçiftler Çözücüsünü Etkinleştir", + "text.autoconfig.skyblocker.option.general.experiments": "Deney Çözücü", + "text.autoconfig.skyblocker.option.general.experiments.enableChronomatronSolver": "Chronomatron Çözücüsünü Etkinleştir", + "key.skyblocker.defaultTgl": "Tab HUD'unda varsayılan görünüme geç", + "text.autoconfig.skyblocker.option.general.bars.barpositions.RIGHT": "Sağ", + "text.autoconfig.skyblocker.option.general.fairySouls": "Peri Ruhları Yardımcısı", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts.@Tooltip": "Vanilla dahil her yerde çalışır! Kısayolları \"/skyblocker shortcuts\" ile düzenleyebilirsiniz. Bu seçeneğin etki göstermesi için sıradaki seçeneklerden en az birinin etkinleştirilmiş olması gerekir.", + "text.autoconfig.skyblocker.option.general.shortcuts": "Kısayollar", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts": "Komut Kısayollarını Etkinleştir", + "text.autoconfig.skyblocker.option.general.shortcuts.enableShortcuts": "Kısayolları Etkinleştir", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts.@Tooltip": "Sadece bir kelimeden oluşan komutlar için kısayollar. Kısayolları \"/skyblocker shortcuts\" ile düzenleyebilirsiniz. Bu seçeneğin etki göstermesi için kısayolların etkinleştirilmiş olması gerekir.", + "text.autoconfig.skyblocker.option.general.etherwarpOverlay": "Etherwarp Kaplaması", + "text.autoconfig.skyblocker.option.general.fairySouls.enableFairySoulsHelper": "Peri Ruhları Yardımcısını Etkinleştir", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts": "Komut Argüman Kısayollarını Etkinleştir", + "text.autoconfig.skyblocker.option.general.waypoints": "İşaret Noktaları", + "text.autoconfig.skyblocker.option.general.waypoints.enableWaypoints": "İşaret Noktalarını Etkinleştir", + "text.autoconfig.skyblocker.option.general.waypoints.waypointType": "İşaret Noktası Tipi", + "text.autoconfig.skyblocker.option.general.waypoints.waypointType.@Tooltip": "Waypoint: İşaret noktasını renklendirir ve fener ışını gösterir\n\nOutlined Waypoint: İşaret noktasını ve kenar çizgilerini gösterir.\n\nHighlight: Sadece işaret noktasını renklendirir.\n\nOutlined Highlight: İşaret noktasını renklendirir ve kenar çizgilerini gösterir.\n\nOutline: Sadece kenar çizgilerini gösterir.", + "text.autoconfig.skyblocker.option.general.itemCooldown": "Eşya Bekleme Süresi", + "text.autoconfig.skyblocker.option.general.itemCooldown.enableItemCooldowns": "Eşya Bekleme Süresini Etkinleştir", + "text.skyblocker.open": "Aç", + "text.skyblocker.quit_config": "Değişikler Kaydedilmedi", + "text.skyblocker.quit_config_sure": "Ayarları düzenlemekten çıkmak istediğinize emin misiniz? Yaptığınız değişikler kaydedilmeyecek!", + "text.skyblocker.quit_discard": "Çık & Değişiklikleri Yoksay", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "Katman 1", + "text.autoconfig.skyblocker.option.general.enableTips": "Tüyoları Etkinleştir", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts.@Tooltip": "Birden fazla kelime/argümandan oluşan komutların birden fazla komut/argümanını değiştiren kısayollar. Kısayolları \"/skyblocker shortcuts\" ile düzenleyebilirsiniz. Bu seçeneğin etki göstermesi için kısayolların etkinleştirilmiş olması gerekir." } diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index a268d5a5..4d058bf1 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -113,7 +113,7 @@ "skyblocker.fairySouls.markAllFound": "将当前岛屿上的全部仙女之魂标记为已发现", "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.shortcuts.enableShortcuts.@Tooltip": "使用 \"/skyblocker shortcuts\" 以编辑命令的精简版本, 以下选项必须至少启用之一方可有效. (此功能在空岛生存外也可使用)", "text.autoconfig.skyblocker.option.general.teleportOverlay": "传送类技能目标位置显示", "text.autoconfig.skyblocker.option.general.teleportOverlay.enableTeleportOverlays": "启用传送类技能目标位置显示", "text.autoconfig.skyblocker.option.general.teleportOverlay.enableWeirdTransmission": "启用 Weird Transmission 目标位置显示", @@ -149,5 +149,13 @@ "text.skyblocker.quit_config_sure": "确定退出吗? 你的修改将不会被保存!", "text.autoconfig.skyblocker.option.general.wikiLookup": "查阅 wiki", "text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki": "使用Hypixel官方 Wiki", - "text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki.@Tooltip": "在查阅时使用Hypixel 官方 wiki 代替 Fandom wiki" + "text.autoconfig.skyblocker.option.general.wikiLookup.officialWiki.@Tooltip": "在查阅时使用Hypixel 官方 wiki 代替 Fandom wiki", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableObtainedDate": "显示获取时间", + "text.autoconfig.skyblocker.option.general.shortcuts.enableCommandShortcuts.@Tooltip": "此功能可用较短的别名替换较长的原始命令，使用 \"/skyblocker shortcuts\" 以编辑. (“更精简的命令”功能必须启用才可生效)", + "text.autoconfig.skyblocker.option.general.waypoints": "路径点", + "text.autoconfig.skyblocker.option.general.waypoints.enableWaypoints": "启用路径点", + "text.autoconfig.skyblocker.option.general.waypoints.waypointType": "路径点类型", + "text.skyblocker.open": "开启", + "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup": "启用 wiki 查阅功能", + "text.autoconfig.skyblocker.option.general.wikiLookup.enableWikiLookup.@Tooltip": "指针悬停于物品之下按 F4 键打开 wiki 相关条目" } diff --git a/src/main/resources/assets/skyblocker/textures/gui/fancy_slot_lock.png b/src/main/resources/assets/skyblocker/textures/gui/fancy_slot_lock.png Binary files differnew file mode 100644 index 00000000..d3370639 --- /dev/null +++ b/src/main/resources/assets/skyblocker/textures/gui/fancy_slot_lock.png |
