mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 20:22:33 +00:00
Put curio integration back
Curio rendering is handled by Curios again, gives us support for hiding them for free. The method is a little bit ugly but I'd rather avoid copying the logic that Curios has every time it changes
This commit is contained in:
1 parent
8b31cce0ef
commit
29686ede7b
23 files changed
+149
-162
No files matched your search
+3
-49
@@ -29,65 +29,19 @@ import vazkii.botania.common.item.ModItems;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
public final class BaubleRenderHandler extends LayerRenderer<AbstractClientPlayerEntity, PlayerModel<AbstractClientPlayerEntity>> {
|
||||
public final class ManaTabletRenderHandler extends LayerRenderer<AbstractClientPlayerEntity, PlayerModel<AbstractClientPlayerEntity>> {
|
||||
|
||||
public BaubleRenderHandler(IEntityRenderer<AbstractClientPlayerEntity, PlayerModel<AbstractClientPlayerEntity>> renderer) {
|
||||
public ManaTabletRenderHandler(IEntityRenderer<AbstractClientPlayerEntity, PlayerModel<AbstractClientPlayerEntity>> renderer) {
|
||||
super(renderer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(MatrixStack ms, IRenderTypeBuffer buffers, int light, @Nonnull AbstractClientPlayerEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
// todo 1.16 curios dispatchRenders(ms, buffers, light, player, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch);
|
||||
|
||||
if (ConfigHandler.CLIENT.renderAccessories.get() && player.getActivePotionEffect(Effects.INVISIBILITY) == null) {
|
||||
if (ConfigHandler.CLIENT.renderAccessories.get() && player.isInvisible()) {
|
||||
renderManaTablet(ms, buffers, player);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
// Like LayerCurios, but with Botania-specific logic
|
||||
private void dispatchRenders(MatrixStack ms, IRenderTypeBuffer buffers, int light, PlayerEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
ms.push();
|
||||
CuriosAPI.getCuriosHandler(player).ifPresent(handler -> {
|
||||
Map<String, CurioStackHandler> curios = handler.getCurioMap();
|
||||
|
||||
for (Map.Entry<String, CurioStackHandler> e : curios.entrySet()) {
|
||||
for (int i = 0; i < e.getValue().getSlots(); i++) {
|
||||
ItemStack stack = e.getValue().getStackInSlot(i);
|
||||
if (!stack.isEmpty()) {
|
||||
Item item = stack.getItem();
|
||||
ItemStack toRender = stack;
|
||||
|
||||
if (item instanceof IPhantomInkable) {
|
||||
IPhantomInkable inkable = (IPhantomInkable) item;
|
||||
if (inkable.hasPhantomInk(stack)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (item instanceof ICosmeticAttachable) {
|
||||
ICosmeticAttachable attachable = (ICosmeticAttachable) item;
|
||||
ItemStack cosmetic = attachable.getCosmeticItem(stack);
|
||||
if (!cosmetic.isEmpty()) {
|
||||
toRender = cosmetic;
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
ms.pop();
|
||||
}
|
||||
*/
|
||||
|
||||
private void renderManaTablet(MatrixStack ms, IRenderTypeBuffer buffers, PlayerEntity player) {
|
||||
boolean renderedOne = false;
|
||||
for (int i = 0; i < player.inventory.getSizeInventory(); i++) {
|
||||
@@ -310,14 +310,14 @@ public class ClientProxy implements IProxy {
|
||||
render = skinMap.get("default");
|
||||
render.addLayer(new ContributorFancinessHandler(render));
|
||||
if (Botania.curiosLoaded) {
|
||||
render.addLayer(new BaubleRenderHandler(render));
|
||||
render.addLayer(new ManaTabletRenderHandler(render));
|
||||
}
|
||||
render.addLayer(new LayerTerraHelmet(render));
|
||||
|
||||
render = skinMap.get("slim");
|
||||
render.addLayer(new ContributorFancinessHandler(render));
|
||||
if (Botania.curiosLoaded) {
|
||||
render.addLayer(new BaubleRenderHandler(render));
|
||||
render.addLayer(new ManaTabletRenderHandler(render));
|
||||
}
|
||||
render.addLayer(new LayerTerraHelmet(render));
|
||||
}
|
||||
|
||||
@@ -17,12 +17,12 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
import net.minecraftforge.event.TickEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.wrapper.InvWrapper;
|
||||
import net.minecraftforge.items.wrapper.RangedWrapper;
|
||||
|
||||
import vazkii.botania.api.mana.IManaItem;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.integration.curios.CurioIntegration;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemBauble;
|
||||
|
||||
import java.util.Arrays;
|
||||
@@ -35,11 +35,9 @@ public abstract class EquipmentHandler {
|
||||
|
||||
public static void init() {
|
||||
if (Botania.curiosLoaded) {
|
||||
/* todo 1.16 curios
|
||||
instance = new CurioIntegration();
|
||||
FMLJavaModLoadingContext.get().getModEventBus().addListener(CurioIntegration::sendImc);
|
||||
MinecraftForge.EVENT_BUS.addListener(CurioIntegration::keepCurioDrops);
|
||||
*/
|
||||
} else {
|
||||
InventoryEquipmentHandler handler = new InventoryEquipmentHandler();
|
||||
instance = handler;
|
||||
@@ -123,9 +121,6 @@ public abstract class EquipmentHandler {
|
||||
|
||||
@Override
|
||||
protected LazyOptional<IItemHandlerModifiable> getAllWornItems(LivingEntity living) {
|
||||
if (living instanceof PlayerEntity) {
|
||||
return LazyOptional.of(() -> new RangedWrapper(new InvWrapper(((PlayerEntity) living).inventory), 0, 9));
|
||||
}
|
||||
return LazyOptional.empty();
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.wrapper.EmptyHandler;
|
||||
|
||||
@@ -31,7 +30,6 @@ import vazkii.botania.api.corporea.IWrappedInventory;
|
||||
import vazkii.botania.api.corporea.InvWithLocation;
|
||||
import vazkii.botania.api.internal.IManaNetwork;
|
||||
import vazkii.botania.client.fx.SparkleParticleData;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia;
|
||||
import vazkii.botania.common.brew.ModBrews;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
@@ -239,11 +237,7 @@ public class BotaniaAPIImpl implements BotaniaAPI {
|
||||
|
||||
@Override
|
||||
public IItemHandlerModifiable getAccessoriesInventory(PlayerEntity player) {
|
||||
if (Botania.curiosLoaded) {
|
||||
LazyOptional<IItemHandlerModifiable> cap = EquipmentHandler.getAllWorn(player);
|
||||
return cap.orElseGet(EmptyHandler::new);
|
||||
}
|
||||
return new EmptyHandler();
|
||||
return EquipmentHandler.getAllWorn(player).orElseGet(EmptyHandler::new);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -8,48 +8,83 @@
|
||||
*/
|
||||
package vazkii.botania.common.integration.curios;
|
||||
|
||||
/*
|
||||
import com.google.common.collect.Multimap;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.IEntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.entity.model.EntityModel;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
import net.minecraftforge.fml.InterModComms;
|
||||
import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
|
||||
import org.apache.commons.lang3.tuple.ImmutableTriple;
|
||||
|
||||
import top.theillusivec4.curios.api.CuriosApi;
|
||||
import top.theillusivec4.curios.api.CuriosCapability;
|
||||
import top.theillusivec4.curios.api.SlotTypeMessage;
|
||||
import top.theillusivec4.curios.api.SlotTypePreset;
|
||||
import top.theillusivec4.curios.api.event.DropRulesEvent;
|
||||
import top.theillusivec4.curios.api.type.capability.ICurio;
|
||||
import top.theillusivec4.curios.api.type.capability.ICurio.DropRule;
|
||||
|
||||
import vazkii.botania.common.capability.SimpleCapProvider;
|
||||
import vazkii.botania.common.core.handler.EquipmentHandler;
|
||||
import vazkii.botania.common.core.handler.ModSounds;
|
||||
import vazkii.botania.common.item.ItemKeepIvy;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemBauble;
|
||||
|
||||
import java.util.function.Predicate;
|
||||
|
||||
// Classloading-safe way to attach curio behaviour to our items
|
||||
public class CurioIntegration extends EquipmentHandler {
|
||||
|
||||
public static void sendImc(InterModEnqueueEvent evt) {
|
||||
InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("charm"));
|
||||
InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("ring").setSize(2));
|
||||
InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("belt"));
|
||||
InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("body"));
|
||||
InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("head"));
|
||||
InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("necklace"));
|
||||
InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.CHARM.getMessageBuilder().build());
|
||||
InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.RING.getMessageBuilder().size(2).build());
|
||||
InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.BELT.getMessageBuilder().build());
|
||||
InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.BODY.getMessageBuilder().build());
|
||||
InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.HEAD.getMessageBuilder().build());
|
||||
InterModComms.sendTo("curios", SlotTypeMessage.REGISTER_TYPE, () -> SlotTypePreset.NECKLACE.getMessageBuilder().build());
|
||||
}
|
||||
|
||||
public static void keepCurioDrops(LivingCurioDropRulesEvent event) {
|
||||
public static void keepCurioDrops(DropRulesEvent event) { //TODO make this less hacky
|
||||
event.addOverride(stack -> {
|
||||
if (ItemKeepIvy.hasIvy(stack)) {
|
||||
stack.removeChildTag(ItemKeepIvy.TAG_KEEP);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}, ICurio.DropRule.ALWAYS_KEEP);
|
||||
}, DropRule.ALWAYS_KEEP);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected LazyOptional<IItemHandlerModifiable> getAllWornItems(LivingEntity living) {
|
||||
return CuriosAPI.getCuriosHandler(living).map(h -> {
|
||||
IItemHandlerModifiable[] invs = h.getCurioMap().values().toArray(new IItemHandlerModifiable[0]);
|
||||
return new CombinedInvWrapper(invs);
|
||||
});
|
||||
return CuriosApi.getCuriosHelper().getEquippedCurios(living);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ItemStack findItem(Item item, LivingEntity living) {
|
||||
return CuriosAPI.getCurioEquipped(item, living)
|
||||
return CuriosApi.getCuriosHelper().findEquippedCurio(item, living)
|
||||
.map(ImmutableTriple::getRight)
|
||||
.orElse(ItemStack.EMPTY);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ItemStack findItem(Predicate<ItemStack> pred, LivingEntity living) {
|
||||
return CuriosAPI.getCurioEquipped(pred, living)
|
||||
return CuriosApi.getCuriosHelper().findEquippedCurio(pred, living)
|
||||
.map(ImmutableTriple::getRight)
|
||||
.orElse(ItemStack.EMPTY);
|
||||
}
|
||||
@@ -76,17 +111,17 @@ public class CurioIntegration extends EquipmentHandler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCurioTick(String identifier, int index, LivingEntity entity) {
|
||||
public void curioTick(String identifier, int index, LivingEntity entity) {
|
||||
getItem().onWornTick(stack, entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEquipped(String identifier, LivingEntity entity) {
|
||||
public void onEquip(String identifier, int index, LivingEntity entity) {
|
||||
getItem().onEquipped(stack, entity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUnequipped(String identifier, LivingEntity entity) {
|
||||
public void onUnequip(String identifier, int index, LivingEntity entity) {
|
||||
getItem().onUnequipped(stack, entity);
|
||||
}
|
||||
|
||||
@@ -96,17 +131,17 @@ public class CurioIntegration extends EquipmentHandler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap<String, AttributeModifier> getAttributeModifiers(String identifier) {
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(String identifier) {
|
||||
return getItem().getEquippedAttributeModifiers(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldSyncToTracking(String identifier, LivingEntity entity) {
|
||||
public boolean canSync(String identifier, int index, LivingEntity livingEntity) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void playEquipSound(LivingEntity entity) {
|
||||
public void playRightClickEquipSound(LivingEntity entity) {
|
||||
entity.world.playSound(null, entity.getPosX(), entity.getPosY(), entity.getPosZ(), ModSounds.equipBauble, entity.getSoundCategory(), 0.1F, 1.3F);
|
||||
}
|
||||
|
||||
@@ -116,16 +151,29 @@ public class CurioIntegration extends EquipmentHandler {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasRender(String identifier, LivingEntity entity) {
|
||||
public boolean canRender(String identifier, int index, LivingEntity entity) {
|
||||
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) {}
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void render(String identifier, int index, MatrixStack matrixStack, IRenderTypeBuffer renderTypeBuffer, int light, LivingEntity livingEntity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
EntityRenderer<?> renderer = Minecraft.getInstance().getRenderManager().getRenderer(livingEntity);
|
||||
if (!(renderer instanceof IEntityRenderer<?, ?>)) {
|
||||
return;
|
||||
}
|
||||
EntityModel<?> model = ((IEntityRenderer<?, ?>) renderer).getEntityModel();
|
||||
if (!(model instanceof BipedModel<?>)) {
|
||||
return;
|
||||
}
|
||||
|
||||
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);
|
||||
ItemStack cosmetic = getItem().getCosmeticItem(stack);
|
||||
if (!cosmetic.isEmpty()) {
|
||||
cosmetic.getCapability(CuriosCapability.ITEM).ifPresent(
|
||||
curio -> curio.render(identifier, index, matrixStack, renderTypeBuffer, light, livingEntity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch));
|
||||
} else {
|
||||
getItem().doRender((BipedModel<?>) model, stack, livingEntity, matrixStack, renderTypeBuffer, light, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch);
|
||||
}
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
@@ -13,6 +13,7 @@ import com.google.common.collect.Multimap;
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
@@ -33,7 +34,6 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider;
|
||||
|
||||
import vazkii.botania.api.item.ICosmeticAttachable;
|
||||
import vazkii.botania.api.item.IPhantomInkable;
|
||||
import vazkii.botania.client.core.handler.BaubleRenderHandler;
|
||||
import vazkii.botania.client.core.handler.TooltipHandler;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.handler.EquipmentHandler;
|
||||
@@ -156,12 +156,11 @@ public abstract class ItemBauble extends Item implements ICosmeticAttachable, IP
|
||||
}
|
||||
|
||||
public boolean hasRender(ItemStack stack, LivingEntity living) {
|
||||
return !(stack.getItem() instanceof ICosmeticAttachable && !((ICosmeticAttachable) stack.getItem()).getCosmeticItem(stack).isEmpty())
|
||||
&& !(stack.getItem() instanceof IPhantomInkable && ((IPhantomInkable) stack.getItem()).hasPhantomInk(stack))
|
||||
return !hasPhantomInk(stack)
|
||||
&& ConfigHandler.CLIENT.renderAccessories.get()
|
||||
&& living.getActivePotionEffect(Effects.INVISIBILITY) == null;
|
||||
&& !living.isInvisible();
|
||||
}
|
||||
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {}
|
||||
public void doRender(BipedModel<?> bipedModel, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {}
|
||||
}
|
||||
@@ -12,6 +12,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
@@ -26,7 +27,6 @@ import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
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,10 +76,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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) {
|
||||
layer.getEntityModel().bipedHead.translateRotate(ms);
|
||||
bipedModel.bipedHead.translateRotate(ms);
|
||||
switch (variant) {
|
||||
case RED_GLASSES:
|
||||
case ENGINEER_GOGGLES:
|
||||
@@ -228,7 +228,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
|
||||
break;
|
||||
}
|
||||
} else { // body cosmetics
|
||||
layer.getEntityModel().bipedBody.translateRotate(ms);
|
||||
bipedModel.bipedBody.translateRotate(ms);
|
||||
switch (variant) {
|
||||
case BLACK_BOWTIE:
|
||||
ms.translate(0, 0.1, -0.13);
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
@@ -41,7 +42,6 @@ import vazkii.botania.api.brew.IBrewContainer;
|
||||
import vazkii.botania.api.brew.IBrewItem;
|
||||
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.brew.ModBrews;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
@@ -117,9 +117,9 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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();
|
||||
layer.getEntityModel().bipedBody.translateRotate(ms);
|
||||
bipedModel.bipedBody.translateRotate(ms);
|
||||
ms.translate(-0.25, 0.4, armor ? 0.05 : 0.12);
|
||||
ms.scale(0.5F, -0.5F, -0.5F);
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.entity.player.ClientPlayerEntity;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
@@ -24,7 +25,6 @@ import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.fml.DistExecutor;
|
||||
|
||||
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;
|
||||
@@ -65,9 +65,9 @@ public class ItemCloudPendant extends ItemBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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();
|
||||
layer.getEntityModel().bipedBody.translateRotate(ms);
|
||||
bipedModel.bipedBody.translateRotate(ms);
|
||||
ms.translate(-0.3, 0.4, armor ? 0.05 : 0.12);
|
||||
ms.scale(0.5F, -0.5F, -0.5F);
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -34,7 +35,6 @@ import net.minecraftforge.fml.server.ServerLifecycleHooks;
|
||||
|
||||
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,8 +100,8 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
layer.getEntityModel().bipedHead.translateRotate(ms);
|
||||
public void doRender(BipedModel<?> bipedModel, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
bipedModel.bipedHead.translateRotate(ms);
|
||||
ms.translate(0.15, -0.42, -0.35);
|
||||
ms.scale(0.4F, -0.4F, -0.4F);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.NO_OVERLAY, ms, buffers);
|
||||
|
||||
@@ -15,6 +15,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.AbstractGui;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
@@ -43,7 +44,6 @@ 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;
|
||||
@@ -307,7 +307,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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];
|
||||
|
||||
@@ -12,6 +12,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
@@ -27,7 +28,6 @@ import net.minecraftforge.event.world.ExplosionEvent;
|
||||
|
||||
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;
|
||||
|
||||
@@ -57,8 +57,8 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
layer.getEntityModel().bipedHead.translateRotate(ms);
|
||||
public void doRender(BipedModel<?> bipedModel, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
bipedModel.bipedHead.translateRotate(ms);
|
||||
ms.translate(0.275, -0.4, 0);
|
||||
ms.rotate(Vector3f.YP.rotationDegrees(-90F));
|
||||
ms.scale(0.55F, -0.55F, -0.55F);
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
@@ -26,7 +27,6 @@ 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;
|
||||
@@ -79,7 +79,7 @@ public class ItemHolyCloak extends ItemBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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();
|
||||
|
||||
@@ -16,6 +16,7 @@ import net.minecraft.block.Blocks;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.enchantment.FrostWalkerEnchantment;
|
||||
@@ -29,7 +30,6 @@ 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,9 +68,9 @@ public class ItemIcePendant extends ItemBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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();
|
||||
layer.getEntityModel().bipedBody.translateRotate(ms);
|
||||
bipedModel.bipedBody.translateRotate(ms);
|
||||
ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12);
|
||||
ms.scale(0.5F, -0.5F, -0.5F);
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ import it.unimi.dsi.fastutil.ints.IntArrayList;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -42,7 +43,6 @@ import net.minecraftforge.items.IItemHandler;
|
||||
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||
import net.minecraftforge.items.wrapper.InvWrapper;
|
||||
|
||||
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;
|
||||
@@ -75,9 +75,9 @@ public class ItemItemFinder extends ItemBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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();
|
||||
layer.getEntityModel().bipedHead.translateRotate(ms);
|
||||
bipedModel.bipedHead.translateRotate(ms);
|
||||
ms.translate(-0.35, -0.2, armor ? 0.05 : 0.1);
|
||||
ms.scale(0.75F, -0.75F, -0.75F);
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@ 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.lib.LibResources;
|
||||
|
||||
public class ItemKnockbackBelt extends ItemBauble {
|
||||
@@ -47,7 +46,7 @@ public class ItemKnockbackBelt extends ItemBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
AccessoryRenderHelper.rotateIfSneaking(ms, living);
|
||||
ms.translate(0F, 0.2F, 0F);
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
@@ -22,7 +23,6 @@ import net.minecraft.item.ItemStack;
|
||||
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 ItemLavaPendant extends ItemBauble {
|
||||
@@ -40,9 +40,9 @@ public class ItemLavaPendant extends ItemBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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();
|
||||
layer.getEntityModel().bipedBody.translateRotate(ms);
|
||||
bipedModel.bipedBody.translateRotate(ms);
|
||||
ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12);
|
||||
ms.scale(0.5F, -0.5F, -0.5F);
|
||||
IBakedModel model = MiscellaneousIcons.INSTANCE.pyroclastGem;
|
||||
|
||||
@@ -10,9 +10,15 @@ package vazkii.botania.common.item.equipment.bauble;
|
||||
|
||||
import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.block.*;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.ComparatorBlock;
|
||||
import net.minecraft.block.RedstoneWireBlock;
|
||||
import net.minecraft.block.RepeaterBlock;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
@@ -31,7 +37,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
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 {
|
||||
@@ -42,8 +47,8 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
layer.getEntityModel().bipedHead.translateRotate(ms);
|
||||
public void doRender(BipedModel<?> bipedModel, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
bipedModel.bipedHead.translateRotate(ms);
|
||||
ms.translate(0.15, -0.2, -0.25);
|
||||
ms.scale(0.3F, -0.3F, -0.3F);
|
||||
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.NO_OVERLAY, ms, buffers);
|
||||
@@ -88,26 +93,20 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
|
||||
}
|
||||
|
||||
public static boolean hasMonocle(PlayerEntity player) {
|
||||
return EquipmentHandler.getAllWorn(player).map(inv -> {
|
||||
for (int i = 0; i < inv.getSlots(); i++) {
|
||||
ItemStack stack = inv.getStackInSlot(i);
|
||||
if (!stack.isEmpty()) {
|
||||
Item item = stack.getItem();
|
||||
if (item instanceof IBurstViewerBauble) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (item instanceof ICosmeticAttachable) {
|
||||
ICosmeticAttachable attach = (ICosmeticAttachable) item;
|
||||
ItemStack cosmetic = attach.getCosmeticItem(stack);
|
||||
if (!cosmetic.isEmpty() && cosmetic.getItem() instanceof IBurstViewerBauble) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return !EquipmentHandler.findOrEmpty(stack -> {
|
||||
if (!stack.isEmpty()) {
|
||||
Item item = stack.getItem();
|
||||
if (item instanceof IBurstViewerBauble) {
|
||||
return true;
|
||||
}
|
||||
if (item instanceof ICosmeticAttachable) {
|
||||
ICosmeticAttachable attach = (ICosmeticAttachable) item;
|
||||
ItemStack cosmetic = attach.getCosmeticItem(stack);
|
||||
return !cosmetic.isEmpty() && cosmetic.getItem() instanceof IBurstViewerBauble;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}).orElse(false);
|
||||
}, player).isEmpty();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -14,6 +14,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
@@ -24,7 +25,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingHurtEvent;
|
||||
|
||||
import vazkii.botania.client.core.handler.BaubleRenderHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.common.core.handler.EquipmentHandler;
|
||||
|
||||
@@ -51,9 +51,9 @@ public class ItemSuperLavaPendant extends ItemBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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();
|
||||
layer.getEntityModel().bipedBody.translateRotate(ms);
|
||||
bipedModel.bipedBody.translateRotate(ms);
|
||||
ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12);
|
||||
ms.scale(0.5F, -0.5F, -0.5F);
|
||||
IBakedModel model = MiscellaneousIcons.INSTANCE.crimsonGem;
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Atlases;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -30,7 +31,6 @@ 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,12 +65,12 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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();
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
ms.push();
|
||||
layer.getEntityModel().bipedBody.translateRotate(ms);
|
||||
bipedModel.bipedBody.translateRotate(ms);
|
||||
|
||||
switch (i) {
|
||||
case 0:
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.mojang.blaze3d.matrix.MatrixStack;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.IRenderTypeBuffer;
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
import net.minecraft.client.renderer.texture.OverlayTexture;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.LivingEntity;
|
||||
@@ -26,7 +27,6 @@ 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;
|
||||
|
||||
@@ -51,8 +51,8 @@ public class ItemTinyPlanet extends ItemBauble {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
layer.getEntityModel().bipedHead.translateRotate(ms);
|
||||
public void doRender(BipedModel<?> bipedModel, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
|
||||
bipedModel.bipedHead.translateRotate(ms);
|
||||
ms.translate(-0.25, -0.4, 0);
|
||||
ms.scale(0.5F, -0.5F, -0.5F);
|
||||
Minecraft.getInstance().getBlockRendererDispatcher().renderBlock(ModBlocks.tinyPlanet.getDefaultState(), ms, buffers, light, OverlayTexture.NO_OVERLAY);
|
||||
|
||||
@@ -29,7 +29,6 @@ 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;
|
||||
|
||||
@@ -148,7 +147,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
|
||||
|
||||
@Override
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
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) {
|
||||
public void doRender(BipedModel<?> bipedModel, 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