diff options
18 files changed, 742 insertions, 175 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3204bdb4..8aa8c4df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,55 @@ +# Release 1.9.0 + +Supports 1.19.4 + +## What's Changed +* Fix trivia solver glitch by @TheColdPot in https://github.com/SkyblockerMod/Skyblocker/pull/89 +* optimize Dwarven HUD & add draggable config by @TacoMonkey11 in https://github.com/SkyblockerMod/Skyblocker/pull/93 +* Use official hypixel wiki for WikiLookup by @TacoMonkey11 in https://github.com/SkyblockerMod/Skyblocker/pull/94 +* Corrections + Update by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/99 +* Fix Fetchur solver not working by adding typo'ed variant by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/100 +* Update GSON and remove old adapter by @TacoMonkey11 in https://github.com/SkyblockerMod/Skyblocker/pull/95 +* Adding QuickNav Customization by @MiraculixxT in https://github.com/SkyblockerMod/Skyblocker/pull/111 +* Fix multiple README badges by @triphora in https://github.com/SkyblockerMod/Skyblocker/pull/110 +* Add Chinese translation by @catandA in https://github.com/SkyblockerMod/Skyblocker/pull/113 +* Fixes crash with WikiLookup by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/114 +* Fixed IndexOutOfBoundsException in WikiLookup by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/118 +* fix LBIN by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/119 +* Update to 1.19.3 by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/109 +* Support for 1.19.4 & Cleanup by @kevinthegreat1 in https://github.com/SkyblockerMod/Skyblocker/pull/123 +* account for the easter name change and refactor slightly by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/125 +* Update gradle & mr version by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/126 +* fix msg filter by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/128 +* Fix config loading by @AzureAaron in https://github.com/SkyblockerMod/Skyblocker/pull/124 +* port UpdateChecker to java.net.http by @TacoMonkey11 in https://github.com/SkyblockerMod/Skyblocker/pull/129 +* Move Discord RPC connection to JOIN event + refactor by @TacoMonkey11 in https://github.com/SkyblockerMod/Skyblocker/pull/130 +* Changes to quicknav tabs (Fixes and Additions) by @Julienraptor01 in https://github.com/SkyblockerMod/Skyblocker/pull/132 +* More I18n for config by @catandA in https://github.com/SkyblockerMod/Skyblocker/pull/115 +* Add Japanese by @hirochisan in https://github.com/SkyblockerMod/Skyblocker/pull/139 + +## New Contributors +* @TheColdPot made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/89 +* @Julienraptor01 made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/99 +* @MiraculixxT made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/111 +* @triphora made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/110 +* @catandA made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/113 +* @kevinthegreat1 made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/114 +* @AzureAaron made their first contribution in https://github.com/SkyblockerMod/Skyblocker/pull/124 + +**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.8.2...v1.9.0 + +___ +# Release 1.8.2 + +## Fixes +* Fix status bars not working after new Skyblock update by @KonaeAkira in https://github.com/SkyblockerMod/Skyblocker/commit/b3a7de41788209dab1d1f453e8b8630169096018 +* Fix backpack preview not updating preview content after new Skyblock update by @KonaeAkira in https://github.com/SkyblockerMod/Skyblocker/commit/f681ad65e73b12ccd01d1fa8184a4b0abc3ee3c2 +* Fix the url of the meteordev repository by @Username404-59 in https://github.com/SkyblockerMod/Skyblocker/pull/84 +* Update PriceInfoTooltip.java by @Fix3dll in https://github.com/SkyblockerMod/Skyblocker/pull/86 +* Fix update notification not showing on first start-up by @KonaeAkira in https://github.com/SkyblockerMod/Skyblocker/commit/26e6a755c002a56db415d9b219ffafefbe384537 + +**Full Changelog**: https://github.com/SkyblockerMod/Skyblocker/compare/v1.8.1...v1.8.2 +___ # Release 1.8.1 Fixes diff --git a/FEATURES.md b/FEATURES.md index c2f2a287..1cd95a1e 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -2,9 +2,10 @@ * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages * Dungeon Minimap * Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * F7 Terminal: Order, Color, Name + * Three Weirdos + * Blaze + * Croesus + * F7 Terminal: Order, Color, Name * Dwarven Mines Solver: Fetchur, Puzzler * Drill Fuel in Item Durability Bar * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) @@ -12,9 +13,11 @@ * reparty: write /rp to reparty * Wiki Lookup: press f4 to open the wiki page about the held item * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message -* Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, warp hub -* Recipe book: in the vanilla recipe book all skyblock items are listed and you can see the recipe of the item -* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and hold shift to preview +* Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, + warp hub +* Recipe book: in the vanilla recipe book all skyblock items are listed, and you can see the recipe of the item +* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and + hold shift to preview * Update notification * Commission HUD: Dwarven Mines quests * 1.8 hitbox for lever and farmland
\ No newline at end of file @@ -1,18 +1,19 @@ -<img height="150" src="https://hypixel.net/attachments/skyblocker-png.2715347" /> +<img height="150" src="https://hysky.de/skyblocker.png" alt="skyblocker"/> ## Skyblocker + [](https://modrinth.com/mod/skyblocker-liap) -[](https://github.com/SkyblockerMod/Skyblocker/releases/latest) -[](https://github.com/SkyblockerMod/Skyblocker/actions/workflows/beta.yml) +[](https://github.com/SkyblockerMod/Skyblocker/releases/latest) +[](https://github.com/SkyblockerMod/Skyblocker/actions/workflows/beta.yml) [](https://discord.com/invite/aNNJHQykck) [](https://ko-fi.com/wohlhabend) - Hypixel Skyblock Mod for Minecraft 1.17.x + 1.18.x + 1.19.x Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/installation) ## Features + <details open> <summary>open</summary> @@ -20,9 +21,10 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in * Hide Messages: Ability Cooldown, Heal, AOTE, Implosion, Molten Wave, Teleport Pad Messages * Dungeon Minimap * Dungeon Puzzle Solver: - * Three Weirdos - * Blaze - * F7 Terminal: Order, Color, Name + * Three Weirdos + * Blaze + * Croesus + * F7 Terminal: Order, Color, Name * Dwarven Mines Solver: Fetchur, Puzzler * Drill Fuel in Item Durability Bar * Hotbar Slot Lock Keybind (Select the hotbar slot you want to lock/unlock and press the lockbutton) @@ -30,9 +32,11 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in * reparty: write /rp to reparty * Wiki Lookup: press f4 to open the wiki page about the held item * Discord Rich Presence: Allows user to show either their Piggy, Bits, or location. Along with a custom message -* Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, warp hub +* Quicknav: fast navigate between pets, armor, enderchest, skill, collection, crafting, enchant, envil, warp dungeon, + warp hub * Recipe book: in the vanilla recipe book all skyblock items are listed, and you can see the recipe of the item -* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and hold shift to preview +* Backpack preview: after you clicked your backpack or enderchest once you can hover over the backpack or enderchest and + hold shift to preview * Update notification * Commission HUD: Dwarven Mines quests * 1.8 hitbox for lever and farmland @@ -40,7 +44,9 @@ Installation guide is [here](https://github.com/SkyblockerMod/Skyblocker/wiki/in </details> ___ + ## Images + <details open> <summary>open</summary> @@ -57,7 +63,8 @@ ___ ## Contribute -Everyone can contribute to Skyblocker, read [this](https://github.com/SkyblockerMod/Skyblocker/wiki/Contribute) for more information. +Everyone can contribute to Skyblocker, read [this](https://github.com/SkyblockerMod/Skyblocker/wiki/Contribute) for more +information. ## Stargazers @@ -65,20 +72,27 @@ Everyone can contribute to Skyblocker, read [this](https://github.com/Skyblocker ## Credits -| [<img alt="Kraineff" src="https://github.com/Kraineff.png" width="100">](https://github.com/Kraineff) | [<img alt="d3dx9" src="https://github.com/d3dx9.png" width="100">](https://github.com/d3dx9) | [<img alt="LifeIsAParadox" src="https://github.com/LifeIsAParadox.png" width="100">](https://github.com/LifeIsAParadox) | [<img alt="ExternalTime" src="https://github.com/ExternalTime.png" width="100">](https://github.com/ExternalTime) | -|:-------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:| -| [Kraineff](https://github.com/Kraineff) | [d3dx9](https://github.com/d3dx9) | [LifeIsAParadox](https://github.com/LifeIsAParadox) | [ExternalTime](https://github.com/ExternalTime) | +| [<img alt="Kraineff" src="https://github.com/Kraineff.png" width="100">](https://github.com/Kraineff) | [<img alt="d3dx9" src="https://github.com/d3dx9.png" width="100">](https://github.com/d3dx9) | [<img alt="LifeIsAParadox" src="https://github.com/LifeIsAParadox.png" width="100">](https://github.com/LifeIsAParadox) | [<img alt="ExternalTime" src="https://github.com/ExternalTime.png" width="100">](https://github.com/ExternalTime) | +|:-----------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:| +| [Kraineff](https://github.com/Kraineff) | [d3dx9](https://github.com/d3dx9) | [LifeIsAParadox](https://github.com/LifeIsAParadox) | [ExternalTime](https://github.com/ExternalTime) | + +| [<img alt="Zailer43" src="https://github.com/Zailer43.png" width="100">](https://github.com/Zailer43) | [<img alt="TacoMonkey11" src="https://github.com/TacoMonkey11.png" width="100">](https://github.com/TacoMonkey11) | [<img alt="KonaeAkira" src="https://github.com/KonaeAkira.png" width="100">](https://github.com/KonaeAkira) | [<img alt="Fix3dll" src="https://github.com/Fix3dll.png" width="100">](https://github.com/Fix3dll) | +|:-----------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------:| +| [Zailer43](https://github.com/Zailer43) | [TacoMonkey11](https://github.com/TacoMonkey11) | [KonaeAkira](https://github.com/KonaeAkira) | [Fix3dll](https://github.com/Fix3dll) | -| [<img alt="Zailer43" src="https://github.com/Zailer43.png" width="100">](https://github.com/Zailer43) | [<img alt="TacoMonkey11" src="https://github.com/TacoMonkey11.png" width="100">](https://github.com/TacoMonkey11) | [<img alt="KonaeAkira" src="https://github.com/KonaeAkira.png" width="100">](https://github.com/KonaeAkira) | [<img alt="Fix3dll" src="https://github.com/Fix3dll.png" width="100">](https://github.com/Fix3dll) | -|:-----------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------------------------------------------------------:| -| [Zailer43](https://github.com/Zailer43) | [TacoMonkey11](https://github.com/TacoMonkey11) | [KonaeAkira](https://github.com/KonaeAkira) | [Fix3dll](https://github.com/Fix3dll) | +| [<img alt="ADON15c" src="https://github.com/ADON15c.png" width="100">](https://github.com/ADON15c) | [<img alt="TheColdPot" src="https://github.com/TheColdPot.png" width="100">](https://github.com/TheColdPot) | [<img alt="Julienraptor01" src="https://github.com/Julienraptor01.png" width="100">](https://github.com/Julienraptor01) | [<img alt="MiraculixxT" src="https://github.com/MiraculixxT.png" width="100">](https://github.com/MiraculixxT) | +|:--------------------------------------------------------------------------------------------------:|-------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------| +| [ADON15c](https://github.com/ADON15c) | [TheColdPot](https://github.com/TheColdPot) | [Julienraptor01](https://github.com/Julienraptor01) | [ADON15c](https://github.com/MiraculixxT) | +| [<img alt="catandA" src="https://github.com/catandA.png" width="100">](https://github.com/catandA) | [<img alt="kevinthegreat1" src="https://github.com/kevinthegreat1.png" width="100">](https://github.com/kevinthegreat1) | [<img alt="AzureAaron" src="https://github.com/AzureAaron.png" width="100">](https://github.com/AzureAaron) | +|:--------------------------------------------------------------------------------------------------:|-------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------| +| [catandA](https://github.com/catandA) | [kevinthegreat1](https://github.com/kevinthegreat1) | [AzureAaron](https://github.com/AzureAaron) | -| [<img alt="Zailer43" src="https://github.com/ADON15c.png" width="100">](https://github.com/ADON15c) | -|:---------------------------------------------------------------------------------------------------:| -| [ADON15c](https://github.com/ADON15c) | ### Translators + German ([LifeIsAParadox](https://github.com/LifeIsAParadox)) \ Indonesian ([null2264](https://github.com/null2264)) \ Russian ([HyperSoop](https://github.com/HyperSoop)) \ -French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01)) +French ([edgarogh](https://github.com/edgarogh) & [Julienraptor01](https://github.com/Julienraptor01)) \ +Japanese ([hirochisan](https://github.com/@irochisan)) \ +Chinese ([catandA](https://github.com/catandA)) diff --git a/gradle.properties b/gradle.properties index 139c0e46..c883c1a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,7 +17,7 @@ clothconfig_version=10.0.96 mod_menu_version=6.1.0-rc.4 # Mod Properties -mod_version = 1.8.3-beta +mod_version = 1.9.0 maven_group = me.xmrvizzy archives_base_name = skyblocker modrinth_id=y6DuFGwJ
\ No newline at end of file diff --git a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java index 2e23bf31..9ee87f2b 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java +++ b/src/main/java/me/xmrvizzy/skyblocker/chat/ChatMessageListener.java @@ -2,11 +2,13 @@ package me.xmrvizzy.skyblocker.chat; import me.xmrvizzy.skyblocker.chat.filters.*; import me.xmrvizzy.skyblocker.skyblock.api.ApiKeyListener; +import me.xmrvizzy.skyblocker.skyblock.barn.HungryHiker; import me.xmrvizzy.skyblocker.skyblock.dungeon.Reparty; 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.skyblock.barn.TreasureHunter; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; import net.minecraft.text.Text; @@ -30,6 +32,8 @@ public interface ChatMessageListener { new Reparty(), new ThreeWeirdos(), new Trivia(), + new TreasureHunter(), + new HungryHiker(), // Filters new AbilityFilter(), new AdFilter(), diff --git a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java index ee24a6d2..9ecfe215 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/me/xmrvizzy/skyblocker/config/SkyblockerConfig.java @@ -125,6 +125,7 @@ public class SkyblockerConfig implements ConfigData { public static class General { public boolean enableUpdateNotification = true; public boolean backpackPreviewWithoutShift = false; + public boolean hideEmptyTooltips = true; @ConfigEntry.Gui.Excluded public String apiKey; @@ -231,6 +232,10 @@ public class SkyblockerConfig implements ConfigData { } public static class Locations { + @ConfigEntry.Category("barn") + @ConfigEntry.Gui.CollapsibleObject() + public Barn barn = new Barn(); + @ConfigEntry.Category("dungeons") @ConfigEntry.Gui.CollapsibleObject() public Dungeons dungeons = new Dungeons(); @@ -244,6 +249,7 @@ public class SkyblockerConfig implements ConfigData { @ConfigEntry.Gui.Tooltip() public boolean croesusHelper = true; public boolean enableMap = true; + public float mapScaling = 1f; public boolean solveThreeWeirdos = true; public boolean blazesolver = true; public boolean solveTrivia = true; @@ -272,6 +278,11 @@ public class SkyblockerConfig implements ConfigData { public int y = 10; } + public static class Barn { + public boolean solveHungryHiker = true; + public boolean solveTreasureHunter = true; + } + public static class Messages { @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) public ChatFilterResult hideAbility = ChatFilterResult.PASS; @@ -312,4 +323,4 @@ public class SkyblockerConfig implements ConfigData { public static SkyblockerConfig get() { return AutoConfig.getConfigHolder(SkyblockerConfig.class).getConfig(); } -}
\ No newline at end of file +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java new file mode 100644 index 00000000..14aa8868 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/ScreenMixin.java @@ -0,0 +1,28 @@ +package me.xmrvizzy.skyblocker.mixin; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import me.xmrvizzy.skyblocker.utils.Utils; + +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.ItemStack; +import net.minecraft.text.Text; + +@Mixin(Screen.class) +public abstract class ScreenMixin { + + @Inject(at = @At("HEAD"), method = "renderTooltip(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/item/ItemStack;II)V", cancellable = true) + public void skyblocker$renderTooltip(MatrixStack matrices, ItemStack itemStack, int x, int y, CallbackInfo ci) { + Text stackName = itemStack.getName(); + String strName = stackName.getString(); + if (Utils.isOnSkyblock && SkyblockerConfig.get().general.hideEmptyTooltips && strName.equals(" ")) { + ci.cancel(); + } + } + +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java new file mode 100644 index 00000000..b0f0445a --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/HungryHiker.java @@ -0,0 +1,47 @@ +package me.xmrvizzy.skyblocker.skyblock.barn; + +import me.xmrvizzy.skyblocker.chat.ChatFilterResult; +import me.xmrvizzy.skyblocker.chat.ChatPatternListener; +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.Text; + +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; + +public class HungryHiker extends ChatPatternListener { + + private static final Map<String, String> foods; + + public HungryHiker() { super("^§e\\[NPC] Hungry Hiker§f: (The food I want is|(I asked for) food that is) ([a-zA-Z, '\\-]*\\.)$"); } + + @Override + public ChatFilterResult state() { + return SkyblockerConfig.get().locations.barn.solveHungryHiker ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + } + + @Override + public boolean onMatch(Text message, Matcher matcher) { + MinecraftClient client = MinecraftClient.getInstance(); + if (client.player == null) return false; + String foodDescription = matcher.group(3); + String food = foods.get(foodDescription); + if (food == null) return false; + String middlePartOfTheMessageToSend = matcher.group(2) != null ? matcher.group(2) : matcher.group(1); + client.player.sendMessage(Text.of("§e[NPC] Hungry Hiker§f: " + middlePartOfTheMessageToSend + " " + food + "."), false); + return true; + } + + static { + foods = new HashMap<>(); + foods.put("from a cow.", Text.translatable("item.minecraft.cooked_beef").getString()); + foods.put("meat from a fowl.", Text.translatable("item.minecraft.cooked_chicken").getString()); + foods.put("red on the inside, green on the outside.", Text.translatable("item.minecraft.melon_slice").getString()); + foods.put("a cooked potato.", Text.translatable("item.minecraft.baked_potato").getString()); + foods.put("a stew.", Text.translatable("item.minecraft.rabbit_stew").getString()); + foods.put("a grilled meat.", Text.translatable("item.minecraft.cooked_porkchop").getString()); + foods.put("red and crunchy.", Text.translatable("item.minecraft.apple").getString()); + foods.put("made of wheat.", Text.translatable("item.minecraft.bread").getString()); + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java new file mode 100644 index 00000000..ad5db522 --- /dev/null +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/barn/TreasureHunter.java @@ -0,0 +1,61 @@ +package me.xmrvizzy.skyblocker.skyblock.barn; + +import me.xmrvizzy.skyblocker.chat.ChatFilterResult; +import me.xmrvizzy.skyblocker.chat.ChatPatternListener; +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; +import net.minecraft.client.MinecraftClient; +import net.minecraft.text.Text; + +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; + +public class TreasureHunter extends ChatPatternListener { + + private static final Map<String, String> locations; + + public TreasureHunter() { super("^§e\\[NPC] Treasure Hunter§f: ([a-zA-Z, '\\-\\.]*)$"); } + + @Override + public ChatFilterResult state() { + return SkyblockerConfig.get().locations.barn.solveTreasureHunter ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + } + + @Override + public boolean onMatch(Text message, Matcher matcher) { + MinecraftClient client = MinecraftClient.getInstance(); + if (client.player == null) return false; + String hint = matcher.group(1); + String location = locations.get(hint); + if (location == null) return false; + client.player.sendMessage(Text.of("§e[NPC] Treasure Hunter§f: Go mine around " + location + "."), false); + return true; + } + + static { + locations = new HashMap<>(); + locations.put("There's a treasure chest somewhere in a small cave in the gorge.", "258 70 -492"); + locations.put("I was in the desert earlier, and I saw something near a red sand rock.", "357 82 -319"); + locations.put("There's this guy who collects animals to experiment on, I think I saw something near his house.", "259 184 -564"); + locations.put("There's a small house in the gorge, I saw some treasure near there.", "297 87 -562"); + locations.put("There's this guy who says he has the best sheep in the world. I think I saw something around his hut.", "392 85 -372"); + locations.put("I spotted something by an odd looking mushroom on one of the ledges in the Mushroom Gorge, you should check it out.", "305 73 -557"); + locations.put("There are some small ruins out in the desert, might want to check them out.", "320 102 -471"); + locations.put("Some dirt was kicked up by the water pool in the overgrown Mushroom Cave. Have a look over there.", "234 56 -410"); + locations.put("There are some old stone structures in the Mushroom Gorge, give them a look.", "223 54 -503"); + locations.put("In the Mushroom Gorge where blue meets the ceiling and floor, you will find what you are looking for.", "205 42 -527"); + locations.put("There was a haystack with a crop greener than usual around it, I think there is something near there.", "334 82 -389"); + locations.put("There's a single piece of tall grass growing in the desert, I saw something there.", "283 76 -363"); + locations.put("I saw some treasure by a cow skull near the village.", "141 77 -397"); + locations.put("Near a melon patch inside a tunnel in the mountain I spotted something.", "257 100 -569"); + locations.put("I saw something near a farmer's cart, you should check it out.", "155 90 -591"); + locations.put("I remember there was a stone pillar made only of cobblestone in the oasis, could be something there.", "122 66 -409"); + locations.put("I thought I saw something near the smallest stone pillar in the oasis.", "94 65 -455"); + locations.put("I found something by a mossy stone pillar in the oasis, you should take a look.", "179 93 -537"); + locations.put("Down in the glowing Mushroom Cave, there was a weird looking mushroom, check it out.", "182 44 -451"); + locations.put("Something caught my eye by the red sand near the bridge over the gorge.", "306 105 -489"); + locations.put("I seem to recall seeing something near the well in the village.", "170 77 -375"); + locations.put("I was down near the lower oasis yesterday, I think I saw something under the bridge.", "142 69 -448"); + locations.put("I was at the upper oasis today, I recall seeing something on the cobblestone stepping stones.", "188 77 -459"); + } +} diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java index e0158bc5..dda8da41 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/DungeonMap.java @@ -1,5 +1,8 @@ package me.xmrvizzy.skyblocker.skyblock.dungeon; +import org.apache.commons.lang3.StringUtils; + +import me.xmrvizzy.skyblocker.config.SkyblockerConfig; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.MapRenderer; import net.minecraft.client.render.VertexConsumerProvider; @@ -8,7 +11,6 @@ import net.minecraft.item.FilledMapItem; import net.minecraft.item.ItemStack; import net.minecraft.item.map.MapState; import net.minecraft.nbt.NbtCompound; -import org.apache.commons.lang3.StringUtils; public class DungeonMap { @@ -25,11 +27,12 @@ public class DungeonMap { VertexConsumerProvider.Immediate vertices = client.getBufferBuilders().getEffectVertexConsumers(); MapRenderer map = client.gameRenderer.getMapRenderer(); MapState state = FilledMapItem.getMapState(mapid, client.world); + float scaling = SkyblockerConfig.get().locations.dungeons.mapScaling; if (state == null) return; matrices.push(); matrices.translate(2, 2, 0); - matrices.scale(1, 1, 0); + matrices.scale(scaling, scaling, 0f); map.draw( matrices, vertices, mapid, state, false, 15728880); vertices.draw(); matrices.pop(); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java index 81bee4ba..10a2e413 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dungeon/Trivia.java @@ -69,7 +69,7 @@ public class Trivia extends ChatPatternListener { answers.put("What is the status of Storm?", new String[]{"The Wither Lords"}); answers.put("What is the status of Necron?", new String[]{"The Wither Lords"}); answers.put("What is the status of Maxor, Storm, Goldor and Necron?", new String[]{"The Wither Lords"}); - answers.put("How many total Fairy Souls are there?", new String[]{"239 Fairy Souls"}); + answers.put("How many total Fairy Souls are there?", new String[]{"240 Fairy Souls"}); answers.put("How many Fairy Souls are there in Spider's Den?", new String[]{"19 Fairy Souls"}); answers.put("How many Fairy Souls are there in The End?", new String[]{"12 Fairy Souls"}); answers.put("How many Fairy Souls are there in The Farming Islands?", new String[]{"20 Fairy Souls"}); diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json index a74b39ff..56f0fb14 100644 --- a/src/main/resources/assets/skyblocker/lang/de_de.json +++ b/src/main/resources/assets/skyblocker/lang/de_de.json @@ -1,33 +1,35 @@ { - "key.categories.skyblocker": "Skyblocker", - "key.hotbarSlotLock": "Schlitzsperre (Hotbar)", + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "Schlitzsperre (Hotbar)", + "text.autoconfig.skyblocker.title": "Skyblocker-Einstellungen", + "text.autoconfig.skyblocker.category.general": "Allgemein", + "text.autoconfig.skyblocker.option.general.bars": "Gesundheits-, Mana-, Verteidigungs- und XP-Balken", + "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.title": "Skyblocker-Einstellungen", - - "text.autoconfig.skyblocker.category.general": "Allgemein", - "text.autoconfig.skyblocker.option.general.bars": "Gesundheits-, Mana-, Verteidigungs- und XP-Balken", - "text.autoconfig.skyblocker.option.general.bars.enableBars": "Balken aktivieren", - - "text.autoconfig.skyblocker.category.locations": "Standorte", - "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", - "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Karte aktivieren", - "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Drei Verrückte Rätsel lösen", - "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Blaze Rätsel lösen", - "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Rätsel lösen", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Löser", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Wähle die richtige Farbe", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Klick in der Reihenfolge lösen", - "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Beginnt mit lösen", - "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Zwergenminen", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Bohrtreibstoff aktivieren", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Löse Fetchur", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Puzzler-Rätsel lösen", - - "text.autoconfig.skyblocker.category.messages": "Nachrichten", - "text.autoconfig.skyblocker.option.messages.hideAbility": "Abklingzeit der Fähigkeit nachricht verbergen", - "text.autoconfig.skyblocker.option.messages.hideHeal": "Heilungsnachrichten verbergen", - "text.autoconfig.skyblocker.option.messages.hideAOTE": "AOTE-Meldungen ausblenden", - "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosionsmeldung ausblenden", - "text.autoconfig.skyblocker.option.messages.hideMoltenWave": "Nachricht über Molten Wave ausblenden", - "text.autoconfig.skyblocker.option.messages.hideAds": "Werbung im öffentlichen Chat ausblenden" -}
\ No newline at end of file + "text.autoconfig.skyblocker.category.locations": "Standorte", + "text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons", + "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Karte aktivieren", + "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Drei Verrückte Rätsel lösen", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Blaze Rätsel lösen", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Rätsel lösen", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Löser", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Wähle die richtige Farbe", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Klick in der Reihenfolge lösen", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Beginnt mit lösen", + "text.autoconfig.skyblocker.option.locations.dwarvenMines": "Zwergenminen", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Bohrtreibstoff aktivieren", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solveFetchur": "Löse Fetchur", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "Puzzler-Rätsel lösen", + "text.autoconfig.skyblocker.category.messages": "Nachrichten", + "text.autoconfig.skyblocker.option.messages.hideAbility": "Abklingzeit der Fähigkeit nachricht verbergen", + "text.autoconfig.skyblocker.option.messages.hideHeal": "Heilungsnachrichten verbergen", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "AOTE-Meldungen ausblenden", + "text.autoconfig.skyblocker.option.messages.hideImplosion": "Implosionsmeldung ausblenden", + "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", + "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" +} diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index ebd801d8..4809b8ab 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -50,17 +50,101 @@ "text.autoconfig.skyblocker.category.quickNav" : "Quick Navigation", "text.autoconfig.skyblocker.option.quickNav.enableQuickNav" : "Enable Quick Navigation", "text.autoconfig.skyblocker.option.quickNav.button1" : "Button 1", + "text.autoconfig.skyblocker.option.quickNav.button1.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button1.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button1.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button1.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button2" : "Button 2", + "text.autoconfig.skyblocker.option.quickNav.button2.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button2.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button2.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button2.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button2.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button2.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button3" : "Button 3", + "text.autoconfig.skyblocker.option.quickNav.button3.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button3.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button3.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button3.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button3.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button4" : "Button 4", + "text.autoconfig.skyblocker.option.quickNav.button4.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button4.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button4.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button4.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button4.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button5" : "Button 5", + "text.autoconfig.skyblocker.option.quickNav.button5.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button5.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button5.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button5.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button5.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button6" : "Button 6", + "text.autoconfig.skyblocker.option.quickNav.button6.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button6.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button6.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button6.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button6.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button7" : "Button 7", + "text.autoconfig.skyblocker.option.quickNav.button7.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button7.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button7.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button7.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button7.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button8" : "Button 8", + "text.autoconfig.skyblocker.option.quickNav.button8.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button8.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button8.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button8.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button8.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button9" : "Button 9", + "text.autoconfig.skyblocker.option.quickNav.button9.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button9.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button9.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button9.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button9.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button10" : "Button 10", + "text.autoconfig.skyblocker.option.quickNav.button10.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button10.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button10.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button10.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button10.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button11" : "Button 11", + "text.autoconfig.skyblocker.option.quickNav.button11.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button11.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button11.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button11.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button11.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.quickNav.button12" : "Button 12", + "text.autoconfig.skyblocker.option.quickNav.button12.render" : "Render", + "text.autoconfig.skyblocker.option.quickNav.button12.item" : "Item", + "text.autoconfig.skyblocker.option.quickNav.button12.item.itemName" : "Item name", + "text.autoconfig.skyblocker.option.quickNav.button12.item.count" : "Item Count", + "text.autoconfig.skyblocker.option.quickNav.button12.item.nbt" : "NBT", + "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle" : "UI Title", + "text.autoconfig.skyblocker.option.quickNav.button12.clickEvent" : "Click event", "text.autoconfig.skyblocker.option.general.itemList": "Item List", "text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Enable Item List", @@ -70,6 +154,7 @@ "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper": "Croesus Helper", "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Gray out chests that have already been opened.", "text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Enable Map", + "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Map Scaling", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle", "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Solve Blaze Puzzle", "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Solve Trivia Puzzle", @@ -108,6 +193,7 @@ "skyblocker.update.update_message_end" : " §ato find out about latest features.", "skyblocker.update.hover_text": "Open Modrinth", "text.autoconfig.skyblocker.option.general.enableUpdateNotification": "Update Notification", + "text.autoconfig.skyblocker.option.general.hideEmptyTooltips": "Hide empty item tooltips in menus", "skyblocker.updaterepository.failed": "§b[§6Skyblocker§b] §cUpdating local repository failed. Remove files manually and restart game.", diff --git a/src/main/resources/assets/skyblocker/lang/ja_JP.json b/src/main/resources/assets/skyblocker/lang/ja_JP.json new file mode 100644 index 00000000..954647c7 --- /dev/null +++ b/src/main/resources/assets/skyblocker/lang/ja_JP.json @@ -0,0 +1,74 @@ +{ + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "ホットバースロットのロック", + "key.wikiLookup": "Wikiのページを開く", + "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.option.general.bars.barpositions": "バーの位置を変える", + "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": "Shiftキーを押さずにバックパックのプレビューを見る", + "text.autoconfig.skyblocker.option.general.itemTooltip": "アイテムの詳細情報", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "NPC売りの値段を表示する", + "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": "最安価の表示を表示する", + "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": "バージョン1.8での作物のヒットボックスを使う", + "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "バージョン1.8でのレバーのヒットボックスを使う", + "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b]§cツールチップ上のアイテムの値段は最大60秒ごとに更新されます。されていない場合はlatest.logを確認してください", + "text.autoconfig.skyblocker.category.richPresence": "discordに自分のゲームアクティビティを表示する", + "text.autoconfig.skyblocker.option.richPresence.info": "skyblockの情報", + "text.autoconfig.skyblocker.option.richPresence.info.@Tooltip": "この値はあなたがサイクリングしている場合は重要ではありません", + "text.autoconfig.skyblocker.option.richPresence.cycleMode": "円状のskyblockの情報", + "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.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.dungeons.terminals": "F7のターミナルソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "select Coloredのソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveOrder": "Click in Orderのソルバー", + "text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveStartsWith": "Starts Withのソルバー", + "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 Puzzleのソルバー", + "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": "X", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "Y", + "text.autoconfig.skyblocker.category.messages": "メッセージ", + "text.autoconfig.skyblocker.option.messages.hideAbility": "アビリティのクールダウンを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideHeal": "回復メッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideAOTE": "AOTEのメッセージを非表示にする", + "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.messages.hideTeleportPad": "テレポートパッドのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideCombo": "Comboのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideAutopet": "Autopetのメッセージを非表示にする", + "text.autoconfig.skyblocker.option.messages.hideMana": "マナの使用表示をアクションバーから非表示にする", + "text.autoconfig.skyblocker.option.messages.hideMana.@Tooltip": "FancyBarでより良くできます", + "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2新しいバージョンがあります!", + "skyblocker.update.update_link": " §2§nここをクリック§r", + "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を設定しました!" +} diff --git a/src/main/resources/assets/skyblocker/lang/ko_KR.json b/src/main/resources/assets/skyblocker/lang/ko_KR.json new file mode 100644 index 00000000..93930cc1 --- /dev/null +++ b/src/main/resources/assets/skyblocker/lang/ko_KR.json @@ -0,0 +1,189 @@ +{ + "key.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "슬롯 고정 (핫바)", + "key.wikiLookup": "위키에서 찾기", + "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.option.general.bars.barpositions": "바 위치 조정", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER1": "레이어 1", + "text.autoconfig.skyblocker.option.general.bars.barpositions.LAYER2": "레이어 2", + "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": "Shift 를 누르지 않고 백팩 미리보기", + "text.autoconfig.skyblocker.option.general.itemTooltip": "아이템 툴팁", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "NPC 가격 활성화", + "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.avg.ONE_DAY": "1일 평균가", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "3일 평균가", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "둘 다", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "최저 BIN 가격 활성화", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableBazaarPrice": "Bazaar 매매 가격 활성화", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableMuseumDate": "Museum 과 날짜 활성화", + "text.autoconfig.skyblocker.option.general.hitbox": "히트박스", + "text.autoconfig.skyblocker.option.general.hitbox.oldFarmlandHitbox": "1.8 농지 히트박스 활성화", + "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "1.8 레버 히트박스 활성화", + "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §c아이템 가격 툴팁이 최대 60초 이내에 갱신됩니다. 갱신되지 않을 시 latest.log 를 확인하세요.", + "skyblocker.itemTooltip.noData": "§c데이터 없음", + "text.autoconfig.skyblocker.category.richPresence": "디스코드 Rich Presence", + "text.autoconfig.skyblocker.option.richPresence.info": "스카이블록 정보", + "text.autoconfig.skyblocker.option.richPresence.info.PURSE": "PURSE", + "text.autoconfig.skyblocker.option.richPresence.info.BITS": "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": "버튼 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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button1.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button1.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button2": "버튼 2", + "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": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button2.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button3": "버튼 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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button3.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button3.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button4": "버튼 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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button4.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button4.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button5": "버튼 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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button6": "버튼 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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button6.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button6.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button7": "버튼 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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button7.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button7.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button8": "버튼 8", + "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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button8.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button8.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button9": "버튼 9", + "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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button9.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button9.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button10": "버튼 10", + "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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button10.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "클릭 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button11": "버튼 11", + "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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button11.uiTitle": "UI 제목", + "text.autoconfig.skyblocker.option.quickNav.button11.clickEvent": "클릑 이벤트", + "text.autoconfig.skyblocker.option.quickNav.button12": "버튼 12", + "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": "NBT", + "text.autoconfig.skyblocker.option.quickNav.button12.uiTitle": "UI 제목", + "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": "Three Weirdos 퍼즐 해결", + "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "블레이즈 퍼즐 해결", + "text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Trivia 퍼즐 해결", + "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": "Dwarven Mines", + "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": "Dwarven 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": "X", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "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": "AOTE 메시지 가리기", + "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.messages.hideTeleportPad": "Teleport Pad 메시지 가리기", + "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 로 더 나은 기능을 사용합니다", + "skyblocker.update.update_message": "§b[§6Skyblocker§b] §2새로운 버전이 사용 가능합니다!", + "skyblocker.update.update_link": " §2§n여기§r", + "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 키를 설정했습니다!" +} diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json index cdc11344..3f4ccdc8 100644 --- a/src/main/resources/assets/skyblocker/lang/zh_cn.json +++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json @@ -1,113 +1,105 @@ { - "key.categories.skyblocker": "Skyblocker", - "key.hotbarSlotLock": "锁定快捷栏", - "key.wikiLookup": "查阅Wiki", - - "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.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": "查看背包预览无需按住shift键", - "text.autoconfig.skyblocker.option.general.itemTooltip": "物品提示信息", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "显示NPC价格", - "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.avg.ONE_DAY": "1天价格", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "3天价格", - "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "同时显示", - "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "显示最低BIN（立即购买）价格", - "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": "启用1.8的农田碰撞箱", - "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "启用1.8的拉杆碰撞箱", - "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §c物品提示里的价格信息会在最多60秒内更新。如果没有，请检查latest.log", - "skyblocker.itemTooltip.noData": "§c没有数据", - - "text.autoconfig.skyblocker.category.richPresence": "Discord活动状态", - "text.autoconfig.skyblocker.option.richPresence.info": "Skyblock信息", - "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": "循环Skyblock信息", - "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" : "按钮1", - "text.autoconfig.skyblocker.option.quickNav.button2" : "按钮2", - "text.autoconfig.skyblocker.option.quickNav.button3" : "按钮3", - "text.autoconfig.skyblocker.option.quickNav.button4" : "按钮4", - "text.autoconfig.skyblocker.option.quickNav.button5" : "按钮5", - "text.autoconfig.skyblocker.option.quickNav.button6" : "按钮6", - "text.autoconfig.skyblocker.option.quickNav.button7" : "按钮7", - "text.autoconfig.skyblocker.option.quickNav.button8" : "按钮8", - "text.autoconfig.skyblocker.option.quickNav.button9" : "按钮9", - "text.autoconfig.skyblocker.option.quickNav.button10" : "按钮10", - "text.autoconfig.skyblocker.option.quickNav.button11" : "按钮11", - "text.autoconfig.skyblocker.option.quickNav.button12" : "按钮12", - - "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": "Croesus助手", - "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "用灰色显示出已经打开过的箱子", - "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.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": "解决Fetchur的迷题", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "解决Puzzler的迷题", - "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": "X", - "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "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": "隐藏AOTE消息", - "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": "§b[§6Skyblocker§b] §2有新版本可用！", - "skyblocker.update.update_link": " §2§n点击这里§r", - "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.categories.skyblocker": "Skyblocker", + "key.hotbarSlotLock": "锁定快捷栏", + "key.wikiLookup": "查阅Wiki", + "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.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": "查看背包预览无需按住shift键", + "text.autoconfig.skyblocker.option.general.itemTooltip": "物品提示信息", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableNPCPrice": "显示NPC价格", + "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.avg.ONE_DAY": "1天价格", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.THREE_DAY": "3天价格", + "text.autoconfig.skyblocker.option.general.itemTooltip.avg.BOTH": "同时显示", + "text.autoconfig.skyblocker.option.general.itemTooltip.enableLowestBIN": "显示最低BIN（立即购买）价格", + "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": "启用1.8的农田碰撞箱", + "text.autoconfig.skyblocker.option.general.hitbox.oldLeverHitbox": "启用1.8的拉杆碰撞箱", + "skyblocker.itemTooltip.nullMessage": "§b[§6Skyblocker§b] §c物品提示里的价格信息会在最多60秒内更新。如果没有，请检查latest.log", + "skyblocker.itemTooltip.noData": "§c没有数据", + "text.autoconfig.skyblocker.category.richPresence": "Discord活动状态", + "text.autoconfig.skyblocker.option.richPresence.info": "Skyblock信息", + "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": "循环Skyblock信息", + "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": "按钮1", + "text.autoconfig.skyblocker.option.quickNav.button2": "按钮2", + "text.autoconfig.skyblocker.option.quickNav.button3": "按钮3", + "text.autoconfig.skyblocker.option.quickNav.button4": "按钮4", + "text.autoconfig.skyblocker.option.quickNav.button5": "按钮5", + "text.autoconfig.skyblocker.option.quickNav.button6": "按钮6", + "text.autoconfig.skyblocker.option.quickNav.button7": "按钮7", + "text.autoconfig.skyblocker.option.quickNav.button8": "按钮8", + "text.autoconfig.skyblocker.option.quickNav.button9": "按钮9", + "text.autoconfig.skyblocker.option.quickNav.button10": "按钮10", + "text.autoconfig.skyblocker.option.quickNav.button11": "按钮11", + "text.autoconfig.skyblocker.option.quickNav.button12": "按钮12", + "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": "Croesus助手", + "text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "用灰色显示出已经打开过的箱子", + "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.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": "解决Fetchur的迷题", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.solvePuzzler": "解决Puzzler的迷题", + "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": "X", + "text.autoconfig.skyblocker.option.locations.dwarvenMines.dwarvenHud.y": "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": "隐藏AOTE消息", + "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": "§b[§6Skyblocker§b] §2有新版本可用！", + "skyblocker.update.update_link": " §2§n点击这里§r", + "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秘钥！", + "text.autoconfig.skyblocker.option.quickNav.button1.item.nbt": "NBT" } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index dd94270d..d8ef4941 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -5,7 +5,7 @@ "name": "Skyblocker", "description": "Hypixel Skyblock Mod", "authors": ["xMrVizzy", "d3dx9", "LifeIsAParadox"], - "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh"], + "contributors": ["ExternalTime", "Zailer43", "TacoMonkey", "KonaeAkira", "Fix3dll", "null2264", "HyperSoop", "edgarogh", "TheColdPot", "Julienraptor01", "ADON15c", "catandA", "kevinthegreat1", "AzureAaron"], "contact": { "homepage": "https://hysky.de", "sources": "https://github.com/SkyblockerMod/Skyblocker", diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index fc37cfb0..4a6be779 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -16,7 +16,8 @@ "HandledScreenMixin", "InventoryScreenMixin", "RecipeBookWidgetAccessor", - "HandledScreenAccessor" + "HandledScreenAccessor", + "ScreenMixin" ], "injectors": { "defaultRequire": 1 |