Fix rod models, made runic altar and avatar render their items

This commit is contained in:
Vincent Lee committed 2015-12-26 17:38:07 -06:00
1 parent 86cd656360
commit 73663e8a0a
7 files changed
+28 -58

No files matched your search

@@ -278,6 +278,9 @@ public final class ModelHandler {
registerItemModel(skyDirtRod);
registerItemModel(tornadoRod);
registerItemModel(terraformRod);
registerItemModel(tornadoRod);
ModelLoader.registerItemVariants(tornadoRod, new ModelResourceLocation("botania:tornadoRod_flying", "inventory"));
}
private static void registerManaResources() {
@@ -17,6 +17,7 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack;
@@ -62,29 +63,10 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer {
if(stack != null) {
GlStateManager.pushMatrix();
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
float s = 0.4F;
float s = 0.6F;
GlStateManager.scale(s, s, s);
GlStateManager.rotate(90F, 0F, 1F, 0F);
GlStateManager.rotate(180F, 0F, 0F, 1F);
GlStateManager.translate(-1.2F, -3.5F, -0.65F);
GlStateManager.rotate(20F, 0F, 0F, 1F);
// Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8
// int renderPass = 0;
// do {
// IIcon icon = stack.getItem().getIcon(stack, renderPass);
// if(icon != null) {
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
// 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 / 16F);
// GlStateManager.color(1F, 1F, 1F);
// }
// renderPass++;
// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
GlStateManager.translate(-0.5F, 2.125F, 0F); // todo 1.8 tweak held item render
Minecraft.getMinecraft().getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.THIRD_PERSON);
GlStateManager.popMatrix();
IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem();
@@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.item.EntityItem;
@@ -71,34 +72,8 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer {
if(stack != null) {
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
GlStateManager.scale(2F, 2F, 2F);
// mc.getRenderItem().renderItemModel(stack);
// if(!ForgeHooksClient.renderEntityItem(new EntityItem(altar.getWorld(), altar.xCoord, altar.yCoord, altar.zCoord, stack), stack, 0F, 0F, altar.getWorld().rand, mc.renderEngine, renderBlocks, 1)) {
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
// if(stack.getItem() instanceof ItemBlock && RenderBlocks.renderItemIn3d(Block.getBlockFromItem(stack.getItem()).getRenderType())) {
// GlStateManager.scale(0.5F, 0.5F, 0.5F);
// GlStateManager.translate(1F, 1.1F, 0F);
// renderBlocks.renderBlockAsItem(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 1F);
// GlStateManager.translate(-1F, -1.1F, 0F);
// GlStateManager.scale(2F, 2F, 2F);
// } else {
// int renderPass = 0;
// do {
// IIcon icon = stack.getItem().getIcon(stack, renderPass);
// if(icon != null) {
// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass));
// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue());
// 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 / 16F);
// GlStateManager.color(1F, 1F, 1F);
// }
// renderPass++;
// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage()));
// }
// }
mc.getRenderItem().func_181564_a(stack, ItemCameraTransforms.TransformType.GROUND);
}
GlStateManager.popMatrix();
}
@@ -45,7 +45,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable {
setStepSound(soundTypeWood);
setUnlocalizedName(LibBlockNames.AVATAR);
setBlockBounds(EnumFacing.Axis.Z);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH));
random = new Random();
}
@@ -56,11 +56,14 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable {
@Override
public int getMetaFromState(IBlockState state) {
return ((EnumFacing) state.getValue(BotaniaStateProps.CARDINALS)).getIndex();
return state.getValue(BotaniaStateProps.CARDINALS).getIndex();
}
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta < 2 || meta > 5) {
meta = 2;
}
return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.getFront(meta));
}
@@ -87,7 +90,7 @@ public class BlockAvatar extends BlockModContainer implements ILexiconable {
@Override
public void setBlockBoundsBasedOnState(IBlockAccess w, BlockPos pos) {
setBlockBounds(((EnumFacing) w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS)).getAxis());
setBlockBounds(w.getBlockState(pos).getValue(BotaniaStateProps.CARDINALS).getAxis());
}
public void setBlockBounds(EnumFacing.Axis horiz) {
@@ -12,6 +12,7 @@ package vazkii.botania.common.item.rod;
import java.util.List;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
@@ -104,10 +105,10 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi
}
// @Override todo 1.8
// public IIcon getIconIndex(ItemStack par1ItemStack) {
// return isFlying(par1ItemStack) ? iconFlying : iconIdle;
// }
@Override
public ModelResourceLocation getModel(ItemStack stack, EntityPlayer player, int useRemaining) {
return isFlying(stack) ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory");
}
@Override
public EnumAction getItemUseAction(ItemStack par1ItemStack) {
@@ -1,5 +1,5 @@
{
"parent": "botania:item/standard_item",
"parent": "botania:item/standard_tool",
"textures": {
"layer0": "botania:items/fireRod"
}
@@ -0,0 +1,6 @@
{
"parent": "botania:item/standard_item",
"textures": {
"layer0": "botania:items/tornadoRod1"
}
}