diff options
Diffstat (limited to 'src/main/java/me/shedaniel/rei/api')
4 files changed, 12 insertions, 23 deletions
diff --git a/src/main/java/me/shedaniel/rei/api/IRecipeCategory.java b/src/main/java/me/shedaniel/rei/api/IRecipeCategory.java index dbc4a7204..ca531ca21 100644 --- a/src/main/java/me/shedaniel/rei/api/IRecipeCategory.java +++ b/src/main/java/me/shedaniel/rei/api/IRecipeCategory.java @@ -2,8 +2,7 @@ package me.shedaniel.rei.api; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; -import me.shedaniel.rei.gui.widget.RecipeViewingWidget; -import me.shedaniel.rei.listeners.IMixinGuiContainer; +import me.shedaniel.rei.gui.widget.RecipeViewingWidgetGui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.GlStateManager; @@ -14,6 +13,7 @@ import net.minecraft.util.ResourceLocation; import java.awt.*; import java.util.Arrays; import java.util.List; +import java.util.function.Supplier; public interface IRecipeCategory<T extends IRecipeDisplay> { @@ -28,17 +28,21 @@ public interface IRecipeCategory<T extends IRecipeDisplay> { return false; } - default public List<IWidget> setupDisplay(IMixinGuiContainer containerGui, T recipeDisplay, Rectangle bounds) { + default public List<IWidget> setupDisplay(Supplier<T> recipeDisplaySupplier, Rectangle bounds) { return Arrays.asList(new RecipeBaseWidget(bounds)); } default public void drawCategoryBackground(Rectangle bounds) { GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); RenderHelper.disableStandardItemLighting(); - Minecraft.getInstance().getTextureManager().bindTexture(RecipeViewingWidget.CHEST_GUI_TEXTURE); + Minecraft.getInstance().getTextureManager().bindTexture(RecipeViewingWidgetGui.CHEST_GUI_TEXTURE); new Gui() { }.drawTexturedModalRect((int) bounds.getX(), (int) bounds.getY(), 0, 0, (int) bounds.getWidth(), (int) bounds.getHeight()); } + default public boolean checkTags() { + return false; + } + } diff --git a/src/main/java/me/shedaniel/rei/api/IRecipeCategoryCraftable.java b/src/main/java/me/shedaniel/rei/api/IRecipeCategoryCraftable.java deleted file mode 100644 index d16f66654..000000000 --- a/src/main/java/me/shedaniel/rei/api/IRecipeCategoryCraftable.java +++ /dev/null @@ -1,18 +0,0 @@ -package me.shedaniel.rei.api; - -import me.shedaniel.rei.gui.widget.IWidget; -import me.shedaniel.rei.listeners.IMixinGuiContainer; -import net.minecraft.client.gui.Gui; - -import java.awt.*; -import java.util.List; - -public interface IRecipeCategoryCraftable<T extends IRecipeDisplay> { - - public boolean canAutoCraftHere(Class<? extends Gui> guiClass, T recipe); - - public boolean performAutoCraft(Gui gui, T recipe); - - public void registerAutoCraftButton(List<IWidget> widgets, Rectangle rectangle, IMixinGuiContainer parentGui, T recipe); - -} diff --git a/src/main/java/me/shedaniel/rei/api/SpeedCraftAreaSupplier.java b/src/main/java/me/shedaniel/rei/api/SpeedCraftAreaSupplier.java index 47e0a66cc..d4db1f072 100644 --- a/src/main/java/me/shedaniel/rei/api/SpeedCraftAreaSupplier.java +++ b/src/main/java/me/shedaniel/rei/api/SpeedCraftAreaSupplier.java @@ -6,4 +6,8 @@ public interface SpeedCraftAreaSupplier { public Rectangle get(Rectangle bounds); + default String getButtonText() { + return "+"; + } + } diff --git a/src/main/java/me/shedaniel/rei/api/SpeedCraftFunctional.java b/src/main/java/me/shedaniel/rei/api/SpeedCraftFunctional.java index 6dd998d47..e2ed4b83d 100644 --- a/src/main/java/me/shedaniel/rei/api/SpeedCraftFunctional.java +++ b/src/main/java/me/shedaniel/rei/api/SpeedCraftFunctional.java @@ -1,6 +1,5 @@ package me.shedaniel.rei.api; -import me.shedaniel.rei.plugin.DefaultCraftingDisplay; import net.minecraft.client.gui.Gui; public interface SpeedCraftFunctional<T extends IRecipeDisplay> { |