Update mappings + dependencies

This commit is contained in:
Nicholas Ignoffo 2019-01-31 19:10:37 -08:00
parent 1426e49164
commit 83f0eefa15
147 changed files with 224 additions and 223 deletions

View file

@ -2,11 +2,11 @@ mod_name=BloodMagic
package_group=com.wayoftime.bloodmagic package_group=com.wayoftime.bloodmagic
mod_version=2.3.3 mod_version=2.3.3
mc_version=1.12.2 mc_version=1.12.2
forge_version=14.23.2.2611 forge_version=14.23.5.2808
curse_id=224791 curse_id=224791
mappings_version=snapshot_20180201 mappings_version=stable_39
jei_version=4.8.5.147 jei_version=4.14.4.264
waila_version=1.8.23-B38_1.12 waila_version=1.8.26-B41_1.12.2
guideapi_version=1.12-2.1.4-57 guideapi_version=1.12-2.1.8-63

View file

@ -42,13 +42,13 @@ public class BloodMagic {
public static final RitualManager RITUAL_MANAGER = new RitualManager(new Configuration(new File(Loader.instance().getConfigDir(), MODID + "/" + "rituals.cfg"))); public static final RitualManager RITUAL_MANAGER = new RitualManager(new Configuration(new File(Loader.instance().getConfigDir(), MODID + "/" + "rituals.cfg")));
public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") { public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") {
@Override @Override
public ItemStack getTabIconItem() { public ItemStack createIcon() {
return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK); return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK);
} }
}; };
public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") { public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") {
@Override @Override
public ItemStack getTabIconItem() { public ItemStack createIcon() {
return new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME); return new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
} }

View file

