fix(data-gen): fix advancement parsing errors spamming the logs

Closes: #115
Elenterius · Feb 8, 2024 · 96ef8f3 · 96ef8f3
1 parent a845959
commit 96ef8f3
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/BioForgeRecipeBuilder.java b/src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/BioForgeRecipeBuilder.java
@@ -22,6 +22,7 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.level.ItemLike;
+import net.minecraftforge.common.crafting.ConditionalAdvancement;
 import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.common.crafting.conditions.ICondition;
 import net.minecraftforge.common.crafting.conditions.ModLoadedCondition;
@@ -233,7 +234,12 @@ public ResourceLocation getId() {
 		@Override
 		@Nullable
 		public JsonObject serializeAdvancement() {
-			return advancementBuilder.serializeToJson();
+			if (conditions.isEmpty()) return advancementBuilder.serializeToJson();
+
+			ConditionalAdvancement.Builder conditionalBuilder = ConditionalAdvancement.builder();
+			conditions.forEach(conditionalBuilder::addCondition);
+			conditionalBuilder.addAdvancement(advancementBuilder);
+			return conditionalBuilder.write();
 		}
 
 		@Override

diff --git a/src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/BioLabRecipeBuilder.java b/src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/BioLabRecipeBuilder.java
@@ -21,6 +21,7 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.level.ItemLike;
+import net.minecraftforge.common.crafting.ConditionalAdvancement;
 import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.common.crafting.conditions.ICondition;
 import net.minecraftforge.common.crafting.conditions.ModLoadedCondition;
@@ -250,7 +251,12 @@ public ResourceLocation getId() {
 		@Override
 		@Nullable
 		public JsonObject serializeAdvancement() {
-			return advancementBuilder.serializeToJson();
+			if (conditions.isEmpty()) return advancementBuilder.serializeToJson();
+
+			ConditionalAdvancement.Builder conditionalBuilder = ConditionalAdvancement.builder();
+			conditions.forEach(conditionalBuilder::addCondition);
+			conditionalBuilder.addAdvancement(advancementBuilder);
+			return conditionalBuilder.write();
 		}
 
 		@Override

diff --git a/src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/DecomposerRecipeBuilder.java b/src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/DecomposerRecipeBuilder.java
@@ -22,6 +22,7 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.level.ItemLike;
+import net.minecraftforge.common.crafting.ConditionalAdvancement;
 import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.common.crafting.conditions.ICondition;
 import net.minecraftforge.common.crafting.conditions.ModLoadedCondition;
@@ -262,7 +263,12 @@ public ResourceLocation getId() {
 		@Override
 		@Nullable
 		public JsonObject serializeAdvancement() {
-			return advancementBuilder.serializeToJson();
+			if (conditions.isEmpty()) return advancementBuilder.serializeToJson();
+
+			ConditionalAdvancement.Builder conditionalBuilder = ConditionalAdvancement.builder();
+			conditions.forEach(conditionalBuilder::addCondition);
+			conditionalBuilder.addAdvancement(advancementBuilder);
+			return conditionalBuilder.write();
 		}
 
 		@Override

diff --git a/src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/DigesterRecipeBuilder.java b/src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/DigesterRecipeBuilder.java
@@ -21,6 +21,7 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.level.ItemLike;
+import net.minecraftforge.common.crafting.ConditionalAdvancement;
 import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.common.crafting.conditions.ICondition;
 import net.minecraftforge.common.crafting.conditions.ModLoadedCondition;
@@ -199,6 +200,7 @@ public Result(DigesterRecipeBuilder builder, ResourceLocation advancementId) {
 			conditions = builder.conditions;
 
 			advancementBuilder = builder.advancement;
+
 			this.advancementId = advancementId;
 		}
 
@@ -232,7 +234,12 @@ public ResourceLocation getId() {
 
 		@Nullable
 		public JsonObject serializeAdvancement() {
-			return advancementBuilder.serializeToJson();
+			if (conditions.isEmpty()) return advancementBuilder.serializeToJson();
+
+			ConditionalAdvancement.Builder conditionalBuilder = ConditionalAdvancement.builder();
+			conditions.forEach(conditionalBuilder::addCondition);
+			conditionalBuilder.addAdvancement(advancementBuilder);
+			return conditionalBuilder.write();
 		}
 
 		@Nullable