From 4a62bb2fbc6785745c63e6becd34ad275ad337bc Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 8 Mar 2023 15:50:03 +0100 Subject: [PATCH] 1.19.4-pre4 --- build.gradle.kts | 2 +- .../viabackwards/api/data/ItemMappings.java | 40 ++----------------- .../data/BackwardsMappings.java | 5 --- .../data/translation-mappings.json | 29 ++++++++++++-- gradle/libs.versions.toml | 2 +- 5 files changed, 30 insertions(+), 48 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 74a015e8..761e808f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { allprojects { group = "com.viaversion" - version = "4.6.0-1.19.4-pre3-SNAPSHOT" + version = "4.6.0-1.19.4-pre4-SNAPSHOT" description = "Allow older clients to join newer server versions." } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/data/ItemMappings.java b/common/src/main/java/com/viaversion/viabackwards/api/data/ItemMappings.java index 83a89d71..3e3a95ec 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/data/ItemMappings.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/data/ItemMappings.java @@ -17,56 +17,22 @@ */ package com.viaversion.viabackwards.api.data; -import com.viaversion.viaversion.api.data.BiMappings; +import com.viaversion.viaversion.api.data.BiMappingsBase; import com.viaversion.viaversion.api.data.Mappings; -public final class ItemMappings implements BiMappings { - - private final Mappings mappings; - private final ItemMappings inverse; +public final class ItemMappings extends BiMappingsBase { private ItemMappings(final Mappings mappings, final Mappings inverse) { - this.mappings = mappings; - this.inverse = new ItemMappings(inverse, this); - } - - private ItemMappings(final Mappings mappings, final ItemMappings inverse) { - this.mappings = mappings; - this.inverse = inverse; + super(mappings, inverse); } public static ItemMappings of(final Mappings mappings, final Mappings inverse) { return new ItemMappings(mappings, inverse); } - @Override - public BiMappings inverse() { - return inverse; - } - - @Override - public int getNewId(final int id) { - return mappings.getNewId(id); - } - @Override public void setNewId(final int id, final int mappedId) { // Only set one-way mappings.setNewId(id, mappedId); } - - @Override - public int size() { - return mappings.size(); - } - - @Override - public int mappedSize() { - return mappings.mappedSize(); - } - - //TODO remove - public Mappings createInverse() { - return null; - } } diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java index 6305e6e0..cd062b93 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java @@ -91,9 +91,4 @@ public class BackwardsMappings extends com.viaversion.viabackwards.api.data.Back public Map getTranslateMappings() { return translateMappings; } - - @Override - protected boolean shouldLoad(final String key) { - return !key.equals("blocks"); - } } diff --git a/common/src/main/resources/assets/viabackwards/data/translation-mappings.json b/common/src/main/resources/assets/viabackwards/data/translation-mappings.json index fcb6155c..155dc071 100644 --- a/common/src/main/resources/assets/viabackwards/data/translation-mappings.json +++ b/common/src/main/resources/assets/viabackwards/data/translation-mappings.json @@ -1,5 +1,7 @@ { "1.19.4": { + "accessibility.onboarding.screen.narrator": "Press enter to enable the narrator", + "accessibility.onboarding.screen.title": "Welcome to Minecraft!\n\nWould you like to enable the Narrator or visit the Accessibility Settings?", "argument.time.tick_count_too_low": "Tick count must not be less than %s, found %s", "biome.minecraft.cherry_grove": "Cherry Grove", "block.minecraft.cherry_button": "Cherry Button", @@ -43,10 +45,18 @@ "container.upgrade.missing_template_tooltip": "Put a Smithing Template here", "controls.keybinds.duplicateKeybinds": "This key is also used for:\n%s", "createWorld.tab.game.title": "Game", - "createWorld.tab.more.title": "More...", + "createWorld.tab.more.title": "More", "createWorld.tab.world.title": "World", + "credits_and_attribution.button.attribution": "Attribution", + "credits_and_attribution.button.credits": "Credits", + "credits_and_attribution.button.licenses": "Licenses", + "credits_and_attribution.screen.title": "Credits and Attribution", "dataPack.bundle.name": "Bundles", "dataPack.update_1_20.name": "Update 1.20", + "datapackFailure.safeMode.failed.title": "Failed to load world in Safe Mode.", + "datapackFailure.safeMode.failed.description": "This world contains invalid or corrupted save data.", + "debug.dump_dynamic_textures": "Saved dynamic textures to %s", + "debug.dump_dynamic_textures.help": "F3 + S = Dump dynamic textures", "effect.duration.infinite": "?", "entity.minecraft.block_display": "Block Display", "entity.minecraft.falling_block_type": "Falling %s", @@ -94,6 +104,9 @@ "item.minecraft.smithing_template.upgrade": "Upgrade: ", "item.minecraft.sniffer_spawn_egg": "Sniffer Spawn Egg", "item.minecraft.torchflower_seeds": "Torchflower Seeds", + "mco.notification.dismiss": "Dismiss", + "mco.notification.visitUrl.message.default": "Please visit the link below", + "mco.notification.visitUrl.buttonText.default": "Open link", "multiplayer.lan.server_found": "New server found: %s", "multiplayer.player.list.narration": "Online players: %s", "multiplayer.status.motd.narration": "Message of the day: %s", @@ -101,7 +114,13 @@ "multiplayer.status.ping.narration": "Ping %s milliseconds", "multiplayer.status.player_count.narration": "%s out of %s players online", "multiplayer.status.version.narration": "Server version: %s", + "narration.tab_navigation.usage": "Press Ctrl and Tab to switch between tabs", + "narrator.position.tab": "Selected tab %s out of %s", "narrator.ready_to_play": "Ready to play", + "options.accessibility.high_contrast": "High Contrast", + "options.accessibility.high_contrast.tooltip": "Enhances the contrast of UI elements", + "options.accessibility.high_contrast.error.tooltip": "High Contrast resource pack is not available", + "options.credits_and_attribution": "Credits & Attribution...", "options.damageTiltStrength": "Damage Tilt", "options.damageTiltStrength.tooltip": "The amount of camera shake caused by being hurt.", "options.difficulty.easy.info": "Hostile mobs spawn but deal less damage. Hunger bar depletes and drains health down to 5 hearts.", @@ -177,13 +196,15 @@ "painting.minecraft.wither.author": "Mojang", "painting.minecraft.wither.title": "Wither", "painting.random": "Random variant", + "resourcePack.high_contrast.name": "High Contrast", "selectWorld.experiments": "Experiments", "selectWorld.experiments.info": "Experiments are potential new features. Be careful as things might break. Experiments can't be turned off after world creation.", - "selectWorld.gameMode.adventure.info": "Same as Survival Mode, but blocks can't be added or removed", + "selectWorld.gameMode.adventure.info": "Same as Survival Mode, but blocks can't be added or removed.", "selectWorld.gameMode.creative.info": "Create, build, and explore without limits. You can fly, have endless materials, and can't be hurt by monsters.", - "selectWorld.gameMode.hardcore.info": "Survival mode locked to 'Hard' difficulty. You can't respawn if you die.", - "selectWorld.gameMode.spectator.info": "You can look but don't touch", + "selectWorld.gameMode.hardcore.info": "Survival Mode locked to 'Hard' difficulty. You can't respawn if you die.", + "selectWorld.gameMode.spectator.info": "You can look but don't touch.", "selectWorld.gameMode.survival.info": "Explore a mysterious world where you build, collect, craft, and fight monsters.", + "selectWorld.targetFolder": "Save folder: %s", "subtitles.block.decorated_pot.shatter": "Pot shatters", "subtitles.entity.sniffer.death": "Sniffer dies", "subtitles.entity.sniffer.digging": "Sniffer digs", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f6ca62f9..d755990d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ metadata.format.version = "1.1" [versions] # ViaVersion -viaver = "4.6.0-1.19.4-pre3-SNAPSHOT" +viaver = "4.6.0-1.19.4-pre4-SNAPSHOT" # Common provided netty = "4.0.20.Final"