Merge branch '1.21.5' into improvement/documentation

Author: emyfops

src/main/java/com/lambda/mixin/render/CapeFeatureRendererMixin.java

@@ -33,9 +33,12 @@
 public class CapeFeatureRendererMixin {
     @ModifyExpressionValue(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/PlayerEntityRenderState;FF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/SkinTextures;capeTexture()Lnet/minecraft/util/Identifier;"))
     Identifier renderCape(Identifier original, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, PlayerEntityRenderState player, float f, float g) {
-        var entity = Lambda.getMc().world.getEntityById(player.id);
-        if (!Capes.INSTANCE.isEnabled() || !CapeManager.INSTANCE.containsKey(entity.getUuid())) return original;
+        var entry = Lambda.getMc().getNetworkHandler().getPlayerListEntry(player.name);
+        if (entry == null) return original;
 
-        return Identifier.of("lambda", CapeManager.INSTANCE.get(entity.getUuid()));
+        var profile = entry.getProfile();
+        if (!Capes.INSTANCE.isEnabled() || !CapeManager.INSTANCE.getCache().containsKey(profile.getId())) return original;
+
+        return Identifier.of("lambda", CapeManager.INSTANCE.getCache().get(profile.getId()));
     }
 }

src/main/java/com/lambda/mixin/render/ElytraFeatureRendererMixin.java

@@ -17,37 +17,44 @@
 
 package com.lambda.mixin.render;
 
+import com.lambda.Lambda;
+import com.lambda.module.modules.client.Capes;
 import com.lambda.module.modules.render.NoRender;
-import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.lambda.network.CapeManager;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.feature.ElytraFeatureRenderer;
 import net.minecraft.client.render.entity.state.BipedEntityRenderState;
+import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(ElytraFeatureRenderer.class)
 public class ElytraFeatureRendererMixin<T extends LivingEntity> {
-    @ModifyReturnValue(method = "getTexture(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;)Lnet/minecraft/util/Identifier;", at = @At("TAIL"))
-    private static Identifier getTexture(Identifier original, BipedEntityRenderState state) {
-        // FixMe: fuck you mojang
-        /*var entity = StreamSupport.stream(Lambda.getMc().world.getEntities().spliterator(), false)
-                        .filter(e -> e.getDisplayName() == state.displayName)
-                        .findFirst().get();
+    @WrapOperation(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/feature/ElytraFeatureRenderer;getTexture(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;)Lnet/minecraft/util/Identifier;"))
+    Identifier injectElytra(BipedEntityRenderState state, Operation<Identifier> original) {
+        if (!(state instanceof PlayerEntityRenderState))
+            return original.call(state);
 
-        if (!Capes.INSTANCE.isEnabled() || !CapeManager.INSTANCE.containsKey(entity.getUuid())) return original;
+        var entry = Lambda.getMc().getNetworkHandler().getPlayerListEntry(((PlayerEntityRenderState) state).name);
+        if (entry == null) return original.call(state);
 
-        return Identifier.of("lambda", CapeManager.INSTANCE.get(entity.getUuid()));*/
+        var profile = entry.getProfile();
 
-        return original;
+        if (!Capes.INSTANCE.isEnabled() || !CapeManager.INSTANCE.getCache().containsKey(profile.getId()))
+            return original.call(state);
+
+        return Identifier.of("lambda", CapeManager.INSTANCE.getCache().get(profile.getId()));
     }
 
-    @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V", at = @At("HEAD"), cancellable = true)
-    private void injectRender(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, BipedEntityRenderState bipedEntityRenderState, float f, float g, CallbackInfo ci) {
-        if (NoRender.INSTANCE.isEnabled() && NoRender.getNoElytra()) ci.cancel();
+    @WrapMethod(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V")
+    private void injectRender(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, BipedEntityRenderState bipedEntityRenderState, float f, float g, Operation<Void> original) {
+        if (NoRender.INSTANCE.isDisabled() && !NoRender.getNoElytra())
+            original.call(matrixStack, vertexConsumerProvider, i, bipedEntityRenderState, f, g);
     }
 }

src/main/kotlin/com/lambda/command/commands/CapeCommand.kt

@@ -38,7 +38,7 @@ object CapeCommand : LambdaCommand(
         required(literal("set")) {
             required(string("id")) { id ->
                 suggests { _, builder ->
-                    CapeManager.capeList
+                    CapeManager.availableCapes
                         .forEach { builder.suggest(it) }
 
                     builder.buildFuture()