Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-11-15 10:45:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	gradle.properties
#	src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
#	src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java
#	src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java
This commit is contained in:
FlorianMichael 2023-12-06 22:42:09 +01:00
commit cde4b24cad
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
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). 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. 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 ### Supported Server versions
- Release (1.0.0 - 1.20.3 snapshot) - Release (1.0.0 - 1.20.3)
- Beta (b1.0 - b1.8.1) - Beta (b1.0 - b1.8.1)
- Alpha (a1.0.15 - a1.2.6) - Alpha (a1.0.15 - a1.2.6)
- Classic (c0.0.15 - c0.30 including [CPE](https://wiki.vg/Classic_Protocol_Extension)) - Classic (c0.0.15 - c0.30 including [CPE](https://wiki.vg/Classic_Protocol_Extension))

10
gradle.properties
View File

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

2
src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
View File

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

1
src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java
View File

@ -54,7 +54,6 @@ public abstract class MixinProtocolVersion {
viaFabricPlus$remaps.put("1.18/1.18.1", new Pair<>("1.18-1.18.1", null)); 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.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/1.20.1", new Pair<>("1.20-1.20.1", null));
viaFabricPlus$remaps.put("1.20.3", new Pair<>("1.20.3-rc1", 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;")) @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;"))