mirror of
https://github.com/ViaVersion/ViaLoader.git
synced 2024-11-12 10:23:55 +01:00
Updated dependencies
This commit is contained in:
RaphiMC
parent
27b92b49ca
commit
77e72b82c5
@ -29,7 +29,7 @@ dependencies {
|
||||
exclude group: "com.viaversion", module: "viaversion"
|
||||
}
|
||||
compileOnly "com.viaversion:viarewind-core:2.0.3-SNAPSHOT"
|
||||
compileOnly "net.raphimc:ViaLegacy:2.0.0"
|
||||
compileOnly "net.raphimc:ViaLegacy:2.1.0"
|
||||
|
||||
api "org.slf4j:slf4j-api:2.0.6"
|
||||
api "org.yaml:snakeyaml:1.33"
|
||||
|
||||
@ -6,4 +6,4 @@ org.gradle.configureondemand=true
|
||||
# Project properties
|
||||
maven_name=ViaProtocolHack
|
||||
maven_group=net.raphimc
|
||||
maven_version=2.0.1
|
||||
maven_version=2.1.0
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
package net.raphimc.viaprotocolhack.impl.viaversion;
|
||||
|
||||
import com.viaversion.viaversion.api.platform.ViaInjector;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import com.viaversion.viaversion.libs.fastutil.ints.IntLinkedOpenHashSet;
|
||||
import com.viaversion.viaversion.libs.fastutil.ints.IntSortedSet;
|
||||
import com.viaversion.viaversion.libs.gson.JsonObject;
|
||||
import net.raphimc.viaprotocolhack.netty.ViaPipeline;
|
||||
import net.raphimc.viaprotocolhack.util.VersionEnum;
|
||||
|
||||
public class VPInjector implements ViaInjector {
|
||||
|
||||
@ -25,10 +25,8 @@ public class VPInjector implements ViaInjector {
|
||||
@Override
|
||||
public IntSortedSet getServerProtocolVersions() {
|
||||
final IntSortedSet versions = new IntLinkedOpenHashSet();
|
||||
for (ProtocolVersion protocol : ProtocolVersion.getProtocols()) {
|
||||
if (protocol.getOriginalVersion() >= 4) { // >=1.7.2
|
||||
versions.add(protocol.getOriginalVersion());
|
||||
}
|
||||
for (VersionEnum version : VersionEnum.OFFICIAL_SUPPORTED_PROTOCOLS) {
|
||||
versions.add(version.getOriginalVersion());
|
||||
}
|
||||
return versions;
|
||||
}
|
||||
|
||||
254
src/main/java/net/raphimc/viaprotocolhack/util/VersionEnum.java
Normal file
254
src/main/java/net/raphimc/viaprotocolhack/util/VersionEnum.java
Normal file
@ -0,0 +1,254 @@
|
||||
package net.raphimc.viaprotocolhack.util;
|
||||
|
||||
import com.viaversion.viaversion.api.connection.UserConnection;
|
||||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
|
||||
import net.raphimc.vialegacy.api.LegacyProtocolVersions;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public enum VersionEnum {
|
||||
|
||||
c0_0_15a_1(LegacyProtocolVersions.c0_0_15a_1),
|
||||
c0_0_16a_02(LegacyProtocolVersions.c0_0_16a_02),
|
||||
c0_0_18a_02(LegacyProtocolVersions.c0_0_18a_02),
|
||||
c0_0_19a_06(LegacyProtocolVersions.c0_0_19a_06),
|
||||
c0_0_20ac0_27(LegacyProtocolVersions.c0_0_20ac0_27),
|
||||
c0_30cpe(LegacyProtocolVersions.c0_30cpe),
|
||||
c0_28toc0_30(LegacyProtocolVersions.c0_28toc0_30),
|
||||
a1_0_15(LegacyProtocolVersions.a1_0_15),
|
||||
a1_0_16toa1_0_16_2(LegacyProtocolVersions.a1_0_16toa1_0_16_2),
|
||||
a1_0_17toa1_0_17_4(LegacyProtocolVersions.a1_0_17toa1_0_17_4),
|
||||
a1_1_0toa1_1_2_1(LegacyProtocolVersions.a1_1_0toa1_1_2_1),
|
||||
a1_2_0toa1_2_1_1(LegacyProtocolVersions.a1_2_0toa1_2_1_1),
|
||||
a1_2_2(LegacyProtocolVersions.a1_2_2),
|
||||
a1_2_3toa1_2_3_4(LegacyProtocolVersions.a1_2_3toa1_2_3_4),
|
||||
a1_2_3_5toa1_2_6(LegacyProtocolVersions.a1_2_3_5toa1_2_6),
|
||||
b1_0tob1_1_1(LegacyProtocolVersions.b1_0tob1_1_1),
|
||||
b1_1_2(LegacyProtocolVersions.b1_1_2),
|
||||
b1_2_0tob1_2_2(LegacyProtocolVersions.b1_2_0tob1_2_2),
|
||||
b1_3tob1_3_1(LegacyProtocolVersions.b1_3tob1_3_1),
|
||||
b1_4tob1_4_1(LegacyProtocolVersions.b1_4tob1_4_1),
|
||||
b1_5tob1_5_2(LegacyProtocolVersions.b1_5tob1_5_2),
|
||||
b1_6tob1_6_6(LegacyProtocolVersions.b1_6tob1_6_6),
|
||||
b1_7tob1_7_3(LegacyProtocolVersions.b1_7tob1_7_3),
|
||||
b1_8tob1_8_1(LegacyProtocolVersions.b1_8tob1_8_1),
|
||||
r1_0_0tor1_0_1(LegacyProtocolVersions.r1_0_0tor1_0_1),
|
||||
r1_1(LegacyProtocolVersions.r1_1),
|
||||
r1_2_1tor1_2_3(LegacyProtocolVersions.r1_2_1tor1_2_3),
|
||||
r1_2_4tor1_2_5(LegacyProtocolVersions.r1_2_4tor1_2_5),
|
||||
r1_3_1tor1_3_2(LegacyProtocolVersions.r1_3_1tor1_3_2),
|
||||
r1_4_2(LegacyProtocolVersions.r1_4_2),
|
||||
r1_4_4tor1_4_5(LegacyProtocolVersions.r1_4_4tor1_4_5),
|
||||
r1_4_6tor1_4_7(LegacyProtocolVersions.r1_4_6tor1_4_7),
|
||||
r1_5tor1_5_1(LegacyProtocolVersions.r1_5tor1_5_1),
|
||||
r1_5_2(LegacyProtocolVersions.r1_5_2),
|
||||
r1_6_1(LegacyProtocolVersions.r1_6_1),
|
||||
r1_6_2(LegacyProtocolVersions.r1_6_2),
|
||||
r1_6_4(LegacyProtocolVersions.r1_6_4),
|
||||
r1_7_2tor1_7_5(ProtocolVersion.v1_7_1),
|
||||
r1_7_6tor1_7_10(ProtocolVersion.v1_7_6),
|
||||
r1_8(ProtocolVersion.v1_8),
|
||||
r1_9(ProtocolVersion.v1_9),
|
||||
r1_9_1(ProtocolVersion.v1_9_1),
|
||||
r1_9_2(ProtocolVersion.v1_9_2),
|
||||
r1_9_3tor1_9_4(ProtocolVersion.v1_9_3),
|
||||
r1_10(ProtocolVersion.v1_10),
|
||||
r1_11(ProtocolVersion.v1_11),
|
||||
r1_11_1to1_11_2(ProtocolVersion.v1_11_1),
|
||||
r1_12(ProtocolVersion.v1_12),
|
||||
r1_12_1(ProtocolVersion.v1_12_1),
|
||||
r1_12_2(ProtocolVersion.v1_12_2),
|
||||
r1_13(ProtocolVersion.v1_13),
|
||||
r1_13_1(ProtocolVersion.v1_13_1),
|
||||
r1_13_2(ProtocolVersion.v1_13_2),
|
||||
s3d_shareware(LegacyProtocolVersions.s3d_shareware),
|
||||
r1_14(ProtocolVersion.v1_14),
|
||||
r1_14_1(ProtocolVersion.v1_14_1),
|
||||
r1_14_2(ProtocolVersion.v1_14_2),
|
||||
r1_14_3(ProtocolVersion.v1_14_3),
|
||||
r1_14_4(ProtocolVersion.v1_14_4),
|
||||
r1_15(ProtocolVersion.v1_15),
|
||||
r1_15_1(ProtocolVersion.v1_15_1),
|
||||
r1_15_2(ProtocolVersion.v1_15_2),
|
||||
s20w14infinite(LegacyProtocolVersions.s20w14infinite),
|
||||
r1_16(ProtocolVersion.v1_16),
|
||||
r1_16_1(ProtocolVersion.v1_16_1),
|
||||
sCombatTest8c(LegacyProtocolVersions.sCombatTest8c),
|
||||
r1_16_2(ProtocolVersion.v1_16_2),
|
||||
r1_16_3(ProtocolVersion.v1_16_3),
|
||||
r1_16_4tor1_16_5(ProtocolVersion.v1_16_4),
|
||||
r1_17(ProtocolVersion.v1_17),
|
||||
r1_17_1(ProtocolVersion.v1_17_1),
|
||||
r1_18tor1_18_1(ProtocolVersion.v1_18),
|
||||
r1_18_2(ProtocolVersion.v1_18_2),
|
||||
r1_19(ProtocolVersion.v1_19),
|
||||
r1_19_1tor1_19_2(ProtocolVersion.v1_19_1),
|
||||
r1_19_3(ProtocolVersion.v1_19_3),
|
||||
|
||||
//
|
||||
UNKNOWN(ProtocolVersion.unknown), // Not in Registry
|
||||
;
|
||||
|
||||
|
||||
private static final Map<ProtocolVersion, VersionEnum> VERSION_REGISTRY = new HashMap<>();
|
||||
public static final List<VersionEnum> SORTED_VERSIONS = new ArrayList<>();
|
||||
public static final List<VersionEnum> OFFICIAL_SUPPORTED_PROTOCOLS = new ArrayList<>();
|
||||
|
||||
static {
|
||||
for (VersionEnum version : VersionEnum.values()) {
|
||||
if (version == UNKNOWN) continue;
|
||||
VERSION_REGISTRY.put(version.getProtocol(), version);
|
||||
}
|
||||
for (VersionEnum version : VersionEnum.getAllVersions()) {
|
||||
if (version.isNewerThan(VersionEnum.r1_6_4) && version != VersionEnum.s3d_shareware && version != VersionEnum.s20w14infinite && version != VersionEnum.sCombatTest8c) {
|
||||
OFFICIAL_SUPPORTED_PROTOCOLS.add(version);
|
||||
}
|
||||
}
|
||||
|
||||
SORTED_VERSIONS.add(r1_19_3);
|
||||
SORTED_VERSIONS.add(r1_19_1tor1_19_2);
|
||||
SORTED_VERSIONS.add(r1_19);
|
||||
SORTED_VERSIONS.add(r1_18_2);
|
||||
SORTED_VERSIONS.add(r1_18tor1_18_1);
|
||||
SORTED_VERSIONS.add(r1_17_1);
|
||||
SORTED_VERSIONS.add(r1_17);
|
||||
SORTED_VERSIONS.add(r1_16_4tor1_16_5);
|
||||
SORTED_VERSIONS.add(r1_16_3);
|
||||
SORTED_VERSIONS.add(r1_16_2);
|
||||
SORTED_VERSIONS.add(r1_16_1);
|
||||
SORTED_VERSIONS.add(r1_16);
|
||||
SORTED_VERSIONS.add(r1_15_2);
|
||||
SORTED_VERSIONS.add(r1_15_1);
|
||||
SORTED_VERSIONS.add(r1_15);
|
||||
SORTED_VERSIONS.add(r1_14_4);
|
||||
SORTED_VERSIONS.add(r1_14_3);
|
||||
SORTED_VERSIONS.add(r1_14_2);
|
||||
SORTED_VERSIONS.add(r1_14_1);
|
||||
SORTED_VERSIONS.add(r1_14);
|
||||
SORTED_VERSIONS.add(r1_13_2);
|
||||
SORTED_VERSIONS.add(r1_13_1);
|
||||
SORTED_VERSIONS.add(r1_13);
|
||||
SORTED_VERSIONS.add(r1_12_2);
|
||||
SORTED_VERSIONS.add(r1_12_1);
|
||||
SORTED_VERSIONS.add(r1_12);
|
||||
SORTED_VERSIONS.add(r1_11_1to1_11_2);
|
||||
SORTED_VERSIONS.add(r1_11);
|
||||
SORTED_VERSIONS.add(r1_10);
|
||||
SORTED_VERSIONS.add(r1_9_3tor1_9_4);
|
||||
SORTED_VERSIONS.add(r1_9_2);
|
||||
SORTED_VERSIONS.add(r1_9_1);
|
||||
SORTED_VERSIONS.add(r1_9);
|
||||
SORTED_VERSIONS.add(r1_8);
|
||||
SORTED_VERSIONS.add(r1_7_6tor1_7_10);
|
||||
SORTED_VERSIONS.add(r1_7_2tor1_7_5);
|
||||
SORTED_VERSIONS.add(r1_6_4);
|
||||
SORTED_VERSIONS.add(r1_6_2);
|
||||
SORTED_VERSIONS.add(r1_6_1);
|
||||
SORTED_VERSIONS.add(r1_5_2);
|
||||
SORTED_VERSIONS.add(r1_5tor1_5_1);
|
||||
SORTED_VERSIONS.add(r1_4_6tor1_4_7);
|
||||
SORTED_VERSIONS.add(r1_4_4tor1_4_5);
|
||||
SORTED_VERSIONS.add(r1_4_2);
|
||||
SORTED_VERSIONS.add(r1_3_1tor1_3_2);
|
||||
SORTED_VERSIONS.add(r1_2_4tor1_2_5);
|
||||
SORTED_VERSIONS.add(r1_2_1tor1_2_3);
|
||||
SORTED_VERSIONS.add(r1_1);
|
||||
SORTED_VERSIONS.add(r1_0_0tor1_0_1);
|
||||
SORTED_VERSIONS.add(b1_8tob1_8_1);
|
||||
SORTED_VERSIONS.add(b1_7tob1_7_3);
|
||||
SORTED_VERSIONS.add(b1_6tob1_6_6);
|
||||
SORTED_VERSIONS.add(b1_5tob1_5_2);
|
||||
SORTED_VERSIONS.add(b1_4tob1_4_1);
|
||||
SORTED_VERSIONS.add(b1_3tob1_3_1);
|
||||
SORTED_VERSIONS.add(b1_2_0tob1_2_2);
|
||||
SORTED_VERSIONS.add(b1_1_2);
|
||||
SORTED_VERSIONS.add(b1_0tob1_1_1);
|
||||
SORTED_VERSIONS.add(a1_2_3_5toa1_2_6);
|
||||
SORTED_VERSIONS.add(a1_2_3toa1_2_3_4);
|
||||
SORTED_VERSIONS.add(a1_2_2);
|
||||
SORTED_VERSIONS.add(a1_2_0toa1_2_1_1);
|
||||
SORTED_VERSIONS.add(a1_1_0toa1_1_2_1);
|
||||
SORTED_VERSIONS.add(a1_0_17toa1_0_17_4);
|
||||
SORTED_VERSIONS.add(a1_0_16toa1_0_16_2);
|
||||
SORTED_VERSIONS.add(a1_0_15);
|
||||
SORTED_VERSIONS.add(c0_28toc0_30);
|
||||
SORTED_VERSIONS.add(c0_0_20ac0_27);
|
||||
SORTED_VERSIONS.add(c0_0_19a_06);
|
||||
SORTED_VERSIONS.add(c0_0_18a_02);
|
||||
SORTED_VERSIONS.add(c0_0_16a_02);
|
||||
SORTED_VERSIONS.add(c0_0_15a_1);
|
||||
SORTED_VERSIONS.add(sCombatTest8c);
|
||||
SORTED_VERSIONS.add(s20w14infinite);
|
||||
SORTED_VERSIONS.add(s3d_shareware);
|
||||
SORTED_VERSIONS.add(c0_30cpe);
|
||||
}
|
||||
|
||||
public static VersionEnum fromProtocolVersion(final ProtocolVersion protocolVersion) {
|
||||
if (!protocolVersion.isKnown()) return UNKNOWN;
|
||||
return VERSION_REGISTRY.getOrDefault(protocolVersion, UNKNOWN);
|
||||
}
|
||||
|
||||
public static VersionEnum fromProtocolId(final int protocolId) {
|
||||
return fromProtocolVersion(ProtocolVersion.getProtocol(protocolId));
|
||||
}
|
||||
|
||||
public static VersionEnum fromUserConnection(final UserConnection userConnection) {
|
||||
return fromUserConnection(userConnection, true);
|
||||
}
|
||||
|
||||
public static VersionEnum fromUserConnection(final UserConnection userConnection, final boolean serverProtocol) {
|
||||
return fromProtocolId(serverProtocol ? userConnection.getProtocolInfo().getServerProtocolVersion() : userConnection.getProtocolInfo().getProtocolVersion());
|
||||
}
|
||||
|
||||
public static Collection<VersionEnum> getAllVersions() {
|
||||
return VERSION_REGISTRY.values();
|
||||
}
|
||||
|
||||
|
||||
private final ProtocolVersion protocolVersion;
|
||||
|
||||
VersionEnum(final ProtocolVersion protocolVersion) {
|
||||
this.protocolVersion = protocolVersion;
|
||||
}
|
||||
|
||||
public ProtocolVersion getProtocol() {
|
||||
return this.protocolVersion;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return this.protocolVersion.getName();
|
||||
}
|
||||
|
||||
public int getVersion() {
|
||||
return this.protocolVersion.getVersion();
|
||||
}
|
||||
|
||||
public int getOriginalVersion() {
|
||||
return this.protocolVersion.getOriginalVersion();
|
||||
}
|
||||
|
||||
public boolean isOlderThan(final VersionEnum other) {
|
||||
return this.ordinal() < other.ordinal();
|
||||
}
|
||||
|
||||
public boolean isOlderThanOrEqualTo(final VersionEnum other) {
|
||||
return this.ordinal() <= other.ordinal();
|
||||
}
|
||||
|
||||
public boolean isNewerThan(final VersionEnum other) {
|
||||
return this.ordinal() > other.ordinal();
|
||||
}
|
||||
|
||||
public boolean isNewerThanOrEqualTo(final VersionEnum other) {
|
||||
return this.ordinal() >= other.ordinal();
|
||||
}
|
||||
|
||||
public boolean isBetweenInclusive(final VersionEnum min, final VersionEnum max) {
|
||||
return this.isNewerThanOrEqualTo(min) && this.isOlderThanOrEqualTo(max);
|
||||
}
|
||||
|
||||
public boolean isBetweenExclusive(final VersionEnum min, final VersionEnum max) {
|
||||
return this.isNewerThan(min) && this.isOlderThan(max);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user