diff options
Diffstat (limited to 'src/main/java/me/shedaniel/plugin')
4 files changed, 27 insertions, 15 deletions
diff --git a/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceRecipe.java b/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceRecipe.java index 3032c2401..3eabdca66 100755 --- a/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceRecipe.java +++ b/src/main/java/me/shedaniel/plugin/blastfurnace/VanillaBlastFurnaceRecipe.java @@ -2,13 +2,18 @@ package me.shedaniel.plugin.blastfurnace; import me.shedaniel.api.IRecipe; import net.minecraft.block.BlastFurnaceBlock; +import net.minecraft.block.entity.BlastFurnaceBlockEntity; +import net.minecraft.block.entity.FurnaceBlockEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; 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.stream.Collectors; public class VanillaBlastFurnaceRecipe implements IRecipe<ItemStack> { private final BlastingRecipe recipe; @@ -33,12 +38,10 @@ public class VanillaBlastFurnaceRecipe implements IRecipe<ItemStack> { public List<List<ItemStack>> getInput() { List<List<ItemStack>> input = new LinkedList<>(); for(Ingredient ingredient : recipe.getPreviewInputs()) { - List<ItemStack> ingredients = new LinkedList<>(); - for(ItemStack matchingStack : ingredient.getStackArray()) { - ingredients.add(matchingStack); - } + List<ItemStack> ingredients = Arrays.asList(ingredient.getStackArray()); input.add(ingredients); } + input.add(BlastFurnaceBlockEntity.getBurnTimeMap().keySet().stream().map(Item::getDefaultStack).collect(Collectors.toList())); return input; } } diff --git a/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java b/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java index dec94db05..30c6a0726 100755 --- a/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java +++ b/src/main/java/me/shedaniel/plugin/crafting/VanillaCraftingCategory.java @@ -60,8 +60,14 @@ public class VanillaCraftingCategory implements IDisplayCategory<VanillaCrafting } else if (!input.get(i).isEmpty()) slots.get(i).setStackList(input.get(i)); } - REISlot slot = new REISlot(130, 75 + 18 + number * 75); - + REISlot slot = new REISlot(130, 75 + 18 + number * 75) { + @Override + public String getTextOverlay(ItemStack stack) { + if (stack.getAmount() == 1) + return ""; + return stack.getAmount() + ""; + } + }; slot.setDrawBackground(true); slot.setStack(recipes.get(number).getOutput().get(0).copy()); slots.add(slot); diff --git a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java index 97c6b5460..8023741b4 100755 --- a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java +++ b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java @@ -1,12 +1,16 @@ package me.shedaniel.plugin.furnace; import me.shedaniel.api.IRecipe; +import net.minecraft.block.entity.FurnaceBlockEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.smelting.SmeltingRecipe; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import java.util.stream.Collectors; public class VanillaFurnaceRecipe implements IRecipe<ItemStack> { private final SmeltingRecipe recipe; @@ -31,12 +35,10 @@ public class VanillaFurnaceRecipe implements IRecipe<ItemStack> { public List<List<ItemStack>> getInput() { List<List<ItemStack>> input = new LinkedList<>(); for(Ingredient ingredient : recipe.getPreviewInputs()) { - List<ItemStack> ingredients = new LinkedList<>(); - for(ItemStack matchingStack : ingredient.getStackArray()) { - ingredients.add(matchingStack); - } + List<ItemStack> ingredients = Arrays.asList(ingredient.getStackArray()); input.add(ingredients); } + input.add(FurnaceBlockEntity.getBurnTimeMap().keySet().stream().map(Item::getDefaultStack).collect(Collectors.toList())); return input; } } diff --git a/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerRecipe.java b/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerRecipe.java index 7a6d0fe95..f05a01fc7 100755 --- a/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerRecipe.java +++ b/src/main/java/me/shedaniel/plugin/smoker/VanillaSmokerRecipe.java @@ -1,13 +1,16 @@ package me.shedaniel.plugin.smoker; import me.shedaniel.api.IRecipe; +import net.minecraft.block.entity.SmokerBlockEntity; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.smelting.SmeltingRecipe; import net.minecraft.recipe.smelting.SmokingRecipe; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; +import java.util.stream.Collectors; public class VanillaSmokerRecipe implements IRecipe<ItemStack> { private final SmokingRecipe recipe; @@ -32,12 +35,10 @@ public class VanillaSmokerRecipe implements IRecipe<ItemStack> { public List<List<ItemStack>> getInput() { List<List<ItemStack>> input = new LinkedList<>(); for(Ingredient ingredient : recipe.getPreviewInputs()) { - List<ItemStack> ingredients = new LinkedList<>(); - for(ItemStack matchingStack : ingredient.getStackArray()) { - ingredients.add(matchingStack); - } + List<ItemStack> ingredients = Arrays.asList(ingredient.getStackArray()); input.add(ingredients); } + input.add(SmokerBlockEntity.getBurnTimeMap().keySet().stream().map(Item::getDefaultStack).collect(Collectors.toList())); return input; } } |