24w09a, port to upstream changes

This commit is contained in:
FlorianMichael 2024-03-11 14:03:46 +01:00
parent 8421b1c862
commit b4b95a2f9e
2 changed files with 4 additions and 12 deletions

View File

@ -8,9 +8,9 @@ maven_version=3.5.0
maven_group=de.florianmichael maven_group=de.florianmichael
# ViaVersion # ViaVersion
viaversion_version=4.10.0-24w07a-SNAPSHOT viaversion_version=4.10.0-24w09a-SNAPSHOT
viabackwards_version=4.10.0-24w07a-SNAPSHOT viabackwards_version=4.10.0-24w09a-SNAPSHOT
viarewind_version=3.0.6-SNAPSHOT viarewind_version=3.0.7-24w09a-SNAPSHOT
vialegacy_version=2.2.22-SNAPSHOT vialegacy_version=2.2.22-SNAPSHOT
viaaprilfools_version=2.0.11-SNAPSHOT viaaprilfools_version=2.0.11-SNAPSHOT
vialoader_version=2.2.13-SNAPSHOT vialoader_version=2.2.13-SNAPSHOT

View File

@ -39,15 +39,7 @@ public class MixinGuiOverlayDebug {
if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) { if (common.getConfig().isShowProtocolVersionInF3() && version != common.getNativeVersion() && !common.getPlatform().isSingleplayer().get()) {
cir.getReturnValue().add(""); cir.getReturnValue().add("");
cir.getReturnValue().add("ViaForge: " + version.toString());
int protocolVersion = version.getVersion();
if (version.olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
// Older versions (<= 1.6.4) are using fake ids in ViaLegacy to prevent version duplications / mismatches
// So we need to unmap the version to get the real protocol version id
protocolVersion = LegacyProtocolVersion.getRealProtocolVersion(protocolVersion);
}
cir.getReturnValue().add("ViaForge: " + version.getName() + " (" + protocolVersion + ")");
} }
} }