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

Update mappings + dependencies

Browse source
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
gradle.properties
src/main/java/WayofTime/bloodmagic
BloodMagic.java
alchemyArray
AlchemyCircleRenderer.java
block
BlockAlchemyArray.javaBlockAlchemyTable.javaBlockAltar.javaBlockBloodLight.javaBlockBloodRune.javaBlockBloodTank.javaBlockDecorative.javaBlockDemonBase.javaBlockDemonCrucible.javaBlockDemonCrystal.javaBlockDemonCrystallizer.javaBlockDemonLight.javaBlockDemonPillarBase.javaBlockDemonPillarCapBase.javaBlockDemonPylon.javaBlockDemonStairsBase.javaBlockDemonWallBase.javaBlockDimensionalPortal.javaBlockIncenseAltar.javaBlockInputRoutingNode.javaBlockInversionPillar.javaBlockInversionPillarEnd.javaBlockItemRoutingNode.javaBlockLifeEssence.javaBlockMasterRoutingNode.javaBlockMimic.javaBlockOutputRoutingNode.javaBlockPath.javaBlockPhantom.javaBlockRitualController.javaBlockRitualStone.javaBlockSoulForge.javaBlockSpectral.javaBlockTeleposer.java
base
BlockEnumPillarCap.javaBlockEnumStairs.java
client
gui
GuiItemRoutingNode.java
render
alchemyArray
AttractorAlchemyCircleRenderer.javaBindingAlchemyCircleRenderer.javaDualAlchemyCircleRenderer.javaMobSacrificeAlchemyCircleRenderer.javaSingleAlchemyCircleRenderer.javaStaticAlchemyCircleRenderer.javaTurretAlchemyCircleRenderer.java
entity
RenderEntityMimic.java
command/sub
SubCommandRitual.java
compat/waila/provider
DataProviderRitualController.java
core/data
Binding.java
demonAura
WorldDemonWillHandler.java
entity/mob
EntitySentientSpecter.java
gson
Serializers.java
item
ItemAltarMaker.javaItemArcaneAshes.javaItemBloodOrb.javaItemBoundSword.javaItemBoundTool.javaItemDaggerOfSacrifice.javaItemDemonWillGauge.javaItemEnum.javaItemExperienceBook.javaItemLavaCrystal.javaItemPotionFlask.javaItemRitualDismantler.javaItemRitualDiviner.javaItemRitualReader.javaItemSanguineBook.javaItemUpgradeTome.javaItemUpgradeTrainer.java
armour
ItemLivingArmour.javaItemSentientArmour.java
block
ItemBlockAlchemyTable.javaItemBlockDemonCrystal.java
base
ItemBlockEnum.javaItemBlockInteger.java
gear
ItemPackSacrifice.javaItemPackSelfSacrifice.java
routing
ItemFluidRouterFilter.javaItemNodeRouter.javaItemRouterFilter.java
sigil
ItemSigilBase.javaItemSigilHolding.javaItemSigilToggleableBase.java
soul
ItemSentientArmourGem.javaItemSentientAxe.javaItemSentientBow.javaItemSentientPickaxe.javaItemSentientShovel.javaItemSentientSword.javaItemSoulGem.javaItemSoulSnare.java
soulBreath
ItemFlightScroll.java
livingArmour
LivingArmour.javaLivingArmourUpgrade.java
downgrade
LivingArmourUpgradeBattleHungry.javaLivingArmourUpgradeCrippledArm.javaLivingArmourUpgradeDigSlowdown.javaLivingArmourUpgradeDisoriented.java
Show more

10
gradle.properties
View file

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

