mirror of
https://github.com/ViaVersion/ViaBackwards.git
synced 2024-11-22 12:16:21 +01:00
Add 1.20.3 translations, fix unlit bulb mappings
This commit is contained in:
Nassim Jahnke
parent
59fc7f6a1a
commit
71f08b9e4e
@ -20,6 +20,7 @@ package com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3;
|
|||||||
import com.viaversion.viabackwards.api.BackwardsProtocol;
|
import com.viaversion.viabackwards.api.BackwardsProtocol;
|
||||||
import com.viaversion.viabackwards.api.data.BackwardsMappings;
|
import com.viaversion.viabackwards.api.data.BackwardsMappings;
|
||||||
import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
|
import com.viaversion.viabackwards.api.rewriters.SoundRewriter;
|
||||||
|
import com.viaversion.viabackwards.api.rewriters.TranslatableRewriter;
|
||||||
import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.rewriter.BlockItemPacketRewriter1_20_3;
|
import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.rewriter.BlockItemPacketRewriter1_20_3;
|
||||||
import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.rewriter.EntityPacketRewriter1_20_3;
|
import com.viaversion.viabackwards.protocol.protocol1_20_2to1_20_3.rewriter.EntityPacketRewriter1_20_3;
|
||||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||||
@ -40,6 +41,7 @@ import com.viaversion.viaversion.protocols.protocol1_20_2to1_20.packet.Serverbou
|
|||||||
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.Protocol1_20_3To1_20_2;
|
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.Protocol1_20_3To1_20_2;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3;
|
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ClientboundPackets1_20_3;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPackets1_20_3;
|
import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.ServerboundPackets1_20_3;
|
||||||
|
import com.viaversion.viaversion.rewriter.ComponentRewriter.ReadType;
|
||||||
import java.util.BitSet;
|
import java.util.BitSet;
|
||||||
|
|
||||||
public final class Protocol1_20_2To1_20_3 extends BackwardsProtocol<ClientboundPackets1_20_3, ClientboundPackets1_20_2, ServerboundPackets1_20_3, ServerboundPackets1_20_2> {
|
public final class Protocol1_20_2To1_20_3 extends BackwardsProtocol<ClientboundPackets1_20_3, ClientboundPackets1_20_2, ServerboundPackets1_20_3, ServerboundPackets1_20_2> {
|
||||||
@ -47,6 +49,7 @@ public final class Protocol1_20_2To1_20_3 extends BackwardsProtocol<ClientboundP
|
|||||||
public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.20.3", "1.20.2", Protocol1_20_3To1_20_2.class);
|
public static final BackwardsMappings MAPPINGS = new BackwardsMappings("1.20.3", "1.20.2", Protocol1_20_3To1_20_2.class);
|
||||||
private final EntityPacketRewriter1_20_3 entityRewriter = new EntityPacketRewriter1_20_3(this);
|
private final EntityPacketRewriter1_20_3 entityRewriter = new EntityPacketRewriter1_20_3(this);
|
||||||
private final BlockItemPacketRewriter1_20_3 itemRewriter = new BlockItemPacketRewriter1_20_3(this);
|
private final BlockItemPacketRewriter1_20_3 itemRewriter = new BlockItemPacketRewriter1_20_3(this);
|
||||||
|
private final TranslatableRewriter<ClientboundPackets1_20_3> translatableRewriter = new TranslatableRewriter<>(this, ReadType.NBT);
|
||||||
|
|
||||||
public Protocol1_20_2To1_20_3() {
|
public Protocol1_20_2To1_20_3() {
|
||||||
super(ClientboundPackets1_20_3.class, ClientboundPackets1_20_2.class, ServerboundPackets1_20_3.class, ServerboundPackets1_20_2.class);
|
super(ClientboundPackets1_20_3.class, ClientboundPackets1_20_2.class, ServerboundPackets1_20_3.class, ServerboundPackets1_20_2.class);
|
||||||
@ -273,6 +276,7 @@ public final class Protocol1_20_2To1_20_3 extends BackwardsProtocol<ClientboundP
|
|||||||
|
|
||||||
private void convertComponent(final PacketWrapper wrapper) throws Exception {
|
private void convertComponent(final PacketWrapper wrapper) throws Exception {
|
||||||
final Tag tag = wrapper.read(Type.TAG);
|
final Tag tag = wrapper.read(Type.TAG);
|
||||||
|
translatableRewriter.processTag(tag);
|
||||||
wrapper.write(Type.COMPONENT, Protocol1_20_3To1_20_2.tagComponentToJson(tag));
|
wrapper.write(Type.COMPONENT, Protocol1_20_3To1_20_2.tagComponentToJson(tag));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -310,4 +314,9 @@ public final class Protocol1_20_2To1_20_3 extends BackwardsProtocol<ClientboundP
|
|||||||
public EntityPacketRewriter1_20_3 getEntityRewriter() {
|
public EntityPacketRewriter1_20_3 getEntityRewriter() {
|
||||||
return entityRewriter;
|
return entityRewriter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TranslatableRewriter<ClientboundPackets1_20_3> getTranslatableRewriter() {
|
||||||
|
return translatableRewriter;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Binary file not shown.
@ -1,4 +1,155 @@
|
|||||||
{
|
{
|
||||||
|
"1.20.3": {
|
||||||
|
"block.minecraft.chiseled_copper": "Chiseled Copper",
|
||||||
|
"block.minecraft.chiseled_tuff": "Chiseled Tuff",
|
||||||
|
"block.minecraft.chiseled_tuff_bricks": "Chiseled Tuff Bricks",
|
||||||
|
"block.minecraft.copper_bulb": "Copper Bulb",
|
||||||
|
"block.minecraft.copper_door": "Copper Door",
|
||||||
|
"block.minecraft.copper_grate": "Copper Grate",
|
||||||
|
"block.minecraft.copper_trapdoor": "Copper Trapdoor",
|
||||||
|
"block.minecraft.crafter": "Crafter",
|
||||||
|
"block.minecraft.exposed_chiseled_copper": "Exposed Chiseled Copper",
|
||||||
|
"block.minecraft.exposed_copper_bulb": "Exposed Copper Bulb",
|
||||||
|
"block.minecraft.exposed_copper_door": "Exposed Copper Door",
|
||||||
|
"block.minecraft.exposed_copper_grate": "Exposed Copper Grate",
|
||||||
|
"block.minecraft.exposed_copper_trapdoor": "Exposed Copper Trapdoor",
|
||||||
|
"block.minecraft.oxidized_chiseled_copper": "Oxidized Chiseled Copper",
|
||||||
|
"block.minecraft.oxidized_copper_bulb": "Oxidized Copper Bulb",
|
||||||
|
"block.minecraft.oxidized_copper_door": "Oxidized Copper Door",
|
||||||
|
"block.minecraft.oxidized_copper_grate": "Oxidized Copper Grate",
|
||||||
|
"block.minecraft.oxidized_copper_trapdoor": "Oxidized Copper Trapdoor",
|
||||||
|
"block.minecraft.polished_tuff": "Polished Tuff",
|
||||||
|
"block.minecraft.polished_tuff_slab": "Polished Tuff Slab",
|
||||||
|
"block.minecraft.polished_tuff_stairs": "Polished Tuff Stairs",
|
||||||
|
"block.minecraft.polished_tuff_wall": "Polished Tuff Wall",
|
||||||
|
"block.minecraft.tuff_brick_slab": "Tuff Brick Slab",
|
||||||
|
"block.minecraft.tuff_brick_stairs": "Tuff Brick Stairs",
|
||||||
|
"block.minecraft.tuff_brick_wall": "Tuff Brick Wall",
|
||||||
|
"block.minecraft.tuff_bricks": "Tuff Bricks",
|
||||||
|
"block.minecraft.tuff_slab": "Tuff Slab",
|
||||||
|
"block.minecraft.tuff_stairs": "Tuff Stairs",
|
||||||
|
"block.minecraft.tuff_wall": "Tuff Wall",
|
||||||
|
"block.minecraft.waxed_chiseled_copper": "Waxed Chiseled Copper",
|
||||||
|
"block.minecraft.waxed_copper_bulb": "Waxed Copper Bulb",
|
||||||
|
"block.minecraft.waxed_copper_door": "Waxed Copper Door",
|
||||||
|
"block.minecraft.waxed_copper_grate": "Waxed Copper Grate",
|
||||||
|
"block.minecraft.waxed_copper_trapdoor": "Waxed Copper Trapdoor",
|
||||||
|
"block.minecraft.waxed_exposed_chiseled_copper": "Waxed Exposed Chiseled Copper",
|
||||||
|
"block.minecraft.waxed_exposed_copper_bulb": "Waxed Exposed Copper Bulb",
|
||||||
|
"block.minecraft.waxed_exposed_copper_door": "Waxed Exposed Copper Door",
|
||||||
|
"block.minecraft.waxed_exposed_copper_grate": "Waxed Exposed Copper Grate",
|
||||||
|
"block.minecraft.waxed_exposed_copper_trapdoor": "Waxed Exposed Copper Trapdoor",
|
||||||
|
"block.minecraft.waxed_oxidized_chiseled_copper": "Waxed Oxidized Chiseled Copper",
|
||||||
|
"block.minecraft.waxed_oxidized_copper_bulb": "Waxed Oxidized Copper Bulb",
|
||||||
|
"block.minecraft.waxed_oxidized_copper_door": "Waxed Oxidized Copper Door",
|
||||||
|
"block.minecraft.waxed_oxidized_copper_grate": "Waxed Oxidized Copper Grate",
|
||||||
|
"block.minecraft.waxed_oxidized_copper_trapdoor": "Waxed Oxidized Copper Trapdoor",
|
||||||
|
"block.minecraft.waxed_weathered_chiseled_copper": "Waxed Weathered Chiseled Copper",
|
||||||
|
"block.minecraft.waxed_weathered_copper_bulb": "Waxed Weathered Copper Bulb",
|
||||||
|
"block.minecraft.waxed_weathered_copper_door": "Waxed Weathered Copper Door",
|
||||||
|
"block.minecraft.waxed_weathered_copper_grate": "Waxed Weathered Copper Grate",
|
||||||
|
"block.minecraft.waxed_weathered_copper_trapdoor": "Waxed Weathered Copper Trapdoor",
|
||||||
|
"block.minecraft.weathered_chiseled_copper": "Weathered Chiseled Copper",
|
||||||
|
"block.minecraft.weathered_copper_bulb": "Weathered Copper Bulb",
|
||||||
|
"block.minecraft.weathered_copper_door": "Weathered Copper Door",
|
||||||
|
"block.minecraft.weathered_copper_grate": "Weathered Copper Grate",
|
||||||
|
"block.minecraft.weathered_copper_trapdoor": "Weathered Copper Trapdoor",
|
||||||
|
"command.forkLimit": "Maximum number of contexts (%s) reached",
|
||||||
|
"commands.execute.function.instantiationFailure": "Failed to instantiate function %s: %s",
|
||||||
|
"commands.function.instantiationFailure": "Failed to instantiate function %s: %s",
|
||||||
|
"commands.function.result": "Function %s returned %s",
|
||||||
|
"commands.function.scheduled.multiple": "Running functions %s",
|
||||||
|
"commands.function.scheduled.no_functions": "Can't find any functions for name %s",
|
||||||
|
"commands.function.scheduled.single": "Running function %s",
|
||||||
|
"commands.kick.owner.failed": "Cannot kick server owner in LAN game",
|
||||||
|
"commands.tick.query.percentiles": "Percentiles: P50: %sms P95: %sms P99: %sms, sample: %s",
|
||||||
|
"commands.tick.query.rate.running": "Target tick rate: %s per second.\nAverage time per tick: %sms (Target: %sms)",
|
||||||
|
"commands.tick.query.rate.sprinting": "Target tick rate: %s per second (ingored, reference only).\nAverage time per tick: %sms",
|
||||||
|
"commands.tick.rate.success": "Set the target tick rate to %s per second",
|
||||||
|
"commands.tick.sprint.report": "Sprint completed with %s ticks per second, or %s ms per tick",
|
||||||
|
"commands.tick.sprint.stop.fail": "No tick sprint in progress",
|
||||||
|
"commands.tick.sprint.stop.success": "A tick sprint interrupted",
|
||||||
|
"commands.tick.status.frozen": "The game is frozen",
|
||||||
|
"commands.tick.status.running": "The game runs normally",
|
||||||
|
"commands.tick.status.sprinting": "The game is sprinting",
|
||||||
|
"commands.tick.step.fail": "Unable to step the game - the game must be frozen first",
|
||||||
|
"commands.tick.step.stop.fail": "No tick step in progress",
|
||||||
|
"commands.tick.step.stop.success": "A tick step interrupted",
|
||||||
|
"commands.tick.step.success": "Stepping %s tick(s)",
|
||||||
|
"container.crafter": "Crafter",
|
||||||
|
"dataPack.update_1_21.description": "New features and content for Minecraft 1.21",
|
||||||
|
"dataPack.update_1_21.name": "Update 1.21",
|
||||||
|
"gamerule.maxCommandForkCount": "Command context limit",
|
||||||
|
"gamerule.maxCommandForkCount.description": "Maximum number of contexts that can be used by commands like 'execute as'.",
|
||||||
|
"gamerule.playersNetherPortalCreativeDelay": "Player's Nether portal delay in creative mode",
|
||||||
|
"gamerule.playersNetherPortalCreativeDelay.description": "Time (in ticks) that a creative mode player needs to stand in a Nether portal before changing dimensions.",
|
||||||
|
"gamerule.playersNetherPortalDefaultDelay": "Player's Nether portal delay in non-creative mode",
|
||||||
|
"gamerule.playersNetherPortalDefaultDelay.description": "Time (in ticks) that a non-creative mode player needs to stand in a Nether portal before changing dimensions.",
|
||||||
|
"gamerule.projectilesCanBreakBlocks": "Projectiles can break blocks",
|
||||||
|
"gamerule.projectilesCanBreakBlocks.description": "Controls whether impact projectiles will destroy blocks that are destructible by them.",
|
||||||
|
"gui.loadingMinecraft": "Loading Minecraft",
|
||||||
|
"gui.togglable_slot": "Click to disable slot",
|
||||||
|
"jigsaw_block.placement_priority": "Placement Priority:",
|
||||||
|
"jigsaw_block.placement_priority.tooltip": "When this Jigsaw block connects to a piece, this is the order in which that piece is processed for connections in the wider structure.\n\nPieces will be processed in descending priority with insertion order breaking ties.",
|
||||||
|
"jigsaw_block.selection_priority": "Selection Priority:",
|
||||||
|
"jigsaw_block.selection_priority.tooltip": "When the parent piece is being processed for connections, this is the order in which this Jigsaw block attempts to connect to its target piece.\n\nJigsaws will be processed in descending priority with random ordering breaking ties.",
|
||||||
|
"mco.account.privacy.info.button": "Read more about GDPR",
|
||||||
|
"mco.account.privacy.information": "Mojang implements certain procedures to help protect children and their privacy including complying with the Children’s Online Privacy Protection Act (COPPA) and General Data Protection Regulation (GDPR).\n\nYou may need to obtain parental consent before accessing your Realms account.",
|
||||||
|
"mco.compatibility.downgrade": "Downgrade",
|
||||||
|
"mco.compatibility.downgrade.description": "This world was last played in version %s; you are on version %s. Downgrading a world could cause corruption - we cannot guarantee that it will load or work.\n\nA backup of your world will be saved under \"World backups\". Please restore your world if needed.",
|
||||||
|
"mco.compatibility.unverifiable.message": "The version this world was last played in could not be verified. If the world gets upgraded or downgraded, a backup will be automatically created and saved under \"World backups\".",
|
||||||
|
"mco.compatibility.unverifiable.title": "Compatibility not verifiable",
|
||||||
|
"mco.compatibility.upgrade": "Upgrade",
|
||||||
|
"mco.compatibility.upgrade.description": "This world was last played in version %s; you are on version %s.\n\nA backup of your world will be saved under \"World backups\". Please restore your world if needed.",
|
||||||
|
"mco.compatibility.upgrade.title": "Do you really want to upgrade your world?",
|
||||||
|
"mco.selectServer.minigameName": "Minigame: %s",
|
||||||
|
"mco.snapshot.createSnapshotPopup.text": "You are about to create a free Snapshot Realm that will be paired with your paid Realms subscription. This new Snapshot Realm will be accessible for as long as the paid subscription is active. Your paid Realm will not be affected.",
|
||||||
|
"mco.snapshot.createSnapshotPopup.title": "Create Snapshot Realm?",
|
||||||
|
"mco.snapshot.creating": "Creating Snapshot Realm...",
|
||||||
|
"mco.snapshot.description": "Paired with \"%s\"",
|
||||||
|
"mco.snapshot.friendsRealm.downgrade": "You need to be on version %s to join this Realm",
|
||||||
|
"mco.snapshot.friendsRealm.upgrade": "%s needs to upgrade their Realm before you can play from this version",
|
||||||
|
"mco.snapshot.paired": "This Snapshot Realm is paired with \"%s\"",
|
||||||
|
"mco.snapshot.parent.tooltip": "Use the latest release of Minecraft to play on this Realm",
|
||||||
|
"mco.snapshot.start": "Start free Snapshot Realm",
|
||||||
|
"mco.snapshot.subscription.info": "This is a Snapshot Realm that is paired to the subscription of your Realm '%s'. It will stay active for as long as its paired Realm is.",
|
||||||
|
"mco.snapshot.tooltip": "Use Snapshot Realms to get a sneak peek at upcoming versions of Minecraft, which might include new features and other changes.\n\nYou can find your normal Realms in the release version of the game.",
|
||||||
|
"mco.snapshotRealmsPopup.message": "Realms are now available in Snapshots starting with Snapshot 23w41a. Every Realms subscription comes with a free Snapshot Realm that is separate from your normal Java Realm!",
|
||||||
|
"mco.snapshotRealmsPopup.title": "Realms now available in Snapshots",
|
||||||
|
"mco.snapshotRealmsPopup.urlText": "Learn More",
|
||||||
|
"mco.version": "Version: %s",
|
||||||
|
"options.hideSplashTexts": "Hide Splash Texts",
|
||||||
|
"options.hideSplashTexts.tooltip": "Hides the yellow splash text in the main menu.",
|
||||||
|
"recover_world.bug_tracker": "Report a Bug",
|
||||||
|
"recover_world.button": "Attempt to Recover",
|
||||||
|
"recover_world.done.failed": "Failed to recover from previous state.",
|
||||||
|
"recover_world.done.success": "Recovery was successful!",
|
||||||
|
"recover_world.done.title": "Recovery done",
|
||||||
|
"recover_world.issue.missing_file": "Missing file",
|
||||||
|
"recover_world.issue.none": "No issues",
|
||||||
|
"recover_world.message": "The following issues occurred while trying to read world folder \"%s\".\nIt might be possible to restore the world from an older state or you can report this issue on the bug tracker.",
|
||||||
|
"recover_world.no_fallback": "No state to recover from available",
|
||||||
|
"recover_world.restore": "Attempt to Restore",
|
||||||
|
"recover_world.restoring": "Attempting to restore world...",
|
||||||
|
"recover_world.state_entry": "State from %s: ",
|
||||||
|
"recover_world.state_entry.unknown": "unknown",
|
||||||
|
"recover_world.title": "Failed to load world",
|
||||||
|
"recover_world.warning": "Failed to load world summary",
|
||||||
|
"selectWorld.incompatible.description": "This world cannot be opened in this version.\nIt was last played in version %s.",
|
||||||
|
"selectWorld.incompatible.info": "Incompatible version: %s",
|
||||||
|
"selectWorld.incompatible.title": "Incompatible version",
|
||||||
|
"selectWorld.incompatible.tooltip": "This world cannot be opened because it was created by an incompatible version.",
|
||||||
|
"selectWorld.resource_load": "Preparing Resources...",
|
||||||
|
"subtitles.block.crafter.craft": "Crafter crafts",
|
||||||
|
"subtitles.block.crafter.fail": "Crafter fails crafting",
|
||||||
|
"subtitles.block.decorated_pot.insert": "Decorated Pot fills",
|
||||||
|
"subtitles.block.decorated_pot.insert_fail": "Decorated Pot wobbles",
|
||||||
|
"subtitles.block.hanging_sign.waxed_interact_fail": "Sign wobbles",
|
||||||
|
"subtitles.entity.player.teleport": "Player teleports",
|
||||||
|
"symlink_warning.more_info": "More Information",
|
||||||
|
"telemetry_info.opt_in.description": "I consent to sending optional telemetry data",
|
||||||
|
"telemetry.event.optional.disabled": "%s (Optional) - Disabled"
|
||||||
|
},
|
||||||
"1.20": {
|
"1.20": {
|
||||||
"advancements.adventure.craft_decorated_pot_using_only_sherds.description": "Make a Decorated Pot out of 4 Pottery Sherds",
|
"advancements.adventure.craft_decorated_pot_using_only_sherds.description": "Make a Decorated Pot out of 4 Pottery Sherds",
|
||||||
"advancements.adventure.craft_decorated_pot_using_only_sherds.title": "Careful Restoration",
|
"advancements.adventure.craft_decorated_pot_using_only_sherds.title": "Careful Restoration",
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user