Fixed Elytra cape compat

Draconic-Inc · May 31, 2024 · 14a1124 · 14a1124
1 parent c5c23c4
commit 14a1124
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 9 deletions.
diff --git a/src/main/java/com/brandon3055/draconicevolution/init/ClientInit.java b/src/main/java/com/brandon3055/draconicevolution/init/ClientInit.java
@@ -220,6 +220,18 @@ private static void setupRenderLayers() {
         ItemBlockRenderTypes.setRenderLayer(DEContent.DEEPSLATE_DRACONIUM_ORE.get(), renderType -> renderType == RenderType.solid() || renderType == RenderType.cutoutMipped());
     }
 
+    public static boolean deElytraVisible(ItemStack stack, LivingEntity entity) {
+        if (ContributorHandler.shouldCancelElytra(entity)) return false;
+        if (stack.getItem() instanceof IModularArmor item) {
+            return item.canElytraFlyBC(stack, entity);
+        }
+        if (BrandonsCore.equipmentManager != null) {
+            ItemStack curio = BrandonsCore.equipmentManager.findMatchingItem(e -> e.getItem() instanceof IModularArmor, entity);
+            return curio.getItem() instanceof IModularArmor item && item.canElytraFlyBC(curio, entity);
+        }
+        return false;
+    }
+
     @SuppressWarnings ({"rawtypes", "unchecked"})
     private static void onAddRenderLayers(EntityRenderersEvent.AddLayers event) {
         for (String skin : event.getSkins()) {
@@ -228,15 +240,7 @@ private static void onAddRenderLayers(EntityRenderersEvent.AddLayers event) {
             renderer.addLayer(new ElytraLayer(renderer, event.getEntityModels()) {
                 @Override
                 public boolean shouldRender(@NotNull ItemStack stack, @NotNull LivingEntity entity) {
-                    if (ContributorHandler.shouldCancelElytra(entity)) return false;
-                    if (stack.getItem() instanceof IModularArmor item) {
-                        return item.canElytraFlyBC(stack, entity);
-                    }
-                    if (BrandonsCore.equipmentManager != null) {
-                        ItemStack curio = BrandonsCore.equipmentManager.findMatchingItem(e -> e.getItem() instanceof IModularArmor, entity);
-                        return curio.getItem() instanceof IModularArmor item && item.canElytraFlyBC(curio, entity);
-                    }
-                    return false;
+                    return deElytraVisible(stack, entity);
                 }
             });
         }

diff --git a/src/main/java/com/brandon3055/draconicevolution/mixin/CapeLayerMixin.java b/src/main/java/com/brandon3055/draconicevolution/mixin/CapeLayerMixin.java
@@ -0,0 +1,36 @@
+package com.brandon3055.draconicevolution.mixin;
+
+import com.brandon3055.draconicevolution.init.ClientInit;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.entity.layers.CapeLayer;
+import net.minecraft.world.item.ItemStack;
+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;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+/**
+ * Created by brandon3055 on 4/2/21
+ */
+@Mixin (CapeLayer.class)
+public class CapeLayerMixin {
+
+    @Inject (
+            method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;FFFFFF)V",
+            at = @At (
+                    value = "INVOKE_ASSIGN",
+                    target = "Lnet/minecraft/client/player/AbstractClientPlayer;getItemBySlot(Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/world/item/ItemStack;",
+                    shift = At.Shift.AFTER
+            ),
+            locals = LocalCapture.CAPTURE_FAILHARD,
+            cancellable = true
+    )
+    private void render(PoseStack pMatrixStack, MultiBufferSource pBuffer, int pPackedLight, AbstractClientPlayer pLivingEntity, float pLimbSwing, float pLimbSwingAmount, float pPartialTicks, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch, CallbackInfo ci, ItemStack itemstack) {
+        if (ClientInit.deElytraVisible(itemstack, pLivingEntity)) {
+            ci.cancel();
+        }
+    }
+}
diff --git a/src/main/resources/mixins.draconicevolution.json b/src/main/resources/mixins.draconicevolution.json
@@ -11,6 +11,7 @@
     "TheEndBiomeSourceMixin"
   ],
   "client": [
+    "CapeLayerMixin",
     "PlayerModelMixin",
     "ServerboundSetCreativeModeSlotPacketMixin"
   ]