lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up some logging + protect against negative values in Altar Recipes

Browse source
This commit is contained in:
Nick 2015-12-23 09:41:59 -08:00
parent 43f2bdd28a
commit 61b2b293ba
6 changed files with 20 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/WayofTime/bloodmagic/api/registry/OrbRegistry.java
View file

@ -26,15 +26,15 @@ public class OrbRegistry {
if (!orbs.contains(orb))
orbs.add(orb);
else
BloodMagicAPI.getLogger().error("Error adding orb: " + orb.toString() + ". Orb already exists!");
BloodMagicAPI.getLogger().error("Error adding orb %s. Orb already exists!", orb.toString());
}
@SideOnly(Side.CLIENT)
public static void registerOrbTexture(BloodOrb orb, String resourceLocation) {
int meta = getIndexOf(orb);
ModelBakery.addVariantName(BloodMagicAPI.getOrbItem(), resourceLocation);
ModelLoader.setCustomModelResourceLocation(BloodMagicAPI.getOrbItem(), meta, new ModelResourceLocation(resourceLocation, "inventory"));
ModelBakery.addVariantName(BloodMagicAPI.getItem(BloodMagicAPI.ORB), resourceLocation);
ModelLoader.setCustomModelResourceLocation(BloodMagicAPI.getItem(BloodMagicAPI.ORB), meta, new ModelResourceLocation(resourceLocation, "inventory"));
}
public static BloodOrb getOrb(int index) {
@ -54,6 +54,6 @@ public class OrbRegistry {
}
public static ItemStack getOrbStack(BloodOrb orb) {
return new ItemStack(BloodMagicAPI.getOrbItem(), 1, getIndexOf(orb));
return new ItemStack(BloodMagicAPI.getItem(BloodMagicAPI.ORB), 1, getIndexOf(orb));
}
}