From 83f0eefa152a878fe2e8cd690cf3813a247689f5 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Thu, 31 Jan 2019 19:10:37 -0800 Subject: [PATCH] Update mappings + dependencies --- gradle.properties | 10 +++++----- .../java/WayofTime/bloodmagic/BloodMagic.java | 4 ++-- .../alchemyArray/AlchemyCircleRenderer.java | 2 +- .../bloodmagic/block/BlockAlchemyArray.java | 6 +++--- .../bloodmagic/block/BlockAlchemyTable.java | 2 +- .../bloodmagic/block/BlockAltar.java | 2 +- .../bloodmagic/block/BlockBloodLight.java | 4 ++-- .../bloodmagic/block/BlockBloodRune.java | 2 +- .../bloodmagic/block/BlockBloodTank.java | 8 ++++---- .../bloodmagic/block/BlockDecorative.java | 2 +- .../bloodmagic/block/BlockDemonBase.java | 2 +- .../bloodmagic/block/BlockDemonCrucible.java | 2 +- .../bloodmagic/block/BlockDemonCrystal.java | 2 +- .../block/BlockDemonCrystallizer.java | 2 +- .../bloodmagic/block/BlockDemonLight.java | 2 +- .../block/BlockDemonPillarBase.java | 2 +- .../block/BlockDemonPillarCapBase.java | 2 +- .../bloodmagic/block/BlockDemonPylon.java | 2 +- .../block/BlockDemonStairsBase.java | 2 +- .../bloodmagic/block/BlockDemonWallBase.java | 2 +- .../block/BlockDimensionalPortal.java | 6 +++--- .../bloodmagic/block/BlockIncenseAltar.java | 2 +- .../block/BlockInputRoutingNode.java | 2 +- .../block/BlockInversionPillar.java | 2 +- .../block/BlockInversionPillarEnd.java | 2 +- .../block/BlockItemRoutingNode.java | 2 +- .../bloodmagic/block/BlockLifeEssence.java | 4 ++-- .../block/BlockMasterRoutingNode.java | 2 +- .../bloodmagic/block/BlockMimic.java | 2 +- .../block/BlockOutputRoutingNode.java | 2 +- .../WayofTime/bloodmagic/block/BlockPath.java | 2 +- .../bloodmagic/block/BlockPhantom.java | 4 ++-- .../block/BlockRitualController.java | 4 ++-- .../bloodmagic/block/BlockRitualStone.java | 2 +- .../bloodmagic/block/BlockSoulForge.java | 2 +- .../bloodmagic/block/BlockSpectral.java | 4 ++-- .../bloodmagic/block/BlockTeleposer.java | 2 +- .../block/base/BlockEnumPillarCap.java | 2 +- .../block/base/BlockEnumStairs.java | 2 +- .../client/gui/GuiItemRoutingNode.java | 2 +- .../AttractorAlchemyCircleRenderer.java | 2 +- .../BindingAlchemyCircleRenderer.java | 2 +- .../DualAlchemyCircleRenderer.java | 2 +- .../MobSacrificeAlchemyCircleRenderer.java | 2 +- .../SingleAlchemyCircleRenderer.java | 2 +- .../StaticAlchemyCircleRenderer.java | 2 +- .../TurretAlchemyCircleRenderer.java | 2 +- .../render/entity/RenderEntityMimic.java | 2 +- .../command/sub/SubCommandRitual.java | 2 +- .../DataProviderRitualController.java | 4 ++-- .../bloodmagic/core/data/Binding.java | 2 +- .../demonAura/WorldDemonWillHandler.java | 2 +- .../entity/mob/EntitySentientSpecter.java | 2 +- .../bloodmagic/gson/Serializers.java | 4 ++-- .../bloodmagic/item/ItemAltarMaker.java | 2 +- .../bloodmagic/item/ItemArcaneAshes.java | 2 +- .../bloodmagic/item/ItemBloodOrb.java | 10 +++++----- .../bloodmagic/item/ItemBoundSword.java | 2 +- .../bloodmagic/item/ItemBoundTool.java | 2 +- .../item/ItemDaggerOfSacrifice.java | 2 +- .../bloodmagic/item/ItemDemonWillGauge.java | 2 +- .../WayofTime/bloodmagic/item/ItemEnum.java | 6 +++--- .../bloodmagic/item/ItemExperienceBook.java | 2 +- .../bloodmagic/item/ItemLavaCrystal.java | 4 ++-- .../bloodmagic/item/ItemPotionFlask.java | 2 +- .../bloodmagic/item/ItemRitualDismantler.java | 2 +- .../bloodmagic/item/ItemRitualDiviner.java | 20 +++++++++---------- .../bloodmagic/item/ItemRitualReader.java | 2 +- .../bloodmagic/item/ItemSanguineBook.java | 2 +- .../bloodmagic/item/ItemUpgradeTome.java | 10 +++++----- .../bloodmagic/item/ItemUpgradeTrainer.java | 4 ++-- .../item/armour/ItemLivingArmour.java | 10 +++++----- .../item/armour/ItemSentientArmour.java | 6 +++--- .../item/block/ItemBlockAlchemyTable.java | 2 +- .../item/block/ItemBlockDemonCrystal.java | 4 ++-- .../item/block/base/ItemBlockEnum.java | 4 ++-- .../item/block/base/ItemBlockInteger.java | 4 ++-- .../item/gear/ItemPackSacrifice.java | 2 +- .../item/gear/ItemPackSelfSacrifice.java | 2 +- .../item/routing/ItemFluidRouterFilter.java | 6 +++--- .../item/routing/ItemNodeRouter.java | 2 +- .../item/routing/ItemRouterFilter.java | 6 +++--- .../bloodmagic/item/sigil/ItemSigilBase.java | 2 +- .../item/sigil/ItemSigilHolding.java | 2 +- .../item/sigil/ItemSigilToggleableBase.java | 2 +- .../item/soul/ItemSentientArmourGem.java | 2 +- .../bloodmagic/item/soul/ItemSentientAxe.java | 2 +- .../bloodmagic/item/soul/ItemSentientBow.java | 2 +- .../item/soul/ItemSentientPickaxe.java | 2 +- .../item/soul/ItemSentientShovel.java | 2 +- .../item/soul/ItemSentientSword.java | 2 +- .../bloodmagic/item/soul/ItemSoulGem.java | 6 +++--- .../bloodmagic/item/soul/ItemSoulSnare.java | 6 +++--- .../item/soulBreath/ItemFlightScroll.java | 2 +- .../bloodmagic/livingArmour/LivingArmour.java | 2 +- .../livingArmour/LivingArmourUpgrade.java | 2 +- .../LivingArmourUpgradeBattleHungry.java | 2 +- .../LivingArmourUpgradeCrippledArm.java | 2 +- .../LivingArmourUpgradeDigSlowdown.java | 2 +- .../LivingArmourUpgradeDisoriented.java | 2 +- .../LivingArmourUpgradeMeleeDecrease.java | 2 +- .../LivingArmourUpgradeQuenched.java | 2 +- .../LivingArmourUpgradeSlippery.java | 2 +- .../LivingArmourUpgradeSlowHeal.java | 2 +- .../LivingArmourUpgradeSlowness.java | 2 +- .../LivingArmourUpgradeStormTrooper.java | 2 +- .../LivingArmourUpgradeArrowProtect.java | 2 +- .../upgrade/LivingArmourUpgradeArrowShot.java | 2 +- .../LivingArmourUpgradeCriticalStrike.java | 2 +- .../upgrade/LivingArmourUpgradeDigging.java | 2 +- .../upgrade/LivingArmourUpgradeElytra.java | 2 +- .../LivingArmourUpgradeExperience.java | 2 +- .../LivingArmourUpgradeFallProtect.java | 2 +- .../LivingArmourUpgradeFireResist.java | 2 +- .../LivingArmourUpgradeGraveDigger.java | 2 +- .../LivingArmourUpgradeGrimReaperSprint.java | 2 +- .../LivingArmourUpgradeHealthboost.java | 2 +- .../upgrade/LivingArmourUpgradeJump.java | 2 +- .../LivingArmourUpgradeKnockbackResist.java | 2 +- .../LivingArmourUpgradeMeleeDamage.java | 2 +- .../LivingArmourUpgradeNightSight.java | 2 +- .../LivingArmourUpgradePhysicalProtect.java | 2 +- .../LivingArmourUpgradePoisonResist.java | 2 +- .../upgrade/LivingArmourUpgradeRepairing.java | 2 +- .../LivingArmourUpgradeSelfSacrifice.java | 2 +- .../LivingArmourUpgradeSolarPowered.java | 2 +- .../upgrade/LivingArmourUpgradeSpeed.java | 2 +- .../LivingArmourUpgradeSprintAttack.java | 2 +- .../LivingArmourUpgradeStepAssist.java | 2 +- .../WayofTime/bloodmagic/ritual/Ritual.java | 8 ++++---- .../ritual/imperfect/ImperfectRitual.java | 2 +- .../ritual/types/RitualAnimalGrowth.java | 12 +++++------ .../ritual/types/RitualCrushing.java | 12 +++++------ .../ritual/types/RitualCrystalSplit.java | 2 +- .../ritual/types/RitualFeatheredKnife.java | 2 +- .../ritual/types/RitualGreenGrove.java | 2 +- .../bloodmagic/ritual/types/RitualLava.java | 2 +- .../bloodmagic/ritual/types/RitualSpeed.java | 2 +- .../structures/DungeonRoomLoader.java | 6 +++--- .../bloodmagic/tile/TileAlchemyTable.java | 2 +- .../bloodmagic/tile/TileDemonCrystal.java | 2 +- .../tile/TileMasterRitualStone.java | 2 +- .../tile/routing/TileRoutingNode.java | 2 +- .../bloodmagic/util/GhostItemHelper.java | 2 +- .../bloodmagic/util/ItemStackWrapper.java | 2 +- .../java/WayofTime/bloodmagic/util/Utils.java | 7 ++++--- .../util/handler/event/ClientHandler.java | 6 +++--- 147 files changed, 224 insertions(+), 223 deletions(-) diff --git a/gradle.properties b/gradle.properties index 48dbcb74..85df68d7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 \ No newline at end of file +jei_version=4.14.4.264 +waila_version=1.8.26-B41_1.12.2 +guideapi_version=1.12-2.1.8-63 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/BloodMagic.java b/src/main/java/WayofTime/bloodmagic/BloodMagic.java index c0413361..4f763a30 100644 --- a/src/main/java/WayofTime/bloodmagic/BloodMagic.java +++ b/src/main/java/WayofTime/bloodmagic/BloodMagic.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java index 89b0e042..51782a6b 100644 --- a/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/alchemyArray/AlchemyCircleRenderer.java @@ -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: diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java index 4f706b6f..589c8b16 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java @@ -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; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java index 6e6fe841..c8867b87 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAlchemyTable.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java index 136f7801..73923dcb 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockAltar.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java index 7076f77f..99b5a6e2 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java @@ -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; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index 471bc99d..538385b8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -22,7 +22,7 @@ public class BlockBloodRune extends BlockEnum 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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index 47e03d74..7dfa8ce2 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java index 76ae3392..065f340e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDecorative.java @@ -14,7 +14,7 @@ public class BlockDecorative extends BlockEnum { public BlockDecorative() { super(Material.ROCK, EnumDecorative.class); - setUnlocalizedName(BloodMagic.MODID + "."); + setTranslationKey(BloodMagic.MODID + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java index 782758fa..0fbe5fd7 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonBase.java @@ -11,7 +11,7 @@ public class BlockDemonBase & IStringSerializable> extends Blo public BlockDemonBase(String baseName, Class enumClass) { super(Material.ROCK, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java index b4d5c1d2..69b59a5a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java index 78a54ba5..9463e459 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java index 26ecfb88..b5dd79c5 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java index f78e7266..45c5f9cc 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonLight.java @@ -10,7 +10,7 @@ public class BlockDemonLight extends BlockEnum { 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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java index 5db379bb..10fb1fa0 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarBase.java @@ -14,7 +14,7 @@ public class BlockDemonPillarBase & IStringSerializable> exten public BlockDemonPillarBase(String baseName, Material materialIn, Class enumClass) { super(materialIn, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java index b31b09b1..7621d7ca 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPillarCapBase.java @@ -14,7 +14,7 @@ public class BlockDemonPillarCapBase & IStringSerializable> ex public BlockDemonPillarCapBase(String baseName, Material materialIn, Class enumClass) { super(materialIn, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java index 38a64240..5fb6a912 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java index 05bd1d75..1402fe47 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonStairsBase.java @@ -11,7 +11,7 @@ public class BlockDemonStairsBase & IStringSerializable> exten public BlockDemonStairsBase(String baseName, Material materialIn, Class enumClass) { super(materialIn, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java index ba6699fa..158ebdb9 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonWallBase.java @@ -11,7 +11,7 @@ public class BlockDemonWallBase & IStringSerializable> extends public BlockDemonWallBase(String baseName, Material materialIn, Class enumClass) { super(materialIn, enumClass); - setUnlocalizedName(BloodMagic.MODID + "." + baseName + "."); + setTranslationKey(BloodMagic.MODID + "." + baseName + "."); setCreativeTab(BloodMagic.TAB_BM); setHardness(2.0F); setResistance(5.0F); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java index 658a87f6..50f69dbc 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java @@ -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; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java index 12d9d77e..c97d1861 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java index 85aab8ae..15ed0f5a 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInputRoutingNode.java @@ -17,7 +17,7 @@ public class BlockInputRoutingNode extends BlockRoutingNode { public BlockInputRoutingNode() { super(); - setUnlocalizedName(BloodMagic.MODID + ".inputRouting"); + setTranslationKey(BloodMagic.MODID + ".inputRouting"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java index f9c17e29..70c68a04 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillar.java @@ -20,7 +20,7 @@ public class BlockInversionPillar extends BlockEnum { 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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java index 54193ee9..0b233797 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockInversionPillarEnd.java @@ -16,7 +16,7 @@ public class BlockInversionPillarEnd extends BlockEnum 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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java index 1bb62034..805e9d9c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockItemRoutingNode.java @@ -14,7 +14,7 @@ public class BlockItemRoutingNode extends BlockRoutingNode { public BlockItemRoutingNode() { super(); - setUnlocalizedName(BloodMagic.MODID + ".itemRouting"); + setTranslationKey(BloodMagic.MODID + ".itemRouting"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java index 8828d7c0..e94badd6 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java @@ -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; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java index d04ab3f2..c69e9caa 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMasterRoutingNode.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java index b0feb7eb..38b9ac62 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockMimic.java @@ -37,7 +37,7 @@ public class BlockMimic extends BlockEnum 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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java index 5882dc30..204db890 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockOutputRoutingNode.java @@ -17,7 +17,7 @@ public class BlockOutputRoutingNode extends BlockRoutingNode { public BlockOutputRoutingNode() { super(); - setUnlocalizedName(BloodMagic.MODID + ".outputRouting"); + setTranslationKey(BloodMagic.MODID + ".outputRouting"); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 92fae1bf..779c1389 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -20,7 +20,7 @@ public class BlockPath extends BlockEnum 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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java index 084e6486..bfcedb11 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java @@ -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; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index d08eb08c..f6a09218 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -35,7 +35,7 @@ public class BlockRitualController extends BlockEnum 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 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) diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 8ef70691..432861d3 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -23,7 +23,7 @@ public class BlockRitualStone extends BlockEnum 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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index 4f93536b..d8eb932d 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java index 6802804b..c6f8985c 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java @@ -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; } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java index 24978953..37bad79e 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java index 365dd875..d4998c28 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumPillarCap.java @@ -32,7 +32,7 @@ public class BlockEnumPillarCap & 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 diff --git a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java index 7a0203c4..f34b2e76 100644 --- a/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java +++ b/src/main/java/WayofTime/bloodmagic/block/base/BlockEnumStairs.java @@ -116,7 +116,7 @@ public class BlockEnumStairs & 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; } diff --git a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java index e879512a..2a9d0590 100644 --- a/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/client/gui/GuiItemRoutingNode.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java index 4e330f9e..348bc98f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/AttractorAlchemyCircleRenderer.java @@ -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: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java index 699916ca..191fde6f 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/BindingAlchemyCircleRenderer.java @@ -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: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java index 29f03cbb..d6fc3741 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/DualAlchemyCircleRenderer.java @@ -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: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java index d4590a5d..2f5bdfc7 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/MobSacrificeAlchemyCircleRenderer.java @@ -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) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java index f409062a..cafb9b63 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/SingleAlchemyCircleRenderer.java @@ -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: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java index a1e2b461..5153f6b8 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/StaticAlchemyCircleRenderer.java @@ -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: diff --git a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java index 967b4638..35702b83 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/alchemyArray/TurretAlchemyCircleRenderer.java @@ -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) { diff --git a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java index 27a39056..2612345a 100644 --- a/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java +++ b/src/main/java/WayofTime/bloodmagic/client/render/entity/RenderEntityMimic.java @@ -69,7 +69,7 @@ public class RenderEntityMimic extends RenderLiving { 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)); } } diff --git a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java index b527ed5f..bf1a7dca 100644 --- a/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java +++ b/src/main/java/WayofTime/bloodmagic/command/sub/SubCommandRitual.java @@ -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]); diff --git a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java index cadada2e..da4d5b21 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderRitualController.java @@ -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)); } } diff --git a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java index 3d7b8e2a..671f6a1b 100644 --- a/src/main/java/WayofTime/bloodmagic/core/data/Binding.java +++ b/src/main/java/WayofTime/bloodmagic/core/data/Binding.java @@ -61,7 +61,7 @@ public class Binding implements INBTSerializable { 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(); diff --git a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java index bd37857a..06639138 100644 --- a/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java +++ b/src/main/java/WayofTime/bloodmagic/demonAura/WorldDemonWillHandler.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java index c69b1e76..21d5b273 100644 --- a/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java +++ b/src/main/java/WayofTime/bloodmagic/entity/mob/EntitySentientSpecter.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java index a2171911..1f940d2e 100644 --- a/src/main/java/WayofTime/bloodmagic/gson/Serializers.java +++ b/src/main/java/WayofTime/bloodmagic/gson/Serializers.java @@ -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; } }; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java index e1da3b10..9800cce6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemAltarMaker.java @@ -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(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java index 41ebf298..12524c89 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemArcaneAshes.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java index c8516244..9e31e607 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBloodOrb.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java index e9b30300..935395da 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundSword.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java index 128751c6..4031565f 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java @@ -51,7 +51,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable { public ItemBoundTool(String name, float damage, Set 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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index c3b3ecfd..919a3039 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -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(); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java index bc8448ea..a2649334 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDemonWillGauge.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java index 0fed5b36..1881a7d6 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemEnum.java @@ -21,14 +21,14 @@ public class ItemEnum & 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 diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java index 5d8bc69e..381d817c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemExperienceBook.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java index 1b47e612..a537d1ec 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java @@ -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; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java index 12e0a2d4..098a2b62 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemPotionFlask.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java index 744b7129..f79d8bc1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDismantler.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java index 6d026756..05601f00 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualDiviner.java @@ -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); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java index bceeb86e..f96afc24 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemRitualReader.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java index ca2d37f9..9dc458f5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSanguineBook.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java index dc7d64b3..8563c02b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTome.java @@ -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)); } } } diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java index cef99437..f37785d1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemUpgradeTrainer.java @@ -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())); } } diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java index 001b3264..2d7ab288 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java index 5b043282..35261f98 100644 --- a/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java +++ b/src/main/java/WayofTime/bloodmagic/item/armour/ItemSentientArmour.java @@ -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) { diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java index 3a42a40e..25cc5b0b 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockAlchemyTable.java @@ -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; } diff --git a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java index 75ab9457..0d72a4a5 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/ItemBlockDemonCrystal.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java index 25f7375d..c7555739 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockEnum.java @@ -22,8 +22,8 @@ public class ItemBlockEnum & 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 diff --git a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java index 038c4e22..1797aa60 100644 --- a/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java +++ b/src/main/java/WayofTime/bloodmagic/item/block/base/ItemBlockInteger.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java index 31dfe5b2..2033e618 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java index a0c08a87..15508082 100644 --- a/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java index a72dfd3f..aa6ca4a1 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemFluidRouterFilter.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java index 7994c36b..4ea9be03 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemNodeRouter.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java index f80cf9aa..e62a77be 100644 --- a/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java +++ b/src/main/java/WayofTime/bloodmagic/item/routing/ItemRouterFilter.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java index dd4471dc..650ff280 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilBase.java @@ -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 + "."; diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java index 6399e817..b3fb15da 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilHolding.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java index 2586e266..ce7517a9 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleableBase.java @@ -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; diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java index 9cb62f6d..c1442db8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientArmourGem.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java index 1f7404cc..db43014d 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientAxe.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index e6df6969..71092325 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -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) diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java index e8d45479..47f3491e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientPickaxe.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java index c8b219b4..644b0b9e 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientShovel.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java index d97cab1c..3f932d34 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientSword.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java index aa678159..62948034 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java index 50971b17..c9483d33 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulSnare.java @@ -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 diff --git a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java index a4878215..12073a87 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java +++ b/src/main/java/WayofTime/bloodmagic/item/soulBreath/ItemFlightScroll.java @@ -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); } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java index 19f9a7a1..ab2fe989 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java @@ -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); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java index c160c6cd..41cfb72e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmourUpgrade.java @@ -55,7 +55,7 @@ public abstract class LivingArmourUpgrade { public abstract String getUniqueIdentifier(); - public abstract String getUnlocalizedName(); + public abstract String getTranslationKey(); public abstract int getMaxTier(); diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java index fe02490a..e7aec23e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeBattleHungry.java @@ -60,7 +60,7 @@ public class LivingArmourUpgradeBattleHungry extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "battleHunger"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java index 88b31e64..0467e0a7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeCrippledArm.java @@ -43,7 +43,7 @@ public class LivingArmourUpgradeCrippledArm extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "crippledArm"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java index 6c1dece3..69d041ee 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDigSlowdown.java @@ -54,7 +54,7 @@ public class LivingArmourUpgradeDigSlowdown extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "digSlowdown"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java index 2d791898..25daaaf4 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeDisoriented.java @@ -52,7 +52,7 @@ public class LivingArmourUpgradeDisoriented extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "disoriented"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java index a67a5cfb..0e59b0ba 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeMeleeDecrease.java @@ -63,7 +63,7 @@ public class LivingArmourUpgradeMeleeDecrease extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "meleeDecrease"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java index 9272cd48..1294fe29 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeQuenched.java @@ -43,7 +43,7 @@ public class LivingArmourUpgradeQuenched extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "quenched"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java index afca233c..413eac26 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlippery.java @@ -80,7 +80,7 @@ public class LivingArmourUpgradeSlippery extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "slippery"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java index 0b964731..f7d0c6ba 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowHeal.java @@ -51,7 +51,7 @@ public class LivingArmourUpgradeSlowHeal extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "slowHeal"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java index db12a7ac..a36c48b3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeSlowness.java @@ -61,7 +61,7 @@ public class LivingArmourUpgradeSlowness extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "slowness"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java index d90aa3e5..5f9ed0fa 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/downgrade/LivingArmourUpgradeStormTrooper.java @@ -48,7 +48,7 @@ public class LivingArmourUpgradeStormTrooper extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "stormTrooper"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java index f50e5d59..94ccca9a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowProtect.java @@ -49,7 +49,7 @@ public class LivingArmourUpgradeArrowProtect extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "arrowProtect"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java index 64e99f67..a83e62ad 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeArrowShot.java @@ -46,7 +46,7 @@ public class LivingArmourUpgradeArrowShot extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "arrowShot"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java index 64b1ff05..5f82954e 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeCriticalStrike.java @@ -57,7 +57,7 @@ public class LivingArmourUpgradeCriticalStrike extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "criticalStrike"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java index a88e42c9..8e977049 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeDigging.java @@ -65,7 +65,7 @@ public class LivingArmourUpgradeDigging extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "digging"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java index d1699406..9e1c4a3a 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeElytra.java @@ -45,7 +45,7 @@ public class LivingArmourUpgradeElytra extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "elytra"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java index ba5abaaa..e36e05bf 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeExperience.java @@ -42,7 +42,7 @@ public class LivingArmourUpgradeExperience extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "experienced"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java index c394a4af..56971eb9 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFallProtect.java @@ -49,7 +49,7 @@ public class LivingArmourUpgradeFallProtect extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "fallProtect"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java index a4725a05..1e0a465c 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeFireResist.java @@ -63,7 +63,7 @@ public class LivingArmourUpgradeFireResist extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "fireResist"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java index 69a58009..1c1ec121 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGraveDigger.java @@ -55,7 +55,7 @@ public class LivingArmourUpgradeGraveDigger extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "graveDigger"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java index 1e8fdfd3..92fba1a7 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeGrimReaperSprint.java @@ -59,7 +59,7 @@ public class LivingArmourUpgradeGrimReaperSprint extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "grimReaper"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java index 08ecc06c..4b3a82bf 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeHealthboost.java @@ -63,7 +63,7 @@ public class LivingArmourUpgradeHealthboost extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "health"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java index 4bb03e62..723ef2ab 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeJump.java @@ -57,7 +57,7 @@ public class LivingArmourUpgradeJump extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "jump"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java index 8909473e..39a34a08 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeKnockbackResist.java @@ -61,7 +61,7 @@ public class LivingArmourUpgradeKnockbackResist extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "knockback"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java index 22e206f8..7a4fc138 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeMeleeDamage.java @@ -63,7 +63,7 @@ public class LivingArmourUpgradeMeleeDamage extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "meleeDamage"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java index b9171625..3493b8e1 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeNightSight.java @@ -71,7 +71,7 @@ public class LivingArmourUpgradeNightSight extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "nightSight"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java index 9b755a27..52a60199 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePhysicalProtect.java @@ -49,7 +49,7 @@ public class LivingArmourUpgradePhysicalProtect extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "physicalProtect"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java index 49bd19c0..08c75b19 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradePoisonResist.java @@ -64,7 +64,7 @@ public class LivingArmourUpgradePoisonResist extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "poisonResist"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java index 80f7093d..d9d00733 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeRepairing.java @@ -67,7 +67,7 @@ public class LivingArmourUpgradeRepairing extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "repair"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java index 0c3a6db7..4b68bb79 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSelfSacrifice.java @@ -43,7 +43,7 @@ public class LivingArmourUpgradeSelfSacrifice extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "selfSacrifice"; } } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java index fea3748c..114508d2 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSolarPowered.java @@ -73,7 +73,7 @@ public class LivingArmourUpgradeSolarPowered extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "solarPowered"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java index d0392eec..8b9288a6 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSpeed.java @@ -98,7 +98,7 @@ public class LivingArmourUpgradeSpeed extends LivingArmourUpgrade } @Override - public String getUnlocalizedName() + public String getTranslationKey() { return tooltipBase + "speed"; } diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java index 49504483..e4963af3 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeSprintAttack.java @@ -68,7 +68,7 @@ public class LivingArmourUpgradeSprintAttack extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "sprintAttack"; } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java index 83d414d4..9392f6ec 100644 --- a/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java +++ b/src/main/java/WayofTime/bloodmagic/livingArmour/upgrade/LivingArmourUpgradeStepAssist.java @@ -45,7 +45,7 @@ public class LivingArmourUpgradeStepAssist extends LivingArmourUpgrade { } @Override - public String getUnlocalizedName() { + public String getTranslationKey() { return tooltipBase + "stepAssist"; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java index 95504bce..d357c6c5 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/Ritual.java @@ -51,7 +51,7 @@ public abstract class Ritual { public void readFromNBT(NBTTagCompound tag) { NBTTagList tags = tag.getTagList("areas", 10); - if (tags.hasNoTags()) { + if (tags.isEmpty()) { return; } @@ -237,12 +237,12 @@ public abstract class Ritual { } public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info")}; } public ITextComponent provideInformationOfRangeToPlayer(EntityPlayer player, String range) { if (getListOfRanges().contains(range)) { - return new TextComponentTranslation(this.getUnlocalizedName() + "." + range + ".info"); + return new TextComponentTranslation(this.getTranslationKey() + "." + range + ".info"); } else { return new TextComponentTranslation("ritual.bloodmagic.blockRange.noRange"); } @@ -301,7 +301,7 @@ public abstract class Ritual { return renderer; } - public String getUnlocalizedName() { + public String getTranslationKey() { return unlocalizedName; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java index 6aa24daa..3a314984 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/imperfect/ImperfectRitual.java @@ -60,7 +60,7 @@ public abstract class ImperfectRitual { return lightShow; } - public String getUnlocalizedName() { + public String getTranslationKey() { return unlocalizedName; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java index f92b2db3..15bb17ac 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualAnimalGrowth.java @@ -192,12 +192,12 @@ public class RitualAnimalGrowth extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { return new ITextComponent[]{ - new TextComponentTranslation(this.getUnlocalizedName() + ".info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info") + new TextComponentTranslation(this.getTranslationKey() + ".info"), + new TextComponentTranslation(this.getTranslationKey() + ".default.info"), + new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), + new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), + new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), + new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info") }; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java index 2d56e16f..271ddac4 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrushing.java @@ -261,12 +261,12 @@ public class RitualCrushing extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { return new ITextComponent[]{ - new TextComponentTranslation(this.getUnlocalizedName() + ".info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), - new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info") + new TextComponentTranslation(this.getTranslationKey() + ".info"), + new TextComponentTranslation(this.getTranslationKey() + ".default.info"), + new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), + new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), + new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), + new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info") }; } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java index a52f5181..d5f666be 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualCrystalSplit.java @@ -185,6 +185,6 @@ public class RitualCrystalSplit extends Ritual @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[] { new TextComponentTranslation(this.getUnlocalizedName() + ".info") }; + return new ITextComponent[] { new TextComponentTranslation(this.getTranslationKey() + ".info") }; } } diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java index 7706e112..352725a3 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualFeatheredKnife.java @@ -203,7 +203,7 @@ public class RitualFeatheredKnife extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info"), new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; } public double getLPModifierForWill(double destructiveWill) { diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java index 19bd678b..4bfddd31 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualGreenGrove.java @@ -267,7 +267,7 @@ public class RitualGreenGrove extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info"), new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java index b247bcab..d9c67d1a 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualLava.java @@ -230,7 +230,7 @@ public class RitualLava extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info"), new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; } @Override diff --git a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java index 5a1eb618..244c038e 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/types/RitualSpeed.java @@ -171,7 +171,7 @@ public class RitualSpeed extends Ritual { @Override public ITextComponent[] provideInformationOfRitualToPlayer(EntityPlayer player) { - return new ITextComponent[]{new TextComponentTranslation(this.getUnlocalizedName() + ".info"), new TextComponentTranslation(this.getUnlocalizedName() + ".default.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".corrosive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".steadfast.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".destructive.info"), new TextComponentTranslation(this.getUnlocalizedName() + ".vengeful.info")}; + return new ITextComponent[]{new TextComponentTranslation(this.getTranslationKey() + ".info"), new TextComponentTranslation(this.getTranslationKey() + ".default.info"), new TextComponentTranslation(this.getTranslationKey() + ".corrosive.info"), new TextComponentTranslation(this.getTranslationKey() + ".steadfast.info"), new TextComponentTranslation(this.getTranslationKey() + ".destructive.info"), new TextComponentTranslation(this.getTranslationKey() + ".vengeful.info")}; } public double getVerticalSpeedForWill(double rawWill) { diff --git a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java index a8b3038f..2b712a20 100644 --- a/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java +++ b/src/main/java/WayofTime/bloodmagic/structures/DungeonRoomLoader.java @@ -54,8 +54,8 @@ public class DungeonRoomLoader { public static void test() { ResourceLocation id = new ResourceLocation(BloodMagic.MODID, "testGson"); - String s = id.getResourceDomain(); - String s1 = id.getResourcePath(); + String s = id.getNamespace(); + String s1 = id.getPath(); InputStream inputstream = null; try { @@ -70,6 +70,6 @@ public class DungeonRoomLoader { } public static String resLocToResourcePath(ResourceLocation resourceLocation) { - return "/assets/" + resourceLocation.getResourceDomain() + "/schematics/" + resourceLocation.getResourcePath() + ".json"; + return "/assets/" + resourceLocation.getNamespace() + "/schematics/" + resourceLocation.getPath() + ".json"; } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java index b023c5c0..57d7d8e1 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileAlchemyTable.java @@ -81,7 +81,7 @@ public class TileAlchemyTable extends TileInventory implements ISidedInventory, super.deserialize(tag); isSlave = tag.getBoolean("isSlave"); - direction = EnumFacing.getFront(tag.getInteger(Constants.NBT.DIRECTION)); + direction = EnumFacing.byIndex(tag.getInteger(Constants.NBT.DIRECTION)); connectedPos = new BlockPos(tag.getInteger(Constants.NBT.X_COORD), tag.getInteger(Constants.NBT.Y_COORD), tag.getInteger(Constants.NBT.Z_COORD)); burnTime = tag.getInteger("burnTime"); diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java index 052e8e2a..827e31b0 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileDemonCrystal.java @@ -173,7 +173,7 @@ public class TileDemonCrystal extends TileTicking { holder.readFromNBT(tag, "Will"); crystalCount = tag.getInteger("crystalCount"); - placement = EnumFacing.getFront(tag.getInteger("placement")); + placement = EnumFacing.byIndex(tag.getInteger("placement")); progressToNextCrystal = tag.getDouble("progress"); } diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java index 1f803f26..46e6332d 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/tile/TileMasterRitualStone.java @@ -80,7 +80,7 @@ public class TileMasterRitualStone extends TileTicking implements IMasterRitualS currentRitual = BloodMagic.RITUAL_MANAGER.getRitual(tag.getString(Constants.NBT.CURRENT_RITUAL)); if (currentRitual != null) { NBTTagCompound ritualTag = tag.getCompoundTag(Constants.NBT.CURRENT_RITUAL_TAG); - if (!ritualTag.hasNoTags()) { + if (!ritualTag.isEmpty()) { currentRitual.readFromNBT(ritualTag); } } diff --git a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java index 66c6b4df..0062ce60 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/routing/TileRoutingNode.java @@ -30,7 +30,7 @@ public class TileRoutingNode extends TileInventory implements IRoutingNode, IIte @Override public void update() { if (!getWorld().isRemote) { - currentInput = getWorld().isBlockIndirectlyGettingPowered(pos); + currentInput = getWorld().getRedstonePowerFromNeighbors(pos); // currentInput = getWorld().getStrongPower(pos); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java index 6c454ba8..54a2e614 100644 --- a/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java +++ b/src/main/java/WayofTime/bloodmagic/util/GhostItemHelper.java @@ -46,7 +46,7 @@ public class GhostItemHelper { NBTTagCompound tag = newStack.getTagCompound(); int amount = getItemGhostAmount(ghostStack); tag.removeTag(Constants.NBT.GHOST_STACK_SIZE); - if (tag.hasNoTags()) { + if (tag.isEmpty()) { newStack.setTagCompound(null); } newStack.setCount(amount); diff --git a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java index d1d648d0..70b19397 100644 --- a/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java +++ b/src/main/java/WayofTime/bloodmagic/util/ItemStackWrapper.java @@ -56,7 +56,7 @@ public class ItemStackWrapper { @Override public String toString() { - return stackSize + "x" + item.getUnlocalizedName() + "@" + this.meta; + return stackSize + "x" + item.getTranslationKey() + "@" + this.meta; } public ItemStack toStack(int count) { diff --git a/src/main/java/WayofTime/bloodmagic/util/Utils.java b/src/main/java/WayofTime/bloodmagic/util/Utils.java index 3e6fecc0..90f1d312 100644 --- a/src/main/java/WayofTime/bloodmagic/util/Utils.java +++ b/src/main/java/WayofTime/bloodmagic/util/Utils.java @@ -41,6 +41,7 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.ISpecialArmor.ArmorProperties; import net.minecraftforge.fluids.IFluidBlock; +import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -59,7 +60,7 @@ public class Utils { static { try { - Field colorValue = ReflectionHelper.findField(EnumDyeColor.class, "field_193351_w", "colorValue"); + Field colorValue = ObfuscationReflectionHelper.findField(EnumDyeColor.class, "field_193351_w"); colorValue.setAccessible(true); for (EnumDyeColor color : EnumDyeColor.values()) { DYE_COLOR_VALUES.put(color, (int) colorValue.get(color)); @@ -130,7 +131,7 @@ public class Utils { public static boolean canEntitySeeBlock(World world, Entity entity, BlockPos pos) { Vec3d relativePosition = new Vec3d(entity.posX - pos.getX() - 0.5, entity.posY + (double) entity.getEyeHeight() - pos.getY() - 0.5, entity.posZ - pos.getZ() - 0.5); EnumFacing dir = EnumFacing.getFacingFromVector((float) relativePosition.x, (float) relativePosition.y, (float) relativePosition.z); - RayTraceResult result = world.rayTraceBlocks(new Vec3d(entity.posX, entity.posY + (double) entity.getEyeHeight(), entity.posZ), new Vec3d(pos.getX() + 0.5 + dir.getFrontOffsetX() * 0.4, pos.getY() + 0.5 + dir.getFrontOffsetY() * 0.4, pos.getZ() + 0.5 + dir.getFrontOffsetZ() * 0.4), false, true, true); + RayTraceResult result = world.rayTraceBlocks(new Vec3d(entity.posX, entity.posY + (double) entity.getEyeHeight(), entity.posZ), new Vec3d(pos.getX() + 0.5 + dir.getXOffset() * 0.4, pos.getY() + 0.5 + dir.getYOffset() * 0.4, pos.getZ() + 0.5 + dir.getZOffset() * 0.4), false, true, true); return result == null || pos.equals(result.getBlockPos()); } @@ -967,7 +968,7 @@ public class Utils { if (player instanceof EntityPlayerMP) reachDistance = ((EntityPlayerMP) player).interactionManager.getBlockReachDistance(); - Vec3d reachPosition = eyePosition.addVector((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); + Vec3d reachPosition = eyePosition.add((double) f6 * reachDistance, (double) f5 * reachDistance, (double) f7 * reachDistance); return player.getEntityWorld().rayTraceBlocks(eyePosition, reachPosition, useLiquids, !useLiquids, false); } } diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java index 8f29bfab..b929e0e9 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/event/ClientHandler.java @@ -185,13 +185,13 @@ public class ClientHandler { // Collect all Blood Magic model errors List errored = new ArrayList<>(); for (ResourceLocation modelError : modelErrors.keySet()) - if (modelError.getResourceDomain().equalsIgnoreCase(BloodMagic.MODID)) + if (modelError.getNamespace().equalsIgnoreCase(BloodMagic.MODID)) errored.add(modelError); // Collect all Blood Magic variant errors List missing = new ArrayList<>(); for (ModelResourceLocation missingVariant : missingVariants) - if (missingVariant.getResourceDomain().equalsIgnoreCase(BloodMagic.MODID)) + if (missingVariant.getNamespace().equalsIgnoreCase(BloodMagic.MODID)) missing.add(missingVariant); // Remove discovered model errors @@ -226,7 +226,7 @@ public class ClientHandler { if (missingTextures.containsKey(mc)) { Set missingMCTextures = missingTextures.get(mc); for (ResourceLocation texture : missingMCTextures) - if (texture.getResourcePath().equalsIgnoreCase(String.format(format, "node")) || texture.getResourcePath().equalsIgnoreCase(String.format(format, "crystal"))) + if (texture.getPath().equalsIgnoreCase(String.format(format, "node")) || texture.getPath().equalsIgnoreCase(String.format(format, "crystal"))) toRemove.add(texture); }