From 54328e45947e641de472d62eb7199faf1118ddf4 Mon Sep 17 00:00:00 2001 From: "Gili \"OpenBagTwo\" Barlev" Date: Mon, 14 Oct 2024 15:20:50 -0400 Subject: [PATCH] Fix: Crystalite Elytra should give set bonus --- .../java/org/betterx/betterend/client/BetterEndClient.java | 5 ++++- .../java/org/betterx/betterend/item/CrystaliteArmor.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/betterx/betterend/client/BetterEndClient.java b/src/main/java/org/betterx/betterend/client/BetterEndClient.java index 177ffb138..624fbc003 100644 --- a/src/main/java/org/betterx/betterend/client/BetterEndClient.java +++ b/src/main/java/org/betterx/betterend/client/BetterEndClient.java @@ -8,6 +8,7 @@ import org.betterx.betterend.events.ItemTooltipCallback; import org.betterx.betterend.interfaces.MultiModelItem; import org.betterx.betterend.item.CrystaliteArmor; +import org.betterx.betterend.item.CrystaliteElytra; import org.betterx.betterend.registry.*; import org.betterx.betterend.world.generator.GeneratorOptions; @@ -65,7 +66,9 @@ public void onInitializeClient() { public static void registerTooltips() { ItemTooltipCallback.EVENT.register((player, stack, context, lines) -> { - if (stack.getItem() instanceof CrystaliteArmor) { + if ((stack.getItem() instanceof CrystaliteArmor) + || (stack.getItem() instanceof CrystaliteElytra) + ) { boolean hasSet = false; if (player != null) { hasSet = CrystaliteArmor.hasFullSet(player); diff --git a/src/main/java/org/betterx/betterend/item/CrystaliteArmor.java b/src/main/java/org/betterx/betterend/item/CrystaliteArmor.java index b937ee9e6..6f8dd5774 100644 --- a/src/main/java/org/betterx/betterend/item/CrystaliteArmor.java +++ b/src/main/java/org/betterx/betterend/item/CrystaliteArmor.java @@ -22,7 +22,10 @@ public CrystaliteArmor(Type type, Properties settings) { public static boolean hasFullSet(LivingEntity owner) { for (ItemStack armorStack : owner.getArmorSlots()) { - if (!(armorStack.getItem() instanceof CrystaliteArmor)) { + if ( + !(armorStack.getItem() instanceof CrystaliteArmor) + && !(armorStack.getItem() instanceof CrystaliteElytra) + ) { return false; } }