Merge remote-tracking branch 'origin/main' into recode/3.0.0

# Conflicts:
#	src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
#	src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java
This commit is contained in:
FlorianMichael 2023-12-07 16:25:18 +01:00
commit febc7538be
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
4 changed files with 6 additions and 5 deletions

View File

@ -15,7 +15,7 @@
ViaFabricPlus is a deep integration of ViaVersion on the Fabric platform, it implements many changes that can't be fixed on protocol level (old animations, old movement/swimming, collisions and general rendering changes).
At the time of writing, VFP is the only protocol translation platform for the client with which you can play on all Minecraft multiplayer versions with many QoL features and get the feel of the old versions.
### Supported Server versions
- Release (1.0.0 - 1.20.3)
- Release (1.0.0 - 1.20.4)
- Beta (b1.0 - b1.8.1)
- Alpha (a1.0.15 - a1.2.6)
- Classic (c0.0.15 - c0.30 including [CPE](https://wiki.vg/Classic_Protocol_Extension))

View File

@ -14,12 +14,12 @@ maven_group=de.florianmichael
archives_base_name=viafabricplus
# ViaVersion Libraries
viaversion_version=4.9.2-SNAPSHOT
viabackwards_version=4.9.1-SNAPSHOT
viaversion_version=4.9.2
viabackwards_version=4.9.1
vialegacy_version=2.2.22-SNAPSHOT
viaaprilfools_version=2.0.11-SNAPSHOT
viabedrock_version=0.0.3-SNAPSHOT
vialoader_version=2.2.12-SNAPSHOT
vialoader_version=2.2.12
# RaphiMC Libraries
minecraftauth_version=3.0.1-SNAPSHOT

View File

@ -35,7 +35,7 @@ public class ResourcePackHeaderDiff {
private final static Map<VersionEnum, GameVersion> GAME_VERSION_DIFF = new HashMap<>();
static {
registerVersion(VersionEnum.r1_20_3, 22, "1.20.3");
registerVersion(VersionEnum.r1_20_3tor1_20_4, 22, "1.20.4");
registerVersion(VersionEnum.r1_20_2, 18, "1.20.2");
registerVersion(VersionEnum.r1_20tor1_20_1, 15, "1.20.1");
registerVersion(VersionEnum.r1_19_4, 13, "1.19.4");

View File

@ -54,6 +54,7 @@ public abstract class MixinProtocolVersion {
viaFabricPlus$remaps.put("1.18/1.18.1", new Pair<>("1.18-1.18.1", null));
viaFabricPlus$remaps.put("1.19.1/2", new Pair<>("1.19.1-1.19.2", null));
viaFabricPlus$remaps.put("1.20/1.20.1", new Pair<>("1.20-1.20.1", null));
viaFabricPlus$remaps.put("1.20.3", new Pair<>("1.20.3-1.20.4", null));
}
@Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;register(ILjava/lang/String;)Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;"))