Mirror von
https://github.com/ViaVersion/ViaVersion.git
synchronisiert 2024-09-08 22:02:50 +02:00
Merge remote-tracking branch 'origin/master' into dev
Dieser Commit ist enthalten in:
Commit
6cb2837d77
@ -27,8 +27,15 @@ public class TranslateRewriter {
|
||||
return;
|
||||
}
|
||||
|
||||
String value = hoverEvent.getAsJsonPrimitive("value").getAsString();
|
||||
if (AchievementTranslationMapping.get(value) == null) {
|
||||
String textValue;
|
||||
JsonElement value = hoverEvent.get("value");
|
||||
if (value.isJsonObject()) {
|
||||
textValue = value.getAsJsonObject().get("text").getAsString();
|
||||
} else {
|
||||
textValue = value.getAsJsonPrimitive().getAsString();
|
||||
}
|
||||
|
||||
if (AchievementTranslationMapping.get(textValue) == null) {
|
||||
JsonObject invalidText = new JsonObject();
|
||||
invalidText.addProperty("text", "Invalid statistic/achievement!");
|
||||
invalidText.addProperty("color", "red");
|
||||
@ -48,17 +55,17 @@ public class TranslateRewriter {
|
||||
baseArray.add(namePart);
|
||||
baseArray.add(newLine);
|
||||
baseArray.add(typePart);
|
||||
if (value.startsWith("achievement")) {
|
||||
namePart.addProperty("translate", value);
|
||||
namePart.addProperty("color", AchievementTranslationMapping.isSpecial(value) ? "dark_purple" : "green");
|
||||
if (textValue.startsWith("achievement")) {
|
||||
namePart.addProperty("translate", textValue);
|
||||
namePart.addProperty("color", AchievementTranslationMapping.isSpecial(textValue) ? "dark_purple" : "green");
|
||||
typePart.addProperty("translate", "stats.tooltip.type.achievement");
|
||||
JsonObject description = new JsonObject();
|
||||
typePart.addProperty("italic", true);
|
||||
description.addProperty("translate", value + ".desc");
|
||||
baseArray.add(newLine);
|
||||
baseArray.add(description);
|
||||
} else if (value.startsWith("stat")) {
|
||||
namePart.addProperty("translate", value);
|
||||
} else if (textValue.startsWith("stat")) {
|
||||
namePart.addProperty("translate", textValue);
|
||||
namePart.addProperty("color", "gray");
|
||||
typePart.addProperty("translate", "stats.tooltip.type.statistic");
|
||||
typePart.addProperty("italic", true);
|
||||
|
@ -211,6 +211,7 @@ public class EntityPackets {
|
||||
handler(wrapper -> {
|
||||
wrapper.passthrough(Type.VAR_INT);
|
||||
int size = wrapper.passthrough(Type.INT);
|
||||
int actualSize = size;
|
||||
for (int i = 0; i < size; i++) {
|
||||
// Attributes have been renamed and are now namespaced identifiers
|
||||
String key = wrapper.read(Type.STRING);
|
||||
@ -218,7 +219,10 @@ public class EntityPackets {
|
||||
if (attributeIdentifier == null) {
|
||||
attributeIdentifier = "minecraft:" + key;
|
||||
if (!us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.MappingData.isValid1_13Channel(attributeIdentifier)) {
|
||||
Via.getPlatform().getLogger().warning("Invalid attribute: " + key);
|
||||
if (!Via.getConfig().isSuppressConversionWarnings()) {
|
||||
Via.getPlatform().getLogger().warning("Invalid attribute: " + key);
|
||||
}
|
||||
actualSize--;
|
||||
wrapper.read(Type.DOUBLE);
|
||||
int modifierSize = wrapper.read(Type.VAR_INT);
|
||||
for (int j = 0; j < modifierSize; j++) {
|
||||
@ -240,6 +244,9 @@ public class EntityPackets {
|
||||
wrapper.passthrough(Type.BYTE);
|
||||
}
|
||||
}
|
||||
if (size != actualSize) {
|
||||
wrapper.set(Type.INT, 0, actualSize);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren