From 72e1653cbb38282f8dce59a00fb381e18bfc795d Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 8 Jan 2019 18:23:00 +0800 Subject: Craftable Only WIP --- .../me/shedaniel/api/DisplayCategoryCraftable.java | 19 ------------------- src/main/java/me/shedaniel/api/IDisplayCategory.java | 1 + .../me/shedaniel/api/IDisplayCategoryCraftable.java | 19 +++++++++++++++++++ src/main/java/me/shedaniel/api/IDisplayHelper.java | 7 ------- src/main/java/me/shedaniel/api/IDrawable.java | 4 +++- src/main/java/me/shedaniel/api/IRecipe.java | 4 ++++ src/main/java/me/shedaniel/api/IRecipeManager.java | 1 + .../java/me/shedaniel/api/TriBooleanProducer.java | 8 -------- .../java/me/shedaniel/api/TriBooleanSupplier.java | 8 ++++++++ 9 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/me/shedaniel/api/DisplayCategoryCraftable.java create mode 100644 src/main/java/me/shedaniel/api/IDisplayCategoryCraftable.java delete mode 100755 src/main/java/me/shedaniel/api/IDisplayHelper.java delete mode 100755 src/main/java/me/shedaniel/api/TriBooleanProducer.java create mode 100755 src/main/java/me/shedaniel/api/TriBooleanSupplier.java (limited to 'src/main/java/me/shedaniel/api') diff --git a/src/main/java/me/shedaniel/api/DisplayCategoryCraftable.java b/src/main/java/me/shedaniel/api/DisplayCategoryCraftable.java deleted file mode 100644 index c0be7bd11..000000000 --- a/src/main/java/me/shedaniel/api/DisplayCategoryCraftable.java +++ /dev/null @@ -1,19 +0,0 @@ -package me.shedaniel.api; - -import me.shedaniel.api.IDisplayCategory; -import me.shedaniel.api.IRecipe; -import me.shedaniel.gui.RecipeGui; -import me.shedaniel.gui.widget.Control; -import net.minecraft.client.gui.Gui; - -import java.util.List; - -public interface DisplayCategoryCraftable extends IDisplayCategory { - - public boolean canAutoCraftHere(Class guiClass, T recipe); - - public boolean performAutoCraft(Gui gui, T recipe); - - public void registerAutoCraftButton(List control, RecipeGui recipeGui, Gui parentGui, T recipe, int number); - -} diff --git a/src/main/java/me/shedaniel/api/IDisplayCategory.java b/src/main/java/me/shedaniel/api/IDisplayCategory.java index 3e4c938cb..309a836ac 100755 --- a/src/main/java/me/shedaniel/api/IDisplayCategory.java +++ b/src/main/java/me/shedaniel/api/IDisplayCategory.java @@ -10,6 +10,7 @@ import java.util.List; * Created by James on 8/7/2018. */ public interface IDisplayCategory { + public String getId(); public String getDisplayName(); diff --git a/src/main/java/me/shedaniel/api/IDisplayCategoryCraftable.java b/src/main/java/me/shedaniel/api/IDisplayCategoryCraftable.java new file mode 100644 index 000000000..c34c1e37b --- /dev/null +++ b/src/main/java/me/shedaniel/api/IDisplayCategoryCraftable.java @@ -0,0 +1,19 @@ +package me.shedaniel.api; + +import me.shedaniel.api.IDisplayCategory; +import me.shedaniel.api.IRecipe; +import me.shedaniel.gui.RecipeGui; +import me.shedaniel.gui.widget.Control; +import net.minecraft.client.gui.Gui; + +import java.util.List; + +public interface IDisplayCategoryCraftable extends IDisplayCategory { + + public boolean canAutoCraftHere(Class guiClass, T recipe); + + public boolean performAutoCraft(Gui gui, T recipe); + + public void registerAutoCraftButton(List control, RecipeGui recipeGui, Gui parentGui, T recipe, int number); + +} diff --git a/src/main/java/me/shedaniel/api/IDisplayHelper.java b/src/main/java/me/shedaniel/api/IDisplayHelper.java deleted file mode 100755 index 6f230d3b5..000000000 --- a/src/main/java/me/shedaniel/api/IDisplayHelper.java +++ /dev/null @@ -1,7 +0,0 @@ -package me.shedaniel.api; - -/** - * Created by James on 8/7/2018. - */ -public interface IDisplayHelper { -} diff --git a/src/main/java/me/shedaniel/api/IDrawable.java b/src/main/java/me/shedaniel/api/IDrawable.java index 102b7e1c5..48294bea7 100755 --- a/src/main/java/me/shedaniel/api/IDrawable.java +++ b/src/main/java/me/shedaniel/api/IDrawable.java @@ -4,7 +4,9 @@ package me.shedaniel.api; * Created by James on 8/7/2018. */ public interface IDrawable { + public void draw(); - + public boolean isHighlighted(); + } diff --git a/src/main/java/me/shedaniel/api/IRecipe.java b/src/main/java/me/shedaniel/api/IRecipe.java index 84cce4c79..a79123ddd 100755 --- a/src/main/java/me/shedaniel/api/IRecipe.java +++ b/src/main/java/me/shedaniel/api/IRecipe.java @@ -1,5 +1,7 @@ package me.shedaniel.api; +import net.minecraft.item.ItemStack; + import java.util.List; /** @@ -13,4 +15,6 @@ public interface IRecipe { public List> getInput(); + public List> getRecipeRequiredInput(); + } diff --git a/src/main/java/me/shedaniel/api/IRecipeManager.java b/src/main/java/me/shedaniel/api/IRecipeManager.java index 355a1cd4d..82135bf3f 100755 --- a/src/main/java/me/shedaniel/api/IRecipeManager.java +++ b/src/main/java/me/shedaniel/api/IRecipeManager.java @@ -17,4 +17,5 @@ public interface IRecipeManager { public void addDisplayAdapter(IDisplayCategory adapter); public Map> getRecipesFor(ItemStack stack); + } diff --git a/src/main/java/me/shedaniel/api/TriBooleanProducer.java b/src/main/java/me/shedaniel/api/TriBooleanProducer.java deleted file mode 100755 index 0925fee75..000000000 --- a/src/main/java/me/shedaniel/api/TriBooleanProducer.java +++ /dev/null @@ -1,8 +0,0 @@ -package me.shedaniel.api; - -/** - * Created by James on 8/4/2018. - */ -public interface TriBooleanProducer { - public boolean accept(int first, int second, int third); -} diff --git a/src/main/java/me/shedaniel/api/TriBooleanSupplier.java b/src/main/java/me/shedaniel/api/TriBooleanSupplier.java new file mode 100755 index 000000000..241307740 --- /dev/null +++ b/src/main/java/me/shedaniel/api/TriBooleanSupplier.java @@ -0,0 +1,8 @@ +package me.shedaniel.api; + +/** + * Created by James on 8/4/2018. + */ +public interface TriBooleanSupplier { + public boolean accept(int first, int second, int third); +} -- cgit