Merge branch '1.19.4' into 1.19.3

.github/ISSUE_TEMPLATE/emi-bug.md

@@ -0,0 +1,10 @@
+---
+name: EMI Bug
+about: Issues in EMI that are not related to content added from other mods
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+### Describe the bug, attach relevant log files, and describe what environment the issue occurs in

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,10 @@
+---
+name: Feature request
+about: Submit a suggestion for a new feature for EMI
+title: ''
+labels: thaumiel
+assignees: ''
+
+---
+
+

.github/ISSUE_TEMPLATE/mod-compatibility-bug.md

@@ -0,0 +1,14 @@
+---
+name: Mod Compatibility Bug
+about: Issues related to content added to EMI from other mods
+title: "[Mod Compat]"
+labels: safe
+assignees: ''
+
+---
+
+### If this issue is related to compatibility with other mods, such as missing recipes, make sure to follow these steps before reporting
+
+- [ ] Make sure the recipe exists in game and can be crafted
+- [ ] If the mod requires JEI, make sure both EMI and JEI are installed together
+- [ ] Report this issue to the mod if applicable

.github/ISSUE_TEMPLATE/other.md

@@ -0,0 +1,10 @@
+---
+name: Other
+about: Blank template for other issues
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

CHANGELOG.md

@@ -1,7 +1,6 @@
 ### Tweaks
-* NeoForge fluid tooltips now include ID with advanced tooltips on
-* Added new JEI features to JEI/EMI compatibility
+* The "Default Stack" bind will now clear a default when used on a defaulted stack (to clear a tag resolution, for example)
 
 ### Fixes
-* Fixed JEI ingredient tooltips #719
-* Fixed tooltips passing world off thread #709
+* #739
+* More update for JEI compatibility #732 #734

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	id "architectury-plugin" version "3.4-SNAPSHOT"
-	id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+	id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
 }
 
 architectury {

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.19.3
 enabled_platforms=fabric,forge
 
 archives_base_name=emi
-mod_version=1.1.14
+mod_version=1.1.15
 maven_group=dev.emi
 
 architectury_version=4.9.83

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

xplat/src/main/java/dev/emi/emi/api/widget/SlotWidget.java

@@ -292,7 +292,11 @@ private boolean slotInteraction(Function<EmiBind, Boolean> function) {
 			}
 		} else if (recipe != null && recipe.supportsRecipeTree()) {
 			if (function.apply(EmiConfig.defaultStack)) {
-				BoM.addRecipe(getStack(), recipe);
+				if (BoM.isDefaultRecipe(getStack(), recipe)) {
+					BoM.removeRecipe(getStack(), recipe);
+				} else {
+					BoM.addRecipe(getStack(), recipe);
+				}
 				return true;
 			}
 		}

xplat/src/main/java/dev/emi/emi/bom/BoM.java

@@ -174,6 +174,15 @@ public static void addResolution(EmiIngredient ingredient, EmiRecipe recipe) {
 		tree.addResolution(ingredient, recipe);
 	}
 
+	public static boolean isDefaultRecipe(EmiIngredient stack, EmiRecipe recipe) {
+		if (recipe instanceof EmiResolutionRecipe err) {
+			if (getRecipe(err.ingredient) instanceof EmiResolutionRecipe res) {
+				return stack.equals(res.stack);
+			}
+		}
+		return getRecipe(stack) == recipe;
+	}
+
 	public static void addRecipe(EmiRecipe recipe) {
 		disabledRecipes.remove(recipe);
 		for (EmiStack stack : recipe.getOutputs()) {
@@ -203,6 +212,21 @@ public static void removeRecipe(EmiRecipe recipe) {
 		recalculate();
 	}
 
+	public static void removeRecipe(EmiIngredient stack, EmiRecipe recipe) {
+		if (recipe instanceof EmiResolutionRecipe err) {
+			if (addedRecipes.get(err.ingredient) instanceof EmiResolutionRecipe res && stack.equals(res.stack)) {
+				addedRecipes.remove(err.ingredient);
+			}
+		} else {
+			addedRecipes.remove(stack, recipe);
+		}
+		if (getRecipeStatus(recipe) != DefaultStatus.EMPTY) {
+			disabledRecipes.add(recipe);
+		}
+		EmiPersistentData.save();
+		recalculate();
+	}
+
 	private static void recalculate() {
 		if (tree != null) {
 			tree.recalculate();

xplat/src/main/resources/assets/emi/lang/ru_ru.json

@@ -256,6 +256,16 @@
 
   "emi.error.recipe.initialize": "Ошибка при инициализации",
   "emi.error.recipe.render": "Ошибка при рендере",
+
+  "emi.dev.severity.error": "Ошибка",
+  "emi.dev.severity.warning": "Предупреждение",
+  "emi.dev.null_recipe_id": "Идентификатор рецепта равен §7нулю§r\nРецепты должны иметь уникальные идентификаторы для сериализации\nЭто повлияет только на данный рецепт",
+  "emi.dev.duplicate_recipe_id": "Идентификатор рецепта — дубликат другого рецепта\n§7%s§r\nРецепты должны иметь уникальные идентификаторы для сериализации\nЭто приведёт к нарушению работы других рецептов с таким идентификатором",
+  "emi.dev.duplicate_vanilla_recipe_id": "Идентификатор рецепта является дубликатом ванильного рецепта\n§7%s§r\nРецепты должны иметь уникальные идентификаторы для сериализации\nЭто нарушит работу ванильного рецепта с тем же идентификатором",
+  "emi.dev.synthetic_id": "Используйте синтетический идентификатор §7[пространство_имён]§b:/§7[путь]§r",
+  "emi.dev.suggest_id": "Используйте синтетический идентификатор §7[пространство_имён]§b:/§7[путь]§r как\n§7%s§b:/§7%s§r",
+  "emi.dev.null_input_or_output": "Входные или выходные данные рецепта равны §7нулю§r\nИспользуйте пустой список без каких-либо входных или выходных данных\nИспользуйте §7EmiStack.EMPTY§r для представления пустой стопки",
+  "emi.dev.no_output_slots": "Слоты рецепта не содержат никаких выходных данных\nВызовите §7SlotWidget.recipeContext(this)§r для выходных данных§r",
 
   "emi.chess.piece.white_pawn": "Белая пешка",
   "emi.chess.piece.white_rook": "Белая ладья",