some patchouli fixes

Closes #234

build.gradle

@@ -107,8 +107,8 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47:api")
     runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47")
 
-    compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-61:api")
-    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-61")
+    compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-63:api")
+    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.18.1-63")
 
     runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.1-5.0.3.0")
     compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:1.18.1-5.0.3.0:api")

src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorAltar.java

@@ -24,7 +24,7 @@ public class ProcessorAltar implements IComponentProcessor {
             case "output" -> IVariable.from(this.recipe.output);
             case "catalyst" -> this.recipe.catalyst != Ingredient.EMPTY ? PatchouliCompat.ingredientVariable(this.recipe.catalyst) : null;
             case "type" -> this.recipe.requiredType != null ? IVariable.from(this.recipe.getDimensionBottle()) : null;
-            case "name" -> IVariable.wrap(this.recipe.output.getDisplayName().getString());
+            case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
             default -> null;
         };
     }

src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorOffering.java

@@ -22,7 +22,7 @@ public class ProcessorOffering implements IComponentProcessor {
             case "input" -> PatchouliCompat.ingredientVariable(this.recipe.input);
             case "output" -> IVariable.from(this.recipe.output);
             case "start" -> PatchouliCompat.ingredientVariable(this.recipe.startItem);
-            case "name" -> IVariable.wrap(this.recipe.output.getDisplayName().getString());
+            case "name" -> IVariable.wrap(this.recipe.output.getHoverName().getString());
             default -> null;
         };
     }

src/main/java/de/ellpeck/naturesaura/compat/patchouli/ProcessorTreeRitual.java

@@ -25,7 +25,7 @@ public class ProcessorTreeRitual implements IComponentProcessor {
             return switch (key) {
                 case "output" -> IVariable.from(this.recipe.result);
                 case "sapling" -> PatchouliCompat.ingredientVariable(this.recipe.saplingType);
-                case "name" -> IVariable.wrap(this.recipe.result.getDisplayName().getString());
+                case "name" -> IVariable.wrap(this.recipe.result.getHoverName().getString());
                 default -> null;
             };
         }

src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java

@@ -265,7 +265,7 @@ public class ClientEvents {
                     var scale = 0.75F;
                     stack.pushPose();
                     stack.scale(scale, scale, scale);
-                    var s = heldCache.getDisplayName().getString();
+                    var s = heldCache.getHoverName().getString();
                     mc.font.drawShadow(stack, s, conf == 1 ? x / scale : (x + 80) / scale - mc.font.width(s), (y - 7) / scale, color);
                     stack.popPose();
 
@@ -359,7 +359,7 @@ public class ClientEvents {
                                 var state = mc.level.getBlockState(pos);
                                 var blockStack = state.getBlock().getCloneItemStack(state, blockHitResult, mc.level, pos, mc.player);
                                 this.drawContainerInfo(stack, container.getStoredAura(), container.getMaxAura(), container.getAuraColor(),
-                                        mc, res, 35, blockStack.getDisplayName().getString(), null);
+                                        mc, res, 35, blockStack.getHoverName().getString(), null);
 
                                 if (tile instanceof BlockEntityNatureAltar) {
                                     var tileStack = ((BlockEntityNatureAltar) tile).getItemHandler().getStackInSlot(0);
@@ -367,7 +367,7 @@ public class ClientEvents {
                                         var stackCont = tileStack.getCapability(NaturesAuraAPI.CAP_AURA_CONTAINER, null).orElse(null);
                                         if (stackCont != null) {
                                             this.drawContainerInfo(stack, stackCont.getStoredAura(), stackCont.getMaxAura(), stackCont.getAuraColor(),
-                                                    mc, res, 55, tileStack.getDisplayName().getString(), null);
+                                                    mc, res, 55, tileStack.getHoverName().getString(), null);
                                         }
                                     }
                                 }

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/templates/altar.json

