Merge branch '1.9' of https://github.com/MrBretze/TechReborn into MrBretze-1.9

# Conflicts:
#	src/main/java/techreborn/init/ModRecipes.java
This commit is contained in:
Modmuss50 2016-03-28 19:32:06 +01:00
commit fe916ae6b2
2 changed files with 1101 additions and 858 deletions

View file

@ -4,14 +4,28 @@ 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)
{
stacks.add(stack);
if (!hasItems(stack))
{
stacks.add(stack);
}
}
private static boolean hasItems(ItemStack stack)
{
for (ItemStack s : stacks)
{
if (stack.getDisplayName().equals(s.getDisplayName()))
return true;
}
return false;
}
}

File diff suppressed because it is too large Load diff