Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencies {
api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
api('com.github.GTNewHorizons:Baubles:1.0.4:dev')

compileOnly('com.github.GTNewHorizons:BloodMagic:1.8.3:dev')
compileOnly('com.github.GTNewHorizons:BloodMagic:1.8.5:dev')
compileOnly('com.github.GTNewHorizons:Botania:1.13.3-GTNH:api')
compileOnly("com.github.GTNewHorizons:AppleCore:3.3.7:dev")

Expand Down
12 changes: 4 additions & 8 deletions src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,10 @@ public void registerIcons(IIconRegister iconRegister) {
}

@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
list.add(StatCollector.translateToLocal("tooltip.divineorb"));

if (!(stack.stackTagCompound == null)) {
list.add(
StatCollector.translateToLocal("tooltip.currentowner") + " "
+ stack.stackTagCompound.getString("ownerName"));
}
public void addInformation(ItemStack item, EntityPlayer player, List<String> tooltip, boolean advanced) {
tooltip.add(StatCollector.translateToLocal("tooltip.energybattery.desc"));
tooltip.add(StatCollector.translateToLocalFormatted("tooltip.energybattery.capacity", getMaxEssence()));
addBindingInformation(item, tooltip);
}

@Override
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/forbidden/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ forbidden.upgrade.pandemonium.text=This upgrade teleports all surrounding enemie
#
# Tooltips
tooltip.currentowner=Current owner:
tooltip.divineorb=Stores raw Life Essence
tooltip.creativeonly=Creative Only
tooltip.collar.owner=Owner:
#
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/assets/forbidden/lang/ja_JP.lang
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ enchantment.impact=衝撃
potion.blood_seal=Blood Seal
#
# Tooltips
tooltip.currentowner=現在の所有者:
tooltip.divineorb=Stores raw Life Essence
tooltip.currentowner=現在の所有者:
tooltip.creativeonly=クリエイティブ限定
tooltip.collar.owner=所有者:
#
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/forbidden/lang/ko_KR.lang
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ forbidden.upgrade.pandemonium.text=이 업그레이드는 텔레포트한 지역
#
# Tooltips
tooltip.currentowner=현재 소유자:
tooltip.divineorb=Stores raw Life Essence
tooltip.creativeonly=크리에이티브 전용
tooltip.collar.owner=소유자:
#
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/forbidden/lang/ru_RU.lang
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ potion.dragonwrack=Убийца Драконов
#
# Tooltips
tooltip.currentowner=Текущий владелец:
tooltip.divineorb=Содержит необработанную жизненную эссенцию
tooltip.creativeonly=Только для творческого режима
tooltip.collar.owner=Владелец:
#
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/forbidden/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ forbidden.upgrade.pandemonium.text=这个升级将会把你被传送到的地方
#
# Tooltips
tooltip.currentowner=当前持有者:
tooltip.divineorb=存储的原生生命源质:
tooltip.creativeonly=创造模式专用
tooltip.collar.owner=持有者:
#
Expand Down