summaryrefslogtreecommitdiff
path: root/src/main/java/darkknight
diff options
context:
space:
mode:
authorOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-25 13:17:09 +0100
committerOnyxDarkKnight <sor1n.iliutza16@gmail.com>2015-04-25 13:17:09 +0100
commit094d38d3e742cd2397f8f86b3f4fe762e064d790 (patch)
tree07680197962dd217de87c871e7d5a67172a48000 /src/main/java/darkknight
parent95c7c8611a0b61d8bd65e71466f96e283a20aef2 (diff)
Working api + hoping to fix jenkins build + trying to make blocks shiny
Diffstat (limited to 'src/main/java/darkknight')
-rw-r--r--src/main/java/darkknight/jewelrycraft/api/Curse.java (renamed from src/main/java/darkknight/jewelrycraft/curses/Curse.java)2
-rw-r--r--src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java (renamed from src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java)2
-rw-r--r--src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java5
-rw-r--r--src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java2
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseList.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/effects/EffectsList.java1
-rw-r--r--src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java2
-rw-r--r--src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java2
-rw-r--r--src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java2
-rw-r--r--src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java2
-rw-r--r--src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java57
-rw-r--r--src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java2
23 files changed, 71 insertions, 20 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/curses/Curse.java b/src/main/java/darkknight/jewelrycraft/api/Curse.java
index fd2a27b..618f5ae 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/Curse.java
+++ b/src/main/java/darkknight/jewelrycraft/api/Curse.java
@@ -1,4 +1,4 @@
-package darkknight.jewelrycraft.curses;
+package darkknight.jewelrycraft.api;
import java.util.ArrayList;
import java.util.Random;
diff --git a/src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java
index d3c8e38..1b930c9 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/ModifierEffects.java
+++ b/src/main/java/darkknight/jewelrycraft/api/ModifierEffects.java
@@ -1,4 +1,4 @@
-package darkknight.jewelrycraft.effects;
+package darkknight.jewelrycraft.api;
import java.util.ArrayList;
import java.util.Random;
diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
index 98b34f9..e2632ac 100644
--- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
+++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiTab.java
@@ -6,8 +6,9 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly (Side.CLIENT)
public abstract class GuiTab extends GuiRectangle
{
- int values, del;
- private String name;
+ protected int values;
+ protected int del;
+ protected String name;
/**
* @param name
diff --git a/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java b/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java
index c3e63e9..ebf7d8b 100644
--- a/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java
+++ b/src/main/java/darkknight/jewelrycraft/commands/JewelrycraftCommands.java
@@ -23,7 +23,7 @@ import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IChatComponent;
import darkknight.jewelrycraft.JewelrycraftMod;
-import darkknight.jewelrycraft.curses.Curse;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.events.EntityEventHandler;
import darkknight.jewelrycraft.network.PacketRequestPlayerInfo;
import darkknight.jewelrycraft.util.JewelryNBT;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
index 963e588..2a9f94e 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
@@ -1,5 +1,6 @@
package darkknight.jewelrycraft.curses;
+import darkknight.jewelrycraft.api.Curse;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
index b3d4967..4140a5c 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
@@ -1,5 +1,6 @@
package darkknight.jewelrycraft.curses;
+import darkknight.jewelrycraft.api.Curse;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
index 0093991..cc45877 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
@@ -1,5 +1,6 @@
package darkknight.jewelrycraft.curses;
+import darkknight.jewelrycraft.api.Curse;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
index 1f1628b..f888b40 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderPlayerEvent;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.damage.DamageSourceList;
import darkknight.jewelrycraft.entities.EntityHalfHeart;
import darkknight.jewelrycraft.entities.EntityHeart;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
index 8013dce..acaafd0 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
@@ -1,6 +1,7 @@
package darkknight.jewelrycraft.curses;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.util.Variables;
public class CurseList
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
index 8ea21ad..b665b0d 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
@@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.block.BlockList;
import darkknight.jewelrycraft.entities.EntityHalfHeart;
import darkknight.jewelrycraft.entities.EntityHeart;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
index a8f6900..938248f 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
@@ -9,6 +9,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderPlayerEvent;
import org.lwjgl.opengl.GL11;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.util.Variables;
public class CursePentagram extends Curse
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
index 26ef684..5bee390 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
@@ -4,6 +4,7 @@
package darkknight.jewelrycraft.curses;
import java.util.ArrayList;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.entities.EntityHalfHeart;
import darkknight.jewelrycraft.entities.EntityHeart;
import net.minecraft.entity.Entity;
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
index 3583833..4cfd635 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
@@ -1,5 +1,6 @@
package darkknight.jewelrycraft.curses;
+import darkknight.jewelrycraft.api.Curse;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
index fdcdd3b..1ddc364 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
@@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
+import darkknight.jewelrycraft.api.ModifierEffects;
import darkknight.jewelrycraft.item.ItemBracelet;
import darkknight.jewelrycraft.item.ItemEarrings;
import darkknight.jewelrycraft.item.ItemNecklace;
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
index 4c36593..39a1613 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
@@ -17,6 +17,7 @@ import net.minecraft.util.Vec3;
import net.minecraft.world.ChunkPosition;
import net.minecraft.world.biome.BiomeGenBase;
import cpw.mods.fml.relauncher.ReflectionHelper;
+import darkknight.jewelrycraft.api.ModifierEffects;
import darkknight.jewelrycraft.item.ItemBracelet;
import darkknight.jewelrycraft.item.ItemEarrings;
import darkknight.jewelrycraft.item.ItemNecklace;
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
index 512a25b..3a68957 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
@@ -16,6 +16,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumChatFormatting;
+import darkknight.jewelrycraft.api.ModifierEffects;
import darkknight.jewelrycraft.damage.DamageSourceList;
import darkknight.jewelrycraft.item.ItemBracelet;
import darkknight.jewelrycraft.item.ItemEarrings;
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
index 13abc48..b30fa0c 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectsList.java
@@ -1,6 +1,7 @@
package darkknight.jewelrycraft.effects;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import darkknight.jewelrycraft.api.ModifierEffects;
public class EffectsList
{
diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
index c608658..61d0955 100644
--- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java
@@ -35,7 +35,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import darkknight.jewelrycraft.JewelrycraftMod;
-import darkknight.jewelrycraft.curses.Curse;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.damage.DamageSourceList;
import darkknight.jewelrycraft.entities.EntityHalfHeart;
import darkknight.jewelrycraft.entities.EntityHeart;
diff --git a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
index 5106abd..92b84ab 100644
--- a/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/PlayerRenderHandler.java
@@ -14,7 +14,7 @@ import net.minecraftforge.client.event.RenderHandEvent;
import net.minecraftforge.client.event.RenderPlayerEvent;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import darkknight.jewelrycraft.curses.Curse;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.curses.CurseList;
import darkknight.jewelrycraft.item.render.BraceletRender;
import darkknight.jewelrycraft.item.render.EarringsRender;
diff --git a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
index 5f15ed5..88ce504 100644
--- a/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
+++ b/src/main/java/darkknight/jewelrycraft/events/ScreenHandler.java
@@ -11,7 +11,7 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import darkknight.jewelrycraft.curses.Curse;
+import darkknight.jewelrycraft.api.Curse;
import darkknight.jewelrycraft.util.Variables;
public class ScreenHandler extends Gui
diff --git a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
index cb38b76..bbd247c 100644
--- a/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
+++ b/src/main/java/darkknight/jewelrycraft/item/ItemBaseJewelry.java
@@ -27,7 +27,7 @@ import net.minecraft.util.StatCollector;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import darkknight.jewelrycraft.JewelrycraftMod;
-import darkknight.jewelrycraft.effects.ModifierEffects;
+import darkknight.jewelrycraft.api.ModifierEffects;
import darkknight.jewelrycraft.util.JewelryNBT;
public abstract class ItemBaseJewelry extends Item
diff --git a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java
index 0b6de4b..c8f7358 100644
--- a/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java
+++ b/src/main/java/darkknight/jewelrycraft/item/render/ItemRender.java
@@ -174,20 +174,10 @@ public class ItemRender implements IItemRenderer
ItemRenderer.renderItemIn2D(tessellator, f1, f2, f, f3, iicon.getIconWidth(), iicon.getIconHeight(), 0.0625F);
}
GL11.glDepthFunc(GL11.GL_EQUAL);
- texturemanager.bindTexture(RES_ITEM_GLINT);
- GL11.glEnable(GL11.GL_BLEND);
- OpenGlHelper.glBlendFunc(768, 1, 1, 0);
- GL11.glMatrixMode(GL11.GL_TEXTURE);
+ renderShine(tessellator);
GL11.glPushMatrix();
float f8 = 0.325F;
GL11.glScalef(f8, f8, f8);
- GL11.glTranslatef(17F, 0.0F, 0.0F);
- GL11.glRotatef(-30.0F, 0.0F, 0.0F, 1.0F);
- GL11.glColor3f(1F, 1F, 0F);
- ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F);
- GL11.glPopMatrix();
- GL11.glPushMatrix();
- GL11.glScalef(f8, f8, f8);
float f9 = (float)(Minecraft.getSystemTime() % 30000L) / 30000.0F * 8.0F;
GL11.glTranslatef(-f9, 0.0F, 0.0F);
GL11.glRotatef(30.0F, 0.0F, 0.0F, 1.0F);
@@ -562,29 +552,74 @@ public class ItemRender implements IItemRenderer
tessellator.setNormal(0.0F, -1.0F, 0.0F);
renderBlocksIr.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 0, damage));
tessellator.draw();
+ renderShine(tessellator);
+ GL11.glMatrixMode(GL11.GL_MODELVIEW);
+ GL11.glDisable(GL11.GL_BLEND);
+ GL11.glDepthFunc(GL11.GL_LEQUAL);
GL11.glColor4f(1F, 1F, 0F, 1.0F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 1.0F, 0.0F);
renderBlocksIr.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 1, damage));
tessellator.draw();
+// renderShine(tessellator);
+// GL11.glMatrixMode(GL11.GL_MODELVIEW);
+// GL11.glDisable(GL11.GL_BLEND);
+// GL11.glDepthFunc(GL11.GL_LEQUAL);
GL11.glColor4f(1F, 1F, 0F, 1.0F);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, -1.0F);
renderBlocksIr.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 2, damage));
tessellator.draw();
+// renderShine(tessellator);
+// GL11.glMatrixMode(GL11.GL_MODELVIEW);
+// GL11.glDisable(GL11.GL_BLEND);
+// GL11.glDepthFunc(GL11.GL_LEQUAL);
tessellator.startDrawingQuads();
tessellator.setNormal(0.0F, 0.0F, 1.0F);
renderBlocksIr.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 3, damage));
tessellator.draw();
+// renderShine(tessellator);
+// GL11.glMatrixMode(GL11.GL_MODELVIEW);
+// GL11.glDisable(GL11.GL_BLEND);
+// GL11.glDepthFunc(GL11.GL_LEQUAL);
tessellator.startDrawingQuads();
tessellator.setNormal(-1.0F, 0.0F, 0.0F);
renderBlocksIr.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 4, damage));
tessellator.draw();
+// renderShine(tessellator);
+// GL11.glMatrixMode(GL11.GL_MODELVIEW);
+// GL11.glDisable(GL11.GL_BLEND);
+// GL11.glDepthFunc(GL11.GL_LEQUAL);
tessellator.startDrawingQuads();
tessellator.setNormal(1.0F, 0.0F, 0.0F);
renderBlocksIr.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderBlocksIr.getBlockIconFromSideAndMetadata(block, 5, damage));
tessellator.draw();
+// renderShine(tessellator);
+// GL11.glMatrixMode(GL11.GL_MODELVIEW);
+// GL11.glDisable(GL11.GL_BLEND);
+// GL11.glDepthFunc(GL11.GL_LEQUAL);
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
}
}
+
+ public void renderShine(Tessellator tessellator)
+ {
+ TextureManager texturemanager = this.mc.getTextureManager();
+ texturemanager.bindTexture(RES_ITEM_GLINT);
+ GL11.glEnable(GL11.GL_BLEND);
+ OpenGlHelper.glBlendFunc(768, 1, 1, 0);
+ GL11.glMatrixMode(GL11.GL_TEXTURE);
+ GL11.glPushMatrix();
+ float f8 = 0.325F;
+ GL11.glScalef(f8, f8, f8);
+ GL11.glTranslatef(17F, 0.0F, 0.0F);
+ GL11.glRotatef(-30.0F, 0.0F, 0.0F, 1.0F);
+ GL11.glColor3f(1F, 1F, 0F);
+ ItemRenderer.renderItemIn2D(tessellator, 0.0F, 0.0F, 1.0F, 1.0F, 256, 256, 0.0625F);
+// tessellator.addVertexWithUV(0.0D, 0.0D, 0.0D, (double)0F, (double)1F);
+// tessellator.addVertexWithUV(1.0D, 0.0D, 0.0D, (double)1F, (double)1F);
+// tessellator.addVertexWithUV(1.0D, 1.0D, 0.0D, (double)1F, (double)0F);
+// tessellator.addVertexWithUV(0.0D, 1.0D, 0.0D, (double)0F, (double)0F);
+ GL11.glPopMatrix();
+ }
}
diff --git a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
index 1d6e4b1..144f653 100644
--- a/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
+++ b/src/main/java/darkknight/jewelrycraft/util/JewelrycraftUtil.java
@@ -12,6 +12,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
+import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameData;
import darkknight.jewelrycraft.JewelrycraftMod;
import darkknight.jewelrycraft.events.EntityEventHandler;
@@ -51,6 +52,7 @@ public class JewelrycraftUtil
jewelry.add(new ItemStack(ItemList.earrings));
for(Object item: GameData.getItemRegistry()){
ArrayList<ItemStack> items = new ArrayList<ItemStack>();
+ if (Loader.isModLoaded("Mantle") && ((Item)item).getUnlocalizedName().equals("Mantle:item.mantle.manual")) continue;
if (item != null && ((Item)item).getHasSubtypes()) ((Item)item).getSubItems((Item)item, null, items);
else objects.add(new ItemStack((Item)item));