@@ -1,60 +1,60 @@
-{
-    "processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAltar",
-    "components": [
-        {
-            "type": "item",
-            "item": "#input",
-            "x": 14,
-            "y": 26
-        },
-        {
-            "type": "item",
-            "item": "#output",
-            "x": 82,
-            "y": 26,
-            "link_recipe": true
-        },
-        {
-            "group": "catalyst",
-            "type": "item",
-            "item": "#catalyst",
-            "x": 36,
-            "y": 26
-        },
-        {
-            "type": "item",
-            "item": "#type",
-            "x": 58,
-            "y": 26
-        },
-        {
-            "group": "altar",
-            "type": "item",
-            "item": "naturesaura:nature_altar",
-            "x": 36,
-            "y": 26
-        },
-        {
-            "type": "image",
-            "image": "naturesaura:textures/gui/patchouli/elements.png",
-            "x": 10,
-            "y": 13,
-            "u": 0,
-            "v": 0,
-            "width": 91,
-            "height": 44
-        },
-        {
-            "type": "header",
-            "text": "#name",
-            "x": -1,
-            "y": 0
-        },
-        {
-            "type": "text",
-            "text": "#text",
-            "x": 0,
-            "y": 63
-        }
-    ]
+{
+    "processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAltar",
+    "components": [
+        {
+            "type": "patchouli:item",
+            "item": "#input",
+            "x": 14,
+            "y": 26
+        },
+        {
+            "type": "patchouli:item",
+            "item": "#output",
+            "x": 82,
+            "y": 26,
+            "link_recipe": true
+        },
+        {
+            "group": "catalyst",
+            "type": "patchouli:item",
+            "item": "#catalyst",
+            "x": 36,
+            "y": 26
+        },
+        {
+            "type": "patchouli:item",
+            "item": "#type",
+            "x": 58,
+            "y": 26
+        },
+        {
+            "group": "altar",
+            "type": "patchouli:item",
+            "item": "naturesaura:nature_altar",
+            "x": 36,
+            "y": 26
+        },
+        {
+            "type": "patchouli:image",
+            "image": "naturesaura:textures/gui/patchouli/elements.png",
+            "x": 10,
+            "y": 13,
+            "u": 0,
+            "v": 0,
+            "width": 91,
+            "height": 44
+        },
+        {
+            "type": "patchouli:header",
+            "text": "#name",
+            "x": -1,
+            "y": 0
+        },
+        {
+            "type": "patchouli:text",
+            "text": "#text",
+            "x": 0,
+            "y": 63
+        }
+    ]
 }

src/main/resources/assets/naturesaura/patchouli_books/book/en_us/templates/animal_spawner.json

@@ -1,66 +1,66 @@
-{
-    "processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAnimalSpawner",
-    "components": [
-        {
-            "type": "item",
-            "item": "#input1",
-            "x": 12,
-            "y": 100
-        },
-        {
-            "type": "item",
-            "item": "#input2",
-            "x": 36,
-            "y": 100
-        },
-        {
-            "type": "item",
-            "item": "#input3",
-            "x": 60,
-            "y": 100
-        },
-        {
-            "type": "item",
-            "item": "#input4",
-            "x": 84,
-            "y": 100
-        },
-        {
-            "type": "entity",
-            "entity": "#entity",
-            "x": 56,
-            "y": 60,
-            "render_size": 60
-        },
-        {
-            "type": "image",
-            "image": "naturesaura:textures/gui/patchouli/elements.png",
-            "x": 8,
-            "y": 10,
-            "u": 0,
-            "v": 131,
-            "width": 96,
-            "height": 110
-        },
-        {
-            "type": "header",
-            "text": "#name",
-            "x": -1,
-            "y": 0
-        },
-        {
-            "type": "text",
-            "text": "#text",
-            "x": 0,
-            "y": 122
-        },
-        {
-            "type": "item",
-            "item": "#egg",
-            "x": 0,
-            "y": 0,
-            "link_recipe": true,
-            "group": "seekrit"
-        }
-    ]
+{
+    "processor": "de.ellpeck.naturesaura.compat.patchouli.ProcessorAnimalSpawner",
+    "components": [
+        {
+            "type": "patchouli:item",
+            "item": "#input1",
+            "x": 12,
+            "y": 100
+        },
+        {
+            "type": "patchouli:item",
+            "item": "#input2",
+            "x": 36,
+            "y": 100
+        },
+        {
+            "type": "patchouli:item",
+            "item": "#input3",
+            "x": 60,
+            "y": 100
+        },
+        {
+            "type": "patchouli:item",
+            "item": "#input4",
+            "x": 84,
+            "y": 100
+        },
+        {
+            "type": "patchouli:entity",
+            "entity": "#entity",
+            "x": 56,
+            "y": 60,
+            "render_size": 60
+        },
+        {
+            "type": "patchouli:image",
+            "image": "naturesaura:textures/gui/patchouli/elements.png",
+            "x": 8,
+            "y": 10,
+            "u": 0,
+            "v": 131,
+            "width": 96,
+            "height": 110
+        },
+        {
+            "type": "patchouli:header",
+            "text": "#name",
+            "x": -1,
+            "y": 0
+        },
+        {
+            "type": "patchouli:text",
+            "text": "#text",
+            "x": 0,
+            "y": 122
+        },
+        {
+            "type": "patchouli:item",
+            "item": "#egg",
+            "x": 0,
+            "y": 0,
+            "link_recipe": true,
+            "group": "seekrit"
+        }
+    ]
 }