Those constants shouldn't be there or used

Also notes last commit in changelog
This commit is contained in:
Nick 2016-01-19 02:34:49 -08:00
parent fdfcb5c5b7
commit 470b5fce9c
4 changed files with 15 additions and 8 deletions

View file

@ -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 Version 2.0.0-6
------------------------------------------------------ ------------------------------------------------------

View file

@ -14,9 +14,6 @@ import java.util.List;
public class BloodMagicAPI public class BloodMagicAPI
{ {
public static final String ORB = "ItemBloodOrb";
public static final String SCRIBE = "ItemInscriptionTool";
@Getter @Getter
private static final List<BlockStack> teleposerBlacklist = new ArrayList<BlockStack>(); private static final List<BlockStack> teleposerBlacklist = new ArrayList<BlockStack>();

View file

@ -1,10 +1,12 @@
package WayofTime.bloodmagic.api.registry; package WayofTime.bloodmagic.api.registry;
import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.orb.BloodOrb; import WayofTime.bloodmagic.api.orb.BloodOrb;
import lombok.Getter; import lombok.Getter;
import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoader;
@ -23,6 +25,8 @@ public class OrbRegistry
@Getter @Getter
private static List<BloodOrb> orbs = new ArrayList<BloodOrb>(); private static List<BloodOrb> orbs = new ArrayList<BloodOrb>();
private static Item orbItem = Constants.BloodMagicItem.BLOOD_ORB.getItem();
public static void registerOrb(BloodOrb orb) public static void registerOrb(BloodOrb orb)
{ {
if (!orbs.contains(orb)) if (!orbs.contains(orb))
@ -36,8 +40,8 @@ public class OrbRegistry
{ {
int meta = getIndexOf(orb); int meta = getIndexOf(orb);
ModelBakery.registerItemVariants(BloodMagicAPI.getItem(BloodMagicAPI.ORB), resourceLocation); ModelBakery.registerItemVariants(orbItem, resourceLocation);
ModelLoader.setCustomModelResourceLocation(BloodMagicAPI.getItem(BloodMagicAPI.ORB), meta, new ModelResourceLocation(resourceLocation, "inventory")); ModelLoader.setCustomModelResourceLocation(orbItem, meta, new ModelResourceLocation(resourceLocation, "inventory"));
} }
public static BloodOrb getOrb(int index) public static BloodOrb getOrb(int index)
@ -62,6 +66,6 @@ public class OrbRegistry
public static ItemStack getOrbStack(BloodOrb orb) public static ItemStack getOrbStack(BloodOrb orb)
{ {
return new ItemStack(BloodMagicAPI.getItem(BloodMagicAPI.ORB), 1, getIndexOf(orb)); return new ItemStack(orbItem, 1, getIndexOf(orb));
} }
} }

View file

@ -1,6 +1,6 @@
package WayofTime.bloodmagic.api.ritual; package WayofTime.bloodmagic.api.ritual;
import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.IStringSerializable; import net.minecraft.util.IStringSerializable;
@ -26,7 +26,7 @@ public enum EnumRuneType implements IStringSerializable
public ItemStack getScribeStack() public ItemStack getScribeStack()
{ {
return new ItemStack(BloodMagicAPI.getItem(BloodMagicAPI.SCRIBE), 1, ordinal()); return new ItemStack(Constants.BloodMagicItem.INSCRIPTION_TOOL.getItem(), 1, ordinal());
} }
@Override @Override