diff options
Diffstat (limited to 'src/main/java/me/shedaniel/plugin')
11 files changed, 60 insertions, 16 deletions
diff --git a/src/main/java/me/shedaniel/plugin/RandomRecipe.java b/src/main/java/me/shedaniel/plugin/RandomRecipe.java index bb1a1a7f0..382f3a726 100644 --- a/src/main/java/me/shedaniel/plugin/RandomRecipe.java +++ b/src/main/java/me/shedaniel/plugin/RandomRecipe.java @@ -4,6 +4,7 @@ import me.shedaniel.api.IRecipe; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; +import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -30,4 +31,10 @@ public class RandomRecipe implements IRecipe<ItemStack> { public List<List<ItemStack>> getInput() { return new LinkedList<>(Arrays.asList(new LinkedList<>(Arrays.asList(new ItemStack[]{new ItemStack(Blocks.OAK_LOG.getItem())})))); } + + @Override + public List<List<ItemStack>> getRecipeRequiredInput() { + return new ArrayList<>(); + } + }
\ No newline at end of file diff --git a/src/main/java/me/shedaniel/plugin/TestRandomCategory.java b/src/main/java/me/shedaniel/plugin/TestRandomCategory.java index 2076fca19..0824e7acc 100644 --- a/src/main/java/me/shedaniel/plugin/TestRandomCategory.java +++ b/src/main/java/me/shedaniel/plugin/TestRandomCategory.java @@ -66,4 +66,5 @@ public class TestRandomCategory implements IDisplayCategory<RandomRecipe> { public ItemStack getCategoryIcon() { return item; } + }
\ No newline at end of file diff --git a/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceCategory.java b/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceCategory.java index 1721fac05..7b6ad557e 100755 --- a/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceCategory.java +++ b/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceCategory.java @@ -1,6 +1,6 @@ package me.shedaniel.plugin.blastfurnace; -import me.shedaniel.api.DisplayCategoryCraftable; +import me.shedaniel.api.IDisplayCategoryCraftable; import me.shedaniel.gui.RecipeGui; import me.shedaniel.gui.widget.Control; import me.shedaniel.gui.widget.REISlot; @@ -21,7 +21,7 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -public class VanillaBlastFurnaceCategory implements DisplayCategoryCraftable<VanillaBlastFurnaceRecipe> { +public class VanillaBlastFurnaceCategory implements IDisplayCategoryCraftable<VanillaBlastFurnaceRecipe> { private List<VanillaBlastFurnaceRecipe> recipes; @Override diff --git a/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceRecipe.java b/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceRecipe.java index dad285c71..3ef8fbeff 100755 --- a/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceRecipe.java +++ b/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceRecipe.java @@ -10,9 +10,7 @@ import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.smelting.BlastingRecipe; import net.minecraft.recipe.smelting.SmokingRecipe; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; public class VanillaBlastFurnaceRecipe implements IRecipe<ItemStack> { @@ -45,6 +43,14 @@ public class VanillaBlastFurnaceRecipe implements IRecipe<ItemStack> { return input; } + @Override + public List<List<ItemStack>> getRecipeRequiredInput() { + List<List<ItemStack>> input = new LinkedList<>(); + for(Ingredient ingredient : recipe.getPreviewInputs()) + Collections.addAll(input, new LinkedList<>(Arrays.asList(ingredient.getStackArray()))); + return input; + } + public BlastingRecipe getRecipe() { return recipe; } diff --git a/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java b/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java index 6b858f456..66b78ed98 100755 --- a/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java +++ b/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java @@ -1,10 +1,9 @@ package me.shedaniel.plugin.crafting; -import me.shedaniel.api.DisplayCategoryCraftable; +import me.shedaniel.api.IDisplayCategoryCraftable; import me.shedaniel.gui.RecipeGui; import me.shedaniel.gui.widget.*; import me.shedaniel.listenerdefinitions.IMixinRecipeBookGui; -import me.shedaniel.mixins.MixinRecipeBookGui; import net.minecraft.block.Blocks; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Gui; @@ -18,7 +17,7 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -public class VanillaCraftingCategory implements DisplayCategoryCraftable<VanillaCraftingRecipe> { +public class VanillaCraftingCategory implements IDisplayCategoryCraftable<VanillaCraftingRecipe> { Window mainWindow = MinecraftClient.getInstance().window; private List<VanillaCraftingRecipe> recipes; diff --git a/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingRecipe.java b/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingRecipe.java index c7d7bfeb2..1f05c80c0 100755 --- a/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingRecipe.java +++ b/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingRecipe.java @@ -4,6 +4,10 @@ import me.shedaniel.api.IRecipe; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public abstract class VanillaCraftingRecipe implements IRecipe<ItemStack> { public int getWidth() { @@ -16,4 +20,9 @@ public abstract class VanillaCraftingRecipe implements IRecipe<ItemStack> { public abstract Recipe getRecipe(); + @Override + public List<List<ItemStack>> getRecipeRequiredInput() { + return getInput(); + } + } diff --git a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java index 67b73076c..e1c513bbf 100755 --- a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java +++ b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java @@ -1,6 +1,6 @@ package me.shedaniel.plugin.furnace; -import me.shedaniel.api.DisplayCategoryCraftable; +import me.shedaniel.api.IDisplayCategoryCraftable; import me.shedaniel.gui.RecipeGui; import me.shedaniel.gui.widget.Control; import me.shedaniel.gui.widget.REISlot; @@ -11,7 +11,6 @@ import net.minecraft.block.Blocks; import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.container.BlastFurnaceGui; import net.minecraft.client.gui.container.FurnaceGui; import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; @@ -22,7 +21,7 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -public class VanillaFurnaceCategory implements DisplayCategoryCraftable<VanillaFurnaceRecipe> { +public class VanillaFurnaceCategory implements IDisplayCategoryCraftable<VanillaFurnaceRecipe> { private List<VanillaFurnaceRecipe> recipes; @Override diff --git a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java index c207c386a..77e8d20b5 100755 --- a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java +++ b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java @@ -9,6 +9,7 @@ import net.minecraft.recipe.Recipe; import net.minecraft.recipe.smelting.SmeltingRecipe; import java.util.Arrays; +import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; @@ -44,6 +45,14 @@ public class VanillaFurnaceRecipe implements IRecipe<ItemStack> { return input; } + @Override + public List<List<ItemStack>> getRecipeRequiredInput() { + List<List<ItemStack>> input = new LinkedList<>(); + for(Ingredient ingredient : recipe.getPreviewInputs()) + Collections.addAll(input, new LinkedList<>(Arrays.asList(ingredient.getStackArray()))); + return input; + } + public Recipe getRecipe() { return recipe; } diff --git a/src/main/java/me/shedaniel/plugin/potion/VanillaPotionRecipe.java b/src/main/java/me/shedaniel/plugin/potion/VanillaPotionRecipe.java index e7343d449..eb482d8d3 100755 --- a/src/main/java/me/shedaniel/plugin/potion/VanillaPotionRecipe.java +++ b/src/main/java/me/shedaniel/plugin/potion/VanillaPotionRecipe.java @@ -37,6 +37,14 @@ public class VanillaPotionRecipe implements IRecipe<ItemStack> { return input; } + @Override + public List<List<ItemStack>> getRecipeRequiredInput() { + List<List<ItemStack>> input = new LinkedList<>(); + input.add(new ArrayList<>(Arrays.asList(this.input))); + input.add(new ArrayList<>(Arrays.asList(this.reactWith))); + return input; + } + public List<ItemStack> getOutput(int slot) { List<ItemStack> stack = new ArrayList<>(); for(int i = 0; i < slot * 2; i++) diff --git a/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerCategory.java b/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerCategory.java index 37bd413f4..e8e627fb1 100755 --- a/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerCategory.java +++ b/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerCategory.java @@ -1,6 +1,6 @@ package me.shedaniel.plugin.smoker; -import me.shedaniel.api.DisplayCategoryCraftable; +import me.shedaniel.api.IDisplayCategoryCraftable; import me.shedaniel.gui.RecipeGui; import me.shedaniel.gui.widget.Control; import me.shedaniel.gui.widget.REISlot; @@ -21,7 +21,7 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -public class VanillaSmokerCategory implements DisplayCategoryCraftable<VanillaSmokerRecipe> { +public class VanillaSmokerCategory implements IDisplayCategoryCraftable<VanillaSmokerRecipe> { private List<VanillaSmokerRecipe> recipes; @Override diff --git a/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerRecipe.java b/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerRecipe.java index 4ff98077a..2a640178b 100755 --- a/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerRecipe.java +++ b/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerRecipe.java @@ -7,9 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.smelting.SmokingRecipe; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; public class VanillaSmokerRecipe implements IRecipe<ItemStack> { @@ -42,6 +40,14 @@ public class VanillaSmokerRecipe implements IRecipe<ItemStack> { return input; } + @Override + public List<List<ItemStack>> getRecipeRequiredInput() { + List<List<ItemStack>> input = new LinkedList<>(); + for(Ingredient ingredient : recipe.getPreviewInputs()) + Collections.addAll(input, new LinkedList<>(Arrays.asList(ingredient.getStackArray()))); + return input; + } + public SmokingRecipe getRecipe() { return recipe; } |