From b0f0dd4bfd52a083e5b30d3ae877bfc2d3da2168 Mon Sep 17 00:00:00 2001 From: Sakura Ryoko Date: Wed, 15 Jan 2025 23:21:28 -0500 Subject: [PATCH] Setup Warnings for when MinecraftDataVersion is > 100 SchemaID's above current Game Version --- .../litematica/data/EntitiesDataStorage.java | 27 +++---------------- .../gui/widgets/WidgetSchematicBrowser.java | 9 ++++++- .../schematic/LitematicaSchematic.java | 2 +- .../masa/litematica/util/DataFixerMode.java | 13 +++++++++ .../dy/masa/litematica/util/EntityUtils.java | 1 + .../masa/litematica/util/InventoryUtils.java | 24 +++++++++-------- .../masa/litematica/util/PickBlockUtils.java | 2 +- .../assets/litematica/lang/en_us.json | 4 ++- .../assets/litematica/lang/es_es.json | 4 ++- .../assets/litematica/lang/it_it.json | 4 ++- .../assets/litematica/lang/ja_jp.json | 4 ++- .../assets/litematica/lang/ko_kr.json | 4 ++- .../assets/litematica/lang/sv_se.json | 4 ++- .../assets/litematica/lang/uk_ua.json | 4 ++- .../assets/litematica/lang/zh_cn.json | 4 ++- .../assets/litematica/lang/zh_tw.json | 4 ++- 16 files changed, 67 insertions(+), 47 deletions(-) diff --git a/src/main/java/fi/dy/masa/litematica/data/EntitiesDataStorage.java b/src/main/java/fi/dy/masa/litematica/data/EntitiesDataStorage.java index 628e2e2803..e216d903e2 100644 --- a/src/main/java/fi/dy/masa/litematica/data/EntitiesDataStorage.java +++ b/src/main/java/fi/dy/masa/litematica/data/EntitiesDataStorage.java @@ -973,14 +973,7 @@ public BlockEntity handleBlockEntityData(BlockPos pos, NbtCompound nbt, @Nullabl synchronized (this.blockEntityCache) { - if (this.blockEntityCache.containsKey(pos)) - { - this.blockEntityCache.replace(pos, Pair.of(System.currentTimeMillis(), Pair.of(blockEntity, nbt))); - } - else - { - this.blockEntityCache.put(pos, Pair.of(System.currentTimeMillis(), Pair.of(blockEntity, nbt))); - } + this.blockEntityCache.put(pos, Pair.of(System.currentTimeMillis(), Pair.of(blockEntity, nbt))); } blockEntity.read(nbt, this.getClientWorld().getRegistryManager()); @@ -1017,14 +1010,7 @@ public BlockEntity handleBlockEntityData(BlockPos pos, NbtCompound nbt, @Nullabl } synchronized (this.blockEntityCache) { - if (this.blockEntityCache.containsKey(pos)) - { - this.blockEntityCache.replace(pos, Pair.of(System.currentTimeMillis(), Pair.of(blockEntity2, nbt))); - } - else - { - this.blockEntityCache.put(pos, Pair.of(System.currentTimeMillis(), Pair.of(blockEntity2, nbt))); - } + this.blockEntityCache.put(pos, Pair.of(System.currentTimeMillis(), Pair.of(blockEntity2, nbt))); } if (Configs.Generic.ENTITY_DATA_LOAD_NBT.getBooleanValue()) @@ -1069,14 +1055,7 @@ public Entity handleEntityData(int entityId, NbtCompound nbt) } synchronized (this.entityCache) { - if (this.entityCache.containsKey(entityId)) - { - this.entityCache.replace(entityId, Pair.of(System.currentTimeMillis(), Pair.of(entity, nbt))); - } - else - { - this.entityCache.put(entityId, Pair.of(System.currentTimeMillis(), Pair.of(entity, nbt))); - } + this.entityCache.put(entityId, Pair.of(System.currentTimeMillis(), Pair.of(entity, nbt))); } if (Configs.Generic.ENTITY_DATA_LOAD_NBT.getBooleanValue()) diff --git a/src/main/java/fi/dy/masa/litematica/gui/widgets/WidgetSchematicBrowser.java b/src/main/java/fi/dy/masa/litematica/gui/widgets/WidgetSchematicBrowser.java index e6ca766b78..98c7f6bb48 100644 --- a/src/main/java/fi/dy/masa/litematica/gui/widgets/WidgetSchematicBrowser.java +++ b/src/main/java/fi/dy/masa/litematica/gui/widgets/WidgetSchematicBrowser.java @@ -220,7 +220,14 @@ protected void drawSelectedSchematicInfo(@Nullable DirectoryEntry entry, DrawCon if (schema != null) { - str = StringUtils.translate("litematica.gui.label.schematic_info.schema", schema.getString(), version.minecraftDataVersion()); + if (version.minecraftDataVersion() - LitematicaSchematic.MINECRAFT_DATA_VERSION > 100) + { + str = StringUtils.translate("litematica.gui.label.schematic_info.schema.newer", schema.getString(), version.minecraftDataVersion()); + } + else + { + str = StringUtils.translate("litematica.gui.label.schematic_info.schema", schema.getString(), version.minecraftDataVersion()); + } this.drawString(drawContext, str, x, y, textColor); y += 12; } diff --git a/src/main/java/fi/dy/masa/litematica/schematic/LitematicaSchematic.java b/src/main/java/fi/dy/masa/litematica/schematic/LitematicaSchematic.java index 5dbabde2d7..d20fba904c 100644 --- a/src/main/java/fi/dy/masa/litematica/schematic/LitematicaSchematic.java +++ b/src/main/java/fi/dy/masa/litematica/schematic/LitematicaSchematic.java @@ -1251,7 +1251,7 @@ private boolean readFromNBT(NbtCompound nbt) if (version >= 1 && version <= SCHEMATIC_VERSION) { - if (minecraftDataVersion > this.MINECRAFT_DATA_VERSION) + if (minecraftDataVersion - this.MINECRAFT_DATA_VERSION > 100) { InfoUtils.showGuiOrInGameMessage(MessageType.WARNING, "litematica.error.schematic_load.newer_minecraft_version", minecraftDataVersion, this.MINECRAFT_DATA_VERSION); } diff --git a/src/main/java/fi/dy/masa/litematica/util/DataFixerMode.java b/src/main/java/fi/dy/masa/litematica/util/DataFixerMode.java index 656a0d63a1..b95737e8fa 100644 --- a/src/main/java/fi/dy/masa/litematica/util/DataFixerMode.java +++ b/src/main/java/fi/dy/masa/litematica/util/DataFixerMode.java @@ -10,6 +10,7 @@ public enum DataFixerMode implements IConfigOptionListEntry { ALWAYS ("always", "litematica.gui.label.data_fixer_mode.always"), + //BELOW_1215 ("below_1215", "litematica.gui.label.data_fixer_mode.below_1215"), BELOW_1205 ("below_1205", "litematica.gui.label.data_fixer_mode.below_1205"), BELOW_120X ("below_120X", "litematica.gui.label.data_fixer_mode.below_120X"), BELOW_119X ("below_119X", "litematica.gui.label.data_fixer_mode.below_119X"), @@ -93,6 +94,18 @@ public static Schema getEffectiveSchema(int dataVersion) switch (config) { case ALWAYS -> { return schema; } + // FIXME 1.21.5+ + /* + case BELOW_1215 -> + { + if (dataVersion < Schema.SCHEMA_1_21_05.getDataVersion()) + { + return schema; + } + + return null; + } + */ case BELOW_1205 -> { if (dataVersion < Schema.SCHEMA_1_20_05.getDataVersion()) diff --git a/src/main/java/fi/dy/masa/litematica/util/EntityUtils.java b/src/main/java/fi/dy/masa/litematica/util/EntityUtils.java index 3b99fd5cc9..34ad63b3d5 100644 --- a/src/main/java/fi/dy/masa/litematica/util/EntityUtils.java +++ b/src/main/java/fi/dy/masa/litematica/util/EntityUtils.java @@ -318,6 +318,7 @@ public static void loadNbtIntoEntity(Entity entity, NbtCompound nbt) } } + @Deprecated private static void readLeashableEntityCustomData(Entity entity, NbtCompound nbt) { MinecraftClient mc = MinecraftClient.getInstance(); diff --git a/src/main/java/fi/dy/masa/litematica/util/InventoryUtils.java b/src/main/java/fi/dy/masa/litematica/util/InventoryUtils.java index a48a87b6bb..f4f68ece0b 100644 --- a/src/main/java/fi/dy/masa/litematica/util/InventoryUtils.java +++ b/src/main/java/fi/dy/masa/litematica/util/InventoryUtils.java @@ -35,6 +35,8 @@ import fi.dy.masa.litematica.data.EntitiesDataStorage; import fi.dy.masa.litematica.world.WorldSchematic; +import org.jetbrains.annotations.ApiStatus; + public class InventoryUtils { private static final List PICK_BLOCKABLE_SLOTS = new ArrayList<>(); @@ -507,11 +509,11 @@ public static String convertItemNbtToString(NbtCompound nbt) * @param threshold the number of items at or below which the re-stocking will happen * @param allowHotbar whether to allow taking items from other hotbar slots */ - @Experimental - public static void PRW_preRestockHand(PlayerEntity player, - Hand hand, - int threshold, - boolean allowHotbar) + @ApiStatus.Experimental + public static void preRestockHand(PlayerEntity player, + Hand hand, + int threshold, + boolean allowHotbar) { PlayerInventory container = player.getInventory(); final ItemStack handStack = player.getStackInHand(hand); @@ -519,11 +521,11 @@ public static void PRW_preRestockHand(PlayerEntity player, final int max = handStack.getMaxCount(); if (handStack.isEmpty() == false && - PRW_getCursorStack().isEmpty() && + getCursorStack().isEmpty() && (count <= threshold && count < max)) { int endSlot = allowHotbar ? 44 : 35; - int currentMainHandSlot = PRW_getSelectedHotbarSlot() + 36; + int currentMainHandSlot = getSelectedHotbarSlot() + 36; int currentSlot = hand == Hand.MAIN_HAND ? currentMainHandSlot : 45; for (int slotNum = 9; slotNum <= endSlot; ++slotNum) @@ -557,8 +559,8 @@ public static void PRW_preRestockHand(PlayerEntity player, } } - @Experimental - public static ItemStack PRW_getCursorStack() + @ApiStatus.Experimental + public static ItemStack getCursorStack() { PlayerEntity player = MinecraftClient.getInstance().player; if (player == null) @@ -569,8 +571,8 @@ public static ItemStack PRW_getCursorStack() return inv != null ? inv.getMainHandStack() : ItemStack.EMPTY; } - @Experimental - public static int PRW_getSelectedHotbarSlot() + @ApiStatus.Experimental + public static int getSelectedHotbarSlot() { PlayerEntity player = MinecraftClient.getInstance().player; if (player == null) diff --git a/src/main/java/fi/dy/masa/litematica/util/PickBlockUtils.java b/src/main/java/fi/dy/masa/litematica/util/PickBlockUtils.java index 332b61f650..39dc380f0b 100644 --- a/src/main/java/fi/dy/masa/litematica/util/PickBlockUtils.java +++ b/src/main/java/fi/dy/masa/litematica/util/PickBlockUtils.java @@ -51,7 +51,7 @@ public static Hand doPickBlockForStack(ItemStack stack) if (hand != null) { - InventoryUtils.PRW_preRestockHand(player, hand, 6, true); + InventoryUtils.preRestockHand(player, hand, 6, true); } return hand; diff --git a/src/main/resources/assets/litematica/lang/en_us.json b/src/main/resources/assets/litematica/lang/en_us.json index 4adc4eeb81..d5b4211153 100644 --- a/src/main/resources/assets/litematica/lang/en_us.json +++ b/src/main/resources/assets/litematica/lang/en_us.json @@ -504,7 +504,7 @@ "litematica.error.schematic.create.no_selections": "No valid selection regions!", "litematica.error.schematic_load.cant_read_file": "Can't read the schematic file '%s' (doesn't exist or permission issue)", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "No Schematic file selected!", "litematica.error.schematic_load.no_schematic_version_information": "The schematic doesn't have version information, and can't be safely loaded!", "litematica.error.schematic_load.unsupported_schematic_version": "Unsupported or future schematic version '%d'", @@ -712,6 +712,7 @@ "litematica.gui.label.easy_place_protocol.v3": "Version 3", "litematica.gui.label.data_fixer_mode.always": "Always", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "Below 1.20.5 Only", "litematica.gui.label.data_fixer_mode.below_120X": "Below 1.20.x Only", "litematica.gui.label.data_fixer_mode.below_119X": "Below 1.19.x Only", @@ -778,6 +779,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Sponge Version: §f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "Vanilla Structure", "litematica.gui.label.schematic_info.schema": "Minecraft: §f%s§r [Schema §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "Create a placement", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "Immediately create a new placement\nand select that placement", diff --git a/src/main/resources/assets/litematica/lang/es_es.json b/src/main/resources/assets/litematica/lang/es_es.json index 5505665d3a..cc987698ed 100644 --- a/src/main/resources/assets/litematica/lang/es_es.json +++ b/src/main/resources/assets/litematica/lang/es_es.json @@ -485,7 +485,7 @@ "litematica.error.schematic_conversion.structure_to_litematica_failed": "Error al convertir la Estructura a un Esquema de Litematica", "litematica.error.schematic.create.no_selections": "¡No hay regiones de selección válidas!", "litematica.error.schematic_load.cant_read_file": "No se puede leer el archivo de esquema '%s' (no existe o problema de permisos)", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "¡No se seleccionó ningún archivo de esquema!", "litematica.error.schematic_load.no_schematic_version_information": "El esquema no tiene información de versión, ¡y no se puede cargar de forma segura!", "litematica.error.schematic_load.unsupported_schematic_version": "Versión de esquema no compatible o futura '%d'", @@ -663,6 +663,7 @@ "litematica.gui.label.easy_place_protocol.v2": "Versión 2", "litematica.gui.label.easy_place_protocol.v3": "Versión 3", "litematica.gui.label.data_fixer_mode.always": "Siempre", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "Solo por debajo de 1.20.5", "litematica.gui.label.data_fixer_mode.below_120X": "Solo por debajo de 1.20.x", "litematica.gui.label.data_fixer_mode.below_119X": "Solo por debajo de 1.19.x", @@ -718,6 +719,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Sponge Version: §f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "Vanilla Structure", "litematica.gui.label.schematic_info.schema": "Minecraft: §f%s§r [Schema §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "Crear una colocación", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "Crear inmediatamente una nueva colocación\ny seleccionar esa colocación", "litematica.gui.label.schematic_placement.enclosing_size": "Tamaño de Encierro: %s", diff --git a/src/main/resources/assets/litematica/lang/it_it.json b/src/main/resources/assets/litematica/lang/it_it.json index a09f1572c3..9da7b9130d 100644 --- a/src/main/resources/assets/litematica/lang/it_it.json +++ b/src/main/resources/assets/litematica/lang/it_it.json @@ -485,7 +485,7 @@ "litematica.error.schematic_conversion.structure_to_litematica_failed": "Impossibile convertire la Struttura in uno Schema Litematica", "litematica.error.schematic.create.no_selections": "Nessuna regione di selezione valida!", "litematica.error.schematic_load.cant_read_file": "Impossibile leggere il file dello schema '%s' (non esiste o problema di permessi)", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "Nessun file schema selezionato!", "litematica.error.schematic_load.no_schematic_version_information": "Lo schema non ha informazioni sulla versione e non può essere caricata in modo sicuro!", "litematica.error.schematic_load.unsupported_schematic_version": "Versione dello schema non supportata o futura '%d'", @@ -663,6 +663,7 @@ "litematica.gui.label.easy_place_protocol.v2": "Versione 2", "litematica.gui.label.easy_place_protocol.v3": "Versione 3", "litematica.gui.label.data_fixer_mode.always": "Sempre", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "Solo sotto la 1.20.5", "litematica.gui.label.data_fixer_mode.below_120X": "Solo sotto la 1.20.x", "litematica.gui.label.data_fixer_mode.below_119X": "Solo sotto la 1.19.x", @@ -718,6 +719,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Sponge Version: §f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "Vanilla Structure", "litematica.gui.label.schematic_info.schema": "Minecraft: §f%s§r [Schema §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "Crea una posizione", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "Crea immediatamente una nuova posizione\ned è selezionata quella posizione", "litematica.gui.label.schematic_placement.enclosing_size": "Dimensioni complessive: %s", diff --git a/src/main/resources/assets/litematica/lang/ja_jp.json b/src/main/resources/assets/litematica/lang/ja_jp.json index c8713d7ce0..31534f53a3 100644 --- a/src/main/resources/assets/litematica/lang/ja_jp.json +++ b/src/main/resources/assets/litematica/lang/ja_jp.json @@ -485,7 +485,7 @@ "litematica.error.schematic_conversion.structure_to_litematica_failed": "構造を Litematica スキーマティックに変換できませんでした", "litematica.error.schematic.create.no_selections": "有効な選択範囲がありません！", "litematica.error.schematic_load.cant_read_file": "スキーマティックファイル '%s' を読み取れません（存在しないか、アクセス権の問題）", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "スキーマティックファイルが選択されていません！", "litematica.error.schematic_load.no_schematic_version_information": "スキーマティックにはバージョン情報がなく、安全に読み込むことができません！", "litematica.error.schematic_load.unsupported_schematic_version": "サポートされていない、または将来のスキーマティックバージョン '%d'", @@ -663,6 +663,7 @@ "litematica.gui.label.easy_place_protocol.v2": "Version 2", "litematica.gui.label.easy_place_protocol.v3": "Version 3", "litematica.gui.label.data_fixer_mode.always": "Always", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "Below 1.20.5 Only", "litematica.gui.label.data_fixer_mode.below_120X": "Below 1.20.x Only", "litematica.gui.label.data_fixer_mode.below_119X": "Below 1.19.x Only", @@ -718,6 +719,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Sponge Version: §f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "Vanilla Structure", "litematica.gui.label.schematic_info.schema": "Minecraft: §f%s§r [Schema §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "配置を作成", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "新しい配置をすぐに作成し、その配置を選択します", "litematica.gui.label.schematic_placement.enclosing_size": "囲むサイズ: %s", diff --git a/src/main/resources/assets/litematica/lang/ko_kr.json b/src/main/resources/assets/litematica/lang/ko_kr.json index 043b81cbef..c1adc7c5a8 100644 --- a/src/main/resources/assets/litematica/lang/ko_kr.json +++ b/src/main/resources/assets/litematica/lang/ko_kr.json @@ -485,7 +485,7 @@ "litematica.error.schematic_conversion.structure_to_litematica_failed": "구조물을 라이트메티카 스키메틱으로 변환하는 데에 실패했습니다.", "litematica.error.schematic.create.no_selections": "유효한 선택 지역이 없습니다!", "litematica.error.schematic_load.cant_read_file": "스키메틱 파일을 읽을 수 없습니다. '%s' (존재하지 않거나 권한이 없습니다.)", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "선택된 스키메틱 파일이 없습니다!", "litematica.error.schematic_load.no_schematic_version_information": "스키메틱에 버전 정보가 없으므로, 안전하게 불러올 수 없습니다!", "litematica.error.schematic_load.unsupported_schematic_version": "미지원 또는 추후 스키메틱 버전입니다. '%d'", @@ -663,6 +663,7 @@ "litematica.gui.label.easy_place_protocol.v2": "버전 2", "litematica.gui.label.easy_place_protocol.v3": "버전 3", "litematica.gui.label.data_fixer_mode.always": "언제나", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "1.20.5 이하 전용", "litematica.gui.label.data_fixer_mode.below_120X": "1.20.x 이하 전용", "litematica.gui.label.data_fixer_mode.below_119X": "1.19.x 이하 전용", @@ -718,6 +719,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Sponge 버전: §f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "바닐라 구조물", "litematica.gui.label.schematic_info.schema": "마인크래프트: §f%s§r [스키마 §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "배치 생성", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "즉시 새 배치를 생성하고\n해당 배치를 선택합니다.", "litematica.gui.label.schematic_placement.enclosing_size": "인클로징 크기: %s", diff --git a/src/main/resources/assets/litematica/lang/sv_se.json b/src/main/resources/assets/litematica/lang/sv_se.json index e01a9e6804..68b8451720 100644 --- a/src/main/resources/assets/litematica/lang/sv_se.json +++ b/src/main/resources/assets/litematica/lang/sv_se.json @@ -485,7 +485,7 @@ "litematica.error.schematic_conversion.structure_to_litematica_failed": "Det gick inte att konvertera strukturen till en Litematica Schematic", "litematica.error.schematic.create.no_selections": "Inga giltiga urvalsregioner!", "litematica.error.schematic_load.cant_read_file": "Kan inte läsa schemafilen '%s' (finns inte eller behörighetsproblem)", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "Ingen schematisk fil vald!", "litematica.error.schematic_load.no_schematic_version_information": "Schemat har inte versionsinformation och kan inte laddas säkert!", "litematica.error.schematic_load.unsupported_schematic_version": "Stöds inte eller framtida schematisk version '%d'", @@ -663,6 +663,7 @@ "litematica.gui.label.easy_place_protocol.v2": "Version 2", "litematica.gui.label.easy_place_protocol.v3": "Version 3", "litematica.gui.label.data_fixer_mode.always": "Alltid", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "Under 1.20.5 Endast", "litematica.gui.label.data_fixer_mode.below_120X": "Endast under 1.20.x", "litematica.gui.label.data_fixer_mode.below_119X": "Endast under 1.19.x", @@ -718,6 +719,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Sponge Version: §f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "Vanilla Structure", "litematica.gui.label.schematic_info.schema": "Minecraft: §f%s§r [Schema §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "Skapa en placering", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "Skapa omedelbart en ny placering\noch välj den placeringen", "litematica.gui.label.schematic_placement.enclosing_size": "Omslutande storlek: %s", diff --git a/src/main/resources/assets/litematica/lang/uk_ua.json b/src/main/resources/assets/litematica/lang/uk_ua.json index 4b3866bd37..0b53b7fe5a 100644 --- a/src/main/resources/assets/litematica/lang/uk_ua.json +++ b/src/main/resources/assets/litematica/lang/uk_ua.json @@ -485,7 +485,7 @@ "litematica.error.schematic_conversion.structure_to_litematica_failed": "Не вдалося перетворити структуру на схематику Litematica", "litematica.error.schematic.create.no_selections": "Немає дійсних вибраних регіонів!", "litematica.error.schematic_load.cant_read_file": "Неможливо зчитати файл схематики «%s» (не існує або проблема з дозволом)", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "Файл схематики не вибрано!", "litematica.error.schematic_load.no_schematic_version_information": "На схематиці немає інформації про версію, і її неможливо безпечно завантажити!", "litematica.error.schematic_load.unsupported_schematic_version": "Схематика «%d» непітримувана або для новіших версій", @@ -663,6 +663,7 @@ "litematica.gui.label.easy_place_protocol.v2": "Версія 2", "litematica.gui.label.easy_place_protocol.v3": "Версія 3", "litematica.gui.label.data_fixer_mode.always": "Завжди", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "Лише нижче 1.20.5", "litematica.gui.label.data_fixer_mode.below_120X": "Лише нижче 1.20.x", "litematica.gui.label.data_fixer_mode.below_119X": "Лише нижче 1.19.x", @@ -718,6 +719,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Версія Sponge: §f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "Ванілльна структура", "litematica.gui.label.schematic_info.schema": "Minecraft: §f%s§r [Схема §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "Створити розміщення", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "Негайно створиити нове розміщення і виберіть його", "litematica.gui.label.schematic_placement.enclosing_size": "Обмежений розмір: %s", diff --git a/src/main/resources/assets/litematica/lang/zh_cn.json b/src/main/resources/assets/litematica/lang/zh_cn.json index 1423d8a7a0..c2520d91a5 100644 --- a/src/main/resources/assets/litematica/lang/zh_cn.json +++ b/src/main/resources/assets/litematica/lang/zh_cn.json @@ -485,7 +485,7 @@ "litematica.error.schematic_conversion.structure_to_litematica_failed": "无法将结构转换为 Litematica 原理图", "litematica.error.schematic.create.no_selections": "没有选择任何有效的区域！", "litematica.error.schematic_load.cant_read_file": "无法读取原理图文件「%s」（文件不存在或权限问题）", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "未选择原理图文件！", "litematica.error.schematic_load.no_schematic_version_information": "该原理图没有版本信息，无法被安全加载", "litematica.error.schematic_load.unsupported_schematic_version": "不支持的或将来版本的原理图「%d」", @@ -663,6 +663,7 @@ "litematica.gui.label.easy_place_protocol.v2": "模式 2", "litematica.gui.label.easy_place_protocol.v3": "模式 3", "litematica.gui.label.data_fixer_mode.always": "总是", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "仅低于 1.20.5", "litematica.gui.label.data_fixer_mode.below_120X": "仅低于 1.20.x", "litematica.gui.label.data_fixer_mode.below_119X": "仅低于 1.19.x", @@ -718,6 +719,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Sponge 版本：§f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "原版结构", "litematica.gui.label.schematic_info.schema": "我的世界：§f%s§r [数据版本 §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "创建放置", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "立即创建新位置并选择该位置", "litematica.gui.label.schematic_placement.enclosing_size": "框尺寸：%s", diff --git a/src/main/resources/assets/litematica/lang/zh_tw.json b/src/main/resources/assets/litematica/lang/zh_tw.json index 91df2e9039..3eae3d036a 100644 --- a/src/main/resources/assets/litematica/lang/zh_tw.json +++ b/src/main/resources/assets/litematica/lang/zh_tw.json @@ -485,7 +485,7 @@ "litematica.error.schematic_conversion.structure_to_litematica_failed": "無法將結構轉換為 Litematica 原理圖", "litematica.error.schematic.create.no_selections": "沒有選擇任何有效的區域！", "litematica.error.schematic_load.cant_read_file": "無法讀取原理圖檔案「%s」（檔案不存在或權限問題）", - "litematica.error.schematic_load.newer_minecraft_version": "WARNING! Schematic is from a future version of Minecraft: '%d' > '%d'\nAny NBT data may be at risk of corruption.", + "litematica.error.schematic_load.newer_minecraft_version": "Schematic is from a future version of Minecraft: '%d' > '%d'\nSome NBT data may be at risk of corruption.", "litematica.error.schematic_load.no_schematic_selected": "未選擇原理圖檔案！", "litematica.error.schematic_load.no_schematic_version_information": "該原理圖沒有版本資訊，無法被安全載入", "litematica.error.schematic_load.unsupported_schematic_version": "不支援的或將來版本的原理圖「%d」", @@ -663,6 +663,7 @@ "litematica.gui.label.easy_place_protocol.v2": "模式 2", "litematica.gui.label.easy_place_protocol.v3": "模式 3", "litematica.gui.label.data_fixer_mode.always": "總是", + "litematica.gui.label.data_fixer_mode.below_1215": "Below 1.21.5 Only", "litematica.gui.label.data_fixer_mode.below_1205": "僅低於 1.20.5", "litematica.gui.label.data_fixer_mode.below_120X": "僅低於 1.20.x", "litematica.gui.label.data_fixer_mode.below_119X": "僅低於 1.19.x", @@ -718,6 +719,7 @@ "litematica.gui.label.schematic_info.sponge_version": "Sponge 版本：§f%d§r", "litematica.gui.label.schematic_info.vanilla_version": "原版結構", "litematica.gui.label.schematic_info.schema": "我的世界：§f%s§r [資料版本 §f%d§r]", + "litematica.gui.label.schematic_info.schema.newer": "Minecraft: §c%s§r [Schema §c%d§r]", "litematica.gui.label.schematic_load.checkbox.create_placement": "建立放置", "litematica.gui.label.schematic_load.hoverinfo.create_placement": "立即建立新位置並選擇該位置", "litematica.gui.label.schematic_placement.enclosing_size": "框尺寸：%s",