Upstream/ViaLegacy
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaLegacy.git synced 2024-06-25 10:14:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned code

Browse Source
This commit is contained in:
RaphiMC 2023-01-04 18:44:59 +01:00
parent 0804397f20
commit ca103feecf
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -6,4 +6,4 @@ org.gradle.configureondemand=true
# Project properties
maven_name=ViaLegacy
maven_group=net.raphimc
maven_version=2.0.2
maven_version=2.0.3

4
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_7_2_5to1_6_4/Protocol1_7_2_5to1_6_4.java
View File

@ -358,7 +358,7 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
handler(wrapper -> {
final String name = wrapper.read(Types1_6_4.STRING); // name
final GameProfileFetcher gameProfileFetcher = Via.getManager().getProviders().get(GameProfileFetcher.class);
wrapper.write(Type.STRING, (gameProfileFetcher.isLegacySkinLoadingEnabled(wrapper.user()) ? gameProfileFetcher.getMojangUUID(name) : gameProfileFetcher.getOfflineUUID(name)).toString().replace("-", "")); // uuid
wrapper.write(Type.STRING, (ViaLegacy.getConfig().isLegacySkinLoading() ? gameProfileFetcher.getMojangUUID(name) : gameProfileFetcher.getOfflineUUID(name)).toString().replace("-", "")); // uuid
wrapper.write(Type.STRING, name);
});
map(Type.INT); // x
@ -899,7 +899,7 @@ public class Protocol1_7_2_5to1_6_4 extends AbstractProtocol<ClientboundPackets1
final HandshakeStorage handshakeStorage = wrapper.user().get(HandshakeStorage.class);
final GameProfileFetcher gameProfileFetcher = Via.getManager().getProviders().get(GameProfileFetcher.class);
info.setUsername(name);
info.setUuid(gameProfileFetcher.isLegacySkinLoadingEnabled(wrapper.user()) ? gameProfileFetcher.getMojangUUID(info.getUsername()) : gameProfileFetcher.getOfflineUUID(info.getUsername()));
info.setUuid(ViaLegacy.getConfig().isLegacySkinLoading() ? gameProfileFetcher.getMojangUUID(info.getUsername()) : gameProfileFetcher.getOfflineUUID(info.getUsername()));
wrapper.write(Type.UNSIGNED_BYTE, (short) (-info.getServerProtocolVersion() >> 2)); // protocol id
wrapper.write(Types1_6_4.STRING, name); // user name

5
src/main/java/net/raphimc/vialegacy/protocols/release/protocol1_8to1_7_6_10/providers/GameProfileFetcher.java
View File

@ -3,7 +3,6 @@ package net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.providers;
import com.google.common.cache.*;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.common.util.concurrent.UncheckedExecutionException;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.platform.providers.Provider;
import net.raphimc.vialegacy.ViaLegacy;
import net.raphimc.vialegacy.protocols.release.protocol1_8to1_7_6_10.model.GameProfile;
@ -33,10 +32,6 @@ public abstract class GameProfileFetcher implements Provider {
}
});
public boolean isLegacySkinLoadingEnabled(final UserConnection user) {
return ViaLegacy.getConfig().isLegacySkinLoading();
}
public boolean isUUIDLoaded(String playerName) {
return UUID_CACHE.getIfPresent(playerName) != null;
}