Fixed all recipes always being saved even without changes

KubeJS-Mods · Sep 1, 2024 · 7b3aaa3 · 7b3aaa3
1 parent e806423
commit 7b3aaa3
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/src/main/java/dev/latvian/mods/kubejs/recipe/KubeRecipe.java b/src/main/java/dev/latvian/mods/kubejs/recipe/KubeRecipe.java
@@ -152,15 +152,15 @@ public KubeRecipe set(Context cx, String key, Object value) {
 		throw new MissingComponentException(key, null, valueMap.keySet()).source(sourceLine);
 	}
 
-	public void initValues(boolean created) {
-		if (created) {
+	public void initValues(boolean save) {
+		if (save) {
 			save();
 		}
 
 		if (!type.schemaType.schema.keys.isEmpty()) {
 			valueMap = new RecipeComponentValueMap(type.schemaType.schema.keys);
 
-			if (created) {
+			if (save) {
 				for (var v : valueMap.holders) {
 					if (v.key.optional()) {
 						v.value = Cast.to(v.key.optional.getDefaultValue(type.schemaType));

diff --git a/src/main/java/dev/latvian/mods/kubejs/recipe/RecipeTypeFunction.java b/src/main/java/dev/latvian/mods/kubejs/recipe/RecipeTypeFunction.java
@@ -41,7 +41,7 @@ public KubeRecipe call(Context cx, Scriptable scope, Scriptable thisObj, Object[
 		try {
 			return createRecipe(cx, sourceLine, args0);
 		} catch (Throwable cause) {
-			var r = schemaType.schema.recipeFactory.create(this, sourceLine);
+			var r = schemaType.schema.recipeFactory.create(this, sourceLine, true);
 			r.creationError = true;
 			event.failedCount.incrementAndGet();
 			ConsoleJS.SERVER.error("Failed to create a '" + idString + "' recipe from args " + Arrays.toString(args0), sourceLine, cause, SKIP_ERROR);

diff --git a/src/main/java/dev/latvian/mods/kubejs/recipe/RecipesKubeEvent.java b/src/main/java/dev/latvian/mods/kubejs/recipe/RecipesKubeEvent.java
@@ -553,7 +553,7 @@ public KubeRecipe custom(Context cx, JsonObject json) {
 			r.afterLoaded();
 			return addRecipe(r, true);
 		} catch (Throwable cause) {
-			var r = type.schemaType.schema.recipeFactory.create(type, sourceLine);
+			var r = type.schemaType.schema.recipeFactory.create(type, sourceLine, true);
 			r.creationError = true;
 			ConsoleJS.SERVER.error("Failed to create custom recipe from json " + JsonUtils.toString(json), sourceLine, cause, POST_SKIP_ERROR);
 			r.json = json;

diff --git a/src/main/java/dev/latvian/mods/kubejs/recipe/schema/KubeRecipeFactory.java b/src/main/java/dev/latvian/mods/kubejs/recipe/schema/KubeRecipeFactory.java
@@ -16,11 +16,11 @@ public KubeRecipeFactory(ResourceLocation id, Class<?> recipeType, Supplier<? ex
 		this(id, TypeInfo.of(recipeType), factory);
 	}
 
-	public KubeRecipe create(RecipeTypeFunction type, SourceLine sourceLine) {
+	public KubeRecipe create(RecipeTypeFunction type, SourceLine sourceLine, boolean save) {
 		var r = factory.get();
 		r.sourceLine = sourceLine;
 		r.type = type;
-		r.initValues(true);
+		r.initValues(save);
 		return r;
 	}
 }
diff --git a/src/main/java/dev/latvian/mods/kubejs/recipe/schema/RecipeConstructor.java b/src/main/java/dev/latvian/mods/kubejs/recipe/schema/RecipeConstructor.java
@@ -54,7 +54,7 @@ public String toString() {
 	}
 
 	public KubeRecipe create(Context cx, SourceLine sourceLine, RecipeTypeFunction type, RecipeSchemaType schemaType, ComponentValueMap from) {
-		var r = schemaType.schema.recipeFactory.create(type, sourceLine);
+		var r = schemaType.schema.recipeFactory.create(type, sourceLine, true);
 		r.json = new JsonObject();
 		r.json.addProperty("type", type.idString);
 		r.newRecipe = true;

diff --git a/src/main/java/dev/latvian/mods/kubejs/recipe/schema/RecipeSchema.java b/src/main/java/dev/latvian/mods/kubejs/recipe/schema/RecipeSchema.java
@@ -247,11 +247,10 @@ public boolean constructorsGenerated() {
 	}
 
 	public KubeRecipe deserialize(SourceLine sourceLine, RecipeTypeFunction type, @Nullable ResourceLocation id, JsonObject json) {
-		var r = recipeFactory.create(type, sourceLine);
+		var r = recipeFactory.create(type, sourceLine, id == null);
 		r.id = id;
 		r.json = json;
 		r.newRecipe = id == null;
-		r.initValues(id == null);
 		r.originalJson = json == null || id == null ? null : (JsonObject) JsonUtils.copy(json);
 		r.deserialize(false);
 		return r;

diff --git a/src/main/java/dev/latvian/mods/kubejs/script/ConsoleJS.java b/src/main/java/dev/latvian/mods/kubejs/script/ConsoleJS.java
@@ -563,9 +563,9 @@ public void handleError(ConsoleLine line, Throwable error, @Nullable Pattern exi
 	public Component errorsComponent(String command) {
 		return Component.empty()
 			.append(TextIcons.error())
-			.append(Component.literal(" KubeJS errors found [" + errors.size() + "]! Click here for more info").kjs$red())
+			.append(Component.literal(" KubeJS errors found [" + errors.size() + "]!").kjs$red())
 			.kjs$clickRunCommand(command)
-			.kjs$hover(Component.literal("Click to show"));
+			.kjs$hover(Component.literal("Click to show more info"));
 	}
 
 	private static final class VarFunc implements Comparable<VarFunc> {