From 6f237d54e0e6447541c364c16b329bd6fc2b23d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ampflower=20=F0=9F=8C=BA?= Date: Mon, 17 Mar 2025 09:34:47 -0700 Subject: [PATCH] feat: Some suspicious compatibility --- .../pridecraft/joy/fabric/client/JoyClient.java | 11 +++++++---- .../entity/elytra/pride_elytra_suspicious.png | Bin 0 -> 376 bytes 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 xplat/src/main/resources/assets/joy/textures/entity/elytra/pride_elytra_suspicious.png diff --git a/fabric/src/client/java/gay/pridecraft/joy/fabric/client/JoyClient.java b/fabric/src/client/java/gay/pridecraft/joy/fabric/client/JoyClient.java index 9fc14a0..0d42622 100644 --- a/fabric/src/client/java/gay/pridecraft/joy/fabric/client/JoyClient.java +++ b/fabric/src/client/java/gay/pridecraft/joy/fabric/client/JoyClient.java @@ -20,6 +20,7 @@ import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback; +import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactories; import net.minecraft.text.Text; @@ -48,10 +49,12 @@ public class JoyClient implements ClientModInitializer { JoyBlocks.POTTED_TRANS_ALLIUM ); - LivingEntityFeatureRendererRegistrationCallback.EVENT.register((entityType, entityRenderer, registrationHelper, context) -> { - Identifier elytra = Identifier.ofVanilla("textures/entity/elytra.png"); - registrationHelper.register(new CustomElytraFeatureRenderer<>(entityRenderer, context.getModelLoader(), elytra)); - }); + if (!FabricLoader.getInstance().isModLoaded("lilium")) { + LivingEntityFeatureRendererRegistrationCallback.EVENT.register((entityType, entityRenderer, registrationHelper, context) -> { + Identifier elytra = Identifier.ofVanilla("textures/entity/elytra.png"); + registrationHelper.register(new CustomElytraFeatureRenderer<>(entityRenderer, context.getModelLoader(), elytra)); + }); + } ParticleFactoryRegistry.getInstance().register(JoyParticles.TOTEM_OF_PRIDE_PARTICLE, TotemOfPrideParticle.Factory::new); diff --git a/xplat/src/main/resources/assets/joy/textures/entity/elytra/pride_elytra_suspicious.png b/xplat/src/main/resources/assets/joy/textures/entity/elytra/pride_elytra_suspicious.png new file mode 100644 index 0000000000000000000000000000000000000000..79f74c1256d7a709bd65e39bd46f21eb3368f8d9 GIT binary patch literal 376 zcmV-;0f+vHP)bs@0I}l$mB#?0)TN>^p`9$Osye5o zHLtEfv$I9JyG_5oPdkKQEOSjScvCZcST=xMKZjybXO=}=j7VRQO=OgHSdMK_hPqef zkN^Mx0d!JMQvg8b*k%9#0KG{>K~#7Fq|^ff!vGLO(TQyv_djH(wl=SfejI$ED2jRj zAr`O^6PiNWmH-O`sZ&7LA!L}QPL?eX=#K08wzVM;u;7L+WTIGiSa8G#A&Me>FG(Pi zMtr47mgV?aabHLhF3v!SUsbqOH%-G&+x7TW{}^DQWk9$E`<3stm2eB%j%%kswqU@W zahk?)oQ46vnsJ8<(>%}8EtrRSIKZ#e$6<9@mVX{>EAA~Su^|p%VS*sF8;!vz7zF?V W_zc}H-C||{0000