diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java index 1f47bc646..48b25289f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java @@ -83,10 +83,8 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin { registry.addRecipes(FERMENTING, level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.FERMENTING.get()).stream().map(RecipeHolder::value).toList()); registry.addRecipes(LASER, level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.LASER.get()).stream().map(RecipeHolder::value).toList()); registry.addRecipes(EMPOWERER, level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.EMPOWERING.get()).stream().map(RecipeHolder::value).toList()); - registry.addRecipes(COFFEE_MACHINE, level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.COFFEE_INGREDIENT.get()).stream().map(RecipeHolder::value).toList()); //registry.addRecipes(ActuallyAdditionsAPI.BOOKLET_PAGES_WITH_ITEM_OR_FLUID_DATA, BookletRecipeCategory.NAME); - //registry.addRecipes(ActuallyAdditionsAPI.COFFEE_MACHINE_INGREDIENTS, CoffeeMachineRecipeCategory.NAME); //registry.addRecipes(ActuallyAdditionsAPI.CRUSHER_RECIPES, CrusherRecipeCategory.NAME); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java deleted file mode 100644 index 49ec67d11..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeCategory.java +++ /dev/null @@ -1,69 +0,0 @@ -///* -// * This file ("CoffeeMachineRecipeCategory.java") is part of the Actually Additions mod for Minecraft. -// * It is created and owned by Ellpeck and distributed -// * under the Actually Additions License to be found at -// * http://ellpeck.de/actaddlicense -// * View the source code at https://github.com/Ellpeck/ActuallyAdditions -// * -// * © 2015-2017 Ellpeck -// */ -// -//package de.ellpeck.actuallyadditions.mod.jei.coffee; -// -//import java.util.Arrays; -// -//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -//import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -//import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -//import de.ellpeck.actuallyadditions.mod.util.StringUtil; -//import mezz.jei.api.IGuiHelper; -//import mezz.jei.api.gui.IDrawable; -//import mezz.jei.api.gui.IRecipeLayout; -//import mezz.jei.api.ingredients.IIngredients; -//import mezz.jei.api.recipe.IRecipeCategory; -// -//public class CoffeeMachineRecipeCategory implements IRecipeCategory { -// -// public static final String NAME = "actuallyadditions.coffee"; -// -// private final IDrawable background; -// -// public CoffeeMachineRecipeCategory(IGuiHelper helper) { -// this.background = helper.createDrawable(AssetUtil.getGuiLocation("gui_nei_coffee_machine"), 0, 0, 126, 92); -// } -// -// @Override -// public String getUid() { -// return NAME; -// } -// -// @Override -// public String getTitle() { -// return StringUtil.localize("container.nei." + NAME + ".name"); -// } -// -// @Override -// public String getModName() { -// return ActuallyAdditions.NAME; -// } -// -// @Override -// public IDrawable getBackground() { -// return this.background; -// } -// -// @Override -// public void setRecipe(IRecipeLayout recipeLayout, CoffeeMachineRecipeWrapper wrapper, IIngredients ingredients) { -// recipeLayout.getItemStacks().init(0, true, 89, 20); -// recipeLayout.getItemStacks().set(0, Arrays.asList(wrapper.ingredient.getInput().getMatchingStacks())); -// -// recipeLayout.getItemStacks().init(1, true, 44, 38); -// recipeLayout.getItemStacks().set(1, wrapper.cup); -// -// recipeLayout.getItemStacks().init(2, true, 1, 38); -// recipeLayout.getItemStacks().set(2, Arrays.asList(TileEntityCoffeeMachine.COFFEE.getMatchingStacks())); -// -// recipeLayout.getItemStacks().init(3, false, 44, 69); -// recipeLayout.getItemStacks().set(3, wrapper.theOutput); -// } -//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java deleted file mode 100644 index 36bfda845..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java +++ /dev/null @@ -1,88 +0,0 @@ -///* -// * This file ("CoffeeMachineRecipeWrapper.java") is part of the Actually Additions mod for Minecraft. -// * It is created and owned by Ellpeck and distributed -// * under the Actually Additions License to be found at -// * http://ellpeck.de/actaddlicense -// * View the source code at https://github.com/Ellpeck/ActuallyAdditions -// * -// * © 2015-2017 Ellpeck -// */ -// -//package de.ellpeck.actuallyadditions.mod.jei.coffee; -// -//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.mod.ActuallyAdditions; -//import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; -//import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -//import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; -//import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; -//import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; -//import de.ellpeck.actuallyadditions.mod.util.StringUtil; -//import mezz.jei.api.ingredients.IIngredients; -//import mezz.jei.api.ingredients.VanillaTypes; -//import net.minecraft.client.Minecraft; -//import net.minecraft.item.ItemStack; -// -//import java.util.ArrayList; -//import java.util.List; -// -//public class CoffeeMachineRecipeWrapper extends RecipeWrapperWithButton { -// -// public final CoffeeIngredient ingredient; -// public final ItemStack theOutput; -// public final ItemStack cup = new ItemStack(ActuallyItems.itemCoffeeCup.get()); -// -// public CoffeeMachineRecipeWrapper(CoffeeIngredient ingredient) { -// this.ingredient = ingredient; -// -// this.theOutput = new ItemStack(ActuallyItems.itemCoffee); -// ActuallyAdditionsAPI.methodHandler.addEffectToStack(this.theOutput, this.ingredient); -// } -// -// @Override -// public void getIngredients(IIngredients ingredients) { -// List list = new ArrayList<>(); -// for (ItemStack s : this.ingredient.getInput().getMatchingStacks()) { -// list.add(s); -// } -// list.add(this.cup); -// for (ItemStack s : TileEntityCoffeeMachine.COFFEE.getMatchingStacks()) { -// list.add(s); -// } -// ingredients.setInputs(VanillaTypes.ITEM, list); -// -// ingredients.setOutput(VanillaTypes.ITEM, this.theOutput); -// } -// -// @Override -// public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { -// if (!Strings.isNullOrEmpty(this.ingredient.getExtraText())) { -// minecraft.fontRenderer.drawString(StringUtil.localize("container.nei." + ActuallyAdditions.MODID + ".coffee.special") + ":", 2, 4, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); -// minecraft.fontRenderer.drawString(this.ingredient.getExtraText(), 2, 16, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); -// } -// -// if (this.ingredient.getMaxAmplifier() > 0) { -// minecraft.fontRenderer.drawString(StringUtil.localize("container.nei." + ActuallyAdditions.MODID + ".coffee.maxAmount") + ": " + this.ingredient.getMaxAmplifier(), 2, 28, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); -// } -// -// super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); -// } -// -// @Override -// public int getButtonX() { -// return 0; -// } -// -// @Override -// public int getButtonY() { -// return 68; -// } -// -// @Override -// public IBookletPage getPage() { -// return BookletUtils.findFirstPageForStack(new ItemStack(ActuallyBlocks.blockCoffeeMachine)); -// } -//}