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

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

Browse Source 
# Conflicts:
#	src/main/java/de/florianmichael/viafabricplus/fixes/data/PackVersionDiff.java
#	src/main/java/de/florianmichael/viafabricplus/injection/mixin/viaversion/MixinProtocolVersion.java
This commit is contained in:
FlorianMichael 2023-11-27 17:32:37 +01:00
commit 9e6a945a40
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -14,8 +14,8 @@ maven_group=de.florianmichael
archives_base_name=viafabricplus archives_base_name=viafabricplus
# ViaVersion Libraries # ViaVersion Libraries
viaversion_version=4.9.0-1.20.3-pre2-SNAPSHOT viaversion_version=4.9.0-1.20.3-pre3-SNAPSHOT
viabackwards_version=4.9.0-1.20.3-pre1-SNAPSHOT viabackwards_version=4.9.0-1.20.3-pre3-SNAPSHOT
vialegacy_version=2.2.21-SNAPSHOT vialegacy_version=2.2.21-SNAPSHOT
viaaprilfools_version=2.0.10-SNAPSHOT viaaprilfools_version=2.0.10-SNAPSHOT
viabedrock_version=0.0.3-SNAPSHOT viabedrock_version=0.0.3-SNAPSHOT

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

@ -34,7 +34,7 @@ public class PackVersionDiff {
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-pre2"); registerVersion(VersionEnum.r1_20_3, 22, "1.20.3-pre3");
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"); // 1.20 and 1.20.1 are equal registerVersion(VersionEnum.r1_20tor1_20_1, 15, "1.20.1"); // 1.20 and 1.20.1 are equal
registerVersion(VersionEnum.r1_19_4, 13, "1.19.4"); registerVersion(VersionEnum.r1_19_4, 13, "1.19.4");

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

@ -54,7 +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.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-pre2", null)); viaFabricPlus$remaps.put("1.20.3", new Pair<>("1.20.3-pre3", 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;"))