Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-12-26 17:37:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

1.19.1-rc3

Browse Source
This commit is contained in:
Nassim Jahnke 2022-07-23 13:57:05 +02:00
parent 941bb91be8
commit bb17bb3bfd
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
4 changed files with 102 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -5,7 +5,7 @@ plugins {
allprojects {
group = "com.viaversion"
version = "4.4.0-1.19.1-pre6-SNAPSHOT"
version = "4.4.0-1.19.1-rc3-SNAPSHOT"
description = "Allow older clients to join newer server versions."
}

21
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18_2to1_19_1/Protocol1_18_2To1_19_1.java
View File

@ -232,7 +232,6 @@ public final class Protocol1_18_2To1_19_1 extends BackwardsProtocol<ClientboundP
wrapper.read(Type.LONG); // Timestamp
wrapper.read(Type.LONG); // Salt
wrapper.read(Type.PLAYER_MESSAGE_SIGNATURE_ARRAY); // Last seen
final JsonElement unsignedMessage = wrapper.read(Type.OPTIONAL_COMPONENT);
@ -244,20 +243,24 @@ public final class Protocol1_18_2To1_19_1 extends BackwardsProtocol<ClientboundP
message = GsonComponentSerializer.gson().serializeToTree(Component.text(plainMessage));
}
wrapper.write(Type.COMPONENT, message);
final int filterMaskType = wrapper.read(Type.VAR_INT);
if (filterMaskType == 2) { // Partially filtered
wrapper.read(Type.LONG_ARRAY_PRIMITIVE); // Mask
}
final int chatTypeId = wrapper.read(Type.VAR_INT);
wrapper.write(Type.BYTE, (byte) 1);
wrapper.write(Type.UUID, signature.uuid());
final JsonElement senderName = wrapper.read(Type.COMPONENT);
final JsonElement targetName = wrapper.read(Type.OPTIONAL_COMPONENT);
decoratedMessage = decorateChatMessage(wrapper, chatTypeId, senderName, targetName, message);
if (decoratedMessage == null) {
wrapper.cancel();
} else {
wrapper.set(Type.COMPONENT, 0, decoratedMessage);
return;
}
translatableRewriter.processText(decoratedMessage);
wrapper.write(Type.COMPONENT, decoratedMessage);
wrapper.write(Type.BYTE, (byte) 1);
wrapper.write(Type.UUID, signature.uuid());
});
}
});
@ -265,8 +268,10 @@ public final class Protocol1_18_2To1_19_1 extends BackwardsProtocol<ClientboundP
registerClientbound(ClientboundPackets1_19_1.SYSTEM_CHAT, ClientboundPackets1_18.CHAT_MESSAGE, new PacketRemapper() {
@Override
public void registerMap() {
map(Type.COMPONENT);
handler(wrapper -> {
final JsonElement content = wrapper.passthrough(Type.COMPONENT);
translatableRewriter.processText(content);
final boolean overlay = wrapper.read(Type.BOOLEAN);
wrapper.write(Type.BYTE, overlay ? (byte) 2 : (byte) 0);
});

91
common/src/main/resources/assets/viabackwards/data/translation-mappings.json
View File

@ -1,5 +1,80 @@
{
"1.19.1": {
"gui.acknowledge": "Acknowledge",
"gui.socialInteractions.report": "Report",
"gui.socialInteractions.tooltip.report": "Report player",
"gui.socialInteractions.tooltip.report.disabled": "Cannot create report: reporting service unavailable",
"gui.socialInteractions.tooltip.report.no_messages": "Cannot create report: no recent messages from player %s",
"gui.socialInteractions.narration.hide": "Hide messages from %s",
"gui.socialInteractions.narration.show": "Show messages from %s",
"gui.socialInteractions.narration.report": "Report player %s",
"gui.chatReport.title": "Report Player",
"gui.chatReport.send": "Send Report",
"gui.chatReport.send.comments_too_long": "Please shorten the comment",
"gui.chatReport.send.no_reason": "Please select a report category",
"gui.chatReport.send.no_reported_messages": "Please select at least one chat message to report",
"gui.chatReport.send.too_many_messages": "Trying to include too many messages in the report",
"gui.chatReport.observed_what": "Why are you reporting this?",
"gui.chatReport.select_reason": "Select Report Category",
"gui.chatReport.more_comments": "Please describe what happened:",
"gui.chatReport.describe": "Sharing details will help us make a well-informed decision.",
"gui.chatReport.comments": "Comments edit box",
"gui.chatReport.read_info": "Learn About Reporting",
"gui.chatReport.select_chat": "Select Chat Messages to Report",
"gui.chatReport.selected_chat": "%s Chat Message(s) Selected to Report",
"gui.chatReport.report_sent_msg": "We<57>ve successfully received your report. Thank you!\n\nOur team will review it as soon as possible.",
"gui.chatReport.discard.title": "Discard report and comments?",
"gui.chatReport.discard.content": "If you leave, you'll lose this report and your comments.\nAre you sure you want to leave?",
"gui.chatReport.discard.discard": "Leave and Discard Report",
"gui.chatReport.discard.return": "Continue Editing",
"gui.abuseReport.reason.title": "Select Report Category",
"gui.abuseReport.reason.description": "Description:",
"gui.abuseReport.reason.narration": "%s: %s",
"gui.abuseReport.reason.false_reporting": "False Reporting",
"gui.abuseReport.reason.child_sexual_exploitation_or_abuse": "Child sexual exploitation or abuse",
"gui.abuseReport.reason.child_sexual_exploitation_or_abuse.description": "Someone is talking about or otherwise promoting indecent behavior involving children.",
"gui.abuseReport.reason.terrorism_or_violent_extremism": "Terrorism or violent extremism",
"gui.abuseReport.reason.terrorism_or_violent_extremism.description": "Someone is talking about, promoting, or threatening to commit acts of terrorism or violent extremism for political, religious, ideological, or other reasons.",
"gui.abuseReport.reason.hate_speech": "Hate speech",
"gui.abuseReport.reason.hate_speech.description": "Someone is attacking you or another player based on characteristics of their identity, like religion, race, or sexuality.",
"gui.abuseReport.reason.harassment_or_bullying": "Harassment or bullying",
"gui.abuseReport.reason.harassment_or_bullying.description": "Someone is shaming, attacking, or bullying you or someone else. This includes when someone is repeatedly trying to contact you or someone else without consent or posting private personal information about you or someone else without consent (\"doxing\").",
"gui.abuseReport.reason.imminent_harm": "Imminent harm - Threat to harm others",
"gui.abuseReport.reason.imminent_harm.description": "Someone is threatening to harm you or someone else in real life.",
"gui.abuseReport.reason.defamation_impersonation_false_information": "Defamation, impersonation, or false information",
"gui.abuseReport.reason.defamation_impersonation_false_information.description": "Someone is damaging someone else's reputation, pretending to be someone they're not, or sharing false information with the aim to exploit or mislead others.",
"gui.abuseReport.reason.self_harm_or_suicide": "Imminent harm - Self-harm or suicide",
"gui.abuseReport.reason.self_harm_or_suicide.description": "Someone is threatening to harm themselves in real life or talking about harming themselves in real life.",
"gui.abuseReport.reason.alcohol_tobacco_drugs": "Drugs or alcohol",
"gui.abuseReport.reason.alcohol_tobacco_drugs.description": "Someone is encouraging others to partake in illegal drug related activities or encouraging underage drinking.",
"gui.abuseReport.reason.non_consensual_intimate_imagery": "Non-consensual intimate imagery",
"gui.abuseReport.reason.non_consensual_intimate_imagery.description": "Someone is talking about, sharing, or otherwise promoting private and intimate images.",
"gui.abuseReport.sending.title": "Sending your report...",
"gui.abuseReport.sent.title": "Report sent",
"gui.abuseReport.error.title": "Problem sending your report",
"gui.abuseReport.send.generic_error": "Encountered an unexpected error while sending your report.",
"gui.abuseReport.send.error_message": "An error was returned while sending your report:\n'%s'",
"gui.abuseReport.send.service_unavailable": "Unable to reach the Abuse Reporting service. Please make sure you are connected to the internet and try again.",
"gui.abuseReport.send.http_error": "An unexpected HTTP error occurred while sending your report.",
"gui.abuseReport.send.json_error": "Encountered malformed payload while sending your report.",
"gui.chatSelection.title": "Select Chat Messages to Report",
"gui.chatSelection.context": "Messages surrounding this selection will be included to provide additional context",
"gui.chatSelection.selected": "%s/%s message(s) selected",
"gui.chatSelection.heading": "%s %s",
"gui.chatSelection.message.narrate": "%s said: %s at %s",
"gui.chatSelection.fold": "%s unrelated messages hidden",
"gui.multiLineEditBox.character_limit": "%s/%s",
"gui.banned.title.temporary": "Account temporarily suspended",
"gui.banned.title.permanent": "Account permanently banned",
"gui.banned.description": "%s\n\n%s\n\nLearn more at the following link: %s",
"gui.banned.description.reason": "We recently received a report for bad behavior by your account. Our moderators have now reviewed your case and identified it as %s, which goes against the Minecraft Community Standards.",
"gui.banned.description.reason_id": "Code: %s",
"gui.banned.description.reason_id_message": "Code: %s - %s",
"gui.banned.description.unknownreason": "We recently received a report for bad behavior by your account. Our moderators have now reviewed your case and identified that it goes against the Minecraft Community Standards.",
"gui.banned.description.temporary.duration": "Your account is temporarily suspended and will be reactivated in %s.",
"gui.banned.description.temporary": "%s Until then, you can<61>t play online or join Realms.",
"gui.banned.description.permanent": "Your account is permanently banned, which means you can<61>t play online or join Realms.",
"menu.playerReporting": "Player Reporting",
"selectWorld.loading_list": "Loading world list",
"flat_world_preset.unknown": "???",
"flat_world_preset.minecraft.classic_flat": "Classic Flat",
@ -23,21 +98,29 @@
"multiplayer.disconnect.invalid_public_key": "Unable to parse profile public key.",
"multiplayer.disconnect.out_of_order_chat": "Out-of-order chat packet received. Did your system time change?",
"multiplayer.disconnect.unsigned_chat": "Received chat packet with missing or invalid signature.",
"multiplayer.disconnect.too_many_pending_chats": "Too many unacknowledged chat messages",
"multiplayer.disconnect.chat_validation_failed": "Chat message validation failure",
"multiplayer.unsecureserver.toast.title": "Chat messages can't be verified",
"multiplayer.unsecureserver.toast": "Messages sent on this server may be modified and might not reflect the original message",
"chatPreview.warning.title": "This server uses Chat Preview",
"chatPreview.warning.content": "Chat Preview allows the server to see your messages in real time as you type them, even before they’re sent. This is often used to preview your message with styling applied.\n\nChat Preview is on by default, but can be turned off in Chat Settings.",
"chatPreview.warning.content": "Chat Preview allows the server to see your messages before they are sent to other players. This allows a server to send you a preview of your chat messages with custom modifications and styling applied.\n\nThe Chat Preview behavior can be changed in your Chat Settings. Current setting is: [%s]",
"chatPreview.warning.check": "Do not notify again for this server",
"chatPreview.warning.toast.title": "Chat Preview is enabled",
"chatPreview.warning.toast": "This server uses Chat Preview and can see your messages as you type them, even before they're sent. You can turn this off in Chat Settings.",
"chat.disabled.profile.moreInfo": "Chat not allowed by account settings. Cannot send or view messages.",
"chat.preview": "Type to preview",
"chat.tag.not_secure": "This message is not secure",
"chat.previewInput": "Press [%s] to preview",
"chat.tag.not_secure": "This message is not secure, which means that it might have been modified by the server",
"chat.tag.modified": "This message has been modified by the server.",
"chat.tag.modified.original": "Original text: %s",
"disconnect.loginFailedInfo.userBanned": "You are banned from playing online",
"options.darknessEffectScale": "Darkness Pulsing",
"options.darknessEffectScale.tooltip": "Controls how much the Darkness effect pulses when a Warden or Sculk Shrieker gives it to you.",
"options.chatPreview": "Chat Preview",
"options.chatPreview.tooltip": "Chat Preview allows servers to see your messages as you type, which allows them to style your message. You can still chat if you turn this off.",
"options.chatPreview.live": "While Typing",
"options.chatPreview.confirm": "When Sending",
"options.chatPreview.tooltip.off": "Any modifications applied to your chat messages by a server will not be previewed and will be treated as insecure.",
"options.chatPreview.tooltip.live": "If a server uses Chat Previews: Any modifications applied to your chat messages by a server will be dynamically sent for previewing as the chat message is typed.",
"options.chatPreview.tooltip.confirm": "If a server uses Chat Previews: A chat preview is only generated when attempting to send a message that does not have a preview or is waiting for a preview.\nSending the message requires confirmation.",
"options.onlyShowSecureChat": "Only Show Secure Chat",
"options.onlyShowSecureChat.tooltip": "Only display messages from other players that can be verified to have been sent by that player, and have not been modified.",
"options.directionalAudio": "Directional Audio",

2
gradle/libs.versions.toml
View File

@ -3,7 +3,7 @@ metadata.format.version = "1.1"
[versions]
# ViaVersion
viaver = "4.4.0-1.19.1-pre6-SNAPSHOT"
viaver = "4.4.0-1.19.1-rc3-SNAPSHOT"
# Common provided
netty = "4.0.20.Final"