From b503feed8a5d9aeb6ee7150cb702080ec22d2d83 Mon Sep 17 00:00:00 2001 From: MrBretzel <Axelolo68@gmail.com> Date: Mon, 28 Mar 2016 16:45:22 +0200 Subject: [PATCH] Force adding ItemStack to Scrapbox List --- src/main/java/techreborn/api/ScrapboxList.java | 7 +++++-- src/main/java/techreborn/init/ModRecipes.java | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/api/ScrapboxList.java b/src/main/java/techreborn/api/ScrapboxList.java index 07fdceb22..08f2b3a00 100644 --- a/src/main/java/techreborn/api/ScrapboxList.java +++ b/src/main/java/techreborn/api/ScrapboxList.java @@ -4,23 +4,26 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; +import techreborn.Core; public class ScrapboxList { - public static List<ItemStack> stacks = new ArrayList<ItemStack>(); + public static List<ItemStack> stacks = new ArrayList<>(); public static void addItemStackToList(ItemStack stack) { if (!hasItems(stack)) + { stacks.add(stack); + } } private static boolean hasItems(ItemStack stack) { for (ItemStack s : stacks) { - if (stack.getItem().getItemStackDisplayName(stack).equals(s.getItem().getItemStackDisplayName(stack))) + if (stack.getDisplayName().equals(s.getDisplayName())) return true; } return false; diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 595b8a71e..fd71726dc 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -2,6 +2,7 @@ package techreborn.init; import java.security.InvalidParameterException; +import net.minecraft.block.Block; import org.apache.commons.lang3.ArrayUtils; import net.minecraft.init.Blocks; @@ -51,6 +52,7 @@ import techreborn.items.ItemParts; import techreborn.items.ItemPlates; import techreborn.parts.ItemStandaloneCables; import techreborn.utils.RecipeUtils; +import techreborn.utils.StackWIPHandler; public class ModRecipes { @@ -106,6 +108,12 @@ public class ModRecipes ScrapboxList.addItemStackToList(new ItemStack(i)); } + for (int i = 0; i < StackWIPHandler.devHeads.size(); i++) + ScrapboxList.stacks.add(StackWIPHandler.devHeads.get(i)); + + registerDyable(Blocks.stained_hardened_clay); + registerDyable(Blocks.wool); + for (int i = 0; i < ScrapboxList.stacks.size(); i++) { RecipeHandler.addRecipe(new ScrapboxRecipe(ScrapboxList.stacks.get(i))); @@ -127,6 +135,11 @@ public class ModRecipes } } + static void registerDyable(Block block) { + for (int i = 0; i < 16; i++) + ScrapboxList.stacks.add(new ItemStack(block, 1, i)); + } + static void addWireRecipes() { CraftingHelper.addShapedOreRecipe(ItemStandaloneCables.getCableByName("copper", 6), "XXX", "CCC", "XXX", 'C',