From 1bcf01101edf8d6c7abfb00355f29df40346fc98 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Mon, 11 Mar 2024 01:33:37 +0100 Subject: [PATCH] Removed old JEI code that has been replaced already --- .../mod/jei/JEIActuallyAdditionsPlugin.java | 9 --- .../jei/crusher/CrusherRecipeCategory.java | 68 ------------------ .../mod/jei/crusher/CrusherRecipeWrapper.java | 72 ------------------- 3 files changed, 149 deletions(-) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java 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 743320e1f..d2d0cc577 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/JEIActuallyAdditionsPlugin.java @@ -77,8 +77,6 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin { registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.CRUSHER.getItem()), CRUSHING); registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.CRUSHER_DOUBLE.getItem()), CRUSHING); -// registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.blockAtomicReconstructor.get()), ReconstructorRecipeCategory.NAME); -// registry.addRecipeCatalyst(new ItemStack(ActuallyBlocks.blockEmpowerer.get()), EmpowererRecipeCategory.NAME); // registry.addRecipeCatalyst(new ItemStack(ActuallyItems.itemBooklet.get()), BookletRecipeCategory.NAME); // registry.addRecipeCatalyst(new ItemStack(InitBlocks.blockCompost.get()), CompostRecipeCategory.NAME); } @@ -94,7 +92,6 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin { registry.addRecipes(PRESSING, level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.PRESSING.get()).stream().map(RecipeHolder::value).toList()); registry.addRecipes(CRUSHING, level.getRecipeManager().getAllRecipesFor(ActuallyRecipes.Types.CRUSHING.get()).stream().map(RecipeHolder::value).toList()); //registry.addRecipes(ActuallyAdditionsAPI.BOOKLET_PAGES_WITH_ITEM_OR_FLUID_DATA, BookletRecipeCategory.NAME); - //registry.addRecipes(ActuallyAdditionsAPI.CRUSHER_RECIPES, CrusherRecipeCategory.NAME); } @Override @@ -117,12 +114,6 @@ public class JEIActuallyAdditionsPlugin implements IModPlugin { // registry.handleRecipes(CompostRecipe.class, CompostRecipeWrapper::new, CompostRecipeCategory.NAME); // // -// -// registry.addRecipeClickArea(GuiCoffeeMachine.class, 53, 42, 22, 16, CoffeeMachineRecipeCategory.NAME); -// registry.addRecipeClickArea(GuiGrinder.class, 80, 40, 24, 22, CrusherRecipeCategory.NAME); -// registry.addRecipeClickArea(GuiGrinder.GuiGrinderDouble.class, 51, 40, 74, 22, CrusherRecipeCategory.NAME); -// registry.addRecipeClickArea(GuiFurnaceDouble.class, 51, 40, 74, 22, VanillaRecipeCategoryUid.SMELTING); -// // IIngredientBlacklist blacklist = helpers.getIngredientBlacklist(); // blacklist.addIngredientToBlacklist(new ItemStack(ActuallyBlocks.blockRice.get())); // blacklist.addIngredientToBlacklist(new ItemStack(ActuallyBlocks.blockCanola.get())); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java deleted file mode 100644 index ca67f8ca3..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeCategory.java +++ /dev/null @@ -1,68 +0,0 @@ -///* -// * This file ("CrusherRecipeCategory.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.crusher; -// -//import java.util.Arrays; -// -//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -//import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -//import de.ellpeck.actuallyadditions.mod.util.StackUtil; -//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 CrusherRecipeCategory implements IRecipeCategory { -// -// public static final String NAME = "actuallyadditions.crushing"; -// -// private final IDrawable background; -// -// public CrusherRecipeCategory(IGuiHelper helper) { -// this.background = helper.createDrawable(AssetUtil.getGuiLocation("gui_grinder"), 60, 13, 56, 79); -// } -// -// @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, CrusherRecipeWrapper wrapper, IIngredients ingredients) { -// recipeLayout.getItemStacks().init(0, true, 19, 7); -// recipeLayout.getItemStacks().set(0, Arrays.asList(wrapper.theRecipe.getInput().getMatchingStacks())); -// -// recipeLayout.getItemStacks().init(1, false, 7, 55); -// recipeLayout.getItemStacks().set(1, wrapper.theRecipe.getOutputOne()); -// -// if (StackUtil.isValid(wrapper.theRecipe.getOutputTwo())) { -// recipeLayout.getItemStacks().init(2, false, 31, 55); -// recipeLayout.getItemStacks().set(2, wrapper.theRecipe.getOutputTwo()); -// } -// } -//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java deleted file mode 100644 index 13b24bbf6..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java +++ /dev/null @@ -1,72 +0,0 @@ -///* -// * This file ("CrusherRecipeWrapper.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.crusher; -// -//import de.ellpeck.actuallyadditions.api.booklet.IBookletPage; -//import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; -//import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; -//import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -//import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; -//import de.ellpeck.actuallyadditions.mod.util.StackUtil; -//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.Arrays; -//import java.util.List; -// -//public class CrusherRecipeWrapper extends RecipeWrapperWithButton { -// -// public final CrusherRecipe theRecipe; -// -// public CrusherRecipeWrapper(CrusherRecipe recipe) { -// this.theRecipe = recipe; -// } -// -// @Override -// public void getIngredients(IIngredients ingredients) { -// ingredients.setInputs(VanillaTypes.ITEM, Arrays.asList(this.theRecipe.getInput().getMatchingStacks())); -// -// List list = new ArrayList<>(); -// list.add(this.theRecipe.getOutputOne()); -// if (StackUtil.isValid(this.theRecipe.getOutputTwo())) { -// list.add(this.theRecipe.getOutputTwo()); -// } -// ingredients.setOutputs(VanillaTypes.ITEM, list); -// } -// -// @Override -// public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { -// if (StackUtil.isValid(this.theRecipe.getOutputTwo())) { -// minecraft.fontRenderer.drawString(this.theRecipe.getSecondChance() + "%", 60, 60, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); -// } -// -// super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); -// } -// -// @Override -// public int getButtonX() { -// return -5; -// } -// -// @Override -// public int getButtonY() { -// return 26; -// } -// -// @Override -// public IBookletPage getPage() { -// return BookletUtils.findFirstPageForStack(new ItemStack(ActuallyBlocks.blockGrinder)); -// } -//}