4
src/main/java/WayofTime/bloodmagic/BloodMagic.java
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 CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") {
@Override
public ItemStack getTabIconItem() {
public ItemStack createIcon() {
return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK);
}
};
public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") {
@Override
public ItemStack getTabIconItem() {
public ItemStack createIcon() {
return new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
}

2
src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java
View file

@ -89,7 +89,7 @@ public class AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP;
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) {
case DOWN:

6
src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java
View file

@ -36,7 +36,7 @@ public class BlockAlchemyArray extends Block {
public BlockAlchemyArray() {
super(Material.CLOTH);
setUnlocalizedName(BloodMagic.MODID + ".alchemyArray");
setTranslationKey(BloodMagic.MODID + ".alchemyArray");
setHardness(0.1f);
}
@ -46,7 +46,7 @@ public class BlockAlchemyArray extends Block {
}
@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);
if (tile instanceof TileAlchemyArray) {
((TileAlchemyArray) tile).onEntityCollidedWithBlock(state, entity);
@ -60,7 +60,7 @@ public class BlockAlchemyArray extends Block {
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}

2
src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
View file

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

4
src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java
View file

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

8
src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java
View file

@ -105,7 +105,7 @@ public class BlockDemonCrystal extends Block implements IBMBlock, IVariantProvid
super(Material.ROCK);
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);
setHardness(2.0F);
setResistance(5.0F);

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java
View file

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

6
src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
View file

@ -32,7 +32,7 @@ public class BlockDimensionalPortal extends BlockInteger {
public BlockDimensionalPortal() {
super(Material.PORTAL, 2);
setUnlocalizedName(BloodMagic.MODID + ".dimensionalPortal");
setTranslationKey(BloodMagic.MODID + ".dimensionalPortal");
setBlockUnbreakable();
setResistance(2000);
setLightOpacity(0);
@ -72,7 +72,7 @@ public class BlockDimensionalPortal extends BlockInteger {
}
@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) {
TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos);
@ -129,7 +129,7 @@ public class BlockDimensionalPortal extends BlockInteger {
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT;
}

2
src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java
View file

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

4
src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockMimic.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockPath.java
View file

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

4
src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
View file

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

4
src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
View file

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

4
src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java
View file

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

2
src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java
View file

@ -32,7 +32,7 @@ public class BlockEnumPillarCap<E extends Enum<E> & IStringSerializable> extends
@Override
public IBlockState getStateFromMeta(int meta) {
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

2
src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java
View file

@ -116,7 +116,7 @@ public class BlockEnumStairs<E extends Enum<E> & IStringSerializable> extends Bl
@Override
public IBlockState getStateFromMeta(int meta) {
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;
}

2
src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java
View file

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

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java
View file

@ -81,7 +81,7 @@ public class AttractorAlchemyCircleRenderer extends AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP;
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) {
case DOWN:

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java
View file

@ -109,7 +109,7 @@ public class BindingAlchemyCircleRenderer extends AlchemyCircleRenderer {
// Specify which face this "circle" is located on
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) {
case DOWN:

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java
View file

@ -67,7 +67,7 @@ public class DualAlchemyCircleRenderer extends AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP;
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) {
case DOWN:

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java
View file

@ -92,7 +92,7 @@ public class MobSacrificeAlchemyCircleRenderer extends AlchemyCircleRenderer
EnumFacing sideHit = EnumFacing.UP;
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)
{

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java
View file

@ -65,7 +65,7 @@ public class SingleAlchemyCircleRenderer extends AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP;
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) {
case DOWN:

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java
View file

@ -70,7 +70,7 @@ public class StaticAlchemyCircleRenderer extends AlchemyCircleRenderer {
EnumFacing sideHit = EnumFacing.UP;
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) {
case DOWN:

2
src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java
View file

@ -101,7 +101,7 @@ public class TurretAlchemyCircleRenderer extends AlchemyCircleRenderer
EnumFacing sideHit = EnumFacing.UP;
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)
{

2
src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java
View file

@ -69,7 +69,7 @@ public class RenderEntityMimic extends RenderLiving<EntityMimic> {
String s = nbttagcompound.getString("SkullOwner");
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));
}
}

2
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java
View file

@ -71,7 +71,7 @@ public class SubCommandRitual extends CommandTreeBase {
sender.sendMessage(new TextComponentTranslation("commands.blooodmagic.ritual.create.noRitual"));
return;
} 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;
}
EntityPlayerMP player = args.length < 3 ? getCommandSenderAsPlayer(sender) : getPlayer(server, sender, args[1]);

4
src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java
View file

@ -59,7 +59,7 @@ public class DataProviderRitualController implements IWailaDataProvider {
TileMasterRitualStone mrs = (TileMasterRitualStone) te;
tag.setBoolean("master", true);
if (mrs.getCurrentRitual() != null) {
tag.setString("ritual", mrs.getCurrentRitual().getUnlocalizedName());
tag.setString("ritual", mrs.getCurrentRitual().getTranslationKey());
tag.setBoolean("active", mrs.isActive());
if (mrs.getOwner() != null)
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()));
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));
}
}

2
src/main/java/WayofTime/bloodmagic/core/data/Binding.java
View file

