diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java index c899f56b5..d644115f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/internal/IMethodHandler.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java deleted file mode 100644 index 00861f0e2..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/BallOfFurReturn.java +++ /dev/null @@ -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; - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java deleted file mode 100644 index 841fad154..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CoffeeIngredient.java +++ /dev/null @@ -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; - } -} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java deleted file mode 100644 index 7a50b80f1..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CompostRecipe.java +++ /dev/null @@ -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; - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java deleted file mode 100644 index 812906468..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java +++ /dev/null @@ -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; - } - -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java index 4f5932856..255b6223c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCoffee.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java index adaf39353..38bd7bc43 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/chapter/BookletChapterCrusher.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeMachine.java index 0f9ee3f45..ef5e8ec7b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCoffeeMachine.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java index c1ebbe3b0..be0084011 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/booklet/page/PageCrusherRecipe.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java index f007f884b..a40a738a0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/BlockCompost.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java b/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java index 677334186..3cddbf1fa 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/crafting/CrusherCrafting.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java b/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java index c61cc5d69..03a712c1a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ItemCoffee.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java index 387809613..ee652da9b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/JEIActuallyAdditionsPlugin.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java index b5673f2a9..1850b5246 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/coffee/CoffeeMachineRecipeWrapper.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java index 6c383ef77..64e51b41b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/compost/CompostRecipeWrapper.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java index ad8dedb52..4f5c5b587 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/jei/crusher/CrusherRecipeWrapper.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java b/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java index 9d121a122..f26dae69f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/misc/apiimpl/MethodHandler.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java b/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java index aa0344522..0ad887a2c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/recipe/CrusherRecipeRegistry.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoffeeMachine.java index a54f635f8..82137d638 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCoffeeMachine.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCompost.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCompost.java index 75ee79fc8..af3509cee 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityCompost.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinder.java index e6500301f..0c8b3b0bd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/tile/TileEntityGrinder.java +++ b/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; diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/util/RecipeUtil.java b/src/main/java/de/ellpeck/actuallyadditions/common/util/RecipeUtil.java index 00bf93659..7d182bb86 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/util/RecipeUtil.java +++ b/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;