diff --git a/build.gradle.kts b/build.gradle.kts index 6dc22310..691a33db 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ import red.jackf.UpdateDependenciesTask plugins { id("maven-publish") - id("fabric-loom") version "1.7-SNAPSHOT" + id("fabric-loom") version "1.6-SNAPSHOT" id("com.github.breadmoirai.github-release") version "2.4.1" id("org.ajoberstar.grgit") version "5.2.1" id("me.modmuss50.mod-publish-plugin") version "0.3.3" @@ -275,18 +275,14 @@ if (canPublish) { val addonProp: String = properties["changelogHeaderAddon"]!!.toString() if (addonProp.isNotBlank()) { - addonProp + addonProp + "\n\n" } else { - null + "" } } else { - null + "" } - val changelogFileText = rootProject.file("changelogs/${properties["mod_version"]}.md") - .takeIf { it.exists() } - ?.readText() - generateChangelogTask = tasks.register("generateChangelog") { this.lastTag.set(lastTag) this.newTag.set(newTag) @@ -307,7 +303,7 @@ if (canPublish) { } // Add a bundled block for each module version - prologue.set(listOfNotNull(changelogHeader, changelogFileText, bundledText).joinToString(separator = "\n\n")) + prologue.set(changelogHeader + bundledText) } } diff --git a/changelogs/2.5.0.md b/changelogs/2.5.0.md deleted file mode 100644 index 97f764c8..00000000 --- a/changelogs/2.5.0.md +++ /dev/null @@ -1,17 +0,0 @@ -## Chest Tracker v2.5.0 for Minecraft versions 1.21.1, 1.20.4 and 1.20.1. - -Along with new translations, there are several feature improvements: - -## Unpack Nested - -Items within shulker boxes, bundles and similar items will now be unpacked and shown on the item list. - -## Ender Chest & related handling improvements - -- Ender Chests will now be tracked correctly from the common commands `/enderchest`,`/ec`, `/echest` or `/ender`. -- Additionally, command-opened menus will no longer cause ghost memories. -- Shulker Box Tooltip integration will now show the proper layout of your ender chest. - -## Name Rendering adjustments - -Container names now have an option to only render when your cursor is over the container; this may be preferable if you use stacked chests. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 94511acc..a422ad89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,13 +9,13 @@ parchment_version=1.20.6:2024.05.01 loader_version=0.15.11 # Mod Properties -mod_version=2.5.3 +mod_version=2.4.14 maven_group=red.jackf archives_base_name=chesttracker # Dependencies -bundle_searchables=true -searchables_version=1.21.1:1.0.1 +bundle_searchables=false +searchables_version=1.21:1.0.5 # Mod Compat clothconfig_version=15.0.127 @@ -26,10 +26,10 @@ jade_version=VQc9njMw yacl_version=3.5.0+1.21-fabric # JF_AUTO_UPDATE_BLOCK -fabric-api_version=0.103.0+1.21.1 -modmenu_version=11.0.2 -where-is-it_version=2.6.2+1.21.1 -emi_version=1.1.12+1.21 +fabric-api_version=0.102.1+1.21.1 +modmenu_version=11.0.0-beta.1 +where-is-it_version=2.5.0+1.21 +emi_version=1.1.6+1.20.6 # JF_END_AUTO_UPDATE_BLOCK # Publishing diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138..b82aa23a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/images/inline example.png b/images/inline example.png deleted file mode 100644 index 46e38c43..00000000 Binary files a/images/inline example.png and /dev/null differ diff --git a/src/client/java/red/jackf/chesttracker/api/memory/Memory.java b/src/client/java/red/jackf/chesttracker/api/memory/Memory.java index 571e1f59..24a12294 100644 --- a/src/client/java/red/jackf/chesttracker/api/memory/Memory.java +++ b/src/client/java/red/jackf/chesttracker/api/memory/Memory.java @@ -36,8 +36,8 @@ public final class Memory { public static final Codec CODEC = RecordCodecBuilder.create(instance -> instance.group( - ItemStack.OPTIONAL_CODEC.listOf().fieldOf("items") - .forGetter(Memory::fullItems), + ItemStack.CODEC.listOf().fieldOf("items") + .forGetter(Memory::items), ComponentSerialization.CODEC.optionalFieldOf("name") .forGetter(m -> Optional.ofNullable(m.name)), ModCodecs.BLOCK_POS_STRING.listOf().optionalFieldOf("otherPositions", Collections.emptyList()) @@ -61,7 +61,6 @@ public final class Memory { ))); - private final List fullItems; private final List items; private final @Nullable Component name; private final List otherPositions; @@ -89,10 +88,6 @@ public List items() { return items; } - public List fullItems() { - return fullItems; - } - /** *

The display name for this memory. This is usually obtained from renaming in an anvil, but can also be manually * edited by the user. This method should be used if the user is seeing this name, as it considers the user-supplied @@ -147,12 +142,13 @@ public List otherPositions() { } /** - * Helper method for returning the center position of a memory, factoring in it's other positions. + * Helper method for returning the center position of a memory, including it's other positions. * + * @param origin Central position of this memory. * @return A position in the world regarded as the 'center'. */ - public Vec3 getCenterPosition() { - return Misc.getAverageOffsetFrom(this.position, this.otherPositions()).add(this.position.getCenter()); + public Vec3 getCenterPosition(BlockPos origin) { + return Misc.getAverageOffsetFrom(origin, this.otherPositions()).add(origin.getCenter()); } /** @@ -200,7 +196,6 @@ public Instant realTimestamp() { @ApiStatus.Internal private MemoryKeyImpl memoryKey = null; - @ApiStatus.Internal private BlockPos position = null; @ApiStatus.Internal @@ -212,8 +207,7 @@ public Memory( long loadedTimestamp, long inGameTimestamp, Instant realTimestamp) { - this.fullItems = ImmutableList.copyOf(items); - this.items = this.fullItems.stream().filter(stack -> !stack.isEmpty()).toList(); + this.items = ImmutableList.copyOf(items); this.name = name; this.otherPositions = ImmutableList.copyOf(otherPositions); this.loadedTimestamp = loadedTimestamp; diff --git a/src/client/java/red/jackf/chesttracker/api/memory/MemoryBank.java b/src/client/java/red/jackf/chesttracker/api/memory/MemoryBank.java index fa77e92f..ead1e632 100644 --- a/src/client/java/red/jackf/chesttracker/api/memory/MemoryBank.java +++ b/src/client/java/red/jackf/chesttracker/api/memory/MemoryBank.java @@ -11,10 +11,7 @@ import red.jackf.chesttracker.api.providers.ProviderUtils; import red.jackf.chesttracker.impl.util.CachedClientBlockSource; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import java.util.*; /** * Interface for working with a loaded memory bank. @@ -116,9 +113,7 @@ default Optional getKey(Optional keyId) { } /** - *

Helper method for getting a count of items in a given memory key matching a given predicate.

- * - *

This version does not unpack nested items.

+ * Helper method for getting a count of items in a given memory key matching a given predicate. * * @param keyId Memory key to look in; if non-existent an empty list will be returned. * @param predicate Predicate to filter each memory against. @@ -126,20 +121,11 @@ default Optional getKey(Optional keyId) { * @return A list of stacks from all memories in the given key matching the predicate, merged according to stackMergeMode. */ default List getCounts(ResourceLocation keyId, CountingPredicate predicate, StackMergeMode stackMergeMode) { - return getCounts(keyId, predicate, stackMergeMode, false); + Optional key = this.getKey(keyId); + if (key.isEmpty()) return Collections.emptyList(); + return key.get().getCounts(predicate, stackMergeMode); } - /** - * Helper method for getting a count of items in a given memory key matching a given predicate. - * - * @param keyId Memory key to look in; if non-existent an empty list will be returned. - * @param predicate Predicate to filter each memory against. - * @param stackMergeMode How to merge stacks in the returned list - for more details, see {@link StackMergeMode} - * @param unpackNested Whether to unpack nested items from within Shulker Boxes or bundles. - * @return A list of stacks from all memories in the given key matching the predicate, merged according to stackMergeMode. - */ - List getCounts(ResourceLocation keyId, CountingPredicate predicate, StackMergeMode stackMergeMode, boolean unpackNested); - /** * Adds or updates a memory in this memory bank. * diff --git a/src/client/java/red/jackf/chesttracker/api/memory/MemoryKey.java b/src/client/java/red/jackf/chesttracker/api/memory/MemoryKey.java index da1888b3..3d488497 100644 --- a/src/client/java/red/jackf/chesttracker/api/memory/MemoryKey.java +++ b/src/client/java/red/jackf/chesttracker/api/memory/MemoryKey.java @@ -50,21 +50,6 @@ public interface MemoryKey { */ Optional get(BlockPos position); - /** - *

Returns a list of all memories in this key that match the given predicate.

- * - *

This overload defaults to not unpacking nested items.

- * - * @see CountingPredicate - * @see StackMergeMode - * @param predicate Predicate to test each memory against - this tests the in-key block position and memory itself. - * @param stackMergeMode How to merge stacks that pass the predicate - for more details, see {@link StackMergeMode}. - * @return A list of ItemStacks that pass the predicate in this memory key, merged according to stackMergeMode. - */ - default List getCounts(CountingPredicate predicate, StackMergeMode stackMergeMode) { - return getCounts(predicate, stackMergeMode, false); - } - /** * Returns a list of all memories in this key that match the given predicate. * @@ -72,8 +57,7 @@ default List getCounts(CountingPredicate predicate, StackMergeMode st * @see StackMergeMode * @param predicate Predicate to test each memory against - this tests the in-key block position and memory itself. * @param stackMergeMode How to merge stacks that pass the predicate - for more details, see {@link StackMergeMode}. - * @param unpackNested Whether to unpack any nested items, such as within shulker boxes. * @return A list of ItemStacks that pass the predicate in this memory key, merged according to stackMergeMode. */ - List getCounts(CountingPredicate predicate, StackMergeMode stackMergeMode, boolean unpackNested); + List getCounts(CountingPredicate predicate, StackMergeMode stackMergeMode); } diff --git a/src/client/java/red/jackf/chesttracker/api/providers/MemoryBuilder.java b/src/client/java/red/jackf/chesttracker/api/providers/MemoryBuilder.java index f5d5e72d..b3468e50 100644 --- a/src/client/java/red/jackf/chesttracker/api/providers/MemoryBuilder.java +++ b/src/client/java/red/jackf/chesttracker/api/providers/MemoryBuilder.java @@ -23,7 +23,7 @@ public interface MemoryBuilder { * @return A new MemoryBuilder, containing the given items. */ static MemoryBuilder create(List items) { - return new MemoryBuilderImpl(items.stream().toList()); + return new MemoryBuilderImpl(items.stream().filter(stack -> !stack.isEmpty()).toList()); } /** diff --git a/src/client/java/red/jackf/chesttracker/api/providers/context/ScreenCloseContext.java b/src/client/java/red/jackf/chesttracker/api/providers/context/ScreenCloseContext.java index b7998f35..44b10794 100644 --- a/src/client/java/red/jackf/chesttracker/api/providers/context/ScreenCloseContext.java +++ b/src/client/java/red/jackf/chesttracker/api/providers/context/ScreenCloseContext.java @@ -51,15 +51,6 @@ public interface ScreenCloseContext { */ List getItems(); - /** - *

Returns all item stacks, including {@link ItemStack#isEmpty()} stacks. You should generally prefer other methods - * unless a full representation of the empty slots are useful, i.e. with ender chests.

- * - *

The list of items gets trimmed after the last non-empty slot in order to save space.

- * @return All ItemStacks in this screen, including empty ones. - */ - List getItemsWithEmpty(); - /** * Returns all non-{@link ItemStack#isEmpty()}, non-player inventory stacks in the slots of this screen matching the given predicate. * diff --git a/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProvider.java b/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProvider.java index 16e7de58..df75862c 100644 --- a/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProvider.java +++ b/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProvider.java @@ -49,11 +49,7 @@ public boolean appliesTo(Coordinate coordinate) { @Override public void onScreenOpen(ScreenOpenContext context) { - if (DefaultProviderScreenOpen.EVENT.invoker().handleScreenOpen(this, context)) return; - - InteractionTracker.INSTANCE.getLastBlockSource() - .flatMap(this::getMemoryLocation) - .ifPresent(context::setMemoryLocation); + InteractionTracker.INSTANCE.getLastBlockSource().flatMap(this::getMemoryLocation).ifPresent(context::setMemoryLocation); } @Override @@ -67,11 +63,6 @@ public void onScreenClose(ScreenCloseContext context) { }); } - @Override - public void onCommandSent(String command) { - DefaultProviderCommandSent.EVENT.invoker().onDefaultCommandSend(this, command); - } - @Override public void onBlockPlaced(BlockPlacedContext context) { // if the block has an alternate mapping (i.e. ender chest) don't run diff --git a/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProviderCommandSent.java b/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProviderCommandSent.java deleted file mode 100644 index fa5a9fa3..00000000 --- a/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProviderCommandSent.java +++ /dev/null @@ -1,29 +0,0 @@ -package red.jackf.chesttracker.api.providers.defaults; - -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import red.jackf.chesttracker.api.providers.ServerProvider; - -/** - * Called by the default provider when the user sends a command. Used internally to set state for ender chest commands. - * - * @see DefaultProvider - */ -public interface DefaultProviderCommandSent { - /** - * Event for handling default user commands. - */ - Event EVENT = EventFactory.createArrayBacked(DefaultProviderCommandSent.class, invokers -> (provider, command) -> { - for (DefaultProviderCommandSent invoker : invokers) { - invoker.onDefaultCommandSend(provider, command); - } - }); - - /** - * Called by the default provider when the user runs a command. - * - * @param provider Provider being used; this is usually a {@link DefaultProvider} instance. - * @param command Command that the user sent, without the slash - */ - void onDefaultCommandSend(ServerProvider provider, String command); -} diff --git a/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProviderScreenOpen.java b/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProviderScreenOpen.java deleted file mode 100644 index 3e816200..00000000 --- a/src/client/java/red/jackf/chesttracker/api/providers/defaults/DefaultProviderScreenOpen.java +++ /dev/null @@ -1,39 +0,0 @@ -package red.jackf.chesttracker.api.providers.defaults; - -import net.fabricmc.fabric.api.event.Event; -import net.fabricmc.fabric.api.event.EventFactory; -import red.jackf.chesttracker.api.providers.ServerProvider; -import red.jackf.chesttracker.api.providers.context.ScreenOpenContext; - -/** - * Called by the default provider when a screen is opened in order to update the context. This is generally intended - * to allow per-location features (such as renaming or ignoring) to work with overrides, such as when the ender chest - * GUI is opened with a command instead of right clicking. - * - * @see red.jackf.chesttracker.impl.DefaultChestTrackerPlugin for implementation example - * @see ScreenOpenContext - * @see DefaultProvider - */ -public interface DefaultProviderScreenOpen { - /** - * Populate the screen context if needed. Currently, this is just setting the GUI's memory location. - * - * @param provider Provider currently being ran. Usually {@link DefaultProvider}. - * @param context Context to populate. - * @return Whether the context is finished being populated. - */ - boolean handleScreenOpen(ServerProvider provider, ScreenOpenContext context); - - /** - * Event for populating a {@link ScreenOpenContext}. Does not use phases. Not intended to be invoked by API users. - */ - Event EVENT = EventFactory.createArrayBacked(DefaultProviderScreenOpen.class, invokers -> (provider, context) -> { - for (DefaultProviderScreenOpen invoker : invokers) { - if (invoker.handleScreenOpen(provider, context)) { - return true; - } - } - - return false; - }); -} diff --git a/src/client/java/red/jackf/chesttracker/impl/DefaultChestTrackerPlugin.java b/src/client/java/red/jackf/chesttracker/impl/DefaultChestTrackerPlugin.java index b5f332c2..7e3d1d94 100644 --- a/src/client/java/red/jackf/chesttracker/impl/DefaultChestTrackerPlugin.java +++ b/src/client/java/red/jackf/chesttracker/impl/DefaultChestTrackerPlugin.java @@ -12,7 +12,9 @@ import red.jackf.chesttracker.api.memory.CommonKeys; import red.jackf.chesttracker.api.providers.*; import red.jackf.chesttracker.api.providers.context.ScreenCloseContext; -import red.jackf.chesttracker.api.providers.defaults.*; +import red.jackf.chesttracker.api.providers.defaults.DefaultProvider; +import red.jackf.chesttracker.api.providers.defaults.DefaultProviderMemoryLocation; +import red.jackf.chesttracker.api.providers.defaults.DefaultProviderScreenClose; import red.jackf.chesttracker.impl.compat.mods.ShareEnderChestIntegration; import red.jackf.chesttracker.impl.compat.servers.hypixel.HypixelProvider; import red.jackf.chesttracker.impl.gui.util.CTTitleOverrideDuck; @@ -20,11 +22,8 @@ import red.jackf.whereisit.api.search.ConnectedBlocksGrabber; import java.util.List; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; public class DefaultChestTrackerPlugin implements ChestTrackerPlugin { - private final AtomicBoolean fromEnderChestCommand = new AtomicBoolean(false); @Override public void load() { @@ -55,23 +54,9 @@ public void load() { ProviderUtils.registerProvider(DefaultProvider.INSTANCE); ProviderUtils.registerProvider(new HypixelProvider()); - // todo configurable - Set enderChestCommands = Set.of("ec", "ender", "enderchest", "echest"); - - DefaultProviderCommandSent.EVENT.register((provider, command) -> fromEnderChestCommand.set(enderChestCommands.contains(command))); - - DefaultProviderScreenOpen.EVENT.register((provider, context) -> { - if (fromEnderChestCommand.get()) { - context.setMemoryLocation(MemoryLocation.override(CommonKeys.ENDER_CHEST_KEY, BlockPos.ZERO)); - return true; - } else { - return false; - } - }); - DefaultProviderScreenClose.EVENT.register(EventPhases.FALLBACK_PHASE, DefaultChestTrackerPlugin::defaultMemoryCreator); - DefaultProviderScreenClose.EVENT.register(EventPhases.DEFAULT_PHASE, this::enderChestMemoryCreator); + DefaultProviderScreenClose.EVENT.register(EventPhases.DEFAULT_PHASE, DefaultChestTrackerPlugin::enderChestMemoryCreator); DefaultProviderMemoryLocation.EVENT.register(EventPhases.FALLBACK_PHASE, cbs -> { var current = ProviderUtils.getPlayersCurrentKey(); @@ -86,7 +71,7 @@ public void load() { }); DefaultProviderMemoryLocation.EVENT.register(EventPhases.DEFAULT_PHASE, cbs -> { - if (cbs.blockState().getBlock() == Blocks.ENDER_CHEST || fromEnderChestCommand.get()) { + if (cbs.blockState().getBlock() == Blocks.ENDER_CHEST) { return ResultHolder.value(MemoryLocation.override(CommonKeys.ENDER_CHEST_KEY, BlockPos.ZERO)); } @@ -125,15 +110,13 @@ private static ResultHolder defaultMemoryCrea .toResult(memoryLocation.get().memoryKey(), rootPos)); } - private ResultHolder enderChestMemoryCreator(ServerProvider provider, ScreenCloseContext context) { - if (!this.fromEnderChestCommand.getAndSet(false)) { - var cbs = InteractionTracker.INSTANCE.getLastBlockSource(); - if (cbs.isEmpty()) return ResultHolder.pass(); + private static ResultHolder enderChestMemoryCreator(ServerProvider provider, ScreenCloseContext context) { + var cbs = InteractionTracker.INSTANCE.getLastBlockSource(); + if (cbs.isEmpty()) return ResultHolder.pass(); - if (!cbs.get().blockState().is(Blocks.ENDER_CHEST)) return ResultHolder.pass(); - } + if (!cbs.get().blockState().is(Blocks.ENDER_CHEST)) return ResultHolder.pass(); - return ResultHolder.value(MemoryBuilder.create(context.getItemsWithEmpty()) + return ResultHolder.value(MemoryBuilder.create(context.getItems()) .inContainer(Blocks.ENDER_CHEST) .toResult(CommonKeys.ENDER_CHEST_KEY, BlockPos.ZERO)); } diff --git a/src/client/java/red/jackf/chesttracker/impl/compat/mods/shulkerboxtooltip/ClientEnderChestPreviewProvider.java b/src/client/java/red/jackf/chesttracker/impl/compat/mods/shulkerboxtooltip/ClientEnderChestPreviewProvider.java index 292a991d..b744ab77 100644 --- a/src/client/java/red/jackf/chesttracker/impl/compat/mods/shulkerboxtooltip/ClientEnderChestPreviewProvider.java +++ b/src/client/java/red/jackf/chesttracker/impl/compat/mods/shulkerboxtooltip/ClientEnderChestPreviewProvider.java @@ -6,11 +6,13 @@ import com.misterpemodder.shulkerboxtooltip.api.color.ColorKey; import com.misterpemodder.shulkerboxtooltip.api.provider.PreviewProvider; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.NotNull; -import red.jackf.chesttracker.api.memory.*; +import red.jackf.chesttracker.api.memory.CommonKeys; +import red.jackf.chesttracker.api.memory.MemoryBank; +import red.jackf.chesttracker.api.memory.MemoryBankAccess; +import red.jackf.chesttracker.api.memory.MemoryKey; import red.jackf.chesttracker.api.memory.counting.CountingPredicate; import red.jackf.chesttracker.api.memory.counting.StackMergeMode; @@ -36,14 +38,7 @@ public boolean shouldDisplay(@NotNull PreviewContext context) { public List getInventory(@NotNull PreviewContext context) { Optional bank = MemoryBankAccess.INSTANCE.getLoaded(); if (bank.isEmpty()) return Collections.emptyList(); - if (ShulkerBoxTooltipApi.getCurrentPreviewType(true) == PreviewType.FULL) { - return bank.get().getKey(CommonKeys.ENDER_CHEST_KEY) - .flatMap(key -> key.get(BlockPos.ZERO)) - .map(Memory::fullItems) - .orElse(List.of()); - } else { - return bank.get().getCounts(CommonKeys.ENDER_CHEST_KEY, CountingPredicate.TRUE, StackMergeMode.NEVER); - } + return bank.get().getCounts(CommonKeys.ENDER_CHEST_KEY, CountingPredicate.TRUE, StackMergeMode.NEVER); } @Override diff --git a/src/client/java/red/jackf/chesttracker/impl/config/ChestTrackerConfig.java b/src/client/java/red/jackf/chesttracker/impl/config/ChestTrackerConfig.java index b67719a0..5d6e805c 100644 --- a/src/client/java/red/jackf/chesttracker/impl/config/ChestTrackerConfig.java +++ b/src/client/java/red/jackf/chesttracker/impl/config/ChestTrackerConfig.java @@ -92,6 +92,9 @@ public static class InventoryButton { } public static class Rendering { + @SerialEntry(comment = "Whether to show names above containers in the world. This can be overridden per memory bank, under Compatibility.") + public boolean displayContainerNames = true; + @SerialEntry(comment = "Name Render Range. Range: [4, 24] blocks") public int nameRange = 12; } @@ -99,8 +102,6 @@ public static class Rendering { public static class Debug { @SerialEntry(comment = "DEBUG: Show Developer Hud") public boolean showDevHud = false; - @SerialEntry(comment = "DEBUG: Disable all container names") - public boolean disableContainerNames = false; } public static class Storage { diff --git a/src/client/java/red/jackf/chesttracker/impl/config/ChestTrackerConfigScreenBuilder.java b/src/client/java/red/jackf/chesttracker/impl/config/ChestTrackerConfigScreenBuilder.java index 2e12ea7c..18a251ea 100644 --- a/src/client/java/red/jackf/chesttracker/impl/config/ChestTrackerConfigScreenBuilder.java +++ b/src/client/java/red/jackf/chesttracker/impl/config/ChestTrackerConfigScreenBuilder.java @@ -304,6 +304,16 @@ private static OptionGroup makeRenderingGroup(ConfigClassHandler instance.instance().rendering.nameRange, i -> instance.instance().rendering.nameRange = i ).build()) + .option(Option.createBuilder() + .name(translatable("chesttracker.config.rendering.displayContainerNames")) + .description(OptionDescription.of(translatable("chesttracker.config.rendering.displayContainerNames.description"))) + .controller(opt -> BooleanControllerBuilder.create(opt) + .yesNoFormatter()) + .binding( + instance.defaults().rendering.displayContainerNames, + () -> instance.instance().rendering.displayContainerNames, + b -> instance.instance().rendering.displayContainerNames = b + ).build()) .option(ButtonOption.createBuilder() .name(translatable("chesttracker.config.whereisit")) .description(OptionDescription.of(translatable("chesttracker.config.whereisit.description"))) @@ -326,16 +336,6 @@ private static OptionGroup makeDevGuiGroup(ConfigClassHandler instance.instance().debug.showDevHud, b -> instance.instance().debug.showDevHud = b ).build()) - .option(Option.createBuilder() - .name(translatable("chesttracker.config.dev.disableContainerNames")) - .controller(opt -> BooleanControllerBuilder.create(opt) - .yesNoFormatter() - .coloured(true)) - .binding( - instance.defaults().debug.disableContainerNames, - () -> instance.instance().debug.disableContainerNames, - b -> instance.instance().debug.disableContainerNames = b - ).build()) .build(); } diff --git a/src/client/java/red/jackf/chesttracker/impl/gui/invbutton/ui/RenameInputScreen.java b/src/client/java/red/jackf/chesttracker/impl/gui/invbutton/ui/RenameInputScreen.java index 0adbd659..79251a9c 100644 --- a/src/client/java/red/jackf/chesttracker/impl/gui/invbutton/ui/RenameInputScreen.java +++ b/src/client/java/red/jackf/chesttracker/impl/gui/invbutton/ui/RenameInputScreen.java @@ -24,8 +24,6 @@ public class RenameInputScreen extends Screen { private static final int PADDING = 15; private static final int GAP = 15; - private static final int MAX_NAME_LENGTH = 256; - private final MemoryLocation location; private final @Nullable String currentName; private final ItemStack preview; @@ -67,7 +65,6 @@ protected void init() { this.nameInput, Component.empty())); - this.nameInput.setMaxLength(MAX_NAME_LENGTH); this.nameInput.setCanLoseFocus(false); this.setFocused(this.nameInput); diff --git a/src/client/java/red/jackf/chesttracker/impl/gui/screen/ChestTrackerScreen.java b/src/client/java/red/jackf/chesttracker/impl/gui/screen/ChestTrackerScreen.java index 40fa3abf..e120a547 100644 --- a/src/client/java/red/jackf/chesttracker/impl/gui/screen/ChestTrackerScreen.java +++ b/src/client/java/red/jackf/chesttracker/impl/gui/screen/ChestTrackerScreen.java @@ -285,7 +285,7 @@ protected void repositionElements() { } /** - * Update the cached item list from the current Memory Bank, then runs a filter operation. + * Update the cached item list from the current Memory Bank, then runs a filter operation.. */ private void updateItems() { MemoryBankAccessImpl.INSTANCE.getLoadedInternal().ifPresent(bank -> { @@ -293,7 +293,7 @@ private void updateItems() { CountingPredicate predicate = getItemListFilter(maxRange); - this.items = bank.getCounts(currentMemoryKey, predicate, bank.getMetadata().getSearchSettings().stackMergeMode, bank.getMetadata().getSearchSettings().unpackNested) + this.items = bank.getCounts(currentMemoryKey, predicate, bank.getMetadata().getSearchSettings().stackMergeMode) .stream() .sorted(itemSort.sort) .toList(); diff --git a/src/client/java/red/jackf/chesttracker/impl/gui/screen/EditMemoryBankScreen.java b/src/client/java/red/jackf/chesttracker/impl/gui/screen/EditMemoryBankScreen.java index 74684962..bb8d3ca8 100644 --- a/src/client/java/red/jackf/chesttracker/impl/gui/screen/EditMemoryBankScreen.java +++ b/src/client/java/red/jackf/chesttracker/impl/gui/screen/EditMemoryBankScreen.java @@ -26,7 +26,6 @@ import red.jackf.chesttracker.impl.memory.metadata.FilteringSettings; import red.jackf.chesttracker.impl.memory.metadata.IntegritySettings; import red.jackf.chesttracker.impl.memory.metadata.SearchSettings; -import red.jackf.chesttracker.impl.rendering.NameRenderMode; import red.jackf.chesttracker.impl.storage.ConnectionSettings; import red.jackf.chesttracker.impl.storage.Storage; import red.jackf.chesttracker.impl.util.GuiUtil; @@ -266,16 +265,13 @@ private void setupCompatibilitySettings() { (cycleButton, newValue) -> this.memoryBank.metadata().getCompatibilitySettings().nameFilterMode = newValue ), SettingsTab.COMPATIBILITY); - addSetting(CycleButton.builder(mode -> mode.label) - .withTooltip(mode -> Tooltip.create(mode.tooltip)) - .withValues(NameRenderMode.values()) - .withInitialValue(this.memoryBank.metadata().getCompatibilitySettings().nameRenderMode) + addSetting(CycleButton.onOffBuilder(this.memoryBank.metadata().getCompatibilitySettings().displayContainerNames) .create(getSettingsX(0), getSettingsY(1), getSettingsWidth(2), BUTTON_HEIGHT, - translatable("chesttracker.gui.editMemoryBank.compatibility.nameRenderMode"), - (cycleButton, newValue) -> this.memoryBank.metadata().getCompatibilitySettings().nameRenderMode = newValue + translatable("chesttracker.gui.editMemoryBank.compatibility.displayContainerNames"), + ((cycleButton, newValue) -> this.memoryBank.metadata().getCompatibilitySettings().displayContainerNames = newValue) ), SettingsTab.COMPATIBILITY); } @@ -575,16 +571,6 @@ protected void applyValue() { ((cycleButton, stackMergeMode) -> this.memoryBank.metadata() .getSearchSettings().stackMergeMode = stackMergeMode) ), SettingsTab.SEARCH); - - addSetting(CycleButton.onOffBuilder(this.memoryBank.metadata().getSearchSettings().unpackNested) - .withTooltip(ignored -> Tooltip.create(translatable("chesttracker.gui.editMemoryBank.search.unpackNested.tooltip"))) - .create(getSettingsX(0), - getSettingsY(3), - getSettingsWidth(2), - BUTTON_HEIGHT, - translatable("chesttracker.gui.editMemoryBank.search.unpackNested"), - ((cycleButton, newValue) -> this.memoryBank.metadata().getSearchSettings().unpackNested = newValue) - ), SettingsTab.SEARCH); } /////////// diff --git a/src/client/java/red/jackf/chesttracker/impl/gui/widget/ItemListWidget.java b/src/client/java/red/jackf/chesttracker/impl/gui/widget/ItemListWidget.java index 872436b3..8fbdd7d4 100644 --- a/src/client/java/red/jackf/chesttracker/impl/gui/widget/ItemListWidget.java +++ b/src/client/java/red/jackf/chesttracker/impl/gui/widget/ItemListWidget.java @@ -74,7 +74,7 @@ public void onClick(double mouseX, double mouseY) { int index = (y * gridWidth) + x; if (index >= items.size()) return; var request = new SearchRequest(); - SearchRequestPopulator.addItemStack(request, items.get(index), Screen.hasShiftDown() ? SearchRequestPopulator.Context.FAVOURITE : SearchRequestPopulator.Context.INVENTORY_PRECISE); + SearchRequestPopulator.addItemStack(request, items.get(index), SearchRequestPopulator.Context.FAVOURITE); SearchInvoker.doSearch(request); } diff --git a/src/client/java/red/jackf/chesttracker/impl/memory/MemoryBankImpl.java b/src/client/java/red/jackf/chesttracker/impl/memory/MemoryBankImpl.java index 3d4652f2..3a617d8f 100644 --- a/src/client/java/red/jackf/chesttracker/impl/memory/MemoryBankImpl.java +++ b/src/client/java/red/jackf/chesttracker/impl/memory/MemoryBankImpl.java @@ -84,11 +84,10 @@ public void removeKey(ResourceLocation key) { * @param key Memory key to pull from * @param filter Filter that memories must pass to be counted * @param stackMergeMode How to merge identical stacks - * @param unpackNested Whether to count items within containers, such as Shulker Boxes */ - public List getCounts(ResourceLocation key, CountingPredicate filter, StackMergeMode stackMergeMode, boolean unpackNested) { + public List getCounts(ResourceLocation key, CountingPredicate filter, StackMergeMode stackMergeMode) { if (this.memoryKeys.containsKey(key)) { - return this.memoryKeys.get(key).getCounts(filter, stackMergeMode, unpackNested); + return this.memoryKeys.get(key).getCounts(filter, stackMergeMode); } else { return Collections.emptyList(); } diff --git a/src/client/java/red/jackf/chesttracker/impl/memory/MemoryKeyImpl.java b/src/client/java/red/jackf/chesttracker/impl/memory/MemoryKeyImpl.java index 0c4eddd2..ed689751 100644 --- a/src/client/java/red/jackf/chesttracker/impl/memory/MemoryKeyImpl.java +++ b/src/client/java/red/jackf/chesttracker/impl/memory/MemoryKeyImpl.java @@ -13,17 +13,14 @@ import red.jackf.chesttracker.impl.memory.key.ManualMode; import red.jackf.chesttracker.impl.memory.key.OverrideInfo; import red.jackf.chesttracker.impl.memory.key.SearchContext; -import red.jackf.chesttracker.impl.rendering.NameRenderMode; import red.jackf.chesttracker.impl.util.ItemStacks; import red.jackf.chesttracker.impl.util.Misc; import red.jackf.chesttracker.impl.util.ModCodecs; import red.jackf.jackfredlib.api.base.codecs.JFLCodecs; import red.jackf.whereisit.api.SearchRequest; import red.jackf.whereisit.api.SearchResult; -import red.jackf.whereisit.api.search.NestedItemsGrabber; import java.util.*; -import java.util.stream.Stream; public class MemoryKeyImpl implements MemoryKey { private final Map memories = new HashMap<>(); @@ -146,23 +143,20 @@ public Optional get(BlockPos pos) { } @Override - public List getCounts(CountingPredicate predicate, StackMergeMode stackMergeMode, boolean unpackNested) { - List> items = this.memories.entrySet().stream() - .filter(predicate) - .map(entry -> { - if (unpackNested) { - return entry.getValue().items().stream() - .flatMap(stack -> Stream.concat(Stream.of(stack), NestedItemsGrabber.get(stack))) - .toList(); - } else { - return entry.getValue().items(); - } - }).toList(); - + public List getCounts(CountingPredicate predicate, StackMergeMode stackMergeMode) { return switch (stackMergeMode) { - case ALL -> ItemStacks.flattenStacks(items.stream().flatMap(Collection::stream).toList(), false); - case WITHIN_CONTAINERS -> items.stream().flatMap(list -> ItemStacks.flattenStacks(list, false).stream()).toList(); - case NEVER -> items.stream().flatMap(Collection::stream).toList(); + case ALL -> ItemStacks.flattenStacks(this.memories.entrySet().stream() + .filter(predicate) + .flatMap(data -> data.getValue().items().stream()) + .toList(), false); + case WITHIN_CONTAINERS -> this.memories.entrySet().stream() + .filter(predicate) + .flatMap(data -> ItemStacks.flattenStacks(data.getValue().items(), false).stream()) + .toList(); + case NEVER -> this.memories.entrySet().stream() + .filter(predicate) + .flatMap(data -> data.getValue().items().stream()) + .toList(); }; } @@ -182,7 +176,7 @@ public List doSearch(SearchContext context) { .item(matchingItem.get()) .otherPositions(entry.getValue().otherPositions()); - if (context.metadata().getCompatibilitySettings().nameRenderMode == NameRenderMode.FULL) + if (context.metadata().getCompatibilitySettings().displayContainerNames) result.name( entry.getValue().renderName(), Misc.getAverageOffsetFrom(entry.getKey(), entry.getValue().otherPositions()).add(0, 1, 0) diff --git a/src/client/java/red/jackf/chesttracker/impl/memory/metadata/CompatibilitySettings.java b/src/client/java/red/jackf/chesttracker/impl/memory/metadata/CompatibilitySettings.java index d45a2dec..ac74c72e 100644 --- a/src/client/java/red/jackf/chesttracker/impl/memory/metadata/CompatibilitySettings.java +++ b/src/client/java/red/jackf/chesttracker/impl/memory/metadata/CompatibilitySettings.java @@ -5,7 +5,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.Style; -import red.jackf.chesttracker.impl.rendering.NameRenderMode; +import red.jackf.chesttracker.impl.config.ChestTrackerConfig; import red.jackf.jackfredlib.api.base.codecs.JFLCodecs; import java.util.Optional; @@ -18,28 +18,28 @@ public class CompatibilitySettings { return instance.group( JFLCodecs.forEnum(NameFilterMode.class).optionalFieldOf("nameFilterMode") .forGetter(settings -> Optional.of(settings.nameFilterMode)), - JFLCodecs.forEnum(NameRenderMode.class).optionalFieldOf("nameRenderMode") - .forGetter(settings -> Optional.of(settings.nameRenderMode)) + Codec.BOOL.optionalFieldOf("displayContainerNames") + .forGetter(settings -> Optional.of(settings.displayContainerNames)) ).apply(instance, (nameFilterMode, displayContainerNames) -> new CompatibilitySettings( nameFilterMode.orElse(def.nameFilterMode), - displayContainerNames.orElse(def.nameRenderMode) + displayContainerNames.orElse(def.displayContainerNames) )); }); public NameFilterMode nameFilterMode = NameFilterMode.NO_FILTER; - public NameRenderMode nameRenderMode = NameRenderMode.FULL; + public boolean displayContainerNames = ChestTrackerConfig.INSTANCE.instance().rendering.displayContainerNames; protected CompatibilitySettings() {} - protected CompatibilitySettings(NameFilterMode nameFilterMode, NameRenderMode nameRenderMode) { + protected CompatibilitySettings(NameFilterMode nameFilterMode, boolean displayContainerNames) { this.nameFilterMode = nameFilterMode; - this.nameRenderMode = nameRenderMode; + this.displayContainerNames = displayContainerNames; } public CompatibilitySettings copy() { return new CompatibilitySettings( this.nameFilterMode, - this.nameRenderMode + this.displayContainerNames ); } diff --git a/src/client/java/red/jackf/chesttracker/impl/memory/metadata/SearchSettings.java b/src/client/java/red/jackf/chesttracker/impl/memory/metadata/SearchSettings.java index 85e7b97c..c379111a 100644 --- a/src/client/java/red/jackf/chesttracker/impl/memory/metadata/SearchSettings.java +++ b/src/client/java/red/jackf/chesttracker/impl/memory/metadata/SearchSettings.java @@ -28,14 +28,11 @@ public class SearchSettings { RANGE_CODEC.optionalFieldOf("searchRange") .forGetter(settings -> Optional.of(settings.searchRange == Integer.MAX_VALUE ? Either.right("infinite") : Either.left(settings.searchRange))), JFLCodecs.forEnum(StackMergeMode.class).optionalFieldOf("stackMergeMode") - .forGetter(settings -> Optional.of(settings.stackMergeMode)), - Codec.BOOL.optionalFieldOf("unpackNested") - .forGetter(settings -> Optional.of(settings.unpackNested)) - ).apply(instance, (itemListRange, searchRange, stackMergeMode, unpackNested) -> new SearchSettings( + .forGetter(settings -> Optional.of(settings.stackMergeMode)) + ).apply(instance, (itemListRange, searchRange, stackMergeMode) -> new SearchSettings( itemListRange.map(either -> collapse(either.mapRight(s -> s.equals("infinite") ? Integer.MAX_VALUE : def.itemListRange))).orElse(def.itemListRange), searchRange.map(either -> collapse(either.mapRight(s -> s.equals("infinite") ? Integer.MAX_VALUE : def.searchRange))).orElse(def.searchRange), - stackMergeMode.orElse(def.stackMergeMode), - unpackNested.orElse(def.unpackNested) + stackMergeMode.orElse(def.stackMergeMode) )); }); @@ -68,19 +65,17 @@ private static Stream range(int from, int to, int step) { public int itemListRange = 256; public int searchRange = 256; public StackMergeMode stackMergeMode = StackMergeMode.ALL; - public boolean unpackNested = true; SearchSettings() { } - public SearchSettings(int itemListRange, int searchRange, StackMergeMode stackMergeMode, boolean unpackNested) { + public SearchSettings(int itemListRange, int searchRange, StackMergeMode stackMergeMode) { this.itemListRange = itemListRange; this.searchRange = searchRange; this.stackMergeMode = stackMergeMode; - this.unpackNested = unpackNested; } public SearchSettings copy() { - return new SearchSettings(itemListRange, searchRange, stackMergeMode, unpackNested); + return new SearchSettings(itemListRange, searchRange, stackMergeMode); } } diff --git a/src/client/java/red/jackf/chesttracker/impl/providers/ProviderHandler.java b/src/client/java/red/jackf/chesttracker/impl/providers/ProviderHandler.java index 52bd8543..e35d2d83 100644 --- a/src/client/java/red/jackf/chesttracker/impl/providers/ProviderHandler.java +++ b/src/client/java/red/jackf/chesttracker/impl/providers/ProviderHandler.java @@ -6,7 +6,6 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import org.jetbrains.annotations.Nullable; import red.jackf.chesttracker.api.ClientBlockSource; -import red.jackf.chesttracker.api.providers.InteractionTracker; import red.jackf.chesttracker.api.providers.context.BlockPlacedContext; import red.jackf.chesttracker.api.providers.ServerProvider; import red.jackf.chesttracker.impl.events.AfterPlayerPlaceBlock; @@ -93,10 +92,8 @@ public void setupEvents() { getCurrentProvider().ifPresent(provider -> provider.onGameMessageReceived(message, overlay))); - ClientSendMessageEvents.COMMAND.register(command -> { - getCurrentProvider().ifPresent(provider -> provider.onCommandSent(command)); - - InteractionTracker.INSTANCE.clear(); - }); + ClientSendMessageEvents.COMMAND.register(command -> + getCurrentProvider().ifPresent(provider -> + provider.onCommandSent(command))); } } diff --git a/src/client/java/red/jackf/chesttracker/impl/providers/ScreenCloseContextImpl.java b/src/client/java/red/jackf/chesttracker/impl/providers/ScreenCloseContextImpl.java index f64b1203..2ec3b33e 100644 --- a/src/client/java/red/jackf/chesttracker/impl/providers/ScreenCloseContextImpl.java +++ b/src/client/java/red/jackf/chesttracker/impl/providers/ScreenCloseContextImpl.java @@ -44,22 +44,6 @@ public List getItems() { .toList(); } - @Override - public List getItemsWithEmpty() { - List items = screen.getMenu().slots.stream() - .filter(slot -> !ProviderUtils.isPlayerSlot(slot)) - .map(Slot::getItem) - .toList(); - - int lastIndex = -1; - - for (int i = 0; i < items.size(); i++) { - if (!items.get(i).isEmpty()) lastIndex = i; - } - - return items.subList(0, lastIndex + 1); - } - @Override public List getItemsMatching(Predicate predicate) { return this.getItems().stream().filter(stack -> !stack.isEmpty() && predicate.test(stack)).toList(); diff --git a/src/client/java/red/jackf/chesttracker/impl/rendering/NameRenderMode.java b/src/client/java/red/jackf/chesttracker/impl/rendering/NameRenderMode.java deleted file mode 100644 index 46f97a5d..00000000 --- a/src/client/java/red/jackf/chesttracker/impl/rendering/NameRenderMode.java +++ /dev/null @@ -1,20 +0,0 @@ -package red.jackf.chesttracker.impl.rendering; - -import net.minecraft.network.chat.Component; - -public enum NameRenderMode { - FULL(Component.translatable("chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full"), - Component.translatable("chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip")), - HOVERED_ONLY(Component.translatable("chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly"), - Component.translatable("chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip")), - DISABLED(Component.translatable("chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled"), - Component.translatable("chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip")); - - public final Component label; - public final Component tooltip; - - NameRenderMode(Component label, Component tooltip) { - this.label = label; - this.tooltip = tooltip; - } -} diff --git a/src/client/java/red/jackf/chesttracker/impl/rendering/NameRenderer.java b/src/client/java/red/jackf/chesttracker/impl/rendering/NameRenderer.java index fa6ad755..281bfade 100644 --- a/src/client/java/red/jackf/chesttracker/impl/rendering/NameRenderer.java +++ b/src/client/java/red/jackf/chesttracker/impl/rendering/NameRenderer.java @@ -3,10 +3,12 @@ import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext; import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.network.chat.Component; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; -import org.jetbrains.annotations.Nullable; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.phys.Vec3; import red.jackf.chesttracker.api.memory.Memory; import red.jackf.chesttracker.api.memory.MemoryKey; import red.jackf.chesttracker.api.providers.ProviderUtils; @@ -19,50 +21,62 @@ import java.util.Set; public class NameRenderer { + public static void setup() { WorldRenderEvents.BEFORE_BLOCK_OUTLINE.register((context, hitResult) -> { - if (ChestTrackerConfig.INSTANCE.instance().debug.disableContainerNames) return true; - MemoryBankAccessImpl.INSTANCE.getLoadedInternal().ifPresent(bank -> { - if (bank.getMetadata().getCompatibilitySettings().nameRenderMode == NameRenderMode.DISABLED) + if (!bank.getMetadata().getCompatibilitySettings().displayContainerNames) return; - bank.getKey(ProviderUtils.getPlayersCurrentKey()).ifPresent(key -> NameRenderer.renderNamesForKey(context, bank, key, hitResult)); + bank.getKey(ProviderUtils.getPlayersCurrentKey()).ifPresent(key -> NameRenderer.renderNamesForKey(context, bank, key)); }); return true; }); } - private static void renderNamesForKey(WorldRenderContext context, MemoryBankImpl bank, MemoryKey key, @Nullable HitResult hitResult) { - @Nullable Memory focused = null; + private static void renderNamesForKey(WorldRenderContext context, MemoryBankImpl bank, MemoryKey key) { + Map named = key.getNamedMemories(); + final int maxRangeSq = ChestTrackerConfig.INSTANCE.instance().rendering.nameRange * ChestTrackerConfig.INSTANCE.instance().rendering.nameRange; + Set alreadyRendering = RenderUtils.getCurrentlyRenderedWithNames(); + for (var entry : named.entrySet()) { + if (alreadyRendering.contains(entry.getKey())) continue; + if (entry.getKey().distToCenterSqr(context.camera().getPosition()) < maxRangeSq) { + Component name = entry.getValue().renderName(); + if (name == null) continue; - if (hitResult instanceof BlockHitResult blockHitResult && !(hitResult.getType() == HitResult.Type.MISS)) { - var targetedMemory = key.get(blockHitResult.getBlockPos()); + BlockPos blockPos = entry.getKey(); + Vec3 facingOffset = getFacingOffset(context, blockPos); + Vec3 renderPos = entry.getValue().getCenterPosition(blockPos).add(facingOffset); - if (targetedMemory.isPresent() && targetedMemory.get().hasCustomName()) { - focused = targetedMemory.get(); - } - } - - if (bank.getMetadata().getCompatibilitySettings().nameRenderMode == NameRenderMode.FULL) { - Map named = key.getNamedMemories(); - final int maxRangeSq = ChestTrackerConfig.INSTANCE.instance().rendering.nameRange * ChestTrackerConfig.INSTANCE.instance().rendering.nameRange; - Set alreadyRendering = RenderUtils.getCurrentlyRenderedWithNames(); - for (var entry : named.entrySet()) { - if (entry.getValue() == focused) continue; - if (alreadyRendering.contains(entry.getKey())) continue; - if (entry.getKey().distToCenterSqr(context.camera().getPosition()) < maxRangeSq) { - Component name = entry.getValue().renderName(); - if (name == null) continue; - RenderUtils.scheduleLabelRender(entry.getValue().getCenterPosition().add(0, 1, 0), entry.getValue().renderName()); - } + RenderUtils.scheduleLabelRender(renderPos, name); } } + } - if (focused != null) { - Component name = focused.renderName(); - if (name != null) { - RenderUtils.scheduleLabelRender(focused.getCenterPosition().add(0, 1, 0), name, true); - } + private static Vec3 getFacingOffset(WorldRenderContext context, BlockPos blockPos) { + BlockState blockState = context.world().getBlockState(blockPos); + BlockPos aboveBlockPos = blockPos.above(); + BlockState aboveBlockState = context.world().getBlockState(aboveBlockPos); + if (aboveBlockState.isAir()) { + return new Vec3(0,1,0); + } else if (blockState.hasProperty(BlockStateProperties.FACING)) { + Direction facing = blockState.getValue(BlockStateProperties.FACING); + return switch (facing) { + case NORTH -> new Vec3(0, 0, -1); + case SOUTH -> new Vec3(0, 0, 1); + case WEST -> new Vec3(-1, 0, 0); + case EAST -> new Vec3(1, 0, 0); + case UP -> new Vec3(0, 1, 0); + case DOWN -> new Vec3(0, -1, 0); + }; + } else { + Direction facing = blockState.getValue(BlockStateProperties.HORIZONTAL_FACING); + return switch (facing) { + case NORTH -> new Vec3(0, 0, -1); + case SOUTH -> new Vec3(0, 0, 1); + case WEST -> new Vec3(-1, 0, 0); + case EAST -> new Vec3(1, 0, 0); + default -> Vec3.ZERO; + }; } } } diff --git a/src/client/resources/assets/chesttracker/lang/de_de.json b/src/client/resources/assets/chesttracker/lang/de_de.json index 61325995..45e2e673 100644 --- a/src/client/resources/assets/chesttracker/lang/de_de.json +++ b/src/client/resources/assets/chesttracker/lang/de_de.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", "chesttracker.gui.editMemoryBank.filtering": "Filtering", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Manual Mode", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Whether containers need to be manually added to Chest Tracker.", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", "chesttracker.gui.editMemoryKeys.return": "Return", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", "chesttracker.config.memoryAndStorage": "Memory & Storage", diff --git a/src/client/resources/assets/chesttracker/lang/en_us.json b/src/client/resources/assets/chesttracker/lang/en_us.json index 73a718fc..87bf6dc6 100644 --- a/src/client/resources/assets/chesttracker/lang/en_us.json +++ b/src/client/resources/assets/chesttracker/lang/en_us.json @@ -70,13 +70,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", "chesttracker.gui.editMemoryBank.filtering": "Filtering", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Manual Mode", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Whether containers need to be manually added to Chest Tracker.", @@ -120,8 +114,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", @@ -164,7 +156,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", diff --git a/src/client/resources/assets/chesttracker/lang/es_es.json b/src/client/resources/assets/chesttracker/lang/es_es.json index 85217c19..7d791b34 100644 --- a/src/client/resources/assets/chesttracker/lang/es_es.json +++ b/src/client/resources/assets/chesttracker/lang/es_es.json @@ -1,178 +1,169 @@ { - "key.chesttracker.open_gui": "Abrir la interfaz de Chest Tracker", - "chesttracker.title": "Chest Tracker", - "chesttracker.compatibility.brand": "Vista previa del cliente vía %s", + "key.chesttracker.open_gui": "Abrir GUI rastreador de cofres", + "chesttracker.title": "Rastreador de Cofres", + "chesttracker.compatibility.brand": "Client-side preview via %s", "chesttracker.inventoryButton.rename": "Renombrar cofre", - "chesttracker.inventoryButton.rename.remove": "Eliminar", - "chesttracker.inventoryButton.rename.clientOnlyWarning": "Esto solo cambiará el nombre del contenedor de tu cliente, no en el servidor.", + "chesttracker.inventoryButton.rename.remove": "Remove", + "chesttracker.inventoryButton.rename.clientOnlyWarning": "This will only rename the container on your client, not the server.", "chesttracker.inventoryButton.forget": "Olvidar", - "chesttracker.inventoryButton.rememberContainer.remember": "Recordar contenedor", - "chesttracker.inventoryButton.rememberContainer.block": "No recordar contenedor", + "chesttracker.inventoryButton.rememberContainer.remember": "Remember Container", + "chesttracker.inventoryButton.rememberContainer.block": "Don't Remember Container", "chesttracker.inventoryButton.export": "Exportar posición", "chesttracker.inventoryButton.export.toast": "Exportado a %s", "chesttracker.inventoryButton.export.errorToast": "Error al exportar la posición. Revise la consola.", "config.jade.plugin_chesttracker.memory_preview": "Usar memorias", "config.waila.plugin_chesttracker": "Rastreador de Cofres", - "config.waila.plugin_chesttracker.show_icon": "Muestra el icono de Chest Tracker", - "config.waila.plugin_chesttracker.show_key_and_location": "DEBUG: Mostrar la posición del resaltado y la clave de memoria", - "chesttracker.generic.seconds": "%d segundos", - "chesttracker.generic.minutes": "%d minutos", - "chesttracker.generic.hour": "1 hora", - "chesttracker.generic.hours": "%d horas", - "chesttracker.generic.day": "1 día", - "chesttracker.generic.days": "%d días", - "chesttracker.generic.blocks": "%d bloques", + "config.waila.plugin_chesttracker.show_icon": "Show Chest Tracker's icon", + "config.waila.plugin_chesttracker.show_key_and_location": "DEBUG: Show a highlight's position and memory key", + "chesttracker.generic.seconds": "%d seconds", + "chesttracker.generic.minutes": "%d minutes", + "chesttracker.generic.hour": "1 hour", + "chesttracker.generic.hours": "%d hours", + "chesttracker.generic.day": "1 day", + "chesttracker.generic.days": "%d days", + "chesttracker.generic.blocks": "%d blocks", "chesttracker.gui.id": "ID", - "chesttracker.gui.open": "Abrir", - "chesttracker.gui.resize": "Cambiar tamaño de la interfaz", - "chesttracker.gui.containerFilter": "Contenedor: %s", - "chesttracker.gui.containerFilter.all": "Todos", - "chesttracker.gui.containerFilter.chests": "Cofres", - "chesttracker.gui.containerFilter.barrels": "Barriles", - "chesttracker.gui.containerFilter.shulkerBoxes": "Cajas de shulker", - "chesttracker.gui.containerFilter.hoppers": "Tolvas", - "chesttracker.gui.containerFilter.furnaces": "Hornos", - "chesttracker.gui.itemSort": "Ordenando: %s", - "chesttracker.gui.itemSort.countDescending": "Número de objetos (mayor a menor)", - "chesttracker.gui.itemSort.countAscending": "Cuenta de objetos (menor a mayor)", - "chesttracker.gui.itemSort.alphabeticalDescending": "Nombre del objeto (A a Z)", - "chesttracker.gui.itemSort.alphabeticalAscending": "Nombre del objeto (Z a A)", - "chesttracker.gui.modSettings": "Cambiar ajustes de Mod", - "chesttracker.gui.openMemoryManager": "Abrir el gestor de memoria", - "chesttracker.gui.memoryBankSettings": "Cambiar configuración del banco de memoria", - "chesttracker.gui.narration.drag": "Presione y arrastre", - "chesttracker.gui.memoryManager": "Administrar bancos de memoria", - "chesttracker.gui.memoryManager.search": "Buscar bancos de memoria", - "chesttracker.gui.memoryManager.selectedBackend": "Modo: %s", - "chesttracker.gui.memoryManager.newMemoryBank": "Crear nuevo banco de memoria", - "chesttracker.gui.createMemoryBank": "Creando nuevo banco de memoria", - "chesttracker.gui.createMemoryBank.fillDefault": "Rellenar mundo por defecto", - "chesttracker.gui.createMemoryBank.createAndLoad": "Crear y cargar", - "chesttracker.gui.createMemoryBank.alreadyExists": "Banco de memoria ya existe con este ID", - "chesttracker.gui.createMemoryBank.emptyId": "El ID no puede estar vacío", - "chesttracker.gui.editMemoryBank": "Editando banco de memoria", - "chesttracker.gui.editMemoryBank.markDefault": "Hacer predeterminado", - "chesttracker.gui.editMemoryBank.alreadyDefault": "Ya es el predeterminado", - "chesttracker.gui.editMemoryBank.markDefault.tooltip": "Marcar este Banco de Memorias como el predeterminado para la conexión/mundo actual.", - "chesttracker.gui.editMemoryBank.compatibility": "Compatibilidad", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode": "Modo de filtrado de nombres", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.tooltip": "Filtrado aplicado a los nombres de contenedores. Esto puede ser útil si un servidor suministra un paquete de recursos que hace uso de caracteres de alto código para la interfaz de usuario.", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.none": "Ninguno", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.none.tooltip": "No se aplica ningún filtrado a los nombres de contenedores.", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii": "Solo ASCII", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Solo permitir caracteres ASCII en los nombres de contenedores.", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Unicode básico", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Solo permite caracteres Unicode hasta \\u33FF. Esto incluye la mayoría de los scripts y símbolos europeos, africanos y americanos, pero excluye chino, coreano, japonés y otros.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", - "chesttracker.gui.editMemoryBank.filtering": "Filtrado", - "chesttracker.gui.editMemoryBank.filtering.manualMode": "Modo manual", - "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Si los contenedores necesitan ser añadidos manualmente a Chest Tracker.", - "chesttracker.gui.editMemoryBank.filtering.onlyRemembedNamed": "Solo con nombre", - "chesttracker.gui.editMemoryBank.filtering.onlyRemembedNamed.tooltip": "Si solo recordar contenedores con nombre.", - "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.all": "Todos los contenedores", - "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.all.tooltip": "Guarda objetos de todos los contenedores, incluyendo tolvas, hornos y similares", - "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.common": "Contenedores comunes", - "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.common.tooltip": "Recuerda solo cofres, barriles y cajas de shulker.", - "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests": "Cofre de ender", - "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests.tooltip": "Recordar los cofres de ender en su propia pestaña o ignorarlos.", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks": "Añadir automáticamente bloques colocados", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.yes": "Sí", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.shulkerBoxesOnly": "Cajas de shulker", + "chesttracker.gui.open": "Open", + "chesttracker.gui.resize": "Resize GUI", + "chesttracker.gui.containerFilter": "Container: %s", + "chesttracker.gui.containerFilter.all": "All", + "chesttracker.gui.containerFilter.chests": "Chests", + "chesttracker.gui.containerFilter.barrels": "Barrels", + "chesttracker.gui.containerFilter.shulkerBoxes": "Shulker Boxes", + "chesttracker.gui.containerFilter.hoppers": "Hoppers", + "chesttracker.gui.containerFilter.furnaces": "Furnaces", + "chesttracker.gui.itemSort": "Sorting: %s", + "chesttracker.gui.itemSort.countDescending": "Item Count (High to Low)", + "chesttracker.gui.itemSort.countAscending": "Item Count (Low to High)", + "chesttracker.gui.itemSort.alphabeticalDescending": "Item Name (A to Z)", + "chesttracker.gui.itemSort.alphabeticalAscending": "Item Name (Z to A)", + "chesttracker.gui.modSettings": "Change Mod Settings", + "chesttracker.gui.openMemoryManager": "Open Memory Manager", + "chesttracker.gui.memoryBankSettings": "Change Memory Bank Settings", + "chesttracker.gui.narration.drag": "Click and drag", + "chesttracker.gui.memoryManager": "Manage Memory Banks", + "chesttracker.gui.memoryManager.search": "Search Memory Banks", + "chesttracker.gui.memoryManager.selectedBackend": "Backend: %s", + "chesttracker.gui.memoryManager.newMemoryBank": "Create new Memory Bank", + "chesttracker.gui.createMemoryBank": "Creating new Memory Bank", + "chesttracker.gui.createMemoryBank.fillDefault": "Fill World Default", + "chesttracker.gui.createMemoryBank.createAndLoad": "Create and Load", + "chesttracker.gui.createMemoryBank.alreadyExists": "Memory Bank already exists with this ID", + "chesttracker.gui.createMemoryBank.emptyId": "Can't have empty ID", + "chesttracker.gui.editMemoryBank": "Editing Memory Bank", + "chesttracker.gui.editMemoryBank.markDefault": "Make Default", + "chesttracker.gui.editMemoryBank.alreadyDefault": "Already Default", + "chesttracker.gui.editMemoryBank.markDefault.tooltip": "Mark this Memory Bank as the default for the current connection/world.", + "chesttracker.gui.editMemoryBank.compatibility": "Compatibility", + "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode": "Name Filtering Mode", + "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.tooltip": "Filtering applied to container label names. This can be useful if a server supplies a resource pack which makes use of high-codepoint characters for UI.", + "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.none": "None", + "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.none.tooltip": "No filtering applied to container names.", + "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii": "ASCII only", + "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", + "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", + "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", + "chesttracker.gui.editMemoryBank.filtering": "Filtering", + "chesttracker.gui.editMemoryBank.filtering.manualMode": "Manual Mode", + "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Whether containers need to be manually added to Chest Tracker.", + "chesttracker.gui.editMemoryBank.filtering.onlyRemembedNamed": "Only Named", + "chesttracker.gui.editMemoryBank.filtering.onlyRemembedNamed.tooltip": "Whether to only remember named containers.", + "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.all": "All Containers", + "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.all.tooltip": "Save items from all containers, including hoppers, furnaces and similar", + "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.common": "Common Containers", + "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.common.tooltip": "Only remember chests, barrels and shulker boxes.", + "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests": "Ender Chests", + "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests.tooltip": "Whether to remember ender chests in their own tab, or to ignore them.", + "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks": "Auto-add Placed Blocks", + "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.yes": "Yes", + "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.shulkerBoxesOnly": "Shulker Boxes", "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.no": "No", - "chesttracker.gui.editMemoryBank.integrity": "Integridad", - "chesttracker.gui.editMemoryBank.integrity.blockBreak": "Romper bloques", - "chesttracker.gui.editMemoryBank.integrity.blockBreak.tooltip": "Quitar los recuerdos cuando el bloque en esa posición se rompa.", - "chesttracker.gui.editMemoryBank.integrity.preserveNamed": "Conservar con nombre", - "chesttracker.gui.editMemoryBank.integrity.preserveNamed.tooltip": "Eximir los recuerdos nombrados de la duración de los recuerdos.", - "chesttracker.gui.editMemoryBank.integrity.periodicCheck": "Comprobación periódica", - "chesttracker.gui.editMemoryBank.integrity.periodicCheck.tooltip": "Comprobar periódicamente los recuerdos cercanos para ver si sus contenedores ya no están ahí, en caso de que algo ajeno al jugador los rompa.", - "chesttracker.gui.editMemoryBank.integrity.memoryLifetime": "Duración de la memoria", - "chesttracker.gui.editMemoryBank.integrity.memoryLifetime.never": "Nunca expira", - "chesttracker.gui.editMemoryBank.integrity.memoryLifetime.tooltip": "Cuánto tiempo debe transcurrir desde el último acceso de una memoria antes de que se considere obsoleta y eliminada.", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode": "Modo de conteo del tiempo de vida", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.realTime": "Usar tiempo real", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.worldTime": "Usar hora del mundo", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.loadedTime": "Usar tiempo de carga del banco", - "chesttracker.gui.editMemoryBank.manage": "Administrar", - "chesttracker.gui.editMemoryBank.manage.workingRange": "Rango: %s", - "chesttracker.gui.editMemoryBank.manage.deleteWithinRange": "Borrar todos los recuerdos dentro de bloques %s (%s)", - "chesttracker.gui.editMemoryBank.manage.deleteOutsideRange": "Borrar todos los recuerdos fuera de bloques %s (%s)", - "chesttracker.gui.editMemoryBank.manage.highlightAll": "Resaltar todo", - "chesttracker.gui.editMemoryBank.search": "Buscar", - "chesttracker.gui.editMemoryBank.search.itemListRange": "Rango de listado de objetos: %s", - "chesttracker.gui.editMemoryBank.search.itemListRange.tooltip": "La distancia máxima en bloques para que la lista de objetos muestre los recuerdos.", - "chesttracker.gui.editMemoryBank.search.searchRange": "Rango de búsqueda: %s", - "chesttracker.gui.editMemoryBank.search.stackMergeMode": "Modo de fusión de pila", - "chesttracker.gui.editMemoryBank.search.stackMergeMode.tooltip": "Cómo diferentes pilas de artículos en contenedores son fusionados y mostrados en la lista de artículos.", - "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Combinarlo todo", - "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Dentro de contenedores", - "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Nunca combinar", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", - "chesttracker.gui.editMemoryKeys": "Editar claves de memoria", - "chesttracker.gui.editMemoryKeys.hint": "Clave de memoria", - "chesttracker.gui.editMemoryKeys.return": "Volver", - "chesttracker.gui.editMemoryKeys.reorder": "Botón de ordenar", - "chesttracker.gui.editMemoryKeys.setIcon": "Establecer icono", - "chesttracker.gui.editMemoryKeys.useDefaultIconOrdering": "Usar orden de iconos por defecto", - "chesttracker.storage.json.fileSize": "Tamaño del archivo: %s", - "chesttracker.config.open": "Abrir", - "chesttracker.config.requiresRestart": "¡Requiere reiniciar el juego!", - "chesttracker.config.gui": "Interfaz", - "chesttracker.config.gui.autofocusSearchBar": "Autoenfocar barra de búsqueda", - "chesttracker.config.gui.autofocusSearchBar.description": "Si enfocar automáticamente la barra de búsqueda cuando se abre la interfaz.", - "chesttracker.config.gui.showAutocomplete": "Mostrar autocompletado para la barra de búsqueda", - "chesttracker.config.gui.autocompleteShowsRegularNames": "Mostrar objetos sin nombre en autocompletar", - "chesttracker.config.gui.showResizeWidget": "Mostrar botón para redimensionar", - "chesttracker.config.gui.gridWidth": "Ancho de la cuadrícula", - "chesttracker.config.gui.gridHeight": "Altura de cuadrícula", - "chesttracker.config.gui.gridSizeSlider": "%d ranuras", - "chesttracker.config.gui.hideMemoryBankIds": "Ocultar los IDs de bancos de memorias", - "chesttracker.config.gui.hideMemoryBankIds.description": "Oculte el ID del banco de memoria de las interfaces de edición, por ejemplo, en caso de que desee ocultar una IP.", - "chesttracker.config.gui.itemListTextScale": "Escala relativa del texto de la interfaz", - "chesttracker.config.gui.itemListTextScale.description": "A qué escala de la interfaz renderizar el texto en la lista de elementos. Útil si el número de objetos se estira en otras ranuras.", - "chesttracker.config.gui.useCustomNamesInGUIs": "Usar nombres personalizados en interfaces", - "chesttracker.config.gui.useCustomNamesInGUIs.description": "Si desea reemplazar el texto del título en interfaces con nombres personalizados, si uno está presente. Tenga en cuenta que esto puede causar problemas de compatibilidad con servidores que usan fuentes para texturas de interfaz, como Origin Realms.", - "chesttracker.config.inventoryButton": "Botón del inventario", - "chesttracker.config.inventoryButton.enabled": "Mostrar botón en el inventario", - "chesttracker.config.inventoryButton.showExtra": "Mostrar botones extra", + "chesttracker.gui.editMemoryBank.integrity": "Integrity", + "chesttracker.gui.editMemoryBank.integrity.blockBreak": "Block Break", + "chesttracker.gui.editMemoryBank.integrity.blockBreak.tooltip": "Whether to remove memories when the block at that position is broken.", + "chesttracker.gui.editMemoryBank.integrity.preserveNamed": "Preserve Named", + "chesttracker.gui.editMemoryBank.integrity.preserveNamed.tooltip": "Whether to exempt named memories from the memory lifetime check.", + "chesttracker.gui.editMemoryBank.integrity.periodicCheck": "Periodic Check", + "chesttracker.gui.editMemoryBank.integrity.periodicCheck.tooltip": "Periodically check memories nearby to see if their containers are no longer there, in case something else broke them.", + "chesttracker.gui.editMemoryBank.integrity.memoryLifetime": "Memory Lifetime", + "chesttracker.gui.editMemoryBank.integrity.memoryLifetime.never": "Never Expires", + "chesttracker.gui.editMemoryBank.integrity.memoryLifetime.tooltip": "How long since a memory's last access before it's considered stale and removed.", + "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode": "Lifetime Count Mode", + "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.realTime": "Use Real Time", + "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.worldTime": "Use World Time", + "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.loadedTime": "Use Bank Loaded Time", + "chesttracker.gui.editMemoryBank.manage": "Manage", + "chesttracker.gui.editMemoryBank.manage.workingRange": "Range: %s", + "chesttracker.gui.editMemoryBank.manage.deleteWithinRange": "Delete all memories within %s blocks (%s)", + "chesttracker.gui.editMemoryBank.manage.deleteOutsideRange": "Delete all memories outside %s blocks (%s)", + "chesttracker.gui.editMemoryBank.manage.highlightAll": "Highlight All", + "chesttracker.gui.editMemoryBank.search": "Search", + "chesttracker.gui.editMemoryBank.search.itemListRange": "Item List Range: %s", + "chesttracker.gui.editMemoryBank.search.itemListRange.tooltip": "The maximum distance in blocks that the item list will display memories for.", + "chesttracker.gui.editMemoryBank.search.searchRange": "Search Range: %s", + "chesttracker.gui.editMemoryBank.search.stackMergeMode": "Stack Merge Mode", + "chesttracker.gui.editMemoryBank.search.stackMergeMode.tooltip": "How different item stacks in containers are merged and displayed in the item list.", + "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", + "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", + "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", + "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", + "chesttracker.gui.editMemoryKeys.hint": "Memory Key", + "chesttracker.gui.editMemoryKeys.return": "Return", + "chesttracker.gui.editMemoryKeys.reorder": "Reorder Key", + "chesttracker.gui.editMemoryKeys.setIcon": "Set Icon", + "chesttracker.gui.editMemoryKeys.useDefaultIconOrdering": "Use Default Icon Ordering", + "chesttracker.storage.json.fileSize": "File Size: %s", + "chesttracker.config.open": "Open", + "chesttracker.config.requiresRestart": "Requires the game to restart!", + "chesttracker.config.gui": "Gui", + "chesttracker.config.gui.autofocusSearchBar": "Auto-focus Search Bar", + "chesttracker.config.gui.autofocusSearchBar.description": "Whether to automatically focus the search bar when the GUI is opened.", + "chesttracker.config.gui.showAutocomplete": "Show Autocomplete for Search Bar", + "chesttracker.config.gui.autocompleteShowsRegularNames": "Show Unnamed Items in Autocomplete", + "chesttracker.config.gui.showResizeWidget": "Show Resize Widget", + "chesttracker.config.gui.gridWidth": "Grid Width", + "chesttracker.config.gui.gridHeight": "Grid Height", + "chesttracker.config.gui.gridSizeSlider": "%d slots", + "chesttracker.config.gui.hideMemoryBankIds": "Hide Memory Bank IDs", + "chesttracker.config.gui.hideMemoryBankIds.description": "Hide the Memory Bank ID from the edit GUIs, for example in case you want to hide an IP.", + "chesttracker.config.gui.itemListTextScale": "GUI Text Relative Scale", + "chesttracker.config.gui.itemListTextScale.description": "What GUI scale to render text in the item list at. Useful if your item counts stretch into other slots.", + "chesttracker.config.gui.useCustomNamesInGUIs": "Use Custom Names in GUIs", + "chesttracker.config.gui.useCustomNamesInGUIs.description": "Whether to replace title text in GUIs with custom names, if one is present. Note that this may cause compatibility issues with servers that use fonts for GUI textures, such as Origin Realms.", + "chesttracker.config.inventoryButton": "Inventory Button", + "chesttracker.config.inventoryButton.enabled": "Show Inventory Button", + "chesttracker.config.inventoryButton.showExtra": "Show Extra Buttons", "chesttracker.config.inventoryButton.showExtra.description": "If relevant, show additional buttons after hovering over the main button, such as deletion and filtering.", - "chesttracker.config.inventoryButton.manageCustom": "Administrar las posiciones de los botones personalizados", - "chesttracker.config.inventoryButton.export": "Mostrar botón de exportar", - "chesttracker.config.inventoryButton.export.description": "Si se debe mostrar un botón de exportación para posiciones de botones personalizadas. Los archivos se colocan en %s.", - "chesttracker.config.rendering": "Renderizado", - "chesttracker.config.rendering.nameRenderRange": "Rango de renderizado de los nombres", - "chesttracker.config.rendering.displayContainerNames": "Mostrar nombres de contenedor", - "chesttracker.config.rendering.displayContainerNames.description": "Si mostrar nombres por encima de los contenedores en el mundo. Esto puede ser reemplazado por un banco de memoria, en compatibilidad.", - "chesttracker.config.dev": "Herramientas de desarrollador", - "chesttracker.config.dev.showDevHud": "Mostrar interfaz de desarrollador", - "chesttracker.config.dev.showDevHud.description": "Muestra la interfaz de desarrollador", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", - "chesttracker.config.whereisit": "Opciones de Where Is It", - "chesttracker.config.whereisit.description": "Abra la configuración de Where Is It Aquí encontrarás las opciones para la renderización.", - "chesttracker.config.memoryAndStorage": "Memoria y almacenamiento", - "chesttracker.config.memory": "Opciones de memoria", - "chesttracker.config.memory.noMemoryBankLoaded": "No hay un banco de memoria actualmente cargado.", - "chesttracker.config.storage": "Opciones de almacenamiento", - "chesttracker.config.storage.openFolder": "Abrir la carpeta de la memoria", - "chesttracker.config.storage.storageBackend": "Modo de almacenamiento", - "chesttracker.config.storage.storageBackend.description": "Define el formato en que los bancos de memoria se almacenan entre mundos/sesiones.", - "chesttracker.config.storage.storageBackend.description.json": "Almacena todos los bancos de memoria como archivos JSON en el directorio 'chesttracker' del juego. Legible, pero ocupa más espacio en disco.", - "chesttracker.config.storage.storageBackend.description.nbt": "Almacena todos los bancos de memoria como archivos NBT en el directorio 'chesttracker' del juego. Más compacto, pero no se puede leer sin un visor externo. Opción recomendada.", - "chesttracker.config.storage.storageBackend.description.memory": "Almacena bancos de memoria en la memoria del juego.", - "chesttracker.config.storage.storageBackend.description.memoryLossOnReboot": "Aviso: todos los bancos de memoria almacenados de esta manera se pierden cuando el juego se cierra.", - "chesttracker.config.storage.json.readableJsonMemories": "Archivos JSON legibles", - "chesttracker.config.storage.json.readableJsonMemories.description": "Si los archivos JSON en el directorio de memoria deben ser legibles, o compactos.", - "chesttracker.config.compatibility.shulkerboxtooltip": "Integración con Shulker Box Tooltip", - "chesttracker.config.compatibility.shulkerboxtooltip.description": "Chest Tracker sobrescribe la vista previa Shulker Box Tooltip mod para cofres de ender con su propio lado del cliente, leyendo el banco de memoria actual. Esto funciona en Realms y servidores sin el mod Shulker Box Tooltip instalado.", - "chesttracker.config.compatibility.wthit": "Integración con WTHIT", - "chesttracker.config.compatibility.wthit.description": "Le permite utilizar el banco de memoria actual para mostrar resaltados en WTHIT. Hay configuraciones adicionales bajo el gestor de plugins de WTHIT.", - "chesttracker.config.searchables.required": "Se requiere Searchables.", - "chesttracker.config.searchables.notInstalled": "Searchables no cargado." + "chesttracker.config.inventoryButton.manageCustom": "Manage Custom Button Positions", + "chesttracker.config.inventoryButton.export": "Show Export Button", + "chesttracker.config.inventoryButton.export.description": "Whether to show an export button for custom button positions. Files get placed in %s.", + "chesttracker.config.rendering": "Rendering", + "chesttracker.config.rendering.nameRenderRange": "Name Render Range", + "chesttracker.config.rendering.displayContainerNames": "Show Container Names", + "chesttracker.config.rendering.displayContainerNames.description": "Whether to show names above containers in the world. This can be overridden per memory bank, under Compatibility.", + "chesttracker.config.dev": "Developer Utils", + "chesttracker.config.dev.showDevHud": "Show Developer Hud", + "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", + "chesttracker.config.whereisit": "Where Is It config", + "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", + "chesttracker.config.memoryAndStorage": "Memory & Storage", + "chesttracker.config.memory": "Memory Settings", + "chesttracker.config.memory.noMemoryBankLoaded": "No Memory Bank currently loaded.", + "chesttracker.config.storage": "Storage Settings", + "chesttracker.config.storage.openFolder": "Open Memory Folder", + "chesttracker.config.storage.storageBackend": "Storage Backend", + "chesttracker.config.storage.storageBackend.description": "Defines the format that Memory Banks are stored between worlds/sessions.", + "chesttracker.config.storage.storageBackend.description.json": "Stores all Memory Banks as JSON files in your game's 'chesttracker' directory. Readable, but takes up more disk space.", + "chesttracker.config.storage.storageBackend.description.nbt": "Stores all Memory Banks as NBT files in your game's 'chesttracker' directory. More compact, but not readable without an external viewer. Recommended option.", + "chesttracker.config.storage.storageBackend.description.memory": "Stores Memory Banks in game memory.", + "chesttracker.config.storage.storageBackend.description.memoryLossOnReboot": "Warning: all Memory Banks stored this way are lost when the game closes.", + "chesttracker.config.storage.json.readableJsonMemories": "Readable JSON Files", + "chesttracker.config.storage.json.readableJsonMemories.description": "Whether the JSON files in the memory directory should be readable, or compacted.", + "chesttracker.config.compatibility.shulkerboxtooltip": "Shulker Box Tooltip Integration", + "chesttracker.config.compatibility.shulkerboxtooltip.description": "Chest Tracker overwrites Shulker Box Tooltip's server-side preview for ender chests with it's own client-side one, reading from the current Memory Bank. This functions on Realms and servers without Shulker Box Tooltip installed.", + "chesttracker.config.compatibility.wthit": "WTHIT Integration", + "chesttracker.config.compatibility.wthit.description": "Allows you to use the current Memory Bank to show highlights in WTHIT. There are additional settings under the WTHIT's plugin manager.", + "chesttracker.config.searchables.required": "Requires Searchables.", + "chesttracker.config.searchables.notInstalled": "Searchables not loaded." } \ No newline at end of file diff --git a/src/client/resources/assets/chesttracker/lang/fr_fr.json b/src/client/resources/assets/chesttracker/lang/fr_fr.json index 1c639b70..8e090af3 100644 --- a/src/client/resources/assets/chesttracker/lang/fr_fr.json +++ b/src/client/resources/assets/chesttracker/lang/fr_fr.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", "chesttracker.gui.editMemoryBank.filtering": "Filtering", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Mode manuel", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Indique si les conteneurs doivent être ajoutés manuellement à Chest Tracker.", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", "chesttracker.gui.editMemoryKeys.return": "Return", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", "chesttracker.config.memoryAndStorage": "Memory & Storage", diff --git a/src/client/resources/assets/chesttracker/lang/it_it.json b/src/client/resources/assets/chesttracker/lang/it_it.json index 99e3b339..45e2e673 100644 --- a/src/client/resources/assets/chesttracker/lang/it_it.json +++ b/src/client/resources/assets/chesttracker/lang/it_it.json @@ -1,46 +1,46 @@ { - "key.chesttracker.open_gui": "Apri la GUI di Chest Tracker", + "key.chesttracker.open_gui": "Open Chest Tracker GUI", "chesttracker.title": "Chest Tracker", - "chesttracker.compatibility.brand": "Anteprima lato client tramite %s", - "chesttracker.inventoryButton.rename": "Rinomina il contenitore", - "chesttracker.inventoryButton.rename.remove": "Rimuovi", - "chesttracker.inventoryButton.rename.clientOnlyWarning": "Questo rinominerà il contenitore solo sul tuo client, non sul server.", - "chesttracker.inventoryButton.forget": "Dimentica", - "chesttracker.inventoryButton.rememberContainer.remember": "Ricorda il contenitore", - "chesttracker.inventoryButton.rememberContainer.block": "Non ricordare il contenitore", - "chesttracker.inventoryButton.export": "Esporta posizione", - "chesttracker.inventoryButton.export.toast": "Esportato in %s", - "chesttracker.inventoryButton.export.errorToast": "Errore durante l'esportazione della posizione, controlla la console.", - "config.jade.plugin_chesttracker.memory_preview": "Usa Memorie", + "chesttracker.compatibility.brand": "Client-side preview via %s", + "chesttracker.inventoryButton.rename": "Rename Container", + "chesttracker.inventoryButton.rename.remove": "Remove", + "chesttracker.inventoryButton.rename.clientOnlyWarning": "This will only rename the container on your client, not the server.", + "chesttracker.inventoryButton.forget": "Forget", + "chesttracker.inventoryButton.rememberContainer.remember": "Remember Container", + "chesttracker.inventoryButton.rememberContainer.block": "Don't Remember Container", + "chesttracker.inventoryButton.export": "Export Position", + "chesttracker.inventoryButton.export.toast": "Exported to %s", + "chesttracker.inventoryButton.export.errorToast": "Error exporting position; check the console.", + "config.jade.plugin_chesttracker.memory_preview": "Use Memories", "config.waila.plugin_chesttracker": "Chest Tracker", - "config.waila.plugin_chesttracker.show_icon": "Mostra l'icona di Chest Tracker", + "config.waila.plugin_chesttracker.show_icon": "Show Chest Tracker's icon", "config.waila.plugin_chesttracker.show_key_and_location": "DEBUG: Show a highlight's position and memory key", - "chesttracker.generic.seconds": "%d secondi", - "chesttracker.generic.minutes": "%d minuti", - "chesttracker.generic.hour": "1 ora", - "chesttracker.generic.hours": "%d ore", - "chesttracker.generic.day": "1 giorno", - "chesttracker.generic.days": "%d giorni", - "chesttracker.generic.blocks": "%d blocchi", + "chesttracker.generic.seconds": "%d seconds", + "chesttracker.generic.minutes": "%d minutes", + "chesttracker.generic.hour": "1 hour", + "chesttracker.generic.hours": "%d hours", + "chesttracker.generic.day": "1 day", + "chesttracker.generic.days": "%d days", + "chesttracker.generic.blocks": "%d blocks", "chesttracker.gui.id": "ID", - "chesttracker.gui.open": "Apri", - "chesttracker.gui.resize": "Ridimensiona la GUI", - "chesttracker.gui.containerFilter": "Contenitore: %s", - "chesttracker.gui.containerFilter.all": "Tutti", - "chesttracker.gui.containerFilter.chests": "Bauli", - "chesttracker.gui.containerFilter.barrels": "Barili", - "chesttracker.gui.containerFilter.shulkerBoxes": "Scatole di shulker", - "chesttracker.gui.containerFilter.hoppers": "Tramogge", - "chesttracker.gui.containerFilter.furnaces": "Fornaci", - "chesttracker.gui.itemSort": "Ordina: %s", - "chesttracker.gui.itemSort.countDescending": "Numero di oggetti (Decrescente)", - "chesttracker.gui.itemSort.countAscending": "Numero di oggetti (Crescente)", - "chesttracker.gui.itemSort.alphabeticalDescending": "Nome oggetti (Da A a Z)", - "chesttracker.gui.itemSort.alphabeticalAscending": "Nome oggetti (Da Z a A)", - "chesttracker.gui.modSettings": "Cambia Impostazioni Mod", - "chesttracker.gui.openMemoryManager": "Apri Gestione Memoria", + "chesttracker.gui.open": "Open", + "chesttracker.gui.resize": "Resize GUI", + "chesttracker.gui.containerFilter": "Container: %s", + "chesttracker.gui.containerFilter.all": "All", + "chesttracker.gui.containerFilter.chests": "Chests", + "chesttracker.gui.containerFilter.barrels": "Barrels", + "chesttracker.gui.containerFilter.shulkerBoxes": "Shulker Boxes", + "chesttracker.gui.containerFilter.hoppers": "Hoppers", + "chesttracker.gui.containerFilter.furnaces": "Furnaces", + "chesttracker.gui.itemSort": "Sorting: %s", + "chesttracker.gui.itemSort.countDescending": "Item Count (High to Low)", + "chesttracker.gui.itemSort.countAscending": "Item Count (Low to High)", + "chesttracker.gui.itemSort.alphabeticalDescending": "Item Name (A to Z)", + "chesttracker.gui.itemSort.alphabeticalAscending": "Item Name (Z to A)", + "chesttracker.gui.modSettings": "Change Mod Settings", + "chesttracker.gui.openMemoryManager": "Open Memory Manager", "chesttracker.gui.memoryBankSettings": "Change Memory Bank Settings", - "chesttracker.gui.narration.drag": "Clicca e trascina", + "chesttracker.gui.narration.drag": "Click and drag", "chesttracker.gui.memoryManager": "Manage Memory Banks", "chesttracker.gui.memoryManager.search": "Search Memory Banks", "chesttracker.gui.memoryManager.selectedBackend": "Backend: %s", @@ -63,16 +63,10 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", "chesttracker.gui.editMemoryBank.filtering": "Filtering", - "chesttracker.gui.editMemoryBank.filtering.manualMode": "Modalità manuale", - "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Indica se i contenitori devono essere aggiunti manualmente a Chest Tracker.", + "chesttracker.gui.editMemoryBank.filtering.manualMode": "Manual Mode", + "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Whether containers need to be manually added to Chest Tracker.", "chesttracker.gui.editMemoryBank.filtering.onlyRemembedNamed": "Only Named", "chesttracker.gui.editMemoryBank.filtering.onlyRemembedNamed.tooltip": "Whether to only remember named containers.", "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.all": "All Containers", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", "chesttracker.gui.editMemoryKeys.return": "Return", @@ -137,8 +129,8 @@ "chesttracker.config.gui.hideMemoryBankIds.description": "Hide the Memory Bank ID from the edit GUIs, for example in case you want to hide an IP.", "chesttracker.config.gui.itemListTextScale": "GUI Text Relative Scale", "chesttracker.config.gui.itemListTextScale.description": "What GUI scale to render text in the item list at. Useful if your item counts stretch into other slots.", - "chesttracker.config.gui.useCustomNamesInGUIs": "Usa i nomi personalizzati nelle GUI", - "chesttracker.config.gui.useCustomNamesInGUIs.description": "Indica se rimpiazzare il testo nelle GUI con nomi personalizzati, se uno è presente. Si noti che questo potrebbe causare problemi di compatibilità con i server che usano i font per le texture GUI, come Origin Realms.", + "chesttracker.config.gui.useCustomNamesInGUIs": "Use Custom Names in GUIs", + "chesttracker.config.gui.useCustomNamesInGUIs.description": "Whether to replace title text in GUIs with custom names, if one is present. Note that this may cause compatibility issues with servers that use fonts for GUI textures, such as Origin Realms.", "chesttracker.config.inventoryButton": "Inventory Button", "chesttracker.config.inventoryButton.enabled": "Show Inventory Button", "chesttracker.config.inventoryButton.showExtra": "Show Extra Buttons", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", "chesttracker.config.memoryAndStorage": "Memory & Storage", diff --git a/src/client/resources/assets/chesttracker/lang/ja_jp.json b/src/client/resources/assets/chesttracker/lang/ja_jp.json index 61325995..45e2e673 100644 --- a/src/client/resources/assets/chesttracker/lang/ja_jp.json +++ b/src/client/resources/assets/chesttracker/lang/ja_jp.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", "chesttracker.gui.editMemoryBank.filtering": "Filtering", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Manual Mode", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Whether containers need to be manually added to Chest Tracker.", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", "chesttracker.gui.editMemoryKeys.return": "Return", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", "chesttracker.config.memoryAndStorage": "Memory & Storage", diff --git a/src/client/resources/assets/chesttracker/lang/ko_kr.json b/src/client/resources/assets/chesttracker/lang/ko_kr.json index d5e7dcb3..67cbf814 100644 --- a/src/client/resources/assets/chesttracker/lang/ko_kr.json +++ b/src/client/resources/assets/chesttracker/lang/ko_kr.json @@ -7,7 +7,7 @@ "chesttracker.inventoryButton.rename.clientOnlyWarning": "이 변경은 서버가 아닌 클라이언트에 저장 됩니다", "chesttracker.inventoryButton.forget": "Forget", "chesttracker.inventoryButton.rememberContainer.remember": "상자 기억하기", - "chesttracker.inventoryButton.rememberContainer.block": "상자 기억하지 않기", + "chesttracker.inventoryButton.rememberContainer.block": "상자 기억하지않기", "chesttracker.inventoryButton.export": "Export Position", "chesttracker.inventoryButton.export.toast": "Exported to %s", "chesttracker.inventoryButton.export.errorToast": "Error exporting position; check the console.", @@ -15,28 +15,28 @@ "config.waila.plugin_chesttracker": "Chest Tracker", "config.waila.plugin_chesttracker.show_icon": "Show Chest Tracker's icon", "config.waila.plugin_chesttracker.show_key_and_location": "DEBUG: Show a highlight's position and memory key", - "chesttracker.generic.seconds": "%d초", - "chesttracker.generic.minutes": "%d분", - "chesttracker.generic.hour": "1시간", - "chesttracker.generic.hours": "%d시간", - "chesttracker.generic.day": "1일", - "chesttracker.generic.days": "%d일", - "chesttracker.generic.blocks": "%d 블록", - "chesttracker.gui.id": "아이디", - "chesttracker.gui.open": "열기", + "chesttracker.generic.seconds": "%d seconds", + "chesttracker.generic.minutes": "%d minutes", + "chesttracker.generic.hour": "1 hour", + "chesttracker.generic.hours": "%d hours", + "chesttracker.generic.day": "1 day", + "chesttracker.generic.days": "%d days", + "chesttracker.generic.blocks": "%d blocks", + "chesttracker.gui.id": "ID", + "chesttracker.gui.open": "Open", "chesttracker.gui.resize": "Resize GUI", "chesttracker.gui.containerFilter": "Container: %s", - "chesttracker.gui.containerFilter.all": "전체", - "chesttracker.gui.containerFilter.chests": "상자", - "chesttracker.gui.containerFilter.barrels": "통", - "chesttracker.gui.containerFilter.shulkerBoxes": "셜커 상자", - "chesttracker.gui.containerFilter.hoppers": "호퍼", - "chesttracker.gui.containerFilter.furnaces": "화로", - "chesttracker.gui.itemSort": "분류: %s", - "chesttracker.gui.itemSort.countDescending": "아이템 개수 (내림차순)", - "chesttracker.gui.itemSort.countAscending": "아이템 개수 (오름차순)", - "chesttracker.gui.itemSort.alphabeticalDescending": "아이템 이름 (오름차순)", - "chesttracker.gui.itemSort.alphabeticalAscending": "아이템 이름 (내림차순)", + "chesttracker.gui.containerFilter.all": "All", + "chesttracker.gui.containerFilter.chests": "Chests", + "chesttracker.gui.containerFilter.barrels": "Barrels", + "chesttracker.gui.containerFilter.shulkerBoxes": "Shulker Boxes", + "chesttracker.gui.containerFilter.hoppers": "Hoppers", + "chesttracker.gui.containerFilter.furnaces": "Furnaces", + "chesttracker.gui.itemSort": "Sorting: %s", + "chesttracker.gui.itemSort.countDescending": "Item Count (High to Low)", + "chesttracker.gui.itemSort.countAscending": "Item Count (Low to High)", + "chesttracker.gui.itemSort.alphabeticalDescending": "Item Name (A to Z)", + "chesttracker.gui.itemSort.alphabeticalAscending": "Item Name (Z to A)", "chesttracker.gui.modSettings": "Change Mod Settings", "chesttracker.gui.openMemoryManager": "Open Memory Manager", "chesttracker.gui.memoryBankSettings": "Change Memory Bank Settings", @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", "chesttracker.gui.editMemoryBank.filtering": "Filtering", "chesttracker.gui.editMemoryBank.filtering.manualMode": "수동 모드", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Chest Tracker에서 상자를 수동으로 추가", @@ -79,12 +73,12 @@ "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.all.tooltip": "Save items from all containers, including hoppers, furnaces and similar", "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.common": "Common Containers", "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.common.tooltip": "Only remember chests, barrels and shulker boxes.", - "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests": "엔더 상자", + "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests": "Ender Chests", "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests.tooltip": "Whether to remember ender chests in their own tab, or to ignore them.", "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks": "Auto-add Placed Blocks", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.yes": "켜짐", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.shulkerBoxesOnly": "셜커 상자", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.no": "꺼짐", + "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.yes": "Yes", + "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.shulkerBoxesOnly": "Shulker Boxes", + "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.no": "No", "chesttracker.gui.editMemoryBank.integrity": "Integrity", "chesttracker.gui.editMemoryBank.integrity.blockBreak": "Block Break", "chesttracker.gui.editMemoryBank.integrity.blockBreak.tooltip": "Whether to remove memories when the block at that position is broken.", @@ -96,15 +90,15 @@ "chesttracker.gui.editMemoryBank.integrity.memoryLifetime.never": "Never Expires", "chesttracker.gui.editMemoryBank.integrity.memoryLifetime.tooltip": "How long since a memory's last access before it's considered stale and removed.", "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode": "Lifetime Count Mode", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.realTime": "실제 시간 사용", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.worldTime": "월드 시간 사용", + "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.realTime": "Use Real Time", + "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.worldTime": "Use World Time", "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.loadedTime": "Use Bank Loaded Time", "chesttracker.gui.editMemoryBank.manage": "Manage", "chesttracker.gui.editMemoryBank.manage.workingRange": "Range: %s", "chesttracker.gui.editMemoryBank.manage.deleteWithinRange": "Delete all memories within %s blocks (%s)", "chesttracker.gui.editMemoryBank.manage.deleteOutsideRange": "Delete all memories outside %s blocks (%s)", "chesttracker.gui.editMemoryBank.manage.highlightAll": "Highlight All", - "chesttracker.gui.editMemoryBank.search": "검색", + "chesttracker.gui.editMemoryBank.search": "Search", "chesttracker.gui.editMemoryBank.search.itemListRange": "Item List Range: %s", "chesttracker.gui.editMemoryBank.search.itemListRange.tooltip": "The maximum distance in blocks that the item list will display memories for.", "chesttracker.gui.editMemoryBank.search.searchRange": "Search Range: %s", @@ -113,16 +107,14 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", - "chesttracker.gui.editMemoryKeys.return": "돌아가기", + "chesttracker.gui.editMemoryKeys.return": "Return", "chesttracker.gui.editMemoryKeys.reorder": "Reorder Key", "chesttracker.gui.editMemoryKeys.setIcon": "Set Icon", "chesttracker.gui.editMemoryKeys.useDefaultIconOrdering": "Use Default Icon Ordering", - "chesttracker.storage.json.fileSize": "파일 크기: %s", - "chesttracker.config.open": "열기", + "chesttracker.storage.json.fileSize": "File Size: %s", + "chesttracker.config.open": "Open", "chesttracker.config.requiresRestart": "Requires the game to restart!", "chesttracker.config.gui": "Gui", "chesttracker.config.gui.autofocusSearchBar": "Auto-focus Search Bar", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", "chesttracker.config.memoryAndStorage": "Memory & Storage", diff --git a/src/client/resources/assets/chesttracker/lang/nl_nl.json b/src/client/resources/assets/chesttracker/lang/nl_nl.json index 7be4c2fb..bf3d8c8c 100644 --- a/src/client/resources/assets/chesttracker/lang/nl_nl.json +++ b/src/client/resources/assets/chesttracker/lang/nl_nl.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", "chesttracker.gui.editMemoryBank.filtering": "Filtering", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Manual Mode", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Whether containers need to be manually added to Chest Tracker.", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", "chesttracker.gui.editMemoryKeys.return": "Terug", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", "chesttracker.config.memoryAndStorage": "Memory & Storage", diff --git a/src/client/resources/assets/chesttracker/lang/pt_pt.json b/src/client/resources/assets/chesttracker/lang/pt_pt.json index 61325995..45e2e673 100644 --- a/src/client/resources/assets/chesttracker/lang/pt_pt.json +++ b/src/client/resources/assets/chesttracker/lang/pt_pt.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Only allow ASCII characters in container names.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Basic Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Only allow Unicode characters up to \\u33FF. This includes most European, African and American scripts and symbols, but excludes Chinese, Korean, Japanese and others.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Display Container Names", "chesttracker.gui.editMemoryBank.filtering": "Filtering", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Manual Mode", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Whether containers need to be manually added to Chest Tracker.", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", "chesttracker.gui.editMemoryKeys.return": "Return", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", "chesttracker.config.memoryAndStorage": "Memory & Storage", diff --git a/src/client/resources/assets/chesttracker/lang/ro_ro.json b/src/client/resources/assets/chesttracker/lang/ro_ro.json deleted file mode 100644 index ebf0ac43..00000000 --- a/src/client/resources/assets/chesttracker/lang/ro_ro.json +++ /dev/null @@ -1,178 +0,0 @@ -{ - "key.chesttracker.open_gui": "Deschide Interfața Chest Tracker", - "chesttracker.title": "Chest Tracker", - "chesttracker.compatibility.brand": "Previzualizare client prin %s", - "chesttracker.inventoryButton.rename": "Redenumește Containerul", - "chesttracker.inventoryButton.rename.remove": "Elimină", - "chesttracker.inventoryButton.rename.clientOnlyWarning": "Aceasta va schimba numele containerului doar pe clientul tău, nu pe server.", - "chesttracker.inventoryButton.forget": "Uită", - "chesttracker.inventoryButton.rememberContainer.remember": "Memorează Container", - "chesttracker.inventoryButton.rememberContainer.block": "Nu Memora Containerul", - "chesttracker.inventoryButton.export": "Exportă Poziția", - "chesttracker.inventoryButton.export.toast": "Exportat la %s", - "chesttracker.inventoryButton.export.errorToast": "Eroare la exportarea poziției; verifică consola.", - "config.jade.plugin_chesttracker.memory_preview": "Folosește Memorii", - "config.waila.plugin_chesttracker": "Chest Tracker", - "config.waila.plugin_chesttracker.show_icon": "Arată pictograma Chest Tracker", - "config.waila.plugin_chesttracker.show_key_and_location": "DEBUG: Arată poziția și cheia de memorie a evidențierii", - "chesttracker.generic.seconds": "%d secunde", - "chesttracker.generic.minutes": "%d minute", - "chesttracker.generic.hour": "1 oră", - "chesttracker.generic.hours": "%d ore", - "chesttracker.generic.day": "1 zi", - "chesttracker.generic.days": "%d zile", - "chesttracker.generic.blocks": "%d blocuri", - "chesttracker.gui.id": "ID", - "chesttracker.gui.open": "Deschide", - "chesttracker.gui.resize": "Redimensionează Interfața", - "chesttracker.gui.containerFilter": "Container: %s", - "chesttracker.gui.containerFilter.all": "Toate", - "chesttracker.gui.containerFilter.chests": "Cufere", - "chesttracker.gui.containerFilter.barrels": "Butoaie", - "chesttracker.gui.containerFilter.shulkerBoxes": "Cutii Shulker", - "chesttracker.gui.containerFilter.hoppers": "Pâlnii", - "chesttracker.gui.containerFilter.furnaces": "Cuptoare", - "chesttracker.gui.itemSort": "Sortare: %s", - "chesttracker.gui.itemSort.countDescending": "Număr de Obiecte (de la Mare la Mic)", - "chesttracker.gui.itemSort.countAscending": "Număr de Obiecte (de la Mic la Mare)", - "chesttracker.gui.itemSort.alphabeticalDescending": "Nume Obiect (de la A la Z)", - "chesttracker.gui.itemSort.alphabeticalAscending": "Nume Obiect (de la Z la A)", - "chesttracker.gui.modSettings": "Modifică Setările Modului", - "chesttracker.gui.openMemoryManager": "Deschide Gestionarul de Memorii", - "chesttracker.gui.memoryBankSettings": "Modifică Setările Băncii de Memorii", - "chesttracker.gui.narration.drag": "Clic și trage", - "chesttracker.gui.memoryManager": "Gestionează Băncile de Memorii", - "chesttracker.gui.memoryManager.search": "Caută Băncile de Memorii", - "chesttracker.gui.memoryManager.selectedBackend": "Backend: %s", - "chesttracker.gui.memoryManager.newMemoryBank": "Creează o nouă Bancă de Memorii", - "chesttracker.gui.createMemoryBank": "Creare Bancă de Memorii nouă", - "chesttracker.gui.createMemoryBank.fillDefault": "Completează cu Valorile Implicite ale Lumii", - "chesttracker.gui.createMemoryBank.createAndLoad": "Creează și Încarcă", - "chesttracker.gui.createMemoryBank.alreadyExists": "O Bancă de Memorii cu acest ID deja există", - "chesttracker.gui.createMemoryBank.emptyId": "ID-ul nu poate fi gol", - "chesttracker.gui.editMemoryBank": "Editare Bancă de Memorii", - "chesttracker.gui.editMemoryBank.markDefault": "Setează ca Implicit", - "chesttracker.gui.editMemoryBank.alreadyDefault": "Deja Implicit", - "chesttracker.gui.editMemoryBank.markDefault.tooltip": "Marchează această Bancă de Memorie ca fiind implicită pentru conexiunea/lumea curentă.", - "chesttracker.gui.editMemoryBank.compatibility": "Compatibilitate", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode": "Modul de Filtrare a Numelui", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.tooltip": "Filtrare aplicată numelui etichetelor containerelor. Acest lucru poate fi util dacă un server furnizează un pachet de resurse care folosește caractere cu coduri mari pentru UI.", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.none": "Niciunul", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.none.tooltip": "Nicio filtrare aplicată numelui containerelor.", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii": "Doar ASCII", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Permite doar caractere ASCII în numele containerelor.", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Unicode de bază", - "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Permite doar caractere Unicode până la \\u33FF. Acest lucru include majoritatea scripturilor și simbolurilor europene, africane și americane, dar exclude caracterele chinezești, coreene, japoneze și altele.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Redare Nume Container", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Plin", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Redați toate numele în interval.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Doar când este trecut cu mouse-ul", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Redați numele doar atunci când crosshair-ul este deasupra lor.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Dezactivat", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Nu reda numele containerelor.", - "chesttracker.gui.editMemoryBank.filtering": "Filtrare", - "chesttracker.gui.editMemoryBank.filtering.manualMode": "Modul Manual", - "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Dacă containerele trebuie adăugate manual în Chest Tracker.", - "chesttracker.gui.editMemoryBank.filtering.onlyRemembedNamed": "Numai Denumite", - "chesttracker.gui.editMemoryBank.filtering.onlyRemembedNamed.tooltip": "Dacă să rețină doar containerele denumite.", - "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.all": "Toate Containerele", - "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.all.tooltip": "Salvează obiectele din toate containerele, inclusiv din pâlnii, cuptoare și similare", - "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.common": "Containere Comune", - "chesttracker.gui.editMemoryBank.filtering.rememberedContainers.common.tooltip": "Ține minte doar cufere, butoaie și cutii Shulker.", - "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests": "Cufere de Ender", - "chesttracker.gui.editMemoryBank.filtering.rememberEnderChests.tooltip": "Dacă să ții minte cuferele ender în propriul tab, sau să le ignori.", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks": "Adăugare Automată a Blocurilor Plasate", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.yes": "Da", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.shulkerBoxesOnly": "Cutii Shulker", - "chesttracker.gui.editMemoryBank.filtering.autoAddPlacedBlocks.no": "Nu", - "chesttracker.gui.editMemoryBank.integrity": "Integritate", - "chesttracker.gui.editMemoryBank.integrity.blockBreak": "Distruge Bloc", - "chesttracker.gui.editMemoryBank.integrity.blockBreak.tooltip": "Dacă să elimine memoriile atunci când blocul de la acea poziție este distrus.", - "chesttracker.gui.editMemoryBank.integrity.preserveNamed": "Păstrează Numele", - "chesttracker.gui.editMemoryBank.integrity.preserveNamed.tooltip": "Dacă să scutească memoriile numite de la verificarea duratei de viață a memoriei.", - "chesttracker.gui.editMemoryBank.integrity.periodicCheck": "Verificare Periodică", - "chesttracker.gui.editMemoryBank.integrity.periodicCheck.tooltip": "Verifică periodic memoriile din apropiere pentru a vedea dacă containerele lor nu mai sunt acolo, în cazul în care altceva le-a distrus.", - "chesttracker.gui.editMemoryBank.integrity.memoryLifetime": "Durata de Viață a Memoriei", - "chesttracker.gui.editMemoryBank.integrity.memoryLifetime.never": "Nu Expiră Niciodată", - "chesttracker.gui.editMemoryBank.integrity.memoryLifetime.tooltip": "Cât timp a trecut de la ultima accesare a unei memorii înainte să fie considerată depășită și eliminată.", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode": "Modul de Calcul al Duratei de Viață", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.realTime": "Folosește Timpul Real", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.worldTime": "Folosește Timpul Lumii", - "chesttracker.gui.editMemoryBank.integrity.lifetimeCountMode.loadedTime": "Folosește Timpul Încărcat al Băncii", - "chesttracker.gui.editMemoryBank.manage": "Gestionare", - "chesttracker.gui.editMemoryBank.manage.workingRange": "Distanță: %s", - "chesttracker.gui.editMemoryBank.manage.deleteWithinRange": "Șterge toate memoriile din interiorul a %s blocuri (%s)", - "chesttracker.gui.editMemoryBank.manage.deleteOutsideRange": "Șterge toate memoriile din afara a %s blocuri (%s)", - "chesttracker.gui.editMemoryBank.manage.highlightAll": "Subliniază Tot", - "chesttracker.gui.editMemoryBank.search": "Căutare", - "chesttracker.gui.editMemoryBank.search.itemListRange": "Distanța listei de obiecte: %s", - "chesttracker.gui.editMemoryBank.search.itemListRange.tooltip": "Distanța maximă în blocuri pentru care lista de obiecte va afișa memoriile.", - "chesttracker.gui.editMemoryBank.search.searchRange": "Distanța de Căutare: %s", - "chesttracker.gui.editMemoryBank.search.stackMergeMode": "Modul de Combinare a Stivei", - "chesttracker.gui.editMemoryBank.search.stackMergeMode.tooltip": "Cum sunt combinate și afișate diferitele stive de obiecte în containere în lista de obiecte.", - "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Combină Tot", - "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "În Containere", - "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Nu Combina Niciodată", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Desfășoară Obiectele Împachetate", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Dacă articolele din containere (cum ar fi Cutiile Shulker sau Săculețele) ar trebui să fie afișate.", - "chesttracker.gui.editMemoryKeys": "Editează Cheile de Memorie", - "chesttracker.gui.editMemoryKeys.hint": "Cheie de Memorie", - "chesttracker.gui.editMemoryKeys.return": "Înapoi", - "chesttracker.gui.editMemoryKeys.reorder": "Cheie de Reordonare", - "chesttracker.gui.editMemoryKeys.setIcon": "Setează Iconiță", - "chesttracker.gui.editMemoryKeys.useDefaultIconOrdering": "Utilizează Ordonare Iconiță Implicită", - "chesttracker.storage.json.fileSize": "Mărime Fișier: %s", - "chesttracker.config.open": "Deschide", - "chesttracker.config.requiresRestart": "Necesită repornirea jocului!", - "chesttracker.config.gui": "Interfață", - "chesttracker.config.gui.autofocusSearchBar": "Focalizare Automată pe Bara de Căutare", - "chesttracker.config.gui.autofocusSearchBar.description": "Dacă bara de căutare trebuie să fie focalizată automat atunci când interfața este deschisă.", - "chesttracker.config.gui.showAutocomplete": "Arată Autocompletarea pentru Bara de Căutare", - "chesttracker.config.gui.autocompleteShowsRegularNames": "Arată Obiectele Fără Nume în Autocompletare", - "chesttracker.config.gui.showResizeWidget": "Arată Redimensionare Widget", - "chesttracker.config.gui.gridWidth": "Lățimea Grilei", - "chesttracker.config.gui.gridHeight": "Înălțimea Grilei", - "chesttracker.config.gui.gridSizeSlider": "%d sloturi", - "chesttracker.config.gui.hideMemoryBankIds": "Ascunde ID-urile Băncilor de Memorie", - "chesttracker.config.gui.hideMemoryBankIds.description": "Ascunde ID-ul Băncii de Memorie din interfețele de editare, de exemplu, în cazul în care dorești să ascunzi un IP.", - "chesttracker.config.gui.itemListTextScale": "Scală relativă a textului în interfață", - "chesttracker.config.gui.itemListTextScale.description": "Scara interfeței pentru a afișa textul din lista de obiecte. Util dacă numărul de obiecte se extinde în alte sloturi.", - "chesttracker.config.gui.useCustomNamesInGUIs": "Folosește Nume Personalizate în GUI-uri", - "chesttracker.config.gui.useCustomNamesInGUIs.description": "Dacă să înlocuiești textul titlului în interfață cu nume personalizate, dacă există unul. Reține că acest lucru poate cauza probleme de compatibilitate cu serverele care folosesc fonturi pentru texturile GUI, cum ar fi Origin Realms.", - "chesttracker.config.inventoryButton": "Buton de Inventar", - "chesttracker.config.inventoryButton.enabled": "Afișează Butonul de Inventar", - "chesttracker.config.inventoryButton.showExtra": "Afișează Butoane Suplimentare", - "chesttracker.config.inventoryButton.showExtra.description": "Dacă este cazul, afișează butoane suplimentare după trecerea cu mouse-ul peste butonul principal, cum ar fi comutarea modului manual și numele client-side.", - "chesttracker.config.inventoryButton.manageCustom": "Gestionează Pozițiile Butonului Personalizat", - "chesttracker.config.inventoryButton.export": "Arată Butonul de Exportare", - "chesttracker.config.inventoryButton.export.description": "Dacă se afișează un buton de export pentru pozițiile personalizate ale butoanelor. Fișierele sunt plasate în %s.", - "chesttracker.config.rendering": "Redare", - "chesttracker.config.rendering.nameRenderRange": "Distanța de Afișare a Numelor", - "chesttracker.config.rendering.displayContainerNames": "Arată Numele Containerelor", - "chesttracker.config.rendering.displayContainerNames.description": "Dacă să afișezi numele deasupra containerelor în lume. Aceasta poate fi suprascrisă pentru fiecare bancă de memorie, în secțiunea Compatibilitate.", - "chesttracker.config.dev": "Instrumente Pentru Dezvoltatori", - "chesttracker.config.dev.showDevHud": "Afișează HUD-ul pentru Dezvoltatori", - "chesttracker.config.dev.showDevHud.description": "Afișează HUD-ul pentru Dezvoltatori", - "chesttracker.config.dev.disableContainerNames": "Dezactivează Numele Containerelor", - "chesttracker.config.whereisit": "Configurația Where Is It", - "chesttracker.config.whereisit.description": "Deschide configurația pentru Where Is It; aici vei găsi setările pentru randare.", - "chesttracker.config.memoryAndStorage": "Memorie și Stocare", - "chesttracker.config.memory": "Setări Memorie", - "chesttracker.config.memory.noMemoryBankLoaded": "Nici o Bancă de Memorie nu este încărcată în prezent.", - "chesttracker.config.storage": "Setări de Stocare", - "chesttracker.config.storage.openFolder": "Deschide Dosarul de Memorii", - "chesttracker.config.storage.storageBackend": "Backend de Stocare", - "chesttracker.config.storage.storageBackend.description": "Definește formatul în care Băncile de Memorie sunt stocate între lumi/sesiuni.", - "chesttracker.config.storage.storageBackend.description.json": "Stochează toate Băncile de Memorie ca fișiere JSON în directorul 'chesttracker' al jocului tău. Fișierele sunt lizibile, dar ocupă mai mult spațiu pe disc.", - "chesttracker.config.storage.storageBackend.description.nbt": "Stochează toate Băncile de Memorie ca fișiere NBT în directorul 'chesttracker' al jocului tău. Mai compacte, dar nu lizibile fără un vizualizator extern. Opțiune recomandată.", - "chesttracker.config.storage.storageBackend.description.memory": "Stochează Băncile de Memorie în memoria jocului.", - "chesttracker.config.storage.storageBackend.description.memoryLossOnReboot": "Atenție: toate Băncile de Memorie stocate în acest mod sunt pierdute când jocul se închide.", - "chesttracker.config.storage.json.readableJsonMemories": "Fișiere JSON Lizibile", - "chesttracker.config.storage.json.readableJsonMemories.description": "Dacă fișierele JSON din directorul de memorie ar trebui să fie lizibile sau compactate.", - "chesttracker.config.compatibility.shulkerboxtooltip": "Integrarea Shulker Box Tooltip", - "chesttracker.config.compatibility.shulkerboxtooltip.description": "Chest Tracker suprascrie previzualizarea server-side a Tooltip Shulker Box pentru cuferele Ender cu propria previzualizare client-side, citind din Bancă de Memorie curentă. Aceasta funcționează pe Realms și pe servere fără Shulker Box Tooltip instalat.", - "chesttracker.config.compatibility.wthit": "Integrarea WTHIT", - "chesttracker.config.compatibility.wthit.description": "Îți permite să folosești Bancă de Memorie curentă pentru a arăta evidențierile în WTHIT. Există setări suplimentare în gestionarul de plugin-uri WTHIT.", - "chesttracker.config.searchables.required": "Necesită Searchables.", - "chesttracker.config.searchables.notInstalled": "Searchables nu este încărcat." -} \ No newline at end of file diff --git a/src/client/resources/assets/chesttracker/lang/ru_ru.json b/src/client/resources/assets/chesttracker/lang/ru_ru.json index 0be79af9..ae625878 100644 --- a/src/client/resources/assets/chesttracker/lang/ru_ru.json +++ b/src/client/resources/assets/chesttracker/lang/ru_ru.json @@ -7,7 +7,7 @@ "chesttracker.inventoryButton.rename.clientOnlyWarning": "Это будет переименовывать только контейнер на вашем клиенте, а не на сервере.", "chesttracker.inventoryButton.forget": "Забыть", "chesttracker.inventoryButton.rememberContainer.remember": "Запомнить контейнер", - "chesttracker.inventoryButton.rememberContainer.block": "Забыть контейнер", + "chesttracker.inventoryButton.rememberContainer.block": "Не помнить контейнер", "chesttracker.inventoryButton.export": "Экспорт позиции", "chesttracker.inventoryButton.export.toast": "Экспортировано в %s", "chesttracker.inventoryButton.export.errorToast": "Ошибка экспорта позиции, проверьте консоль.", @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "В именах контейнеров разрешается использовать только символы ASCII.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Базовый Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Разрешаются символы Unicode только до \\u33FF. Сюда входит большинство европейских, африканских и американских шрифтов и символов, но исключаются китайский, корейский, японский и другие.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Показывать имена контейнеров", "chesttracker.gui.editMemoryBank.filtering": "Фильтрация", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Ручной режим", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Должны ли контейнеры быть добавлены вручную в сундук Трекер.", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Merge All", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Within Containers", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Never Merge", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Edit Memory Keys", "chesttracker.gui.editMemoryKeys.hint": "Memory Key", "chesttracker.gui.editMemoryKeys.return": "Return", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Developer Utils", "chesttracker.config.dev.showDevHud": "Show Developer Hud", "chesttracker.config.dev.showDevHud.description": "Show Developer Hud", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It config", "chesttracker.config.whereisit.description": "Open the config for Where Is It; here you'll find settings for rendering.", "chesttracker.config.memoryAndStorage": "Memory & Storage", diff --git a/src/client/resources/assets/chesttracker/lang/tr_tr.json b/src/client/resources/assets/chesttracker/lang/tr_tr.json index 03233fa9..3eadd388 100644 --- a/src/client/resources/assets/chesttracker/lang/tr_tr.json +++ b/src/client/resources/assets/chesttracker/lang/tr_tr.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Konteyner isimlerinde yalnızca ASCII karakterlerine izin verilir.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Temel Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "\\u33FF'e kadar Unicode karakterlerine izin verilir. Bu, çoğu Avrupa, Afrika ve Amerikan yazı tiplerini ve sembollerini içerir, ancak Çince, Korece, Japonca ve diğerlerini dışarıda bırakır.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Konteyner İsimlerini Göster", "chesttracker.gui.editMemoryBank.filtering": "Filtreleme", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Elle Düzenleme Modu", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Konteynerlerin Chest Tracker'a manuel olarak eklenmesi gerekip gerekmediği.", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Hepsini Birleştir", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "Kutular İçinde", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Asla Birleştirme", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Hafıza Anahtarlarını Düzenle", "chesttracker.gui.editMemoryKeys.hint": "Hafıza Anahtarı", "chesttracker.gui.editMemoryKeys.return": "Geri Dön", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Geliştirici Araçları", "chesttracker.config.dev.showDevHud": "Geliştirici HUD'u Göster", "chesttracker.config.dev.showDevHud.description": "Geliştirici HUD'u Göster", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It Ayarı", "chesttracker.config.whereisit.description": "Where Is It için yapılandırmayı açın; burada renderleme için ayarları bulacaksınız.", "chesttracker.config.memoryAndStorage": "Hafıza ve Depolama", diff --git a/src/client/resources/assets/chesttracker/lang/uk_ua.json b/src/client/resources/assets/chesttracker/lang/uk_ua.json index d827c99d..2028d2e2 100644 --- a/src/client/resources/assets/chesttracker/lang/uk_ua.json +++ b/src/client/resources/assets/chesttracker/lang/uk_ua.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "Дозволено лише символи ASCII в назвах контейнерів.", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "Базовий Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "Дозволяти лише символи Unicode до \\u33FF. Це включає більшість європейських, африканських та американських шрифтів і символів, але не включає китайську, корейську, японську та інші мови.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "Показувати імена контейнера", "chesttracker.gui.editMemoryBank.filtering": "Фільтрація", "chesttracker.gui.editMemoryBank.filtering.manualMode": "Ручний режим", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "Чи потрібно додавати контейнери до Chest Tracker вручну.", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "Об’єднати все", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "В контейнерах", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "Ніколи не об'єднувати", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "Редагувати ключі пам'яті", "chesttracker.gui.editMemoryKeys.hint": "Ключ пам'яті", "chesttracker.gui.editMemoryKeys.return": "Повернутись", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "Утиліти розробників", "chesttracker.config.dev.showDevHud": "Показати Hud розробника", "chesttracker.config.dev.showDevHud.description": "Показати Hud розробника", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Де знаходиться конфігурація", "chesttracker.config.whereisit.description": "Відкрийте конфігурацію для Де це; тут ви знайдете налаштування для візуалізації.", "chesttracker.config.memoryAndStorage": "Пам'ять і сховище", diff --git a/src/client/resources/assets/chesttracker/lang/zh_cn.json b/src/client/resources/assets/chesttracker/lang/zh_cn.json index 009ec060..816f201d 100644 --- a/src/client/resources/assets/chesttracker/lang/zh_cn.json +++ b/src/client/resources/assets/chesttracker/lang/zh_cn.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "容器名称中只允许使用ASCII字符", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "基本Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "只允许 Unicode 字符最多为 \\u33FF。这包括大多数欧洲、非洲和美国的语言符号，但不包括中文、朝鲜文、日文和其他语言的符号。", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "显示容器名称", "chesttracker.gui.editMemoryBank.filtering": "正在筛选", "chesttracker.gui.editMemoryBank.filtering.manualMode": "手动模式", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "是否手动添加容器到Chest Tracker。", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "合并所有", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "容器内合并", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "永不合并", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "编辑记忆键", "chesttracker.gui.editMemoryKeys.hint": "记忆键", "chesttracker.gui.editMemoryKeys.return": "返回", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "开发工具", "chesttracker.config.dev.showDevHud": "显示开发者HUD", "chesttracker.config.dev.showDevHud.description": "显示开发者HUD", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "位置配置", "chesttracker.config.whereisit.description": "打开Where Is It的配置，在这里你可以找到渲染的设置", "chesttracker.config.memoryAndStorage": "库存和存储", diff --git a/src/client/resources/assets/chesttracker/lang/zh_tw.json b/src/client/resources/assets/chesttracker/lang/zh_tw.json index d2c2bcd9..834466c2 100644 --- a/src/client/resources/assets/chesttracker/lang/zh_tw.json +++ b/src/client/resources/assets/chesttracker/lang/zh_tw.json @@ -63,13 +63,7 @@ "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.ascii.tooltip": "只允許容器名稱中出現 ASCII 字元。", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode": "基本 Unicode", "chesttracker.gui.editMemoryBank.compatibility.nameFilterMode.basicUnicode.tooltip": "只允許使用到 \\u33FF 的 Unicode 字元。這包含了大多數的歐洲、非洲和美洲的文字和符號，但不包括中文、韓文、日文和其他文字。", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode": "Container Name Rendering", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full": "Full", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.full.tooltip": "Render all names within range.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly": "Hovered Only", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.hoveredOnly.tooltip": "Only render names when the crosshair is over them.", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled": "Disabled", - "chesttracker.gui.editMemoryBank.compatibility.nameRenderMode.disabled.tooltip": "Don't render container names.", + "chesttracker.gui.editMemoryBank.compatibility.displayContainerNames": "顯示容器名稱", "chesttracker.gui.editMemoryBank.filtering": "過濾", "chesttracker.gui.editMemoryBank.filtering.manualMode": "手動模式", "chesttracker.gui.editMemoryBank.filtering.manualMode.tooltip": "容器是否需要手動新增到儲物箱追蹤器。", @@ -113,8 +107,6 @@ "chesttracker.gui.editMemoryBank.search.stackMergeMode.all": "全部合併", "chesttracker.gui.editMemoryBank.search.stackMergeMode.withinContainers": "在容器內", "chesttracker.gui.editMemoryBank.search.stackMergeMode.never": "永不合併", - "chesttracker.gui.editMemoryBank.search.unpackNested": "Unpack Nested Items", - "chesttracker.gui.editMemoryBank.search.unpackNested.tooltip": "Whether items within containers (such as Shulker Boxes or Bundles) should be shown.", "chesttracker.gui.editMemoryKeys": "編輯記憶金鑰", "chesttracker.gui.editMemoryKeys.hint": "記憶金鑰", "chesttracker.gui.editMemoryKeys.return": "返回", @@ -153,7 +145,6 @@ "chesttracker.config.dev": "開發者工具", "chesttracker.config.dev.showDevHud": "顯示開發者 HUD", "chesttracker.config.dev.showDevHud.description": "顯示開發者 HUD", - "chesttracker.config.dev.disableContainerNames": "Disable Container Names", "chesttracker.config.whereisit": "Where Is It 設定", "chesttracker.config.whereisit.description": "開啟 Where Is It 的設定；你可以在這裡找到繪製的設定。", "chesttracker.config.memoryAndStorage": "記憶體和儲存空間",