diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 8373b5a8f..efcf7b7a0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -34,6 +34,7 @@ import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.integration.curios.CurioIntegration; import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; @@ -66,6 +67,7 @@ public final class BaubleRenderHandler extends LayerRenderer { - if (c.hasRender(e.getKey(), player)) { - ms.push(); - c.render(e.getKey(), ms, buffers, light, player, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch); - ms.pop(); - } - }); + toRender = attachable.getCosmeticItem(stack); } + + toRender.getCapability(CuriosCapability.ITEM).ifPresent(c -> { + if (c.hasRender(e.getKey(), player) && c instanceof CurioIntegration.Wrapper) { + ms.push(); + ((CurioIntegration.Wrapper) c).doRender(this, player, ms, buffers, light, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch); + ms.pop(); + } + }); } } } diff --git a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java index bb8edf63b..33567cdbc 100644 --- a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java +++ b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java @@ -32,6 +32,7 @@ import top.theillusivec4.curios.api.capability.ICurio; import top.theillusivec4.curios.api.event.LivingCurioDropRulesEvent; import top.theillusivec4.curios.api.imc.CurioIMCMessage; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.common.capability.SimpleCapProvider; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.handler.ModSounds; @@ -96,7 +97,7 @@ public class CurioIntegration extends EquipmentHandler { return super.isAccessory(stack) || stack.getCapability(CuriosCapability.ITEM).isPresent(); } - private static class Wrapper implements ICurio { + public static class Wrapper implements ICurio { private final ItemStack stack; Wrapper(ItemStack stack) { @@ -152,9 +153,12 @@ public class CurioIntegration extends EquipmentHandler { return getItem().hasRender(stack, entity); } + // Don't use Curios' built-in render method since we need more data passed @Override - public void render(String identifier, MatrixStack ms, IRenderTypeBuffer buffers, int light, LivingEntity livingEntity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - getItem().doRender(stack, livingEntity, ms, buffers, light, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch); + public void render(String identifier, MatrixStack ms, IRenderTypeBuffer buffers, int light, LivingEntity livingEntity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {} + + public void doRender(BaubleRenderHandler layer, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + getItem().doRender(layer, stack, player, ms, buffers, light, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch); } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 04c33f451..bb3fab8e3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -33,6 +33,7 @@ import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -169,5 +170,5 @@ public abstract class ItemBauble extends Item implements ICosmeticAttachable, IP } @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {} + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {} } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index e770546de..753399070 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -27,6 +27,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.item.ICosmeticBauble; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.helper.RenderHelper; import java.util.List; @@ -76,7 +77,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { Variant variant = ((ItemBaubleCosmetic) stack.getItem()).variant; if (variant.isHead) { AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 686a34037..42ae7b1fb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -41,6 +41,7 @@ import vazkii.botania.api.brew.IBrewItem; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -115,7 +116,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index 5580531fd..0ccf191eb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -26,6 +26,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.network.PacketHandler; @@ -66,7 +67,7 @@ public class ItemCloudPendant extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index d665a96ab..cad176971 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -36,6 +36,7 @@ import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.handler.ModSounds; @@ -100,7 +101,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); ms.scale(0.8F, 0.8F, 0.8F); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index d11285df8..aa7363815 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -43,6 +43,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.fx.SparkleParticleData; @@ -306,7 +307,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { int meta = getVariant(stack); if (meta > 0 && meta <= MiscellaneousIcons.INSTANCE.tiaraWingIcons.length) { IBakedModel model = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1]; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index aee73cacd..a7df42b94 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -30,6 +30,7 @@ import net.minecraftforge.fml.common.Mod; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; @@ -62,7 +63,7 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); AccessoryRenderHelper.translateToFace(ms); AccessoryRenderHelper.defaultTransforms(ms); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 088f81b11..0a1e68943 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCloak; @@ -77,7 +78,7 @@ public class ItemHolyCloak extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { ItemHolyCloak item = ((ItemHolyCloak) stack.getItem()); AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 411043e3c..eff3fb026 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -30,6 +30,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; public class ItemIcePendant extends ItemBauble { @@ -68,7 +69,7 @@ public class ItemIcePendant extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); ms.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 3c15c5104..92e48b87c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -44,6 +44,7 @@ import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.Botania; @@ -76,7 +77,7 @@ public class ItemItemFinder extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty(); AccessoryRenderHelper.translateToHeadLevel(ms, living, partialTicks); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index fb4e400a9..dfc03ffea 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -24,6 +24,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.lib.LibResources; public class ItemKnockbackBelt extends ItemBauble { @@ -44,7 +45,7 @@ public class ItemKnockbackBelt extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { ms.translate(0F, 0.2F, 0F); float s = 1.05F / 16F; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 4e162dc26..6d9915f4a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -24,6 +24,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; public class ItemLavaPendant extends ItemBauble { @@ -41,7 +42,7 @@ public class ItemLavaPendant extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); ms.scale(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index 49fee24da..2b783459a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -39,6 +39,7 @@ import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.item.IBurstViewerBauble; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.ICosmeticBauble; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.common.core.handler.EquipmentHandler; public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosmeticBauble { @@ -49,7 +50,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty(); AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index ce734a8c7..3983efb27 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.core.handler.EquipmentHandler; @@ -52,7 +53,7 @@ public class ItemSuperLavaPendant extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { AccessoryRenderHelper.rotateIfSneaking(ms, player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); ms.scale(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index c9108a03b..eaffaf608 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -31,6 +31,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; @@ -65,7 +66,7 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); ms.translate(-0.3, -0.6, armor ? -0.18 : -0.12); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index c03d8c486..4276e3c4b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -26,6 +26,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.ITinyPlanetExcempt; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; @@ -50,7 +51,7 @@ public class ItemTinyPlanet extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { ms.scale(0.5F, 0.5F, 0.5F); ms.translate(0, -1.5F, 0.5F); Minecraft.getInstance().getBlockRendererDispatcher().renderBlockAsEntity(ModBlocks.tinyPlanet.getDefaultState(), ms, buffers, light, OverlayTexture.DEFAULT_UV); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index c83d3a100..1e5a9af31 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -29,6 +29,7 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.client.core.handler.BaubleRenderHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.core.handler.EquipmentHandler; @@ -146,7 +147,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) - public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { + public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { AccessoryRenderHelper.rotateIfSneaking(ms, player); ms.translate(0F, 0.2F, 0F); diff --git a/web/versions.ini b/web/versions.ini index 7bbe75329..f9478593b 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -321,4 +321,5 @@ r1.11-374=1.14.4 r1.11-375=1.14.4 r1.11-376=1.14.4 r1.11-377=1.14.4 -r1.11-379=1.15.2 \ No newline at end of file +r1.11-379=1.15.2 +r1.15-380=1.15.2 \ No newline at end of file