Deleted deprecated recipe classes

Signed-off-by: canitzp <canitzp@gmail.com>

src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java

@@ -3,7 +3,6 @@ package de.ellpeck.actuallyadditions.api.internal;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;

src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java

@@ -1,16 +0,0 @@
-package de.ellpeck.actuallyadditions.api.recipe;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.WeightedRandom;
-
-@Deprecated
-public class BallOfFurReturn extends WeightedRandom.Item {
-
-    public final ItemStack returnItem;
-
-    public BallOfFurReturn(ItemStack returnItem, int chance) {
-        super(chance);
-        this.returnItem = returnItem;
-    }
-
-}

src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java

@@ -1,49 +0,0 @@
-package de.ellpeck.actuallyadditions.api.recipe;
-
-import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.potion.EffectInstance;
-
-@Deprecated
-public class CoffeeIngredient {
-
-    protected final Ingredient input;
-    protected final int maxAmplifier;
-    protected EffectInstance[] effects;
-
-    @Deprecated
-    public CoffeeIngredient(ItemStack input, EffectInstance[] effects, int maxAmplifier) {
-        this(Ingredient.fromStacks(input), maxAmplifier, effects);
-    }
-
-    public CoffeeIngredient(Ingredient input, int maxAmplifier, EffectInstance... effects) {
-        this.input = input;
-        this.effects = effects;
-        this.maxAmplifier = maxAmplifier;
-    }
-
-    public boolean matches(ItemStack stack) {
-        return this.input.test(stack);
-    }
-
-    public Ingredient getInput() {
-        return this.input;
-    }
-
-    public EffectInstance[] getEffects() {
-        return this.effects;
-    }
-
-    public boolean effect(ItemStack stack) {
-        return ActuallyAdditionsAPI.methodHandler.addEffectToStack(stack, this);
-    }
-
-    public String getExtraText() {
-        return "";
-    }
-
-    public int getMaxAmplifier() {
-        return this.maxAmplifier;
-    }
-}

src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java

@@ -1,48 +0,0 @@
-package de.ellpeck.actuallyadditions.api.recipe;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-
-@Deprecated
-public class CompostRecipe {
-
-    protected final Ingredient input;
-    protected final ItemStack output;
-    protected final BlockState inputDisplay;
-    protected final BlockState outputDisplay;
-
-    @Deprecated
-    public CompostRecipe(ItemStack input, Block inputDisplay, ItemStack output, Block outputDisplay) {
-        this(Ingredient.fromStacks(input), inputDisplay.getDefaultState(), output, outputDisplay.getDefaultState());
-    }
-
-    public CompostRecipe(Ingredient input, BlockState inputDisplay, ItemStack output, BlockState outputDisplay) {
-        this.input = input;
-        this.output = output;
-        this.inputDisplay = inputDisplay;
-        this.outputDisplay = outputDisplay;
-    }
-
-    public boolean matches(ItemStack stack) {
-        return this.input.test(stack);
-    }
-
-    public Ingredient getInput() {
-        return this.input;
-    }
-
-    public ItemStack getOutput() {
-        return this.output;
-    }
-
-    public BlockState getInputDisplay() {
-        return this.inputDisplay;
-    }
-
-    public BlockState getOutputDisplay() {
-        return this.outputDisplay;
-    }
-
-}

src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java

@@ -1,45 +0,0 @@
-package de.ellpeck.actuallyadditions.api.recipe;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.Ingredient;
-
-public class CrusherRecipe {
-
-    protected Ingredient input;
-    protected ItemStack outputOne;
-    protected ItemStack outputTwo;
-    protected int outputChance;
-
-    @Deprecated
-    public CrusherRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int outputChance) {
-        this(Ingredient.fromStacks(input), outputOne, outputTwo, outputChance);
-    }
-
-    public CrusherRecipe(Ingredient input, ItemStack outputOne, ItemStack outputTwo, int outputChance) {
-        this.input = input;
-        this.outputOne = outputOne;
-        this.outputTwo = outputTwo;
-        this.outputChance = outputChance;
-    }
-
-    public boolean matches(ItemStack stack) {
-        return this.input.test(stack);
-    }
-
-    public ItemStack getOutputOne() {
-        return this.outputOne;
-    }
-
-    public ItemStack getOutputTwo() {
-        return this.outputTwo;
-    }
-
-    public int getSecondChance() {
-        return this.outputChance;
-    }
-
-    public Ingredient getInput() {
-        return this.input;
-    }
-
-}

