feat: add more details to inworld tooltips

Author: dphaldes

src/main/java/com/mystchonky/arsocultas/content/EventHandler.java

@@ -15,7 +15,7 @@
 import com.klikli_dev.occultism.util.EntityUtil;
 import com.mystchonky.arsocultas.ArsOcultas;
 import com.mystchonky.arsocultas.Config;
-import com.mystchonky.arsocultas.content.spirit_jar.SpiritBehaviour;
+import com.mystchonky.arsocultas.content.spirit_jar.SpiritJarBehaviour;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.component.DataComponents;
@@ -44,7 +44,7 @@ public static void crusherJob(CrusherJob.CrusherJobEvent event) {
         if (entity instanceof SpiritEntity spirit) {
             if (level.getBlockEntity(spirit.blockPosition()) instanceof MobJarTile jar) {
                 jar.dispatchBehavior(behavior -> {
-                    if (behavior instanceof SpiritBehaviour<? extends SpiritEntity> spiritBehaviour) {
+                    if (behavior instanceof SpiritJarBehaviour<? extends SpiritEntity> spiritBehaviour) {
                         var remainder = spiritBehaviour.tryItemNearbyTransfer(jar, level, event.getResult());
                         event.setResult(remainder);
                     }
@@ -60,7 +60,7 @@ public static void smelterJob(SmelterJob.SmelterJobEvent event) {
         if (entity instanceof SpiritEntity spirit) {
             if (level.getBlockEntity(spirit.blockPosition()) instanceof MobJarTile jar) {
                 jar.dispatchBehavior(behavior -> {
-                    if (behavior instanceof SpiritBehaviour<? extends SpiritEntity> spiritBehaviour) {
+                    if (behavior instanceof SpiritJarBehaviour<? extends SpiritEntity> spiritBehaviour) {
                         var remainder = spiritBehaviour.tryItemNearbyTransfer(jar, level, event.getResult());
                         event.setResult(remainder);
                     }
@@ -76,7 +76,7 @@ public static void crystallizerJob(CrystallizerJob.CrystallizerJobEvent event) {
         if (entity instanceof SpiritEntity spirit) {
             if (level.getBlockEntity(spirit.blockPosition()) instanceof MobJarTile jar) {
                 jar.dispatchBehavior(behavior -> {
-                    if (behavior instanceof SpiritBehaviour<? extends SpiritEntity> spiritBehaviour) {
+                    if (behavior instanceof SpiritJarBehaviour<? extends SpiritEntity> spiritBehaviour) {
                         var remainder = spiritBehaviour.tryItemNearbyTransfer(jar, level, event.getResult());
                         event.setResult(remainder);
                     }
@@ -92,7 +92,7 @@ public static void traderJob(TraderJob.TraderJobEvent event) {
         if (entity instanceof SpiritEntity spirit) {
             if (level.getBlockEntity(spirit.blockPosition()) instanceof MobJarTile jar) {
                 jar.dispatchBehavior(behavior -> {
-                    if (behavior instanceof SpiritBehaviour<? extends SpiritEntity> spiritBehaviour) {
+                    if (behavior instanceof SpiritJarBehaviour<? extends SpiritEntity> spiritBehaviour) {
                         var remainder = spiritBehaviour.tryItemNearbyTransfer(jar, level, event.getResult());
                         event.setResult(remainder);
                     }

…/content/spirit_jar/SpiritBehaviour.java …ntent/spirit_jar/SpiritJarBehaviour.javasrc/main/java/com/mystchonky/arsocultas/content/spirit_jar/SpiritBehaviour.java renamed to src/main/java/com/mystchonky/arsocultas/content/spirit_jar/SpiritJarBehaviour.java src/main/java/com/mystchonky/arsocultas/content/spirit_jar/SpiritBehaviour.java renamed to src/main/java/com/mystchonky/arsocultas/content/spirit_jar/SpiritJarBehaviour.java

@@ -14,6 +14,7 @@
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.MenuProvider;
@@ -29,7 +30,7 @@
 
 import java.util.List;
 
-public class SpiritBehaviour<T extends SpiritEntity> extends JarBehavior<T> {
+public class SpiritJarBehaviour<T extends SpiritEntity> extends JarBehavior<T> {
 
     private static final String TRANSLATION_KEY_BASE = "gui." + Occultism.MODID + ".spirit";
 
@@ -100,12 +101,19 @@ private boolean canAcceptItemStack(SpiritEntity spirit, ItemStack stack) {
     @Override
     public void getTooltip(MobJarTile tile, List<Component> tooltips) {
         super.getTooltip(tile, tooltips);
-        var job = entityFromJar(tile).getJobID();
+        var spirit = entityFromJar(tile);
+        var job = spirit.getJobID();
         if (!StringUtils.isBlank(job)) {
             job = job.replace(":", ".");
             String jobText = I18n.get(TRANSLATION_KEY_BASE + ".job", I18n.get("job." + job));
             tooltips.add(Component.translatable(jobText).withStyle(ChatFormatting.GOLD));
         }
+        tooltips.add(spirit.getDisplayName());
+        if (spirit.hasCustomName()) {
+            MutableComponent name = spirit.getType().getDescription().copy();
+            name.withStyle(ChatFormatting.GRAY);
+            tooltips.add(name);
+        }
     }
 
     public void openScreen(Player playerEntity, SpiritEntity spirit, MobJarTile tile) {

src/main/java/com/mystchonky/arsocultas/init/IntegrationRegistrar.java

@@ -6,7 +6,7 @@
 import com.hollingsworth.arsnouveau.api.registry.JarBehaviorRegistry;
 import com.hollingsworth.arsnouveau.api.spell.AbstractSpellPart;
 import com.klikli_dev.occultism.registry.OccultismEntities;
-import com.mystchonky.arsocultas.content.spirit_jar.SpiritBehaviour;
+import com.mystchonky.arsocultas.content.spirit_jar.SpiritJarBehaviour;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,10 +44,10 @@ public static void registerFamiliars(AbstractFamiliarHolder familiarHolder) {
     }
 
     public static void registerJarBehaviours() {
-        JarBehaviorRegistry.register(OccultismEntities.FOLIOT.get(), new SpiritBehaviour<>());
-        JarBehaviorRegistry.register(OccultismEntities.DJINNI.get(), new SpiritBehaviour<>());
-        JarBehaviorRegistry.register(OccultismEntities.AFRIT.get(), new SpiritBehaviour<>());
-        JarBehaviorRegistry.register(OccultismEntities.MARID.get(), new SpiritBehaviour<>());
+        JarBehaviorRegistry.register(OccultismEntities.FOLIOT.get(), new SpiritJarBehaviour<>());
+        JarBehaviorRegistry.register(OccultismEntities.DJINNI.get(), new SpiritJarBehaviour<>());
+        JarBehaviorRegistry.register(OccultismEntities.AFRIT.get(), new SpiritJarBehaviour<>());
+        JarBehaviorRegistry.register(OccultismEntities.MARID.get(), new SpiritJarBehaviour<>());
     }
 
 }