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

Update mappings + dependencies

Browse source
This commit is contained in:
Nicholas Ignoffo 2019-01-31 19:10:37 -08:00
parent 1426e49164
commit 83f0eefa15
147 changed files with 224 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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