src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java

@@ -7,7 +7,6 @@ import java.util.List;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.booklet.page.BookletPage;
 import de.ellpeck.actuallyadditions.booklet.page.PageCoffeeMachine;
 import de.ellpeck.actuallyadditions.common.items.ItemCoffee;

src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java

@@ -6,7 +6,6 @@ import java.util.List;
 
 import de.ellpeck.actuallyadditions.api.booklet.IBookletEntry;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.booklet.page.PageCrusherRecipe;
 import de.ellpeck.actuallyadditions.common.crafting.CrusherCrafting;
 import net.minecraft.item.ItemStack;

src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeMachine.java

@@ -4,7 +4,6 @@ import java.util.List;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase;
-import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet;
 import de.ellpeck.actuallyadditions.common.items.InitItems;
 import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems;

src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java

@@ -3,7 +3,6 @@ package de.ellpeck.actuallyadditions.booklet.page;
 import java.util.List;
 
 import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase;
-import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.booklet.gui.GuiBooklet;
 import de.ellpeck.actuallyadditions.common.util.StackUtil;

src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java

@@ -1,6 +1,5 @@
 package de.ellpeck.actuallyadditions.common.blocks;
 
-import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe;
 import de.ellpeck.actuallyadditions.common.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.common.tile.TileEntityCompost;
 import de.ellpeck.actuallyadditions.common.util.AssetUtil;

src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.common.items.InitItems;
 import de.ellpeck.actuallyadditions.common.items.metalists.TheDusts;

src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java

@@ -6,7 +6,6 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.common.items.base.ItemFoodBase;
 import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems;

src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java

@@ -2,9 +2,6 @@ package de.ellpeck.actuallyadditions.common.jei;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
-import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe;
-import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe;
 import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
 import de.ellpeck.actuallyadditions.common.blocks.InitBlocks;

src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java

@@ -7,7 +7,6 @@ import com.google.common.base.Strings;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.common.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils;

src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java

@@ -3,7 +3,6 @@ package de.ellpeck.actuallyadditions.common.jei.compost;
 import java.util.Arrays;
 
 import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe;
 import de.ellpeck.actuallyadditions.common.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils;
 import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton;

src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java

@@ -5,7 +5,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
-import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.common.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.booklet.misc.BookletUtils;
 import de.ellpeck.actuallyadditions.common.jei.RecipeWrapperWithButton;

src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java

@@ -10,7 +10,6 @@ import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
 import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.internal.IMethodHandler;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
-import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
 import de.ellpeck.actuallyadditions.common.blocks.BlockLaserRelay;
 import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter;

src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.common.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.common.config.values.ConfigStringListValues;
 import de.ellpeck.actuallyadditions.common.util.StackUtil;

src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoffeeMachine.java

@@ -1,6 +1,5 @@
 package de.ellpeck.actuallyadditions.common.tile;
 
-import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.common.items.InitItems;
 import de.ellpeck.actuallyadditions.common.items.ItemCoffee;
 import de.ellpeck.actuallyadditions.common.items.metalists.TheMiscItems;

src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCompost.java

@@ -1,7 +1,6 @@
 package de.ellpeck.actuallyadditions.common.tile;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.api.recipe.CompostRecipe;
 import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IAcceptor;
 import de.ellpeck.actuallyadditions.common.util.ItemStackHandlerAA.IRemover;
 import de.ellpeck.actuallyadditions.common.util.ItemUtil;

src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinder.java

@@ -1,6 +1,5 @@
 package de.ellpeck.actuallyadditions.common.tile;
 
-import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.common.blocks.BlockFurnaceDouble;
 import de.ellpeck.actuallyadditions.common.misc.SoundHandler;
 import de.ellpeck.actuallyadditions.common.network.gui.IButtonReactor;

src/main/java/de/ellpeck/actuallyadditions/common/util/RecipeUtil.java

@@ -3,7 +3,6 @@ package de.ellpeck.actuallyadditions.common.util;
 import java.util.List;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe;
 import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
 import de.ellpeck.actuallyadditions.common.util.crafting.RecipeHandler;