@ -89,7 +89,7 @@ public class AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP; EnumFacing sideHit = EnumFacing.UP;
EnumFacing rotation = tileArray.getRotation(); EnumFacing rotation = tileArray.getRotation();
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit) { switch (sideHit) {
case DOWN: case DOWN:

View file

@ -36,7 +36,7 @@ public class BlockAlchemyArray extends Block {
public BlockAlchemyArray() { public BlockAlchemyArray() {
super(Material.CLOTH); super(Material.CLOTH);
setUnlocalizedName(BloodMagic.MODID + ".alchemyArray"); setTranslationKey(BloodMagic.MODID + ".alchemyArray");
setHardness(0.1f); setHardness(0.1f);
} }
@ -46,7 +46,7 @@ public class BlockAlchemyArray extends Block {
} }
@Override @Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) { public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) {
TileEntity tile = world.getTileEntity(pos); TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileAlchemyArray) { if (tile instanceof TileAlchemyArray) {
((TileAlchemyArray) tile).onEntityCollidedWithBlock(state, entity); ((TileAlchemyArray) tile).onEntityCollidedWithBlock(state, entity);
@ -60,7 +60,7 @@ public class BlockAlchemyArray extends Block {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() { public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT; return BlockRenderLayer.CUTOUT;
} }

View file

@ -33,7 +33,7 @@ public class BlockAlchemyTable extends Block implements IBMBlock {
super(Material.ROCK); super(Material.ROCK);
// this.setDefaultState(this.blockState.getBaseState().withProperty(DIRECTION, EnumFacing.DOWN).withProperty(INVISIBLE, false)); // this.setDefaultState(this.blockState.getBaseState().withProperty(DIRECTION, EnumFacing.DOWN).withProperty(INVISIBLE, false));
setUnlocalizedName(BloodMagic.MODID + ".alchemyTable"); setTranslationKey(BloodMagic.MODID + ".alchemyTable");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -44,7 +44,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl
public BlockAltar() { public BlockAltar() {
super(Material.ROCK); super(Material.ROCK);
setUnlocalizedName(BloodMagic.MODID + ".altar"); setTranslationKey(BloodMagic.MODID + ".altar");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -28,7 +28,7 @@ public class BlockBloodLight extends Block {
public BlockBloodLight() { public BlockBloodLight() {
super(Material.CLOTH); super(Material.CLOTH);
setUnlocalizedName(BloodMagic.MODID + ".bloodLight"); setTranslationKey(BloodMagic.MODID + ".bloodLight");
} }
@Override @Override
@ -49,7 +49,7 @@ public class BlockBloodLight extends Block {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() { public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT; return BlockRenderLayer.CUTOUT;
} }

View file

@ -22,7 +22,7 @@ public class BlockBloodRune extends BlockEnum<BloodRuneType> implements IBloodRu
public BlockBloodRune() { public BlockBloodRune() {
super(Material.ROCK, BloodRuneType.class); super(Material.ROCK, BloodRuneType.class);
setUnlocalizedName(BloodMagic.MODID + ".rune."); setTranslationKey(BloodMagic.MODID + ".rune.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setSoundType(SoundType.STONE); setSoundType(SoundType.STONE);
setHardness(2.0F); setHardness(2.0F);

View file

@ -39,7 +39,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB
public BlockBloodTank() { public BlockBloodTank() {
super(Material.IRON, TileBloodTank.CAPACITIES.length - 1, "tier"); super(Material.IRON, TileBloodTank.CAPACITIES.length - 1, "tier");
setUnlocalizedName(BloodMagic.MODID + ".bloodTank"); setTranslationKey(BloodMagic.MODID + ".bloodTank");
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setSoundType(SoundType.GLASS); setSoundType(SoundType.GLASS);
@ -60,7 +60,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() { public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED; return BlockRenderLayer.CUTOUT_MIPPED;
} }
@ -91,7 +91,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB
if (success) { if (success) {
world.checkLight(blockPos); world.checkLight(blockPos);
world.updateComparatorOutputLevel(blockPos, this); world.updateComparatorOutputLevel(blockPos, this);
world.markAndNotifyBlock(blockPos, world.getChunkFromBlockCoords(blockPos), state, state, 3); world.markAndNotifyBlock(blockPos, world.getChunk(blockPos), state, state, 3);
return true; return true;
} }
@ -138,7 +138,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB
world.checkLight(pos); world.checkLight(pos);
world.updateComparatorOutputLevel(pos, this); world.updateComparatorOutputLevel(pos, this);
world.markAndNotifyBlock(pos, world.getChunkFromBlockCoords(pos), blockState, blockState, 3); world.markAndNotifyBlock(pos, world.getChunk(pos), blockState, blockState, 3);
} }
@Override @Override

View file

@ -14,7 +14,7 @@ public class BlockDecorative extends BlockEnum<EnumDecorative> {
public BlockDecorative() { public BlockDecorative() {
super(Material.ROCK, EnumDecorative.class); super(Material.ROCK, EnumDecorative.class);
setUnlocalizedName(BloodMagic.MODID + "."); setTranslationKey(BloodMagic.MODID + ".");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -11,7 +11,7 @@ public class BlockDemonBase<E extends Enum<E> & IStringSerializable> extends Blo
public BlockDemonBase(String baseName, Class<E> enumClass) { public BlockDemonBase(String baseName, Class<E> enumClass) {
super(Material.ROCK, enumClass); super(Material.ROCK, enumClass);
setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -49,7 +49,7 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl
public BlockDemonCrucible() { public BlockDemonCrucible() {
super(Material.ROCK); super(Material.ROCK);
setUnlocalizedName(BloodMagic.MODID + ".demonCrucible"); setTranslationKey(BloodMagic.MODID + ".demonCrucible");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -105,7 +105,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid
super(Material.ROCK); super(Material.ROCK);
this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, EnumFacing.UP)); this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, EnumFacing.UP));
setUnlocalizedName(BloodMagic.MODID + ".demonCrystal."); setTranslationKey(BloodMagic.MODID + ".demonCrystal.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -21,7 +21,7 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr
public BlockDemonCrystallizer() { public BlockDemonCrystallizer() {
super(Material.ROCK); super(Material.ROCK);
setUnlocalizedName(BloodMagic.MODID + ".demonCrystallizer"); setTranslationKey(BloodMagic.MODID + ".demonCrystallizer");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -10,7 +10,7 @@ public class BlockDemonLight extends BlockEnum<EnumSubWillType> {
public BlockDemonLight() { public BlockDemonLight() {
super(Material.ROCK, EnumSubWillType.class); super(Material.ROCK, EnumSubWillType.class);
setUnlocalizedName(BloodMagic.MODID + ".demonlight."); setTranslationKey(BloodMagic.MODID + ".demonlight.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -14,7 +14,7 @@ public class BlockDemonPillarBase<E extends Enum<E> & IStringSerializable> exten
public BlockDemonPillarBase(String baseName, Material materialIn, Class<E> enumClass) { public BlockDemonPillarBase(String baseName, Material materialIn, Class<E> enumClass) {
super(materialIn, enumClass); super(materialIn, enumClass);
setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -14,7 +14,7 @@ public class BlockDemonPillarCapBase<E extends Enum<E> & IStringSerializable> ex
public BlockDemonPillarCapBase(String baseName, Material materialIn, Class<E> enumClass) { public BlockDemonPillarCapBase(String baseName, Material materialIn, Class<E> enumClass) {
super(materialIn, enumClass); super(materialIn, enumClass);
setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -36,7 +36,7 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian
public BlockDemonPylon() { public BlockDemonPylon() {
super(Material.ROCK); super(Material.ROCK);
setUnlocalizedName(BloodMagic.MODID + ".demonPylon"); setTranslationKey(BloodMagic.MODID + ".demonPylon");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -11,7 +11,7 @@ public class BlockDemonStairsBase<E extends Enum<E> & IStringSerializable> exten
public BlockDemonStairsBase(String baseName, Material materialIn, Class<E> enumClass) { public BlockDemonStairsBase(String baseName, Material materialIn, Class<E> enumClass) {
super(materialIn, enumClass); super(materialIn, enumClass);
setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -11,7 +11,7 @@ public class BlockDemonWallBase<E extends Enum<E> & IStringSerializable> extends
public BlockDemonWallBase(String baseName, Material materialIn, Class<E> enumClass) { public BlockDemonWallBase(String baseName, Material materialIn, Class<E> enumClass) {
super(materialIn, enumClass); super(materialIn, enumClass);
setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -32,7 +32,7 @@ public class BlockDimensionalPortal extends BlockInteger {
public BlockDimensionalPortal() { public BlockDimensionalPortal() {
super(Material.PORTAL, 2); super(Material.PORTAL, 2);
setUnlocalizedName(BloodMagic.MODID + ".dimensionalPortal"); setTranslationKey(BloodMagic.MODID + ".dimensionalPortal");
setBlockUnbreakable(); setBlockUnbreakable();
setResistance(2000); setResistance(2000);
setLightOpacity(0); setLightOpacity(0);
@ -72,7 +72,7 @@ public class BlockDimensionalPortal extends BlockInteger {
} }
@Override @Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState blockState, Entity entity) { public void onEntityCollision(World world, BlockPos pos, IBlockState blockState, Entity entity) {
if (!world.isRemote && world.getTileEntity(pos) instanceof TileDimensionalPortal) { if (!world.isRemote && world.getTileEntity(pos) instanceof TileDimensionalPortal) {
TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos); TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos);
@ -129,7 +129,7 @@ public class BlockDimensionalPortal extends BlockInteger {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() { public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT; return BlockRenderLayer.TRANSLUCENT;
} }

View file

@ -22,7 +22,7 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo
public BlockIncenseAltar() { public BlockIncenseAltar() {
super(Material.ROCK); super(Material.ROCK);
setUnlocalizedName(BloodMagic.MODID + ".incenseAltar"); setTranslationKey(BloodMagic.MODID + ".incenseAltar");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -17,7 +17,7 @@ public class BlockInputRoutingNode extends BlockRoutingNode {
public BlockInputRoutingNode() { public BlockInputRoutingNode() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".inputRouting"); setTranslationKey(BloodMagic.MODID + ".inputRouting");
} }
@Override @Override

View file

@ -20,7 +20,7 @@ public class BlockInversionPillar extends BlockEnum<EnumSubWillType> {
public BlockInversionPillar() { public BlockInversionPillar() {
super(Material.ROCK, EnumSubWillType.class); super(Material.ROCK, EnumSubWillType.class);
setUnlocalizedName(BloodMagic.MODID + ".inversionpillar."); setTranslationKey(BloodMagic.MODID + ".inversionpillar.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -16,7 +16,7 @@ public class BlockInversionPillarEnd extends BlockEnum<EnumInversionCap> impleme
public BlockInversionPillarEnd() { public BlockInversionPillarEnd() {
super(Material.ROCK, EnumInversionCap.class); super(Material.ROCK, EnumInversionCap.class);
setUnlocalizedName(BloodMagic.MODID + ".inversionpillarend."); setTranslationKey(BloodMagic.MODID + ".inversionpillarend.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -14,7 +14,7 @@ public class BlockItemRoutingNode extends BlockRoutingNode {
public BlockItemRoutingNode() { public BlockItemRoutingNode() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".itemRouting"); setTranslationKey(BloodMagic.MODID + ".itemRouting");
} }
@Override @Override

View file

@ -21,7 +21,7 @@ public class BlockLifeEssence extends BlockFluidClassic {
public BlockLifeEssence() { public BlockLifeEssence() {
super(LIFE_ESSENCE, Material.WATER); super(LIFE_ESSENCE, Material.WATER);
setUnlocalizedName(BloodMagic.MODID + ".fluid.lifeEssence"); setTranslationKey(BloodMagic.MODID + ".fluid.lifeEssence");
getLifeEssence().setBlock(this); getLifeEssence().setBlock(this);
} }
@ -36,7 +36,7 @@ public class BlockLifeEssence extends BlockFluidClassic {
} }
@Override @Override
public BlockRenderLayer getBlockLayer() { public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.SOLID; return BlockRenderLayer.SOLID;
} }

View file

@ -12,7 +12,7 @@ public class BlockMasterRoutingNode extends BlockRoutingNode {
public BlockMasterRoutingNode() { public BlockMasterRoutingNode() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".masterRouting"); setTranslationKey(BloodMagic.MODID + ".masterRouting");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -37,7 +37,7 @@ public class BlockMimic extends BlockEnum<EnumMimic> implements IAltarComponent
public BlockMimic() { public BlockMimic() {
super(Material.ROCK, EnumMimic.class); super(Material.ROCK, EnumMimic.class);
setUnlocalizedName(BloodMagic.MODID + ".mimic."); setTranslationKey(BloodMagic.MODID + ".mimic.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -17,7 +17,7 @@ public class BlockOutputRoutingNode extends BlockRoutingNode {
public BlockOutputRoutingNode() { public BlockOutputRoutingNode() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".outputRouting"); setTranslationKey(BloodMagic.MODID + ".outputRouting");
} }
@Override @Override

View file

@ -20,7 +20,7 @@ public class BlockPath extends BlockEnum<EnumPath> implements IIncensePath {
public BlockPath() { public BlockPath() {
super(Material.ROCK, EnumPath.class); super(Material.ROCK, EnumPath.class);
setUnlocalizedName(BloodMagic.MODID + ".path."); setTranslationKey(BloodMagic.MODID + ".path.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);

View file

@ -23,7 +23,7 @@ public class BlockPhantom extends Block implements IVariantProvider {
public BlockPhantom() { public BlockPhantom() {
super(Material.CLOTH); super(Material.CLOTH);
setUnlocalizedName(BloodMagic.MODID + ".phantom"); setTranslationKey(BloodMagic.MODID + ".phantom");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }
@ -54,7 +54,7 @@ public class BlockPhantom extends Block implements IVariantProvider {
@Override @Override
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() { public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT; return BlockRenderLayer.TRANSLUCENT;
} }

View file

@ -35,7 +35,7 @@ public class BlockRitualController extends BlockEnum<EnumRitualController> imple
public BlockRitualController() { public BlockRitualController() {
super(Material.ROCK, EnumRitualController.class); super(Material.ROCK, EnumRitualController.class);
setUnlocalizedName(BloodMagic.MODID + ".stone.ritual."); setTranslationKey(BloodMagic.MODID + ".stone.ritual.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setSoundType(SoundType.STONE); setSoundType(SoundType.STONE);
setHardness(2.0F); setHardness(2.0F);
@ -97,7 +97,7 @@ public class BlockRitualController extends BlockEnum<EnumRitualController> imple
} }
@Override @Override
public void onBlockDestroyedByExplosion(World world, BlockPos pos, Explosion explosion) { public void onExplosionDestroy(World world, BlockPos pos, Explosion explosion) {
TileEntity tile = world.getTileEntity(pos); TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileMasterRitualStone) if (tile instanceof TileMasterRitualStone)

View file

@ -23,7 +23,7 @@ public class BlockRitualStone extends BlockEnum<EnumRuneType> implements IRitual
public BlockRitualStone() { public BlockRitualStone() {
super(Material.ROCK, EnumRuneType.class); super(Material.ROCK, EnumRuneType.class);
setUnlocalizedName(BloodMagic.MODID + ".ritualStone."); setTranslationKey(BloodMagic.MODID + ".ritualStone.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setSoundType(SoundType.STONE); setSoundType(SoundType.STONE);
setHardness(2.0F); setHardness(2.0F);

View file

@ -27,7 +27,7 @@ public class BlockSoulForge extends Block implements IVariantProvider, IBMBlock
public BlockSoulForge() { public BlockSoulForge() {
super(Material.IRON); super(Material.IRON);
setUnlocalizedName(BloodMagic.MODID + ".soulForge"); setTranslationKey(BloodMagic.MODID + ".soulForge");
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
setSoundType(SoundType.METAL); setSoundType(SoundType.METAL);

View file

@ -28,7 +28,7 @@ public class BlockSpectral extends Block {
public BlockSpectral() { public BlockSpectral() {
super(Material.CLOTH); super(Material.CLOTH);
setUnlocalizedName(BloodMagic.MODID + ".spectral"); setTranslationKey(BloodMagic.MODID + ".spectral");
} }
@Override @Override
@ -58,7 +58,7 @@ public class BlockSpectral extends Block {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
@Override @Override
public BlockRenderLayer getBlockLayer() { public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT; return BlockRenderLayer.TRANSLUCENT;
} }

View file

@ -24,7 +24,7 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider,
super(Material.ROCK); super(Material.ROCK);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setUnlocalizedName(BloodMagic.MODID + ".teleposer"); setTranslationKey(BloodMagic.MODID + ".teleposer");
setHardness(2.0F); setHardness(2.0F);
setResistance(5.0F); setResistance(5.0F);
} }

View file

@ -32,7 +32,7 @@ public class BlockEnumPillarCap<E extends Enum<E> & IStringSerializable> extends
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMeta(int meta) {
IBlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 2]); IBlockState state = getBlockState().getBaseState().withProperty(this.getProperty(), getTypes()[meta % 2]);
return state.withProperty(FACING, EnumFacing.getFront(meta / 2)); return state.withProperty(FACING, EnumFacing.byIndex(meta / 2));
} }
@Override @Override

View file

@ -116,7 +116,7 @@ public class BlockEnumStairs<E extends Enum<E> & IStringSerializable> extends Bl
@Override @Override
public IBlockState getStateFromMeta(int meta) { public IBlockState getStateFromMeta(int meta) {
IBlockState state = getBlockState().getBaseState().withProperty(BlockStairs.HALF, (meta & 8) > 0 ? BlockStairs.EnumHalf.TOP : BlockStairs.EnumHalf.BOTTOM); IBlockState state = getBlockState().getBaseState().withProperty(BlockStairs.HALF, (meta & 8) > 0 ? BlockStairs.EnumHalf.TOP : BlockStairs.EnumHalf.BOTTOM);
state = state.withProperty(FACING, EnumFacing.getFront(5 - (meta & 6) / 2)).withProperty(this.getProperty(), getTypes()[meta % 2]); state = state.withProperty(FACING, EnumFacing.byIndex(5 - (meta & 6) / 2)).withProperty(this.getProperty(), getTypes()[meta % 2]);
return state; return state;
} }

View file

@ -41,7 +41,7 @@ public class GuiItemRoutingNode extends GuiContainer {
} }
private int getCurrentActiveSlotPriority() { private int getCurrentActiveSlotPriority() {
EnumFacing direction = EnumFacing.getFront(inventory.currentActiveSlot); EnumFacing direction = EnumFacing.byIndex(inventory.currentActiveSlot);
if (direction != null) { if (direction != null) {
return inventory.getPriority(direction); return inventory.getPriority(direction);
} }

View file

@ -81,7 +81,7 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP; EnumFacing sideHit = EnumFacing.UP;
EnumFacing rotation = tileArray.getRotation(); EnumFacing rotation = tileArray.getRotation();
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit) { switch (sideHit) {
case DOWN: case DOWN:

View file

@ -109,7 +109,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer {
// Specify which face this "circle" is located on // Specify which face this "circle" is located on
EnumFacing sideHit = EnumFacing.UP; EnumFacing sideHit = EnumFacing.UP;
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit) { switch (sideHit) {
case DOWN: case DOWN:

View file

@ -67,7 +67,7 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP; EnumFacing sideHit = EnumFacing.UP;
EnumFacing rotation = tileArray.getRotation(); EnumFacing rotation = tileArray.getRotation();
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit) { switch (sideHit) {
case DOWN: case DOWN:

View file

@ -92,7 +92,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
EnumFacing sideHit = EnumFacing.UP; EnumFacing sideHit = EnumFacing.UP;
EnumFacing rotation = tileArray.getRotation(); EnumFacing rotation = tileArray.getRotation();
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit) switch (sideHit)
{ {

View file

@ -65,7 +65,7 @@ public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP; EnumFacing sideHit = EnumFacing.UP;
EnumFacing rotation = tileArray.getRotation(); EnumFacing rotation = tileArray.getRotation();
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit) { switch (sideHit) {
case DOWN: case DOWN:

View file

@ -70,7 +70,7 @@ public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP; EnumFacing sideHit = EnumFacing.UP;
EnumFacing rotation = tileArray.getRotation(); EnumFacing rotation = tileArray.getRotation();
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit) { switch (sideHit) {
case DOWN: case DOWN:

View file

@ -101,7 +101,7 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer
EnumFacing sideHit = EnumFacing.UP; EnumFacing sideHit = EnumFacing.UP;
EnumFacing rotation = tileArray.getRotation(); EnumFacing rotation = tileArray.getRotation();
GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace); GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);
switch (sideHit) switch (sideHit)
{ {

View file

@ -69,7 +69,7 @@ public class RenderEntityMimic extends RenderLiving<EntityMimic> {
String s = nbttagcompound.getString("SkullOwner"); String s = nbttagcompound.getString("SkullOwner");
if (!StringUtils.isNullOrEmpty(s)) { if (!StringUtils.isNullOrEmpty(s)) {
gameprofile = TileEntitySkull.updateGameprofile(new GameProfile(null, s)); gameprofile = TileEntitySkull.updateGameProfile(new GameProfile(null, s));
nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), gameprofile)); nbttagcompound.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), gameprofile));
} }
} }

View file

@ -71,7 +71,7 @@ public class SubCommandRitual extends CommandTreeBase {
sender.sendMessage(new TextComponentTranslation("commands.blooodmagic.ritual.create.noRitual")); sender.sendMessage(new TextComponentTranslation("commands.blooodmagic.ritual.create.noRitual"));
return; return;
} else if (args.length == 2 && (args[1].equals("help") || args[1].equals("?"))) { } else if (args.length == 2 && (args[1].equals("help") || args[1].equals("?"))) {
sender.sendMessage(new TextComponentTranslation(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getUnlocalizedName() + ".info")); sender.sendMessage(new TextComponentTranslation(BloodMagic.RITUAL_MANAGER.getRitual(args[0]).getTranslationKey() + ".info"));
return; return;
} }
EntityPlayerMP player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]); EntityPlayerMP player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]);

View file

@ -59,7 +59,7 @@ public class DataProviderRitualController implements IWailaDataProvider {
TileMasterRitualStone mrs = (TileMasterRitualStone) te; TileMasterRitualStone mrs = (TileMasterRitualStone) te;
tag.setBoolean("master", true); tag.setBoolean("master", true);
if (mrs.getCurrentRitual() != null) { if (mrs.getCurrentRitual() != null) {
tag.setString("ritual", mrs.getCurrentRitual().getUnlocalizedName()); tag.setString("ritual", mrs.getCurrentRitual().getTranslationKey());
tag.setBoolean("active", mrs.isActive()); tag.setBoolean("active", mrs.isActive());
if (mrs.getOwner() != null) if (mrs.getOwner() != null)
tag.setString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner())); tag.setString("owner", PlayerHelper.getUsernameFromUUID(mrs.getOwner()));
@ -70,7 +70,7 @@ public class DataProviderRitualController implements IWailaDataProvider {
ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up())); ImperfectRitual ritual = BloodMagic.RITUAL_MANAGER.getImperfectRitual(world.getBlockState(pos.up()));
if (ritual != null) { if (ritual != null) {
tag.setString("ritual", ritual.getUnlocalizedName()); tag.setString("ritual", ritual.getTranslationKey());
tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false)); tag.setBoolean("enabled", BloodMagic.RITUAL_MANAGER.enabled(BloodMagic.RITUAL_MANAGER.getId(ritual), false));
} }
} }

View file

@ -61,7 +61,7 @@ public class Binding implements INBTSerializable<NBTTagCompound> {
return null; return null;
NBTBase bindingTag = stack.getTagCompound().getTag("binding"); NBTBase bindingTag = stack.getTagCompound().getTag("binding");
if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data.
return null; return null;
Binding binding = new Binding(); Binding binding = new Binding();

View file

@ -138,7 +138,7 @@ public class WorldDemonWillHandler {
public static WillChunk getWillChunk(World world, BlockPos pos) { public static WillChunk getWillChunk(World world, BlockPos pos) {
WillChunk willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); WillChunk willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4);
if (willChunk == null) { if (willChunk == null) {
Chunk chunk = world.getChunkFromBlockCoords(pos); Chunk chunk = world.getChunk(pos);
generateWill(chunk); generateWill(chunk);
willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4); willChunk = getWillChunk(world.provider.getDimension(), pos.getX() >> 4, pos.getZ() >> 4);

View file

@ -413,7 +413,7 @@ public class EntitySentientSpecter extends EntityDemonBase {
entitytippedarrow.shoot(d0, d1 + d3 * 0.2, d2, 1.6F, 0); //TODO: Yes, it is an accurate arrow. Don't be hatin' entitytippedarrow.shoot(d0, d1 + d3 * 0.2, d2, 1.6F, 0); //TODO: Yes, it is an accurate arrow. Don't be hatin'
int i = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.POWER, this); int i = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.POWER, this);
int j = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.PUNCH, this); int j = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.PUNCH, this);
entitytippedarrow.setDamage((double) (velocity * 2.0F) + this.rand.nextGaussian() * 0.25D + (double) ((float) this.getEntityWorld().getDifficulty().getDifficultyId() * 0.11F)); entitytippedarrow.setDamage((double) (velocity * 2.0F) + this.rand.nextGaussian() * 0.25D + (double) ((float) this.getEntityWorld().getDifficulty().getId() * 0.11F));
if (i > 0) { if (i > 0) {
entitytippedarrow.setDamage(entitytippedarrow.getDamage() + (double) i * 0.5D + 0.5D); entitytippedarrow.setDamage(entitytippedarrow.getDamage() + (double) i * 0.5D + 0.5D);

View file

@ -65,8 +65,8 @@ public class Serializers {
@Override @Override
public JsonElement serialize(ResourceLocation src, Type typeOfSrc, JsonSerializationContext context) { public JsonElement serialize(ResourceLocation src, Type typeOfSrc, JsonSerializationContext context) {
JsonObject object = new JsonObject(); JsonObject object = new JsonObject();
object.addProperty("domain", src.getResourceDomain()); object.addProperty("domain", src.getNamespace());
object.addProperty("path", src.getResourcePath()); object.addProperty("path", src.getPath());
return object; return object;
} }
}; };

View file

@ -33,7 +33,7 @@ public class ItemAltarMaker extends Item implements IAltarManipulator, IVariantP
public ItemAltarMaker() { public ItemAltarMaker() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".altarMaker"); setTranslationKey(BloodMagic.MODID + ".altarMaker");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1); setMaxStackSize(1);
setFull3D(); setFull3D();

View file

@ -23,7 +23,7 @@ import java.util.List;
public class ItemArcaneAshes extends Item implements IVariantProvider { public class ItemArcaneAshes extends Item implements IVariantProvider {
public ItemArcaneAshes() { public ItemArcaneAshes() {
setUnlocalizedName(BloodMagic.MODID + ".arcaneAshes"); setTranslationKey(BloodMagic.MODID + ".arcaneAshes");
setMaxStackSize(1); setMaxStackSize(1);
setMaxDamage(19); //Allows for 20 uses setMaxDamage(19); //Allows for 20 uses
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);

View file

@ -24,18 +24,18 @@ import java.util.List;
public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb { public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb {
public ItemBloodOrb() { public ItemBloodOrb() {
setUnlocalizedName(BloodMagic.MODID + ".orb"); setTranslationKey(BloodMagic.MODID + ".orb");
this.setMaxDamage(0); this.setMaxDamage(0);
setHasSubtypes(true); setHasSubtypes(true);
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
BloodOrb orb = getOrb(stack); BloodOrb orb = getOrb(stack);
if (orb == null) if (orb == null)
return super.getUnlocalizedName(stack); return super.getTranslationKey(stack);
return super.getUnlocalizedName(stack) + "." + orb.getName(); return super.getTranslationKey(stack) + "." + orb.getName();
} }
@Override @Override
@ -94,7 +94,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb {
BloodOrb orb = getOrb(stack); BloodOrb orb = getOrb(stack);
if (flag.isAdvanced() && orb != null) if (flag.isAdvanced() && orb != null)
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName().getResourceDomain())); tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.orb.owner", orb.getRegistryName().getNamespace()));
super.addInformation(stack, world, tooltip, flag); super.addInformation(stack, world, tooltip, flag);
} }

View file

@ -36,7 +36,7 @@ public class ItemBoundSword extends ItemSword implements IBindable, IActivatable
public ItemBoundSword() { public ItemBoundSword() {
super(RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL); super(RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL);
setUnlocalizedName(BloodMagic.MODID + ".bound.sword"); setTranslationKey(BloodMagic.MODID + ".bound.sword");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -51,7 +51,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable {
public ItemBoundTool(String name, float damage, Set<Block> effectiveBlocks) { public ItemBoundTool(String name, float damage, Set<Block> effectiveBlocks) {
super(damage, 1, RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL, effectiveBlocks); super(damage, 1, RegistrarBloodMagicItems.BOUND_TOOL_MATERIAL, effectiveBlocks);
setUnlocalizedName(BloodMagic.MODID + ".bound." + name); setTranslationKey(BloodMagic.MODID + ".bound." + name);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHarvestLevel(name, 4); setHarvestLevel(name, 4);

View file

@ -25,7 +25,7 @@ import javax.annotation.Nonnull;
public class ItemDaggerOfSacrifice extends Item implements IVariantProvider { public class ItemDaggerOfSacrifice extends Item implements IVariantProvider {
public ItemDaggerOfSacrifice() { public ItemDaggerOfSacrifice() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".daggerOfSacrifice"); setTranslationKey(BloodMagic.MODID + ".daggerOfSacrifice");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1); setMaxStackSize(1);
setFull3D(); setFull3D();

View file

@ -19,7 +19,7 @@ import java.util.List;
public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemonWillViewer { public class ItemDemonWillGauge extends Item implements IVariantProvider, IDemonWillViewer {
public ItemDemonWillGauge() { public ItemDemonWillGauge() {
setUnlocalizedName(BloodMagic.MODID + ".willGauge"); setTranslationKey(BloodMagic.MODID + ".willGauge");
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -21,14 +21,14 @@ public class ItemEnum<T extends Enum<T> & ISubItem> extends Item {
this.types = enumClass.getEnumConstants(); this.types = enumClass.getEnumConstants();
setUnlocalizedName(BloodMagic.MODID + "." + baseName); setTranslationKey(BloodMagic.MODID + "." + baseName);
setHasSubtypes(types.length > 1); setHasSubtypes(types.length > 1);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return super.getUnlocalizedName(stack) + "." + getItemType(stack).getInternalName(); return super.getTranslationKey(stack) + "." + getItemType(stack).getInternalName();
} }
@Override @Override

View file

@ -24,7 +24,7 @@ import java.util.List;
public class ItemExperienceBook extends Item implements IVariantProvider { public class ItemExperienceBook extends Item implements IVariantProvider {
public ItemExperienceBook() { public ItemExperienceBook() {
setUnlocalizedName(BloodMagic.MODID + ".experienceTome"); setTranslationKey(BloodMagic.MODID + ".experienceTome");
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -23,7 +23,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide
public ItemLavaCrystal() { public ItemLavaCrystal() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".lavaCrystal"); setTranslationKey(BloodMagic.MODID + ".lavaCrystal");
} }
@Override @Override
@ -66,7 +66,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide
return null; return null;
NBTBase bindingTag = stack.getTagCompound().getTag("binding"); NBTBase bindingTag = stack.getTagCompound().getTag("binding");
if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.hasNoTags()) // Make sure it's both a tag compound and that it has actual data. if (bindingTag == null || bindingTag.getId() != 10 || bindingTag.isEmpty()) // Make sure it's both a tag compound and that it has actual data.
return null; return null;
NBTTagCompound nbt = (NBTTagCompound) bindingTag; NBTTagCompound nbt = (NBTTagCompound) bindingTag;

View file

@ -28,7 +28,7 @@ import java.util.function.Consumer;
public class ItemPotionFlask extends Item implements IMeshProvider { public class ItemPotionFlask extends Item implements IMeshProvider {
public ItemPotionFlask() { public ItemPotionFlask() {
setUnlocalizedName(BloodMagic.MODID + ".potionFlask"); setTranslationKey(BloodMagic.MODID + ".potionFlask");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1); setMaxStackSize(1);
setMaxDamage(8); setMaxDamage(8);

View file

@ -27,7 +27,7 @@ import java.util.List;
public class ItemRitualDismantler extends Item implements IVariantProvider { public class ItemRitualDismantler extends Item implements IVariantProvider {
public ItemRitualDismantler() { public ItemRitualDismantler() {
setUnlocalizedName(BloodMagic.MODID + ".ritualDismantler"); setTranslationKey(BloodMagic.MODID + ".ritualDismantler");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1); setMaxStackSize(1);
} }

View file

@ -46,15 +46,15 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
public static String[] names = {"normal", "dusk", "dawn"}; public static String[] names = {"normal", "dusk", "dawn"};
public ItemRitualDiviner() { public ItemRitualDiviner() {
setUnlocalizedName(BloodMagic.MODID + ".ritualDiviner"); setTranslationKey(BloodMagic.MODID + ".ritualDiviner");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHasSubtypes(true); setHasSubtypes(true);
setMaxStackSize(1); setMaxStackSize(1);
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; return super.getTranslationKey(stack) + names[stack.getItemDamage()];
} }
@Override @Override
@ -66,7 +66,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
if (ritual == null) if (ritual == null)
return displayName; return displayName;
return displayName + ": " + TextHelper.localize(ritual.getUnlocalizedName()); return displayName + ": " + TextHelper.localize(ritual.getTranslationKey());
} }
@Override @Override
@ -208,7 +208,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack)); Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(this.getCurrentRitual(stack));
if (ritual != null) { if (ritual != null) {
tooltip.add(TextHelper.localize("tooltip.bloodmagic.diviner.currentRitual", TextHelper.localize(ritual.getUnlocalizedName()))); tooltip.add(TextHelper.localize("tooltip.bloodmagic.diviner.currentRitual", TextHelper.localize(ritual.getTranslationKey())));
boolean sneaking = Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); boolean sneaking = Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT);
boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M); boolean extraInfo = sneaking && Keyboard.isKeyDown(Keyboard.KEY_M);
@ -217,8 +217,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
tooltip.add(""); tooltip.add("");
for (EnumDemonWillType type : EnumDemonWillType.values()) { for (EnumDemonWillType type : EnumDemonWillType.values()) {
if (TextHelper.canTranslate(ritual.getUnlocalizedName() + "." + type.getName().toLowerCase() + ".info")) { if (TextHelper.canTranslate(ritual.getTranslationKey() + "." + type.getName().toLowerCase() + ".info")) {
tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getUnlocalizedName() + "." + type.getName().toLowerCase() + ".info")))); tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getTranslationKey() + "." + type.getName().toLowerCase() + ".info"))));
} }
} }
} else if (sneaking) { } else if (sneaking) {
@ -281,8 +281,8 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
tooltip.add(TextHelper.localize(tooltipBase + "totalRune", totalRunes)); tooltip.add(TextHelper.localize(tooltipBase + "totalRune", totalRunes));
} else { } else {
tooltip.add(""); tooltip.add("");
if (TextHelper.canTranslate(ritual.getUnlocalizedName() + ".info")) { if (TextHelper.canTranslate(ritual.getTranslationKey() + ".info")) {
tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getUnlocalizedName() + ".info")))); tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect(ritual.getTranslationKey() + ".info"))));
tooltip.add(""); tooltip.add("");
} }
@ -453,7 +453,7 @@ public class ItemRitualDiviner extends Item implements IVariantProvider {
public void notifyRitualChange(String key, EntityPlayer player) { public void notifyRitualChange(String key, EntityPlayer player) {
Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key); Ritual ritual = BloodMagic.RITUAL_MANAGER.getRitual(key);
if (ritual != null) { if (ritual != null) {
player.sendStatusMessage(new TextComponentTranslation(ritual.getUnlocalizedName()), true); player.sendStatusMessage(new TextComponentTranslation(ritual.getTranslationKey()), true);
} }
} }

View file

@ -38,7 +38,7 @@ public class ItemRitualReader extends Item implements IVariantProvider {
public ItemRitualReader() { public ItemRitualReader() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".ritualReader"); setTranslationKey(BloodMagic.MODID + ".ritualReader");
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -38,7 +38,7 @@ public class ItemSanguineBook extends Item implements IVariantProvider, IAltarMa
private AltarTier currentDisplayedTier = AltarTier.ONE; private AltarTier currentDisplayedTier = AltarTier.ONE;
public ItemSanguineBook() { public ItemSanguineBook() {
setUnlocalizedName(BloodMagic.MODID + ".sanguineBook"); setTranslationKey(BloodMagic.MODID + ".sanguineBook");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setMaxStackSize(1); setMaxStackSize(1);
} }

View file

@ -31,7 +31,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider {
super(); super();
setCreativeTab(BloodMagic.TAB_TOMES); setCreativeTab(BloodMagic.TAB_TOMES);
setUnlocalizedName(BloodMagic.MODID + ".upgradeTome"); setTranslationKey(BloodMagic.MODID + ".upgradeTome");
setHasSubtypes(true); setHasSubtypes(true);
setMaxStackSize(1); setMaxStackSize(1);
} }
@ -65,15 +65,15 @@ public class ItemUpgradeTome extends Item implements IVariantProvider {
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
if (!stack.hasTagCompound()) if (!stack.hasTagCompound())
return super.getUnlocalizedName(stack); return super.getTranslationKey(stack);
LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack);
if (upgrade != null && upgrade.isDowngrade()) if (upgrade != null && upgrade.isDowngrade())
return "item." + BloodMagic.MODID + ".downgradeTome"; return "item." + BloodMagic.MODID + ".downgradeTome";
return super.getUnlocalizedName(stack); return super.getTranslationKey(stack);
} }
@Override @Override
@ -106,7 +106,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider {
return; return;
LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack);
if (upgrade != null) { if (upgrade != null) {
tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getUnlocalizedName()), upgrade.getUpgradeLevel() + 1)); tooltip.add(TextHelper.localizeEffect("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getTranslationKey()), upgrade.getUpgradeLevel() + 1));
} }
} }
} }

View file

@ -27,7 +27,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
super(); super();
setCreativeTab(BloodMagic.TAB_TOMES); setCreativeTab(BloodMagic.TAB_TOMES);
setUnlocalizedName(BloodMagic.MODID + ".upgradeTrainer"); setTranslationKey(BloodMagic.MODID + ".upgradeTrainer");
setHasSubtypes(true); setHasSubtypes(true);
setMaxStackSize(1); setMaxStackSize(1);
} }
@ -55,7 +55,7 @@ public class ItemUpgradeTrainer extends Item implements IUpgradeTrainer, IVarian
return; return;
LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack); LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack);
if (upgrade != null) { if (upgrade != null) {
tooltip.add(TextHelper.localize(upgrade.getUnlocalizedName())); tooltip.add(TextHelper.localize(upgrade.getTranslationKey()));
} }
} }

View file

@ -62,7 +62,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
public ItemLivingArmour(EntityEquipmentSlot armorType) { public ItemLivingArmour(EntityEquipmentSlot armorType) {
super(ItemArmor.ArmorMaterial.IRON, 0, armorType); super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
setUnlocalizedName(BloodMagic.MODID + ".livingArmour."); setTranslationKey(BloodMagic.MODID + ".livingArmour.");
// setMaxDamage(250); // setMaxDamage(250);
setMaxDamage((int) (getMaxDamage() * 1.5)); setMaxDamage((int) (getMaxDamage() * 1.5));
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
@ -259,10 +259,10 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
if (tracker != null) { if (tracker != null) {
double progress = tracker.getProgress(armour, upgrade.getUpgradeLevel()); double progress = tracker.getProgress(armour, upgrade.getUpgradeLevel());
tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.progress", TextHelper.localize(upgrade.getUnlocalizedName()), MathHelper.clamp((int) (progress * 100D), 0, 100))); tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.progress", TextHelper.localize(upgrade.getTranslationKey()), MathHelper.clamp((int) (progress * 100D), 0, 100)));
} }
} else { } else {
tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getUnlocalizedName()), upgrade.getUpgradeLevel() + 1)); tooltip.add(TextHelper.localize("tooltip.bloodmagic.livingArmour.upgrade.level", TextHelper.localize(upgrade.getTranslationKey()), upgrade.getUpgradeLevel() + 1));
} }
} }
} }
@ -344,8 +344,8 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return super.getUnlocalizedName(stack) + names[3 - armorType.getIndex()]; return super.getTranslationKey(stack) + names[3 - armorType.getIndex()];
} }
@Override @Override

View file

@ -56,7 +56,7 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
public ItemSentientArmour(EntityEquipmentSlot armorType) { public ItemSentientArmour(EntityEquipmentSlot armorType) {
super(ItemArmor.ArmorMaterial.IRON, 0, armorType); super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
setUnlocalizedName(BloodMagic.MODID + ".sentientArmour."); setTranslationKey(BloodMagic.MODID + ".sentientArmour.");
setMaxDamage(250); setMaxDamage(250);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }
@ -268,8 +268,8 @@ public class ItemSentientArmour extends ItemArmor implements ISpecialArmor, IMes
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return super.getUnlocalizedName(stack) + names[3 - armorType.getIndex()]; return super.getTranslationKey(stack) + names[3 - armorType.getIndex()];
} }
public void revertArmour(EntityPlayer player, ItemStack itemStack) { public void revertArmour(EntityPlayer player, ItemStack itemStack) {

View file

@ -23,7 +23,7 @@ public class ItemBlockAlchemyTable extends ItemBlock implements IVariantProvider
float yaw = player.rotationYaw; float yaw = player.rotationYaw;
EnumFacing direction = EnumFacing.fromAngle(yaw); EnumFacing direction = EnumFacing.fromAngle(yaw);
if (direction.getFrontOffsetY() != 0) { if (direction.getYOffset() != 0) {
return false; return false;
} }

View file

@ -21,8 +21,8 @@ public class ItemBlockDemonCrystal extends ItemBlock {
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return super.getUnlocalizedName(stack) + EnumDemonWillType.values()[stack.getItemDamage()].toString().toLowerCase(Locale.ENGLISH); return super.getTranslationKey(stack) + EnumDemonWillType.values()[stack.getItemDamage()].toString().toLowerCase(Locale.ENGLISH);
} }
@Override @Override

View file

@ -22,8 +22,8 @@ public class ItemBlockEnum<E extends Enum<E> & IStringSerializable> extends Item
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return getBlock().getUnlocalizedName() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, getBlock().getTypes().length - 1)].getName(); return getBlock().getTranslationKey() + getBlock().getTypes()[MathHelper.clamp(stack.getItemDamage(), 0, getBlock().getTypes().length - 1)].getName();
} }
@Override @Override

View file

@ -20,8 +20,8 @@ public class ItemBlockInteger extends ItemBlock {
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return getBlock().getUnlocalizedName() + "." + stack.getItemDamage(); return getBlock().getTranslationKey() + "." + stack.getItemDamage();
} }
@Override @Override

View file

@ -31,7 +31,7 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator, I
public ItemPackSacrifice() { public ItemPackSacrifice() {
super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST); super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST);
setUnlocalizedName(BloodMagic.MODID + ".pack.sacrifice"); setTranslationKey(BloodMagic.MODID + ".pack.sacrifice");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -47,7 +47,7 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
public ItemPackSelfSacrifice() { public ItemPackSelfSacrifice() {
super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST); super(ArmorMaterial.CHAIN, 0, EntityEquipmentSlot.CHEST);
setUnlocalizedName(BloodMagic.MODID + ".pack.selfSacrifice"); setTranslationKey(BloodMagic.MODID + ".pack.selfSacrifice");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -31,15 +31,15 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider,
{ {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".fluidFilter."); setTranslationKey(BloodMagic.MODID + ".fluidFilter.");
setHasSubtypes(true); setHasSubtypes(true);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) public String getTranslationKey(ItemStack stack)
{ {
return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; return super.getTranslationKey(stack) + names[stack.getItemDamage()];
} }
@Override @Override

View file

@ -30,7 +30,7 @@ import java.util.List;
public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvider { public class ItemNodeRouter extends Item implements INodeRenderer, IVariantProvider {
public ItemNodeRouter() { public ItemNodeRouter() {
setUnlocalizedName(BloodMagic.MODID + ".nodeRouter"); setTranslationKey(BloodMagic.MODID + ".nodeRouter");
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -30,15 +30,15 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
{ {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".itemFilter."); setTranslationKey(BloodMagic.MODID + ".itemFilter.");
setHasSubtypes(true); setHasSubtypes(true);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) public String getTranslationKey(ItemStack stack)
{ {
return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; return super.getTranslationKey(stack) + names[stack.getItemDamage()];
} }
@Override @Override

View file

@ -24,7 +24,7 @@ public class ItemSigilBase extends ItemSigil implements IVariantProvider {
public ItemSigilBase(String name, int lpUsed) { public ItemSigilBase(String name, int lpUsed) {
super(lpUsed); super(lpUsed);
setUnlocalizedName(BloodMagic.MODID + ".sigil." + name); setTranslationKey(BloodMagic.MODID + ".sigil." + name);
this.name = name; this.name = name;
this.tooltipBase = "tooltip.bloodmagic.sigil." + name + "."; this.tooltipBase = "tooltip.bloodmagic.sigil." + name + ".";

View file

@ -248,7 +248,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl
NBTTagList tagList = tagCompound.getTagList(Constants.NBT.ITEMS, 10); NBTTagList tagList = tagCompound.getTagList(Constants.NBT.ITEMS, 10);
if (tagList.hasNoTags()) { if (tagList.isEmpty()) {
return NonNullList.withSize(inventorySize, ItemStack.EMPTY); return NonNullList.withSize(inventorySize, ItemStack.EMPTY);
} }

View file

@ -23,7 +23,7 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable implements IMes
public ItemSigilToggleableBase(String name, int lpUsed) { public ItemSigilToggleableBase(String name, int lpUsed) {
super(lpUsed); super(lpUsed);
setUnlocalizedName(BloodMagic.MODID + ".sigil." + name); setTranslationKey(BloodMagic.MODID + ".sigil." + name);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
this.name = name; this.name = name;

View file

@ -26,7 +26,7 @@ public class ItemSentientArmourGem extends Item implements IMeshProvider {
super(); super();
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setUnlocalizedName(BloodMagic.MODID + ".sentientArmourGem"); setTranslationKey(BloodMagic.MODID + ".sentientArmourGem");
setMaxStackSize(1); setMaxStackSize(1);
} }

View file

@ -75,7 +75,7 @@ public class ItemSentientAxe extends ItemAxe implements IDemonWillWeapon, IMeshP
setMaxDamage(getMaxDamage() * 2); setMaxDamage(getMaxDamage() * 2);
// super(ModItems.soulToolMaterial); // super(ModItems.soulToolMaterial);
setUnlocalizedName(BloodMagic.MODID + ".sentientAxe"); setTranslationKey(BloodMagic.MODID + ".sentientAxe");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -55,7 +55,7 @@ public class ItemSentientBow extends ItemBow implements IMultiWillTool, ISentien
public ItemSentientBow() { public ItemSentientBow() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".sentientBow"); setTranslationKey(BloodMagic.MODID + ".sentientBow");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() { this.addPropertyOverride(new ResourceLocation("pull"), new IItemPropertyGetter() {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

View file

@ -75,7 +75,7 @@ public class ItemSentientPickaxe extends ItemPickaxe implements IDemonWillWeapon
setMaxDamage(getMaxDamage() * 2); setMaxDamage(getMaxDamage() * 2);
// super(ModItems.soulToolMaterial); // super(ModItems.soulToolMaterial);
setUnlocalizedName(BloodMagic.MODID + ".sentientPickaxe"); setTranslationKey(BloodMagic.MODID + ".sentientPickaxe");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -75,7 +75,7 @@ public class ItemSentientShovel extends ItemSpade implements IDemonWillWeapon, I
setMaxDamage(getMaxDamage() * 2); setMaxDamage(getMaxDamage() * 2);
// super(ModItems.soulToolMaterial); // super(ModItems.soulToolMaterial);
setUnlocalizedName(BloodMagic.MODID + ".sentientShovel"); setTranslationKey(BloodMagic.MODID + ".sentientShovel");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -68,7 +68,7 @@ public class ItemSentientSword extends ItemSword implements IDemonWillWeapon, IM
public ItemSentientSword() { public ItemSentientSword() {
super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL); super(RegistrarBloodMagicItems.SOUL_TOOL_MATERIAL);
setUnlocalizedName(BloodMagic.MODID + ".sentientSword"); setTranslationKey(BloodMagic.MODID + ".sentientSword");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -37,15 +37,15 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
public ItemSoulGem() { public ItemSoulGem() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".soulGem."); setTranslationKey(BloodMagic.MODID + ".soulGem.");
setHasSubtypes(true); setHasSubtypes(true);
setMaxStackSize(1); setMaxStackSize(1);
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; return super.getTranslationKey(stack) + names[stack.getItemDamage()];
} }
@Override @Override

View file

@ -26,7 +26,7 @@ public class ItemSoulSnare extends Item implements IVariantProvider {
public ItemSoulSnare() { public ItemSoulSnare() {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".soulSnare."); setTranslationKey(BloodMagic.MODID + ".soulSnare.");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
setHasSubtypes(true); setHasSubtypes(true);
setMaxStackSize(16); setMaxStackSize(16);
@ -51,8 +51,8 @@ public class ItemSoulSnare extends Item implements IVariantProvider {
} }
@Override @Override
public String getUnlocalizedName(ItemStack stack) { public String getTranslationKey(ItemStack stack) {
return super.getUnlocalizedName(stack) + names[stack.getItemDamage()]; return super.getTranslationKey(stack) + names[stack.getItemDamage()];
} }
@Override @Override

View file

@ -42,7 +42,7 @@ public class ItemFlightScroll extends ItemSoulBreathContainer implements IMeshPr
public ItemFlightScroll() public ItemFlightScroll()
{ {
super(); super();
setUnlocalizedName(BloodMagic.MODID + ".icarusScroll"); setTranslationKey(BloodMagic.MODID + ".icarusScroll");
setCreativeTab(BloodMagic.TAB_BM); setCreativeTab(BloodMagic.TAB_BM);
} }

View file

@ -239,7 +239,7 @@ public class LivingArmour implements ILivingArmour {
StatTracker tracker = (StatTracker) obj; StatTracker tracker = (StatTracker) obj;
String key = tracker.getUniqueIdentifier(); String key = tracker.getUniqueIdentifier();
NBTTagCompound trackerTag = tag.getCompoundTag(key); NBTTagCompound trackerTag = tag.getCompoundTag(key);
if (!trackerTag.hasNoTags()) { if (!trackerTag.isEmpty()) {
tracker.readFromNBT(trackerTag); tracker.readFromNBT(trackerTag);
} }
trackerMap.put(key, tracker); trackerMap.put(key, tracker);

View file

@ -55,7 +55,7 @@ public abstract class LivingArmourUpgrade {
public abstract String getUniqueIdentifier(); public abstract String getUniqueIdentifier();
public abstract String getUnlocalizedName(); public abstract String getTranslationKey();
public abstract int getMaxTier(); public abstract int getMaxTier();

View file

@ -60,7 +60,7 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade {
} }
@Override @Override
public String getUnlocalizedName() { public String getTranslationKey() {
return tooltipBase + "battleHunger"; return tooltipBase + "battleHunger";
} }

View file

@ -43,7 +43,7 @@ public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade {
} }
@Override @Override
public String getUnlocalizedName() { public String getTranslationKey() {
return tooltipBase + "crippledArm"; return tooltipBase + "crippledArm";
} }

View file

@ -54,7 +54,7 @@ public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade {
} }
@Override @Override
public String getUnlocalizedName() { public String getTranslationKey() {
return tooltipBase + "digSlowdown"; return tooltipBase + "digSlowdown";
} }

View file

@ -52,7 +52,7 @@ public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade {
} }
@Override @Override
public String getUnlocalizedName() { public String getTranslationKey() {
return tooltipBase + "disoriented"; return tooltipBase + "disoriented";
} }

Some files were not shown because too many files have changed in this diff Show more