Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-27 16:40:10 +01:00
Code Issues Releases Aktivität

Merge remote-tracking branch 'origin/master' into dev

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2024-02-08 22:02:25 +01:00
Commit e0f32d9f2f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
2 geänderte Dateien mit 6 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

11
common/src/main/java/com/viaversion/viaversion/configuration/AbstractViaConfig.java
Datei anzeigen

@ -180,12 +180,12 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
if (c == '<') {
if (lowerBound != -1) {
Via.getPlatform().getLogger().warning("Already set lower bound " + lowerBound + " overridden by " + protocolVersion.getName());
LOGGER.warning("Already set lower bound " + lowerBound + " overridden by " + protocolVersion.getName());
}
lowerBound = protocolVersion.getVersion();
} else {
if (upperBound != -1) {
Via.getPlatform().getLogger().warning("Already set upper bound " + upperBound + " overridden by " + protocolVersion.getName());
LOGGER.warning("Already set upper bound " + upperBound + " overridden by " + protocolVersion.getName());
}
upperBound = protocolVersion.getVersion();
}
@ -199,7 +199,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
// Add single protocol version and check for duplication
if (!blockedProtocols.add(protocolVersion.getVersion())) {
Via.getPlatform().getLogger().warning("Duplicated blocked protocol version " + protocolVersion.getName() + "/" + protocolVersion.getVersion());
LOGGER.warning("Duplicated blocked protocol version " + protocolVersion.getName() + "/" + protocolVersion.getVersion());
}
}
@ -210,8 +210,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
blockedProtocols.removeIf((IntPredicate) version -> {
if (finalLowerBound != -1 && version < finalLowerBound || finalUpperBound != -1 && version > finalUpperBound) {
ProtocolVersion protocolVersion = ProtocolVersion.getProtocol(version);
Via.getPlatform().getLogger().warning("Blocked protocol version "
+ protocolVersion.getName() + "/" + protocolVersion.getVersion() + " already covered by upper or lower bound");
LOGGER.warning("Blocked protocol version " + protocolVersion.getName() + "/" + protocolVersion.getVersion() + " already covered by upper or lower bound");
return true;
}
return false;
@ -223,7 +222,7 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
private @Nullable ProtocolVersion protocolVersion(String s) {
ProtocolVersion protocolVersion = ProtocolVersion.getClosest(s);
if (protocolVersion == null) {
Via.getPlatform().getLogger().warning("Unknown protocol version in block-versions: " + s);
LOGGER.warning("Unknown protocol version in block-versions: " + s);
return null;
}
return protocolVersion;

2
common/src/main/java/com/viaversion/viaversion/util/Config.java
Datei anzeigen

@ -38,7 +38,7 @@ import java.util.logging.Logger;
@SuppressWarnings("VulnerableCodeUsages")
public abstract class Config {
private static final Logger LOGGER = Logger.getLogger("ViaVersion Config");
protected static final Logger LOGGER = Logger.getLogger("ViaVersion Config");
private static final YamlCompat YAMP_COMPAT = YamlCompat.isVersion1() ? new Yaml1Compat() : new Yaml2Compat();
private static final ThreadLocal<Yaml> YAML = ThreadLocal.withInitial(() -> {
DumperOptions options = new DumperOptions();