mirror of
https://github.com/ViaVersion/ViaFabricPlus.git
synced 2024-11-02 08:59:31 +01:00
Merge remote-tracking branch 'origin/main' into recode/3.0.0
# 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:
commit
9e6a945a40
@ -14,8 +14,8 @@ maven_group=de.florianmichael
|
||||
archives_base_name=viafabricplus
|
||||
|
||||
# ViaVersion Libraries
|
||||
viaversion_version=4.9.0-1.20.3-pre2-SNAPSHOT
|
||||
viabackwards_version=4.9.0-1.20.3-pre1-SNAPSHOT
|
||||
viaversion_version=4.9.0-1.20.3-pre3-SNAPSHOT
|
||||
viabackwards_version=4.9.0-1.20.3-pre3-SNAPSHOT
|
||||
vialegacy_version=2.2.21-SNAPSHOT
|
||||
viaaprilfools_version=2.0.10-SNAPSHOT
|
||||
viabedrock_version=0.0.3-SNAPSHOT
|
||||
|
@ -34,7 +34,7 @@ public class PackVersionDiff {
|
||||
private final static Map<VersionEnum, GameVersion> GAME_VERSION_DIFF = new HashMap<>();
|
||||
|
||||
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_20tor1_20_1, 15, "1.20.1"); // 1.20 and 1.20.1 are equal
|
||||
registerVersion(VersionEnum.r1_19_4, 13, "1.19.4");
|
||||
|
@ -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.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-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;"))
|
||||
|
Loading…
Reference in New Issue
Block a user