diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java index cf8fb24f1..c85d4ecdf 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MechanicalCraftingRecipeBuilder.java @@ -1,6 +1,5 @@ package com.simibubi.create.foundation.data.recipe; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -16,8 +15,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.simibubi.create.AllRecipeTypes; -import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder; - import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.SetTag; @@ -25,10 +22,6 @@ import net.minecraft.world.item.Item; 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.CraftingHelper; -import net.minecraftforge.common.crafting.conditions.ICondition; -import net.minecraftforge.common.crafting.conditions.ModLoadedCondition; -import net.minecraftforge.common.crafting.conditions.NotCondition; import net.minecraftforge.registries.ForgeRegistries; public class MechanicalCraftingRecipeBuilder { @@ -38,13 +31,11 @@ public class MechanicalCraftingRecipeBuilder { private final List pattern = Lists.newArrayList(); private final Map key = Maps.newLinkedHashMap(); private boolean acceptMirrored; - private List recipeConditions; public MechanicalCraftingRecipeBuilder(ItemLike p_i48261_1_, int p_i48261_2_) { result = p_i48261_1_.asItem(); count = p_i48261_2_; acceptMirrored = true; - recipeConditions = new ArrayList<>(); } /** @@ -136,7 +127,7 @@ public class MechanicalCraftingRecipeBuilder { public void build(Consumer p_200467_1_, ResourceLocation p_200467_2_) { validate(p_200467_2_); p_200467_1_ - .accept(new MechanicalCraftingRecipeBuilder.Result(p_200467_2_, result, count, pattern, key, acceptMirrored, recipeConditions)); + .accept(new MechanicalCraftingRecipeBuilder.Result(p_200467_2_, result, count, pattern, key, acceptMirrored)); } /** @@ -165,19 +156,6 @@ public class MechanicalCraftingRecipeBuilder { } } - public MechanicalCraftingRecipeBuilder whenModLoaded(String modid) { - return withCondition(new ModLoadedCondition(modid)); - } - - public MechanicalCraftingRecipeBuilder whenModMissing(String modid) { - return withCondition(new NotCondition(new ModLoadedCondition(modid))); - } - - public MechanicalCraftingRecipeBuilder withCondition(ICondition condition) { - recipeConditions.add(condition); - return this; - } - public class Result implements FinishedRecipe { private final ResourceLocation id; private final Item result; @@ -185,17 +163,15 @@ public class MechanicalCraftingRecipeBuilder { private final List pattern; private final Map key; private final boolean acceptMirrored; - private List recipeConditions; public Result(ResourceLocation p_i48271_2_, Item p_i48271_3_, int p_i48271_4_, List p_i48271_6_, - Map p_i48271_7_, boolean asymmetrical, List recipeConditions) { + Map p_i48271_7_, boolean asymmetrical) { this.id = p_i48271_2_; this.result = p_i48271_3_; this.count = p_i48271_4_; this.pattern = p_i48271_6_; this.key = p_i48271_7_; this.acceptMirrored = asymmetrical; - this.recipeConditions = recipeConditions; } public void serializeRecipeData(JsonObject p_218610_1_) { @@ -218,13 +194,6 @@ public class MechanicalCraftingRecipeBuilder { p_218610_1_.add("result", jsonobject1); p_218610_1_.addProperty("acceptMirrored", acceptMirrored); - - if (recipeConditions.isEmpty()) - return; - - JsonArray conds = new JsonArray(); - recipeConditions.forEach(c -> conds.add(CraftingHelper.serialize(c))); - p_218610_1_.add("conditions", conds); } public RecipeSerializer getType() {