Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-25 19:45:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix 1.11->1.12 show_achievement rewriter (#3792)

Browse Source
This commit is contained in:
RK_01 2024-04-18 20:45:19 +02:00 committed by GitHub
parent a99273db2e
commit bfde4b953c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/TranslateRewriter.java
View File

@ -24,6 +24,7 @@ import com.viaversion.viaversion.api.Via;
import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.data.AchievementTranslationMapping; import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.data.AchievementTranslationMapping;
import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3; import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
import com.viaversion.viaversion.rewriter.ComponentRewriter; import com.viaversion.viaversion.rewriter.ComponentRewriter;
import com.viaversion.viaversion.util.SerializerVersion;
import java.util.logging.Level; import java.util.logging.Level;
public class TranslateRewriter { public class TranslateRewriter {
@ -45,13 +46,7 @@ public class TranslateRewriter {
return; return;
} }
String textValue; String textValue = SerializerVersion.V1_9.toComponent(hoverEvent.get("value")).asUnformattedString();
JsonElement value = hoverEvent.get("value");
if (value.isJsonObject()) {
textValue = value.getAsJsonObject().get("text").getAsString();
} else {
textValue = value.getAsJsonPrimitive().getAsString();
}
if (AchievementTranslationMapping.get(textValue) == null) { if (AchievementTranslationMapping.get(textValue) == null) {
JsonObject invalidText = new JsonObject(); JsonObject invalidText = new JsonObject();
@ -79,7 +74,7 @@ public class TranslateRewriter {
typePart.addProperty("translate", "stats.tooltip.type.achievement"); typePart.addProperty("translate", "stats.tooltip.type.achievement");
JsonObject description = new JsonObject(); JsonObject description = new JsonObject();
typePart.addProperty("italic", true); typePart.addProperty("italic", true);
description.addProperty("translate", value + ".desc"); description.addProperty("translate", textValue + ".desc");
baseArray.add(newLine); baseArray.add(newLine);
baseArray.add(description); baseArray.add(description);
} else if (textValue.startsWith("stat")) { } else if (textValue.startsWith("stat")) {
@ -91,7 +86,9 @@ public class TranslateRewriter {
hoverEvent.addProperty("action", "show_text"); hoverEvent.addProperty("action", "show_text");
hoverEvent.add("value", baseArray); hoverEvent.add("value", baseArray);
} catch (Exception e) { } catch (Exception e) {
Via.getPlatform().getLogger().log(Level.WARNING, "Error rewriting show_achievement: " + hoverEvent, e); if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
Via.getPlatform().getLogger().log(Level.WARNING, "Error rewriting show_achievement: " + hoverEvent, e);
}
JsonObject invalidText = new JsonObject(); JsonObject invalidText = new JsonObject();
invalidText.addProperty("text", "Invalid statistic/achievement!"); invalidText.addProperty("text", "Invalid statistic/achievement!");
invalidText.addProperty("color", "red"); invalidText.addProperty("color", "red");