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

Fixed skin loading in <= 1.20.1

Browse Source
This commit is contained in:
RaphiMC 2023-09-23 19:21:55 +02:00
parent c44228bfaa
commit 6ac8ec625d
No known key found for this signature in database
GPG Key ID: 0F6BB0657A03AC94
3 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/florianmichael/viafabricplus/ViaFabricPlus.java
View File

@ -41,7 +41,6 @@ import java.io.File;
/*
* TODO | Port
* - Skin loading has changed (Server doesn't send the whole skin data anymore)
* - Entity passenger points and heights/offsets are completely broken across all entities
*
* TODO | General

50
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerListEntry.java Normal file
View File

@ -0,0 +1,50 @@
/*
* This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus
* Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.yggdrasil.ProfileResult;
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.PlayerListEntry;
import net.minecraft.client.texture.PlayerSkinProvider;
import net.minecraft.client.util.SkinTextures;
import net.minecraft.util.Util;
import net.raphimc.vialoader.util.VersionEnum;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.util.concurrent.CompletableFuture;
@Mixin(PlayerListEntry.class)
public abstract class MixinPlayerListEntry {
@Redirect(method = "texturesSupplier", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/PlayerSkinProvider;fetchSkinTextures(Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture;"))
private static CompletableFuture<SkinTextures> fetchGameProfileProperties(PlayerSkinProvider instance, GameProfile profile) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_20tor1_20_1) && !profile.getProperties().containsKey("textures")) {
return CompletableFuture.supplyAsync(() -> {
final ProfileResult profileResult = MinecraftClient.getInstance().getSessionService().fetchProfile(profile.getId(), true);
return profileResult == null ? profile : profileResult.profile();
}, Util.getMainWorkerExecutor()).thenCompose(instance::fetchSkinTextures);
} else {
return instance.fetchSkinTextures(profile);
}
}
}

7
src/main/resources/viafabricplus.mixins.json
View File

@ -36,6 +36,7 @@
"fixes.minecraft.MixinMinecraftClient",
"fixes.minecraft.MixinPendingUpdateManager",
"fixes.minecraft.MixinPlayerEntityRenderer",
"fixes.minecraft.MixinPlayerListEntry",
"fixes.minecraft.MixinPlayerPublicKey_PublicKeyData",
"fixes.minecraft.MixinProfileKeysImpl",
"fixes.minecraft.MixinServerResourcePackProvider",
@ -58,6 +59,7 @@
"fixes.minecraft.block.MixinFarmlandBlock",
"fixes.minecraft.block.MixinFenceBlock",
"fixes.minecraft.block.MixinFireBlock",
"fixes.minecraft.block.MixinFlowerbedBlock",
"fixes.minecraft.block.MixinFlowerPotBlock",
"fixes.minecraft.block.MixinHopperBlock",
"fixes.minecraft.block.MixinLadderBlock",
@ -98,6 +100,7 @@
"fixes.minecraft.item.MixinBrushItem",
"fixes.minecraft.item.MixinElytraItem",
"fixes.minecraft.item.MixinEnderPearlItem",
"fixes.minecraft.item.MixinEquipment",
"fixes.minecraft.item.MixinFireworkRocketItem",
"fixes.minecraft.item.MixinHeldItemRenderer",
"fixes.minecraft.item.MixinHoeItem",
@ -170,9 +173,7 @@
"fixes.viaversion.protocol1_9to1_8.MixinViaIdleThread",
"jsonwebtoken.MixinClasses",
"jsonwebtoken.MixinDefaultCompressionCodecResolver",
"jsonwebtoken.MixinDefaultJwtParserBuilder",
"fixes.minecraft.block.MixinFlowerbedBlock",
"fixes.minecraft.item.MixinEquipment"
"jsonwebtoken.MixinDefaultJwtParserBuilder"
],
"injectors": {
"defaultRequire": 1