update

(cherry picked from commit 2dd539c3df)

dependencies.gradle

@@ -2,8 +2,8 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha35:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha50:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.28-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2:api')
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle.properties

@@ -117,7 +117,7 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
 }
 
 

src/main/java/forestry/core/recipes/nei/RecipeHandlerBase.java

@@ -114,13 +114,18 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
         if (GuiContainerManager.shouldShowTooltip(guiRecipe)) {
             Point mouse = GuiDraw.getMousePosition();
-            Point offset = guiRecipe.getRecipePosition(recipe);
-            Point relMouse = new Point(
-                    mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
-                    mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+            int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
 
-            currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
+            if (recipeIndex >= 0) {
+                Point offset = guiRecipe.getRecipePosition(recipeIndex);
+                Point relMouse = new Point(
+                        mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
+                        mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+
+                currenttip = this.provideTooltip(guiRecipe, currenttip, crecipe, relMouse);
+            }
         }
+
         return currenttip;
     }
 
@@ -130,12 +135,17 @@ public abstract class RecipeHandlerBase extends TemplateRecipeHandler implements
         super.handleItemTooltip(guiRecipe, itemStack, currenttip, recipe);
         CachedBaseRecipe crecipe = (CachedBaseRecipe) this.arecipes.get(recipe);
         Point mouse = GuiDraw.getMousePosition();
-        Point offset = guiRecipe.getRecipePosition(recipe);
-        Point relMouse = new Point(
-                mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
-                mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+        int recipeIndex = guiRecipe.getRecipeIndices().indexOf(recipe);
+
+        if (recipeIndex >= 0) {
+            Point offset = guiRecipe.getRecipePosition(recipeIndex);
+            Point relMouse = new Point(
+                    mouse.x - (guiRecipe.width - 176) / 2 - offset.x,
+                    mouse.y - (guiRecipe.height - 166) / 2 - offset.y);
+
+            currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
+        }
 
-        currenttip = this.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse);
         return currenttip;
     }