mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
Use our own render path for curios so the layer can be passed in
This commit is contained in:
1 parent
7b979c430e
commit
52d47de619
20 files changed
+54
-29
No files matched your search
@@ -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<AbstractClientPlaye
|
||||
ItemStack stack = e.getValue().getStackInSlot(i);
|
||||
if (!stack.isEmpty()) {
|
||||
Item item = stack.getItem();
|
||||
ItemStack toRender = stack;
|
||||
|
||||
if (item instanceof IPhantomInkable) {
|
||||
IPhantomInkable inkable = (IPhantomInkable) item;
|
||||
@@ -76,15 +78,16 @@ public final class BaubleRenderHandler extends LayerRenderer<AbstractClientPlaye
|
||||
|
||||
if (item instanceof ICosmeticAttachable) {
|
||||
ICosmeticAttachable attachable = (ICosmeticAttachable) item;
|
||||
ItemStack cosmetic = attachable.getCosmeticItem(stack);
|
||||
cosmetic.getCapability(CuriosCapability.ITEM).ifPresent(c -> {
|
||||
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();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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) {}
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user