fix(vial): tooltip #13

SirEdvin · Jul 20, 2023 · ce7fa6c · ce7fa6c
1 parent 0d36c6e
commit ce7fa6c
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Various scanner problems (see UnlimitedPeripheralWorks#22)
 - Potential crash when provide incorrect item to automata upgrades
 - Mason recipe is not missed anymore (#12)
+- Tooltip for soul vial (#13)
 
 ## [1.0.0] - 2023-07-09
 

diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/items/SoulVial.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/common/items/SoulVial.kt
@@ -13,6 +13,7 @@ import net.minecraft.world.phys.HitResult
 import site.siredvin.peripheralium.common.items.DescriptiveItem
 import site.siredvin.peripheralium.util.itemExtra
 import site.siredvin.turtlematic.common.setup.Items
+import site.siredvin.turtlematic.data.ModTooltip
 
 class SoulVial : DescriptiveItem(Properties().stacksTo(1).fireResistant()) {
 
@@ -30,7 +31,7 @@ class SoulVial : DescriptiveItem(Properties().stacksTo(1).fireResistant()) {
         super.appendHoverText(itemStack, level, list, tooltipFlag)
         val data = itemStack.tag
         if (data != null) {
-            list.add(itemExtra(descriptionId, "progress", data.getInt(NBT_KEY), SOUL_LIMIT))
+            list.add(ModTooltip.SOUL_VIAL_PROGRESS.format(data.getInt(NBT_KEY), SOUL_LIMIT))
         }
     }
 

diff --git a/projects/core/src/main/kotlin/site/siredvin/turtlematic/data/ModEnLanguageProvider.kt b/projects/core/src/main/kotlin/site/siredvin/turtlematic/data/ModEnLanguageProvider.kt
@@ -86,7 +86,7 @@ class ModEnLanguageProvider(output: PackOutput) : ModLanguageProvider(output, "e
         add(ModTooltip.CAPTURED_ENTITY, "§oStored entity: %s")
         add(ModTooltip.AMOUNT_OF_XP, "§oStored xp: %s")
 
-        add(ModTooltip.SOUL_VIAL_PROGRESS, "§5Already %s from %s souls stored")
+        add(ModTooltip.SOUL_VIAL_PROGRESS, "§5Already %s §5from %s §5souls stored")
 
         addTurtle(AutomataCorePeripheral.UPGRADE_ID, "Automata")
         addTurtle(HusbandryAutomataCorePeripheral.UPGRADE_ID, "Husbandry Automata")

diff --git a/projects/fabric/src/generated/resources/.cache/1a20bbdf039a1905a1788999f66658322d8a4bec b/projects/fabric/src/generated/resources/.cache/1a20bbdf039a1905a1788999f66658322d8a4bec
@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-18T22:08:47.50501926	Turtlematic/Tags for minecraft:entity_type
+// 1.20.1	2023-07-20T16:00:25.193334763	Turtlematic/Tags for minecraft:entity_type
 6d4ebb69c36ed8a9e9dde2ffbdd7afc561fe5b45 data/turtlematic/tags/entity_types/ai_control_blocklist.json
 916474b74424282b20dc9400f53d3baa4e34951c data/turtlematic/tags/entity_types/animal.json
 6d4ebb69c36ed8a9e9dde2ffbdd7afc561fe5b45 data/turtlematic/tags/entity_types/capture_blocklist.json
diff --git a/projects/fabric/src/generated/resources/.cache/857fcdcb73698b0a239b74a31fee89ad3a877e9f b/projects/fabric/src/generated/resources/.cache/857fcdcb73698b0a239b74a31fee89ad3a877e9f
@@ -1,2 +1,2 @@
-// 1.20.1	2023-07-18T22:08:47.504459796	Turtlematic/Languageen_us
-72d07a3d926ff2b2ff56348fb54e1a75647a11db assets/turtlematic/lang/en_us.json
+// 1.20.1	2023-07-20T16:00:25.192825051	Turtlematic/Languageen_us
+8765d9206e847f02677edf131b12d282ee1cd8b8 assets/turtlematic/lang/en_us.json
diff --git a/projects/fabric/src/generated/resources/.cache/8bcf6d0bc332b4541e7addb3be4bb99e4e488a54 b/projects/fabric/src/generated/resources/.cache/8bcf6d0bc332b4541e7addb3be4bb99e4e488a54
@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-18T22:08:47.502439466	Turtlematic/Block State Definitions
+// 1.20.1	2023-07-20T16:00:25.191197849	Turtlematic/Block State Definitions
 9d8b3c01909e14f2d01d7ee18d3d75d16342a372 assets/turtlematic/models/item/creative_enchanting_automata_core.json
 128b5aa5ba88d5d300d0dfc1a5b71fef9a32e668 assets/turtlematic/models/item/forged_automata_core.json
 bb1fc2331e01106412b812d8e40a425bc87016f1 assets/turtlematic/models/item/starbound_mason_automata_core.json
@@ -29,18 +29,18 @@ ddd8f99080b1596fb387808afda571c342e0a6aa assets/turtlematic/models/turtle/chunk_
 c76a088a0af63ba07f19058a28571e7c9e742d35 assets/turtlematic/models/item/netherite_end_automata_core.json
 7802b552e7c7dde5fadc36748b75d7a800db36ba assets/turtlematic/models/item/brewing_automata_core.json
 7d8885dd74ccd9132fb4c01697b1628c37753dee assets/turtlematic/models/item/starbound_enchanting_automata_core.json
-5dcef3027a21b1afde5df54153b7941216f1e4e2 assets/turtlematic/models/item/creative_protective_automata_core.json
 07e6c3817f6b099b1c4d5f7e233e444fd033ef5d assets/turtlematic/models/item/automata_core.json
+5dcef3027a21b1afde5df54153b7941216f1e4e2 assets/turtlematic/models/item/creative_protective_automata_core.json
 c5663b653279e58961c47e12cf63b57d5e385a15 assets/turtlematic/models/item/netherite_protective_automata_core.json
-c2580532b94fda91ffb3b93e493400a1160b70ba assets/turtlematic/models/item/enchanting_automata_core.json
 238c3ad406da468463752e2b81c43bedaefe4165 assets/turtlematic/models/item/soul_vial_2.json
+c2580532b94fda91ffb3b93e493400a1160b70ba assets/turtlematic/models/item/enchanting_automata_core.json
 d299671b86fbce6399bb7c4fd0b01d19209ce182 assets/turtlematic/models/item/starbound_protective_automata_core.json
 0ac550cc551abbdca71de79329574a625964efb8 assets/turtlematic/models/turtle/chatter_left.json
 1f25a7a21f850402437487360f0c2c6d31c8d0ba assets/turtlematic/models/item/mason_automata_core.json
 df9b1cb8b814c8e57c8c8cdf9061df315b6c0474 assets/turtlematic/models/turtle/creative_chest_left.json
 f02b4d2c6d1251ce04b2ec55f8137e3ac93fecf7 assets/turtlematic/models/item/creative_end_automata_core.json
 35247aac4ef47bd38e10ae82224ae46b32d65038 assets/turtlematic/models/item/starbound_smithing_automata_core.json
 11245eb0b2b39d729313639432f425faf5366d08 assets/turtlematic/models/turtle/chatter_right.json
-236e41847b68be363e6b775e69b9129301bc13e9 assets/turtlematic/models/item/netherite_husbandry_automata_core.json
 170ae3a2ca7eae54074f52548f177d884df0d010 assets/turtlematic/models/item/chunk_vial.json
+236e41847b68be363e6b775e69b9129301bc13e9 assets/turtlematic/models/item/netherite_husbandry_automata_core.json
 90020ef4a2a8b90340d582b723bffac2042cb8f2 assets/turtlematic/models/item/turtle_chatter.json
diff --git a/projects/fabric/src/generated/resources/.cache/8f7f8eab3c1584436fa68a1c45d234b162ef0eb6 b/projects/fabric/src/generated/resources/.cache/8f7f8eab3c1584436fa68a1c45d234b162ef0eb6
@@ -1,3 +1,3 @@
-// 1.20.1	2023-07-18T22:08:47.504904181	Turtlematic/Tags for minecraft:block
+// 1.20.1	2023-07-20T16:00:25.19323514	Turtlematic/Tags for minecraft:block
 aa196e5473daadd5b73af0ab19705a24b53a7464 data/turtlematic/tags/blocks/enchantment_power_provider.json
 4d1abb425b105905a7b45e3187fdfc56fc37c4b2 data/turtlematic/tags/blocks/husbandry_extra_crops.json
diff --git a/projects/fabric/src/generated/resources/.cache/a5def069bbe21cb11af035eb7290bbea1f3a4f10 b/projects/fabric/src/generated/resources/.cache/a5def069bbe21cb11af035eb7290bbea1f3a4f10
@@ -1,2 +1,2 @@
-// 1.20.1	2023-07-18T22:08:47.504238999	Turtlematic/Tags for minecraft:item
+// 1.20.1	2023-07-20T16:00:25.192670939	Turtlematic/Tags for minecraft:item
 f81daf5710edcc0407f666c5aff78ac08af75657 data/turtlematic/tags/items/enchantment_power_provider.json
diff --git a/projects/fabric/src/generated/resources/.cache/d6347775e1013985476b4414955f759199825e46 b/projects/fabric/src/generated/resources/.cache/d6347775e1013985476b4414955f759199825e46
@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-18T22:08:47.50457149	Turtlematic/Turtle Upgrades
+// 1.20.1	2023-07-20T16:00:25.192916744	Turtlematic/Turtle Upgrades
 9b2ddb951d234857533a8b1bf8ccbe53eb73ef24 data/turtlematic/computercraft/turtle_upgrades/creative_mason_automata.json
 8fff04acaa49950df15fecf1772c2feb9ed4252b data/turtlematic/computercraft/turtle_upgrades/netherite_husbandry_automata.json
 3466bc8dddd60f92ada0c120d0027bd110c5b724 data/turtlematic/computercraft/turtle_upgrades/mimic.json

diff --git a/projects/fabric/src/generated/resources/.cache/ecc215a018ded31c7dbbd212d26cd1cdd53aae9b b/projects/fabric/src/generated/resources/.cache/ecc215a018ded31c7dbbd212d26cd1cdd53aae9b
@@ -1,4 +1,4 @@
-// 1.20.1	2023-07-18T22:08:47.505146122	Turtlematic/Recipes
+// 1.20.1	2023-07-20T16:00:25.193474135	Turtlematic/Recipes
 c4fa29293eff4af57167a3d4090f908d06ee8afa data/turtlematic/recipes/starbound_smithing_automata_core.json
 f5fc32b41e4bd9c63259373065b9501067ce88fb data/turtlematic/recipes/starbound_end_automata_core.json
 edcb59b3086b936091372ad71088294d18609809 data/turtlematic/recipes/netherite_husbandry_automata_core.json

diff --git a/projects/fabric/src/generated/resources/assets/turtlematic/lang/en_us.json b/projects/fabric/src/generated/resources/assets/turtlematic/lang/en_us.json
@@ -72,7 +72,7 @@
   "tooltip.turtlematic.required_souls": "  Required souls: %s",
   "tooltip.turtlematic.single_grown": "  §6§nPeriodically accelerate grown of random crop in interaction radius",
   "tooltip.turtlematic.soul_upgrade_from": "  Upgrade from: %s",
-  "tooltip.turtlematic.soul_vial_progress": "§5Already %s from %s souls stored",
+  "tooltip.turtlematic.soul_vial_progress": "§5Already %s §5from %s §5souls stored",
   "tooltip.turtlematic.starbound_generation": "  §6§nPeriodically generate small amount of fuel points",
   "turtle.turtlematic.automata": "Automata",
   "turtle.turtlematic.bow": "Shooting",

diff --git a/projects/forge/src/generated/resources/.cache/3ed5f82225c71d368c692e9ef5b4bc3af7d8034c b/projects/forge/src/generated/resources/.cache/3ed5f82225c71d368c692e9ef5b4bc3af7d8034c
@@ -1,2 +1,2 @@
-// 1.20.1	2023-07-18T22:08:55.663982496	vanilla/Languageen_us
-72d07a3d926ff2b2ff56348fb54e1a75647a11db assets/turtlematic/lang/en_us.json
+// 1.20.1	2023-07-20T16:00:35.884148743	vanilla/Languageen_us
+8765d9206e847f02677edf131b12d282ee1cd8b8 assets/turtlematic/lang/en_us.json
diff --git a/projects/forge/src/generated/resources/assets/turtlematic/lang/en_us.json b/projects/forge/src/generated/resources/assets/turtlematic/lang/en_us.json
@@ -72,7 +72,7 @@
   "tooltip.turtlematic.required_souls": "  Required souls: %s",
   "tooltip.turtlematic.single_grown": "  §6§nPeriodically accelerate grown of random crop in interaction radius",
   "tooltip.turtlematic.soul_upgrade_from": "  Upgrade from: %s",
-  "tooltip.turtlematic.soul_vial_progress": "§5Already %s from %s souls stored",
+  "tooltip.turtlematic.soul_vial_progress": "§5Already %s §5from %s §5souls stored",
   "tooltip.turtlematic.starbound_generation": "  §6§nPeriodically generate small amount of fuel points",
   "turtle.turtlematic.automata": "Automata",
   "turtle.turtlematic.bow": "Shooting",