From fd95f3f461369c6d38d8693047751d8bc9fee1dd Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Sun, 26 Oct 2025 21:50:00 -0400 Subject: [PATCH 1/3] Add capacity to the tooltip of the Eldritch Blood Orb --- .../fox/spiteful/forbidden/items/ItemDivineOrb.java | 12 ++++-------- src/main/resources/assets/forbidden/lang/en_US.lang | 2 +- src/main/resources/assets/forbidden/lang/ja_JP.lang | 3 +-- src/main/resources/assets/forbidden/lang/ko_KR.lang | 1 - src/main/resources/assets/forbidden/lang/ru_RU.lang | 1 - src/main/resources/assets/forbidden/lang/zh_CN.lang | 1 - 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java b/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java index a2fa885..842e380 100644 --- a/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java +++ b/src/main/java/fox/spiteful/forbidden/items/ItemDivineOrb.java @@ -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 tooltip, boolean advanced) { + tooltip.add(StatCollector.translateToLocal("tooltip.energybattery.desc")); + tooltip.add(StatCollector.translateToLocalFormatted("tooltip.energybattery.capacity", getMaxEssence())); + addBindingInformation(item, tooltip); } @Override diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang index 8c039b3..a605f3b 100644 --- a/src/main/resources/assets/forbidden/lang/en_US.lang +++ b/src/main/resources/assets/forbidden/lang/en_US.lang @@ -139,7 +139,7 @@ forbidden.upgrade.pandemonium.text=This upgrade teleports all surrounding enemie # # Tooltips tooltip.currentowner=Current owner: -tooltip.divineorb=Stores raw Life Essence +tooltip.divineorb.capacity=Capacity: %,d LP tooltip.creativeonly=Creative Only tooltip.collar.owner=Owner: # diff --git a/src/main/resources/assets/forbidden/lang/ja_JP.lang b/src/main/resources/assets/forbidden/lang/ja_JP.lang index 1fbebfb..0afc856 100644 --- a/src/main/resources/assets/forbidden/lang/ja_JP.lang +++ b/src/main/resources/assets/forbidden/lang/ja_JP.lang @@ -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=所有者: # diff --git a/src/main/resources/assets/forbidden/lang/ko_KR.lang b/src/main/resources/assets/forbidden/lang/ko_KR.lang index fba3c6d..a7b5a29 100644 --- a/src/main/resources/assets/forbidden/lang/ko_KR.lang +++ b/src/main/resources/assets/forbidden/lang/ko_KR.lang @@ -134,7 +134,6 @@ forbidden.upgrade.pandemonium.text=이 업그레이드는 텔레포트한 지역 # # Tooltips tooltip.currentowner=현재 소유자: -tooltip.divineorb=Stores raw Life Essence tooltip.creativeonly=크리에이티브 전용 tooltip.collar.owner=소유자: # diff --git a/src/main/resources/assets/forbidden/lang/ru_RU.lang b/src/main/resources/assets/forbidden/lang/ru_RU.lang index 474de6b..7a89381 100644 --- a/src/main/resources/assets/forbidden/lang/ru_RU.lang +++ b/src/main/resources/assets/forbidden/lang/ru_RU.lang @@ -135,7 +135,6 @@ potion.dragonwrack=Убийца Драконов # # Tooltips tooltip.currentowner=Текущий владелец: -tooltip.divineorb=Содержит необработанную жизненную эссенцию tooltip.creativeonly=Только для творческого режима tooltip.collar.owner=Владелец: # diff --git a/src/main/resources/assets/forbidden/lang/zh_CN.lang b/src/main/resources/assets/forbidden/lang/zh_CN.lang index c1a7fc9..66a7a53 100644 --- a/src/main/resources/assets/forbidden/lang/zh_CN.lang +++ b/src/main/resources/assets/forbidden/lang/zh_CN.lang @@ -126,7 +126,6 @@ forbidden.upgrade.pandemonium.text=这个升级将会把你被传送到的地方 # # Tooltips tooltip.currentowner=当前持有者: -tooltip.divineorb=存储的原生生命源质: tooltip.creativeonly=创造模式专用 tooltip.collar.owner=持有者: # From 269d93a4360b2e0de24d0b1a1c419d61e315ef97 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Sun, 26 Oct 2025 21:50:31 -0400 Subject: [PATCH 2/3] update --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0a8068b..2351d0f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -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") From cd88e76364fa82aef2c16629d4390ac28e063626 Mon Sep 17 00:00:00 2001 From: koolkrafter5 Date: Sun, 26 Oct 2025 21:51:41 -0400 Subject: [PATCH 3/3] Remove this since it's in BM --- src/main/resources/assets/forbidden/lang/en_US.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/assets/forbidden/lang/en_US.lang b/src/main/resources/assets/forbidden/lang/en_US.lang index a605f3b..940fdbf 100644 --- a/src/main/resources/assets/forbidden/lang/en_US.lang +++ b/src/main/resources/assets/forbidden/lang/en_US.lang @@ -139,7 +139,6 @@ forbidden.upgrade.pandemonium.text=This upgrade teleports all surrounding enemie # # Tooltips tooltip.currentowner=Current owner: -tooltip.divineorb.capacity=Capacity: %,d LP tooltip.creativeonly=Creative Only tooltip.collar.owner=Owner: #