Merge branch '1.20.5' into 1.20.4

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
 #        run: ./gradlew :forge:build
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: Artifacts
           path: |

CHANGELOG.md

@@ -1,7 +1,7 @@
 ### Tweaks
+* NeoForge fluid tooltips now include ID with advanced tooltips on
 * Added new JEI features to JEI/EMI compatibility
 
 ### Fixes
-* Fixed JEI subtype compatibility on previous versions #686
-* Fixed various new JEI compatibility issues #683 #682 #687
-* Fixed scrolling not taking exclusion areas into consideration #685
+* Fixed JEI ingredient tooltips #719
+* Fixed tooltips passing world off thread #709

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 enabled_platforms=fabric,neoforge
 
 archives_base_name=emi
-mod_version=1.1.13
+mod_version=1.1.14
 maven_group=dev.emi
 
 architectury_version=4.9.83

neoforge/src/main/java/dev/emi/emi/platform/neoforge/EmiAgnosNeoForge.java

@@ -50,6 +50,7 @@
 import net.minecraft.recipe.Ingredient;
 import net.minecraft.screen.PlayerScreenHandler;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
 import net.neoforged.neoforge.common.brewing.BrewingRecipe;
@@ -260,7 +261,13 @@ protected Text getFluidNameAgnos(Fluid fluid, NbtCompound nbt) {
 
 	@Override
 	protected List<Text> getFluidTooltipAgnos(Fluid fluid, NbtCompound nbt) {
-		return List.of(getFluidName(fluid, nbt));
+		List<Text> tooltip = Lists.newArrayList();
+		tooltip.add(getFluidName(fluid, nbt));
+		MinecraftClient client = MinecraftClient.getInstance();
+		if (client.options.advancedItemTooltips) {
+			tooltip.add(EmiPort.literal(EmiPort.getFluidRegistry().getId(fluid).toString()).formatted(Formatting.DARK_GRAY));
+		}
+		return tooltip;
 	}
 
 	@Override

xplat/src/main/java/dev/emi/emi/api/recipe/EmiRecipe.java

@@ -20,7 +20,13 @@ public interface EmiRecipe {
 	EmiRecipeCategory getCategory();
 
 	/**
-	 * @return The unique id of the recipe, or null. If null, the recipe cannot be serialized.
+	 * IDs should be standard formatting (minecraft:lime_dye_from_smelting) only if they uniquely represent a data driven json recipe.
+	 * If a mod wants to represent a vanilla recipe with different processing, it cannot reuse the vanilla ID.
+	 * For example, a custom machine's recipe crafting an iron pickaxe cannot use "minecraft:iron_pickaxe".
+	 * If a recipe does not have a normal unique ID, it should use a synthetic ID.
+	 * Synthetic IDs are formatted "namespace:/path" with a "/" at the start of the path.
+	 * Commonly, synthetic IDs will be formatted "mymod:/my_process/unique_name".
+	 * @return The unique ID of the recipe, or null. If null, the recipe cannot be serialized.
 	 */
 	@Nullable Identifier getId();
 

xplat/src/main/java/dev/emi/emi/jemi/JemiPlugin.java

@@ -364,6 +364,7 @@ public SlotWidget getOutputWidget(int x, int y) {
 				}
 			} catch (Throwable t) {
 				EmiLog.error("[JEMI] Exception thrown setting JEI crafting recipe");
+				EmiLog.error(t);
 			}
 		}
 		registry.removeRecipes(r -> r instanceof EmiCraftingRecipe && replaced.contains(r.getId()) && !replacements.contains(r));