General fixes.

This commit is contained in:
Lizbeth Rika committed 2014-09-26 21:09:38 +01:00
1 parent ae73299d8b
commit 42d28d93a0
5 files changed
+24 -6

No files matched your search

@@ -164,7 +164,7 @@ public final class TiaraWingRenderHandler {
Minecraft.getMinecraft().renderEngine.bindTexture(textureHalo);
GL11.glTranslated(0, -player.eyeHeight + (player.isSneaking() ? 0.0625 : 0), 0);
GL11.glTranslated(0, -player.getDefaultEyeHeight() + (player.isSneaking() ? 0.0625 : 0), 0);
GL11.glRotated(30, 1, 0, -1);
GL11.glTranslatef(-0.1F, -0.5F, -0.1F);
GL11.glRotatef(player.ticksExisted + partialTicks, 0, 1, 0);
@@ -17,6 +17,7 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.Item;
@@ -145,7 +146,9 @@ public class SubTileRannuncarpus extends SubTileFunctional {
int y = res.getScaledHeight() / 2 + 30;
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
new RenderItem().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y);
RenderHelper.enableGUIStandardItemLighting();
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y);
RenderHelper.disableStandardItemLighting();
}
GL11.glDisable(GL11.GL_LIGHTING);
@@ -15,6 +15,7 @@ import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -441,7 +442,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
mc.fontRenderer.drawStringWithShadow(lensName, x + 20, y + 5, color);
GL11.glDisable(GL11.GL_DEPTH_TEST);
new RenderItem().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, lens, x, y);
RenderHelper.enableGUIStandardItemLighting();
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, lens, x, y);
RenderHelper.disableStandardItemLighting();
GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_BLEND);
@@ -459,7 +462,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector,
int y = res.getScaledHeight() / 2 + 30;
mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color);
new RenderItem().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y);
RenderHelper.enableGUIStandardItemLighting();
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, recieverStack, x, y);
RenderHelper.disableStandardItemLighting();
}
GL11.glDisable(GL11.GL_LIGHTING);
@@ -83,11 +83,11 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.diviningRod);
addItem(ModItems.gravityRod);
addItem(ModItems.virus);
if(Botania.thaumcraftLoaded)
addItem(ModItems.manaInkwell);
addItem(ModItems.slingshot);
addItem(ModItems.vineBall);
addItem(ModItems.regenIvy);
if(Botania.thaumcraftLoaded)
addItem(ModItems.manaInkwell);
addBlock(ModBlocks.forestDrum);
addBlock(ModBlocks.forestEye);
addBlock(ModBlocks.enderEye);
@@ -11,7 +11,11 @@
*/
package vazkii.botania.common.item.interaction.thaumcraft;
import java.util.List;
import cpw.mods.fml.common.Optional;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@@ -37,6 +41,12 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools
setNoRepair();
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
list.add(new ItemStack(item, 1, USES));
list.add(new ItemStack(item));
}
@Override
public int getDamage(ItemStack stack) {
float mana = getMana(stack);