From 5fa2c0ab2710f95e2b3a8ec4166a85a716bebd82 Mon Sep 17 00:00:00 2001 From: fscan Date: Sun, 26 Nov 2017 15:45:34 +0100 Subject: [PATCH] Deprecate AE2 recipe system. (#3247) * Deprecate aerecipes to indicate that they are going away soon. --- .../java/appeng/api/features/IRecipeHandlerRegistry.java | 3 +++ src/api/java/appeng/api/recipes/ICraftHandler.java | 2 +- src/api/java/appeng/api/recipes/IIngredient.java | 2 +- src/api/java/appeng/api/recipes/IRecipeHandler.java | 1 + src/api/java/appeng/api/recipes/IRecipeLoader.java | 2 +- .../assets/appliedenergistics2/aerecipes/README.html | 2 +- .../assets/appliedenergistics2/aerecipes/index.recipe | 6 ++++++ .../assets/appliedenergistics2/aerecipes/oredict.recipe | 6 ++++++ 8 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java b/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java index a208cbf37..620f67114 100644 --- a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java +++ b/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java @@ -48,6 +48,7 @@ public interface IRecipeHandlerRegistry * @param name name of crafthandler * @param handler class of crafthandler */ + @Deprecated void addNewCraftHandler( String name, Class handler ); /** @@ -65,11 +66,13 @@ public interface IRecipeHandlerRegistry * @return A recipe handler by name, returns null on failure. */ @Nullable + @Deprecated ICraftHandler getCraftHandlerFor( String name ); /** * @return a new recipe handler, which can be used to parse, and read recipe files. */ + @Deprecated IRecipeHandler createNewRecipehandler(); /** diff --git a/src/api/java/appeng/api/recipes/ICraftHandler.java b/src/api/java/appeng/api/recipes/ICraftHandler.java index c76924931..6e9554f27 100644 --- a/src/api/java/appeng/api/recipes/ICraftHandler.java +++ b/src/api/java/appeng/api/recipes/ICraftHandler.java @@ -30,7 +30,7 @@ import appeng.api.exceptions.MissingIngredientException; import appeng.api.exceptions.RecipeException; import appeng.api.exceptions.RegistrationException; - +@Deprecated public interface ICraftHandler { diff --git a/src/api/java/appeng/api/recipes/IIngredient.java b/src/api/java/appeng/api/recipes/IIngredient.java index 9c114d30d..0cca74d0d 100644 --- a/src/api/java/appeng/api/recipes/IIngredient.java +++ b/src/api/java/appeng/api/recipes/IIngredient.java @@ -29,7 +29,7 @@ import net.minecraft.item.ItemStack; import appeng.api.exceptions.MissingIngredientException; import appeng.api.exceptions.RegistrationException; - +@Deprecated public interface IIngredient { diff --git a/src/api/java/appeng/api/recipes/IRecipeHandler.java b/src/api/java/appeng/api/recipes/IRecipeHandler.java index 58c2b4a71..9f2e0bb96 100644 --- a/src/api/java/appeng/api/recipes/IRecipeHandler.java +++ b/src/api/java/appeng/api/recipes/IRecipeHandler.java @@ -27,6 +27,7 @@ package appeng.api.recipes; /** * Represents the AE2 Recipe Loading/Reading Class */ +@Deprecated public interface IRecipeHandler { diff --git a/src/api/java/appeng/api/recipes/IRecipeLoader.java b/src/api/java/appeng/api/recipes/IRecipeLoader.java index 277ef988e..b51e507dd 100644 --- a/src/api/java/appeng/api/recipes/IRecipeLoader.java +++ b/src/api/java/appeng/api/recipes/IRecipeLoader.java @@ -28,7 +28,7 @@ import java.io.BufferedReader; import javax.annotation.Nonnull; - +@Deprecated public interface IRecipeLoader { /** diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/README.html b/src/main/resources/assets/appliedenergistics2/aerecipes/README.html index 662caf1ce..0234fd432 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/README.html +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/README.html @@ -110,7 +110,7 @@
diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/index.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/index.recipe index 5c4c3e1fc..ca34c6bad 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/index.recipe @@ -1,3 +1,9 @@ +########################################################## +# DEPRECATED # +# Until vanilla/Forge JSON is capable of supporting most # +# of our use cases use CraftTweaker for custom recipes # +########################################################## + # Crash on Issues crash=false diff --git a/src/main/resources/assets/appliedenergistics2/aerecipes/oredict.recipe b/src/main/resources/assets/appliedenergistics2/aerecipes/oredict.recipe index 7e5bf5b85..480af8fe1 100644 --- a/src/main/resources/assets/appliedenergistics2/aerecipes/oredict.recipe +++ b/src/main/resources/assets/appliedenergistics2/aerecipes/oredict.recipe @@ -1,3 +1,9 @@ +########################################################## +# DEPRECATED # +# Until vanilla/Forge JSON is capable of supporting most # +# of our use cases use CraftTweaker for custom recipes # +########################################################## + # Forge Ore Dictionary # logWood, slabWood, stairWood, treeSapling, treeLeaves, # oreGold, oreIron, oreLapis, oreDiamond, oreRedstone, oreEmerald, oreQuartz, oreCoal,