mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
Blood, ice, lava, super lava pendants and itemfinder bauble renders
This commit is contained in:
1 parent
a13d6fca53
commit
4448a6a498
6 files changed
+72
-56
No files matched your search
@@ -75,6 +75,16 @@ public class MiscellaneousIcons {
|
||||
public TextureAtlasSprite nerfBatIcon = null;
|
||||
// end dank_memes
|
||||
|
||||
// Icons for baubles that don't render their own model on the player
|
||||
public TextureAtlasSprite
|
||||
bloodPendantChain,
|
||||
bloodPendantGem,
|
||||
snowflakePendantGem,
|
||||
itemFinderGem,
|
||||
pyroclastGem,
|
||||
crimsonGem;
|
||||
|
||||
|
||||
@SubscribeEvent
|
||||
public void onModelBake(ModelBakeEvent evt) {
|
||||
// BlockSpecialFlower
|
||||
@@ -141,6 +151,13 @@ public class MiscellaneousIcons {
|
||||
}
|
||||
|
||||
terrasteelHelmWillIcon = IconHelper.forName(evt.map, "willFlame", "items");
|
||||
|
||||
bloodPendantChain = IconHelper.forName(evt.map, "bloodPendant2", "items");
|
||||
bloodPendantGem = IconHelper.forName(evt.map, "bloodPendant3", "items");
|
||||
snowflakePendantGem = IconHelper.forName(evt.map, "icePendantGem", "items");
|
||||
itemFinderGem = IconHelper.forName(evt.map, "itemFinderGem", "items");
|
||||
pyroclastGem = IconHelper.forName(evt.map, "lavaPendantGem", "items");
|
||||
crimsonGem = IconHelper.forName(evt.map, "superLavaPendantGem", "items");
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
@@ -16,6 +16,8 @@ import java.util.List;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -39,6 +41,8 @@ import vazkii.botania.api.item.IBaubleRender;
|
||||
import vazkii.botania.api.mana.IManaUsingItem;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
import vazkii.botania.client.core.handler.ClientTickHandler;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import baubles.api.BaubleType;
|
||||
@@ -171,13 +175,12 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
|
||||
GlStateManager.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F);
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
|
||||
for(int i = 2; i < 4; i++) {
|
||||
/*IIcon icon = icons[i]; todo 1.8
|
||||
for(TextureAtlasSprite icon : new TextureAtlasSprite[] { MiscellaneousIcons.INSTANCE.bloodPendantChain, MiscellaneousIcons.INSTANCE.bloodPendantGem }) {
|
||||
float f = icon.getMinU();
|
||||
float f1 = icon.getMaxU();
|
||||
float f2 = icon.getMinV();
|
||||
float f3 = icon.getMaxV();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);*/
|
||||
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 32F);
|
||||
|
||||
Color color = new Color(getColorFromItemStack(stack, 1));
|
||||
GL11.glColor3ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
|
||||
|
||||
@@ -17,6 +17,11 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.block.BlockLiquid;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -26,12 +31,13 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import vazkii.botania.api.item.IBaubleRender;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import baubles.api.BaubleType;
|
||||
|
||||
public class ItemIcePendant extends ItemBauble implements IBaubleRender {
|
||||
|
||||
//IIcon gemIcon;
|
||||
public static Map<String, List<IceRemover>> playerIceBlocks = new HashMap();
|
||||
|
||||
public ItemIcePendant() {
|
||||
@@ -43,12 +49,6 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender {
|
||||
return BaubleType.AMULET;
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public void registerIcons(IIconRegister par1IconRegister) {
|
||||
super.registerIcons(par1IconRegister);
|
||||
gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem");
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void onWornTick(ItemStack stack, EntityLivingBase entity) {
|
||||
super.onWornTick(stack, entity);
|
||||
@@ -102,21 +102,22 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender {
|
||||
|
||||
@Override
|
||||
public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
|
||||
/*if(type == RenderType.BODY) { todo 1.8
|
||||
if(type == RenderType.BODY) {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
Helper.rotateIfSneaking(event.entityPlayer);
|
||||
boolean armor = event.entityPlayer.getCurrentArmor(2) != null;
|
||||
Helper.rotateIfSneaking(player);
|
||||
boolean armor = player.getCurrentArmor(2) != null;
|
||||
GlStateManager.rotate(180F, 1F, 0F, 0F);
|
||||
GlStateManager.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F);
|
||||
GlStateManager.rotate(-45F, 0F, 0F, 1F);
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
|
||||
TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.snowflakePendantGem;
|
||||
float f = gemIcon.getMinU();
|
||||
float f1 = gemIcon.getMaxU();
|
||||
float f2 = gemIcon.getMinV();
|
||||
float f3 = gemIcon.getMaxV();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F);
|
||||
}*/
|
||||
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F);
|
||||
}
|
||||
}
|
||||
|
||||
class IceRemover {
|
||||
|
||||
@@ -13,6 +13,11 @@ package vazkii.botania.common.item.equipment.bauble;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
@@ -29,6 +34,8 @@ import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.village.MerchantRecipe;
|
||||
|
||||
import vazkii.botania.api.item.IBaubleRender;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
@@ -44,19 +51,12 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemItemFinder extends ItemBauble implements IBaubleRender {
|
||||
|
||||
//IIcon gemIcon;
|
||||
private static final String TAG_POSITIONS = "highlightPositions";
|
||||
|
||||
public ItemItemFinder() {
|
||||
super(LibItemNames.ITEM_FINDER);
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public void registerIcons(IIconRegister par1IconRegister) {
|
||||
super.registerIcons(par1IconRegister);
|
||||
gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem");
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void onWornTick(ItemStack stack, EntityLivingBase player) {
|
||||
super.onWornTick(stack, player);
|
||||
@@ -203,22 +203,21 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
|
||||
/* todo 1.8
|
||||
TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.itemFinderGem;
|
||||
if(type == RenderType.HEAD) {
|
||||
float f = gemIcon.getMinU();
|
||||
float f1 = gemIcon.getMaxU();
|
||||
float f2 = gemIcon.getMinV();
|
||||
float f3 = gemIcon.getMaxV();
|
||||
boolean armor = event.entityPlayer.getCurrentArmor(3) != null;
|
||||
Helper.translateToHeadLevel(event.entityPlayer);
|
||||
boolean armor = player.getCurrentArmor(3) != null;
|
||||
Helper.translateToHeadLevel(player);
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
GlStateManager.rotate(90F, 0F, 1F, 0F);
|
||||
GlStateManager.rotate(180F, 1F, 0F, 0F);
|
||||
GlStateManager.translate(-0.4F, 0.1F, armor ? -0.3F : -0.25F);
|
||||
GlStateManager.translate(-0.4F, -1.4F, armor ? -0.3F : -0.25F);
|
||||
GlStateManager.scale(0.75F, 0.75F, 0.75F);
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F);
|
||||
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 16F);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,18 +10,23 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.bauble;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import vazkii.botania.api.item.IBaubleRender;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import baubles.api.BaubleType;
|
||||
|
||||
public class ItemLavaPendant extends ItemBauble implements IBaubleRender {
|
||||
|
||||
//IIcon gemIcon;
|
||||
|
||||
public ItemLavaPendant() {
|
||||
super(LibItemNames.LAVA_PENDANT);
|
||||
}
|
||||
@@ -37,31 +42,24 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender {
|
||||
return BaubleType.AMULET;
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public void registerIcons(IIconRegister par1IconRegister) {
|
||||
super.registerIcons(par1IconRegister);
|
||||
gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem");
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
|
||||
/* todo 1.8
|
||||
if(type == RenderType.BODY) {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
|
||||
Helper.rotateIfSneaking(event.entityPlayer);
|
||||
boolean armor = event.entityPlayer.getCurrentArmor(2) != null;
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
Helper.rotateIfSneaking(player);
|
||||
boolean armor = player.getCurrentArmor(2) != null;
|
||||
GlStateManager.rotate(180F, 1F, 0F, 0F);
|
||||
GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F);
|
||||
GlStateManager.rotate(-45F, 0F, 0F, 1F);
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
|
||||
TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.pyroclastGem;
|
||||
float f = gemIcon.getMinU();
|
||||
float f1 = gemIcon.getMaxU();
|
||||
float f2 = gemIcon.getMinV();
|
||||
float f3 = gemIcon.getMaxV();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F);
|
||||
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
}
|
||||
+12
-14
@@ -10,12 +10,19 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.bauble;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import vazkii.botania.api.item.IBaubleRender;
|
||||
import vazkii.botania.client.core.handler.MiscellaneousIcons;
|
||||
import vazkii.botania.client.core.helper.IconHelper;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
import baubles.api.BaubleType;
|
||||
@@ -23,8 +30,6 @@ import net.minecraftforge.fml.relauncher.ReflectionHelper;
|
||||
|
||||
public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender {
|
||||
|
||||
//IIcon gemIcon;
|
||||
|
||||
public ItemSuperLavaPendant() {
|
||||
super(LibItemNames.SUPER_LAVA_PENDANT);
|
||||
}
|
||||
@@ -48,30 +53,23 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender {
|
||||
return BaubleType.AMULET;
|
||||
}
|
||||
|
||||
/*@Override
|
||||
public void registerIcons(IIconRegister par1IconRegister) {
|
||||
super.registerIcons(par1IconRegister);
|
||||
gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem");
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
|
||||
/* todo 1.8
|
||||
if(type == RenderType.BODY) {
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture);
|
||||
Helper.rotateIfSneaking(event.entityPlayer);
|
||||
boolean armor = event.entityPlayer.getCurrentArmor(2) != null;
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
Helper.rotateIfSneaking(player);
|
||||
boolean armor = player.getCurrentArmor(2) != null;
|
||||
GlStateManager.rotate(180F, 1F, 0F, 0F);
|
||||
GlStateManager.translate(-0.36F, -0.24F, armor ? 0.2F : 0.15F);
|
||||
GlStateManager.rotate(-45F, 0F, 0F, 1F);
|
||||
GlStateManager.scale(0.5F, 0.5F, 0.5F);
|
||||
|
||||
TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.crimsonGem;
|
||||
float f = gemIcon.getMinU();
|
||||
float f1 = gemIcon.getMaxU();
|
||||
float f2 = gemIcon.getMinV();
|
||||
float f3 = gemIcon.getMaxV();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F);
|
||||
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getIconWidth(), gemIcon.getIconHeight(), 1F / 32F);
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user