From 470b5fce9cbf5b098e3b8ab7d040623e83df1314 Mon Sep 17 00:00:00 2001
From: Nick <speedynutty68@gmail.com>
Date: Tue, 19 Jan 2016 02:34:49 -0800
Subject: [PATCH] Those constants shouldn't be there or used

Also notes last commit in changelog
---
 changelog.txt                                          |  6 ++++++
 .../java/WayofTime/bloodmagic/api/BloodMagicAPI.java   |  3 ---
 .../WayofTime/bloodmagic/api/registry/OrbRegistry.java | 10 +++++++---
 .../WayofTime/bloodmagic/api/ritual/EnumRuneType.java  |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 80cba06a..0ed03728 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+------------------------------------------------------
+Version 2.0.0-7
+------------------------------------------------------
+- [API] Method to easily get instances of Items and Blocks
+- JEI now displays more information for Altar recipes. Hover over the Altar image to view it.
+
 ------------------------------------------------------
 Version 2.0.0-6
 ------------------------------------------------------
diff --git a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java
index 6f985eb9..d13a3291 100644
--- a/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java
+++ b/src/main/java/WayofTime/bloodmagic/api/BloodMagicAPI.java
@@ -14,9 +14,6 @@ import java.util.List;
 
 public class BloodMagicAPI
 {
-    public static final String ORB = "ItemBloodOrb";
-    public static final String SCRIBE = "ItemInscriptionTool";
-
     @Getter
     private static final List<BlockStack> teleposerBlacklist = new ArrayList<BlockStack>();
 
diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
index cf88eb0b..7c1ce86d 100644
--- a/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
+++ b/src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
@@ -1,10 +1,12 @@
 package WayofTime.bloodmagic.api.registry;
 
 import WayofTime.bloodmagic.api.BloodMagicAPI;
+import WayofTime.bloodmagic.api.Constants;
 import WayofTime.bloodmagic.api.orb.BloodOrb;
 import lombok.Getter;
 import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
@@ -23,6 +25,8 @@ public class OrbRegistry
     @Getter
     private static List<BloodOrb> orbs = new ArrayList<BloodOrb>();
 
+    private static Item orbItem = Constants.BloodMagicItem.BLOOD_ORB.getItem();
+
     public static void registerOrb(BloodOrb orb)
     {
         if (!orbs.contains(orb))
@@ -36,8 +40,8 @@ public class OrbRegistry
     {
         int meta = getIndexOf(orb);
 
-        ModelBakery.registerItemVariants(BloodMagicAPI.getItem(BloodMagicAPI.ORB), resourceLocation);
-        ModelLoader.setCustomModelResourceLocation(BloodMagicAPI.getItem(BloodMagicAPI.ORB), meta, new ModelResourceLocation(resourceLocation, "inventory"));
+        ModelBakery.registerItemVariants(orbItem, resourceLocation);
+        ModelLoader.setCustomModelResourceLocation(orbItem, meta, new ModelResourceLocation(resourceLocation, "inventory"));
     }
 
     public static BloodOrb getOrb(int index)
@@ -62,6 +66,6 @@ public class OrbRegistry
 
     public static ItemStack getOrbStack(BloodOrb orb)
     {
-        return new ItemStack(BloodMagicAPI.getItem(BloodMagicAPI.ORB), 1, getIndexOf(orb));
+        return new ItemStack(orbItem, 1, getIndexOf(orb));
     }
 }
diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java
index 256a0a26..b619caca 100644
--- a/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java
+++ b/src/main/java/WayofTime/bloodmagic/api/ritual/EnumRuneType.java
@@ -1,6 +1,6 @@
 package WayofTime.bloodmagic.api.ritual;
 
-import WayofTime.bloodmagic.api.BloodMagicAPI;
+import WayofTime.bloodmagic.api.Constants;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IStringSerializable;
 
@@ -26,7 +26,7 @@ public enum EnumRuneType implements IStringSerializable
 
     public ItemStack getScribeStack()
     {
-        return new ItemStack(BloodMagicAPI.getItem(BloodMagicAPI.SCRIBE), 1, ordinal());
+        return new ItemStack(Constants.BloodMagicItem.INSCRIPTION_TOOL.getItem(), 1, ordinal());
     }
 
     @Override