Fix compilation issue during merge

CyclopsMC · Jul 26, 2022 · 68c273f · 68c273f
1 parent 6a42296
commit 68c273f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.../java/org/cyclops/cyclopscore/recipe/type/RecipeSerializerCraftingShapedCustomOutput.java b/.../java/org/cyclops/cyclopscore/recipe/type/RecipeSerializerCraftingShapedCustomOutput.java
@@ -10,7 +10,6 @@
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
 import net.minecraft.world.item.crafting.ShapedRecipe;
-import net.minecraftforge.registries.ForgeRegistryEntry;
 
 import javax.annotation.Nullable;
 import java.util.Map;
@@ -20,8 +19,7 @@
  * Recipe serializer for predefined output items.
  * @author rubensworks
  */
-public class RecipeSerializerCraftingShapedCustomOutput extends ForgeRegistryEntry<RecipeSerializer<?>>
-        implements RecipeSerializer<RecipeCraftingShapedCustomOutput> {
+public class RecipeSerializerCraftingShapedCustomOutput implements RecipeSerializer<RecipeCraftingShapedCustomOutput> {
 
     private final Supplier<ItemStack> outputProvider;
     @Nullable

diff --git a/...va/org/cyclops/cyclopscore/recipe/type/RecipeSerializerCraftingShapelessCustomOutput.java b/...va/org/cyclops/cyclopscore/recipe/type/RecipeSerializerCraftingShapelessCustomOutput.java
@@ -11,7 +11,6 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.RecipeSerializer;
-import net.minecraftforge.registries.ForgeRegistryEntry;
 
 import javax.annotation.Nullable;
 import java.util.function.Supplier;
@@ -20,8 +19,7 @@
  * Recipe serializer for predefined output items.
  * @author rubensworks
  */
-public class RecipeSerializerCraftingShapelessCustomOutput extends ForgeRegistryEntry<RecipeSerializer<?>>
-        implements RecipeSerializer<RecipeCraftingShapelessCustomOutput> {
+public class RecipeSerializerCraftingShapelessCustomOutput implements RecipeSerializer<RecipeCraftingShapelessCustomOutput> {
 
     private final Supplier<ItemStack> outputProvider;
     @Nullable
@@ -62,7 +60,7 @@ private static NonNullList<Ingredient> itemsFromJson(JsonArray p_44276_) {
 
         for(int i = 0; i < p_44276_.size(); ++i) {
             Ingredient ingredient = Ingredient.fromJson(p_44276_.get(i));
-            if (net.minecraftforge.common.ForgeConfig.SERVER.skipEmptyShapelessCheck.get() || !ingredient.isEmpty()) {
+            if (true || !ingredient.isEmpty()) { // FORGE: Skip checking if an ingredient is empty during shapeless recipe deserialization to prevent complex ingredients from caching tags too early. Can not be done using a config value due to sync issues.
                 nonnulllist.add(ingredient);
             }
         }