@ -61,7 +61,7 @@ public class Binding implements INBTSerializable<NBTTagCompound> {
return null;
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;
Binding binding = new Binding();

2
src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java
View file

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

2
src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java
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'
int i = EnchantmentHelper.getMaxEnchantmentLevel(Enchantments.POWER, 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) {
entitytippedarrow.setDamage(entitytippedarrow.getDamage() + (double) i * 0.5D + 0.5D);

4
src/main/java/WayofTime/bloodmagic/gson/Serializers.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java
View file

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

10
src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java
View file

@ -24,18 +24,18 @@ import java.util.List;
public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb {
public ItemBloodOrb() {
setUnlocalizedName(BloodMagic.MODID + ".orb");
setTranslationKey(BloodMagic.MODID + ".orb");
this.setMaxDamage(0);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack stack) {
public String getTranslationKey(ItemStack stack) {
BloodOrb orb = getOrb(stack);
if (orb == null)
return super.getUnlocalizedName(stack);
return super.getTranslationKey(stack);
return super.getUnlocalizedName(stack) + "." + orb.getName();
return super.getTranslationKey(stack) + "." + orb.getName();
}
@Override
@ -94,7 +94,7 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb {
BloodOrb orb = getOrb(stack);
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);
}

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java
View file

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

6
src/main/java/WayofTime/bloodmagic/item/ItemEnum.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java
View file

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

4
src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java
View file

@ -23,7 +23,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide
public ItemLavaCrystal() {
super();
setUnlocalizedName(BloodMagic.MODID + ".lavaCrystal");
setTranslationKey(BloodMagic.MODID + ".lavaCrystal");
}
@Override
@ -66,7 +66,7 @@ public class ItemLavaCrystal extends ItemBindableBase implements IVariantProvide
return null;
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;
NBTTagCompound nbt = (NBTTagCompound) bindingTag;

2
src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java
View file

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

20
src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java
View file

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

10
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java
View file

@ -31,7 +31,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider {
super();
setCreativeTab(BloodMagic.TAB_TOMES);
setUnlocalizedName(BloodMagic.MODID + ".upgradeTome");
setTranslationKey(BloodMagic.MODID + ".upgradeTome");
setHasSubtypes(true);
setMaxStackSize(1);
}
@ -65,15 +65,15 @@ public class ItemUpgradeTome extends Item implements IVariantProvider {
}
@Override
public String getUnlocalizedName(ItemStack stack) {
public String getTranslationKey(ItemStack stack) {
if (!stack.hasTagCompound())
return super.getUnlocalizedName(stack);
return super.getTranslationKey(stack);
LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack);
if (upgrade != null && upgrade.isDowngrade())
return "item." + BloodMagic.MODID + ".downgradeTome";
return super.getUnlocalizedName(stack);
return super.getTranslationKey(stack);
}
@Override
@ -106,7 +106,7 @@ public class ItemUpgradeTome extends Item implements IVariantProvider {
return;
LivingArmourUpgrade upgrade = LivingUpgrades.getUpgrade(stack);
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));
}
}
}

4
src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java
View file

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

10
src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
View file

@ -62,7 +62,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
public ItemLivingArmour(EntityEquipmentSlot armorType) {
super(ItemArmor.ArmorMaterial.IRON, 0, armorType);
setUnlocalizedName(BloodMagic.MODID + ".livingArmour.");
setTranslationKey(BloodMagic.MODID + ".livingArmour.");
// setMaxDamage(250);
setMaxDamage((int) (getMaxDamage() * 1.5));
setCreativeTab(BloodMagic.TAB_BM);
@ -259,10 +259,10 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IMeshP
if (tracker != null) {
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 {
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
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName(stack) + names[3 - armorType.getIndex()];
public String getTranslationKey(ItemStack stack) {
return super.getTranslationKey(stack) + names[3 - armorType.getIndex()];
}
@Override

6
src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java
View file

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

4
src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java
View file

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

4
src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java
View file

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

4
src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
View file

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

6
src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java
View file

@ -31,15 +31,15 @@ public class ItemFluidRouterFilter extends Item implements IFluidFilterProvider,
{
super();
setUnlocalizedName(BloodMagic.MODID + ".fluidFilter.");
setTranslationKey(BloodMagic.MODID + ".fluidFilter.");
setHasSubtypes(true);
setCreativeTab(BloodMagic.TAB_BM);
}
@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

2
src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java
View file

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

6
src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java
View file

@ -30,15 +30,15 @@ public class ItemRouterFilter extends Item implements IItemFilterProvider, IVari
{
super();
setUnlocalizedName(BloodMagic.MODID + ".itemFilter.");
setTranslationKey(BloodMagic.MODID + ".itemFilter.");
setHasSubtypes(true);
setCreativeTab(BloodMagic.TAB_BM);
}
@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

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java
View file

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

6
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
View file

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

6
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java
View file

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

2
src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java
View file

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

2
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
View file

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

2
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java
View file

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

2
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java
View file

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

2
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java
View file

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

2
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java
View file

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

2
src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java
View file

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

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