From a4f2251ff68f835468f5c5bb8a9ac160699dcae0 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sun, 17 Jan 2016 01:14:30 +0100 Subject: [PATCH] Removed INEIRecipeHandler and RecipeWrapperWithButton from the API. They won't work that way. /shrugs --- .../jei}/RecipeWrapperWithButton.java | 15 +-------------- .../mod/jei/booklet/BookletRecipeWrapper.java | 2 +- .../nei}/INEIRecipeHandler.java | 9 +-------- .../mod/nei/NEIBookletRecipe.java | 1 - .../mod/nei/NEICoffeeMachineRecipe.java | 1 - .../mod/nei/NEICompostRecipe.java | 1 - .../mod/nei/NEICrusherRecipe.java | 1 - .../mod/nei/NEIFurnaceDoubleRecipe.java | 1 - .../mod/nei/NEIHairyBallRecipe.java | 1 - .../mod/nei/NEIReconstructorRecipe.java | 1 - .../mod/nei/NEIScreenEvents.java | 1 - .../mod/nei/NEITreasureChestRecipe.java | 1 - 12 files changed, 3 insertions(+), 32 deletions(-) rename src/main/java/de/ellpeck/actuallyadditions/{api/integration => mod/jei}/RecipeWrapperWithButton.java (84%) rename src/main/java/de/ellpeck/actuallyadditions/{api/integration => mod/nei}/INEIRecipeHandler.java (63%) diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/integration/RecipeWrapperWithButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java similarity index 84% rename from src/main/java/de/ellpeck/actuallyadditions/api/integration/RecipeWrapperWithButton.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java index 8abd9bbce..9d4b50515 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/integration/RecipeWrapperWithButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/RecipeWrapperWithButton.java @@ -8,7 +8,7 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.api.integration; +package de.ellpeck.actuallyadditions.mod.jei; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; @@ -19,10 +19,6 @@ import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; -/** - * Make a JEI Recipe Wrapper extend this to make a button show up on the page - * You still need to make it implement IRecipeWrapper! - */ public abstract class RecipeWrapperWithButton{ protected TexturedButton theButton; @@ -40,9 +36,6 @@ public abstract class RecipeWrapperWithButton{ }; } - /** - * Handles a click. Return this on IRecipeWrapper's handleClick() method - */ public boolean handleClick(Minecraft mc, int mouseX, int mouseY){ if(this.theButton.mousePressed(mc, mouseX, mouseY)){ this.theButton.playPressSound(mc.getSoundHandler()); @@ -59,15 +52,9 @@ public abstract class RecipeWrapperWithButton{ return false; } - /** - * Updates the button's rendering. Call this on IRecipeWrapper's drawInfo() method - */ public void updateButton(Minecraft mc, int mouseX, int mouseY){ this.theButton.drawButton(mc, mouseX, mouseY); } - /** - * The booklet page that will be opened when clicking the button - */ public abstract BookletPage getPage(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java index ce8124033..5d0eca838 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java @@ -13,8 +13,8 @@ package de.ellpeck.actuallyadditions.mod.jei.booklet; import com.google.common.collect.ImmutableList; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; -import de.ellpeck.actuallyadditions.api.integration.RecipeWrapperWithButton; import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture; +import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton; import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/de/ellpeck/actuallyadditions/api/integration/INEIRecipeHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java similarity index 63% rename from src/main/java/de/ellpeck/actuallyadditions/api/integration/INEIRecipeHandler.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java index 97b851ef1..d4c570a6e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/api/integration/INEIRecipeHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/INEIRecipeHandler.java @@ -8,18 +8,11 @@ * © 2016 Ellpeck */ -package de.ellpeck.actuallyadditions.api.integration; +package de.ellpeck.actuallyadditions.mod.nei; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -/** - * Make an NEI Recipe Handler implement this to make a button show up on the page - */ public interface INEIRecipeHandler{ - /** - * The page that will be opened when clicking the button - * @param neiIndex the page variable in NEI's GuiRecipe - */ BookletPage getPageForInfo(int neiIndex); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java index ccefcd865..dcffa7320 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIBookletRecipe.java @@ -17,7 +17,6 @@ import codechicken.nei.recipe.TemplateRecipeHandler; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; import de.ellpeck.actuallyadditions.mod.booklet.page.PagePicture; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java index 2bcbe51eb..f2adf5b5a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICoffeeMachineRecipe.java @@ -17,7 +17,6 @@ import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeBrewing; import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java index b1ab6a3af..fc7eab9e5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICompostRecipe.java @@ -16,7 +16,6 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; import de.ellpeck.actuallyadditions.mod.items.InitItems; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java index 293bb981d..23e12ffd9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEICrusherRecipe.java @@ -16,7 +16,6 @@ import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java index c6c862a6e..fd65dcc97 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIFurnaceDoubleRecipe.java @@ -16,7 +16,6 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiFurnaceDouble; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java index 287f8bf2c..f25599559 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIHairyBallRecipe.java @@ -17,7 +17,6 @@ import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; import de.ellpeck.actuallyadditions.mod.items.InitItems; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java index c2a107ee8..2abe18254 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIReconstructorRecipe.java @@ -16,7 +16,6 @@ import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java index 3cbf8c8d3..99f2729ac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEIScreenEvents.java @@ -14,7 +14,6 @@ import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.IRecipeHandler; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils; import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet; import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java index c0990ff50..58486bd8d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/nei/NEITreasureChestRecipe.java @@ -17,7 +17,6 @@ import codechicken.nei.recipe.RecipeInfo; import codechicken.nei.recipe.TemplateRecipeHandler; import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI; import de.ellpeck.actuallyadditions.api.booklet.BookletPage; -import de.ellpeck.actuallyadditions.api.integration.INEIRecipeHandler; import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot; import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks; import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;